[Chromium] Rename PlatformBridge to PlatformSupport
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 1 Sep 2011 06:23:40 +0000 (06:23 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 1 Sep 2011 06:23:40 +0000 (06:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=67349

Reviewed by Darin Fisher.

This matches the WebKitPlatformSupport embedder API.

Source/WebCore:

* WebCore.gypi:
* WebCore.pro:
* bindings/v8/NPV8Object.cpp:
(_NPN_Evaluate):
* bindings/v8/ScriptController.cpp:
(WebCore::ScriptController::createScriptInstanceForWidget):
* bindings/v8/V8DOMWindowShell.cpp:
(WebCore::reportFatalErrorInV8):
* bindings/v8/V8GCController.cpp:
* bindings/v8/V8Proxy.cpp:
(WebCore::V8Proxy::handleOutOfMemory):
(WebCore::V8Proxy::evaluate):
* bindings/v8/V8Proxy.h:
* bindings/v8/custom/V8InspectorFrontendHostCustom.cpp:
(WebCore::histogramEnumeration):
* page/PageGroup.cpp:
(WebCore::PageGroup::isLinkVisited):
* platform/audio/chromium/AudioBusChromium.cpp:
(WebCore::AudioBus::loadPlatformResource):
(WebCore::createBusFromInMemoryAudioFile):
* platform/chromium/ChromiumDataObject.cpp:
(WebCore::ChromiumDataObject::types):
(WebCore::ChromiumDataObject::getData):
(WebCore::ChromiumDataObject::getSequenceNumber):
(WebCore::ChromiumDataObject::containsFilenames):
* platform/chromium/DataTransferItemChromium.cpp:
(WebCore::DataTransferItemChromium::getAsString):
(WebCore::DataTransferItemChromium::getAsFile):
* platform/chromium/DragDataChromium.cpp:
(WebCore::DragData::asURL):
* platform/chromium/FileSystemChromium.cpp:
(WebCore::deleteFile):
(WebCore::deleteEmptyDirectory):
(WebCore::getFileSize):
(WebCore::getFileModificationTime):
(WebCore::revealFolderInOS):
(WebCore::directoryName):
(WebCore::pathByAppendingComponent):
(WebCore::makeAllDirectories):
(WebCore::fileExists):
(WebCore::openFile):
(WebCore::closeFile):
(WebCore::seekFile):
(WebCore::truncateFile):
(WebCore::readFromFile):
(WebCore::writeToFile):
* platform/chromium/LanguageChromium.cpp:
(WebCore::platformDefaultLanguage):
* platform/chromium/LinkHashChromium.cpp:
(WebCore::visitedLinkHash):
* platform/chromium/MIMETypeRegistryChromium.cpp:
(WebCore::MIMETypeRegistry::getMIMETypeForExtension):
(WebCore::MIMETypeRegistry::getWellKnownMIMETypeForExtension):
(WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
(WebCore::MIMETypeRegistry::isSupportedImageMIMEType):
(WebCore::MIMETypeRegistry::isSupportedJavaScriptMIMEType):
(WebCore::MIMETypeRegistry::isSupportedNonImageMIMEType):
* platform/chromium/PasteboardChromium.cpp:
(WebCore::Pasteboard::writeSelection):
(WebCore::Pasteboard::writePlainText):
(WebCore::Pasteboard::writeURL):
(WebCore::Pasteboard::writeImage):
(WebCore::Pasteboard::canSmartReplace):
(WebCore::Pasteboard::plainText):
(WebCore::Pasteboard::documentFragment):
* platform/chromium/PlatformBridge.h: Removed.
* platform/chromium/PlatformScreenChromium.cpp:
(WebCore::screenDepth):
(WebCore::screenDepthPerComponent):
(WebCore::screenIsMonochrome):
(WebCore::screenRect):
(WebCore::screenAvailableRect):
* platform/chromium/PlatformSupport.h: Copied from Source/WebCore/platform/chromium/PlatformBridge.h.
* platform/chromium/SSLKeyGeneratorChromium.cpp:
(WebCore::signedPublicKeyAndChallengeString):
* platform/chromium/ScrollbarThemeChromium.cpp:
* platform/chromium/ScrollbarThemeChromiumLinux.cpp:
(WebCore::ScrollbarThemeChromiumLinux::scrollbarThickness):
(WebCore::ScrollbarThemeChromiumLinux::paintTrackPiece):
(WebCore::ScrollbarThemeChromiumLinux::paintButton):
(WebCore::ScrollbarThemeChromiumLinux::paintThumb):
(WebCore::ScrollbarThemeChromiumLinux::buttonSize):
(WebCore::ScrollbarThemeChromiumLinux::minimumThumbLength):
* platform/chromium/ScrollbarThemeChromiumMac.mm:
(WebCore::scrollbarStateToThemeState):
(WebCore::ScrollbarThemeChromiumMac::paint):
* platform/chromium/ScrollbarThemeChromiumWin.cpp:
(WebCore::ScrollbarThemeChromiumWin::scrollbarThickness):
(WebCore::ScrollbarThemeChromiumWin::paintTrackPiece):
(WebCore::ScrollbarThemeChromiumWin::paintButton):
(WebCore::ScrollbarThemeChromiumWin::paintThumb):
(WebCore::ScrollbarThemeChromiumWin::buttonSize):
* platform/chromium/SharedTimerChromium.cpp:
(WebCore::setSharedTimerFiredFunction):
(WebCore::setSharedTimerFireInterval):
(WebCore::stopSharedTimer):
* platform/chromium/SuddenTerminationChromium.cpp:
(WebCore::disableSuddenTermination):
(WebCore::enableSuddenTermination):
* platform/chromium/TraceEvent.h:
(WebCore::internal::ScopeTracer::ScopeTracer):
(WebCore::internal::ScopeTracer::~ScopeTracer):
* platform/graphics/chromium/ContentLayerChromium.cpp:
(WebCore::ContentLayerPainter::paint):
* platform/graphics/chromium/CrossProcessFontLoading.mm:
* platform/graphics/chromium/FontCacheChromiumWin.cpp:
(WebCore::fontContainsCharacter):
(WebCore::FillLogFont):
* platform/graphics/chromium/FontCacheLinux.cpp:
(WebCore::FontCache::getFontDataForCharacters):
* platform/graphics/chromium/FontChromiumWin.cpp:
(WebCore::drawGlyphsWin):
* platform/graphics/chromium/FontPlatformDataChromiumWin.cpp:
(WebCore::FontPlatformData::scriptFontProperties):
* platform/graphics/chromium/FontPlatformDataLinux.cpp:
(WebCore::FontPlatformData::querySystemForRenderStyle):
* platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp:
(WebCore::fillBMPGlyphs):
* platform/graphics/chromium/ImageChromium.cpp:
(WebCore::Image::loadPlatformResource):
* platform/graphics/chromium/ImageChromiumMac.mm:
(WebCore::Image::loadPlatformResource):
* platform/graphics/chromium/SimpleFontDataChromiumWin.cpp:
(WebCore::SimpleFontData::platformInit):
(WebCore::SimpleFontData::determinePitch):
(WebCore::SimpleFontData::platformWidthForGlyph):
* platform/graphics/chromium/UniscribeHelperTextRun.cpp:
(WebCore::UniscribeHelperTextRun::tryToPreloadFont):
* platform/graphics/skia/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::fontPlatformData):
* platform/network/chromium/CookieJarChromium.cpp:
(WebCore::setCookies):
(WebCore::cookies):
(WebCore::cookieRequestHeaderFieldValue):
(WebCore::cookiesEnabled):
(WebCore::getRawCookies):
(WebCore::deleteCookie):
* platform/network/chromium/DNSChromium.cpp:
(WebCore::prefetchDNS):
* platform/qt/PlatformBridge.h: Removed.
* platform/qt/PlatformBridgeQt.cpp: Removed.
* platform/qt/PlatformSupport.h: Copied from Source/WebCore/platform/qt/PlatformBridge.h.
* platform/qt/PlatformSupportQt.cpp: Copied from Source/WebCore/platform/qt/PlatformBridgeQt.cpp.
(WebCore::PlatformSupport::popupsAllowed):
(WebCore::PlatformSupport::pluginScriptableObject):
* platform/sql/chromium/SQLiteFileSystemChromium.cpp:
(WebCore::SQLiteFileSystem::deleteDatabaseFile):
(WebCore::SQLiteFileSystem::getDatabaseFileSize):
* platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
* platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp:
* plugins/chromium/PluginDataChromium.cpp:
(WebCore::PluginCache::plugins):
* rendering/RenderThemeChromiumLinux.cpp:
(WebCore::getWebThemeState):
(WebCore::RenderThemeChromiumLinux::adjustSliderThumbSize):
(WebCore::RenderThemeChromiumLinux::paintCheckbox):
(WebCore::RenderThemeChromiumLinux::setCheckboxSize):
(WebCore::RenderThemeChromiumLinux::paintRadio):
(WebCore::RenderThemeChromiumLinux::setRadioSize):
(WebCore::RenderThemeChromiumLinux::paintButton):
(WebCore::RenderThemeChromiumLinux::paintTextField):
(WebCore::RenderThemeChromiumLinux::paintMenuList):
(WebCore::RenderThemeChromiumLinux::paintSliderTrack):
(WebCore::RenderThemeChromiumLinux::paintSliderThumb):
(WebCore::RenderThemeChromiumLinux::adjustInnerSpinButtonStyle):
(WebCore::RenderThemeChromiumLinux::paintInnerSpinButton):
(WebCore::RenderThemeChromiumLinux::paintProgressBar):
* rendering/RenderThemeChromiumMac.mm:
(WebCore::RenderThemeChromiumMac::usesTestModeFocusRingColor):
* rendering/RenderThemeChromiumSkia.cpp:
(WebCore::RenderThemeChromiumSkia::caretBlinkInterval):
* rendering/RenderThemeChromiumWin.cpp:
(WebCore::RenderThemeChromiumWin::platformActiveSelectionBackgroundColor):
(WebCore::RenderThemeChromiumWin::platformInactiveSelectionBackgroundColor):
(WebCore::RenderThemeChromiumWin::platformActiveSelectionForegroundColor):
(WebCore::RenderThemeChromiumWin::systemColor):
(WebCore::RenderThemeChromiumWin::paintButton):
(WebCore::RenderThemeChromiumWin::paintSliderTrack):
(WebCore::menuListButtonWidth):
(WebCore::RenderThemeChromiumWin::paintMenuList):
(WebCore::RenderThemeChromiumWin::paintTextFieldInternal):
(WebCore::RenderThemeChromiumWin::paintInnerSpinButton):
(WebCore::RenderThemeChromiumWin::paintProgressBar):
* storage/chromium/IDBFactoryBackendInterface.cpp:
(WebCore::IDBFactoryBackendInterface::create):
* storage/chromium/IDBKeyPathBackendImpl.cpp:
(WebCore::IDBKeyPathBackendImpl::createIDBKeysFromSerializedValuesAndKeyPath):
(WebCore::IDBKeyPathBackendImpl::injectIDBKeyIntoSerializedValue):
* storage/chromium/QuotaTracker.cpp:
(WebCore::QuotaTracker::getDatabaseSizeAndSpaceAvailableToOrigin):

Source/WebKit/chromium:

* WebKit.gyp:
* src/AssertMatchingEnums.cpp:
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::shouldRunModalDialogDuringPageDismissal):
* src/PlatformBridge.cpp: Removed.
* src/ResourceHandle.cpp:
(WebCore::ResourceHandle::cacheMetadata):
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::WebFrameImpl):
(WebKit::WebFrameImpl::~WebFrameImpl):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::paint):
(WebKit::WebViewImplContentPainter::paint):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@94275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

66 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pro
Source/WebCore/bindings/v8/NPV8Object.cpp
Source/WebCore/bindings/v8/ScriptController.cpp
Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
Source/WebCore/bindings/v8/V8GCController.cpp
Source/WebCore/bindings/v8/V8Proxy.cpp
Source/WebCore/bindings/v8/V8Proxy.h
Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp
Source/WebCore/page/PageGroup.cpp
Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp
Source/WebCore/platform/chromium/ChromiumDataObject.cpp
Source/WebCore/platform/chromium/DataTransferItemChromium.cpp
Source/WebCore/platform/chromium/DragDataChromium.cpp
Source/WebCore/platform/chromium/FileSystemChromium.cpp
Source/WebCore/platform/chromium/LanguageChromium.cpp
Source/WebCore/platform/chromium/LinkHashChromium.cpp
Source/WebCore/platform/chromium/MIMETypeRegistryChromium.cpp
Source/WebCore/platform/chromium/PasteboardChromium.cpp
Source/WebCore/platform/chromium/PlatformScreenChromium.cpp
Source/WebCore/platform/chromium/PlatformSupport.h [moved from Source/WebCore/platform/chromium/PlatformBridge.h with 98% similarity]
Source/WebCore/platform/chromium/SSLKeyGeneratorChromium.cpp
Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp
Source/WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp
Source/WebCore/platform/chromium/ScrollbarThemeChromiumMac.mm
Source/WebCore/platform/chromium/ScrollbarThemeChromiumWin.cpp
Source/WebCore/platform/chromium/SharedTimerChromium.cpp
Source/WebCore/platform/chromium/SuddenTerminationChromium.cpp
Source/WebCore/platform/chromium/TraceEvent.h
Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp
Source/WebCore/platform/graphics/chromium/CrossProcessFontLoading.mm
Source/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp
Source/WebCore/platform/graphics/chromium/FontCacheLinux.cpp
Source/WebCore/platform/graphics/chromium/FontChromiumWin.cpp
Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp
Source/WebCore/platform/graphics/chromium/FontPlatformDataLinux.cpp
Source/WebCore/platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp
Source/WebCore/platform/graphics/chromium/ImageChromium.cpp
Source/WebCore/platform/graphics/chromium/ImageChromiumMac.mm
Source/WebCore/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp
Source/WebCore/platform/graphics/chromium/UniscribeHelperTextRun.cpp
Source/WebCore/platform/graphics/skia/FontCustomPlatformData.cpp
Source/WebCore/platform/network/chromium/CookieJarChromium.cpp
Source/WebCore/platform/network/chromium/DNSChromium.cpp
Source/WebCore/platform/qt/PlatformSupport.h [moved from Source/WebCore/platform/qt/PlatformBridge.h with 91% similarity]
Source/WebCore/platform/qt/PlatformSupportQt.cpp [moved from Source/WebCore/platform/qt/PlatformBridgeQt.cpp with 90% similarity]
Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromium.cpp
Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp
Source/WebCore/platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp
Source/WebCore/plugins/chromium/PluginDataChromium.cpp
Source/WebCore/rendering/RenderThemeChromiumLinux.cpp
Source/WebCore/rendering/RenderThemeChromiumMac.mm
Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
Source/WebCore/rendering/RenderThemeChromiumWin.cpp
Source/WebCore/storage/chromium/IDBFactoryBackendInterface.cpp
Source/WebCore/storage/chromium/IDBKeyPathBackendImpl.cpp
Source/WebCore/storage/chromium/QuotaTracker.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/src/AssertMatchingEnums.cpp
Source/WebKit/chromium/src/ChromeClientImpl.cpp
Source/WebKit/chromium/src/PlatformSupport.cpp [moved from Source/WebKit/chromium/src/PlatformBridge.cpp with 74% similarity]
Source/WebKit/chromium/src/ResourceHandle.cpp
Source/WebKit/chromium/src/WebFrameImpl.cpp
Source/WebKit/chromium/src/WebViewImpl.cpp

