2011-01-19 Sheriff Bot <webkit.review.bot@gmail.com>
authordimich@chromium.org <dimich@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Jan 2011 06:09:20 +0000 (06:09 +0000)
committerdimich@chromium.org <dimich@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Jan 2011 06:09:20 +0000 (06:09 +0000)
        Unreviewed, rolling out r76203.
        http://trac.webkit.org/changeset/76203
        https://bugs.webkit.org/show_bug.cgi?id=52784

        Broke Win compile on Chromium bots (Requested by dimich on
        #webkit).

        * WebCore.gypi:
        * bindings/v8/V8DOMWindowShell.cpp:
        (WebCore::reportFatalErrorInV8):
        * page/PageGroup.cpp:
        (WebCore::PageGroup::isLinkVisited):
        * platform/android/PlatformBridge.h:
        * platform/audio/chromium/AudioBusChromium.cpp:
        (WebCore::createBusFromInMemoryAudioFile):
        * platform/chromium/ChromiumBridge.h: Added.
        * platform/chromium/ChromiumDataObjectLegacy.cpp:
        (WebCore::ChromiumDataObjectLegacy::getData):
        * 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::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:
        * platform/chromium/PlatformScreenChromium.cpp:
        (WebCore::screenDepth):
        (WebCore::screenDepthPerComponent):
        (WebCore::screenIsMonochrome):
        (WebCore::screenRect):
        (WebCore::screenAvailableRect):
        * platform/chromium/ReadableDataObject.cpp:
        (WebCore::ReadableDataObject::getData):
        (WebCore::ReadableDataObject::urlTitle):
        (WebCore::ReadableDataObject::htmlBaseUrl):
        (WebCore::ReadableDataObject::filenames):
        (WebCore::ReadableDataObject::ensureTypeCacheInitialized):
        * 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::setSharedTimerFireTime):
        (WebCore::stopSharedTimer):
        * platform/chromium/SuddenTerminationChromium.cpp:
        (WebCore::disableSuddenTermination):
        (WebCore::enableSuddenTermination):
        * platform/chromium/SystemTimeChromium.cpp:
        (WebCore::currentTime):
        * platform/chromium/WritableDataObject.cpp:
        (WebCore::WritableDataObject::setData):
        * 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::Font::drawGlyphs):
        * 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:
        * platform/sql/chromium/SQLiteFileSystemChromium.cpp:
        (WebCore::SQLiteFileSystem::deleteDatabaseFile):
        (WebCore::SQLiteFileSystem::getDatabaseFileSize):
        * platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
        (chromiumOpen):
        (chromiumDelete):
        (chromiumAccess):
        * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp:
        * plugins/chromium/PluginDataChromium.cpp:
        (WebCore::PluginCache::plugins):
        * 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):
        (WebCore::IDBFactoryBackendInterface::~IDBFactoryBackendInterface):
        * storage/chromium/IDBKeyPathBackendImpl.cpp:
        (WebCore::IDBKeyPathBackendImpl::createIDBKeysFromSerializedValuesAndKeyPath):
2011-01-19  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r76203.
        http://trac.webkit.org/changeset/76203
        https://bugs.webkit.org/show_bug.cgi?id=52784

        Broke Win compile on Chromium bots (Requested by dimich on
        #webkit).

        * WebKit.gyp:
        * src/AssertMatchingEnums.cpp:
        * src/ChromiumBridge.cpp: Renamed from Source/WebKit/chromium/src/PlatformBridge.cpp.
        (WebCore::toChromeClientImpl):
        (WebCore::toWebWidgetClient):
        (WebCore::getCookieJar):
        (WebCore::ChromiumBridge::cacheMetadata):
        (WebCore::ChromiumBridge::clipboardIsFormatAvailable):
        (WebCore::ChromiumBridge::clipboardReadPlainText):
        (WebCore::ChromiumBridge::clipboardReadHTML):
        (WebCore::ChromiumBridge::clipboardWriteSelection):
        (WebCore::ChromiumBridge::clipboardWritePlainText):
        (WebCore::ChromiumBridge::clipboardWriteURL):
        (WebCore::ChromiumBridge::clipboardWriteImage):
        (WebCore::ChromiumBridge::clipboardWriteData):
        (WebCore::ChromiumBridge::clipboardReadAvailableTypes):
        (WebCore::ChromiumBridge::clipboardReadData):
        (WebCore::ChromiumBridge::clipboardReadFilenames):
        (WebCore::ChromiumBridge::setCookies):
        (WebCore::ChromiumBridge::cookies):
        (WebCore::ChromiumBridge::cookieRequestHeaderFieldValue):
        (WebCore::ChromiumBridge::rawCookies):
        (WebCore::ChromiumBridge::deleteCookie):
        (WebCore::ChromiumBridge::cookiesEnabled):
        (WebCore::ChromiumBridge::prefetchDNS):
        (WebCore::ChromiumBridge::fileExists):
        (WebCore::ChromiumBridge::deleteFile):
        (WebCore::ChromiumBridge::deleteEmptyDirectory):
        (WebCore::ChromiumBridge::getFileSize):
        (WebCore::ChromiumBridge::revealFolderInOS):
        (WebCore::ChromiumBridge::getFileModificationTime):
        (WebCore::ChromiumBridge::directoryName):
        (WebCore::ChromiumBridge::pathByAppendingComponent):
        (WebCore::ChromiumBridge::makeAllDirectories):
        (WebCore::ChromiumBridge::getAbsolutePath):
        (WebCore::ChromiumBridge::isDirectory):
        (WebCore::ChromiumBridge::filePathToURL):
        (WebCore::ChromiumBridge::openFile):
        (WebCore::ChromiumBridge::closeFile):
        (WebCore::ChromiumBridge::seekFile):
        (WebCore::ChromiumBridge::truncateFile):
        (WebCore::ChromiumBridge::readFromFile):
        (WebCore::ChromiumBridge::writeToFile):
        (WebCore::ChromiumBridge::ensureFontLoaded):
        (WebCore::ChromiumBridge::getFontFamilyForCharacters):
        (WebCore::ChromiumBridge::getRenderStyleForStrike):
        (WebCore::ChromiumBridge::loadFont):
        (WebCore::ChromiumBridge::databaseOpenFile):
        (WebCore::ChromiumBridge::databaseDeleteFile):
        (WebCore::ChromiumBridge::databaseGetFileAttributes):
        (WebCore::ChromiumBridge::databaseGetFileSize):
        (WebCore::ChromiumBridge::idbFactory):
        (WebCore::ChromiumBridge::idbShutdown):
        (WebCore::ChromiumBridge::createIDBKeysFromSerializedValuesAndKeyPath):
        (WebCore::ChromiumBridge::signedPublicKeyAndChallengeString):
        (WebCore::ChromiumBridge::computedDefaultLanguage):
        (WebCore::ChromiumBridge::layoutTestMode):
        (WebCore::ChromiumBridge::isSupportedImageMIMEType):
        (WebCore::ChromiumBridge::isSupportedJavaScriptMIMEType):
        (WebCore::ChromiumBridge::isSupportedNonImageMIMEType):
        (WebCore::ChromiumBridge::mimeTypeForExtension):
        (WebCore::ChromiumBridge::mimeTypeFromFile):
        (WebCore::ChromiumBridge::preferredExtensionForMIMEType):
        (WebCore::ChromiumBridge::plugins):
        (WebCore::ChromiumBridge::pluginScriptableObject):
        (WebCore::ChromiumBridge::loadPlatformImageResource):
        (WebCore::ChromiumBridge::loadPlatformAudioResource):
        (WebCore::ChromiumBridge::decodeAudioFileData):
        (WebCore::ChromiumBridge::sandboxEnabled):
        (WebCore::ChromiumBridge::setSharedTimerFiredFunction):
        (WebCore::ChromiumBridge::setSharedTimerFireTime):
        (WebCore::ChromiumBridge::stopSharedTimer):
        (WebCore::ChromiumBridge::decrementStatsCounter):
        (WebCore::ChromiumBridge::incrementStatsCounter):
        (WebCore::ChromiumBridge::histogramCustomCounts):
        (WebCore::ChromiumBridge::histogramEnumeration):
        (WebCore::ChromiumBridge::suddenTerminationChanged):
        (WebCore::ChromiumBridge::currentTime):
        (WebCore::ChromiumBridge::paintButton):
        (WebCore::ChromiumBridge::paintMenuList):
        (WebCore::ChromiumBridge::paintScrollbarArrow):
        (WebCore::ChromiumBridge::paintScrollbarThumb):
        (WebCore::ChromiumBridge::paintScrollbarTrack):
        (WebCore::ChromiumBridge::paintSpinButton):
        (WebCore::ChromiumBridge::paintTextField):
        (WebCore::ChromiumBridge::paintTrackbar):
        (WebCore::ChromiumBridge::paintProgressBar):
        (WebCore::WebThemePart):
        (WebCore::WebThemeState):
        (WebCore::GetWebThemeExtraParams):
        (WebCore::ChromiumBridge::getThemePartSize):
        (WebCore::ChromiumBridge::paintThemePart):
        (WebCore::ChromiumBridge::traceEventBegin):
        (WebCore::ChromiumBridge::traceEventEnd):
        (WebCore::ChromiumBridge::visitedLinkHash):
        (WebCore::ChromiumBridge::isLinkVisited):
        (WebCore::ChromiumBridge::notifyJSOutOfMemory):
        (WebCore::ChromiumBridge::memoryUsageMB):
        (WebCore::ChromiumBridge::actualMemoryUsageMB):
        (WebCore::ChromiumBridge::screenDepth):
        (WebCore::ChromiumBridge::screenDepthPerComponent):
        (WebCore::ChromiumBridge::screenIsMonochrome):
        (WebCore::ChromiumBridge::screenRect):
        (WebCore::ChromiumBridge::screenAvailableRect):
        (WebCore::ChromiumBridge::popupsAllowed):
        (WebCore::WorkerContextProxy::create):
        * src/ResourceHandle.cpp:
        (WebCore::ResourceHandle::cacheMetadata):
        * src/WebFrameImpl.cpp:
        (WebKit::WebFrameImpl::WebFrameImpl):
        (WebKit::WebFrameImpl::~WebFrameImpl):
        * src/WebViewImpl.cpp:
        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):

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

56 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gypi
Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
Source/WebCore/page/PageGroup.cpp
Source/WebCore/platform/android/PlatformBridge.h
Source/WebCore/platform/audio/chromium/AudioBusChromium.cpp
Source/WebCore/platform/chromium/ChromiumBridge.h [new file with mode: 0644]
Source/WebCore/platform/chromium/ChromiumDataObjectLegacy.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/PlatformBridge.h
Source/WebCore/platform/chromium/PlatformScreenChromium.cpp
Source/WebCore/platform/chromium/ReadableDataObject.cpp
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/SystemTimeChromium.cpp
Source/WebCore/platform/chromium/WritableDataObject.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/PlatformBridge.h
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/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/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/src/AssertMatchingEnums.cpp
Source/WebKit/chromium/src/ResourceHandle.cpp
Source/WebKit/chromium/src/WebFrameImpl.cpp
Source/WebKit/chromium/src/WebViewImpl.cpp

index c404e6f..c2702a9 100644 (file)
@@ -1,3 +1,170 @@
+2011-01-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r76203.
+        http://trac.webkit.org/changeset/76203
+        https://bugs.webkit.org/show_bug.cgi?id=52784
+
+        Broke Win compile on Chromium bots (Requested by dimich on
+        #webkit).
+
+        * WebCore.gypi:
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::reportFatalErrorInV8):
+        * page/PageGroup.cpp:
+        (WebCore::PageGroup::isLinkVisited):
+        * platform/android/PlatformBridge.h:
+        * platform/audio/chromium/AudioBusChromium.cpp:
+        (WebCore::createBusFromInMemoryAudioFile):
+        * platform/chromium/ChromiumBridge.h: Added.
+        * platform/chromium/ChromiumDataObjectLegacy.cpp:
+        (WebCore::ChromiumDataObjectLegacy::getData):
+        * 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::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:
+        * platform/chromium/PlatformScreenChromium.cpp:
+        (WebCore::screenDepth):
+        (WebCore::screenDepthPerComponent):
+        (WebCore::screenIsMonochrome):
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+        * platform/chromium/ReadableDataObject.cpp:
+        (WebCore::ReadableDataObject::getData):
+        (WebCore::ReadableDataObject::urlTitle):
+        (WebCore::ReadableDataObject::htmlBaseUrl):
+        (WebCore::ReadableDataObject::filenames):
+        (WebCore::ReadableDataObject::ensureTypeCacheInitialized):
+        * 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::setSharedTimerFireTime):
+        (WebCore::stopSharedTimer):
+        * platform/chromium/SuddenTerminationChromium.cpp:
+        (WebCore::disableSuddenTermination):
+        (WebCore::enableSuddenTermination):
+        * platform/chromium/SystemTimeChromium.cpp:
+        (WebCore::currentTime):
+        * platform/chromium/WritableDataObject.cpp:
+        (WebCore::WritableDataObject::setData):
+        * 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::Font::drawGlyphs):
+        * 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:
+        * platform/sql/chromium/SQLiteFileSystemChromium.cpp:
+        (WebCore::SQLiteFileSystem::deleteDatabaseFile):
+        (WebCore::SQLiteFileSystem::getDatabaseFileSize):
+        * platform/sql/chromium/SQLiteFileSystemChromiumPosix.cpp:
+        (chromiumOpen):
+        (chromiumDelete):
+        (chromiumAccess):
+        * platform/sql/chromium/SQLiteFileSystemChromiumWin.cpp:
+        * plugins/chromium/PluginDataChromium.cpp:
+        (WebCore::PluginCache::plugins):
+        * 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):
+        (WebCore::IDBFactoryBackendInterface::~IDBFactoryBackendInterface):
+        * storage/chromium/IDBKeyPathBackendImpl.cpp:
+        (WebCore::IDBKeyPathBackendImpl::createIDBKeysFromSerializedValuesAndKeyPath):
+
 2011-01-19  Helder Correia  <helder@sencha.com>
 
         Reviewed by Andreas Kling.
