diff options
Diffstat (limited to 'Source/WebKit/chromium/src/PlatformSupport.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/PlatformSupport.cpp | 51 |
1 files changed, 21 insertions, 30 deletions
diff --git a/Source/WebKit/chromium/src/PlatformSupport.cpp b/Source/WebKit/chromium/src/PlatformSupport.cpp index 717455688..bbd07ca7c 100644 --- a/Source/WebKit/chromium/src/PlatformSupport.cpp +++ b/Source/WebKit/chromium/src/PlatformSupport.cpp @@ -48,7 +48,6 @@ #include "WebViewClient.h" #include "WebViewImpl.h" #include "WebWorkerClientImpl.h" -#include "WebWorkerRunLoop.h" #include "platform/WebAudioBus.h" #include "platform/WebCookie.h" #include "platform/WebCookieJar.h" @@ -61,10 +60,6 @@ #include "platform/WebURL.h" #include "platform/WebVector.h" -#if USE(CG) -#include <CoreGraphics/CGContext.h> -#endif - #if OS(WINDOWS) #include "platform/WebRect.h" #include "platform/win/WebThemeEngine.h" @@ -100,6 +95,7 @@ #include "WorkerContextProxy.h" #include <public/WebClipboard.h> #include <public/WebMimeRegistry.h> +#include <public/WebWorkerRunLoop.h> #include <wtf/Assertions.h> // We are part of the WebKit implementation. @@ -305,33 +301,33 @@ bool PlatformSupport::cookiesEnabled(const Document* document) bool PlatformSupport::fileExists(const String& path) { - return webKitPlatformSupport()->fileUtilities()->fileExists(path); + return WebKit::Platform::current()->fileUtilities()->fileExists(path); } bool PlatformSupport::deleteFile(const String& path) { - return webKitPlatformSupport()->fileUtilities()->deleteFile(path); + return WebKit::Platform::current()->fileUtilities()->deleteFile(path); } bool PlatformSupport::deleteEmptyDirectory(const String& path) { - return webKitPlatformSupport()->fileUtilities()->deleteEmptyDirectory(path); + return WebKit::Platform::current()->fileUtilities()->deleteEmptyDirectory(path); } bool PlatformSupport::getFileSize(const String& path, long long& result) { - return webKitPlatformSupport()->fileUtilities()->getFileSize(path, result); + return WebKit::Platform::current()->fileUtilities()->getFileSize(path, result); } void PlatformSupport::revealFolderInOS(const String& path) { - webKitPlatformSupport()->fileUtilities()->revealFolderInOS(path); + WebKit::Platform::current()->fileUtilities()->revealFolderInOS(path); } bool PlatformSupport::getFileModificationTime(const String& path, time_t& result) { double modificationTime; - if (!webKitPlatformSupport()->fileUtilities()->getFileModificationTime(path, modificationTime)) + if (!WebKit::Platform::current()->fileUtilities()->getFileModificationTime(path, modificationTime)) return false; result = static_cast<time_t>(modificationTime); return true; @@ -339,62 +335,62 @@ bool PlatformSupport::getFileModificationTime(const String& path, time_t& result String PlatformSupport::directoryName(const String& path) { - return webKitPlatformSupport()->fileUtilities()->directoryName(path); + return WebKit::Platform::current()->fileUtilities()->directoryName(path); } String PlatformSupport::pathByAppendingComponent(const String& path, const String& component) { - return webKitPlatformSupport()->fileUtilities()->pathByAppendingComponent(path, component); + return WebKit::Platform::current()->fileUtilities()->pathByAppendingComponent(path, component); } bool PlatformSupport::makeAllDirectories(const String& path) { - return webKitPlatformSupport()->fileUtilities()->makeAllDirectories(path); + return WebKit::Platform::current()->fileUtilities()->makeAllDirectories(path); } String PlatformSupport::getAbsolutePath(const String& path) { - return webKitPlatformSupport()->fileUtilities()->getAbsolutePath(path); + return WebKit::Platform::current()->fileUtilities()->getAbsolutePath(path); } bool PlatformSupport::isDirectory(const String& path) { - return webKitPlatformSupport()->fileUtilities()->isDirectory(path); + return WebKit::Platform::current()->fileUtilities()->isDirectory(path); } KURL PlatformSupport::filePathToURL(const String& path) { - return webKitPlatformSupport()->fileUtilities()->filePathToURL(path); + return WebKit::Platform::current()->fileUtilities()->filePathToURL(path); } PlatformFileHandle PlatformSupport::openFile(const String& path, FileOpenMode mode) { - return webKitPlatformSupport()->fileUtilities()->openFile(path, mode); + return WebKit::Platform::current()->fileUtilities()->openFile(path, mode); } void PlatformSupport::closeFile(PlatformFileHandle& handle) { - webKitPlatformSupport()->fileUtilities()->closeFile(handle); + WebKit::Platform::current()->fileUtilities()->closeFile(handle); } long long PlatformSupport::seekFile(PlatformFileHandle handle, long long offset, FileSeekOrigin origin) { - return webKitPlatformSupport()->fileUtilities()->seekFile(handle, offset, origin); + return WebKit::Platform::current()->fileUtilities()->seekFile(handle, offset, origin); } bool PlatformSupport::truncateFile(PlatformFileHandle handle, long long offset) { - return webKitPlatformSupport()->fileUtilities()->truncateFile(handle, offset); + return WebKit::Platform::current()->fileUtilities()->truncateFile(handle, offset); } int PlatformSupport::readFromFile(PlatformFileHandle handle, char* data, int length) { - return webKitPlatformSupport()->fileUtilities()->readFromFile(handle, data, length); + return WebKit::Platform::current()->fileUtilities()->readFromFile(handle, data, length); } int PlatformSupport::writeToFile(PlatformFileHandle handle, const char* data, int length) { - return webKitPlatformSupport()->fileUtilities()->writeToFile(handle, data, length); + return WebKit::Platform::current()->fileUtilities()->writeToFile(handle, data, length); } #if ENABLE(FILE_SYSTEM) @@ -830,11 +826,6 @@ LinkHash PlatformSupport::visitedLinkHash(const KURL& base, return webKitPlatformSupport()->visitedLinkHash(buffer.data(), buffer.length()); } -bool PlatformSupport::isLinkVisited(LinkHash visitedLinkHash) -{ - return webKitPlatformSupport()->isLinkVisited(visitedLinkHash); -} - // These are temporary methods that the WebKit layer can use to call to the // Glue layer. Once the Glue layer moves entirely into the WebKit layer, these // methods will be deleted. @@ -915,12 +906,12 @@ bool PlatformSupport::popupsAllowed(NPP npp) #if ENABLE(WORKERS) void PlatformSupport::didStartWorkerRunLoop(WorkerRunLoop* loop) { - webKitPlatformSupport()->didStartWorkerRunLoop(WebWorkerRunLoop(loop)); + WebKit::Platform::current()->didStartWorkerRunLoop(WebWorkerRunLoop(loop)); } void PlatformSupport::didStopWorkerRunLoop(WorkerRunLoop* loop) { - webKitPlatformSupport()->didStopWorkerRunLoop(WebWorkerRunLoop(loop)); + WebKit::Platform::current()->didStopWorkerRunLoop(WebWorkerRunLoop(loop)); } WorkerContextProxy* WorkerContextProxy::create(Worker* worker) |