index 217e364..3dc65b9 100644 (file)
@@ -1,3 +1,203 @@
+2011-08-31  Adam Barth  <abarth@webkit.org>
+
+        [Chromium] Rename PlatformBridge to PlatformSupport
+        https://bugs.webkit.org/show_bug.cgi?id=67349
+
+        Reviewed by Darin Fisher.
+
+        This matches the WebKitPlatformSupport embedder API.
+
+        * WebCore.gypi:
+        * WebCore.pro:
+        * bindings/v8/NPV8Object.cpp:
+        (_NPN_Evaluate):
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::createScriptInstanceForWidget):
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::reportFatalErrorInV8):
+        * bindings/v8/V8GCController.cpp:
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::handleOutOfMemory):
+        (WebCore::V8Proxy::evaluate):
+        * bindings/v8/V8Proxy.h:
+        * bindings/v8/custom/V8InspectorFrontendHostCustom.cpp:
+        (WebCore::histogramEnumeration):
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::isLinkVisited):
+        * platform/audio/chromium/AudioBusChromium.cpp:
+        (WebCore::AudioBus::loadPlatformResource):
+        (WebCore::createBusFromInMemoryAudioFile):
+        * platform/chromium/ChromiumDataObject.cpp:
+        (WebCore::ChromiumDataObject::types):
+        (WebCore::ChromiumDataObject::getData):
+        (WebCore::ChromiumDataObject::getSequenceNumber):
+        (WebCore::ChromiumDataObject::containsFilenames):
+        * platform/chromium/DataTransferItemChromium.cpp:
+        (WebCore::DataTransferItemChromium::getAsString):
+        (WebCore::DataTransferItemChromium::getAsFile):
+        * platform/chromium/DragDataChromium.cpp:
+        (WebCore::DragData::asURL):
+        * platform/chromium/FileSystemChromium.cpp:
+        (WebCore::deleteFile):
+        (WebCore::deleteEmptyDirectory):
+        (WebCore::getFileSize):
+        (WebCore::getFileModificationTime):
+        (WebCore::revealFolderInOS):
+        (WebCore::directoryName):
+        (WebCore::pathByAppendingComponent):
+        (WebCore::makeAllDirectories):
+        (WebCore::fileExists):
+        (WebCore::openFile):
+        (WebCore::closeFile):
+        (WebCore::seekFile):
+        (WebCore::truncateFile):
+        (WebCore::readFromFile):
+        (WebCore::writeToFile):
+        * platform/chromium/LanguageChromium.cpp:
+        (WebCore::platformDefaultLanguage):
+        * platform/chromium/LinkHashChromium.cpp:
+        (WebCore::visitedLinkHash):
+        * platform/chromium/MIMETypeRegistryChromium.cpp:
+        (WebCore::MIMETypeRegistry::getMIMETypeForExtension):
+        (WebCore::MIMETypeRegistry::getWellKnownMIMETypeForExtension):
+        (WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
+        (WebCore::MIMETypeRegistry::isSupportedImageMIMEType):
+        (WebCore::MIMETypeRegistry::isSupportedJavaScriptMIMEType):
+        (WebCore::MIMETypeRegistry::isSupportedNonImageMIMEType):
+        * platform/chromium/PasteboardChromium.cpp:
+        (WebCore::Pasteboard::writeSelection):
+        (WebCore::Pasteboard::writePlainText):
+        (WebCore::Pasteboard::writeURL):
+        (WebCore::Pasteboard::writeImage):
+        (WebCore::Pasteboard::canSmartReplace):
+        (WebCore::Pasteboard::plainText):
+        (WebCore::Pasteboard::documentFragment):
+        * platform/chromium/PlatformBridge.h: Removed.
+        * platform/chromium/PlatformScreenChromium.cpp:
+        (WebCore::screenDepth):
+        (WebCore::screenDepthPerComponent):
+        (WebCore::screenIsMonochrome):
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+        * platform/chromium/PlatformSupport.h: Copied from Source/WebCore/platform/chromium/PlatformBridge.h.
+        * platform/chromium/SSLKeyGeneratorChromium.cpp:
+        (WebCore::signedPublicKeyAndChallengeString):
+        * platform/chromium/ScrollbarThemeChromium.cpp:
+        * platform/chromium/ScrollbarThemeChromiumLinux.cpp:
+        (WebCore::ScrollbarThemeChromiumLinux::scrollbarThickness):
+        (WebCore::ScrollbarThemeChromiumLinux::paintTrackPiece):
+        (WebCore::ScrollbarThemeChromiumLinux::paintButton):
+        (WebCore::ScrollbarThemeChromiumLinux::paintThumb):
+        (WebCore::ScrollbarThemeChromiumLinux::buttonSize):
+        (WebCore::ScrollbarThemeChromiumLinux::minimumThumbLength):
+        * platform/chromium/ScrollbarThemeChromiumMac.mm:
+        (WebCore::scrollbarStateToThemeState):
+        (WebCore::ScrollbarThemeChromiumMac::paint):
+        * platform/chromium/ScrollbarThemeChromiumWin.cpp:
+        (WebCore::ScrollbarThemeChromiumWin::scrollbarThickness):
+        (WebCore::ScrollbarThemeChromiumWin::paintTrackPiece):
+        (WebCore::ScrollbarThemeChromiumWin::paintButton):
+        (WebCore::ScrollbarThemeChromiumWin::paintThumb):
+        (WebCore::ScrollbarThemeChromiumWin::buttonSize):
+        * platform/chromium/SharedTimerChromium.cpp:
+        (WebCore::setSharedTimerFiredFunction):
+        (WebCore::setSharedTimerFireInterval):
+        (WebCore::stopSharedTimer):
+        * platform/chromium/SuddenTerminationChromium.cpp:
+        (WebCore::disableSuddenTermination):
+        (WebCore::enableSuddenTermination):
+        * platform/chromium/TraceEvent.h:
+        (WebCore::internal::ScopeTracer::ScopeTracer):
+        (WebCore::internal::ScopeTracer::~ScopeTracer):
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        (WebCore::ContentLayerPainter::paint):
+        * platform/graphics/chromium/CrossProcessFontLoading.mm:
+        * platform/graphics/chromium/FontCacheChromiumWin.cpp:
+        (WebCore::fontContainsCharacter):
+        (WebCore::FillLogFont):
+        * platform/graphics/chromium/FontCacheLinux.cpp:
+        (WebCore::FontCache::getFontDataForCharacters):
+        * platform/graphics/chromium/FontChromiumWin.cpp:
+        (WebCore::drawGlyphsWin):
+        * platform/graphics/chromium/FontPlatformDataChromiumWin.cpp:
+        (WebCore::FontPlatformData::scriptFontProperties):
+        * platform/graphics/chromium/FontPlatformDataLinux.cpp:
+        (WebCore::FontPlatformData::querySystemForRenderStyle):
+        * platform/graphics/chromium/GlyphPageTreeNodeChromiumWin.cpp:
+        (WebCore::fillBMPGlyphs):
+        * platform/graphics/chromium/ImageChromium.cpp:
+        (WebCore::Image::loadPlatformResource):
+        * platform/graphics/chromium/ImageChromiumMac.mm:
+        (WebCore::Image::loadPlatformResource):
+        * platform/graphics/chromium/SimpleFontDataChromiumWin.cpp:
+        (WebCore::SimpleFontData::platformInit):
+        (WebCore::SimpleFontData::determinePitch):
+        (WebCore::SimpleFontData::platformWidthForGlyph):
+        * platform/graphics/chromium/UniscribeHelperTextRun.cpp:
+        (WebCore::UniscribeHelperTextRun::tryToPreloadFont):
+        * platform/graphics/skia/FontCustomPlatformData.cpp:
+        (WebCore::FontCustomPlatformData::fontPlatformData):
+        * platform/network/chromium/CookieJarChromium.cpp:
+        (WebCore::setCookies):
+        (WebCore::cookies):
+        (WebCore::cookieRequestHeaderFieldValue):
+        (WebCore::cookiesEnabled):
+        (WebCore::getRawCookies):
+        (WebCore::deleteCookie):
+        * platform/network/chromium/DNSChromium.cpp:
+        (WebCore::prefetchDNS):
+        * platform/qt/PlatformBridge.h: Removed.
+        * platform/qt/PlatformBridgeQt.cpp: Removed.
+        * platform/qt/PlatformSupport.h: Copied from Source/WebCore/platform/qt/PlatformBridge.h.
+        * platform/qt/PlatformSupportQt.cpp: Copied from Source/WebCore/platform/qt/PlatformBridgeQt.cpp.
+        (WebCore::PlatformSupport::popupsAllowed):
+        (WebCore::PlatformSupport::pluginScriptableObject):
+        * platform/sql/chromium/SQLiteFileSystemChromium.cpp:
+        (WebCore::SQLiteFileSystem::deleteDatabaseFile):
+        (WebCore::SQLiteFileSystem::getDatabaseFileSize):
+        * platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
+        * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp:
+        * plugins/chromium/PluginDataChromium.cpp:
+        (WebCore::PluginCache::plugins):
+        * rendering/RenderThemeChromiumLinux.cpp:
+        (WebCore::getWebThemeState):
+        (WebCore::RenderThemeChromiumLinux::adjustSliderThumbSize):
+        (WebCore::RenderThemeChromiumLinux::paintCheckbox):
+        (WebCore::RenderThemeChromiumLinux::setCheckboxSize):
+        (WebCore::RenderThemeChromiumLinux::paintRadio):
+        (WebCore::RenderThemeChromiumLinux::setRadioSize):
+        (WebCore::RenderThemeChromiumLinux::paintButton):
+        (WebCore::RenderThemeChromiumLinux::paintTextField):
+        (WebCore::RenderThemeChromiumLinux::paintMenuList):
+        (WebCore::RenderThemeChromiumLinux::paintSliderTrack):
+        (WebCore::RenderThemeChromiumLinux::paintSliderThumb):
+        (WebCore::RenderThemeChromiumLinux::adjustInnerSpinButtonStyle):
+        (WebCore::RenderThemeChromiumLinux::paintInnerSpinButton):
+        (WebCore::RenderThemeChromiumLinux::paintProgressBar):
+        * rendering/RenderThemeChromiumMac.mm:
+        (WebCore::RenderThemeChromiumMac::usesTestModeFocusRingColor):
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::RenderThemeChromiumSkia::caretBlinkInterval):
+        * rendering/RenderThemeChromiumWin.cpp:
+        (WebCore::RenderThemeChromiumWin::platformActiveSelectionBackgroundColor):
+        (WebCore::RenderThemeChromiumWin::platformInactiveSelectionBackgroundColor):
+        (WebCore::RenderThemeChromiumWin::platformActiveSelectionForegroundColor):
+        (WebCore::RenderThemeChromiumWin::systemColor):
+        (WebCore::RenderThemeChromiumWin::paintButton):
+        (WebCore::RenderThemeChromiumWin::paintSliderTrack):
+        (WebCore::menuListButtonWidth):
+        (WebCore::RenderThemeChromiumWin::paintMenuList):
+        (WebCore::RenderThemeChromiumWin::paintTextFieldInternal):
+        (WebCore::RenderThemeChromiumWin::paintInnerSpinButton):
+        (WebCore::RenderThemeChromiumWin::paintProgressBar):
+        * storage/chromium/IDBFactoryBackendInterface.cpp:
+        (WebCore::IDBFactoryBackendInterface::create):
+        * storage/chromium/IDBKeyPathBackendImpl.cpp:
+        (WebCore::IDBKeyPathBackendImpl::createIDBKeysFromSerializedValuesAndKeyPath):
+        (WebCore::IDBKeyPathBackendImpl::injectIDBKeyIntoSerializedValue):
+        * storage/chromium/QuotaTracker.cpp:
+        (WebCore::QuotaTracker::getDatabaseSizeAndSpaceAvailableToOrigin):
+
 2011-08-31  Ryosuke Niwa  <rniwa@webkit.org>
 
         Crash when inserting text with a trailing newline into a textarea via JS
index e9341ed..3608a63 100644 (file)
             'platform/chromium/MIMETypeRegistryChromium.cpp',
             'platform/chromium/PasteboardChromium.cpp',
             'platform/chromium/PasteboardPrivate.h',
-            'platform/chromium/PlatformBridge.h',
             'platform/chromium/PlatformCursor.h',
             'platform/chromium/PlatformKeyboardEventChromium.cpp',
             'platform/chromium/PlatformScreenChromium.cpp',
+            'platform/chromium/PlatformSupport.h',
             'platform/chromium/PlatformThemeChromiumGtk.cpp',
             'platform/chromium/PlatformThemeChromiumGtk.h',
             'platform/chromium/PlatformWidget.h',
             'platform/qt/LoggingQt.cpp',
             'platform/qt/MIMETypeRegistryQt.cpp',
             'platform/qt/PasteboardQt.cpp',
-            'platform/qt/PlatformBridge.h',
-            'platform/qt/PlatformBridgeQt.cpp',
             'platform/qt/PlatformKeyboardEventQt.cpp',
             'platform/qt/PlatformMouseEventQt.cpp',
             'platform/qt/PlatformScreenQt.cpp',
+            'platform/qt/PlatformSupport.h',
+            'platform/qt/PlatformSupportQt.cpp',
             'platform/qt/PlatformTouchEventQt.cpp',
             'platform/qt/PlatformTouchPointQt.cpp',
             'platform/qt/QWebPageClient.h',