index 593f0c1..d293614 100644 (file)
             'platform/cf/SchedulePair.cpp',
             'platform/cf/SchedulePair.h',
             'platform/cf/SharedBufferCF.cpp',
+            'platform/chromium/ChromiumBridge.h',
             'platform/chromium/ChromiumDataObject.cpp',
             'platform/chromium/ChromiumDataObject.h',
             'platform/chromium/ChromiumDataObjectLegacy.cpp',
             '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',
index 9d665db..8205fe5 100644 (file)
@@ -84,7 +84,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 = ChromiumBridge::actualMemoryUsageMB();
 #endif
     printf("V8 error: %s (%s).  Current memory usage: %d MB\n", message, location, memoryUsageMB);
     handleFatalErrorInV8();
index b9b0e34..8b902c0 100644 (file)
@@ -37,7 +37,7 @@
 #include "StorageNamespace.h"
 
 #if PLATFORM(CHROMIUM)
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #endif
 
 namespace WebCore {
@@ -128,7 +128,7 @@ bool PageGroup::isLinkVisited(LinkHash visitedLinkHash)
 {
 #if PLATFORM(CHROMIUM)
     // Use Chromium's built-in visited link database.
-    return PlatformBridge::isLinkVisited(visitedLinkHash);
+    return ChromiumBridge::isLinkVisited(visitedLinkHash);
 #else
     if (!m_visitedLinksPopulated) {
         m_visitedLinksPopulated = true;
index 81d9a1f..4269ef8 100644 (file)
@@ -86,7 +86,7 @@ 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
+// This is very similar to ChromiumBridge and the two are likely to converge
 // in the future.
 //
 // The methods in this class all need to reach across a JNI layer to the Java VM
index 9eef84e..a93703d 100644 (file)
@@ -29,7 +29,7 @@
 #include "AudioBus.h"
 
 #include "AudioFileReader.h"
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
@@ -38,12 +38,12 @@ namespace WebCore {
 
 // PassOwnPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, double sampleRate)
 // {
-//     return PlatformBridge::loadPlatformAudioResource(name, sampleRate);
+//     return ChromiumBridge::loadPlatformAudioResource(name, sampleRate);
 // }
 
 PassOwnPtr<AudioBus> createBusFromInMemoryAudioFile(const void* data, size_t dataSize, bool mixToMono, double sampleRate)
 {
-    OwnPtr<AudioBus> audioBus = PlatformBridge::decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
+    OwnPtr<AudioBus> audioBus = ChromiumBridge::decodeAudioFileData(static_cast<const char*>(data), dataSize, sampleRate);
     if (audioBus->numberOfChannels() == 2 && mixToMono) {
         OwnPtr<AudioBus> monoAudioBus = adoptPtr(new AudioBus(1, audioBus->length()));
 
diff --git a/Source/WebCore/platform/chromium/ChromiumBridge.h b/Source/WebCore/platform/chromium/ChromiumBridge.h
new file mode 100644 (file)
index 0000000..f104b2c
--- /dev/null
@@ -0,0 +1,353 @@
+/*
+ * Copyright (c) 2010, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ChromiumBridge_h
+#define ChromiumBridge_h
+
+#if ENABLE(WEB_AUDIO)
+#include "AudioBus.h"
+#endif
+
+#include "FileSystem.h"
+#include "ImageSource.h"
+#include "LinkHash.h"
+#include "PassRefPtr.h"
+#include "PasteboardPrivate.h"
+#include "PluginData.h"
+
+#include <wtf/Forward.h>
+#include <wtf/HashSet.h>
+#include <wtf/Vector.h>
+
+typedef struct NPObject NPObject;
+typedef struct _NPP NPP_t;
+typedef NPP_t* NPP;
+
+#if OS(DARWIN)
+typedef struct CGFont* CGFontRef;
+typedef uintptr_t ATSFontContainerRef;
+#ifdef __OBJC__
+@class NSFont;
+#else
+class NSFont;
+#endif
+#endif // OS(DARWIN)
+
+#if OS(WINDOWS)
+typedef struct HFONT__* HFONT;
+#endif
+
+namespace WebCore {
+
+    class ClipboardData;
+    class Color;
+    class Cursor;
+    class Document;
+    class Frame;
+    class GeolocationServiceBridge;
+    class GeolocationServiceChromium;
+    class GraphicsContext;
+    class Image;
+    class IDBFactoryBackendInterface;
+    class IDBKey;
+    class IntRect;
+    class KURL;
+    class SerializedScriptValue;
+    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...
+
+    class ChromiumBridge {
+    public:
+        // Cache --------------------------------------------------------------
+        static void cacheMetadata(const KURL& url, double responseTime, const Vector<char>&);
+
+        // Clipboard ----------------------------------------------------------
+        static bool clipboardIsFormatAvailable(PasteboardPrivate::ClipboardFormat, PasteboardPrivate::ClipboardBuffer);
+
+        static String clipboardReadPlainText(PasteboardPrivate::ClipboardBuffer);
+        static void clipboardReadHTML(PasteboardPrivate::ClipboardBuffer, String*, KURL*);
+
+        // Only the clipboardRead functions take a buffer argument because
+        // Chromium currently uses a different technique to write to alternate
+        // clipboard buffers.
+        static void clipboardWriteSelection(const String&, const KURL&, const String&, bool);
+        static void clipboardWritePlainText(const String&);
+        static void clipboardWriteURL(const KURL&, const String&);
+        static void clipboardWriteImage(NativeImagePtr, const KURL&, const String&);
+        static void clipboardWriteData(const String& type, const String& data, const String& metadata);
+
+        // Interface for handling copy and paste, drag and drop, and selection copy.
+        static HashSet<String> clipboardReadAvailableTypes(PasteboardPrivate::ClipboardBuffer, bool* containsFilenames);
+        static bool clipboardReadData(PasteboardPrivate::ClipboardBuffer, const String& type, String& data, String& metadata);
+        static Vector<String> clipboardReadFilenames(PasteboardPrivate::ClipboardBuffer);
+
+        // Cookies ------------------------------------------------------------
+        static void setCookies(const Document*, const KURL&, const String& value);
+        static String cookies(const Document*, const KURL&);
+        static String cookieRequestHeaderFieldValue(const Document*, const KURL&);
+        static bool rawCookies(const Document*, const KURL& url, Vector<Cookie>&);
+        static void deleteCookie(const Document*, const KURL& url, const String& cookieName);
+        static bool cookiesEnabled(const Document*);
+
+        // DNS ----------------------------------------------------------------
+        static void prefetchDNS(const String& hostname);
+
+        // File ---------------------------------------------------------------
+        static void revealFolderInOS(const String&);
+        static bool fileExists(const String&);
+        static bool deleteFile(const String&);
+        static bool deleteEmptyDirectory(const String&);
+        static bool getFileSize(const String&, long long& result);
+        static bool getFileModificationTime(const String&, time_t& result);
+        static String directoryName(const String& path);
+        static String pathByAppendingComponent(const String& path, const String& component);
+        static bool makeAllDirectories(const String& path);
+        static String getAbsolutePath(const String&);
+        static bool isDirectory(const String&);
+        static KURL filePathToURL(const String&);
+        static PlatformFileHandle openFile(const String& path, FileOpenMode);
+        static void closeFile(PlatformFileHandle&);
+        static long long seekFile(PlatformFileHandle, long long offset, FileSeekOrigin);
+        static bool truncateFile(PlatformFileHandle, long long offset);
+        static int readFromFile(PlatformFileHandle, char* data, int length);
+        static int writeToFile(PlatformFileHandle, const char* data, int length);
+
+        // Font ---------------------------------------------------------------
+#if OS(WINDOWS)
+        static bool ensureFontLoaded(HFONT font);
+#endif
+#if OS(LINUX) || OS(FREEBSD)
+        static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result);
+        static String getFontFamilyForCharacters(const UChar*, size_t numCharacters);
+#endif
+#if OS(DARWIN)
+        static bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
+#endif
+
+        // Forms --------------------------------------------------------------
+        static void notifyFormStateChanged(const Document*);
+
+        // Databases ----------------------------------------------------------
+        // Returns a handle to the DB file and ooptionally a handle to its containing directory
+        static PlatformFileHandle databaseOpenFile(const String& vfsFleName, int desiredFlags);
+        // Returns a SQLite code (SQLITE_OK = 0, on success)
+        static int databaseDeleteFile(const String& vfsFileName, bool syncDir = false);
+        // Returns the attributes of the DB file
+        static long databaseGetFileAttributes(const String& vfsFileName);
+        // Returns the size of the DB file
+        static long long databaseGetFileSize(const String& vfsFileName);
+
+        // IndexedDB ----------------------------------------------------------
+        static PassRefPtr<IDBFactoryBackendInterface> idbFactory();
+        static void idbShutdown();
+        // Extracts keyPath from values and returns the corresponding keys.
+        static void createIDBKeysFromSerializedValuesAndKeyPath(const Vector<RefPtr<SerializedScriptValue> >& values, const String& keyPath, Vector<RefPtr<IDBKey> >& keys);
+
+        // JavaScript ---------------------------------------------------------
+        static void notifyJSOutOfMemory(Frame*);
+        static bool allowScriptDespiteSettings(const KURL& documentURL);
+
+        // Keygen -------------------------------------------------------------
+        static String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& challenge, const KURL& url);
+
+        // Language -----------------------------------------------------------
+        static String computedDefaultLanguage();
+
+        // LayoutTestMode -----------------------------------------------------
+        static bool layoutTestMode();
+
+        // Memory -------------------------------------------------------------
+        // Returns the current space allocated for the pagefile, in MB.
+        // That is committed size for Windows and virtual memory size for POSIX
+        static int memoryUsageMB();
+
+        // Same as above, but always returns actual value, without any caches.
+        static int actualMemoryUsageMB();
+
+        // MimeType -----------------------------------------------------------
+        static bool isSupportedImageMIMEType(const String& mimeType);
+        static bool isSupportedJavaScriptMIMEType(const String& mimeType);
+        static bool isSupportedNonImageMIMEType(const String& mimeType);
+        static String mimeTypeForExtension(const String& fileExtension);
+        static String mimeTypeFromFile(const String& filePath);
+        static String preferredExtensionForMIMEType(const String& mimeType);
+
+        // Plugin -------------------------------------------------------------
+        static bool plugins(bool refresh, Vector<PluginInfo>*);
+        static NPObject* pluginScriptableObject(Widget*);
+        static bool popupsAllowed(NPP);
+
+        // Resources ----------------------------------------------------------
+        static PassRefPtr<Image> loadPlatformImageResource(const char* name);
+
+#if ENABLE(WEB_AUDIO)
+        static PassOwnPtr<AudioBus> loadPlatformAudioResource(const char* name, double sampleRate);
+        static PassOwnPtr<AudioBus> decodeAudioFileData(const char* data, size_t size, double sampleRate);
+#endif
+
+        // Sandbox ------------------------------------------------------------
+        static bool sandboxEnabled();
+
+        // Screen -------------------------------------------------------------
+        static int screenDepth(Widget*);
+        static int screenDepthPerComponent(Widget*);
+        static bool screenIsMonochrome(Widget*);
+        static IntRect screenRect(Widget*);
+        static IntRect screenAvailableRect(Widget*);
+
+        // SharedTimers -------------------------------------------------------
+        static void setSharedTimerFiredFunction(void (*func)());
+        static void setSharedTimerFireTime(double fireTime);
+        static void stopSharedTimer();
+
+        // StatsCounters ------------------------------------------------------
+        static void decrementStatsCounter(const char* name);
+        static void incrementStatsCounter(const char* name);
+        static void histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount);
+        static void histogramEnumeration(const char* name, int sample, int boundaryValue);
+
+        // Sudden Termination
+        static void suddenTerminationChanged(bool enabled);
+
+        // SystemTime ---------------------------------------------------------
+        static double currentTime();
+
+        // Theming ------------------------------------------------------------
+#if OS(WINDOWS)
+        static void paintButton(
+            GraphicsContext*, int part, int state, int classicState, const IntRect&);
+        static void paintMenuList(
+            GraphicsContext*, int part, int state, int classicState, const IntRect&);
+        static void paintScrollbarArrow(
+            GraphicsContext*, int state, int classicState, const IntRect&);
+        static void paintScrollbarThumb(
+            GraphicsContext*, int part, int state, int classicState, const IntRect&);
+        static void paintScrollbarTrack(
+            GraphicsContext*, int part, int state, int classicState, const IntRect&, const IntRect& alignRect);
+        static void paintSpinButton(
+            GraphicsContext*, int part, int state, int classicState, const IntRect&);
+        static void paintTextField(
+            GraphicsContext*, int part, int state, int classicState, const IntRect&, const Color&, bool fillContentArea, bool drawEdges);
+        static void paintTrackbar(
+            GraphicsContext*, int part, int state, int classicState, const IntRect&);
+        static void paintProgressBar(
+            GraphicsContext*, const IntRect& barRect, const IntRect& valueRect, bool determinate, double animatedSeconds);
+#elif OS(LINUX)
+        // The UI part which is being accessed.
+        enum ThemePart {
+            PartScrollbarDownArrow,
+            PartScrollbarLeftArrow,
+            PartScrollbarRightArrow,
+            PartScrollbarUpArrow,
+            PartScrollbarHorizontalThumb,
+            PartScrollbarVerticalThumb,
+            PartScrollbarHorizontalTrack,
+            PartScrollbarVerticalTrack,
+        };
+
+        // The current state of the associated Part.
+        enum ThemePaintState {
+            StateDisabled,
+            StateHover,
+            StateNormal,
+            StatePressed,
+        };
+
+        struct ScrollbarTrackExtraParams {
+            // The bounds of the entire track, as opposed to the part being painted.
+            int trackX;
+            int trackY;
+            int trackWidth;
+            int trackHeight;
+        };
+
+        union ThemePaintExtraParams {
+            ScrollbarTrackExtraParams scrollbarTrack;
+        };
+
+        // Gets the size of the given theme part. For variable sized items
+        // like vertical scrollbar thumbs, the width will be the required width of
+        // the track while the height will be the minimum height.
+        static IntSize getThemePartSize(ThemePart);
+        // Paint the given the given theme part.
+        static void paintThemePart(GraphicsContext*, ThemePart, ThemePaintState, const IntRect&, const ThemePaintExtraParams*);
+#elif OS(DARWIN)
+        enum ThemePaintState {
+            StateDisabled,
+            StateInactive,
+            StateActive,
+            StatePressed,
+        };
+
+        enum ThemePaintSize {
+            SizeRegular,
+            SizeSmall,
+        };
+
+        enum ThemePaintScrollbarOrientation {
+            ScrollbarOrientationHorizontal,
+            ScrollbarOrientationVertical,
+        };
+
+        enum ThemePaintScrollbarParent {
+            ScrollbarParentScrollView,
+            ScrollbarParentRenderLayer,
+        };
+
+        struct ThemePaintScrollbarInfo {
+            ThemePaintScrollbarOrientation orientation;
+            ThemePaintScrollbarParent parent;
+            int maxValue;
+            int currentValue;
+            int visibleSize;
+            int totalSize;
+        };
+
+        static void paintScrollbarThumb(GraphicsContext*, ThemePaintState, ThemePaintSize, const IntRect&, const ThemePaintScrollbarInfo&);
+#endif
+
+        // Trace Event --------------------------------------------------------
+        static void traceEventBegin(const char* name, void* id, const char* extra);
+        static void traceEventEnd(const char* name, void* id, const char* extra);
+
+        // Visited links ------------------------------------------------------
+        static LinkHash visitedLinkHash(const UChar* url, unsigned length);
+        static LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL);
+        static bool isLinkVisited(LinkHash);
+    };
+
+} // namespace WebCore
+
+#endif
index 82e47e2..a2952c0 100644 (file)
@@ -31,9 +31,9 @@
 #include "config.h"
 #include "ChromiumDataObjectLegacy.h"
 
+#include "ChromiumBridge.h"
 #include "ClipboardMimeTypes.h"
 #include "Pasteboard.h"
-#include "PlatformBridge.h"
 
 namespace WebCore {
 
@@ -132,7 +132,7 @@ String ChromiumDataObjectLegacy::getData(const String& type, bool& success)
                 Pasteboard::generalPasteboard()->isSelectionMode() ?
                 PasteboardPrivate::SelectionBuffer :
                 PasteboardPrivate::StandardBuffer;
-            String text = PlatformBridge::clipboardReadPlainText(buffer);
+            String text = ChromiumBridge::clipboardReadPlainText(buffer);
             success = !text.isEmpty();
             return text;
         }
@@ -158,7 +158,7 @@ String ChromiumDataObjectLegacy::getData(const String& type, bool& success)
                 PasteboardPrivate::StandardBuffer;
             String htmlText;
             KURL sourceURL;
-            PlatformBridge::clipboardReadHTML(buffer, &htmlText, &sourceURL);
+            ChromiumBridge::clipboardReadHTML(buffer, &htmlText, &sourceURL);
             success = !htmlText.isEmpty();
             return htmlText;
         }
index 9312505..8c20a00 100644 (file)
 #include "config.h"
 #include "DragData.h"
 
+#include "ChromiumBridge.h"
 #include "ChromiumDataObject.h"
 #include "ClipboardMimeTypes.h"
 #include "DocumentFragment.h"
 #include "FileSystem.h"
 #include "Frame.h"
 #include "KURL.h"
+#include "markup.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
 #include "PlatformString.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 = ChromiumBridge::filePathToURL(ChromiumBridge::getAbsolutePath(m_platformDragData->filenames()[0]));
     }
     return url;
 }
index faf5e92..d8a1e3f 100644 (file)
 #include "config.h"
 #include "FileSystem.h"
 
+#include "ChromiumBridge.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
 #include "PlatformString.h"
 
 namespace WebCore {
 
 bool deleteFile(const String& path)
 {
-    return PlatformBridge::deleteFile(path);
+    return ChromiumBridge::deleteFile(path);
 }
 
 bool deleteEmptyDirectory(const String& path)
 {
-    return PlatformBridge::deleteEmptyDirectory(path);
+    return ChromiumBridge::deleteEmptyDirectory(path);
 }
 
 bool getFileSize(const String& path, long long& result)
 {
-    return PlatformBridge::getFileSize(path, result);
+    return ChromiumBridge::getFileSize(path, result);
 }
 
 bool getFileModificationTime(const String& path, time_t& result)
 {
-    return PlatformBridge::getFileModificationTime(path, result);
+    return ChromiumBridge::getFileModificationTime(path, result);
 }
 
 void revealFolderInOS(const String& path)
 {
-    PlatformBridge::revealFolderInOS(path);
+    ChromiumBridge::revealFolderInOS(path);
 }
 
 String directoryName(const String& path)
 {
-    return PlatformBridge::directoryName(path);
+    return ChromiumBridge::directoryName(path);
 }
 
 String pathByAppendingComponent(const String& path, const String& component)
 {
-    return PlatformBridge::pathByAppendingComponent(path, component);
+    return ChromiumBridge::pathByAppendingComponent(path, component);
 }
 
 bool makeAllDirectories(const String& path)
 {
-    return PlatformBridge::makeAllDirectories(path);
+    return ChromiumBridge::makeAllDirectories(path);
 }
 
 bool fileExists(const String& path)
 {
-    return PlatformBridge::fileExists(path);
+    return ChromiumBridge::fileExists(path);
 }
 
 PlatformFileHandle openFile(const String& path, FileOpenMode mode)
 {
-    return PlatformBridge::openFile(path, mode);
+    return ChromiumBridge::openFile(path, mode);
 }
 
 void closeFile(PlatformFileHandle& handle)
 {
-    return PlatformBridge::closeFile(handle);
+    return ChromiumBridge::closeFile(handle);
 }
 
 long long seekFile(PlatformFileHandle handle, long long offset, FileSeekOrigin origin)
 {
-    return PlatformBridge::seekFile(handle, offset, origin);
+    return ChromiumBridge::seekFile(handle, offset, origin);
 }
 
 bool truncateFile(PlatformFileHandle handle, long long offset)
 {
-    return PlatformBridge::truncateFile(handle, offset);
+    return ChromiumBridge::truncateFile(handle, offset);
 }
 
 int readFromFile(PlatformFileHandle handle, char* data, int length)
 {
-    return PlatformBridge::readFromFile(handle, data, length);
+    return ChromiumBridge::readFromFile(handle, data, length);
 }
 
 int writeToFile(PlatformFileHandle handle, const char* data, int length)
 {
-    return PlatformBridge::writeToFile(handle, data, length);
+    return ChromiumBridge::writeToFile(handle, data, length);
 }
 
 } // namespace WebCore
index fedc4d5..69fe372 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "Language.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #include "PlatformString.h"
 
 namespace WebCore {
@@ -40,7 +40,7 @@ String platformDefaultLanguage()
 {
     static String computedDefaultLanguage;
     if (computedDefaultLanguage.isEmpty())
-        computedDefaultLanguage = PlatformBridge::computedDefaultLanguage();
+        computedDefaultLanguage = ChromiumBridge::computedDefaultLanguage();
     return computedDefaultLanguage;
 }
 
index 5e1ffa4..9cb93ea 100644 (file)
 #include "config.h"
 #include "LinkHash.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 
 namespace WebCore {
 
 LinkHash visitedLinkHash(const UChar* url, unsigned length)
 {
-    return PlatformBridge::visitedLinkHash(url, length);
+    return ChromiumBridge::visitedLinkHash(url, length);
 }
 
 LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL)
 {
-    return PlatformBridge::visitedLinkHash(base, attributeURL);
+    return ChromiumBridge::visitedLinkHash(base, attributeURL);
 }
 
 } // namespace WebCore
index fec0e9b..9df8847 100644 (file)
 #include "config.h"
 #include "MIMETypeRegistry.h"
 
+#include "ChromiumBridge.h"
 #include "MediaPlayer.h"
-#include "PlatformBridge.h"
 #include "PluginDataChromium.h"
 #include <wtf/text/CString.h>
 
 // NOTE: Unlike other ports, we don't use the shared implementation bits in
 // MIMETypeRegistry.cpp.  Instead, we need to route most functions via the
-// PlatformBridge to the embedder.
+// ChromiumBridge to the embedder.
 
 namespace WebCore {
 
 String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
 {
-    return PlatformBridge::mimeTypeForExtension(ext);
+    return ChromiumBridge::mimeTypeForExtension(ext);
 }
 
 // Returns the file extension if one is found.  Does not include the dot in the
@@ -55,7 +55,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 = ChromiumBridge::preferredExtensionForMIMEType(type);
     if (!ext.isEmpty() && ext[0] == '.')
         ext = ext.substring(1);
 
@@ -81,7 +81,7 @@ String MIMETypeRegistry::getMIMETypeForPath(const String& path)
 
 bool MIMETypeRegistry::isSupportedImageMIMEType(const String& mimeType)
 { 
-    return PlatformBridge::isSupportedImageMIMEType(mimeType);
+    return ChromiumBridge::isSupportedImageMIMEType(mimeType);
 }
 
 bool MIMETypeRegistry::isSupportedImageResourceMIMEType(const String& mimeType)
@@ -96,12 +96,12 @@ bool MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(const String& mimeTyp
 
 bool MIMETypeRegistry::isSupportedJavaScriptMIMEType(const String& mimeType)
 {
-    return PlatformBridge::isSupportedJavaScriptMIMEType(mimeType);
+    return ChromiumBridge::isSupportedJavaScriptMIMEType(mimeType);
 }
     
 bool MIMETypeRegistry::isSupportedNonImageMIMEType(const String& mimeType)
 {
-    return PlatformBridge::isSupportedNonImageMIMEType(mimeType);
+    return ChromiumBridge::isSupportedNonImageMIMEType(mimeType);
 }
 
 bool MIMETypeRegistry::isSupportedMediaMIMEType(const String& mimeType)
index 6beb017..907a4b9 100644 (file)
 #include "config.h"
 #include "Pasteboard.h"
 
+#include "ChromiumBridge.h"
 #include "ClipboardUtilitiesChromium.h"
-#include "Document.h"
 #include "DocumentFragment.h"
+#include "Document.h"
 #include "Element.h"
 #include "Frame.h"
 #include "HTMLNames.h"
 #include "HTMLParserIdioms.h"
 #include "Image.h"
 #include "KURL.h"
+#include "markup.h"
 #include "NativeImageSkia.h"
-#include "PlatformBridge.h"
 #include "Range.h"
 #include "RenderImage.h"
-#include "markup.h"
 
 #if ENABLE(SVG)
 #include "SVGNames.h"
@@ -91,7 +91,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete,
 #endif
     replaceNBSPWithSpace(plainText);
 
-    PlatformBridge::clipboardWriteSelection(html, url, plainText, canSmartCopyOrDelete);
+    ChromiumBridge::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);
+    ChromiumBridge::clipboardWritePlainText(plainText);
 #else
-    PlatformBridge::clipboardWritePlainText(text);
+    ChromiumBridge::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);
+    ChromiumBridge::clipboardWriteURL(url, title);
 }
 
 void Pasteboard::writeImage(Node* node, const KURL&, const String& title)
@@ -150,17 +150,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);
+    ChromiumBridge::clipboardWriteImage(bitmap, url, title);
 }
 
 bool Pasteboard::canSmartReplace()
 {
-    return PlatformBridge::clipboardIsFormatAvailable(PasteboardPrivate::WebSmartPasteFormat, m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer);
+    return ChromiumBridge::clipboardIsFormatAvailable(PasteboardPrivate::WebSmartPasteFormat, m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer);
 }
 
 String Pasteboard::plainText(Frame* frame)
 {
-    return PlatformBridge::clipboardReadPlainText(m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer);
+    return ChromiumBridge::clipboardReadPlainText(m_selectionMode ? PasteboardPrivate::SelectionBuffer : PasteboardPrivate::StandardBuffer);
 }
 
 PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefPtr<Range> context, bool allowPlainText, bool& chosePlainText)
@@ -168,10 +168,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 (ChromiumBridge::clipboardIsFormatAvailable(PasteboardPrivate::HTMLFormat, buffer)) {
         String markup;
         KURL srcURL;
-        PlatformBridge::clipboardReadHTML(buffer, &markup, &srcURL);
+        ChromiumBridge::clipboardReadHTML(buffer, &markup, &srcURL);
 
         RefPtr<DocumentFragment> fragment =
             createFragmentFromMarkup(frame->document(), markup, srcURL, FragmentScriptingNotAllowed);
@@ -180,7 +180,7 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP
     }
 
     if (allowPlainText) {
-        String markup = PlatformBridge::clipboardReadPlainText(buffer);
+        String markup = ChromiumBridge::clipboardReadPlainText(buffer);
         if (!markup.isEmpty()) {
             chosePlainText = true;
 
index f5c1ed7..ecb7b45 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Google Inc. All rights reserved.
+ * Copyright (c) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
 #ifndef PlatformBridge_h
 #define PlatformBridge_h
 
-#if ENABLE(WEB_AUDIO)
-#include "AudioBus.h"
-#endif
-
-#include "FileSystem.h"
-#include "ImageSource.h"
-#include "LinkHash.h"
-#include "PassRefPtr.h"
-#include "PasteboardPrivate.h"
-#include "PluginData.h"
-
-#include <wtf/Forward.h>
-#include <wtf/HashSet.h>
-#include <wtf/Vector.h>
-
-typedef struct NPObject NPObject;
-typedef struct _NPP NPP_t;
-typedef NPP_t* NPP;
-
-#if OS(DARWIN)
-typedef struct CGFont* CGFontRef;
-typedef uintptr_t ATSFontContainerRef;
-#ifdef __OBJC__
-@class NSFont;
-#else
-class NSFont;
-#endif
-#endif // OS(DARWIN)
-
-#if OS(WINDOWS)
-typedef struct HFONT__* HFONT;
-#endif
+#include "ChromiumBridge.h"
 
 namespace WebCore {
 
-class ClipboardData;
-class Color;
-class Cursor;
-class Document;
-class Frame;
-class GeolocationServiceBridge;
-class GeolocationServiceChromium;
-class GraphicsContext;
-class Image;
-class IDBFactoryBackendInterface;
-class IDBKey;
-class IntRect;
-class KURL;
-class SerializedScriptValue;
-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...
-
-class PlatformBridge {
-public:
-    // Cache --------------------------------------------------------------
-    static void cacheMetadata(const KURL&, double responseTime, const Vector<char>&);
-
-    // Clipboard ----------------------------------------------------------
-    static bool clipboardIsFormatAvailable(PasteboardPrivate::ClipboardFormat, PasteboardPrivate::ClipboardBuffer);
-
-    static String clipboardReadPlainText(PasteboardPrivate::ClipboardBuffer);
-    static void clipboardReadHTML(PasteboardPrivate::ClipboardBuffer, String*, KURL*);
-
-    // Only the clipboardRead functions take a buffer argument because
-    // Chromium currently uses a different technique to write to alternate
-    // clipboard buffers.
-    static void clipboardWriteSelection(const String&, const KURL&, const String&, bool);
-    static void clipboardWritePlainText(const String&);
-    static void clipboardWriteURL(const KURL&, const String&);
-    static void clipboardWriteImage(NativeImagePtr, const KURL&, const String&);
-    static void clipboardWriteData(const String& type, const String& data, const String& metadata);
-
-    // Interface for handling copy and paste, drag and drop, and selection copy.
-    static HashSet<String> clipboardReadAvailableTypes(PasteboardPrivate::ClipboardBuffer, bool* containsFilenames);
-    static bool clipboardReadData(PasteboardPrivate::ClipboardBuffer, const String& type, String& data, String& metadata);
-    static Vector<String> clipboardReadFilenames(PasteboardPrivate::ClipboardBuffer);
-
-    // Cookies ------------------------------------------------------------
-    static void setCookies(const Document*, const KURL&, const String& value);
-    static String cookies(const Document*, const KURL&);
-    static String cookieRequestHeaderFieldValue(const Document*, const KURL&);
-    static bool rawCookies(const Document*, const KURL&, Vector<Cookie>&);
-    static void deleteCookie(const Document*, const KURL&, const String& cookieName);
-    static bool cookiesEnabled(const Document*);
-
-    // DNS ----------------------------------------------------------------
-    static void prefetchDNS(const String& hostname);
-
-    // File ---------------------------------------------------------------
-    static void revealFolderInOS(const String&);
-    static bool fileExists(const String&);
-    static bool deleteFile(const String&);
-    static bool deleteEmptyDirectory(const String&);
-    static bool getFileSize(const String&, long long& result);
-    static bool getFileModificationTime(const String&, time_t& result);
-    static String directoryName(const String& path);
-    static String pathByAppendingComponent(const String& path, const String& component);
-    static bool makeAllDirectories(const String& path);
-    static String getAbsolutePath(const String&);
-    static bool isDirectory(const String&);
-    static KURL filePathToURL(const String&);
-    static PlatformFileHandle openFile(const String& path, FileOpenMode);
-    static void closeFile(PlatformFileHandle&);
-    static long long seekFile(PlatformFileHandle, long long offset, FileSeekOrigin);
-    static bool truncateFile(PlatformFileHandle, long long offset);
-    static int readFromFile(PlatformFileHandle, char* data, int length);
-    static int writeToFile(PlatformFileHandle, const char* data, int length);
-
-    // Font ---------------------------------------------------------------
-#if OS(WINDOWS)
-    static bool ensureFontLoaded(HFONT);
-#endif
-#if OS(LINUX) || OS(FREEBSD)
-    static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result);
-    static String getFontFamilyForCharacters(const UChar*, size_t numCharacters);
-#endif
-#if OS(DARWIN)
-    static bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
-#endif
-
-    // Forms --------------------------------------------------------------
-    static void notifyFormStateChanged(const Document*);
-
-    // Databases ----------------------------------------------------------
-    // Returns a handle to the DB file and ooptionally a handle to its containing directory
-    static PlatformFileHandle databaseOpenFile(const String& vfsFleName, int desiredFlags);
-    // Returns a SQLite code (SQLITE_OK = 0, on success)
-    static int databaseDeleteFile(const String& vfsFileName, bool syncDir = false);
-    // Returns the attributes of the DB file
-    static long databaseGetFileAttributes(const String& vfsFileName);
-    // Returns the size of the DB file
-    static long long databaseGetFileSize(const String& vfsFileName);
-
-    // IndexedDB ----------------------------------------------------------
-    static PassRefPtr<IDBFactoryBackendInterface> idbFactory();
-    static void idbShutdown();
-    // Extracts keyPath from values and returns the corresponding keys.
-    static void createIDBKeysFromSerializedValuesAndKeyPath(const Vector<RefPtr<SerializedScriptValue> >& values, const String& keyPath, Vector<RefPtr<IDBKey> >& keys);
-
-    // JavaScript ---------------------------------------------------------
-    static void notifyJSOutOfMemory(Frame*);
-    static bool allowScriptDespiteSettings(const KURL& documentURL);
-
-    // Keygen -------------------------------------------------------------
-    static String signedPublicKeyAndChallengeString(unsigned keySizeIndex, const String& challenge, const KURL&);
-
-    // Language -----------------------------------------------------------
-    static String computedDefaultLanguage();
-
-    // LayoutTestMode -----------------------------------------------------
-    static bool layoutTestMode();
-
-    // Memory -------------------------------------------------------------
-    // Returns the current space allocated for the pagefile, in MB.
-    // That is committed size for Windows and virtual memory size for POSIX
-    static int memoryUsageMB();
-
-    // Same as above, but always returns actual value, without any caches.
-    static int actualMemoryUsageMB();
-
-    // MimeType -----------------------------------------------------------
-    static bool isSupportedImageMIMEType(const String& mimeType);
-    static bool isSupportedJavaScriptMIMEType(const String& mimeType);
-    static bool isSupportedNonImageMIMEType(const String& mimeType);
-    static String mimeTypeForExtension(const String& fileExtension);
-    static String mimeTypeFromFile(const String& filePath);
-    static String preferredExtensionForMIMEType(const String& mimeType);
-
-    // Plugin -------------------------------------------------------------
-    static bool plugins(bool refresh, Vector<PluginInfo>*);
-    static NPObject* pluginScriptableObject(Widget*);
-    static bool popupsAllowed(NPP);
-
-    // Resources ----------------------------------------------------------
-    static PassRefPtr<Image> loadPlatformImageResource(const char* name);
-
-#if ENABLE(WEB_AUDIO)
-    static PassOwnPtr<AudioBus> loadPlatformAudioResource(const char* name, double sampleRate);
-    static PassOwnPtr<AudioBus> decodeAudioFileData(const char* data, size_t, double sampleRate);
-#endif
-
-    // Sandbox ------------------------------------------------------------
-    static bool sandboxEnabled();
-
-    // Screen -------------------------------------------------------------
-    static int screenDepth(Widget*);
-    static int screenDepthPerComponent(Widget*);
-    static bool screenIsMonochrome(Widget*);
-    static IntRect screenRect(Widget*);
-    static IntRect screenAvailableRect(Widget*);
-
-    // SharedTimers -------------------------------------------------------
-    static void setSharedTimerFiredFunction(void (*func)());
-    static void setSharedTimerFireTime(double);
-    static void stopSharedTimer();
-
-    // StatsCounters ------------------------------------------------------
-    static void decrementStatsCounter(const char* name);
-    static void incrementStatsCounter(const char* name);
-    static void histogramCustomCounts(const char* name, int sample, int min, int max, int bucketCount);
-    static void histogramEnumeration(const char* name, int sample, int boundaryValue);
-
-    // Sudden Termination
-    static void suddenTerminationChanged(bool enabled);
-
-    // SystemTime ---------------------------------------------------------
-    static double currentTime();
-
-    // Theming ------------------------------------------------------------
-#if OS(WINDOWS)
-    static void paintButton(
-        GraphicsContext*, int part, int state, int classicState, const IntRect&);
-    static void paintMenuList(
-        GraphicsContext*, int part, int state, int classicState, const IntRect&);
-    static void paintScrollbarArrow(
-        GraphicsContext*, int state, int classicState, const IntRect&);
-    static void paintScrollbarThumb(
-        GraphicsContext*, int part, int state, int classicState, const IntRect&);
-    static void paintScrollbarTrack(
-        GraphicsContext*, int part, int state, int classicState, const IntRect&, const IntRect& alignRect);
-    static void paintSpinButton(
-        GraphicsContext*, int part, int state, int classicState, const IntRect&);
-    static void paintTextField(
-        GraphicsContext*, int part, int state, int classicState, const IntRect&, const Color&, bool fillContentArea, bool drawEdges);
-    static void paintTrackbar(
-        GraphicsContext*, int part, int state, int classicState, const IntRect&);
-    static void paintProgressBar(
-        GraphicsContext*, const IntRect& barRect, const IntRect& valueRect, bool determinate, double animatedSeconds);
-#elif OS(LINUX)
-    // The UI part which is being accessed.
-    enum ThemePart {
-        PartScrollbarDownArrow,
-        PartScrollbarLeftArrow,
-        PartScrollbarRightArrow,
-        PartScrollbarUpArrow,
-        PartScrollbarHorizontalThumb,
-        PartScrollbarVerticalThumb,
-        PartScrollbarHorizontalTrack,
-        PartScrollbarVerticalTrack,
-    };
-
-    // The current state of the associated Part.
-    enum ThemePaintState {
-        StateDisabled,
-        StateHover,
-        StateNormal,
-        StatePressed,
-    };
-
-    struct ScrollbarTrackExtraParams {
-        // The bounds of the entire track, as opposed to the part being painted.
-        int trackX;
-        int trackY;
-        int trackWidth;
-        int trackHeight;
-    };
-
-    union ThemePaintExtraParams {
-        ScrollbarTrackExtraParams scrollbarTrack;
-    };
-
-    // Gets the size of the given theme part. For variable sized items
-    // like vertical scrollbar thumbs, the width will be the required width of
-    // the track while the height will be the minimum height.
-    static IntSize getThemePartSize(ThemePart);
-    // Paint the given the given theme part.
-    static void paintThemePart(GraphicsContext*, ThemePart, ThemePaintState, const IntRect&, const ThemePaintExtraParams*);
-#elif OS(DARWIN)
-    enum ThemePaintState {
-        StateDisabled,
-        StateInactive,
-        StateActive,
-        StatePressed,
-    };
-
-    enum ThemePaintSize {
-        SizeRegular,
-        SizeSmall,
-    };
-
-    enum ThemePaintScrollbarOrientation {
-        ScrollbarOrientationHorizontal,
-        ScrollbarOrientationVertical,
-    };
-
-    enum ThemePaintScrollbarParent {
-        ScrollbarParentScrollView,
-        ScrollbarParentRenderLayer,
-    };
-
-    struct ThemePaintScrollbarInfo {
-        ThemePaintScrollbarOrientation orientation;
-        ThemePaintScrollbarParent parent;
-        int maxValue;
-        int currentValue;
-        int visibleSize;
-        int totalSize;
-    };
-
-    static void paintScrollbarThumb(GraphicsContext*, ThemePaintState, ThemePaintSize, const IntRect&, const ThemePaintScrollbarInfo&);
-#endif
-
-    // Trace Event --------------------------------------------------------
-    static void traceEventBegin(const char* name, void*, const char* extra);
-    static void traceEventEnd(const char* name, void*, const char* extra);
-
-    // Visited links ------------------------------------------------------
-    static LinkHash visitedLinkHash(const UChar* url, unsigned length);
-    static LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL);
-    static bool isLinkVisited(LinkHash);
-};
+// FIXME: A better name for ChromiumBridge is PlatformBridge. Android already
+// uses PlatformBridge so the code that is shared among the Android and Chromium
+// ports is gradually moving towards using PlatformBridge. Once the Android
+// unforking is done, we will change the name of ChromiumBridge to PlatformBridge
+// and merge the two classes into one that will be shared by both ports.
+typedef ChromiumBridge PlatformBridge;
 
 } // namespace WebCore
 
-#endif
+#endif // PlatformBridge_h
index 35d5018..e659ef5 100644 (file)
 #include "config.h"
 #include "PlatformScreen.h"
 
+#include "ChromiumBridge.h"
 #include "IntRect.h"
-#include "PlatformBridge.h"
 
 namespace WebCore {
 
 int screenDepth(Widget* widget)
 {
-    return PlatformBridge::screenDepth(widget);
+    return ChromiumBridge::screenDepth(widget);
 }
 
 int screenDepthPerComponent(Widget* widget)
 {
-    return PlatformBridge::screenDepthPerComponent(widget);
+    return ChromiumBridge::screenDepthPerComponent(widget);
 }
 
 bool screenIsMonochrome(Widget* widget)
 {
-    return PlatformBridge::screenIsMonochrome(widget);
+    return ChromiumBridge::screenIsMonochrome(widget);
 }
 
 FloatRect screenRect(Widget* widget)
 {
-    return PlatformBridge::screenRect(widget);
+    return ChromiumBridge::screenRect(widget);
 }
 
 FloatRect screenAvailableRect(Widget* widget)
 {
-    return PlatformBridge::screenAvailableRect(widget);
+    return ChromiumBridge::screenAvailableRect(widget);
 }
 
 } // namespace WebCore
index dbf4739..97c481b 100644 (file)
 #include "config.h"
 #include "ReadableDataObject.h"
 
+#include "ChromiumBridge.h"
 #include "ClipboardMimeTypes.h"
 #include "Pasteboard.h"
 #include "PasteboardPrivate.h"
-#include "PlatformBridge.h"
 
 namespace WebCore {
 
@@ -80,19 +80,19 @@ String ReadableDataObject::getData(const String& type, bool& succeeded) const
                 Pasteboard::generalPasteboard()->isSelectionMode() ?
                 PasteboardPrivate::SelectionBuffer :
                 PasteboardPrivate::StandardBuffer;
-            data = PlatformBridge::clipboardReadPlainText(buffer);
+            data = ChromiumBridge::clipboardReadPlainText(buffer);
         } else if (type == mimeTypeTextHTML) {
             PasteboardPrivate::ClipboardBuffer buffer =
                 Pasteboard::generalPasteboard()->isSelectionMode() ?
                 PasteboardPrivate::SelectionBuffer :
                 PasteboardPrivate::StandardBuffer;
             KURL ignoredSourceURL;
-            PlatformBridge::clipboardReadHTML(buffer, &data, &ignoredSourceURL);
+            ChromiumBridge::clipboardReadHTML(buffer, &data, &ignoredSourceURL);
         }
         succeeded = !data.isEmpty();
         return data;
     }
-    succeeded = PlatformBridge::clipboardReadData(
+    succeeded = ChromiumBridge::clipboardReadData(
         clipboardBuffer(m_clipboardType), type, data, ignoredMetadata);
     return data;
 }
@@ -101,7 +101,7 @@ String ReadableDataObject::urlTitle() const
 {
     String ignoredData;
     String urlTitle;
-    PlatformBridge::clipboardReadData(
+    ChromiumBridge::clipboardReadData(
         clipboardBuffer(m_clipboardType), mimeTypeTextURIList, ignoredData, urlTitle);
     return urlTitle;
 }
@@ -110,7 +110,7 @@ KURL ReadableDataObject::htmlBaseUrl() const
 {
     String ignoredData;
     String htmlBaseUrl;
-    PlatformBridge::clipboardReadData(
+    ChromiumBridge::clipboardReadData(
         clipboardBuffer(m_clipboardType), mimeTypeTextHTML, ignoredData, htmlBaseUrl);
     return KURL(ParsedURLString, htmlBaseUrl);
 }
@@ -123,7 +123,7 @@ bool ReadableDataObject::containsFilenames() const
 
 Vector<String> ReadableDataObject::filenames() const
 {
-    return PlatformBridge::clipboardReadFilenames(clipboardBuffer(m_clipboardType));
+    return ChromiumBridge::clipboardReadFilenames(clipboardBuffer(m_clipboardType));
 }
 
 void ReadableDataObject::ensureTypeCacheInitialized() const
@@ -131,7 +131,7 @@ void ReadableDataObject::ensureTypeCacheInitialized() const
     if (m_isTypeCacheInitialized)
         return;
 
-    m_types = PlatformBridge::clipboardReadAvailableTypes(
+    m_types = ChromiumBridge::clipboardReadAvailableTypes(
         clipboardBuffer(m_clipboardType), &m_containsFilenames);
     m_isTypeCacheInitialized = true;
 }
index 6467764..49d9517 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SSLKeyGenerator.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #include "PlatformString.h"
 
 namespace WebCore {
@@ -51,7 +51,7 @@ String signedPublicKeyAndChallengeString(unsigned keySizeIndex,
                                          const String& challengeString,
                                          const KURL& url)
 {
-    return PlatformBridge::signedPublicKeyAndChallengeString(keySizeIndex,
+    return ChromiumBridge::signedPublicKeyAndChallengeString(keySizeIndex,
                                                              challengeString,
                                                              url);
 }
index fe09553..234d0ee 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "ScrollbarThemeChromium.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #include "PlatformMouseEvent.h"
 #include "Scrollbar.h"
 #include "ScrollbarClient.h"
index e173dff..ba10953 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "ScrollbarThemeChromiumLinux.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.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 = ChromiumBridge::getThemePartSize(ChromiumBridge::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;
+    ChromiumBridge::ThemePaintState state = scrollbar->hoveredPart() == partType ? ChromiumBridge::StateHover : ChromiumBridge::StateNormal;
     IntRect alignRect = trackRect(scrollbar, false);
-    PlatformBridge::ThemePaintExtraParams extraParams;
+    ChromiumBridge::ThemePaintExtraParams extraParams;
     extraParams.scrollbarTrack.trackX = alignRect.x();
     extraParams.scrollbarTrack.trackY = alignRect.y();
     extraParams.scrollbarTrack.trackWidth = alignRect.width();
     extraParams.scrollbarTrack.trackHeight = alignRect.height();
-    PlatformBridge::paintThemePart(
+    ChromiumBridge::paintThemePart(
         gc,
-        scrollbar->orientation() == HorizontalScrollbar ? PlatformBridge::PartScrollbarHorizontalTrack : PlatformBridge::PartScrollbarVerticalTrack,
+        scrollbar->orientation() == HorizontalScrollbar ? ChromiumBridge::PartScrollbarHorizontalTrack : ChromiumBridge::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;
+    ChromiumBridge::ThemePart paintPart;
+    ChromiumBridge::ThemePaintState state = ChromiumBridge::StateNormal;
     bool checkMin = false;
     bool checkMax = false;
     if (scrollbar->orientation() == HorizontalScrollbar) {
         if (part == BackButtonStartPart) {
-            paintPart = PlatformBridge::PartScrollbarLeftArrow;
+            paintPart = ChromiumBridge::PartScrollbarLeftArrow;
             checkMin = true;
         } else {
-            paintPart = PlatformBridge::PartScrollbarRightArrow;
+            paintPart = ChromiumBridge::PartScrollbarRightArrow;
             checkMax = true;
         }
     } else {
         if (part == BackButtonStartPart) {
-            paintPart = PlatformBridge::PartScrollbarUpArrow;
+            paintPart = ChromiumBridge::PartScrollbarUpArrow;
             checkMin = true;
         } else {
-            paintPart = PlatformBridge::PartScrollbarDownArrow;
+            paintPart = ChromiumBridge::PartScrollbarDownArrow;
             checkMax = true;
         }
     }
     if ((checkMin && (scrollbar->currentPos() <= 0))
         || (checkMax && scrollbar->currentPos() == scrollbar->maximum())) {
-        state = PlatformBridge::StateDisabled;
+        state = ChromiumBridge::StateDisabled;
     } else {
         if (part == scrollbar->pressedPart())
-            state = PlatformBridge::StatePressed;
+            state = ChromiumBridge::StatePressed;
         else if (part == scrollbar->hoveredPart())
-            state = PlatformBridge::StateHover;
+            state = ChromiumBridge::StateHover;
     }
-    PlatformBridge::paintThemePart(gc, paintPart, state, rect, 0);
+    ChromiumBridge::paintThemePart(gc, paintPart, state, rect, 0);
 }
 
 void ScrollbarThemeChromiumLinux::paintThumb(GraphicsContext* gc, Scrollbar* scrollbar, const IntRect& rect)
 {
-    PlatformBridge::ThemePaintState state;
+    ChromiumBridge::ThemePaintState state;
 
     if (scrollbar->pressedPart() == ThumbPart)
-        state = PlatformBridge::StatePressed;
+        state = ChromiumBridge::StatePressed;
     else if (scrollbar->hoveredPart() == ThumbPart)
-        state = PlatformBridge::StateHover;
+        state = ChromiumBridge::StateHover;
     else
-        state = PlatformBridge::StateNormal;
-    PlatformBridge::paintThemePart(
+        state = ChromiumBridge::StateNormal;
+    ChromiumBridge::paintThemePart(
         gc,
-        scrollbar->orientation() == HorizontalScrollbar ? PlatformBridge::PartScrollbarHorizontalThumb : PlatformBridge::PartScrollbarVerticalThumb,
+        scrollbar->orientation() == HorizontalScrollbar ? ChromiumBridge::PartScrollbarHorizontalThumb : ChromiumBridge::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 = ChromiumBridge::getThemePartSize(ChromiumBridge::PartScrollbarUpArrow);
         return IntSize(size.width(), scrollbar->height() < 2 * size.height() ? scrollbar->height() / 2 : size.height());
     }
 
     // HorizontalScrollbar
-    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartScrollbarLeftArrow);
+    IntSize size = ChromiumBridge::getThemePartSize(ChromiumBridge::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 = ChromiumBridge::getThemePartSize(ChromiumBridge::PartScrollbarVerticalThumb);
         return size.height();
     }
 
-    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartScrollbarHorizontalThumb);
+    IntSize size = ChromiumBridge::getThemePartSize(ChromiumBridge::PartScrollbarHorizontalThumb);
     return size.width();
 }
 
index 0f49297..0aa3e10 100644 (file)
@@ -27,9 +27,9 @@
 #include "config.h"
 #include "ScrollbarThemeChromiumMac.h"
 
+#include "ChromiumBridge.h"
 #include "FrameView.h"
 #include "ImageBuffer.h"
-#include "PlatformBridge.h"
 #include "PlatformMouseEvent.h"
 #include "ScrollView.h"
 #include <Carbon/Carbon.h>
@@ -370,15 +370,15 @@ static int scrollbarPartToHIPressedState(ScrollbarPart part)
     }
 }
 
-static PlatformBridge::ThemePaintState scrollbarStateToThemeState(Scrollbar* scrollbar) {
+static ChromiumBridge::ThemePaintState scrollbarStateToThemeState(Scrollbar* scrollbar) {
     if (!scrollbar->enabled())
-        return PlatformBridge::StateDisabled;
+        return ChromiumBridge::StateDisabled;
     if (!scrollbar->client()->isActive())
-        return PlatformBridge::StateInactive;
+        return ChromiumBridge::StateInactive;
     if (scrollbar->pressedPart() == ThumbPart)
-        return PlatformBridge::StatePressed;
+        return ChromiumBridge::StatePressed;
 
-    return PlatformBridge::StateActive;
+    return ChromiumBridge::StateActive;
 }
 
 bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* context, const IntRect& damageRect)
@@ -463,18 +463,18 @@ bool ScrollbarThemeChromiumMac::paint(Scrollbar* scrollbar, GraphicsContext* con
     }
 
     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;
+        ChromiumBridge::ThemePaintScrollbarInfo scrollbarInfo;
+        scrollbarInfo.orientation = scrollbar->orientation() == HorizontalScrollbar ? ChromiumBridge::ScrollbarOrientationHorizontal : ChromiumBridge::ScrollbarOrientationVertical;
+        scrollbarInfo.parent = scrollbar->parent() && scrollbar->parent()->isFrameView() && static_cast<FrameView*>(scrollbar->parent())->isScrollViewScrollbar(scrollbar) ? ChromiumBridge::ScrollbarParentScrollView : ChromiumBridge::ScrollbarParentRenderLayer;
         scrollbarInfo.maxValue = scrollbar->maximum();
         scrollbarInfo.currentValue = scrollbar->currentPos();
         scrollbarInfo.visibleSize = scrollbar->visibleSize();
         scrollbarInfo.totalSize = scrollbar->totalSize();
 
-        PlatformBridge::paintScrollbarThumb(
+        ChromiumBridge::paintScrollbarThumb(
             drawingContext,
             scrollbarStateToThemeState(scrollbar),
-            scrollbar->controlSize() == RegularScrollbar ? PlatformBridge::SizeRegular : PlatformBridge::SizeSmall,
+            scrollbar->controlSize() == RegularScrollbar ? ChromiumBridge::SizeRegular : ChromiumBridge::SizeSmall,
             scrollbar->frameRect(),
             scrollbarInfo);
     }
index 29e8b44..ba7e97b 100644 (file)
@@ -30,8 +30,8 @@
 #include <windows.h>
 #include <vsstyle.h>
 
+#include "ChromiumBridge.h"
 #include "GraphicsContext.h"
-#include "PlatformBridge.h"
 #include "PlatformContextSkia.h"
 #include "PlatformMouseEvent.h"
 #include "Scrollbar.h"
@@ -61,7 +61,7 @@ int ScrollbarThemeChromiumWin::scrollbarThickness(ScrollbarControlSize controlSi
 {
     static int thickness;
     if (!thickness) {
-        if (PlatformBridge::layoutTestMode())
+        if (ChromiumBridge::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(
+    ChromiumBridge::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(
+    ChromiumBridge::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(
+    ChromiumBridge::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(
+    ChromiumBridge::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 = ChromiumBridge::layoutTestMode() ? kLayoutTestModeGirth : thickness;
 
     if (scrollbar->orientation() == HorizontalScrollbar) {
         int width = scrollbar->width() < 2 * girth ? scrollbar->width() / 2 : girth;
index 5acb253..5a6a000 100644 (file)
 #include "config.h"
 #include "SharedTimer.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 
 namespace WebCore {
 
 void setSharedTimerFiredFunction(void (*f)())
 {                   
-    PlatformBridge::setSharedTimerFiredFunction(f);
+    ChromiumBridge::setSharedTimerFiredFunction(f);
 }
 
 void setSharedTimerFireTime(double fireTime)
 {
-    PlatformBridge::setSharedTimerFireTime(fireTime);
+    ChromiumBridge::setSharedTimerFireTime(fireTime);
 }
 
 void stopSharedTimer()
 {
-    PlatformBridge::stopSharedTimer();
+    ChromiumBridge::stopSharedTimer();
 }
 
 } // namespace WebCore
index 06cc738..54b8304 100644 (file)
@@ -1,48 +1,48 @@
-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "SuddenTermination.h"
-
-#include "PlatformBridge.h"
-
-namespace WebCore {
-
-void disableSuddenTermination()
-{
-    PlatformBridge::suddenTerminationChanged(false);
-}
-
-void enableSuddenTermination()
-{
-    PlatformBridge::suddenTerminationChanged(true);
-}
-
-} // namespace WebCore
+/*\r
+ * Copyright (C) 2009 Google Inc. All rights reserved.\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions are\r
+ * met:\r
+ *\r
+ *     * Redistributions of source code must retain the above copyright\r
+ * notice, this list of conditions and the following disclaimer.\r
+ *     * Redistributions in binary form must reproduce the above\r
+ * copyright notice, this list of conditions and the following disclaimer\r
+ * in the documentation and/or other materials provided with the\r
+ * distribution.\r
+ *     * Neither the name of Google Inc. nor the names of its\r
+ * contributors may be used to endorse or promote products derived from\r
+ * this software without specific prior written permission.\r
+ *\r
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\r
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\r
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\r
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\r
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\r
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\r
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\r
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\r
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\r
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\r
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
+ */\r
+\r
+#include "config.h"\r
+#include "SuddenTermination.h"\r
+\r
+#include "ChromiumBridge.h"\r
+\r
+namespace WebCore {\r
+\r
+void disableSuddenTermination()\r
+{\r
+    ChromiumBridge::suddenTerminationChanged(false);\r
+}\r
+\r
+void enableSuddenTermination()\r
+{\r
+    ChromiumBridge::suddenTerminationChanged(true);\r
+}\r
+\r
+} // namespace WebCore\r
index 93ac8b1..52ac262 100644 (file)
 #include "config.h"
 #include "SystemTime.h"
 
+#include "ChromiumBridge.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
 
 namespace WebCore {
 
 // Get the current time in seconds since epoch.
 double currentTime()
 {
-    return PlatformBridge::currentTime();
+    return ChromiumBridge::currentTime();
 }
 
 float userIdleTime()
index a1ac7d9..7cbf42c 100644 (file)
@@ -31,8 +31,8 @@
 #include "config.h"
 #include "WritableDataObject.h"
 
+#include "ChromiumBridge.h"
 #include "ClipboardMimeTypes.h"
-#include "PlatformBridge.h"
 
 namespace WebCore {
 
@@ -80,7 +80,7 @@ bool WritableDataObject::setData(const String& type, const String& data)
         // FIXME: This is currently unimplemented on the Chromium-side. This is
         // "okay" for now since the original implementation didn't support it
         // anyway. Going forward, this is something we'll need to fix though.
-        PlatformBridge::clipboardWriteData(type, data, "");
+        ChromiumBridge::clipboardWriteData(type, data, "");
         return true;
     }
     m_dataMap.set(type, data);
index 227fbe4..72e3369 100644 (file)
@@ -30,7 +30,7 @@
 #import "CrossProcessFontLoading.h"
 
 #import "../graphics/cocoa/FontPlatformData.h"
-#import "PlatformBridge.h"
+#import "ChromiumBridge.h"
 #import <AppKit/NSFont.h>
 #import <wtf/HashMap.h>
 
@@ -87,7 +87,7 @@ PassRefPtr<MemoryActivatedFont> loadFontFromBrowserProcess(NSFont* nsFont)
 {
     ATSFontContainerRef container;
     // Send cross-process request to load font.
-    if (!PlatformBridge::loadFont(nsFont, &container))
+    if (!ChromiumBridge::loadFont(nsFont, &container))
         return 0;
     
     ATSFontContainerRef srcFontContainerRef = fontContainerRefFromNSFont(nsFont);
index f4c0dee..2c79815 100644 (file)
 #include "config.h"
 #include "FontCache.h"
 
+#include "ChromiumBridge.h"
 #include "Font.h"
 #include "FontUtilsChromiumWin.h"
 #include "HashMap.h"
 #include "HashSet.h"
-#include "PlatformBridge.h"
 #include "SimpleFontData.h"
 #include <unicode/uniset.h>
 #include <wtf/text/StringHash.h>
@@ -288,9 +288,9 @@ 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 == 0 && ChromiumBridge::ensureFontLoaded(hfont))
         count = GetFontUnicodeRanges(hdc, 0);
-    if (!count) {
+    if (count == 0) {
         LOG_ERROR("Unable to get the font unicode range after second attempt");
         SelectObject(hdc, oldFont);
         ReleaseDC(0, hdc);
@@ -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 = ChromiumBridge::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 a849a6c..bd33927 100644 (file)
 #include "config.h"
 #include "FontCache.h"
 
+#include "ChromiumBridge.h"
 #include "Font.h"
 #include "FontDescription.h"
 #include "FontPlatformData.h"
 #include "Logging.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
 #include "SimpleFontData.h"
 
 #include "SkPaint.h"
@@ -57,7 +57,7 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font,
                                                           const UChar* characters,
                                                           int length)
 {
-    String family = PlatformBridge::getFontFamilyForCharacters(characters, length);
+    String family = ChromiumBridge::getFontFamilyForCharacters(characters, length);
     if (family.isEmpty())
         return 0;
 
index 5da4d5a..1a00833 100644 (file)
 #include "config.h"
 #include "Font.h"
 
+#include "ChromiumBridge.h"
 #include "FontFallbackList.h"
 #include "GlyphBuffer.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
 #include "PlatformContextSkia.h"
 #include "SimpleFontData.h"
 #include "SkiaFontWin.h"
@@ -424,7 +424,7 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext,
             success = painter.drawGlyphs(curLen, &glyphs[0], &advances[0], curAdvance);
             if (!success && executions == 0) {
                 // Ask the browser to load the font for us and retry.
-                PlatformBridge::ensureFontLoaded(font->platformData().hfont());
+                ChromiumBridge::ensureFontLoaded(font->platformData().hfont());
                 continue;
             }
             break;
index 6d75c90..d6c83ec 100644 (file)
 #include "config.h"
 #include "FontPlatformData.h"
 
-#include "PlatformBridge.h"
-#include "SkiaFontWin.h"
-
-#include <mlang.h>
-#include <objidl.h>
 #include <windows.h>
+#include <objidl.h>
+#include <mlang.h>
+
+#include "ChromiumBridge.h"
+#include "SkiaFontWin.h"
 
 namespace WebCore {
 
@@ -136,7 +136,7 @@ SCRIPT_FONTPROPERTIES* FontPlatformData::scriptFontProperties() const
             HRESULT hr = ScriptGetFontProperties(dc, scriptCache(),
                                                  m_scriptFontProperties);
             if (S_OK != hr) {
-                if (PlatformBridge::ensureFontLoaded(hfont())) {
+                if (ChromiumBridge::ensureFontLoaded(hfont())) {
                     // FIXME: Handle gracefully the error if this call also fails.
                     hr = ScriptGetFontProperties(dc, scriptCache(),
                                                  m_scriptFontProperties);
index a1ea012..42942cc 100644 (file)
@@ -31,9 +31,9 @@
 #include "config.h"
 #include "FontPlatformData.h"
 
+#include "ChromiumBridge.h"
 #include "HarfbuzzSkia.h"
 #include "NotImplemented.h"
-#include "PlatformBridge.h"
 #include "PlatformString.h"
 
 #include "SkPaint.h"
@@ -229,7 +229,7 @@ void FontPlatformData::querySystemForRenderStyle()
         return;
     }
 
-    PlatformBridge::getRenderStyleForStrike(m_family.data(), (((int)m_textSize) << 2) | (m_typeface->style() & 3), &m_style);
+    ChromiumBridge::getRenderStyleForStrike(m_family.data(), (((int)m_textSize) << 2) | (m_typeface->style() & 3), &m_style);
 }
 
 }  // namespace WebCore
index ee2b5ab..e71f66a 100644 (file)
@@ -32,9 +32,9 @@
 #include <windows.h>
 #include <vector>
 
+#include "ChromiumBridge.h"
 #include "Font.h"
 #include "GlyphPageTreeNode.h"
-#include "PlatformBridge.h"
 #include "SimpleFontData.h"
 #include "UniscribeHelperTextRun.h"
 #include "WindowsVersion.h"
@@ -80,11 +80,12 @@ static bool fillBMPGlyphs(unsigned offset,
         ReleaseDC(0, dc);
 
         if (recurse) {
-            if (PlatformBridge::ensureFontLoaded(fontData->platformData().hfont()))
+            if (ChromiumBridge::ensureFontLoaded(fontData->platformData().hfont()))
                 return fillBMPGlyphs(offset, length, buffer, page, fontData, false);
-
-            fillEmptyGlyphs(page);
-            return false;
+            else {
+                fillEmptyGlyphs(page);
+                return false;
+            }
         } else {
             // FIXME: Handle gracefully the error if this call also fails.
             // See http://crbug.com/6401
index e2b6f7a..e90d566 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "Image.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 
 namespace WebCore {
 
@@ -39,7 +39,7 @@ namespace WebCore {
 
 PassRefPtr<Image> Image::loadPlatformResource(const char *name)
 {
-    return PlatformBridge::loadPlatformImageResource(name);
+    return ChromiumBridge::loadPlatformImageResource(name);
 }
 
 } // namespace WebCore
index f003894..073a409 100644 (file)
 #include "config.h"
 #include "BitmapImage.h"
 
+#include "ChromiumBridge.h"
 #include "Image.h"
-#include "PlatformBridge.h"
 
 namespace WebCore {
 
 PassRefPtr<Image> Image::loadPlatformResource(const char* name)
 {
-    return PlatformBridge::loadPlatformImageResource(name);
+    return ChromiumBridge::loadPlatformImageResource(name);
 }
 
 // FIXME: These are temporary stubs, we need real implementations which
index c23c586..204c565 100644 (file)
 #include "config.h"
 #include "SimpleFontData.h"
 
-#include "FloatRect.h"
+#include "ChromiumBridge.h"
 #include "Font.h"
 #include "FontCache.h"
+#include "FloatRect.h"
 #include "FontDescription.h"
-#include "PlatformBridge.h"
 #include <wtf/MathExtras.h>
 
 #include <unicode/uchar.h>
@@ -70,7 +70,7 @@ void SimpleFontData::platformInit()
 
     TEXTMETRIC textMetric = {0};
     if (!GetTextMetrics(dc, &textMetric)) {
-        if (PlatformBridge::ensureFontLoaded(m_platformData.hfont())) {
+        if (ChromiumBridge::ensureFontLoaded(m_platformData.hfont())) {
             // Retry GetTextMetrics.
             // FIXME: Handle gracefully the error if this call also fails.
             // See http://crbug.com/6401.
@@ -159,7 +159,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 (ChromiumBridge::ensureFontLoaded(m_platformData.hfont())) {
             // Retry GetTextMetrics.
             // FIXME: Handle gracefully the error if this call also fails.
             // See http://crbug.com/6401.
@@ -190,7 +190,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 (ChromiumBridge::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 aa18b4a..84a08fc 100644 (file)
@@ -31,8 +31,8 @@
 #include "config.h"
 #include "UniscribeHelperTextRun.h"
 
+#include "ChromiumBridge.h"
 #include "Font.h"
-#include "PlatformBridge.h"
 #include "SimpleFontData.h"
 #include "TextRun.h"
 
@@ -80,7 +80,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);
+    ChromiumBridge::ensureFontLoaded(font);
 }
 
 bool UniscribeHelperTextRun::nextWinFontData(
index 0b31dfa..e94c417 100644 (file)
@@ -35,8 +35,8 @@
 
 #if OS(WINDOWS)
 #include "Base64.h"
+#include "ChromiumBridge.h"
 #include "OpenTypeUtilities.h"
-#include "PlatformBridge.h"
 #elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
 #include "SkStream.h"
 #endif
@@ -91,7 +91,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 = ChromiumBridge::layoutTestMode() ?
                         NONANTIALIASED_QUALITY :
                         DEFAULT_QUALITY; // Honor user's desktop settings.
     logFont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
index 2f2489b..e17816a 100644 (file)
 #include "CookieJar.h"
 
 #include "Cookie.h"
+#include "ChromiumBridge.h"
 #include "Document.h"
-#include "PlatformBridge.h"
 
 namespace WebCore {
 
 void setCookies(Document* document, const KURL& url, const String& value)
 {
-    PlatformBridge::setCookies(document, url, value);
+    ChromiumBridge::setCookies(document, url, value);
 }
 
 String cookies(const Document* document, const KURL& url)
 {
-    return PlatformBridge::cookies(document, url);
+    return ChromiumBridge::cookies(document, url);
 }
 
 String cookieRequestHeaderFieldValue(const Document* document, const KURL& url)
 {
-    return PlatformBridge::cookieRequestHeaderFieldValue(document, url);
+    return ChromiumBridge::cookieRequestHeaderFieldValue(document, url);
 }
 
 bool cookiesEnabled(const Document* document)
 {
-    return PlatformBridge::cookiesEnabled(document);
+    return ChromiumBridge::cookiesEnabled(document);
 }
 
 bool getRawCookies(const Document* document, const KURL& url, Vector<Cookie>& rawCookies)
 {
-    return PlatformBridge::rawCookies(document, url, rawCookies);
+    return ChromiumBridge::rawCookies(document, url, rawCookies);
 }
 
 void deleteCookie(const Document* document, const KURL& url, const String& cookieName)
 {
-    return PlatformBridge::deleteCookie(document, url, cookieName);
+    return ChromiumBridge::deleteCookie(document, url, cookieName);
 }
 
 } // namespace WebCore
index 7b9eac5..21fcd46 100644 (file)
 #include "config.h"
 #include "DNS.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #include "ResourceHandle.h"
 
 namespace WebCore {
 
 void prefetchDNS(const String& hostname)
 {
-    PlatformBridge::prefetchDNS(hostname);
+    ChromiumBridge::prefetchDNS(hostname);
 }
 
 void ResourceHandle::prepareForURL(const KURL& url)
index 9647507..e478d8f 100644 (file)
@@ -86,7 +86,7 @@ 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
+// This is very similar to ChromiumBridge and the two are likely to converge
 // in the future.
 class PlatformBridge {
 public:
index b79eb1a..0a09888 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLiteFileSystem.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.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 (ChromiumBridge::databaseDeleteFile(fileName) == SQLITE_OK);
 }
 
 long long SQLiteFileSystem::getDatabaseFileSize(const String& fileName)
 {
-    return PlatformBridge::databaseGetFileSize(fileName);
+    return ChromiumBridge::databaseGetFileSize(fileName);
 }
 
 } // namespace WebCore
index 37f96be..1102df5 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLiteFileSystem.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #include <sqlite3.h>
 
 #include <errno.h>
@@ -996,10 +996,10 @@ static int chromiumOpen(sqlite3_vfs* vfs, const char* fileName,
     }
 
     if (fd < 0) {
-        fd = PlatformBridge::databaseOpenFile(fileName, desiredFlags);
+        fd = ChromiumBridge::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 = ChromiumBridge::databaseOpenFile(fileName, newFlags);
         }
     }
     if (fd < 0) {
@@ -1031,7 +1031,7 @@ static int chromiumOpen(sqlite3_vfs* vfs, const char* fileName,
 //           should be synched after the file is deleted.
 static int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir)
 {
-    return PlatformBridge::databaseDeleteFile(fileName, syncDir);
+    return ChromiumBridge::databaseDeleteFile(fileName, syncDir);
 }
 
 // Check the existance and status of the given file.
@@ -1042,7 +1042,7 @@ static int chromiumDelete(sqlite3_vfs*, const char* fileName, int syncDir)
 // res - the result.
 static int chromiumAccess(sqlite3_vfs*, const char* fileName, int flag, int* res)
 {
-    int attr = static_cast<int>(PlatformBridge::databaseGetFileAttributes(fileName));
+    int attr = static_cast<int>(ChromiumBridge::databaseGetFileAttributes(fileName));
     if (attr < 0) {
         *res = 0;
         return SQLITE_OK;
index 47e01d0..d846af7 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "SQLiteFileSystem.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.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 = ChromiumBridge::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 ChromiumBridge::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 = ChromiumBridge::databaseGetFileAttributes(fileName);
     switch (flag) {
     case SQLITE_ACCESS_READ:
     case SQLITE_ACCESS_EXISTS:
index 77cdbbf..c924063 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "PluginDataChromium.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 
 namespace WebCore {
 
@@ -50,7 +50,7 @@ public:
     const Vector<PluginInfo>& plugins()
     {
         if (!m_loaded) {
-            PlatformBridge::plugins(m_refresh, &m_plugins);
+            ChromiumBridge::plugins(m_refresh, &m_plugins);
             m_loaded = true;
             m_refresh = false;
         }
index 10285ac..02eb134 100644 (file)
@@ -20,8 +20,8 @@
 
 #import "config.h"
 #import "RenderThemeChromiumMac.h"
+#import "ChromiumBridge.h"
 #import "PaintInfo.h"
-#import "PlatformBridge.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 ChromiumBridge::layoutTestMode();
 }
 
 NSView* RenderThemeChromiumMac::documentViewFor(RenderObject*) const
index 1457766..bb60c1f 100644 (file)
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "RenderThemeChromiumSkia.h"
 
+#include "ChromiumBridge.h"
 #include "CSSValueKeywords.h"
 #include "CurrentTime.h"
 #include "GraphicsContext.h"
@@ -32,7 +33,6 @@
 #include "Image.h"
 #include "MediaControlElements.h"
 #include "PaintInfo.h"
-#include "PlatformBridge.h"
 #include "PlatformContextSkia.h"
 #include "RenderBox.h"
 #include "RenderMediaControlsChromium.h"
@@ -185,7 +185,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 (ChromiumBridge::layoutTestMode())
         return 0;
 
     return caretBlinkIntervalInternal();
index bba0520..572aa2f 100644 (file)
@@ -30,6 +30,7 @@
 #include <vssym32.h>
 
 #include "CSSValueKeywords.h"
+#include "ChromiumBridge.h"
 #include "CurrentTime.h"
 #include "FontSelector.h"
 #include "FontUtilsChromiumWin.h"
@@ -38,7 +39,6 @@
 #include "HTMLNames.h"
 #include "MediaControlElements.h"
 #include "PaintInfo.h"
-#include "PlatformBridge.h"
 #include "RenderBox.h"
 #include "RenderProgress.h"
 #include "RenderSlider.h"
@@ -238,7 +238,7 @@ bool RenderThemeChromiumWin::supportsFocusRing(const RenderStyle* style) const
 
 Color RenderThemeChromiumWin::platformActiveSelectionBackgroundColor() const
 {
-    if (PlatformBridge::layoutTestMode())
+    if (ChromiumBridge::layoutTestMode())
         return Color(0x00, 0x00, 0xff); // Royal blue.
     COLORREF color = GetSysColor(COLOR_HIGHLIGHT);
     return Color(GetRValue(color), GetGValue(color), GetBValue(color), 0xff);
@@ -246,7 +246,7 @@ Color RenderThemeChromiumWin::platformActiveSelectionBackgroundColor() const
 
 Color RenderThemeChromiumWin::platformInactiveSelectionBackgroundColor() const
 {
-    if (PlatformBridge::layoutTestMode())
+    if (ChromiumBridge::layoutTestMode())
         return Color(0x99, 0x99, 0x99); // Medium gray.
     COLORREF color = GetSysColor(COLOR_GRAYTEXT);
     return Color(GetRValue(color), GetGValue(color), GetBValue(color), 0xff);
@@ -254,7 +254,7 @@ Color RenderThemeChromiumWin::platformInactiveSelectionBackgroundColor() const
 
 Color RenderThemeChromiumWin::platformActiveSelectionForegroundColor() const
 {
-    if (PlatformBridge::layoutTestMode())
+    if (ChromiumBridge::layoutTestMode())
         return Color(0xff, 0xff, 0xcc); // Pale yellow.
     COLORREF color = GetSysColor(COLOR_HIGHLIGHTTEXT);
     return Color(GetRValue(color), GetGValue(color), GetBValue(color), 0xff);
@@ -375,7 +375,7 @@ static int cssValueIdToSysColorIndex(int cssValueId)
 Color RenderThemeChromiumWin::systemColor(int cssValueId) const
 {
     int sysColorIndex = cssValueIdToSysColorIndex(cssValueId);
-    if (PlatformBridge::layoutTestMode() || (sysColorIndex == -1))
+    if (ChromiumBridge::layoutTestMode() || (sysColorIndex == -1))
         return RenderTheme::systemColor(cssValueId);
 
     COLORREF color = GetSysColor(sysColorIndex);
@@ -411,7 +411,7 @@ bool RenderThemeChromiumWin::paintButton(RenderObject* o, const PaintInfo& i, co
     const ThemeData& themeData = getThemeData(o);
 
     ThemePainter painter(i.context, r);
-    PlatformBridge::paintButton(painter.context(),
+    ChromiumBridge::paintButton(painter.context(),
                                 themeData.m_part,
                                 themeData.m_state,
                                 themeData.m_classicState,
@@ -429,7 +429,7 @@ bool RenderThemeChromiumWin::paintSliderTrack(RenderObject* o, const PaintInfo&
     const ThemeData& themeData = getThemeData(o);
 
     ThemePainter painter(i.context, r);
-    PlatformBridge::paintTrackbar(painter.context(),
+    ChromiumBridge::paintTrackbar(painter.context(),
                                   themeData.m_part,
                                   themeData.m_state,
                                   themeData.m_classicState,
@@ -444,7 +444,7 @@ bool RenderThemeChromiumWin::paintSliderThumb(RenderObject* o, const PaintInfo&
 
 static int menuListButtonWidth()
 {
-    static int width = PlatformBridge::layoutTestMode() ? kStandardMenuListButtonWidth : GetSystemMetrics(SM_CXVSCROLL);
+    static int width = ChromiumBridge::layoutTestMode() ? kStandardMenuListButtonWidth : GetSystemMetrics(SM_CXVSCROLL);
     return width;
 }
 
@@ -492,7 +492,7 @@ 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(),
+    ChromiumBridge::paintMenuList(painter.context(),
                                   CP_DROPDOWNBUTTON,
                                   determineState(o),
                                   determineClassicState(o),
@@ -657,7 +657,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 ChromiumBridge::paintTextField duplicates this check).
     Color backgroundColor(Color::white);
     if (o->style()->visitedDependentColor(CSSPropertyBackgroundColor).isValid())
         backgroundColor = o->style()->visitedDependentColor(CSSPropertyBackgroundColor);
@@ -681,7 +681,7 @@ bool RenderThemeChromiumWin::paintTextFieldInternal(RenderObject* o,
     {
         const ThemeData& themeData = getThemeData(o);
         ThemePainter painter(i.context, r);
-        PlatformBridge::paintTextField(painter.context(),
+        ChromiumBridge::paintTextField(painter.context(),
                                        themeData.m_part,
                                        themeData.m_state,
                                        themeData.m_classicState,
@@ -710,7 +710,7 @@ 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(),
+    ChromiumBridge::paintSpinButton(upPainter.context(),
                                     upThemeData.m_part,
                                     upThemeData.m_state,
                                     upThemeData.m_classicState,
@@ -719,7 +719,7 @@ bool RenderThemeChromiumWin::paintInnerSpinButton(RenderObject* object, const Pa
     half.setY(rect.y() + rect.height() / 2);
     const ThemeData& downThemeData = getThemeData(object, SpinButtonDown);
     ThemePainter downPainter(info.context, half);
-    PlatformBridge::paintSpinButton(downPainter.context(),
+    ChromiumBridge::paintSpinButton(downPainter.context(),
                                     downThemeData.m_part,
                                     downThemeData.m_state,
                                     downThemeData.m_classicState,
@@ -760,7 +760,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);
+    ChromiumBridge::paintProgressBar(painter.context(), r, valueRect, renderProgress->isDeterminate(), animatedSeconds);
     return false;
 }
 
index 92e9a7b..c0fb444 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "IDBFactoryBackendInterface.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 
 #if ENABLE(INDEXED_DATABASE)
 
@@ -36,12 +36,12 @@ namespace WebCore {
 
 PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendInterface::create()
 {
-    return PlatformBridge::idbFactory();
+    return ChromiumBridge::idbFactory();
 }
 
 IDBFactoryBackendInterface::~IDBFactoryBackendInterface()
 {
-    PlatformBridge::idbShutdown();
+    ChromiumBridge::idbShutdown();
 }
 
 } // namespace WebCore
index 38b2983..0f10875 100644 (file)
 
 #if ENABLE(INDEXED_DATABASE)
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.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);
+    ChromiumBridge::createIDBKeysFromSerializedValuesAndKeyPath(values, keyPath, keys);
 }
 
 } // namespace WebCore
index 648bc79..774f8fa 100644 (file)
@@ -1,3 +1,126 @@
+2011-01-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r76203.
+        http://trac.webkit.org/changeset/76203
+        https://bugs.webkit.org/show_bug.cgi?id=52784
+
+        Broke Win compile on Chromium bots (Requested by dimich on
+        #webkit).
+
+        * WebKit.gyp:
+        * src/AssertMatchingEnums.cpp:
+        * src/ChromiumBridge.cpp: Renamed from Source/WebKit/chromium/src/PlatformBridge.cpp.
+        (WebCore::toChromeClientImpl):
+        (WebCore::toWebWidgetClient):
+        (WebCore::getCookieJar):
+        (WebCore::ChromiumBridge::cacheMetadata):
+        (WebCore::ChromiumBridge::clipboardIsFormatAvailable):
+        (WebCore::ChromiumBridge::clipboardReadPlainText):
+        (WebCore::ChromiumBridge::clipboardReadHTML):
+        (WebCore::ChromiumBridge::clipboardWriteSelection):
+        (WebCore::ChromiumBridge::clipboardWritePlainText):
+        (WebCore::ChromiumBridge::clipboardWriteURL):
+        (WebCore::ChromiumBridge::clipboardWriteImage):
+        (WebCore::ChromiumBridge::clipboardWriteData):
+        (WebCore::ChromiumBridge::clipboardReadAvailableTypes):
+        (WebCore::ChromiumBridge::clipboardReadData):
+        (WebCore::ChromiumBridge::clipboardReadFilenames):
+        (WebCore::ChromiumBridge::setCookies):
+        (WebCore::ChromiumBridge::cookies):
+        (WebCore::ChromiumBridge::cookieRequestHeaderFieldValue):
+        (WebCore::ChromiumBridge::rawCookies):
+        (WebCore::ChromiumBridge::deleteCookie):
+        (WebCore::ChromiumBridge::cookiesEnabled):
+        (WebCore::ChromiumBridge::prefetchDNS):
+        (WebCore::ChromiumBridge::fileExists):
+        (WebCore::ChromiumBridge::deleteFile):
+        (WebCore::ChromiumBridge::deleteEmptyDirectory):
+        (WebCore::ChromiumBridge::getFileSize):
+        (WebCore::ChromiumBridge::revealFolderInOS):
+        (WebCore::ChromiumBridge::getFileModificationTime):
+        (WebCore::ChromiumBridge::directoryName):
+        (WebCore::ChromiumBridge::pathByAppendingComponent):
+        (WebCore::ChromiumBridge::makeAllDirectories):
+        (WebCore::ChromiumBridge::getAbsolutePath):
+        (WebCore::ChromiumBridge::isDirectory):
+        (WebCore::ChromiumBridge::filePathToURL):
+        (WebCore::ChromiumBridge::openFile):
+        (WebCore::ChromiumBridge::closeFile):
+        (WebCore::ChromiumBridge::seekFile):
+        (WebCore::ChromiumBridge::truncateFile):
+        (WebCore::ChromiumBridge::readFromFile):
+        (WebCore::ChromiumBridge::writeToFile):
+        (WebCore::ChromiumBridge::ensureFontLoaded):
+        (WebCore::ChromiumBridge::getFontFamilyForCharacters):
+        (WebCore::ChromiumBridge::getRenderStyleForStrike):
+        (WebCore::ChromiumBridge::loadFont):
+        (WebCore::ChromiumBridge::databaseOpenFile):
+        (WebCore::ChromiumBridge::databaseDeleteFile):
+        (WebCore::ChromiumBridge::databaseGetFileAttributes):
+        (WebCore::ChromiumBridge::databaseGetFileSize):
+        (WebCore::ChromiumBridge::idbFactory):
+        (WebCore::ChromiumBridge::idbShutdown):
+        (WebCore::ChromiumBridge::createIDBKeysFromSerializedValuesAndKeyPath):
+        (WebCore::ChromiumBridge::signedPublicKeyAndChallengeString):
+        (WebCore::ChromiumBridge::computedDefaultLanguage):
+        (WebCore::ChromiumBridge::layoutTestMode):
+        (WebCore::ChromiumBridge::isSupportedImageMIMEType):
+        (WebCore::ChromiumBridge::isSupportedJavaScriptMIMEType):
+        (WebCore::ChromiumBridge::isSupportedNonImageMIMEType):
+        (WebCore::ChromiumBridge::mimeTypeForExtension):
+        (WebCore::ChromiumBridge::mimeTypeFromFile):
+        (WebCore::ChromiumBridge::preferredExtensionForMIMEType):
+        (WebCore::ChromiumBridge::plugins):
+        (WebCore::ChromiumBridge::pluginScriptableObject):
+        (WebCore::ChromiumBridge::loadPlatformImageResource):
+        (WebCore::ChromiumBridge::loadPlatformAudioResource):
+        (WebCore::ChromiumBridge::decodeAudioFileData):
+        (WebCore::ChromiumBridge::sandboxEnabled):
+        (WebCore::ChromiumBridge::setSharedTimerFiredFunction):
+        (WebCore::ChromiumBridge::setSharedTimerFireTime):
+        (WebCore::ChromiumBridge::stopSharedTimer):
+        (WebCore::ChromiumBridge::decrementStatsCounter):
+        (WebCore::ChromiumBridge::incrementStatsCounter):
+        (WebCore::ChromiumBridge::histogramCustomCounts):
+        (WebCore::ChromiumBridge::histogramEnumeration):
+        (WebCore::ChromiumBridge::suddenTerminationChanged):
+        (WebCore::ChromiumBridge::currentTime):
+        (WebCore::ChromiumBridge::paintButton):
+        (WebCore::ChromiumBridge::paintMenuList):
+        (WebCore::ChromiumBridge::paintScrollbarArrow):
+        (WebCore::ChromiumBridge::paintScrollbarThumb):
+        (WebCore::ChromiumBridge::paintScrollbarTrack):
+        (WebCore::ChromiumBridge::paintSpinButton):
+        (WebCore::ChromiumBridge::paintTextField):
+        (WebCore::ChromiumBridge::paintTrackbar):
+        (WebCore::ChromiumBridge::paintProgressBar):
+        (WebCore::WebThemePart):
+        (WebCore::WebThemeState):
+        (WebCore::GetWebThemeExtraParams):
+        (WebCore::ChromiumBridge::getThemePartSize):
+        (WebCore::ChromiumBridge::paintThemePart):
+        (WebCore::ChromiumBridge::traceEventBegin):
+        (WebCore::ChromiumBridge::traceEventEnd):
+        (WebCore::ChromiumBridge::visitedLinkHash):
+        (WebCore::ChromiumBridge::isLinkVisited):
+        (WebCore::ChromiumBridge::notifyJSOutOfMemory):
+        (WebCore::ChromiumBridge::memoryUsageMB):
+        (WebCore::ChromiumBridge::actualMemoryUsageMB):
+        (WebCore::ChromiumBridge::screenDepth):
+        (WebCore::ChromiumBridge::screenDepthPerComponent):
+        (WebCore::ChromiumBridge::screenIsMonochrome):
+        (WebCore::ChromiumBridge::screenRect):
+        (WebCore::ChromiumBridge::screenAvailableRect):
+        (WebCore::ChromiumBridge::popupsAllowed):
+        (WebCore::WorkerContextProxy::create):
+        * src/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::cacheMetadata):
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::WebFrameImpl):
+        (WebKit::WebFrameImpl::~WebFrameImpl):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
+
 2011-01-19  Adam Klein  <adamk@chromium.org>
 
         Reviewed by Darin Fisher.
index f40f4a2..85f671d 100644 (file)
                 'src/BoundObject.h',
                 'src/ChromeClientImpl.cpp',
                 'src/ChromeClientImpl.h',
+                'src/ChromiumBridge.cpp',
                 'src/ChromiumCurrentTime.cpp',
                 'src/ChromiumThreading.cpp',
                 'src/CompositionUnderlineBuilder.h',
                 'src/MediaPlayerPrivateChromium.cpp',
                 'src/NotificationPresenterImpl.h',
                 'src/NotificationPresenterImpl.cpp',
-                'src/PlatformBridge.cpp',
                 'src/PlatformMessagePortChannel.cpp',
                 'src/PlatformMessagePortChannel.h',
                 'src/ResourceHandle.cpp',
index e89fb74..e1ee4a1 100644 (file)
@@ -80,7 +80,7 @@
 #include <wtf/text/StringImpl.h>
 
 #if OS(DARWIN)
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #include "mac/WebThemeEngine.h"
 #endif
 
@@ -398,17 +398,17 @@ COMPILE_ASSERT_MATCHING_ENUM(WebGeolocationError::ErrorPermissionDenied, Geoloca
 COMPILE_ASSERT_MATCHING_ENUM(WebGeolocationError::ErrorPositionUnavailable, GeolocationError::PositionUnavailable);
 
 #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, ChromiumBridge::StateDisabled);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateInactive, ChromiumBridge::StateInactive);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StateActive, ChromiumBridge::StateActive);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::StatePressed, ChromiumBridge::StatePressed);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeRegular, PlatformBridge::SizeRegular);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeSmall, PlatformBridge::SizeSmall);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeRegular, ChromiumBridge::SizeRegular);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::SizeSmall, ChromiumBridge::SizeSmall);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationHorizontal, PlatformBridge::ScrollbarOrientationHorizontal);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationVertical, PlatformBridge::ScrollbarOrientationVertical);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationHorizontal, ChromiumBridge::ScrollbarOrientationHorizontal);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarOrientationVertical, ChromiumBridge::ScrollbarOrientationVertical);
 
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentScrollView, PlatformBridge::ScrollbarParentScrollView);
-COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentRenderLayer, PlatformBridge::ScrollbarParentRenderLayer);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentScrollView, ChromiumBridge::ScrollbarParentScrollView);
+COMPILE_ASSERT_MATCHING_ENUM(WebThemeEngine::ScrollbarParentRenderLayer, ChromiumBridge::ScrollbarParentRenderLayer);
 #endif
index 72f60bb..83e0017 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "ResourceHandle.h"
 
-#include "PlatformBridge.h"
+#include "ChromiumBridge.h"
 #include "ResourceHandleClient.h"
 #include "ResourceRequest.h"
 #include "SharedBuffer.h"
@@ -330,7 +330,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);
+    ChromiumBridge::cacheMetadata(response.url(), response.responseTime(), data);
 }
 
 } // namespace WebCore
index beaa0eb..a13eec0 100644 (file)
@@ -74,6 +74,7 @@
 #include "AssociatedURLLoader.h"
 #include "BackForwardController.h"
 #include "Chrome.h"
+#include "ChromiumBridge.h"
 #include "ClipboardUtilitiesChromium.h"
 #include "Console.h"
 #include "DOMUtilitiesPrivate.h"
 #include "InspectorController.h"
 #include "Page.h"
 #include "Performance.h"
-#include "PlatformBridge.h"
 #include "PlatformContextSkia.h"
 #include "PluginDocument.h"
 #include "PrintContext.h"
@@ -1820,13 +1820,13 @@ WebFrameImpl::WebFrameImpl(WebFrameClient* client)
     , m_animationController(this)
     , m_identifier(generateFrameIdentifier())
 {
-    PlatformBridge::incrementStatsCounter(webFrameActiveCount);
+    ChromiumBridge::incrementStatsCounter(webFrameActiveCount);
     frameCount++;
 }
 
 WebFrameImpl::~WebFrameImpl()
 {
-    PlatformBridge::decrementStatsCounter(webFrameActiveCount);
+    ChromiumBridge::decrementStatsCounter(webFrameActiveCount);
     frameCount--;
 
     cancelPendingScopingEffort();
index 8280d0b..41a0804 100644 (file)
 #include "AutoFillPopupMenuClient.h"
 #include "AXObjectCache.h"
 #include "BackForwardListChromium.h"
-#include "CSSStyleSelector.h"
-#include "CSSValueKeywords.h"
 #include "Chrome.h"
+#include "ChromiumBridge.h"
 #include "ColorSpace.h"
 #include "CompositionUnderlineVectorBuilder.h"
 #include "ContextMenu.h"
 #include "ContextMenuController.h"
 #include "ContextMenuItem.h"
+#include "CSSStyleSelector.h"
+#include "CSSValueKeywords.h"
 #include "Cursor.h"
-#include "DOMUtilitiesPrivate.h"
 #include "DeviceOrientationClientProxy.h"
 #include "Document.h"
 #include "DocumentLoader.h"
+#include "DOMUtilitiesPrivate.h"
 #include "DragController.h"
-#include "DragData.h"
 #include "DragScrollTimer.h"
+#include "DragData.h"
 #include "Editor.h"
 #include "EventHandler.h"
 #include "Extensions3D.h"
@@ -64,8 +65,8 @@
 #include "GraphicsContext3DInternal.h"
 #include "HTMLInputElement.h"
 #include "HTMLMediaElement.h"
-#include "HTMLNames.h"
 #include "HitTestResult.h"
+#include "HTMLNames.h"
 #include "Image.h"
 #include "ImageBuffer.h"
 #include "InspectorController.h"
@@ -77,7 +78,6 @@
 #include "PageGroup.h"
 #include "PageGroupLoadDeferrer.h"
 #include "Pasteboard.h"
-#include "PlatformBridge.h"
 #include "PlatformContextSkia.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
@@ -98,8 +98,8 @@
 #include "Vector.h"
 #include "WebAccessibilityObject.h"
 #include "WebAutoFillClient.h"
-#include "WebDevToolsAgentImpl.h"
 #include "WebDevToolsAgentPrivate.h"
+#include "WebDevToolsAgentImpl.h"
 #include "WebDragData.h"
 #include "WebFrameImpl.h"
 #include "WebImage.h"
@@ -2287,7 +2287,7 @@ void WebViewImpl::invalidateRootLayerRect(const IntRect& rect)
 
 void WebViewImpl::setIsAcceleratedCompositingActive(bool active)
 {
-    PlatformBridge::histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
+    ChromiumBridge::histogramEnumeration("GPU.setIsAcceleratedCompositingActive", active * 2 + m_isAcceleratedCompositingActive, 4);
 
     if (m_isAcceleratedCompositingActive == active)
         return;