index 300ecc7..0f33502 100644 (file)
@@ -64,7 +64,7 @@ v8 {
     include($$PWD/../JavaScriptCore/wtf/wtf.pri)
 
     SOURCES += \
-        platform/qt/PlatformBridgeQt.cpp \
+        platform/qt/PlatformSupportQt.cpp \
         bindings/generic/BindingSecurityBase.cpp \
         \
         bindings/v8/WorldContextHandle.cpp \
index 37f4b4e..d016104 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "NPV8Object.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "DOMWindow.h"
 #include "Frame.h"
 #include "OwnArrayPtr.h"
@@ -279,7 +279,7 @@ bool _NPN_InvokeDefault(NPP npp, NPObject* npObject, const NPVariant* arguments,
 
 bool _NPN_Evaluate(NPP npp, NPObject* npObject, NPString* npScript, NPVariant* result)
 {
-    bool popupsAllowed = PlatformBridge::popupsAllowed(npp);
+    bool popupsAllowed = PlatformSupport::popupsAllowed(npp);
     return _NPN_EvaluateHelper(npp, popupsAllowed, npObject, npScript, result);
 }
 
index 8076d69..9969389 100644 (file)
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "ScriptController.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "Document.h"
 #include "ScriptCallStack.h"
 #include "ScriptCallStackFactory.h"
@@ -276,7 +276,7 @@ PassScriptInstance ScriptController::createScriptInstanceForWidget(Widget* widge
     if (widget->isFrameView())
         return 0;
 
-    NPObject* npObject = PlatformBridge::pluginScriptableObject(widget);
+    NPObject* npObject = PlatformSupport::pluginScriptableObject(widget);
 
     if (!npObject)
         return 0;
index 742d17b..c316b55 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "V8DOMWindowShell.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "CSSMutableStyleDeclaration.h"
 #include "DateExtension.h"
 #include "DocumentLoader.h"
@@ -92,7 +92,7 @@ static void reportFatalErrorInV8(const char* location, const char* message)
     // FIXME: clean up V8Proxy and disable JavaScript.
     int memoryUsageMB = -1;
 #if PLATFORM(CHROMIUM)
-    memoryUsageMB = PlatformBridge::actualMemoryUsageMB();
+    memoryUsageMB = PlatformSupport::actualMemoryUsageMB();
 #endif
     printf("V8 error: %s (%s).  Current memory usage: %d MB\n", message, location, memoryUsageMB);
     handleFatalErrorInV8();
index b51aed1..e9bed09 100644 (file)
@@ -38,7 +38,7 @@
 #include "HTMLImageElement.h"
 #include "HTMLNames.h"
 #include "MessagePort.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "RetainedDOMInfo.h"
 #include "RetainedObjectInfo.h"
 #include "V8Binding.h"
@@ -421,7 +421,7 @@ namespace {
 int getMemoryUsageInMB()
 {
 #if PLATFORM(CHROMIUM)
-    return PlatformBridge::memoryUsageMB();
+    return PlatformSupport::memoryUsageMB();
 #else
     return 0;
 #endif
@@ -430,7 +430,7 @@ int getMemoryUsageInMB()
 int getActualMemoryUsageInMB()
 {
 #if PLATFORM(CHROMIUM)
-    return PlatformBridge::actualMemoryUsageMB();
+    return PlatformSupport::actualMemoryUsageMB();
 #else
     return 0;
 #endif
index 221f4b0..1ca3ec0 100644 (file)
@@ -45,7 +45,7 @@
 #include "InspectorInstrumentation.h"
 #include "Page.h"
 #include "PageGroup.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "ScriptSourceCode.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
@@ -231,7 +231,7 @@ bool V8Proxy::handleOutOfMemory()
     }
 
 #if PLATFORM(CHROMIUM)
-    PlatformBridge::notifyJSOutOfMemory(frame);
+    PlatformSupport::notifyJSOutOfMemory(frame);
 #endif
 
     // Disable JS.
@@ -368,7 +368,7 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod
         // Compile the script.
         v8::Local<v8::String> code = v8ExternalString(source.source());
 #if PLATFORM(CHROMIUM)
-        PlatformBridge::traceEventBegin("v8.compile", node, "");
+        PlatformSupport::traceEventBegin("v8.compile", node, "");
 #endif
         OwnPtr<v8::ScriptData> scriptData = precompileScript(code, source.cachedScript());
 
@@ -376,9 +376,9 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod
         // 1, whereas v8 starts at 0.
         v8::Handle<v8::Script> script = compileScript(code, source.url(), WTF::toZeroBasedTextPosition(source.startPosition()), scriptData.get());
 #if PLATFORM(CHROMIUM)
-        PlatformBridge::traceEventEnd("v8.compile", node, "");
+        PlatformSupport::traceEventEnd("v8.compile", node, "");
 
-        PlatformBridge::traceEventBegin("v8.run", node, "");
+        PlatformSupport::traceEventBegin("v8.run", node, "");
 #endif
         // Set inlineCode to true for <a href="javascript:doSomething()">
         // and false for <script>doSomething</script>. We make a rough guess at
@@ -386,7 +386,7 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod
         result = runScript(script, source.url().string().isNull());
     }
 #if PLATFORM(CHROMIUM)
-    PlatformBridge::traceEventEnd("v8.run", node, "");
+    PlatformSupport::traceEventEnd("v8.run", node, "");
 #endif
 
     InspectorInstrumentation::didEvaluateScript(cookie);
index 22d2683..f49396b 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef V8Proxy_h
 #define V8Proxy_h
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "SharedPersistent.h"
 #include "V8AbstractEventListener.h"
 #include "V8DOMWindowShell.h"
@@ -46,7 +46,7 @@
 #include <wtf/text/TextPosition.h>
 
 #if defined(ENABLE_DOM_STATS_COUNTERS) && PLATFORM(CHROMIUM)
-#define INC_STATS(name) PlatformBridge::incrementStatsCounter(name)
+#define INC_STATS(name) PlatformSupport::incrementStatsCounter(name)
 #else
 #define INC_STATS(name)
 #endif
index 0d61a9f..431e4e5 100644 (file)
@@ -36,7 +36,7 @@
 #include "InspectorFrontendClient.h"
 #include "InspectorFrontendHost.h"
 #if !PLATFORM(QT)
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #endif
 #include "PlatformString.h"
 
@@ -125,7 +125,7 @@ static v8::Handle<v8::Value> histogramEnumeration(const char* name, const v8::Ar
 
     int sample = args[0]->ToInt32()->Value();
     if (sample < boundaryValue)
-        PlatformBridge::histogramEnumeration(name, sample, boundaryValue);
+        PlatformSupport::histogramEnumeration(name, sample, boundaryValue);
 
     return v8::Undefined();
 }
index 81cc030..b00a37c 100644 (file)
@@ -39,7 +39,7 @@
 #include "StorageNamespace.h"
 
 #if PLATFORM(CHROMIUM)
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #endif
 
 namespace WebCore {
@@ -178,7 +178,7 @@ bool PageGroup::isLinkVisited(LinkHash visitedLinkHash)
 {
 #if PLATFORM(CHROMIUM)
     // Use Chromium's built-in visited link database.
-    return PlatformBridge::isLinkVisited(visitedLinkHash);
+    return PlatformSupport::isLinkVisited(visitedLinkHash);
 #else
     if (!m_visitedLinksPopulated) {
         m_visitedLinksPopulated = true;
index cc5b4fd..d5c5526 100644 (file)
@@ -29,7 +29,7 @@
 #include "AudioBus.h"
 
 #include "AudioFileReader.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
@@ -37,7 +37,7 @@ namespace WebCore {
 PassOwnPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, double sampleRate)
 {
     // FIXME: the sampleRate parameter is ignored. It should be removed from the API.
-    OwnPtr<AudioBus> audioBus = PlatformBridge::loadPlatformAudioResource(name, sampleRate);
+    OwnPtr<AudioBus> audioBus = PlatformSupport::loadPlatformAudioResource(name, sampleRate);
     if (!audioBus.get())
         return nullptr;
     
@@ -51,7 +51,7 @@ PassOwnPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, double sam
 PassOwnPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dataSize, bool mixToMono, double sampleRate)
 {
     // FIXME: the sampleRate parameter is ignored. It should be removed from the API.
-    OwnPtr<AudioBus> audioBus = PlatformBridge::decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
+    OwnPtr<AudioBus> audioBus = PlatformSupport::decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
     if (!audioBus.get())
         return nullptr;
       
index eadeaf6..a882e63 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "ClipboardMimeTypes.h"
 #include "Pasteboard.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
@@ -103,7 +103,7 @@ HashSet<String> ChromiumDataObject::types() const
 {
     if (m_clipboardType == Clipboard::CopyAndPaste) {
         bool ignoredContainsFilenames;
-        return PlatformBridge::clipboardReadAvailableTypes(PasteboardPrivate::StandardBuffer,
+        return PlatformSupport::clipboardReadAvailableTypes(PasteboardPrivate::StandardBuffer,
                                                            &ignoredContainsFilenames);
     }
 
@@ -134,7 +134,7 @@ String ChromiumDataObject::getData(const String& type, bool& success)
                 Pasteboard::generalPasteboard()->isSelectionMode() ?
                 PasteboardPrivate::SelectionBuffer :
                 PasteboardPrivate::StandardBuffer;
-            String text = PlatformBridge::clipboardReadPlainText(buffer);
+            String text = PlatformSupport::clipboardReadPlainText(buffer);
             success = !text.isEmpty();
             return text;
         }
@@ -160,7 +160,7 @@ String ChromiumDataObject::getData(const String& type, bool& success)
                 PasteboardPrivate::StandardBuffer;
             String htmlText;
             KURL sourceURL;
-            PlatformBridge::clipboardReadHTML(buffer, &htmlText, &sourceURL);
+            PlatformSupport::clipboardReadHTML(buffer, &htmlText, &sourceURL);
             success = !htmlText.isEmpty();
             return htmlText;
         }
@@ -228,7 +228,7 @@ bool ChromiumDataObject::setData(const String& type, const String& data)
 
 uint64_t ChromiumDataObject::getSequenceNumber()
 {
-    return PlatformBridge::clipboardGetSequenceNumber();
+    return PlatformSupport::clipboardGetSequenceNumber();
 }
 
 bool ChromiumDataObject::containsFilenames() const
@@ -236,7 +236,7 @@ bool ChromiumDataObject::containsFilenames() const
     bool containsFilenames;
     if (m_clipboardType == Clipboard::CopyAndPaste) {
         HashSet<String> ignoredResults =
-            PlatformBridge::clipboardReadAvailableTypes(PasteboardPrivate::StandardBuffer,
+            PlatformSupport::clipboardReadAvailableTypes(PasteboardPrivate::StandardBuffer,
                                                         &containsFilenames);
     } else
         containsFilenames = !m_filenames.isEmpty();
index 7cf871a..b37eca4 100644 (file)
@@ -37,7 +37,7 @@
 #include "Clipboard.h"
 #include "ClipboardChromium.h"
 #include "ClipboardMimeTypes.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "SharedBuffer.h"
 #include "StringCallback.h"
 
@@ -91,13 +91,13 @@ void DataTransferItemChromium::getAsString(PassRefPtr<StringCallback> callback)
     ASSERT(m_source == PasteboardSource);
     // This is ugly but there's no real alternative.
     if (type() == mimeTypeTextPlain) {
-        callback->scheduleCallback(m_context, PlatformBridge::clipboardReadPlainText(PasteboardPrivate::StandardBuffer));
+        callback->scheduleCallback(m_context, PlatformSupport::clipboardReadPlainText(PasteboardPrivate::StandardBuffer));
         return;
     }
     if (type() == mimeTypeTextHTML) {
         String html;
         KURL ignoredSourceURL;
-        PlatformBridge::clipboardReadHTML(PasteboardPrivate::StandardBuffer, &html, &ignoredSourceURL);
+        PlatformSupport::clipboardReadHTML(PasteboardPrivate::StandardBuffer, &html, &ignoredSourceURL);
         callback->scheduleCallback(m_context, html);
         return;
     }
@@ -123,7 +123,7 @@ PassRefPtr<Blob> DataTransferItemChromium::getAsFile()
         // method to the blob registry; that way the data is only copied over
         // into the renderer when it's actually read, not when the blob is
         // initially constructed).
-        RefPtr<SharedBuffer> data = PlatformBridge::clipboardReadImage(PasteboardPrivate::StandardBuffer);
+        RefPtr<SharedBuffer> data = PlatformSupport::clipboardReadImage(PasteboardPrivate::StandardBuffer);
         RefPtr<RawData> rawData = RawData::create();
         rawData->mutableData()->append(data->data(), data->size());
         OwnPtr<BlobData> blobData = BlobData::create();
index 9312505..09da8a4 100644 (file)
@@ -37,8 +37,8 @@
 #include "Frame.h"
 #include "KURL.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
 #include "PlatformString.h"
+#include "PlatformSupport.h"
 #include "markup.h"
 
 namespace WebCore {
@@ -63,7 +63,7 @@ String DragData::asURL(Frame*, FilenameConversionPolicy filenamePolicy, String*
         if (title)
             *title = m_platformDragData->urlTitle();
     } else if (filenamePolicy == ConvertFilenames && containsFiles()) {
-        url = PlatformBridge::filePathToURL(PlatformBridge::getAbsolutePath(m_platformDragData->filenames()[0]));
+        url = PlatformSupport::filePathToURL(PlatformSupport::getAbsolutePath(m_platformDragData->filenames()[0]));
     }
     return url;
 }
index 5e03c5b..c1abbbd 100644 (file)
 #include "FileSystem.h"
 
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
 #include "PlatformString.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
 bool deleteFile(const String& path)
 {
-    return PlatformBridge::deleteFile(path);
+    return PlatformSupport::deleteFile(path);
 }
 
 bool deleteEmptyDirectory(const String& path)
 {
-    return PlatformBridge::deleteEmptyDirectory(path);
+    return PlatformSupport::deleteEmptyDirectory(path);
 }
 
 bool getFileSize(const String& path, long long& result)
 {
-    return PlatformBridge::getFileSize(path, result);
+    return PlatformSupport::getFileSize(path, result);
 }
 
 bool getFileModificationTime(const String& path, time_t& result)
 {
-    return PlatformBridge::getFileModificationTime(path, result);
+    return PlatformSupport::getFileModificationTime(path, result);
 }
 
 void revealFolderInOS(const String& path)
 {
-    PlatformBridge::revealFolderInOS(path);
+    PlatformSupport::revealFolderInOS(path);
 }
 
 String directoryName(const String& path)
 {
-    return PlatformBridge::directoryName(path);
+    return PlatformSupport::directoryName(path);
 }
 
 String pathByAppendingComponent(const String& path, const String& component)
 {
-    return PlatformBridge::pathByAppendingComponent(path, component);
+    return PlatformSupport::pathByAppendingComponent(path, component);
 }
 
 bool makeAllDirectories(const String& path)
 {
-    return PlatformBridge::makeAllDirectories(path);
+    return PlatformSupport::makeAllDirectories(path);
 }
 
 bool fileExists(const String& path)
 {
-    return PlatformBridge::fileExists(path);
+    return PlatformSupport::fileExists(path);
 }
 
 PlatformFileHandle openFile(const String& path, FileOpenMode mode)
 {
-    return PlatformBridge::openFile(path, mode);
+    return PlatformSupport::openFile(path, mode);
 }
 
 void closeFile(PlatformFileHandle& handle)
 {
-    return PlatformBridge::closeFile(handle);
+    return PlatformSupport::closeFile(handle);
 }
 
 long long seekFile(PlatformFileHandle handle, long long offset, FileSeekOrigin origin)
 {
-    return PlatformBridge::seekFile(handle, offset, origin);
+    return PlatformSupport::seekFile(handle, offset, origin);
 }
 
 bool truncateFile(PlatformFileHandle handle, long long offset)
 {
-    return PlatformBridge::truncateFile(handle, offset);
+    return PlatformSupport::truncateFile(handle, offset);
 }
 
 int readFromFile(PlatformFileHandle handle, char* data, int length)
 {
-    return PlatformBridge::readFromFile(handle, data, length);
+    return PlatformSupport::readFromFile(handle, data, length);
 }
 
 int writeToFile(PlatformFileHandle handle, const char* data, int length)
 {
-    return PlatformBridge::writeToFile(handle, data, length);
+    return PlatformSupport::writeToFile(handle, data, length);
 }
 
 Vector<String> listDirectory(const String& path, const String& filter)
index fedc4d5..1da89a1 100644 (file)
@@ -31,8 +31,8 @@
 #include "config.h"
 #include "Language.h"
 
-#include "PlatformBridge.h"
 #include "PlatformString.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
@@ -40,7 +40,7 @@ String platformDefaultLanguage()
 {
     static String computedDefaultLanguage;
     if (computedDefaultLanguage.isEmpty())
-        computedDefaultLanguage = PlatformBridge::computedDefaultLanguage();
+        computedDefaultLanguage = PlatformSupport::computedDefaultLanguage();
     return computedDefaultLanguage;
 }
 
index 5e1ffa4..ff1a793 100644 (file)
 #include "config.h"
 #include "LinkHash.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
 LinkHash visitedLinkHash(const UChar* url, unsigned length)
 {
-    return PlatformBridge::visitedLinkHash(url, length);
+    return PlatformSupport::visitedLinkHash(url, length);
 }
 
 LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL)
 {
-    return PlatformBridge::visitedLinkHash(base, attributeURL);
+    return PlatformSupport::visitedLinkHash(base, attributeURL);
 }
 
 } // namespace WebCore
index b6c03a2..d20aca4 100644 (file)
 #include "MIMETypeRegistry.h"
 
 #include "MediaPlayer.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "PluginDataChromium.h"
 #include <wtf/text/CString.h>
 
 // NOTE: Unlike other ports, we don't use the shared implementation in
 // MIMETypeRegistry.cpp.  Instead, we need to route most functions via
-// the PlatformBridge to the embedder.
+// the PlatformSupport to the embedder.
 
 namespace WebCore {
 
 String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
 {
-    return PlatformBridge::mimeTypeForExtension(ext);
+    return PlatformSupport::mimeTypeForExtension(ext);
 }
 
 #if ENABLE(FILE_SYSTEM)
 String MIMETypeRegistry::getWellKnownMIMETypeForExtension(const String &ext)
 {
     // This method must be thread safe and should not consult the OS/registry.
-    return PlatformBridge::wellKnownMimeTypeForExtension(ext);
+    return PlatformSupport::wellKnownMimeTypeForExtension(ext);
 }
 #endif
 
@@ -63,7 +63,7 @@ String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& type)
     // FIXME: Is this really necessary??
     String mimeType = type.substring(0, static_cast<unsigned>(type.find(';')));
 
-    String ext = PlatformBridge::preferredExtensionForMIMEType(type);
+    String ext = PlatformSupport::preferredExtensionForMIMEType(type);
     if (!ext.isEmpty() && ext[0] == '.')
         ext = ext.substring(1);
 
@@ -89,7 +89,7 @@ String MIMETypeRegistry::getMIMETypeForPath(const String& path)
 
 bool MIMETypeRegistry::isSupportedImageMIMEType(const String& mimeType)
 { 
-    return PlatformBridge::isSupportedImageMIMEType(mimeType);
+    return PlatformSupport::isSupportedImageMIMEType(mimeType);
 }
 
 bool MIMETypeRegistry::isSupportedImageResourceMIMEType(const String& mimeType)
@@ -104,12 +104,12 @@ bool MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(const String& mimeTyp
 
 bool MIMETypeRegistry::isSupportedJavaScriptMIMEType(const String& mimeType)
 {
-    return PlatformBridge::isSupportedJavaScriptMIMEType(mimeType);
+    return PlatformSupport::isSupportedJavaScriptMIMEType(mimeType);
 }
     
 bool MIMETypeRegistry::isSupportedNonImageMIMEType(const String& mimeType)
 {
-    return PlatformBridge::isSupportedNonImageMIMEType(mimeType);
+    return PlatformSupport::isSupportedNonImageMIMEType(mimeType);
 }
 
 bool MIMETypeRegistry::isSupportedMediaMIMEType(const String& mimeType)
index dbfaa3b..6f56077 100644 (file)
@@ -41,7 +41,7 @@
 #include "Image.h"
 #include "KURL.h"
 #include "NativeImageSkia.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "Range.h"
 #include "RenderImage.h"
 #include "markup.h"
@@ -91,7 +91,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete,
 #endif
     replaceNBSPWithSpace(plainText);
 
-    PlatformBridge::clipboardWriteSelection(html, url, plainText, canSmartCopyOrDelete);
+    PlatformSupport::clipboardWriteSelection(html, url, plainText, canSmartCopyOrDelete);
 }
 
 void Pasteboard::writePlainText(const String& text)
@@ -99,9 +99,9 @@ void Pasteboard::writePlainText(const String& text)
 #if OS(WINDOWS)
     String plainText(text);
     replaceNewlinesWithWindowsStyleNewlines(plainText);
-    PlatformBridge::clipboardWritePlainText(plainText);
+    PlatformSupport::clipboardWritePlainText(plainText);
 #else
-    PlatformBridge::clipboardWritePlainText(text);
+    PlatformSupport::clipboardWritePlainText(text);
 #endif
 }
 
@@ -116,7 +116,7 @@ void Pasteboard::writeURL(const KURL& url, const String& titleStr, Frame* frame)
             title = url.host();
     }
 
-    PlatformBridge::clipboardWriteURL(url, title);
+    PlatformSupport::clipboardWriteURL(url, title);
 }
 
 void Pasteboard::writeImage(Node* node, const KURL&, const String& title)
@@ -152,17 +152,17 @@ void Pasteboard::writeImage(Node* node, const KURL&, const String& title)
     }
     KURL url = urlString.isEmpty() ? KURL() : node->document()->completeURL(stripLeadingAndTrailingHTMLSpaces(urlString));
 
-    PlatformBridge::clipboardWriteImage(bitmap, url, title);
+    PlatformSupport::clipboardWriteImage(bitmap, url, title);
 }
 
 bool Pasteboard::canSmartReplace()
 {
-    return PlatformBridge::clipboardIsFormatAvailable(PasteboardPrivate::WebSmartPasteFormat, m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer);
+    return PlatformSupport::clipboardIsFormatAvailable(PasteboardPrivate::WebSmartPasteFormat, m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer);
 }
 
 String Pasteboard::plainText(Frame* frame)
 {
-    return PlatformBridge::clipboardReadPlainText(m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer);
+    return PlatformSupport::clipboardReadPlainText(m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer);
 }
 
 PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefPtr<Range> context, bool allowPlainText, bool& chosePlainText)
@@ -170,10 +170,10 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP
     chosePlainText = false;
     PasteboardPrivate::ClipboardBuffer buffer = m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer;
 
-    if (PlatformBridge::clipboardIsFormatAvailable(PasteboardPrivate::HTMLFormat, buffer)) {
+    if (PlatformSupport::clipboardIsFormatAvailable(PasteboardPrivate::HTMLFormat, buffer)) {
         String markup;
         KURL srcURL;
-        PlatformBridge::clipboardReadHTML(buffer, &markup, &srcURL);
+        PlatformSupport::clipboardReadHTML(buffer, &markup, &srcURL);
 
         RefPtr<DocumentFragment> fragment =
             createFragmentFromMarkup(frame->document(), markup, srcURL, FragmentScriptingNotAllowed);
@@ -182,7 +182,7 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP
     }
 
     if (allowPlainText) {
-        String markup = PlatformBridge::clipboardReadPlainText(buffer);
+        String markup = PlatformSupport::clipboardReadPlainText(buffer);
         if (!markup.isEmpty()) {
             chosePlainText = true;
 
index 35d5018..a7a7811 100644 (file)
 #include "PlatformScreen.h"
 
 #include "IntRect.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
 int screenDepth(Widget* widget)
 {
-    return PlatformBridge::screenDepth(widget);
+    return PlatformSupport::screenDepth(widget);
 }
 
 int screenDepthPerComponent(Widget* widget)
 {
-    return PlatformBridge::screenDepthPerComponent(widget);
+    return PlatformSupport::screenDepthPerComponent(widget);
 }
 
 bool screenIsMonochrome(Widget* widget)
 {
-    return PlatformBridge::screenIsMonochrome(widget);
+    return PlatformSupport::screenIsMonochrome(widget);
 }
 
 FloatRect screenRect(Widget* widget)
 {
-    return PlatformBridge::screenRect(widget);
+    return PlatformSupport::screenRect(widget);
 }
 
 FloatRect screenAvailableRect(Widget* widget)
 {
-    return PlatformBridge::screenAvailableRect(widget);
+    return PlatformSupport::screenAvailableRect(widget);
 }
 
 } // namespace WebCore
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PlatformBridge_h
-#define PlatformBridge_h
+#ifndef PlatformSupport_h
+#define PlatformSupport_h
 
 #if ENABLE(WEB_AUDIO)
 #include "AudioBus.h"
@@ -85,10 +85,11 @@ class Widget;
 struct Cookie;
 struct FontRenderStyle;
 
-// An interface to the embedding layer, which has the ability to answer
-// questions about the system and so on...
+// PlatformSupport an interface to the embedding layer that lets the embedder
+// supply implementations for Platform functionality that WebCore cannot access
+// directly (for example, because WebCore is in a sandbox).
 
-class PlatformBridge {
+class PlatformSupport {
 public:
     // Cache --------------------------------------------------------------
     static void cacheMetadata(const KURL&, double responseTime, const Vector<char>&);
index 6467764..406af1e 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SSLKeyGenerator.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "PlatformString.h"
 
 namespace WebCore {
@@ -47,13 +47,9 @@ void getSupportedKeySizes(Vector<String>& sizes)
     sizes[1] = keygenMenuMediumGradeKeySize();
 }
 
-String signedPublicKeyAndChallengeString(unsigned keySizeIndex,
-                                         const String& challengeString,
-                                         const KURL& url)
+String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& challengeString, const KURL& url)
 {
-    return PlatformBridge::signedPublicKeyAndChallengeString(keySizeIndex,
-                                                             challengeString,
-                                                             url);
+    return PlatformSupport::signedPublicKeyAndChallengeString(keySizeIndex, challengeString, url);
 }
 
 } // namespace WebCore
index 843fc3c..24b3e18 100644 (file)
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "ScrollbarThemeChromium.h"
 
-#include "PlatformBridge.h"
 #include "PlatformMouseEvent.h"
 #include "ScrollableArea.h"
 #include "Scrollbar.h"
index e173dff..ea34a14 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "ScrollbarThemeChromiumLinux.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "PlatformMouseEvent.h"
 #include "Scrollbar.h"
 
@@ -46,22 +46,22 @@ ScrollbarTheme* ScrollbarTheme::nativeTheme()
 int ScrollbarThemeChromiumLinux::scrollbarThickness(ScrollbarControlSize controlSize)
 {
     // Horiz and Vert scrollbars are the same thickness.
-    IntSize scrollbarSize = PlatformBridge::getThemePartSize(PlatformBridge::PartScrollbarVerticalTrack);
+    IntSize scrollbarSize = PlatformSupport::getThemePartSize(PlatformSupport::PartScrollbarVerticalTrack);
     return scrollbarSize.width();
 }
 
 void ScrollbarThemeChromiumLinux::paintTrackPiece(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect, ScrollbarPart partType)
 {
-    PlatformBridge::ThemePaintState state = scrollbar->hoveredPart() == partType ? PlatformBridge::StateHover : PlatformBridge::StateNormal;
+    PlatformSupport::ThemePaintState state = scrollbar->hoveredPart() == partType ? PlatformSupport::StateHover : PlatformSupport::StateNormal;
     IntRect alignRect = trackRect(scrollbar, false);
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.scrollbarTrack.trackX = alignRect.x();
     extraParams.scrollbarTrack.trackY = alignRect.y();
     extraParams.scrollbarTrack.trackWidth = alignRect.width();
     extraParams.scrollbarTrack.trackHeight = alignRect.height();
-    PlatformBridge::paintThemePart(
+    PlatformSupport::paintThemePart(
         gc,
-        scrollbar->orientation() == HorizontalScrollbar ? PlatformBridge::PartScrollbarHorizontalTrack : PlatformBridge::PartScrollbarVerticalTrack,
+        scrollbar->orientation() == HorizontalScrollbar ? PlatformSupport::PartScrollbarHorizontalTrack : PlatformSupport::PartScrollbarVerticalTrack,
         state,
         rect,
         &extraParams);
@@ -69,52 +69,52 @@ void ScrollbarThemeChromiumLinux::paintTrackPiece(GraphicsContext* gc, Scrollbar
 
 void ScrollbarThemeChromiumLinux::paintButton(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect, ScrollbarPart part)
 {
-    PlatformBridge::ThemePart paintPart;
-    PlatformBridge::ThemePaintState state = PlatformBridge::StateNormal;
+    PlatformSupport::ThemePart paintPart;
+    PlatformSupport::ThemePaintState state = PlatformSupport::StateNormal;
     bool checkMin = false;
     bool checkMax = false;
     if (scrollbar->orientation() == HorizontalScrollbar) {
         if (part == BackButtonStartPart) {
-            paintPart = PlatformBridge::PartScrollbarLeftArrow;
+            paintPart = PlatformSupport::PartScrollbarLeftArrow;
             checkMin = true;
         } else {
-            paintPart = PlatformBridge::PartScrollbarRightArrow;
+            paintPart = PlatformSupport::PartScrollbarRightArrow;
             checkMax = true;
         }
     } else {
         if (part == BackButtonStartPart) {
-            paintPart = PlatformBridge::PartScrollbarUpArrow;
+            paintPart = PlatformSupport::PartScrollbarUpArrow;
             checkMin = true;
         } else {
-            paintPart = PlatformBridge::PartScrollbarDownArrow;
+            paintPart = PlatformSupport::PartScrollbarDownArrow;
             checkMax = true;
         }
     }
     if ((checkMin && (scrollbar->currentPos() <= 0))
         || (checkMax && scrollbar->currentPos() == scrollbar->maximum())) {
-        state = PlatformBridge::StateDisabled;
+        state = PlatformSupport::StateDisabled;
     } else {
         if (part == scrollbar->pressedPart())
-            state = PlatformBridge::StatePressed;
+            state = PlatformSupport::StatePressed;
         else if (part == scrollbar->hoveredPart())
-            state = PlatformBridge::StateHover;
+            state = PlatformSupport::StateHover;
     }
-    PlatformBridge::paintThemePart(gc, paintPart, state, rect, 0);
+    PlatformSupport::paintThemePart(gc, paintPart, state, rect, 0);
 }
 
 void ScrollbarThemeChromiumLinux::paintThumb(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect)
 {
-    PlatformBridge::ThemePaintState state;
+    PlatformSupport::ThemePaintState state;
 
     if (scrollbar->pressedPart() == ThumbPart)
-        state = PlatformBridge::StatePressed;
+        state = PlatformSupport::StatePressed;
     else if (scrollbar->hoveredPart() == ThumbPart)
-        state = PlatformBridge::StateHover;
+        state = PlatformSupport::StateHover;
     else
-        state = PlatformBridge::StateNormal;
-    PlatformBridge::paintThemePart(
+        state = PlatformSupport::StateNormal;
+    PlatformSupport::paintThemePart(
         gc,
-        scrollbar->orientation() == HorizontalScrollbar ? PlatformBridge::PartScrollbarHorizontalThumb : PlatformBridge::PartScrollbarVerticalThumb,
+        scrollbar->orientation() == HorizontalScrollbar ? PlatformSupport::PartScrollbarHorizontalThumb : PlatformSupport::PartScrollbarVerticalThumb,
         state,
         rect,
         0);
@@ -128,23 +128,23 @@ bool ScrollbarThemeChromiumLinux::shouldCenterOnThumb(Scrollbar*, const Platform
 IntSize ScrollbarThemeChromiumLinux::buttonSize(Scrollbar* scrollbar)
 {
     if (scrollbar->orientation() == VerticalScrollbar) {
-        IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartScrollbarUpArrow);
+        IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartScrollbarUpArrow);
         return IntSize(size.width(), scrollbar->height() < 2 * size.height() ? scrollbar->height() / 2 : size.height());
     }
 
     // HorizontalScrollbar
-    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartScrollbarLeftArrow);
+    IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartScrollbarLeftArrow);
     return IntSize(scrollbar->width() < 2 * size.width() ? scrollbar->width() / 2 : size.width(), size.height());
 }
 
 int ScrollbarThemeChromiumLinux::minimumThumbLength(Scrollbar* scrollbar)
 {
     if (scrollbar->orientation() == VerticalScrollbar) {
-        IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartScrollbarVerticalThumb);
+        IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartScrollbarVerticalThumb);
         return size.height();
     }
 
-    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartScrollbarHorizontalThumb);
+    IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartScrollbarHorizontalThumb);
     return size.width();
 }
 
index e74b612..472343d 100644 (file)
@@ -32,8 +32,8 @@
 #include "Gradient.h"
 #include "ImageBuffer.h"
 #include "LocalCurrentGraphicsContext.h"
-#include "PlatformBridge.h"
 #include "PlatformMouseEvent.h"
+#include "PlatformSupport.h"
 #include "ScrollAnimatorChromiumMac.h"
 #include "ScrollView.h"
 #include <Carbon/Carbon.h>
@@ -456,16 +456,16 @@ static int scrollbarPartToHIPressedState(ScrollbarPart part)
     }
 }
 
-static PlatformBridge::ThemePaintState scrollbarStateToThemeState(Scrollbar* scrollbar)
+static PlatformSupport::ThemePaintState scrollbarStateToThemeState(Scrollbar* scrollbar)
 {
     if (!scrollbar->enabled())
-        return PlatformBridge::StateDisabled;
+        return PlatformSupport::StateDisabled;
     if (!scrollbar->scrollableArea()->isActive())
-        return PlatformBridge::StateInactive;
+        return PlatformSupport::StateInactive;
     if (scrollbar->pressedPart() == ThumbPart)
-        return PlatformBridge::StatePressed;
+        return PlatformSupport::StatePressed;
 
-    return PlatformBridge::StateActive;
+    return PlatformSupport::StateActive;
 }
 
 void ScrollbarThemeChromiumMac::updateEnabledState(Scrollbar* scrollbar)
@@ -622,18 +622,18 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
     paintGivenTickmarks(drawingContext, scrollbar, tickmarkTrackRect, tickmarks);
 
     if (hasThumb(scrollbar)) {
-        PlatformBridge::ThemePaintScrollbarInfo scrollbarInfo;
-        scrollbarInfo.orientation = scrollbar->orientation() == HorizontalScrollbar ? PlatformBridge::ScrollbarOrientationHorizontal : PlatformBridge::ScrollbarOrientationVertical;
-        scrollbarInfo.parent = scrollbar->parent() && scrollbar->parent()->isFrameView() && static_cast<FrameView*>(scrollbar->parent())->isScrollViewScrollbar(scrollbar) ? PlatformBridge::ScrollbarParentScrollView : PlatformBridge::ScrollbarParentRenderLayer;
+        PlatformSupport::ThemePaintScrollbarInfo scrollbarInfo;
+        scrollbarInfo.orientation = scrollbar->orientation() == HorizontalScrollbar ? PlatformSupport::ScrollbarOrientationHorizontal : PlatformSupport::ScrollbarOrientationVertical;
+        scrollbarInfo.parent = scrollbar->parent() && scrollbar->parent()->isFrameView() && static_cast<FrameView*>(scrollbar->parent())->isScrollViewScrollbar(scrollbar) ? PlatformSupport::ScrollbarParentScrollView : PlatformSupport::ScrollbarParentRenderLayer;
         scrollbarInfo.maxValue = scrollbar->maximum();
         scrollbarInfo.currentValue = scrollbar->currentPos();
         scrollbarInfo.visibleSize = scrollbar->visibleSize();
         scrollbarInfo.totalSize = scrollbar->totalSize();
 
-        PlatformBridge::paintScrollbarThumb(
+        PlatformSupport::paintScrollbarThumb(
             drawingContext,
             scrollbarStateToThemeState(scrollbar),
-            scrollbar->controlSize() == RegularScrollbar ? PlatformBridge::SizeRegular : PlatformBridge::SizeSmall,
+            scrollbar->controlSize() == RegularScrollbar ? PlatformSupport::SizeRegular : PlatformSupport::SizeSmall,
             scrollbar->frameRect(),
             scrollbarInfo);
     }
index 7229c51..8605637 100644 (file)
@@ -31,9 +31,9 @@
 #include <vsstyle.h>
 
 #include "GraphicsContext.h"
-#include "PlatformBridge.h"
 #include "PlatformContextSkia.h"
 #include "PlatformMouseEvent.h"
+#include "PlatformSupport.h"
 #include "Scrollbar.h"
 #include "SystemInfo.h"
 
@@ -61,7 +61,7 @@ int ScrollbarThemeChromiumWin::scrollbarThickness(ScrollbarControlSize controlSi
 {
     static int thickness;
     if (!thickness) {
-        if (PlatformBridge::layoutTestMode())
+        if (PlatformSupport::layoutTestMode())
             return kMacScrollbarSize[controlSize];
         thickness = GetSystemMetrics(SM_CXVSCROLL);
     }
@@ -104,7 +104,7 @@ void ScrollbarThemeChromiumWin::paintTrackPiece(GraphicsContext* gc, Scrollbar*
     IntRect alignRect = trackRect(scrollbar, false);
 
     // Draw the track area before/after the thumb on the scroll bar.
-    PlatformBridge::paintScrollbarTrack(
+    PlatformSupport::paintScrollbarTrack(
         gc,
         partId,
         getThemeState(scrollbar, partType),
@@ -124,7 +124,7 @@ void ScrollbarThemeChromiumWin::paintButton(GraphicsContext* gc, Scrollbar* scro
         partId = horz ? DFCS_SCROLLRIGHT : DFCS_SCROLLDOWN;
 
     // Draw the thumb (the box you drag in the scroll bar to scroll).
-    PlatformBridge::paintScrollbarArrow(
+    PlatformSupport::paintScrollbarArrow(
         gc,
         getThemeArrowState(scrollbar, part),
         partId | getClassicThemeState(scrollbar, part),
@@ -136,7 +136,7 @@ void ScrollbarThemeChromiumWin::paintThumb(GraphicsContext* gc, Scrollbar* scrol
     bool horz = scrollbar->orientation() == HorizontalScrollbar;
 
     // Draw the thumb (the box you drag in the scroll bar to scroll).
-    PlatformBridge::paintScrollbarThumb(
+    PlatformSupport::paintScrollbarThumb(
         gc,
         horz ? SBP_THUMBBTNHORZ : SBP_THUMBBTNVERT,
         getThemeState(scrollbar, ThumbPart),
@@ -144,7 +144,7 @@ void ScrollbarThemeChromiumWin::paintThumb(GraphicsContext* gc, Scrollbar* scrol
         rect);
 
     // Draw the gripper (the three little lines on the thumb).
-    PlatformBridge::paintScrollbarThumb(
+    PlatformSupport::paintScrollbarThumb(
         gc,
         horz ? SBP_GRIPPERHORZ : SBP_GRIPPERVERT,
         getThemeState(scrollbar, ThumbPart),
@@ -256,7 +256,7 @@ IntSize ScrollbarThemeChromiumWin::buttonSize(Scrollbar* scrollbar)
     // test mode so that should be enough to result in repeatable results, but
     // preserving this hack avoids having to rebaseline pixel tests.
     const int kLayoutTestModeGirth = 17;
-    int girth = PlatformBridge::layoutTestMode() ? kLayoutTestModeGirth : thickness;
+    int girth = PlatformSupport::layoutTestMode() ? kLayoutTestModeGirth : thickness;
 
     if (scrollbar->orientation() == HorizontalScrollbar) {
         int width = scrollbar->width() < 2 * girth ? scrollbar->width() / 2 : girth;
index e091f55..8d7c766 100644 (file)
 #include "config.h"
 #include "SharedTimer.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
 void setSharedTimerFiredFunction(void (*f)())
 {                   
-    PlatformBridge::setSharedTimerFiredFunction(f);
+    PlatformSupport::setSharedTimerFiredFunction(f);
 }
 
 void setSharedTimerFireInterval(double fireTime)
 {
-    PlatformBridge::setSharedTimerFireInterval(fireTime);
+    PlatformSupport::setSharedTimerFireInterval(fireTime);
 }
 
 void stopSharedTimer()
 {
-    PlatformBridge::stopSharedTimer();
+    PlatformSupport::stopSharedTimer();
 }
 
 } // namespace WebCore
index 06cc738..cc77c89 100644 (file)
 #include "config.h"
 #include "SuddenTermination.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
 void disableSuddenTermination()
 {
-    PlatformBridge::suddenTerminationChanged(false);
+    PlatformSupport::suddenTerminationChanged(false);
 }
 
 void enableSuddenTermination()
 {
-    PlatformBridge::suddenTerminationChanged(true);
+    PlatformSupport::suddenTerminationChanged(true);
 }
 
 } // namespace WebCore
index c23f284..db8c74b 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef TraceEvent_h
 #define TraceEvent_h
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include <wtf/OwnArrayPtr.h>
 
 // Implementation detail: trace event macros create temporary variables
@@ -35,7 +35,7 @@
 #define TRACE_EVENT_MAKE_UNIQUE_IDENTIFIER2(a, b) TRACE_EVENT_MAKE_UNIQUE_IDENTIFIER3(a, b)
 #define TRACE_EVENT_MAKE_UNIQUE_IDENTIFIER(name_prefix) TRACE_EVENT_MAKE_UNIQUE_IDENTIFIER2(name_prefix, __LINE__)
 
-// Issues PlatformBridge::traceEventBegin and traceEventEnd calls for the enclosing scope
+// Issues PlatformSupport::traceEventBegin and traceEventEnd calls for the enclosing scope
 #define TRACE_EVENT(name, id, extra) WebCore::internal::ScopeTracer TRACE_EVENT_MAKE_UNIQUE_IDENTIFIER(__traceEventScope)(name, id, extra);
 
 namespace WebCore {
@@ -58,14 +58,14 @@ inline ScopeTracer::ScopeTracer(const char* name, void* id, const char* extra)
     : m_name(name)
     , m_id(id)
 {
-    PlatformBridge::traceEventBegin(name, id, extra); \
+    PlatformSupport::traceEventBegin(name, id, extra); \
     if (extra)
         m_extra = adoptArrayPtr(strdup(extra));
 }
 
 inline ScopeTracer::~ScopeTracer()
 {
-    PlatformBridge::traceEventEnd(m_name, m_id, m_extra.get());
+    PlatformSupport::traceEventEnd(m_name, m_id, m_extra.get());
 }
 
 } // namespace internal
index 59c2cca..e56ab6b 100644 (file)
@@ -37,7 +37,7 @@
 #include "LayerPainterChromium.h"
 #include "LayerRendererChromium.h"
 #include "LayerTextureUpdaterCanvas.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "cc/CCLayerTreeHost.h"
 #include <wtf/CurrentTime.h>
 
@@ -59,8 +59,8 @@ public:
         m_owner->paintGraphicsLayerContents(context, contentRect);
         double paintEnd = currentTime();
         double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart);
-        PlatformBridge::histogramCustomCounts("Renderer4.AccelContentPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
-        PlatformBridge::histogramCustomCounts("Renderer4.AccelContentPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
+        PlatformSupport::histogramCustomCounts("Renderer4.AccelContentPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
+        PlatformSupport::histogramCustomCounts("Renderer4.AccelContentPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
     }
 private:
     explicit ContentLayerPainter(GraphicsLayerChromium* owner)
index f10ad9a..6abe3d6 100644 (file)
@@ -30,7 +30,7 @@
 #import "CrossProcessFontLoading.h"
 
 #import "../graphics/FontPlatformData.h"
-#import "PlatformBridge.h"
+#import "PlatformSupport.h"
 #import <AppKit/NSFont.h>
 #import <wtf/HashMap.h>
 
@@ -135,7 +135,7 @@ PassRefPtr<MemoryActivatedFont> loadFontFromBrowserProcess(NSFont* nsFont)
     ATSFontContainerRef container;
     uint32_t fontID;
     // Send cross-process request to load font.
-    if (!PlatformBridge::loadFont(nsFont, &container, &fontID))
+    if (!PlatformSupport::loadFont(nsFont, &container, &fontID))
         return 0;
 
     // Now that we have the fontID from the browser process, we can consult
@@ -144,7 +144,7 @@ PassRefPtr<MemoryActivatedFont> loadFontFromBrowserProcess(NSFont* nsFont)
     if (font) {
         // We can safely discard the new container since we already have the
         // font in our cache.
-        // FIXME: PlatformBridge::loadFont() should consult the id cache
+        // FIXME: PlatformSupport::loadFont() should consult the id cache
         // before activating the font.  Then we can save this activate/deactive
         // dance altogether.
         ATSFontDeactivate(container, 0, kATSOptionFlagsDefault);
index ee9fdfc..52d1064 100644 (file)
@@ -36,7 +36,7 @@
 #include "FontUtilsChromiumWin.h"
 #include "HashMap.h"
 #include "HashSet.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "SimpleFontData.h"
 #include <unicode/uniset.h>
 #include <wtf/text/StringHash.h>
@@ -288,7 +288,7 @@ static bool fontContainsCharacter(const FontPlatformData* fontData,
     HDC hdc = GetDC(0);
     HGDIOBJ oldFont = static_cast<HFONT>(SelectObject(hdc, hfont));
     int count = GetFontUnicodeRanges(hdc, 0);
-    if (!count && PlatformBridge::ensureFontLoaded(hfont))
+    if (!count && PlatformSupport::ensureFontLoaded(hfont))
         count = GetFontUnicodeRanges(hdc, 0);
     if (!count) {
         LOG_ERROR("Unable to get the font unicode range after second attempt");
@@ -362,7 +362,7 @@ static void FillLogFont(const FontDescription& fontDescription, LOGFONT* winfont
     winfont->lfStrikeOut = false;
     winfont->lfCharSet = DEFAULT_CHARSET;
     winfont->lfOutPrecision = OUT_TT_ONLY_PRECIS;
-    winfont->lfQuality = PlatformBridge::layoutTestMode() ? NONANTIALIASED_QUALITY : DEFAULT_QUALITY; // Honor user's desktop settings.
+    winfont->lfQuality = PlatformSupport::layoutTestMode() ? NONANTIALIASED_QUALITY : DEFAULT_QUALITY; // Honor user's desktop settings.
     winfont->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
     winfont->lfItalic = fontDescription.italic();
     winfont->lfWeight = toGDIFontWeight(fontDescription.weight());
index 350e7f4..794adf6 100644 (file)
@@ -36,7 +36,7 @@
 #include "FontPlatformData.h"
 #include "Logging.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "SimpleFontData.h"
 
 #include "SkPaint.h"
@@ -59,7 +59,7 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font,
                                                           int length)
 {
     icu::Locale locale = icu::Locale::getDefault();
-    String family = PlatformBridge::getFontFamilyForCharacters(characters, length, locale.getLanguage());
+    String family = PlatformSupport::getFontFamilyForCharacters(characters, length, locale.getLanguage());
     if (family.isEmpty())
         return 0;
 
index dd44162..cdecc53 100644 (file)
@@ -35,7 +35,7 @@
 #include "FontFallbackList.h"
 #include "GlyphBuffer.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "PlatformContextSkia.h"
 #include "SimpleFontData.h"
 #include "SkiaFontWin.h"
@@ -431,7 +431,7 @@ static void drawGlyphsWin(GraphicsContext* graphicsContext,
             success = painter.drawGlyphs(curLen, &glyphs[0], &advances[0], horizontalOffset - point.x() - currentWidth);
             if (!success && executions == 0) {
                 // Ask the browser to load the font for us and retry.
-                PlatformBridge::ensureFontLoaded(font->platformData().hfont());
+                PlatformSupport::ensureFontLoaded(font->platformData().hfont());
                 continue;
             }
             break;
index b4391b2..f5279aa 100644 (file)
 #include "config.h"
 #include "FontPlatformData.h"
 
-#include <windows.h>
-#include <objidl.h>
 #include <mlang.h>
-
-#include "PlatformBridge.h"
+#include <objidl.h>
+#include <windows.h>
+#include "PlatformSupport.h"
 #include "SkiaFontWin.h"
 
 namespace WebCore {
@@ -135,7 +134,7 @@ SCRIPT_FONTPROPERTIES* FontPlatformData::scriptFontProperties() const
             HRESULT hr = ScriptGetFontProperties(dc, scriptCache(),
                                                  m_scriptFontProperties);
             if (S_OK != hr) {
-                if (PlatformBridge::ensureFontLoaded(hfont())) {
+                if (PlatformSupport::ensureFontLoaded(hfont())) {
                     // FIXME: Handle gracefully the error if this call also fails.
                     hr = ScriptGetFontProperties(dc, scriptCache(),
                                                  m_scriptFontProperties);
index b2a3ecc..9f6ab47 100644 (file)
@@ -32,7 +32,7 @@
 #include "FontPlatformData.h"
 
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "PlatformString.h"
 
 #include "SkAdvancedTypefaceMetrics.h"
@@ -245,7 +245,7 @@ void FontPlatformData::querySystemForRenderStyle()
         return;
     }
 
-    PlatformBridge::getRenderStyleForStrike(m_family.data(), (((int)m_textSize) << 2) | (m_typeface->style() & 3), &m_style);
+    PlatformSupport::getRenderStyleForStrike(m_family.data(), (((int)m_textSize) << 2) | (m_typeface->style() & 3), &m_style);
 }
 
 }  // namespace WebCore
index cfc1754..f5ab221 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "Font.h"
 #include "GlyphPageTreeNode.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "SimpleFontData.h"
 #include "SystemInfo.h"
 #include "UniscribeHelperTextRun.h"
@@ -80,7 +80,7 @@ static bool fillBMPGlyphs(unsigned offset,
         ReleaseDC(0, dc);
 
         if (recurse) {
-            if (PlatformBridge::ensureFontLoaded(fontData->platformData().hfont()))
+            if (PlatformSupport::ensureFontLoaded(fontData->platformData().hfont()))
                 return fillBMPGlyphs(offset, length, buffer, page, fontData, false);
 
             fillEmptyGlyphs(page);
index e2b6f7a..c8a7ef5 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "Image.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
@@ -39,7 +39,7 @@ namespace WebCore {
 
 PassRefPtr<Image> Image::loadPlatformResource(const char *name)
 {
-    return PlatformBridge::loadPlatformImageResource(name);
+    return PlatformSupport::loadPlatformImageResource(name);
 }
 
 } // namespace WebCore
index f003894..a6bbe34 100644 (file)
 #include "BitmapImage.h"
 
 #include "Image.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
 PassRefPtr<Image> Image::loadPlatformResource(const char* name)
 {
-    return PlatformBridge::loadPlatformImageResource(name);
+    return PlatformSupport::loadPlatformImageResource(name);
 }
 
 // FIXME: These are temporary stubs, we need real implementations which
index a6a27a9..78ad56a 100644 (file)
@@ -36,7 +36,7 @@
 #include "Font.h"
 #include "FontCache.h"
 #include "FontDescription.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include <wtf/MathExtras.h>
 
 #include <unicode/uchar.h>
@@ -60,7 +60,7 @@ void SimpleFontData::platformInit()
 
     TEXTMETRIC textMetric = {0};
     if (!GetTextMetrics(dc, &textMetric)) {
-        if (PlatformBridge::ensureFontLoaded(m_platformData.hfont())) {
+        if (PlatformSupport::ensureFontLoaded(m_platformData.hfont())) {
             // Retry GetTextMetrics.
             // FIXME: Handle gracefully the error if this call also fails.
             // See http://crbug.com/6401.
@@ -154,7 +154,7 @@ void SimpleFontData::determinePitch()
     // is *not* fixed pitch.  Unbelievable but true.
     TEXTMETRIC textMetric = {0};
     if (!GetTextMetrics(dc, &textMetric)) {
-        if (PlatformBridge::ensureFontLoaded(m_platformData.hfont())) {
+        if (PlatformSupport::ensureFontLoaded(m_platformData.hfont())) {
             // Retry GetTextMetrics.
             // FIXME: Handle gracefully the error if this call also fails.
             // See http://crbug.com/6401.
@@ -185,7 +185,7 @@ float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
     int width = 0;
     if (!GetCharWidthI(dc, glyph, 1, 0, &width)) {
         // Ask the browser to preload the font and retry.
-        if (PlatformBridge::ensureFontLoaded(m_platformData.hfont())) {
+        if (PlatformSupport::ensureFontLoaded(m_platformData.hfont())) {
             // FIXME: Handle gracefully the error if this call also fails.
             // See http://crbug.com/6401.
             if (!GetCharWidthI(dc, glyph, 1, 0, &width))
index 8e0bc04..16503e8 100644 (file)
@@ -32,7 +32,7 @@
 #include "UniscribeHelperTextRun.h"
 
 #include "Font.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "SimpleFontData.h"
 #include "TextRun.h"
 
@@ -81,7 +81,7 @@ void UniscribeHelperTextRun::tryToPreloadFont(HFONT font)
     // Ask the browser to get the font metrics for this font.
     // That will preload the font and it should now be accessible
     // from the renderer.
-    PlatformBridge::ensureFontLoaded(font);
+    PlatformSupport::ensureFontLoaded(font);
 }
 
 bool UniscribeHelperTextRun::nextWinFontData(
index cb7bf2d..5a0491d 100644 (file)
@@ -36,7 +36,7 @@
 #if OS(WINDOWS)
 #include "Base64.h"
 #include "OpenTypeUtilities.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #elif OS(UNIX) || PLATFORM(BREWMP)
 #include "SkStream.h"
 #endif
@@ -92,7 +92,7 @@ FontPlatformData FontCustomPlatformData::fontPlatformData(int size, bool bold, b
     logFont.lfStrikeOut = false;
     logFont.lfCharSet = DEFAULT_CHARSET;
     logFont.lfOutPrecision = OUT_TT_ONLY_PRECIS;
-    logFont.lfQuality = PlatformBridge::layoutTestMode() ?
+    logFont.lfQuality = PlatformSupport::layoutTestMode() ?
                         NONANTIALIASED_QUALITY :
                         DEFAULT_QUALITY; // Honor user's desktop settings.
     logFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
index 779fe45..b71a0a6 100644 (file)
 
 #include "Cookie.h"
 #include "Document.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
 void setCookies(Document* document, const KURL& url, const String& value)
 {
-    PlatformBridge::setCookies(document, url, value);
+    PlatformSupport::setCookies(document, url, value);
 }
 
 String cookies(const Document* document, const KURL& url)
 {
-    return PlatformBridge::cookies(document, url);
+    return PlatformSupport::cookies(document, url);
 }
 
 String cookieRequestHeaderFieldValue(const Document* document, const KURL& url)
 {
-    return PlatformBridge::cookieRequestHeaderFieldValue(document, url);
+    return PlatformSupport::cookieRequestHeaderFieldValue(document, url);
 }
 
 bool cookiesEnabled(const Document* document)
 {
-    return PlatformBridge::cookiesEnabled(document);
+    return PlatformSupport::cookiesEnabled(document);
 }
 
 bool getRawCookies(const Document* document, const KURL& url, Vector<Cookie>& rawCookies)
 {
-    return PlatformBridge::rawCookies(document, url, rawCookies);
+    return PlatformSupport::rawCookies(document, url, rawCookies);
 }
 
 void deleteCookie(const Document* document, const KURL& url, const String& cookieName)
 {
-    return PlatformBridge::deleteCookie(document, url, cookieName);
+    return PlatformSupport::deleteCookie(document, url, cookieName);
 }
 
 void getHostnamesWithCookies(HashSet<String>& hostnames)
index 7b9eac5..59714e3 100644 (file)
 #include "config.h"
 #include "DNS.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "ResourceHandle.h"
 
 namespace WebCore {
 
 void prefetchDNS(const String& hostname)
 {
-    PlatformBridge::prefetchDNS(hostname);
+    PlatformSupport::prefetchDNS(hostname);
 }
 
 void ResourceHandle::prepareForURL(const KURL& url)
similarity index 91%
rename from Source/WebCore/platform/qt/PlatformBridge.h
rename to Source/WebCore/platform/qt/PlatformSupport.h
index 9647507..629a4e3 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PlatformBridge_h
-#define PlatformBridge_h
+#ifndef PlatformSupport_h
+#define PlatformSupport_h
 
 #include "KURL.h"
 #include "PlatformString.h"
@@ -84,11 +84,9 @@ namespace WebCore {
 
 class Widget;
 
-// An interface to the embedding layer, which has the ability to answer
-// questions about the system and so on...
-// This is very similar to chromium/PlatformBridge and the two are likely to converge
-// in the future.
-class PlatformBridge {
+// This is very similar to chromium/PlatformSupport and the two are likely to
+// converge in the future.
+class PlatformSupport {
 public:
     static bool popupsAllowed(NPP npp);
     // Plugin
@@ -96,4 +94,4 @@ public:
 };
 
 }
-#endif // PlatformBridge_h
+#endif
@@ -20,7 +20,7 @@
  *
  */
 #include "config.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 #include "Frame.h"
 #include "PluginView.h"
@@ -28,7 +28,7 @@
 
 namespace WebCore {
 
-bool PlatformBridge::popupsAllowed(NPP npp)
+bool PlatformSupport::popupsAllowed(NPP npp)
 {
     if (npp && npp->ndata)
         return static_cast<PluginView*>(npp->ndata)->arePopupsAllowed();
@@ -36,7 +36,7 @@ bool PlatformBridge::popupsAllowed(NPP npp)
     return false;
 }
 
-NPObject* PlatformBridge::pluginScriptableObject(Widget* widget)
+NPObject* PlatformSupport::pluginScriptableObject(Widget* widget)
 {
     if (!widget)
         return 0;
index b79eb1a..1363cfe 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLiteFileSystem.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "SQLiteDatabase.h"
 #include <sqlite3.h>
 #include <wtf/text/CString.h>
@@ -92,12 +92,12 @@ bool SQLiteFileSystem::deleteEmptyDatabaseDirectory(const String&)
 
 bool SQLiteFileSystem::deleteDatabaseFile(const String& fileName)
 {
-    return (PlatformBridge::databaseDeleteFile(fileName) == SQLITE_OK);
+    return (PlatformSupport::databaseDeleteFile(fileName) == SQLITE_OK);
 }
 
 long long SQLiteFileSystem::getDatabaseFileSize(const String& fileName)
 {
-    return PlatformBridge::databaseGetFileSize(fileName);
+    return PlatformSupport::databaseGetFileSize(fileName);
 }
 
 } // namespace WebCore
index 6dbc384..bdd7f26 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLiteFileSystem.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include <sqlite3.h>
 
 #include <fcntl.h>
@@ -69,10 +69,10 @@ int chromiumOpen(sqlite3_vfs* vfs, const char* fileName,
         return result;
 
     if (fd < 0) {
-        fd = PlatformBridge::databaseOpenFile(fileName, desiredFlags);
+        fd = PlatformSupport::databaseOpenFile(fileName, desiredFlags);
         if ((fd < 0) && (desiredFlags & SQLITE_OPEN_READWRITE)) {
             int newFlags = (desiredFlags & ~(SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE)) | SQLITE_OPEN_READONLY;
-            fd = PlatformBridge::databaseOpenFile(fileName, newFlags);
+            fd = PlatformSupport::databaseOpenFile(fileName, newFlags);
         }
     }
     if (fd < 0) {
@@ -103,7 +103,7 @@ int chromiumOpen(sqlite3_vfs* vfs, const char* fileName,
 //           should be synched after the file is deleted.
 int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir)
 {
-    return PlatformBridge::databaseDeleteFile(fileName, syncDir);
+    return PlatformSupport::databaseDeleteFile(fileName, syncDir);
 }
 
 // Check the existance and status of the given file.
@@ -114,7 +114,7 @@ int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir)
 // res - the result.
 int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res)
 {
-    int attr = static_cast<int>(PlatformBridge::databaseGetFileAttributes(fileName));
+    int attr = static_cast<int>(PlatformSupport::databaseGetFileAttributes(fileName));
     if (attr < 0) {
         *res = 0;
         return SQLITE_OK;
index 47e01d0..3c0166a 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLiteFileSystem.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include <sqlite3.h>
 #include <windows.h>
 
@@ -55,7 +55,7 @@ namespace {
 int chromiumOpen(sqlite3_vfs*, const char* fileName,
                  sqlite3_file* id, int desiredFlags, int* usedFlags)
 {
-    HANDLE h = PlatformBridge::databaseOpenFile(fileName, desiredFlags);
+    HANDLE h = PlatformSupport::databaseOpenFile(fileName, desiredFlags);
     if (h == INVALID_HANDLE_VALUE) {
         if (desiredFlags & SQLITE_OPEN_READWRITE) {
             int newFlags = (desiredFlags | SQLITE_OPEN_READONLY) & ~SQLITE_OPEN_READWRITE;
@@ -82,7 +82,7 @@ int chromiumOpen(sqlite3_vfs*, const char* fileName,
 //           should be synched after the file is deleted.
 int chromiumDelete(sqlite3_vfs*, const char* fileName, int)
 {
-    return PlatformBridge::databaseDeleteFile(fileName);
+    return PlatformSupport::databaseDeleteFile(fileName);
 }
 
 // Check the existance and status of the given file.
@@ -93,7 +93,7 @@ int chromiumDelete(sqlite3_vfs*, const char* fileName, int)
 // res - the result.
 int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res)
 {
-    DWORD attr = PlatformBridge::databaseGetFileAttributes(fileName);
+    DWORD attr = PlatformSupport::databaseGetFileAttributes(fileName);
     switch (flag) {
     case SQLITE_ACCESS_READ:
     case SQLITE_ACCESS_EXISTS:
index 77cdbbf..240494f 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "PluginDataChromium.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 namespace WebCore {
 
@@ -50,7 +50,7 @@ public:
     const Vector<PluginInfo>& plugins()
     {
         if (!m_loaded) {
-            PlatformBridge::plugins(m_refresh, &m_plugins);
+            PlatformSupport::plugins(m_refresh, &m_plugins);
             m_loaded = true;
             m_refresh = false;
         }
index d39911b..a4b30ff 100644 (file)
@@ -28,7 +28,7 @@
 #include "CSSValueKeywords.h"
 #include "Color.h"
 #include "PaintInfo.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "RenderObject.h"
 #include "RenderProgress.h"
 #include "RenderSlider.h"
@@ -50,16 +50,16 @@ double RenderThemeChromiumLinux::m_caretBlinkInterval;
 
 static const unsigned defaultButtonBackgroundColor = 0xffdddddd;
 
-static PlatformBridge::ThemePaintState getWebThemeState(const RenderTheme* theme, const RenderObject* o)
+static PlatformSupport::ThemePaintState getWebThemeState(const RenderTheme* theme, const RenderObject* o)
 {
     if (!theme->isEnabled(o))
-        return PlatformBridge::StateDisabled;
+        return PlatformSupport::StateDisabled;
     if (theme->isPressed(o))
-        return PlatformBridge::StatePressed;
+        return PlatformSupport::StatePressed;
     if (theme->isHovered(o))
-        return PlatformBridge::StateHover;
+        return PlatformSupport::StateHover;
 
-    return PlatformBridge::StateNormal;
+    return PlatformSupport::StateNormal;
 }
 
 
@@ -145,7 +145,7 @@ Color RenderThemeChromiumLinux::platformInactiveSelectionForegroundColor() const
 
 void RenderThemeChromiumLinux::adjustSliderThumbSize(RenderStyle* style) const
 {
-    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartSliderThumb);
+    IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartSliderThumb);
 
     if (style->appearance() == SliderThumbHorizontalPart) {
         style->setWidth(Length(size.width(), Fixed));
@@ -186,11 +186,11 @@ void RenderThemeChromiumLinux::setSelectionColors(
 
 bool RenderThemeChromiumLinux::paintCheckbox(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.button.checked = isChecked(o);
     extraParams.button.indeterminate = isIndeterminate(o);
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartCheckbox, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartCheckbox, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
@@ -200,16 +200,16 @@ void RenderThemeChromiumLinux::setCheckboxSize(RenderStyle* style) const
     if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
         return;
 
-    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartCheckbox);
+    IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartCheckbox);
     setSizeIfAuto(style, size);
 }
 
 bool RenderThemeChromiumLinux::paintRadio(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.button.checked = isChecked(o);
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartRadio, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartRadio, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
@@ -219,20 +219,20 @@ void RenderThemeChromiumLinux::setRadioSize(RenderStyle* style) const
     if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
         return;
 
-    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartRadio);
+    IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartRadio);
     setSizeIfAuto(style, size);
 }
 
 bool RenderThemeChromiumLinux::paintButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.button.isDefault = isDefault(o);
     extraParams.button.hasBorder = true;
     extraParams.button.backgroundColor = defaultButtonBackgroundColor;
     if (o->hasBackground())
         extraParams.button.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartButton, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartButton, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
@@ -245,7 +245,7 @@ bool RenderThemeChromiumLinux::paintTextField(RenderObject* o, const PaintInfo&
 
     ControlPart part = o->style()->appearance();
 
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.textField.isTextArea = part == TextAreaPart;
     extraParams.textField.isListbox = part == ListboxPart;
 
@@ -255,7 +255,7 @@ bool RenderThemeChromiumLinux::paintTextField(RenderObject* o, const PaintInfo&
         backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor);
     extraParams.textField.backgroundColor = backgroundColor.rgb();
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartTextField, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartTextField, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
@@ -267,7 +267,7 @@ bool RenderThemeChromiumLinux::paintMenuList(RenderObject* o, const PaintInfo& i
     const int right = rect.x() + rect.width();
     const int middle = rect.y() + rect.height() / 2;
 
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.menuList.arrowX = (o->style()->direction() == RTL) ? rect.x() + 7 : right - 13;
     extraParams.menuList.arrowY = middle;
     const RenderBox* box = toRenderBox(o);
@@ -279,32 +279,32 @@ bool RenderThemeChromiumLinux::paintMenuList(RenderObject* o, const PaintInfo& i
     if (o->hasBackground())
         extraParams.menuList.backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor).rgb();
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartMenuList, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartMenuList, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
 bool RenderThemeChromiumLinux::paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.slider.vertical = o->style()->appearance() == SliderVerticalPart;
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartSliderTrack, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartSliderTrack, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
 bool RenderThemeChromiumLinux::paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.slider.vertical = o->style()->appearance() == SliderThumbVerticalPart;
     extraParams.slider.inDrag = isPressed(o);
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartSliderThumb, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartSliderThumb, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
 void RenderThemeChromiumLinux::adjustInnerSpinButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
 {
-    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartInnerSpinButton);
+    IntSize size = PlatformSupport::getThemePartSize(PlatformSupport::PartInnerSpinButton);
 
     style->setWidth(Length(size.width(), Fixed));
     style->setMinWidth(Length(size.width(), Fixed));
@@ -312,11 +312,11 @@ void RenderThemeChromiumLinux::adjustInnerSpinButtonStyle(CSSStyleSelector*, Ren
 
 bool RenderThemeChromiumLinux::paintInnerSpinButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
 {
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.innerSpin.spinUp = (controlStatesForRenderer(o) & SpinUpState);
     extraParams.innerSpin.readOnly = isReadOnlyControl(o);
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartInnerSpinButton, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartInnerSpinButton, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
@@ -330,14 +330,14 @@ bool RenderThemeChromiumLinux::paintProgressBar(RenderObject* o, const PaintInfo
     RenderProgress* renderProgress = toRenderProgress(o);
     IntRect valueRect = progressValueRectFor(renderProgress, rect);
 
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    PlatformSupport::ThemePaintExtraParams extraParams;
     extraParams.progressBar.determinate = renderProgress->isDeterminate();
     extraParams.progressBar.valueRectX = valueRect.x();
     extraParams.progressBar.valueRectY = valueRect.y();
     extraParams.progressBar.valueRectWidth = valueRect.width();
     extraParams.progressBar.valueRectHeight = valueRect.height();
 
-    PlatformBridge::paintThemePart(i.context, PlatformBridge::PartProgressBar, getWebThemeState(this, o), rect, &extraParams);
+    PlatformSupport::paintThemePart(i.context, PlatformSupport::PartProgressBar, getWebThemeState(this, o), rect, &extraParams);
     return false;
 }
 
index 9aa7569..0dd6b7a 100644 (file)
@@ -21,7 +21,7 @@
 #import "config.h"
 #import "RenderThemeChromiumMac.h"
 #import "PaintInfo.h"
-#import "PlatformBridge.h"
+#import "PlatformSupport.h"
 #import "RenderMediaControlsChromium.h"
 #import "UserAgentStyleSheets.h"
 #import <Carbon/Carbon.h>
@@ -71,7 +71,7 @@ PassRefPtr<RenderTheme> RenderThemeChromiumMac::create()
 
 bool RenderThemeChromiumMac::usesTestModeFocusRingColor() const
 {
-    return PlatformBridge::layoutTestMode();
+    return PlatformSupport::layoutTestMode();
 }
 
 NSView* RenderThemeChromiumMac::documentViewFor(RenderObject*) const
index cb398d9..77f6292 100644 (file)
@@ -32,7 +32,7 @@
 #include "Image.h"
 #include "MediaControlElements.h"
 #include "PaintInfo.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "PlatformContextSkia.h"
 #include "RenderBox.h"
 #include "RenderMediaControlsChromium.h"
@@ -154,7 +154,7 @@ double RenderThemeChromiumSkia::caretBlinkInterval() const
 {
     // Disable the blinking caret in layout test mode, as it introduces
     // a race condition for the pixel tests. http://b/1198440
-    if (PlatformBridge::layoutTestMode())
+    if (PlatformSupport::layoutTestMode())
         return 0;
 
     return caretBlinkIntervalInternal();
index 45c2acc..893e46c 100644 (file)
@@ -38,7 +38,7 @@
 #include "HTMLNames.h"
 #include "MediaControlElements.h"
 #include "PaintInfo.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "RenderBox.h"
 #include "RenderProgress.h"
 #include "RenderSlider.h"
@@ -255,7 +255,7 @@ bool RenderThemeChromiumWin::supportsFocusRing(const RenderStyle* style) const
 
 Color RenderThemeChromiumWin::platformActiveSelectionBackgroundColor() const
 {
-    if (PlatformBridge::layoutTestMode())
+    if (PlatformSupport::layoutTestMode())
         return Color(0x00, 0x00, 0xff); // Royal blue.
     COLORREF color = GetSysColor(COLOR_HIGHLIGHT);
     return Color(GetRValue(color), GetGValue(color), GetBValue(color), 0xff);
@@ -263,7 +263,7 @@ Color RenderThemeChromiumWin::platformActiveSelectionBackgroundColor() const
 
 Color RenderThemeChromiumWin::platformInactiveSelectionBackgroundColor() const
 {
-    if (PlatformBridge::layoutTestMode())
+    if (PlatformSupport::layoutTestMode())
         return Color(0x99, 0x99, 0x99); // Medium gray.
     COLORREF color = GetSysColor(COLOR_GRAYTEXT);
     return Color(GetRValue(color), GetGValue(color), GetBValue(color), 0xff);
@@ -271,7 +271,7 @@ Color RenderThemeChromiumWin::platformInactiveSelectionBackgroundColor() const
 
 Color RenderThemeChromiumWin::platformActiveSelectionForegroundColor() const
 {
-    if (PlatformBridge::layoutTestMode())
+    if (PlatformSupport::layoutTestMode())
         return Color(0xff, 0xff, 0xcc); // Pale yellow.
     COLORREF color = GetSysColor(COLOR_HIGHLIGHTTEXT);
     return Color(GetRValue(color), GetGValue(color), GetBValue(color), 0xff);
@@ -392,7 +392,7 @@ static int cssValueIdToSysColorIndex(int cssValueId)
 Color RenderThemeChromiumWin::systemColor(int cssValueId) const
 {
     int sysColorIndex = cssValueIdToSysColorIndex(cssValueId);
-    if (PlatformBridge::layoutTestMode() || (sysColorIndex == -1))
+    if (PlatformSupport::layoutTestMode() || (sysColorIndex == -1))
         return RenderTheme::systemColor(cssValueId);
 
     COLORREF color = GetSysColor(sysColorIndex);
@@ -428,7 +428,7 @@ bool RenderThemeChromiumWin::paintButton(RenderObject* o, const PaintInfo& i, co
     const ThemeData& themeData = getThemeData(o);
 
     ThemePainter painter(i.context, r);
-    PlatformBridge::paintButton(painter.context(),
+    PlatformSupport::paintButton(painter.context(),
                                 themeData.m_part,
                                 themeData.m_state,
                                 themeData.m_classicState,
@@ -446,7 +446,7 @@ bool RenderThemeChromiumWin::paintSliderTrack(RenderObject* o, const PaintInfo&
     const ThemeData& themeData = getThemeData(o);
 
     ThemePainter painter(i.context, r);
-    PlatformBridge::paintTrackbar(painter.context(),
+    PlatformSupport::paintTrackbar(painter.context(),
                                   themeData.m_part,
                                   themeData.m_state,
                                   themeData.m_classicState,
@@ -461,7 +461,7 @@ bool RenderThemeChromiumWin::paintSliderThumb(RenderObject* o, const PaintInfo&
 
 static int menuListButtonWidth()
 {
-    static int width = PlatformBridge::layoutTestMode() ? kStandardMenuListButtonWidth : GetSystemMetrics(SM_CXVSCROLL);
+    static int width = PlatformSupport::layoutTestMode() ? kStandardMenuListButtonWidth : GetSystemMetrics(SM_CXVSCROLL);
     return width;
 }
 
@@ -509,11 +509,11 @@ bool RenderThemeChromiumWin::paintMenuList(RenderObject* o, const PaintInfo& i,
 
     // Get the correct theme data for a textfield and paint the menu.
     ThemePainter painter(i.context, rect);
-    PlatformBridge::paintMenuList(painter.context(),
-                                  CP_DROPDOWNBUTTON,
-                                  determineState(o),
-                                  determineClassicState(o),
-                                  painter.drawRect());
+    PlatformSupport::paintMenuList(painter.context(),
+                                   CP_DROPDOWNBUTTON,
+                                   determineState(o),
+                                   determineClassicState(o),
+                                   painter.drawRect());
     return false;
 }
 
@@ -675,7 +675,7 @@ bool RenderThemeChromiumWin::paintTextFieldInternal(RenderObject* o,
                                                     bool drawEdges)
 {
     // Fallback to white if the specified color object is invalid.
-    // (Note PlatformBridge::paintTextField duplicates this check).
+    // (Note PlatformSupport::paintTextField duplicates this check).
     Color backgroundColor(Color::white);
     if (o->style()->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
         backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor);
@@ -699,14 +699,14 @@ bool RenderThemeChromiumWin::paintTextFieldInternal(RenderObject* o,
     {
         const ThemeData& themeData = getThemeData(o);
         ThemePainter painter(i.context, r);
-        PlatformBridge::paintTextField(painter.context(),
-                                       themeData.m_part,
-                                       themeData.m_state,
-                                       themeData.m_classicState,
-                                       painter.drawRect(),
-                                       backgroundColor,
-                                       fillContentArea,
-                                       drawEdges);
+        PlatformSupport::paintTextField(painter.context(),
+                                        themeData.m_part,
+                                        themeData.m_state,
+                                        themeData.m_classicState,
+                                        painter.drawRect(),
+                                        backgroundColor,
+                                        fillContentArea,
+                                        drawEdges);
         // End of block commits the painter before restoring context.
     }
     if (o->style()->hasBorderRadius())
@@ -730,22 +730,22 @@ bool RenderThemeChromiumWin::paintInnerSpinButton(RenderObject* object, const Pa
         half.setHeight(rect.height() / 2);
         const ThemeData& upThemeData = getThemeData(object, SpinButtonUp);
         ThemePainter upPainter(info.context, half);
-        PlatformBridge::paintSpinButton(upPainter.context(),
-                                        upThemeData.m_part,
-                                        upThemeData.m_state,
-                                        upThemeData.m_classicState,
-                                        upPainter.drawRect());
+        PlatformSupport::paintSpinButton(upPainter.context(),
+                                         upThemeData.m_part,
+                                         upThemeData.m_state,
+                                         upThemeData.m_classicState,
+                                         upPainter.drawRect());
     }
 
     {
         half.setY(rect.y() + rect.height() / 2);
         const ThemeData& downThemeData = getThemeData(object, SpinButtonDown);
         ThemePainter downPainter(info.context, half);
-        PlatformBridge::paintSpinButton(downPainter.context(),
-                                        downThemeData.m_part,
-                                        downThemeData.m_state,
-                                        downThemeData.m_classicState,
-                                        downPainter.drawRect());
+        PlatformSupport::paintSpinButton(downPainter.context(),
+                                         downThemeData.m_part,
+                                         downThemeData.m_state,
+                                         downThemeData.m_classicState,
+                                         downPainter.drawRect());
     }
     return false;
 }
@@ -783,7 +783,7 @@ bool RenderThemeChromiumWin::paintProgressBar(RenderObject* o, const PaintInfo&
     IntRect valueRect = renderProgress->isDeterminate() ? determinateProgressValueRectFor(renderProgress, r) : IntRect(0, 0, 0, 0);
     double animatedSeconds = renderProgress->animationStartTime() ?  WTF::currentTime() - renderProgress->animationStartTime() : 0;
     ThemePainter painter(i.context, r);
-    PlatformBridge::paintProgressBar(painter.context(), r, valueRect, renderProgress->isDeterminate(), animatedSeconds);
+    PlatformSupport::paintProgressBar(painter.context(), r, valueRect, renderProgress->isDeterminate(), animatedSeconds);
     return false;
 }
 
index 81eeb3e..fed5dc5 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "IDBFactoryBackendInterface.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 #if ENABLE(INDEXED_DATABASE)
 
@@ -36,7 +36,7 @@ namespace WebCore {
 
 PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendInterface::create()
 {
-    return PlatformBridge::idbFactory();
+    return PlatformSupport::idbFactory();
 }
 
 } // namespace WebCore
index e6a1ad5..b804a0f 100644 (file)
 #if ENABLE(INDEXED_DATABASE)
 
 #include "IDBKey.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "SerializedScriptValue.h"
 
 namespace WebCore {
 
 void IDBKeyPathBackendImpl::createIDBKeysFromSerializedValuesAndKeyPath(const Vector<RefPtr<SerializedScriptValue>, 0>& values,  const String& keyPath, Vector<RefPtr<IDBKey>, 0>& keys)
 {
-    PlatformBridge::createIDBKeysFromSerializedValuesAndKeyPath(values, keyPath, keys);
+    PlatformSupport::createIDBKeysFromSerializedValuesAndKeyPath(values, keyPath, keys);
 }
 
 PassRefPtr<SerializedScriptValue> IDBKeyPathBackendImpl::injectIDBKeyIntoSerializedValue(PassRefPtr<IDBKey> key, PassRefPtr<SerializedScriptValue> value, const String& keyPath)
 {
-    return PlatformBridge::injectIDBKeyIntoSerializedValue(key, value, keyPath);
+    return PlatformSupport::injectIDBKeyIntoSerializedValue(key, value, keyPath);
 }
 
 } // namespace WebCore
index 95087fc..0448478 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "config.h"
 #include "QuotaTracker.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 #if ENABLE(DATABASE)
 
@@ -48,7 +48,7 @@ void QuotaTracker::getDatabaseSizeAndSpaceAvailableToOrigin(
     const String& originIdentifier, const String& databaseName,
     unsigned long long* databaseSize, unsigned long long* spaceAvailable)
 {
-    // Extra scope to unlock prior to potentially calling PlatformBridge.
+    // Extra scope to unlock prior to potentially calling PlatformSupport.
     {
         MutexLocker lockData(m_dataGuard);
         ASSERT(m_databaseSizes.contains(originIdentifier));
@@ -63,7 +63,7 @@ void QuotaTracker::getDatabaseSizeAndSpaceAvailableToOrigin(
     }
 
     // The embedder hasn't pushed this value to us, so we pull it as needed.
-    *spaceAvailable = PlatformBridge::databaseGetSpaceAvailableForOrigin(originIdentifier);
+    *spaceAvailable = PlatformSupport::databaseGetSpaceAvailableForOrigin(originIdentifier);
 }
 
 void QuotaTracker::updateDatabaseSize(
index 23602e5..bdedd34 100644 (file)
@@ -1,3 +1,27 @@
+2011-08-31  Adam Barth  <abarth@webkit.org>
+
+        [Chromium] Rename PlatformBridge to PlatformSupport
+        https://bugs.webkit.org/show_bug.cgi?id=67349
+
+        Reviewed by Darin Fisher.
+
+        This matches the WebKitPlatformSupport embedder API.
+
+        * WebKit.gyp:
+        * src/AssertMatchingEnums.cpp:
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::shouldRunModalDialogDuringPageDismissal):
+        * src/PlatformBridge.cpp: Removed.
+        * src/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::cacheMetadata):
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::WebFrameImpl):
+        (WebKit::WebFrameImpl::~WebFrameImpl):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::paint):
+        (WebKit::WebViewImplContentPainter::paint):
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
 2011-08-31  Sailesh Agrawal  <sail@chromium.org>
 
         Chromium Mac: PDF: Scrollsbars should be visible when scrolling using the two finger gesture on Lion
index 9d35401..cdf6e99 100644 (file)
                 'src/painting/GraphicsContextBuilder.h',
                 'src/PageOverlay.cpp',
                 'src/PageOverlay.h',
-                'src/PlatformBridge.cpp',
                 'src/PlatformMessagePortChannel.cpp',
                 'src/PlatformMessagePortChannel.h',
+                'src/PlatformSupport.cpp',
                 'src/ResourceHandle.cpp',
                 'src/ScrollbarGroup.cpp',
                 'src/ScrollbarGroup.h',
index 2ac8f4f..ca73691 100644 (file)
@@ -92,7 +92,7 @@
 #include <wtf/text/StringImpl.h>
 
 #if OS(DARWIN)
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "mac/WebThemeEngine.h"
 #endif
 
@@ -438,19 +438,19 @@ COMPILE_ASSERT_MATCHING_ENUM(WebStorageQuotaErrorAbort, ABORT_ERR);
 #endif
 
 #if OS(DARWIN)
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateDisabled, PlatformBridge::StateDisabled);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateInactive, PlatformBridge::StateInactive);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateActive, PlatformBridge::StateActive);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StatePressed, PlatformBridge::StatePressed);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateDisabled, PlatformSupport::StateDisabled);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateInactive, PlatformSupport::StateInactive);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateActive, PlatformSupport::StateActive);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StatePressed, PlatformSupport::StatePressed);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeRegular, PlatformBridge::SizeRegular);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeSmall, PlatformBridge::SizeSmall);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeRegular, PlatformSupport::SizeRegular);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeSmall, PlatformSupport::SizeSmall);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationHorizontal, PlatformBridge::ScrollbarOrientationHorizontal);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationVertical, PlatformBridge::ScrollbarOrientationVertical);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationHorizontal, PlatformSupport::ScrollbarOrientationHorizontal);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationVertical, PlatformSupport::ScrollbarOrientationVertical);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentScrollView, PlatformBridge::ScrollbarParentScrollView);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentRenderLayer, PlatformBridge::ScrollbarParentRenderLayer);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentScrollView, PlatformSupport::ScrollbarParentScrollView);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentRenderLayer, PlatformSupport::ScrollbarParentRenderLayer);
 #endif
 
 COMPILE_ASSERT_MATCHING_ENUM(WebPageVisibilityStateVisible, PageVisibilityStateVisible);
index 024f998..fef7e7c 100644 (file)
@@ -56,7 +56,7 @@
 #include "Node.h"
 #include "NotificationPresenterImpl.h"
 #include "Page.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "PopupContainer.h"
 #include "PopupMenuChromium.h"
 #include "RenderWidget.h"
@@ -964,7 +964,7 @@ bool ChromeClientImpl::shouldRunModalDialogDuringPageDismissal(const DialogType&
     int dismissal = static_cast<int>(dismissalType) - 1; // Exclude NoDismissal.
     ASSERT(0 <= dismissal && dismissal < static_cast<int>(arraysize(kDismissals)));
 
-    PlatformBridge::histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) * arraysize(kDismissals));
+    PlatformSupport::histogramEnumeration("Renderer.ModalDialogsDuringPageDismissal", dismissal * arraysize(kDialogs) + dialog, arraysize(kDialogs) * arraysize(kDismissals));
 
     m_webView->mainFrame()->addMessageToConsole(WebConsoleMessage(WebConsoleMessage::LevelError, makeString("Blocked ", kDialogs[dialog], "('", dialogMessage, "') during ", kDismissals[dismissal], ".")));
 
@@ -29,7 +29,7 @@
  */
 
 #include "config.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 
 #include <googleurl/src/url_util.h>
 
@@ -141,14 +141,14 @@ static WebCookieJar* getCookieJar(const Document* document)
 
 // Cache ----------------------------------------------------------------------
 
-void PlatformBridge::cacheMetadata(const KURL& url, double responseTime, const Vector<char>& data)
+void PlatformSupport::cacheMetadata(const KURL& url, double responseTime, const Vector<char>& data)
 {
     webKitPlatformSupport()->cacheMetadata(url, responseTime, data.data(), data.size());
 }
 
 // Clipboard ------------------------------------------------------------------
 
-bool PlatformBridge::clipboardIsFormatAvailable(
+bool PlatformSupport::clipboardIsFormatAvailable(
     PasteboardPrivate::ClipboardFormat format,
     PasteboardPrivate::ClipboardBuffer buffer)
 {
@@ -157,14 +157,14 @@ bool PlatformBridge::clipboardIsFormatAvailable(
         static_cast<WebClipboard::Buffer>(buffer));
 }
 
-String PlatformBridge::clipboardReadPlainText(
+String PlatformSupport::clipboardReadPlainText(
     PasteboardPrivate::ClipboardBuffer buffer)
 {
     return webKitPlatformSupport()->clipboard()->readPlainText(
         static_cast<WebClipboard::Buffer>(buffer));
 }
 
-void PlatformBridge::clipboardReadHTML(
+void PlatformSupport::clipboardReadHTML(
     PasteboardPrivate::ClipboardBuffer buffer,
     String* htmlText, KURL* sourceURL)
 {
@@ -174,18 +174,18 @@ void PlatformBridge::clipboardReadHTML(
     *sourceURL = url;
 }
 
-PassRefPtr<SharedBuffer> PlatformBridge::clipboardReadImage(
+PassRefPtr<SharedBuffer> PlatformSupport::clipboardReadImage(
     PasteboardPrivate::ClipboardBuffer buffer)
 {
     return webKitPlatformSupport()->clipboard()->readImage(static_cast<WebClipboard::Buffer>(buffer));
 }
 
-uint64_t PlatformBridge::clipboardGetSequenceNumber()
+uint64_t PlatformSupport::clipboardGetSequenceNumber()
 {
     return webKitPlatformSupport()->clipboard()->getSequenceNumber();
 }
 
-void PlatformBridge::clipboardWriteSelection(const String& htmlText,
+void PlatformSupport::clipboardWriteSelection(const String& htmlText,
                                              const KURL& sourceURL,
                                              const String& plainText,
                                              bool writeSmartPaste)
@@ -194,17 +194,17 @@ void PlatformBridge::clipboardWriteSelection(const String& htmlText,
         htmlText, sourceURL, plainText, writeSmartPaste);
 }
 
-void PlatformBridge::clipboardWritePlainText(const String& plainText)
+void PlatformSupport::clipboardWritePlainText(const String& plainText)
 {
     webKitPlatformSupport()->clipboard()->writePlainText(plainText);
 }
 
-void PlatformBridge::clipboardWriteURL(const KURL& url, const String& title)
+void PlatformSupport::clipboardWriteURL(const KURL& url, const String& title)
 {
     webKitPlatformSupport()->clipboard()->writeURL(url, title);
 }
 
-void PlatformBridge::clipboardWriteImage(NativeImagePtr image,
+void PlatformSupport::clipboardWriteImage(NativeImagePtr image,
                                          const KURL& sourceURL,
                                          const String& title)
 {
@@ -216,14 +216,14 @@ void PlatformBridge::clipboardWriteImage(NativeImagePtr image,
     webKitPlatformSupport()->clipboard()->writeImage(webImage, sourceURL, title);
 }
 
-void PlatformBridge::clipboardWriteData(const String& type,
+void PlatformSupport::clipboardWriteData(const String& type,
                                         const String& data,
                                         const String& metadata)
 {
     webKitPlatformSupport()->clipboard()->writeData(type, data, metadata);
 }
 
-HashSet<String> PlatformBridge::clipboardReadAvailableTypes(
+HashSet<String> PlatformSupport::clipboardReadAvailableTypes(
     PasteboardPrivate::ClipboardBuffer buffer, bool* containsFilenames)
 {
     WebVector<WebString> result = webKitPlatformSupport()->clipboard()->readAvailableTypes(
@@ -234,7 +234,7 @@ HashSet<String> PlatformBridge::clipboardReadAvailableTypes(
     return types;
 }
 
-bool PlatformBridge::clipboardReadData(PasteboardPrivate::ClipboardBuffer buffer,
+bool PlatformSupport::clipboardReadData(PasteboardPrivate::ClipboardBuffer buffer,
                                        const String& type, String& data, String& metadata)
 {
     WebString resultData;
@@ -248,7 +248,7 @@ bool PlatformBridge::clipboardReadData(PasteboardPrivate::ClipboardBuffer buffer
     return succeeded;
 }
 
-Vector<String> PlatformBridge::clipboardReadFilenames(PasteboardPrivate::ClipboardBuffer buffer)
+Vector<String> PlatformSupport::clipboardReadFilenames(PasteboardPrivate::ClipboardBuffer buffer)
 {
     WebVector<WebString> result = webKitPlatformSupport()->clipboard()->readFilenames(
         static_cast<WebClipboard::Buffer>(buffer));
@@ -260,7 +260,7 @@ Vector<String> PlatformBridge::clipboardReadFilenames(PasteboardPrivate::Clipboa
 
 // Cookies --------------------------------------------------------------------
 
-void PlatformBridge::setCookies(const Document* document, const KURL& url,
+void PlatformSupport::setCookies(const Document* document, const KURL& url,
                                 const String& value)
 {
     WebCookieJar* cookieJar = getCookieJar(document);
@@ -268,7 +268,7 @@ void PlatformBridge::setCookies(const Document* document, const KURL& url,
         cookieJar->setCookie(url, document->firstPartyForCookies(), value);
 }
 
-String PlatformBridge::cookies(const Document* document, const KURL& url)
+String PlatformSupport::cookies(const Document* document, const KURL& url)
 {
     String result;
     WebCookieJar* cookieJar = getCookieJar(document);
@@ -277,7 +277,7 @@ String PlatformBridge::cookies(const Document* document, const KURL& url)
     return result;
 }
 
-String PlatformBridge::cookieRequestHeaderFieldValue(const Document* document,
+String PlatformSupport::cookieRequestHeaderFieldValue(const Document* document,
                                                      const KURL& url)
 {
     String result;
@@ -287,7 +287,7 @@ String PlatformBridge::cookieRequestHeaderFieldValue(const Document* document,
     return result;
 }
 
-bool PlatformBridge::rawCookies(const Document* document, const KURL& url, Vector<Cookie>& rawCookies)
+bool PlatformSupport::rawCookies(const Document* document, const KURL& url, Vector<Cookie>& rawCookies)
 {
     rawCookies.clear();
     WebVector<WebCookie> webCookies;
@@ -311,14 +311,14 @@ bool PlatformBridge::rawCookies(const Document* document, const KURL& url, Vecto
     return true;
 }
 
-void PlatformBridge::deleteCookie(const Document* document, const KURL& url, const String& cookieName)
+void PlatformSupport::deleteCookie(const Document* document, const KURL& url, const String& cookieName)
 {
     WebCookieJar* cookieJar = getCookieJar(document);
     if (cookieJar)
         cookieJar->deleteCookie(url, cookieName);
 }
 
-bool PlatformBridge::cookiesEnabled(const Document* document)
+bool PlatformSupport::cookiesEnabled(const Document* document)
 {
     bool result = false;
     WebCookieJar* cookieJar = getCookieJar(document);
@@ -329,39 +329,39 @@ bool PlatformBridge::cookiesEnabled(const Document* document)
 
 // DNS ------------------------------------------------------------------------
 
-void PlatformBridge::prefetchDNS(const String& hostname)
+void PlatformSupport::prefetchDNS(const String& hostname)
 {
     webKitPlatformSupport()->prefetchHostName(hostname);
 }
 
 // File ------------------------------------------------------------------------
 
-bool PlatformBridge::fileExists(const String& path)
+bool PlatformSupport::fileExists(const String& path)
 {
     return webKitPlatformSupport()->fileUtilities()->fileExists(path);
 }
 
-bool PlatformBridge::deleteFile(const String& path)
+bool PlatformSupport::deleteFile(const String& path)
 {
     return webKitPlatformSupport()->fileUtilities()->deleteFile(path);
 }
 
-bool PlatformBridge::deleteEmptyDirectory(const String& path)
+bool PlatformSupport::deleteEmptyDirectory(const String& path)
 {
     return webKitPlatformSupport()->fileUtilities()->deleteEmptyDirectory(path);
 }
 
-bool PlatformBridge::getFileSize(const String& path, long long& result)
+bool PlatformSupport::getFileSize(const String& path, long long& result)
 {
     return webKitPlatformSupport()->fileUtilities()->getFileSize(path, result);
 }
 
-void PlatformBridge::revealFolderInOS(const String& path)
+void PlatformSupport::revealFolderInOS(const String& path)
 {
     webKitPlatformSupport()->fileUtilities()->revealFolderInOS(path);
 }
 
-bool PlatformBridge::getFileModificationTime(const String& path, time_t& result)
+bool PlatformSupport::getFileModificationTime(const String& path, time_t& result)
 {
     double modificationTime;
     if (!webKitPlatformSupport()->fileUtilities()->getFileModificationTime(path, modificationTime))
@@ -370,62 +370,62 @@ bool PlatformBridge::getFileModificationTime(const String& path, time_t& result)
     return true;
 }
 
-String PlatformBridge::directoryName(const String& path)
+String PlatformSupport::directoryName(const String& path)
 {
     return webKitPlatformSupport()->fileUtilities()->directoryName(path);
 }
 
-String PlatformBridge::pathByAppendingComponent(const String& path, const String& component)
+String PlatformSupport::pathByAppendingComponent(const String& path, const String& component)
 {
     return webKitPlatformSupport()->fileUtilities()->pathByAppendingComponent(path, component);
 }
 
-bool PlatformBridge::makeAllDirectories(const String& path)
+bool PlatformSupport::makeAllDirectories(const String& path)
 {
     return webKitPlatformSupport()->fileUtilities()->makeAllDirectories(path);
 }
 
-String PlatformBridge::getAbsolutePath(const String& path)
+String PlatformSupport::getAbsolutePath(const String& path)
 {
     return webKitPlatformSupport()->fileUtilities()->getAbsolutePath(path);
 }
 
-bool PlatformBridge::isDirectory(const String& path)
+bool PlatformSupport::isDirectory(const String& path)
 {
     return webKitPlatformSupport()->fileUtilities()->isDirectory(path);
 }
 
-KURL PlatformBridge::filePathToURL(const String& path)
+KURL PlatformSupport::filePathToURL(const String& path)
 {
     return webKitPlatformSupport()->fileUtilities()->filePathToURL(path);
 }
 
-PlatformFileHandle PlatformBridge::openFile(const String& path, FileOpenMode mode)
+PlatformFileHandle PlatformSupport::openFile(const String& path, FileOpenMode mode)
 {
     return webKitPlatformSupport()->fileUtilities()->openFile(path, mode);
 }
 
-void PlatformBridge::closeFile(PlatformFileHandle& handle)
+void PlatformSupport::closeFile(PlatformFileHandle& handle)
 {
     webKitPlatformSupport()->fileUtilities()->closeFile(handle);
 }
 
-long long PlatformBridge::seekFile(PlatformFileHandle handle, long long offset, FileSeekOrigin origin)
+long long PlatformSupport::seekFile(PlatformFileHandle handle, long long offset, FileSeekOrigin origin)
 {
     return webKitPlatformSupport()->fileUtilities()->seekFile(handle, offset, origin);
 }
 
-bool PlatformBridge::truncateFile(PlatformFileHandle handle, long long offset)
+bool PlatformSupport::truncateFile(PlatformFileHandle handle, long long offset)
 {
     return webKitPlatformSupport()->fileUtilities()->truncateFile(handle, offset);
 }
 
-int PlatformBridge::readFromFile(PlatformFileHandle handle, char* data, int length)
+int PlatformSupport::readFromFile(PlatformFileHandle handle, char* data, int length)
 {
     return webKitPlatformSupport()->fileUtilities()->readFromFile(handle, data, length);
 }
 
-int PlatformBridge::writeToFile(PlatformFileHandle handle, const char* data, int length)
+int PlatformSupport::writeToFile(PlatformFileHandle handle, const char* data, int length)
 {
     return webKitPlatformSupport()->fileUtilities()->writeToFile(handle, data, length);
 }
@@ -433,7 +433,7 @@ int PlatformBridge::writeToFile(PlatformFileHandle handle, const char* data, int
 // Font -----------------------------------------------------------------------
 
 #if OS(WINDOWS)
-bool PlatformBridge::ensureFontLoaded(HFONT font)
+bool PlatformSupport::ensureFontLoaded(HFONT font)
 {
     WebSandboxSupport* ss = webKitPlatformSupport()->sandboxSupport();
 
@@ -444,7 +444,7 @@ bool PlatformBridge::ensureFontLoaded(HFONT font)
 #endif
 
 #if OS(DARWIN)
-bool PlatformBridge::loadFont(NSFont* srcFont, ATSFontContainerRef* container, uint32_t* fontID)
+bool PlatformSupport::loadFont(NSFont* srcFont, ATSFontContainerRef* container, uint32_t* fontID)
 {
     WebSandboxSupport* ss = webKitPlatformSupport()->sandboxSupport();
     if (ss)
@@ -459,7 +459,7 @@ bool PlatformBridge::loadFont(NSFont* srcFont, ATSFontContainerRef* container, u
     return false;
 }
 #elif OS(UNIX)
-String PlatformBridge::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale)
+String PlatformSupport::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale)
 {
     if (webKitPlatformSupport()->sandboxSupport())
         return webKitPlatformSupport()->sandboxSupport()->getFontFamilyForCharacters(characters, numCharacters, preferredLocale);
@@ -471,7 +471,7 @@ String PlatformBridge::getFontFamilyForCharacters(const UChar* characters, size_
     return WebString();
 }
 
-void PlatformBridge::getRenderStyleForStrike(const char* font, int sizeAndStyle, FontRenderStyle* result)
+void PlatformSupport::getRenderStyleForStrike(const char* font, int sizeAndStyle, FontRenderStyle* result)
 {
     WebFontRenderStyle style;
 
@@ -486,41 +486,41 @@ void PlatformBridge::getRenderStyleForStrike(const char* font, int sizeAndStyle,
 
 // Databases ------------------------------------------------------------------
 
-PlatformFileHandle PlatformBridge::databaseOpenFile(const String& vfsFileName, int desiredFlags)
+PlatformFileHandle PlatformSupport::databaseOpenFile(const String& vfsFileName, int desiredFlags)
 {
     return webKitPlatformSupport()->databaseOpenFile(WebString(vfsFileName), desiredFlags);
 }
 
-int PlatformBridge::databaseDeleteFile(const String& vfsFileName, bool syncDir)
+int PlatformSupport::databaseDeleteFile(const String& vfsFileName, bool syncDir)
 {
     return webKitPlatformSupport()->databaseDeleteFile(WebString(vfsFileName), syncDir);
 }
 
-long PlatformBridge::databaseGetFileAttributes(const String& vfsFileName)
+long PlatformSupport::databaseGetFileAttributes(const String& vfsFileName)
 {
     return webKitPlatformSupport()->databaseGetFileAttributes(WebString(vfsFileName));
 }
 
-long long PlatformBridge::databaseGetFileSize(const String& vfsFileName)
+long long PlatformSupport::databaseGetFileSize(const String& vfsFileName)
 {
     return webKitPlatformSupport()->databaseGetFileSize(WebString(vfsFileName));
 }
 
-long long PlatformBridge::databaseGetSpaceAvailableForOrigin(const String& originIdentifier)
+long long PlatformSupport::databaseGetSpaceAvailableForOrigin(const String& originIdentifier)
 {
     return webKitPlatformSupport()->databaseGetSpaceAvailableForOrigin(originIdentifier);
 }
 
 // Indexed Database -----------------------------------------------------------
 
-PassRefPtr<IDBFactoryBackendInterface> PlatformBridge::idbFactory()
+PassRefPtr<IDBFactoryBackendInterface> PlatformSupport::idbFactory()
 {
     // There's no reason why we need to allocate a new proxy each time, but
     // there's also no strong reason not to.
     return IDBFactoryBackendProxy::create();
 }
 
-void PlatformBridge::createIDBKeysFromSerializedValuesAndKeyPath(const Vector<RefPtr<SerializedScriptValue> >& values, const String& keyPath, Vector<RefPtr<IDBKey> >& keys)
+void PlatformSupport::createIDBKeysFromSerializedValuesAndKeyPath(const Vector<RefPtr<SerializedScriptValue> >& values, const String& keyPath, Vector<RefPtr<IDBKey> >& keys)
 {
     WebVector<WebSerializedScriptValue> webValues = values;
     WebVector<WebIDBKey> webKeys;
@@ -532,14 +532,14 @@ void PlatformBridge::createIDBKeysFromSerializedValuesAndKeyPath(const Vector<Re
         keys.append(PassRefPtr<IDBKey>(webKeys[i]));
 }
 
-PassRefPtr<SerializedScriptValue> PlatformBridge::injectIDBKeyIntoSerializedValue(PassRefPtr<IDBKey> key, PassRefPtr<SerializedScriptValue> value, const String& keyPath)
+PassRefPtr<SerializedScriptValue> PlatformSupport::injectIDBKeyIntoSerializedValue(PassRefPtr<IDBKey> key, PassRefPtr<SerializedScriptValue> value, const String& keyPath)
 {
     return webKitPlatformSupport()->injectIDBKeyIntoSerializedValue(key, value, keyPath);
 }
 
 // Keygen ---------------------------------------------------------------------
 
-String PlatformBridge::signedPublicKeyAndChallengeString(
+String PlatformSupport::signedPublicKeyAndChallengeString(
     unsigned keySizeIndex, const String& challenge, const KURL& url)
 {
     return webKitPlatformSupport()->signedPublicKeyAndChallengeString(keySizeIndex,
@@ -549,68 +549,68 @@ String PlatformBridge::signedPublicKeyAndChallengeString(
 
 // Language -------------------------------------------------------------------
 
-String PlatformBridge::computedDefaultLanguage()
+String PlatformSupport::computedDefaultLanguage()
 {
     return webKitPlatformSupport()->defaultLocale();
 }
 
 // LayoutTestMode -------------------------------------------------------------
 
-bool PlatformBridge::layoutTestMode()
+bool PlatformSupport::layoutTestMode()
 {
     return WebKit::layoutTestMode();
 }
 
 // MimeType -------------------------------------------------------------------
 
-bool PlatformBridge::isSupportedImageMIMEType(const String& mimeType)
+bool PlatformSupport::isSupportedImageMIMEType(const String& mimeType)
 {
     return webKitPlatformSupport()->mimeRegistry()->supportsImageMIMEType(mimeType)
         != WebMimeRegistry::IsNotSupported;
 }
 
-bool PlatformBridge::isSupportedJavaScriptMIMEType(const String& mimeType)
+bool PlatformSupport::isSupportedJavaScriptMIMEType(const String& mimeType)
 {
     return webKitPlatformSupport()->mimeRegistry()->supportsJavaScriptMIMEType(mimeType)
         != WebMimeRegistry::IsNotSupported;
 }
 
-bool PlatformBridge::isSupportedNonImageMIMEType(const String& mimeType)
+bool PlatformSupport::isSupportedNonImageMIMEType(const String& mimeType)
 {
     return webKitPlatformSupport()->mimeRegistry()->supportsNonImageMIMEType(mimeType)
         != WebMimeRegistry::IsNotSupported;
 }
 
-String PlatformBridge::mimeTypeForExtension(const String& extension)
+String PlatformSupport::mimeTypeForExtension(const String& extension)
 {
     return webKitPlatformSupport()->mimeRegistry()->mimeTypeForExtension(extension);
 }
 
-String PlatformBridge::wellKnownMimeTypeForExtension(const String& extension)
+String PlatformSupport::wellKnownMimeTypeForExtension(const String& extension)
 {
     return webKitPlatformSupport()->mimeRegistry()->wellKnownMimeTypeForExtension(extension);
 }
 
-String PlatformBridge::mimeTypeFromFile(const String& path)
+String PlatformSupport::mimeTypeFromFile(const String& path)
 {
     return webKitPlatformSupport()->mimeRegistry()->mimeTypeFromFile(path);
 }
 
-String PlatformBridge::preferredExtensionForMIMEType(const String& mimeType)
+String PlatformSupport::preferredExtensionForMIMEType(const String& mimeType)
 {
     return webKitPlatformSupport()->mimeRegistry()->preferredExtensionForMIMEType(mimeType);
 }
 
 // Plugin ---------------------------------------------------------------------
 
-bool PlatformBridge::plugins(bool refresh, Vector<PluginInfo>* results)
+bool PlatformSupport::plugins(bool refresh, Vector<PluginInfo>* results)
 {
     WebPluginListBuilderImpl builder(results);
     webKitPlatformSupport()->getPluginList(refresh, &builder);
     return true;  // FIXME: There is no need for this function to return a value.
 }
 
-NPObject* PlatformBridge::pluginScriptableObject(Widget* widget)
+NPObject* PlatformSupport::pluginScriptableObject(Widget* widget)
 {
     if (!widget || !widget->isPluginContainer())
         return 0;
@@ -620,7 +620,7 @@ NPObject* PlatformBridge::pluginScriptableObject(Widget* widget)
 
 // Resources ------------------------------------------------------------------
 
-PassRefPtr<Image> PlatformBridge::loadPlatformImageResource(const char* name)
+PassRefPtr<Image> PlatformSupport::loadPlatformImageResource(const char* name)
 {
     const WebData& resource = webKitPlatformSupport()->loadResource(name);
     if (resource.isEmpty())
@@ -633,7 +633,7 @@ PassRefPtr<Image> PlatformBridge::loadPlatformImageResource(const char* name)
 
 #if ENABLE(WEB_AUDIO)
 
-PassOwnPtr<AudioBus> PlatformBridge::loadPlatformAudioResource(const char* name, double sampleRate)
+PassOwnPtr<AudioBus> PlatformSupport::loadPlatformAudioResource(const char* name, double sampleRate)
 {
     const WebData& resource = webKitPlatformSupport()->loadResource(name);
     if (resource.isEmpty())
@@ -642,7 +642,7 @@ PassOwnPtr<AudioBus> PlatformBridge::loadPlatformAudioResource(const char* name,
     return decodeAudioFileData(resource.data(), resource.size(), sampleRate);
 }
 
-PassOwnPtr<AudioBus> PlatformBridge::decodeAudioFileData(const char* data, size_t size, double sampleRate)
+PassOwnPtr<AudioBus> PlatformSupport::decodeAudioFileData(const char* data, size_t size, double sampleRate)
 {
     WebAudioBus webAudioBus;
     if (webKitPlatformSupport()->loadAudioResource(&webAudioBus, data, size, sampleRate))
@@ -654,53 +654,53 @@ PassOwnPtr<AudioBus> PlatformBridge::decodeAudioFileData(const char* data, size_
 
 // Sandbox --------------------------------------------------------------------
 
-bool PlatformBridge::sandboxEnabled()
+bool PlatformSupport::sandboxEnabled()
 {
     return webKitPlatformSupport()->sandboxEnabled();
 }
 
 // SharedTimers ---------------------------------------------------------------
 
-void PlatformBridge::setSharedTimerFiredFunction(void (*func)())
+void PlatformSupport::setSharedTimerFiredFunction(void (*func)())
 {
     webKitPlatformSupport()->setSharedTimerFiredFunction(func);
 }
 
-void PlatformBridge::setSharedTimerFireInterval(double interval)
+void PlatformSupport::setSharedTimerFireInterval(double interval)
 {
     webKitPlatformSupport()->setSharedTimerFireInterval(interval);
 }
 
-void PlatformBridge::stopSharedTimer()
+void PlatformSupport::stopSharedTimer()
 {
     webKitPlatformSupport()->stopSharedTimer();
 }
 
 // StatsCounters --------------------------------------------------------------
 
-void PlatformBridge::decrementStatsCounter(const char* name)
+void PlatformSupport::decrementStatsCounter(const char* name)
 {
     webKitPlatformSupport()->decrementStatsCounter(name);
 }
 
-void PlatformBridge::incrementStatsCounter(const char* name)
+void PlatformSupport::incrementStatsCounter(const char* name)
 {
     webKitPlatformSupport()->incrementStatsCounter(name);
 }
 
-void PlatformBridge::histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount)
+void PlatformSupport::histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount)
 {
     webKitPlatformSupport()->histogramCustomCounts(name, sample, min, max, bucketCount);
 }
 
-void PlatformBridge::histogramEnumeration(const char* name, int sample, int boundaryValue)
+void PlatformSupport::histogramEnumeration(const char* name, int sample, int boundaryValue)
 {
     webKitPlatformSupport()->histogramEnumeration(name, sample, boundaryValue);
 }
 
 // Sudden Termination ---------------------------------------------------------
 
-void PlatformBridge::suddenTerminationChanged(bool enabled)
+void PlatformSupport::suddenTerminationChanged(bool enabled)
 {
     webKitPlatformSupport()->suddenTerminationChanged(enabled);
 }
@@ -709,7 +709,7 @@ void PlatformBridge::suddenTerminationChanged(bool enabled)
 
 #if OS(WINDOWS)
 
-void PlatformBridge::paintButton(
+void PlatformSupport::paintButton(
     GraphicsContext* gc, int part, int state, int classicState,
     const IntRect& rect)
 {
@@ -717,7 +717,7 @@ void PlatformBridge::paintButton(
         gc->platformContext()->canvas(), part, state, classicState, rect);
 }
 
-void PlatformBridge::paintMenuList(
+void PlatformSupport::paintMenuList(
     GraphicsContext* gc, int part, int state, int classicState,
     const IntRect& rect)
 {
@@ -725,7 +725,7 @@ void PlatformBridge::paintMenuList(
         gc->platformContext()->canvas(), part, state, classicState, rect);
 }
 
-void PlatformBridge::paintScrollbarArrow(
+void PlatformSupport::paintScrollbarArrow(
     GraphicsContext* gc, int state, int classicState,
     const IntRect& rect)
 {
@@ -733,7 +733,7 @@ void PlatformBridge::paintScrollbarArrow(
         gc->platformContext()->canvas(), state, classicState, rect);
 }
 
-void PlatformBridge::paintScrollbarThumb(
+void PlatformSupport::paintScrollbarThumb(
     GraphicsContext* gc, int part, int state, int classicState,
     const IntRect& rect)
 {
@@ -741,7 +741,7 @@ void PlatformBridge::paintScrollbarThumb(
         gc->platformContext()->canvas(), part, state, classicState, rect);
 }
 
-void PlatformBridge::paintScrollbarTrack(
+void PlatformSupport::paintScrollbarTrack(
     GraphicsContext* gc, int part, int state, int classicState,
     const IntRect& rect, const IntRect& alignRect)
 {
@@ -750,7 +750,7 @@ void PlatformBridge::paintScrollbarTrack(
         alignRect);
 }
 
-void PlatformBridge::paintSpinButton(
+void PlatformSupport::paintSpinButton(
     GraphicsContext* gc, int part, int state, int classicState,
     const IntRect& rect)
 {
@@ -758,7 +758,7 @@ void PlatformBridge::paintSpinButton(
         gc->platformContext()->canvas(), part, state, classicState, rect);
 }
 
-void PlatformBridge::paintTextField(
+void PlatformSupport::paintTextField(
     GraphicsContext* gc, int part, int state, int classicState,
     const IntRect& rect, const Color& color, bool fillContentArea,
     bool drawEdges)
@@ -771,7 +771,7 @@ void PlatformBridge::paintTextField(
         backgroundColor, fillContentArea, drawEdges);
 }
 
-void PlatformBridge::paintTrackbar(
+void PlatformSupport::paintTrackbar(
     GraphicsContext* gc, int part, int state, int classicState,
     const IntRect& rect)
 {
@@ -779,7 +779,7 @@ void PlatformBridge::paintTrackbar(
         gc->platformContext()->canvas(), part, state, classicState, rect);
 }
 
-void PlatformBridge::paintProgressBar(
+void PlatformSupport::paintProgressBar(
     GraphicsContext* gc, const IntRect& barRect, const IntRect& valueRect, bool determinate, double animatedSeconds)
 {
     webKitPlatformSupport()->themeEngine()->paintProgressBar(
@@ -788,7 +788,7 @@ void PlatformBridge::paintProgressBar(
 
 #elif OS(DARWIN)
 
-void PlatformBridge::paintScrollbarThumb(
+void PlatformSupport::paintScrollbarThumb(
     GraphicsContext* gc, ThemePaintState state, ThemePaintSize size, const IntRect& rect, const ThemePaintScrollbarInfo& scrollbarInfo)
 {
     WebThemeEngine::ScrollbarInfo webThemeScrollbarInfo;
@@ -815,87 +815,87 @@ void PlatformBridge::paintScrollbarThumb(
 
 #elif OS(UNIX)
 
-static WebThemeEngine::Part WebThemePart(PlatformBridge::ThemePart part)
+static WebThemeEngine::Part WebThemePart(PlatformSupport::ThemePart part)
 {
     switch (part) {
-    case PlatformBridge::PartScrollbarDownArrow: return WebThemeEngine::PartScrollbarDownArrow;
-    case PlatformBridge::PartScrollbarLeftArrow: return WebThemeEngine::PartScrollbarLeftArrow;
-    case PlatformBridge::PartScrollbarRightArrow: return WebThemeEngine::PartScrollbarRightArrow;
-    case PlatformBridge::PartScrollbarUpArrow: return WebThemeEngine::PartScrollbarUpArrow;
-    case PlatformBridge::PartScrollbarHorizontalThumb: return WebThemeEngine::PartScrollbarHorizontalThumb;
-    case PlatformBridge::PartScrollbarVerticalThumb: return WebThemeEngine::PartScrollbarVerticalThumb;
-    case PlatformBridge::PartScrollbarHorizontalTrack: return WebThemeEngine::PartScrollbarHorizontalTrack;
-    case PlatformBridge::PartScrollbarVerticalTrack: return WebThemeEngine::PartScrollbarVerticalTrack;
-    case PlatformBridge::PartCheckbox: return WebThemeEngine::PartCheckbox;
-    case PlatformBridge::PartRadio: return WebThemeEngine::PartRadio;
-    case PlatformBridge::PartButton: return WebThemeEngine::PartButton;
-    case PlatformBridge::PartTextField: return WebThemeEngine::PartTextField;
-    case PlatformBridge::PartMenuList: return WebThemeEngine::PartMenuList;
-    case PlatformBridge::PartSliderTrack: return WebThemeEngine::PartSliderTrack;
-    case PlatformBridge::PartSliderThumb: return WebThemeEngine::PartSliderThumb;
-    case PlatformBridge::PartInnerSpinButton: return WebThemeEngine::PartInnerSpinButton;
-    case PlatformBridge::PartProgressBar: return WebThemeEngine::PartProgressBar;
+    case PlatformSupport::PartScrollbarDownArrow: return WebThemeEngine::PartScrollbarDownArrow;
+    case PlatformSupport::PartScrollbarLeftArrow: return WebThemeEngine::PartScrollbarLeftArrow;
+    case PlatformSupport::PartScrollbarRightArrow: return WebThemeEngine::PartScrollbarRightArrow;
+    case PlatformSupport::PartScrollbarUpArrow: return WebThemeEngine::PartScrollbarUpArrow;
+    case PlatformSupport::PartScrollbarHorizontalThumb: return WebThemeEngine::PartScrollbarHorizontalThumb;
+    case PlatformSupport::PartScrollbarVerticalThumb: return WebThemeEngine::PartScrollbarVerticalThumb;
+    case PlatformSupport::PartScrollbarHorizontalTrack: return WebThemeEngine::PartScrollbarHorizontalTrack;
+    case PlatformSupport::PartScrollbarVerticalTrack: return WebThemeEngine::PartScrollbarVerticalTrack;
+    case PlatformSupport::PartCheckbox: return WebThemeEngine::PartCheckbox;
+    case PlatformSupport::PartRadio: return WebThemeEngine::PartRadio;
+    case PlatformSupport::PartButton: return WebThemeEngine::PartButton;
+    case PlatformSupport::PartTextField: return WebThemeEngine::PartTextField;
+    case PlatformSupport::PartMenuList: return WebThemeEngine::PartMenuList;
+    case PlatformSupport::PartSliderTrack: return WebThemeEngine::PartSliderTrack;
+    case PlatformSupport::PartSliderThumb: return WebThemeEngine::PartSliderThumb;
+    case PlatformSupport::PartInnerSpinButton: return WebThemeEngine::PartInnerSpinButton;
+    case PlatformSupport::PartProgressBar: return WebThemeEngine::PartProgressBar;
     }
     ASSERT_NOT_REACHED();
     return WebThemeEngine::PartScrollbarDownArrow;
 }
 
-static WebThemeEngine::State WebThemeState(PlatformBridge::ThemePaintState state)
+static WebThemeEngine::State WebThemeState(PlatformSupport::ThemePaintState state)
 {
     switch (state) {
-    case PlatformBridge::StateDisabled: return WebThemeEngine::StateDisabled;
-    case PlatformBridge::StateHover: return WebThemeEngine::StateHover;
-    case PlatformBridge::StateNormal: return WebThemeEngine::StateNormal;
-    case PlatformBridge::StatePressed: return WebThemeEngine::StatePressed;
+    case PlatformSupport::StateDisabled: return WebThemeEngine::StateDisabled;
+    case PlatformSupport::StateHover: return WebThemeEngine::StateHover;
+    case PlatformSupport::StateNormal: return WebThemeEngine::StateNormal;
+    case PlatformSupport::StatePressed: return WebThemeEngine::StatePressed;
     }
     ASSERT_NOT_REACHED();
     return WebThemeEngine::StateDisabled;
 }
 
-static void GetWebThemeExtraParams(PlatformBridge::ThemePart part, PlatformBridge::ThemePaintState state, const PlatformBridge::ThemePaintExtraParams* extraParams, WebThemeEngine::ExtraParams* webThemeExtraParams)
+static void GetWebThemeExtraParams(PlatformSupport::ThemePart part, PlatformSupport::ThemePaintState state, const PlatformSupport::ThemePaintExtraParams* extraParams, WebThemeEngine::ExtraParams* webThemeExtraParams)
 {
     switch (part) {
-    case PlatformBridge::PartScrollbarHorizontalTrack:
-    case PlatformBridge::PartScrollbarVerticalTrack:
+    case PlatformSupport::PartScrollbarHorizontalTrack:
+    case PlatformSupport::PartScrollbarVerticalTrack:
         webThemeExtraParams->scrollbarTrack.trackX = extraParams->scrollbarTrack.trackX;
         webThemeExtraParams->scrollbarTrack.trackY = extraParams->scrollbarTrack.trackY;
         webThemeExtraParams->scrollbarTrack.trackWidth = extraParams->scrollbarTrack.trackWidth;
         webThemeExtraParams->scrollbarTrack.trackHeight = extraParams->scrollbarTrack.trackHeight;
         break;
-    case PlatformBridge::PartCheckbox:
+    case PlatformSupport::PartCheckbox:
         webThemeExtraParams->button.checked = extraParams->button.checked;
         webThemeExtraParams->button.indeterminate = extraParams->button.indeterminate;
         break;
-    case PlatformBridge::PartRadio:
+    case PlatformSupport::PartRadio:
         webThemeExtraParams->button.checked = extraParams->button.checked;
         break;
-    case PlatformBridge::PartButton:
+    case PlatformSupport::PartButton:
         webThemeExtraParams->button.isDefault = extraParams->button.isDefault;
         webThemeExtraParams->button.hasBorder = extraParams->button.hasBorder;
         webThemeExtraParams->button.backgroundColor = extraParams->button.backgroundColor;
         break;
-    case PlatformBridge::PartTextField:
+    case PlatformSupport::PartTextField:
         webThemeExtraParams->textField.isTextArea = extraParams->textField.isTextArea;
         webThemeExtraParams->textField.isListbox = extraParams->textField.isListbox;
         webThemeExtraParams->textField.backgroundColor = extraParams->textField.backgroundColor;
         break;
-    case PlatformBridge::PartMenuList:
+    case PlatformSupport::PartMenuList:
         webThemeExtraParams->menuList.hasBorder = extraParams->menuList.hasBorder;
         webThemeExtraParams->menuList.hasBorderRadius = extraParams->menuList.hasBorderRadius;
         webThemeExtraParams->menuList.arrowX = extraParams->menuList.arrowX;
         webThemeExtraParams->menuList.arrowY = extraParams->menuList.arrowY;
         webThemeExtraParams->menuList.backgroundColor = extraParams->menuList.backgroundColor;
         break;
-    case PlatformBridge::PartSliderTrack:
-    case PlatformBridge::PartSliderThumb:
+    case PlatformSupport::PartSliderTrack:
+    case PlatformSupport::PartSliderThumb:
         webThemeExtraParams->slider.vertical = extraParams->slider.vertical;
         webThemeExtraParams->slider.inDrag = extraParams->slider.inDrag;
         break;
-    case PlatformBridge::PartInnerSpinButton:
+    case PlatformSupport::PartInnerSpinButton:
         webThemeExtraParams->innerSpin.spinUp = extraParams->innerSpin.spinUp;
         webThemeExtraParams->innerSpin.readOnly = extraParams->innerSpin.readOnly;
         break;
-    case PlatformBridge::PartProgressBar:
+    case PlatformSupport::PartProgressBar:
         webThemeExtraParams->progressBar.determinate = extraParams->progressBar.determinate;
         webThemeExtraParams->progressBar.valueRectX = extraParams->progressBar.valueRectX;
         webThemeExtraParams->progressBar.valueRectY = extraParams->progressBar.valueRectY;
@@ -907,12 +907,12 @@ static void GetWebThemeExtraParams(PlatformBridge::ThemePart part, PlatformBridg
     }
 }
 
-IntSize PlatformBridge::getThemePartSize(ThemePart part)
+IntSize PlatformSupport::getThemePartSize(ThemePart part)
 {
      return webKitPlatformSupport()->themeEngine()->getSize(WebThemePart(part));
 }
 
-void PlatformBridge::paintThemePart(
+void PlatformSupport::paintThemePart(
     GraphicsContext* gc, ThemePart part, ThemePaintState state, const IntRect& rect, const ThemePaintExtraParams* extraParams)
 {
     WebThemeEngine::ExtraParams webThemeExtraParams;
@@ -925,19 +925,19 @@ void PlatformBridge::paintThemePart(
 
 // Trace Event ----------------------------------------------------------------
 
-void PlatformBridge::traceEventBegin(const char* name, void* id, const char* extra)
+void PlatformSupport::traceEventBegin(const char* name, void* id, const char* extra)
 {
     webKitPlatformSupport()->traceEventBegin(name, id, extra);
 }
 
-void PlatformBridge::traceEventEnd(const char* name, void* id, const char* extra)
+void PlatformSupport::traceEventEnd(const char* name, void* id, const char* extra)
 {
     webKitPlatformSupport()->traceEventEnd(name, id, extra);
 }
 
 // Visited Links --------------------------------------------------------------
 
-LinkHash PlatformBridge::visitedLinkHash(const UChar* url, unsigned length)
+LinkHash PlatformSupport::visitedLinkHash(const UChar* url, unsigned length)
 {
     url_canon::RawCanonOutput<2048> buffer;
     url_parse::Parsed parsed;
@@ -946,7 +946,7 @@ LinkHash PlatformBridge::visitedLinkHash(const UChar* url, unsigned length)
     return webKitPlatformSupport()->visitedLinkHash(buffer.data(), buffer.length());
 }
 
-LinkHash PlatformBridge::visitedLinkHash(const KURL& base,
+LinkHash PlatformSupport::visitedLinkHash(const KURL& base,
                                          const AtomicString& attributeURL)
 {
     // Resolve the relative URL using googleurl and pass the absolute URL up to
@@ -980,7 +980,7 @@ LinkHash PlatformBridge::visitedLinkHash(const KURL& base,
     return webKitPlatformSupport()->visitedLinkHash(buffer.data(), buffer.length());
 }
 
-bool PlatformBridge::isLinkVisited(LinkHash visitedLinkHash)
+bool PlatformSupport::isLinkVisited(LinkHash visitedLinkHash)
 {
     return webKitPlatformSupport()->isLinkVisited(visitedLinkHash);
 }
@@ -989,7 +989,7 @@ bool PlatformBridge::isLinkVisited(LinkHash visitedLinkHash)
 // Glue layer. Once the Glue layer moves entirely into the WebKit layer, these
 // methods will be deleted.
 
-void PlatformBridge::notifyJSOutOfMemory(Frame* frame)
+void PlatformSupport::notifyJSOutOfMemory(Frame* frame)
 {
     if (!frame)
         return;
@@ -1000,17 +1000,17 @@ void PlatformBridge::notifyJSOutOfMemory(Frame* frame)
     webFrame->client()->didExhaustMemoryAvailableForScript(webFrame);
 }
 
-int PlatformBridge::memoryUsageMB()
+int PlatformSupport::memoryUsageMB()
 {
     return static_cast<int>(webKitPlatformSupport()->memoryUsageMB());
 }
 
-int PlatformBridge::actualMemoryUsageMB()
+int PlatformSupport::actualMemoryUsageMB()
 {
     return static_cast<int>(webKitPlatformSupport()->actualMemoryUsageMB());
 }
 
-int PlatformBridge::screenDepth(Widget* widget)
+int PlatformSupport::screenDepth(Widget* widget)
 {
     WebWidgetClient* client = toWebWidgetClient(widget);
     if (!client)
@@ -1018,7 +1018,7 @@ int PlatformBridge::screenDepth(Widget* widget)
     return client->screenInfo().depth;
 }
 
-int PlatformBridge::screenDepthPerComponent(Widget* widget)
+int PlatformSupport::screenDepthPerComponent(Widget* widget)
 {
     WebWidgetClient* client = toWebWidgetClient(widget);
     if (!client)
@@ -1026,7 +1026,7 @@ int PlatformBridge::screenDepthPerComponent(Widget* widget)
     return client->screenInfo().depthPerComponent;
 }
 
-bool PlatformBridge::screenIsMonochrome(Widget* widget)
+bool PlatformSupport::screenIsMonochrome(Widget* widget)
 {
     WebWidgetClient* client = toWebWidgetClient(widget);
     if (!client)
@@ -1034,7 +1034,7 @@ bool PlatformBridge::screenIsMonochrome(Widget* widget)
     return client->screenInfo().isMonochrome;
 }
 
-IntRect PlatformBridge::screenRect(Widget* widget)
+IntRect PlatformSupport::screenRect(Widget* widget)
 {
     WebWidgetClient* client = toWebWidgetClient(widget);
     if (!client)
@@ -1042,7 +1042,7 @@ IntRect PlatformBridge::screenRect(Widget* widget)
     return client->screenInfo().rect;
 }
 
-IntRect PlatformBridge::screenAvailableRect(Widget* widget)
+IntRect PlatformSupport::screenAvailableRect(Widget* widget)
 {
     WebWidgetClient* client = toWebWidgetClient(widget);
     if (!client)
@@ -1050,7 +1050,7 @@ IntRect PlatformBridge::screenAvailableRect(Widget* widget)
     return client->screenInfo().availableRect;
 }
 
-bool PlatformBridge::popupsAllowed(NPP npp)
+bool PlatformSupport::popupsAllowed(NPP npp)
 {
     // FIXME: Give the embedder a way to control this.
     return false;
index f80126c..1071ca8 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "ResourceHandle.h"
 
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "ResourceHandleClient.h"
 #include "ResourceHandleInternal.h"
 #include "ResourceRequest.h"
@@ -293,7 +293,7 @@ bool ResourceHandle::willLoadFromCache(ResourceRequest& request, Frame*)
 // static
 void ResourceHandle::cacheMetadata(const ResourceResponse& response, const Vector<char>& data)
 {
-    PlatformBridge::cacheMetadata(response.url(), response.responseTime(), data);
+    PlatformSupport::cacheMetadata(response.url(), response.responseTime(), data);
 }
 
 } // namespace WebCore
index 55b05e0..b8b0d6e 100644 (file)
 #include "PageOverlay.h"
 #include "painting/GraphicsContextBuilder.h"
 #include "Performance.h"
-#include "PlatformBridge.h"
+#include "PlatformSupport.h"
 #include "PluginDocument.h"
 #include "PrintContext.h"
 #include "RenderFrame.h"
@@ -1869,13 +1869,13 @@ WebFrameImpl::WebFrameImpl(WebFrameClient* client)
     , m_identifier(generateFrameIdentifier())
     , m_inSameDocumentHistoryLoad(false)
 {
-    PlatformBridge::incrementStatsCounter(webFrameActiveCount);
+    PlatformSupport::incrementStatsCounter(webFrameActiveCount);
     frameCount++;
 }
 
 WebFrameImpl::~WebFrameImpl()
 {
-    PlatformBridge::decrementStatsCounter(webFrameActiveCount);
+    PlatformSupport::decrementStatsCounter(webFrameActiveCount);
     frameCount--;
 
     cancelPendingScopingEffort();
index e2b902a..5d3fd7a 100644 (file)
@@ -1142,8 +1142,8 @@ void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect)
             webframe->paint(canvas, rect);
         double paintEnd = currentTime();
         double pixelsPerSec = (rect.width * rect.height) / (paintEnd - paintStart);
-        PlatformBridge::histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
-        PlatformBridge::histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
+        PlatformSupport::histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
+        PlatformSupport::histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
     }
 }
 
@@ -2581,8 +2581,8 @@ public:
         view->paintContents(&context, contentRect);
         double paintEnd = currentTime();
         double pixelsPerSec = (contentRect.width() * contentRect.height()) / (paintEnd - paintStart);
-        PlatformBridge::histogramCustomCounts("Renderer4.AccelRootPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
-        PlatformBridge::histogramCustomCounts("Renderer4.AccelRootPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
+        PlatformSupport::histogramCustomCounts("Renderer4.AccelRootPaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30);
+        PlatformSupport::histogramCustomCounts("Renderer4.AccelRootPaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30);
     }
 
 private:
@@ -2596,7 +2596,7 @@ private:
 
 void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
 {
-    PlatformBridge::histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
+    PlatformSupport::histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
 
     if (m_isAcceleratedCompositingActive == active)
         return;