Unreviewed, rolling out r144422 and r144424.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Mar 2013 13:30:17 +0000 (13:30 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Mar 2013 13:30:17 +0000 (13:30 +0000)
http://trac.webkit.org/changeset/144422
http://trac.webkit.org/changeset/144424
https://bugs.webkit.org/show_bug.cgi?id=111167

Caused over 20 tests to fail assertion on Chromium Win port as
ASSERTION FAILED: m_platformRequestUpdated (Requested by
toyoshim on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-03-01

Source/WebCore:

* CMakeLists.txt:
* GNUmakefile.list.am:
* Modules/mediastream/RTCPeerConnection.cpp:
* Modules/notifications/Notification.cpp:
* Target.pri:
* WebCore.exp.in:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/ScriptControllerBase.cpp:
* bindings/js/JSNodeCustom.cpp:
* bindings/js/ScriptController.cpp:
* bindings/js/ScriptSourceCode.h:
* bindings/objc/DOM.mm:
* bindings/v8/ScriptController.cpp:
* bindings/v8/V8DOMWindowShell.cpp:
* bindings/v8/custom/V8DOMWindowCustom.cpp:
* css/CSSCrossfadeValue.h:
(WebCore::CSSCrossfadeValue::CSSCrossfadeValue):
(WebCore::CSSCrossfadeValue::CrossfadeSubimageObserverProxy::CrossfadeSubimageObserverProxy):
* css/CSSFontFaceSource.h:
* css/CSSFontSelector.cpp:
* css/WebKitCSSSVGDocumentValue.cpp:
* css/WebKitCSSSVGDocumentValue.h:
(WebCore):
* dom/Clipboard.cpp:
(WebCore::Clipboard::Clipboard):
* dom/ContainerNode.cpp:
* dom/DOMImplementation.cpp:
* dom/PendingScript.h:
* dom/ScriptElement.cpp:
* dom/ScriptElement.h:
* history/CachedFrame.cpp:
* html/DOMURL.cpp:
* html/HTMLAnchorElement.cpp:
* html/HTMLAppletElement.cpp:
* html/HTMLElement.cpp:
* html/HTMLEmbedElement.cpp:
* html/HTMLFrameSetElement.cpp:
* html/HTMLHtmlElement.cpp:
* html/HTMLImageElement.cpp:
* html/HTMLObjectElement.cpp:
* html/HTMLPlugInElement.cpp:
* html/ImageDocument.cpp:
* html/ImageInputType.cpp:
* html/MediaDocument.cpp:
* html/PluginDocument.cpp:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore):
* html/parser/HTMLConstructionSite.cpp:
* html/parser/HTMLParserOptions.cpp:
* html/parser/HTMLScriptRunner.h:
* html/parser/XSSAuditor.cpp:
* html/parser/XSSAuditorDelegate.cpp:
* inspector/InspectorDebuggerAgent.cpp:
* inspector/InspectorFileSystemAgent.cpp:
* inspector/InspectorFrontendHost.cpp:
* inspector/InspectorInstrumentation.h:
(WebCore):
* inspector/InspectorPageAgent.cpp:
* inspector/NetworkResourcesData.cpp:
* inspector/NetworkResourcesData.h:
(WebCore):
* loader/CookieJar.cpp:
* loader/CrossOriginAccessControl.cpp:
* loader/CrossOriginAccessControl.h:
(WebCore):
* loader/CrossOriginPreflightResultCache.h:
* loader/DocumentThreadableLoader.h:
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::FrameLoader):
* loader/FrameLoader.h:
(WebCore):
(WebCore::FrameLoader::policyChecker):
* loader/ImageLoader.cpp:
* loader/ImageLoader.h:
* loader/LinkLoader.h:
* loader/MainResourceLoader.cpp:
* loader/MainResourceLoader.h:
* loader/MixedContentChecker.cpp:
* loader/PingLoader.cpp:
* loader/PolicyChecker.h:
(WebCore):
* loader/ProgressTracker.cpp:
* loader/SubframeLoader.cpp:
* loader/SubresourceLoader.cpp:
* loader/TextTrackLoader.cpp:
* loader/TextTrackLoader.h:
* loader/ThreadableLoader.h:
* loader/appcache/ApplicationCacheGroup.cpp:
* loader/appcache/ApplicationCacheGroup.h:
(WebCore):
* loader/appcache/ApplicationCacheHost.cpp:
* loader/archive/cf/LegacyWebArchive.cpp:
* loader/cache/CachedFont.cpp:
* loader/cache/CachedFont.h:
(CachedFontClient):
(WebCore::CachedFontClient::~CachedFontClient):
(WebCore::CachedFontClient::expectedType):
(WebCore::CachedFontClient::resourceClientType):
(WebCore::CachedFontClient::fontLoaded):
(WebCore):
* loader/cache/CachedFontClient.h: Removed.
* loader/cache/CachedImage.cpp:
* loader/cache/CachedRawResource.cpp:
* loader/cache/CachedRawResource.h:
(WebCore):
(CachedRawResourceClient):
(WebCore::CachedRawResourceClient::~CachedRawResourceClient):
(WebCore::CachedRawResourceClient::expectedType):
(WebCore::CachedRawResourceClient::resourceClientType):
(WebCore::CachedRawResourceClient::dataSent):
(WebCore::CachedRawResourceClient::responseReceived):
(WebCore::CachedRawResourceClient::dataReceived):
(WebCore::CachedRawResourceClient::redirectReceived):
(WebCore::CachedRawResourceClient::dataDownloaded):
* loader/cache/CachedRawResourceClient.h: Removed.
* loader/cache/CachedResource.cpp:
* loader/cache/CachedResourceHandle.cpp:
* loader/cache/CachedResourceHandle.h:
(WebCore::CachedResourceHandleBase::~CachedResourceHandleBase):
(WebCore::CachedResourceHandleBase::CachedResourceHandleBase):
* loader/cache/CachedSVGDocument.h:
(CachedSVGDocumentClient):
(WebCore::CachedSVGDocumentClient::~CachedSVGDocumentClient):
(WebCore::CachedSVGDocumentClient::expectedType):
(WebCore::CachedSVGDocumentClient::resourceClientType):
(WebCore):
* loader/cache/CachedSVGDocumentClient.h: Removed.
* loader/cache/CachedSVGDocumentReference.cpp: Removed.
* loader/cache/CachedSVGDocumentReference.h:
(WebCore::CachedSVGDocumentReference::CachedSVGDocumentReference):
(WebCore::CachedSVGDocumentReference::~CachedSVGDocumentReference):
* loader/cache/CachedStyleSheetClient.h:
* loader/cache/MemoryCache.cpp:
* loader/cache/MemoryCache.h:
(WebCore):
(MemoryCache):
* loader/chromium/CachedRawResourceChromium.cpp:
* loader/icon/IconController.cpp:
* loader/icon/IconLoader.h:
* loader/mac/ResourceLoaderMac.mm:
* page/DOMWindowExtension.cpp:
* page/DragController.cpp:
* page/Frame.cpp:
(WebCore::Frame::Frame):
(WebCore::Frame::reportMemoryUsage):
* page/Frame.h:
(WebCore):
(Frame):
(WebCore::Frame::init):
(WebCore::Frame::loader):
* page/PerformanceNavigation.cpp:
* page/PerformanceTiming.cpp:
* page/PointerLockController.cpp:
* page/Settings.cpp:
* page/animation/CSSPropertyAnimation.cpp:
* platform/chromium/PasteboardChromium.cpp:
* platform/efl/ErrorsEfl.cpp:
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/filters/FilterOperation.cpp:
* platform/graphics/filters/FilterOperation.h:
(WebCore::FilterOperation::ReferenceFilterOperation::setCachedSVGDocumentReference):
(WebCore::FilterOperation::ReferenceFilterOperation::ReferenceFilterOperation):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
* platform/gtk/ErrorsGtk.cpp:
* platform/gtk/PasteboardGtk.cpp:
* platform/gtk/PasteboardHelper.h:
* platform/mac/ClipboardMac.h:
* platform/mac/ClipboardMac.mm:
* platform/mac/HTMLConverter.mm:
* platform/mac/PasteboardMac.mm:
* platform/network/AuthenticationChallengeBase.cpp:
* platform/network/cf/CookieJarCFNet.cpp:
* platform/network/cf/ResourceRequestCFNet.cpp:
* platform/network/mac/CookieStorageMac.mm:
* platform/qt/PasteboardQt.cpp:
* plugins/DOMMimeType.cpp:
* plugins/PluginRequest.h: Removed.
* plugins/PluginStream.h:
(PluginStreamClient):
(WebCore::PluginStreamClient::~PluginStreamClient):
(WebCore::PluginStreamClient::streamDidFinishLoading):
(WebCore):
* plugins/PluginStreamClient.h: Removed.
* plugins/PluginView.cpp:
* plugins/PluginView.h:
(WebCore):
(PluginRequest):
(WebCore::PluginRequest::PluginRequest):
(WebCore::PluginRequest::frameLoadRequest):
(WebCore::PluginRequest::notifyData):
(WebCore::PluginRequest::sendNotification):
(WebCore::PluginRequest::shouldAllowPopups):
* rendering/HitTestResult.cpp:
* rendering/InlineFlowBox.cpp:
* rendering/RenderBox.cpp:
* rendering/RenderEmbeddedObject.cpp:
* rendering/RenderImage.cpp:
* rendering/RenderImageResource.cpp:
(WebCore::RenderImageResource::RenderImageResource):
* rendering/RenderImageResource.h:
(WebCore::RenderImageResource::image):
(WebCore::RenderImageResource::errorOccurred):
(WebCore::RenderImageResource::usesImageContainerSize):
(WebCore::RenderImageResource::imageHasRelativeWidth):
(WebCore::RenderImageResource::imageHasRelativeHeight):
(WebCore::RenderImageResource::imageSize):
* rendering/RenderImageResourceStyleImage.cpp:
* rendering/RenderLayer.cpp:
* rendering/RenderLayerBacking.cpp:
* rendering/RenderLayerFilterInfo.h:
* rendering/RenderListItem.cpp:
* rendering/RenderListMarker.cpp:
* rendering/RenderSnapshottedPlugIn.cpp:
* rendering/RenderTableCol.cpp:
* rendering/RenderTableRow.cpp:
* rendering/RenderTableSection.cpp:
* rendering/style/StyleCachedShader.h:
* rendering/style/StyleCustomFilterProgram.cpp: Removed.
* rendering/style/StyleCustomFilterProgram.h:
(WebCore):
(WebCore::StyleCustomFilterProgram::vertexShaderString):
(StyleCustomFilterProgram):
(WebCore::StyleCustomFilterProgram::fragmentShaderString):
(WebCore::StyleCustomFilterProgram::isLoaded):
(WebCore::StyleCustomFilterProgram::willHaveClients):
(WebCore::StyleCustomFilterProgram::didRemoveLastClient):
(WebCore::StyleCustomFilterProgram::notifyFinished):
* svg/SVGFEImageElement.h:
* svg/SVGFontFaceUriElement.h:
(SVGFontFaceUriElement):
* svg/SVGImageLoader.cpp:
* svg/SVGUseElement.cpp:
* svg/SVGUseElement.h:
* svg/graphics/SVGImageCache.cpp:
* testing/MockPagePopupDriver.cpp:
* xml/XSLStyleSheet.h:
* xml/XSLTProcessorLibxslt.cpp:
* xml/parser/XMLDocumentParser.cpp:
* xml/parser/XMLDocumentParser.h:
* xml/parser/XMLDocumentParserLibxml2.cpp:

Source/WebKit/chromium:

* src/ApplicationCacheHost.cpp:
* src/AssociatedURLLoader.cpp:
* src/EditorClientImpl.cpp:
* src/SharedWorkerRepository.cpp:
* src/WebDataSourceImpl.cpp:
* src/WebFrameImpl.h:
(WebCore):
* src/WebNode.cpp:
* src/WebSharedWorkerImpl.cpp:
* tests/FrameLoaderClientImplTest.cpp:

Source/WebKit/efl:

* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
* ewk/ewk_frame.cpp:

Source/WebKit/gtk:

* webkit/webkitwebpolicydecision.cpp:

Source/WebKit/mac:

* DOM/WebDOMOperations.mm:
* Misc/WebNSPasteboardExtras.mm:
* WebCoreSupport/WebFrameNetworkingContext.mm:
* WebView/WebRenderLayer.mm:
* WebView/WebRenderNode.mm:

Source/WebKit/qt:

* WebCoreSupport/NotificationPresenterClientQt.cpp:
* WebCoreSupport/QWebPageAdapter.cpp:

Source/WebKit2:

* NetworkProcess/HostRecord.h:
* NetworkProcess/NetworkResourceLoadScheduler.h:
* NetworkProcess/NetworkResourceLoader.h:
(WebCore):
* Shared/WebRenderLayer.cpp:
* Shared/WebRenderObject.cpp:
* WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp:
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
* WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
* WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
* WebProcess/Plugins/PluginView.cpp:
* WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
* WebProcess/WebPage/mac/WebPageMac.mm:
* WebProcess/WebProcess.cpp:
* WebProcess/soup/WebProcessSoup.cpp:

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

215 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
Source/WebCore/Modules/notifications/Notification.cpp
Source/WebCore/Target.pri
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/bindings/ScriptControllerBase.cpp
Source/WebCore/bindings/js/JSNodeCustom.cpp
Source/WebCore/bindings/js/ScriptController.cpp
Source/WebCore/bindings/js/ScriptSourceCode.h
Source/WebCore/bindings/objc/DOM.mm
Source/WebCore/bindings/v8/ScriptController.cpp
Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
Source/WebCore/css/CSSCrossfadeValue.h
Source/WebCore/css/CSSFontFaceSource.h
Source/WebCore/css/CSSFontSelector.cpp
Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp
Source/WebCore/css/WebKitCSSSVGDocumentValue.h
Source/WebCore/dom/Clipboard.cpp
Source/WebCore/dom/ContainerNode.cpp
Source/WebCore/dom/DOMImplementation.cpp
Source/WebCore/dom/PendingScript.h
Source/WebCore/dom/ScriptElement.cpp
Source/WebCore/dom/ScriptElement.h
Source/WebCore/history/CachedFrame.cpp
Source/WebCore/html/DOMURL.cpp
Source/WebCore/html/HTMLAnchorElement.cpp
Source/WebCore/html/HTMLAppletElement.cpp
Source/WebCore/html/HTMLElement.cpp
Source/WebCore/html/HTMLEmbedElement.cpp
Source/WebCore/html/HTMLFrameSetElement.cpp
Source/WebCore/html/HTMLHtmlElement.cpp
Source/WebCore/html/HTMLImageElement.cpp
Source/WebCore/html/HTMLObjectElement.cpp
Source/WebCore/html/HTMLPlugInElement.cpp
Source/WebCore/html/ImageDocument.cpp
Source/WebCore/html/ImageInputType.cpp
Source/WebCore/html/MediaDocument.cpp
Source/WebCore/html/PluginDocument.cpp
Source/WebCore/html/canvas/WebGLRenderingContext.cpp
Source/WebCore/html/parser/HTMLConstructionSite.cpp
Source/WebCore/html/parser/HTMLParserOptions.cpp
Source/WebCore/html/parser/HTMLScriptRunner.h
Source/WebCore/html/parser/XSSAuditor.cpp
Source/WebCore/html/parser/XSSAuditorDelegate.cpp
Source/WebCore/inspector/InspectorDebuggerAgent.cpp
Source/WebCore/inspector/InspectorFileSystemAgent.cpp
Source/WebCore/inspector/InspectorFrontendHost.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InspectorPageAgent.cpp
Source/WebCore/inspector/NetworkResourcesData.cpp
Source/WebCore/inspector/NetworkResourcesData.h
Source/WebCore/loader/CookieJar.cpp
Source/WebCore/loader/CrossOriginAccessControl.cpp
Source/WebCore/loader/CrossOriginAccessControl.h
Source/WebCore/loader/CrossOriginPreflightResultCache.h
Source/WebCore/loader/DocumentThreadableLoader.h
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/FrameLoader.h
Source/WebCore/loader/ImageLoader.cpp
Source/WebCore/loader/ImageLoader.h
Source/WebCore/loader/LinkLoader.h
Source/WebCore/loader/MainResourceLoader.cpp
Source/WebCore/loader/MainResourceLoader.h
Source/WebCore/loader/MixedContentChecker.cpp
Source/WebCore/loader/PingLoader.cpp
Source/WebCore/loader/PolicyChecker.h
Source/WebCore/loader/ProgressTracker.cpp
Source/WebCore/loader/SubframeLoader.cpp
Source/WebCore/loader/SubresourceLoader.cpp
Source/WebCore/loader/TextTrackLoader.cpp
Source/WebCore/loader/TextTrackLoader.h
Source/WebCore/loader/ThreadableLoader.h
Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
Source/WebCore/loader/appcache/ApplicationCacheGroup.h
Source/WebCore/loader/appcache/ApplicationCacheHost.cpp
Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp
Source/WebCore/loader/cache/CachedFont.cpp
Source/WebCore/loader/cache/CachedFont.h
Source/WebCore/loader/cache/CachedFontClient.h [deleted file]
Source/WebCore/loader/cache/CachedImage.cpp
Source/WebCore/loader/cache/CachedRawResource.cpp
Source/WebCore/loader/cache/CachedRawResource.h
Source/WebCore/loader/cache/CachedRawResourceClient.h [deleted file]
Source/WebCore/loader/cache/CachedResource.cpp
Source/WebCore/loader/cache/CachedResourceHandle.cpp
Source/WebCore/loader/cache/CachedResourceHandle.h
Source/WebCore/loader/cache/CachedSVGDocument.h
Source/WebCore/loader/cache/CachedSVGDocumentClient.h [deleted file]
Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp [deleted file]
Source/WebCore/loader/cache/CachedSVGDocumentReference.h
Source/WebCore/loader/cache/CachedStyleSheetClient.h
Source/WebCore/loader/cache/MemoryCache.cpp
Source/WebCore/loader/cache/MemoryCache.h
Source/WebCore/loader/chromium/CachedRawResourceChromium.cpp
Source/WebCore/loader/icon/IconController.cpp
Source/WebCore/loader/icon/IconLoader.h
Source/WebCore/loader/mac/ResourceLoaderMac.mm
Source/WebCore/page/DOMWindowExtension.cpp
Source/WebCore/page/DragController.cpp
Source/WebCore/page/Frame.cpp
Source/WebCore/page/Frame.h
Source/WebCore/page/PerformanceNavigation.cpp
Source/WebCore/page/PerformanceTiming.cpp
Source/WebCore/page/PointerLockController.cpp
Source/WebCore/page/Settings.cpp
Source/WebCore/page/animation/CSSPropertyAnimation.cpp
Source/WebCore/platform/chromium/PasteboardChromium.cpp
Source/WebCore/platform/efl/ErrorsEfl.cpp
Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
Source/WebCore/platform/graphics/filters/FilterOperation.cpp
Source/WebCore/platform/graphics/filters/FilterOperation.h
Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
Source/WebCore/platform/gtk/ErrorsGtk.cpp
Source/WebCore/platform/gtk/PasteboardGtk.cpp
Source/WebCore/platform/gtk/PasteboardHelper.h
Source/WebCore/platform/mac/ClipboardMac.h
Source/WebCore/platform/mac/ClipboardMac.mm
Source/WebCore/platform/mac/HTMLConverter.mm
Source/WebCore/platform/mac/PasteboardMac.mm
Source/WebCore/platform/network/AuthenticationChallengeBase.cpp
Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
Source/WebCore/platform/network/mac/CookieStorageMac.mm
Source/WebCore/platform/qt/PasteboardQt.cpp
Source/WebCore/plugins/DOMMimeType.cpp
Source/WebCore/plugins/PluginRequest.h [deleted file]
Source/WebCore/plugins/PluginStream.h
Source/WebCore/plugins/PluginStreamClient.h [deleted file]
Source/WebCore/plugins/PluginView.cpp
Source/WebCore/plugins/PluginView.h
Source/WebCore/rendering/HitTestResult.cpp
Source/WebCore/rendering/InlineFlowBox.cpp
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderEmbeddedObject.cpp
Source/WebCore/rendering/RenderImage.cpp
Source/WebCore/rendering/RenderImageResource.cpp
Source/WebCore/rendering/RenderImageResource.h
Source/WebCore/rendering/RenderImageResourceStyleImage.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderLayerBacking.cpp
Source/WebCore/rendering/RenderLayerFilterInfo.h
Source/WebCore/rendering/RenderListItem.cpp
Source/WebCore/rendering/RenderListMarker.cpp
Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
Source/WebCore/rendering/RenderTableCol.cpp
Source/WebCore/rendering/RenderTableRow.cpp
Source/WebCore/rendering/RenderTableSection.cpp
Source/WebCore/rendering/style/StyleCachedShader.h
Source/WebCore/rendering/style/StyleCustomFilterProgram.cpp [deleted file]
Source/WebCore/rendering/style/StyleCustomFilterProgram.h
Source/WebCore/svg/SVGFEImageElement.h
Source/WebCore/svg/SVGFontFaceUriElement.h
Source/WebCore/svg/SVGImageLoader.cpp
Source/WebCore/svg/SVGUseElement.cpp
Source/WebCore/svg/SVGUseElement.h
Source/WebCore/svg/graphics/SVGImageCache.cpp
Source/WebCore/testing/MockPagePopupDriver.cpp
Source/WebCore/xml/XSLStyleSheet.h
Source/WebCore/xml/XSLTProcessorLibxslt.cpp
Source/WebCore/xml/parser/XMLDocumentParser.cpp
Source/WebCore/xml/parser/XMLDocumentParser.h
Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/ApplicationCacheHost.cpp
Source/WebKit/chromium/src/AssociatedURLLoader.cpp
Source/WebKit/chromium/src/EditorClientImpl.cpp
Source/WebKit/chromium/src/SharedWorkerRepository.cpp
Source/WebKit/chromium/src/WebDataSourceImpl.cpp
Source/WebKit/chromium/src/WebFrameImpl.h
Source/WebKit/chromium/src/WebNode.cpp
Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp
Source/WebKit/chromium/tests/FrameLoaderClientImplTest.cpp
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
Source/WebKit/efl/ewk/ewk_frame.cpp
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/webkit/webkitwebpolicydecision.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/DOM/WebDOMOperations.mm
Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm
Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm
Source/WebKit/mac/WebView/WebRenderLayer.mm
Source/WebKit/mac/WebView/WebRenderNode.mm
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/HostRecord.h
Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h
Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
Source/WebKit2/Shared/WebRenderLayer.cpp
Source/WebKit2/Shared/WebRenderObject.cpp
Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm
Source/WebKit2/WebProcess/Plugins/PluginView.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm
Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

index f2c0ff2..f670cf0 100644 (file)
@@ -1733,7 +1733,6 @@ set(WebCore_SOURCES
     loader/cache/CachedScript.cpp
     loader/cache/CachedShader.cpp
     loader/cache/CachedSVGDocument.cpp
-    loader/cache/CachedSVGDocumentReference.cpp
     loader/cache/CachedTextTrack.cpp
     loader/cache/CachedXSLStyleSheet.cpp
     loader/cache/MemoryCache.cpp
@@ -2256,7 +2255,6 @@ set(WebCore_SOURCES
     rendering/style/StyleBoxData.cpp
     rendering/style/StyleCachedImage.cpp
     rendering/style/StyleCachedImageSet.cpp
-    rendering/style/StyleCustomFilterProgram.cpp
     rendering/style/StyleDeprecatedFlexibleBoxData.cpp
     rendering/style/StyleFilterData.cpp
     rendering/style/StyleFlexibleBoxData.cpp
index a238bc4..959f4a0 100644 (file)
@@ -1,3 +1,260 @@
+2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144422 and r144424.
+        http://trac.webkit.org/changeset/144422
+        http://trac.webkit.org/changeset/144424
+        https://bugs.webkit.org/show_bug.cgi?id=111167
+
+        Caused over 20 tests to fail assertion on Chromium Win port as
+        ASSERTION FAILED: m_platformRequestUpdated (Requested by
+        toyoshim on #webkit).
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Modules/mediastream/RTCPeerConnection.cpp:
+        * Modules/notifications/Notification.cpp:
+        * Target.pri:
+        * WebCore.exp.in:
+        * WebCore.gypi:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/ScriptControllerBase.cpp:
+        * bindings/js/JSNodeCustom.cpp:
+        * bindings/js/ScriptController.cpp:
+        * bindings/js/ScriptSourceCode.h:
+        * bindings/objc/DOM.mm:
+        * bindings/v8/ScriptController.cpp:
+        * bindings/v8/V8DOMWindowShell.cpp:
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        * css/CSSCrossfadeValue.h:
+        (WebCore::CSSCrossfadeValue::CSSCrossfadeValue):
+        (WebCore::CSSCrossfadeValue::CrossfadeSubimageObserverProxy::CrossfadeSubimageObserverProxy):
+        * css/CSSFontFaceSource.h:
+        * css/CSSFontSelector.cpp:
+        * css/WebKitCSSSVGDocumentValue.cpp:
+        * css/WebKitCSSSVGDocumentValue.h:
+        (WebCore):
+        * dom/Clipboard.cpp:
+        (WebCore::Clipboard::Clipboard):
+        * dom/ContainerNode.cpp:
+        * dom/DOMImplementation.cpp:
+        * dom/PendingScript.h:
+        * dom/ScriptElement.cpp:
+        * dom/ScriptElement.h:
+        * history/CachedFrame.cpp:
+        * html/DOMURL.cpp:
+        * html/HTMLAnchorElement.cpp:
+        * html/HTMLAppletElement.cpp:
+        * html/HTMLElement.cpp:
+        * html/HTMLEmbedElement.cpp:
+        * html/HTMLFrameSetElement.cpp:
+        * html/HTMLHtmlElement.cpp:
+        * html/HTMLImageElement.cpp:
+        * html/HTMLObjectElement.cpp:
+        * html/HTMLPlugInElement.cpp:
+        * html/ImageDocument.cpp:
+        * html/ImageInputType.cpp:
+        * html/MediaDocument.cpp:
+        * html/PluginDocument.cpp:
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore):
+        * html/parser/HTMLConstructionSite.cpp:
+        * html/parser/HTMLParserOptions.cpp:
+        * html/parser/HTMLScriptRunner.h:
+        * html/parser/XSSAuditor.cpp:
+        * html/parser/XSSAuditorDelegate.cpp:
+        * inspector/InspectorDebuggerAgent.cpp:
+        * inspector/InspectorFileSystemAgent.cpp:
+        * inspector/InspectorFrontendHost.cpp:
+        * inspector/InspectorInstrumentation.h:
+        (WebCore):
+        * inspector/InspectorPageAgent.cpp:
+        * inspector/NetworkResourcesData.cpp:
+        * inspector/NetworkResourcesData.h:
+        (WebCore):
+        * loader/CookieJar.cpp:
+        * loader/CrossOriginAccessControl.cpp:
+        * loader/CrossOriginAccessControl.h:
+        (WebCore):
+        * loader/CrossOriginPreflightResultCache.h:
+        * loader/DocumentThreadableLoader.h:
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::FrameLoader):
+        * loader/FrameLoader.h:
+        (WebCore):
+        (WebCore::FrameLoader::policyChecker):
+        * loader/ImageLoader.cpp:
+        * loader/ImageLoader.h:
+        * loader/LinkLoader.h:
+        * loader/MainResourceLoader.cpp:
+        * loader/MainResourceLoader.h:
+        * loader/MixedContentChecker.cpp:
+        * loader/PingLoader.cpp:
+        * loader/PolicyChecker.h:
+        (WebCore):
+        * loader/ProgressTracker.cpp:
+        * loader/SubframeLoader.cpp:
+        * loader/SubresourceLoader.cpp:
+        * loader/TextTrackLoader.cpp:
+        * loader/TextTrackLoader.h:
+        * loader/ThreadableLoader.h:
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        * loader/appcache/ApplicationCacheGroup.h:
+        (WebCore):
+        * loader/appcache/ApplicationCacheHost.cpp:
+        * loader/archive/cf/LegacyWebArchive.cpp:
+        * loader/cache/CachedFont.cpp:
+        * loader/cache/CachedFont.h:
+        (CachedFontClient):
+        (WebCore::CachedFontClient::~CachedFontClient):
+        (WebCore::CachedFontClient::expectedType):
+        (WebCore::CachedFontClient::resourceClientType):
+        (WebCore::CachedFontClient::fontLoaded):
+        (WebCore):
+        * loader/cache/CachedFontClient.h: Removed.
+        * loader/cache/CachedImage.cpp:
+        * loader/cache/CachedRawResource.cpp:
+        * loader/cache/CachedRawResource.h:
+        (WebCore):
+        (CachedRawResourceClient):
+        (WebCore::CachedRawResourceClient::~CachedRawResourceClient):
+        (WebCore::CachedRawResourceClient::expectedType):
+        (WebCore::CachedRawResourceClient::resourceClientType):
+        (WebCore::CachedRawResourceClient::dataSent):
+        (WebCore::CachedRawResourceClient::responseReceived):
+        (WebCore::CachedRawResourceClient::dataReceived):
+        (WebCore::CachedRawResourceClient::redirectReceived):
+        (WebCore::CachedRawResourceClient::dataDownloaded):
+        * loader/cache/CachedRawResourceClient.h: Removed.
+        * loader/cache/CachedResource.cpp:
+        * loader/cache/CachedResourceHandle.cpp:
+        * loader/cache/CachedResourceHandle.h:
+        (WebCore::CachedResourceHandleBase::~CachedResourceHandleBase):
+        (WebCore::CachedResourceHandleBase::CachedResourceHandleBase):
+        * loader/cache/CachedSVGDocument.h:
+        (CachedSVGDocumentClient):
+        (WebCore::CachedSVGDocumentClient::~CachedSVGDocumentClient):
+        (WebCore::CachedSVGDocumentClient::expectedType):
+        (WebCore::CachedSVGDocumentClient::resourceClientType):
+        (WebCore):
+        * loader/cache/CachedSVGDocumentClient.h: Removed.
+        * loader/cache/CachedSVGDocumentReference.cpp: Removed.
+        * loader/cache/CachedSVGDocumentReference.h:
+        (WebCore::CachedSVGDocumentReference::CachedSVGDocumentReference):
+        (WebCore::CachedSVGDocumentReference::~CachedSVGDocumentReference):
+        * loader/cache/CachedStyleSheetClient.h:
+        * loader/cache/MemoryCache.cpp:
+        * loader/cache/MemoryCache.h:
+        (WebCore):
+        (MemoryCache):
+        * loader/chromium/CachedRawResourceChromium.cpp:
+        * loader/icon/IconController.cpp:
+        * loader/icon/IconLoader.h:
+        * loader/mac/ResourceLoaderMac.mm:
+        * page/DOMWindowExtension.cpp:
+        * page/DragController.cpp:
+        * page/Frame.cpp:
+        (WebCore::Frame::Frame):
+        (WebCore::Frame::reportMemoryUsage):
+        * page/Frame.h:
+        (WebCore):
+        (Frame):
+        (WebCore::Frame::init):
+        (WebCore::Frame::loader):
+        * page/PerformanceNavigation.cpp:
+        * page/PerformanceTiming.cpp:
+        * page/PointerLockController.cpp:
+        * page/Settings.cpp:
+        * page/animation/CSSPropertyAnimation.cpp:
+        * platform/chromium/PasteboardChromium.cpp:
+        * platform/efl/ErrorsEfl.cpp:
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/filters/FilterOperation.cpp:
+        * platform/graphics/filters/FilterOperation.h:
+        (WebCore::FilterOperation::ReferenceFilterOperation::setCachedSVGDocumentReference):
+        (WebCore::FilterOperation::ReferenceFilterOperation::ReferenceFilterOperation):
+        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+        * platform/gtk/ErrorsGtk.cpp:
+        * platform/gtk/PasteboardGtk.cpp:
+        * platform/gtk/PasteboardHelper.h:
+        * platform/mac/ClipboardMac.h:
+        * platform/mac/ClipboardMac.mm:
+        * platform/mac/HTMLConverter.mm:
+        * platform/mac/PasteboardMac.mm:
+        * platform/network/AuthenticationChallengeBase.cpp:
+        * platform/network/cf/CookieJarCFNet.cpp:
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        * platform/network/mac/CookieStorageMac.mm:
+        * platform/qt/PasteboardQt.cpp:
+        * plugins/DOMMimeType.cpp:
+        * plugins/PluginRequest.h: Removed.
+        * plugins/PluginStream.h:
+        (PluginStreamClient):
+        (WebCore::PluginStreamClient::~PluginStreamClient):
+        (WebCore::PluginStreamClient::streamDidFinishLoading):
+        (WebCore):
+        * plugins/PluginStreamClient.h: Removed.
+        * plugins/PluginView.cpp:
+        * plugins/PluginView.h:
+        (WebCore):
+        (PluginRequest):
+        (WebCore::PluginRequest::PluginRequest):
+        (WebCore::PluginRequest::frameLoadRequest):
+        (WebCore::PluginRequest::notifyData):
+        (WebCore::PluginRequest::sendNotification):
+        (WebCore::PluginRequest::shouldAllowPopups):
+        * rendering/HitTestResult.cpp:
+        * rendering/InlineFlowBox.cpp:
+        * rendering/RenderBox.cpp:
+        * rendering/RenderEmbeddedObject.cpp:
+        * rendering/RenderImage.cpp:
+        * rendering/RenderImageResource.cpp:
+        (WebCore::RenderImageResource::RenderImageResource):
+        * rendering/RenderImageResource.h:
+        (WebCore::RenderImageResource::image):
+        (WebCore::RenderImageResource::errorOccurred):
+        (WebCore::RenderImageResource::usesImageContainerSize):
+        (WebCore::RenderImageResource::imageHasRelativeWidth):
+        (WebCore::RenderImageResource::imageHasRelativeHeight):
+        (WebCore::RenderImageResource::imageSize):
+        * rendering/RenderImageResourceStyleImage.cpp:
+        * rendering/RenderLayer.cpp:
+        * rendering/RenderLayerBacking.cpp:
+        * rendering/RenderLayerFilterInfo.h:
+        * rendering/RenderListItem.cpp:
+        * rendering/RenderListMarker.cpp:
+        * rendering/RenderSnapshottedPlugIn.cpp:
+        * rendering/RenderTableCol.cpp:
+        * rendering/RenderTableRow.cpp:
+        * rendering/RenderTableSection.cpp:
+        * rendering/style/StyleCachedShader.h:
+        * rendering/style/StyleCustomFilterProgram.cpp: Removed.
+        * rendering/style/StyleCustomFilterProgram.h:
+        (WebCore):
+        (WebCore::StyleCustomFilterProgram::vertexShaderString):
+        (StyleCustomFilterProgram):
+        (WebCore::StyleCustomFilterProgram::fragmentShaderString):
+        (WebCore::StyleCustomFilterProgram::isLoaded):
+        (WebCore::StyleCustomFilterProgram::willHaveClients):
+        (WebCore::StyleCustomFilterProgram::didRemoveLastClient):
+        (WebCore::StyleCustomFilterProgram::notifyFinished):
+        * svg/SVGFEImageElement.h:
+        * svg/SVGFontFaceUriElement.h:
+        (SVGFontFaceUriElement):
+        * svg/SVGImageLoader.cpp:
+        * svg/SVGUseElement.cpp:
+        * svg/SVGUseElement.h:
+        * svg/graphics/SVGImageCache.cpp:
+        * testing/MockPagePopupDriver.cpp:
+        * xml/XSLStyleSheet.h:
+        * xml/XSLTProcessorLibxslt.cpp:
+        * xml/parser/XMLDocumentParser.cpp:
+        * xml/parser/XMLDocumentParser.h:
+        * xml/parser/XMLDocumentParserLibxml2.cpp:
+
 2013-03-01  Alexei Filippov  <alph@chromium.org>
 
         Web Inspector: fix closure compiler warnings in ProfilesPanel
index 2d6edb0..365c4ae 100644 (file)
@@ -3952,7 +3952,6 @@ webcore_sources += \
        Source/WebCore/loader/cache/CachedCSSStyleSheet.h \
        Source/WebCore/loader/cache/CachedFont.cpp \
        Source/WebCore/loader/cache/CachedFont.h \
-       Source/WebCore/loader/cache/CachedFontClient.h \
        Source/WebCore/loader/cache/CachedImage.cpp \
        Source/WebCore/loader/cache/CachedImage.h \
        Source/WebCore/loader/cache/CachedImageClient.h \
@@ -3960,7 +3959,6 @@ webcore_sources += \
        Source/WebCore/loader/cache/CachedResourceClientWalker.h \
        Source/WebCore/loader/cache/CachedRawResource.cpp \
        Source/WebCore/loader/cache/CachedRawResource.h \
-       Source/WebCore/loader/cache/CachedRawResourceClient.h \
        Source/WebCore/loader/cache/CachedResource.cpp \
        Source/WebCore/loader/cache/CachedResource.h \
        Source/WebCore/loader/cache/CachedResourceHandle.cpp \
@@ -4323,11 +4321,9 @@ webcore_sources += \
        Source/WebCore/plugins/PluginPackage.cpp \
        Source/WebCore/plugins/PluginPackage.h \
        Source/WebCore/plugins/PluginQuirkSet.h \
-       Source/WebCore/plugins/PluginRequest.h \
        Source/WebCore/plugins/PluginStrategy.h \
        Source/WebCore/plugins/PluginStream.cpp \
        Source/WebCore/plugins/PluginStream.h \
-       Source/WebCore/plugins/PluginStreamClient.h \
        Source/WebCore/plugins/PluginViewBase.h \
        Source/WebCore/plugins/PluginView.cpp \
        Source/WebCore/plugins/PluginView.h \
@@ -4628,7 +4624,6 @@ webcore_sources += \
        Source/WebCore/rendering/style/StyleCachedImageSet.h \
        Source/WebCore/rendering/style/StyleCachedShader.cpp \
        Source/WebCore/rendering/style/StyleCachedShader.h \
-       Source/WebCore/rendering/style/StyleCustomFilterProgram.cpp \
        Source/WebCore/rendering/style/StyleCustomFilterProgram.h \
        Source/WebCore/rendering/style/StyleDashboardRegion.h \
        Source/WebCore/rendering/style/StyleDeprecatedFlexibleBoxData.cpp \
@@ -4813,8 +4808,6 @@ webcore_svg_sources += \
        Source/WebCore/css/WebKitCSSSVGDocumentValue.h \
        Source/WebCore/loader/cache/CachedSVGDocument.cpp \
        Source/WebCore/loader/cache/CachedSVGDocument.h \
-       Source/WebCore/loader/cache/CachedSVGDocumentClient.h \
-       Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp \
        Source/WebCore/loader/cache/CachedSVGDocumentReference.h \
        Source/WebCore/platform/graphics/SVGGlyph.cpp \
        Source/WebCore/platform/graphics/SVGGlyph.h \
index c3cad57..1a59098 100644 (file)
@@ -39,7 +39,6 @@
 #include "Event.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "MediaConstraintsImpl.h"
 #include "MediaStreamEvent.h"
index b6d70e4..52ec618 100644 (file)
 #include "NotificationClient.h"
 #include "NotificationController.h"
 #include "NotificationPermissionCallback.h"
+#include "ResourceRequest.h"
+#include "ResourceResponse.h"
+#include "ThreadableLoader.h"
 #include "WindowFocusAllowedIndicator.h"
+#include "WorkerContext.h"
 
 namespace WebCore {
 
index fcd8a43..da02700 100644 (file)
@@ -851,7 +851,7 @@ SOURCES += \
     loader/cache/CachedScript.cpp \
     loader/cache/CachedShader.cpp \
     loader/cache/CachedSVGDocument.cpp \
-    loader/cache/CachedSVGDocumentReference.cpp \
+    loader/cache/CachedSVGDocument.h \
     loader/cache/CachedXSLStyleSheet.cpp \
     loader/CookieJar.cpp \
     loader/CrossOriginAccessControl.cpp \
@@ -1276,7 +1276,6 @@ SOURCES += \
     rendering/style/StyleCachedImage.cpp \
     rendering/style/StyleCachedImageSet.cpp \
     rendering/style/StyleCachedShader.cpp \
-    rendering/style/StyleCustomFilterProgram.cpp \
     rendering/style/StyleDeprecatedFlexibleBoxData.cpp \
     rendering/style/StyleFilterData.cpp \
     rendering/style/StyleFlexibleBoxData.cpp \
@@ -2039,17 +2038,13 @@ HEADERS += \
     loader/archive/ArchiveResource.h \
     loader/cache/CachedCSSStyleSheet.h \
     loader/cache/CachedFont.h \
-    loader/cache/CachedFontClient.h \
     loader/cache/CachedImage.h \
-    loader/cache/CachedRawResource.h \
-    loader/cache/CachedRawResourceClient.h \
     loader/cache/CachedResourceClientWalker.h \
     loader/cache/CachedResource.h \
     loader/cache/CachedResourceHandle.h \
     loader/cache/CachedScript.h \
     loader/cache/CachedShader.h \
     loader/cache/CachedSVGDocument.h \
-    loader/cache/CachedSVGDocumentClient.h \
     loader/cache/CachedXSLStyleSheet.h \
     loader/cache/MemoryCache.h \
     loader/CookieJar.h \
@@ -2439,9 +2434,7 @@ HEADERS += \
     plugins/PlugInOriginHash.h \
     plugins/PluginMainThreadScheduler.h \
     plugins/PluginPackage.h \
-    plugins/PluginRequest.h \
     plugins/PluginStream.h \
-    plugins/PluginStreamClient.h \
     plugins/PluginView.h \
     plugins/win/PluginMessageThrottlerWin.h \
     rendering/AutoTableLayout.h \
index 3ff424f..f6f2304 100644 (file)
@@ -842,7 +842,6 @@ __ZN7WebCore5Frame23visiblePositionForPointERKNS_8IntPointE
 __ZN7WebCore5Frame24searchForLabelsAboveCellEPNS_17RegularExpressionEPNS_20HTMLTableCellElementEPm
 __ZN7WebCore5Frame25setPageAndTextZoomFactorsEff
 __ZN7WebCore5Frame27resizePageRectsKeepingRatioERKNS_9FloatSizeES3_
-__ZN7WebCore5Frame4initEv
 __ZN7WebCore5Frame6createEPNS_4PageEPNS_21HTMLFrameOwnerElementEPNS_17FrameLoaderClientE
 __ZN7WebCore5Frame7setViewEN3WTF10PassRefPtrINS_9FrameViewEEE
 __ZN7WebCore5FrameD1Ev
index 1113070..e80503b 100644 (file)
             'loader/cache/CachedCSSStyleSheet.h',
             'loader/cache/CachedFont.cpp',
             'loader/cache/CachedFont.h',
-            'loader/cache/CachedFontClient.h',
             'loader/cache/CachedImage.cpp',
             'loader/cache/CachedRawResource.cpp',
-            'loader/cache/CachedRawResource.h',
-            'loader/cache/CachedRawResourceClient.h',
             'loader/cache/CachedResource.cpp',
             'loader/cache/CachedResourceClientWalker.h',
             'loader/cache/CachedResourceHandle.cpp',
             'loader/cache/CachedShader.h',
             'loader/cache/CachedSVGDocument.cpp',
             'loader/cache/CachedSVGDocument.h',
-            'loader/cache/CachedSVGDocumentClient.h',
-            'loader/cache/CachedSVGDocumentReference.cpp',
             'loader/cache/CachedSVGDocumentReference.h',
             'loader/cache/CachedTextTrack.cpp',
             'loader/cache/CachedTextTrack.h',
             'plugins/PluginPackage.h',
             'plugins/PluginPackageNone.cpp',
             'plugins/PluginQuirkSet.h',
-            'plugins/PluginRequest.h',
             'plugins/PluginStream.cpp',
             'plugins/PluginStream.h',
-            'plugins/PluginStreamClient.h',
             'plugins/PluginView.cpp',
             'plugins/PluginView.h',
             'plugins/PluginViewNone.cpp',
             'rendering/style/StyleCachedShader.h',
             'rendering/style/StyleCachedShader.cpp',
             'rendering/style/StyleCustomFilterProgram.h',
-            'rendering/style/StyleCustomFilterProgram.cpp',
             'rendering/style/StyleDeprecatedFlexibleBoxData.cpp',
             'rendering/style/StyleFilterData.cpp',
             'rendering/style/StyleFlexibleBoxData.cpp',
index 89232e1..ec42643 100755 (executable)
                                        >
                                </File>
                                <File
-                                       RelativePath="..\loader\cache\CachedFontClient.h"
-                                       >
-                               </File>
-                               <File
                                        RelativePath="..\loader\cache\CachedImage.cpp"
                                        >
                                </File>
                                        >
                                </File>
                                <File
-                                       RelativePath="..\loader\cache\CachedRawResourceClient.h"
-                                       >
-                               </File>
-                               <File
                                        RelativePath="..\loader\cache\CachedResource.cpp"
                                        >
                                </File>
                                        >
                                </File>
                                <File
-                                       RelativePath="..\loader\cache\CachedSVGDocumentClient.h"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\loader\cache\CachedSVGDocumentReference.cpp"
-                                       >
-                               </File>
-                               <File
                                        RelativePath="..\loader\cache\CachedSVGDocumentReference.h"
                                        >
                                </File>
                                        >
                                </File>
                                <File
-                                       RelativePath="..\rendering\style\StyleCustomFilterProgram.cpp"
-                                       >
-                               </File>
-                               <File
                                        RelativePath="..\rendering\style\StyleCustomFilterProgram.h"
                                        >
                                </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\plugins\PluginRequest.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\plugins\PluginStrategy.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\plugins\PluginStreamClient.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\plugins\PluginView.cpp"
                                >
                        </File>
index 2d163b7..0745e72 100644 (file)
     <ClCompile Include="..\loader\cache\CachedScript.cpp" />
     <ClCompile Include="..\loader\cache\CachedShader.cpp" />
     <ClCompile Include="..\loader\cache\CachedSVGDocument.cpp" />
-    <ClCompile Include="..\loader\cache\CachedSVGDocumentReference.cpp" />
     <ClCompile Include="..\loader\cache\CachedTextTrack.cpp" />
     <ClCompile Include="..\loader\cache\CachedXSLStyleSheet.cpp" />
     <ClCompile Include="..\loader\cache\MemoryCache.cpp" />
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\rendering\style\StyleCachedShader.cpp" />
-    <ClCompile Include="..\rendering\style\StyleCustomFilterProgram.cpp" />
     <ClCompile Include="..\rendering\style\StyleDeprecatedFlexibleBoxData.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     <ClInclude Include="..\loader\archive\mhtml\MHTMLParser.h" />
     <ClInclude Include="..\loader\cache\CachedCSSStyleSheet.h" />
     <ClInclude Include="..\loader\cache\CachedFont.h" />
-    <ClInclude Include="..\loader\cache\CachedFontClient.h" />
     <ClInclude Include="..\loader\cache\CachedImage.h" />
     <ClInclude Include="..\loader\cache\CachedRawResource.h" />
-    <ClInclude Include="..\loader\cache\CachedRawResourceClient.h" />
     <ClInclude Include="..\loader\cache\CachedResource.h" />
     <ClInclude Include="..\loader\cache\CachedResourceClient.h" />
     <ClInclude Include="..\loader\cache\CachedResourceClientWalker.h" />
     <ClInclude Include="..\loader\cache\CachedShader.h" />
     <ClInclude Include="..\loader\cache\CachedStyleSheetClient.h" />
     <ClInclude Include="..\loader\cache\CachedSVGDocument.h" />
-    <ClInclude Include="..\loader\cache\CachedSVGDocumentClient.h" />
     <ClInclude Include="..\loader\cache\CachedSVGDocumentReference.h" />
     <ClInclude Include="..\loader\cache\CachedTextTrack.h" />
     <ClInclude Include="..\loader\cache\CachedXSLStyleSheet.h" />
     <ClInclude Include="..\plugins\PlugInOriginHash.h" />
     <ClInclude Include="..\plugins\PluginPackage.h" />
     <ClInclude Include="..\plugins\PluginQuirkSet.h" />
-    <ClInclude Include="..\plugins\PluginRequest.h" />
     <ClInclude Include="..\plugins\PluginStrategy.h" />
     <ClInclude Include="..\plugins\PluginStream.h" />
-    <ClInclude Include="..\plugins\PluginStreamClient.h" />
     <ClInclude Include="..\plugins\PluginView.h" />
     <ClInclude Include="..\plugins\win\PluginMessageThrottlerWin.h" />
     <ClInclude Include="..\svg\ColorDistance.h" />
index 7b75b73..bfab91e 100644 (file)
     <ClCompile Include="..\loader\cache\CachedSVGDocument.cpp">
       <Filter>loader\cache</Filter>
     </ClCompile>
-    <ClCompile Include="..\loader\cache\CachedSVGDocumentReference.cpp">
-      <Filter>loader\cache</Filter>
-    </ClCompile>
     <ClCompile Include="..\loader\cache\CachedTextTrack.cpp">
       <Filter>loader\cache</Filter>
     </ClCompile>
     <ClCompile Include="..\rendering\style\StyleCachedShader.cpp">
       <Filter>rendering\style</Filter>
     </ClCompile>
-    <ClCompile Include="..\rendering\style\StyleCustomFilterProgram.cpp">
-      <Filter>rendering\style</Filter>
-    </ClCompile>
     <ClCompile Include="..\rendering\style\StyleDeprecatedFlexibleBoxData.cpp">
       <Filter>rendering\style</Filter>
     </ClCompile>
     <ClInclude Include="..\loader\cache\CachedFont.h">
       <Filter>loader\cache</Filter>
     </ClInclude>
-    <ClInclude Include="..\loader\cache\CachedFontClient.h">
-      <Filter>loader\cache</Filter>
-    </ClInclude>
     <ClInclude Include="..\loader\cache\CachedImage.h">
       <Filter>loader\cache</Filter>
     </ClInclude>
     <ClInclude Include="..\loader\cache\CachedRawResource.h">
       <Filter>loader\cache</Filter>
     </ClInclude>
-    <ClInclude Include="..\loader\cache\CachedRawResourceClient.h">
-      <Filter>loader\cache</Filter>
-    </ClInclude>
     <ClInclude Include="..\loader\cache\CachedResource.h">
       <Filter>loader\cache</Filter>
     </ClInclude>
     <ClInclude Include="..\loader\cache\CachedSVGDocument.h">
       <Filter>loader\cache</Filter>
     </ClInclude>
-    <ClInclude Include="..\loader\cache\CachedSVGDocumentClient.h">
-      <Filter>loader\cache</Filter>
-    </ClInclude>
     <ClInclude Include="..\loader\cache\CachedSVGDocumentReference.h">
       <Filter>loader\cache</Filter>
     </ClInclude>
     <ClInclude Include="..\plugins\PluginQuirkSet.h">
       <Filter>plugins</Filter>
     </ClInclude>
-    <ClInclude Include="..\plugins\PluginRequest.h">
-      <Filter>plugins</Filter>
-    </ClInclude>
     <ClInclude Include="..\plugins\PluginStrategy.h">
       <Filter>plugins</Filter>
     </ClInclude>
     <ClInclude Include="..\plugins\PluginStream.h">
       <Filter>plugins</Filter>
     </ClInclude>
-    <ClInclude Include="..\plugins\PluginStreamClient.h">
-      <Filter>plugins</Filter>
-    </ClInclude>
     <ClInclude Include="..\plugins\PluginView.h">
       <Filter>plugins</Filter>
     </ClInclude>
index c52e7ed..d67d569 100644 (file)
                E1ED8AC30CC49BE000BFC557 /* CSSPrimitiveValueMappings.h in Headers */ = {isa = PBXBuildFile; fileRef = E1ED8AC20CC49BE000BFC557 /* CSSPrimitiveValueMappings.h */; };
                E1F1E82F0C3C2BB9006DB391 /* XSLTExtensions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F1E82D0C3C2BB9006DB391 /* XSLTExtensions.cpp */; };
                E1F1E8300C3C2BB9006DB391 /* XSLTExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = E1F1E82E0C3C2BB9006DB391 /* XSLTExtensions.h */; };
-               E1FC456E16DCB9010010F7B2 /* CachedSVGDocumentClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC456D16DCB9000010F7B2 /* CachedSVGDocumentClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               E1FC457016DCB9770010F7B2 /* CachedSVGDocumentReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FC456F16DCB9770010F7B2 /* CachedSVGDocumentReference.cpp */; };
-               E1FC457216DDF7250010F7B2 /* CachedRawResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457116DDF7220010F7B2 /* CachedRawResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               E1FC457416DDF7E60010F7B2 /* CachedFontClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457316DDF7E30010F7B2 /* CachedFontClient.h */; };
-               E1FC457616DE00100010F7B2 /* StyleCustomFilterProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FC457516DE000F0010F7B2 /* StyleCustomFilterProgram.cpp */; };
-               E1FC457816DF0A750010F7B2 /* PluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457716DF0A750010F7B2 /* PluginView.h */; };
-               E1FC457A16DF0ADA0010F7B2 /* PluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457916DF0AD90010F7B2 /* PluginStream.h */; };
-               E1FC457C16DF0AF10010F7B2 /* PluginStreamClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457B16DF0AF10010F7B2 /* PluginStreamClient.h */; };
-               E1FC457E16DF0B880010F7B2 /* PluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457D16DF0B880010F7B2 /* PluginRequest.h */; };
                E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */; };
                E415F1690D9A165D0033CE97 /* DOMElementTimeControl.h in Headers */ = {isa = PBXBuildFile; fileRef = E415F1680D9A165D0033CE97 /* DOMElementTimeControl.h */; };
                E1ED8AC20CC49BE000BFC557 /* CSSPrimitiveValueMappings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSPrimitiveValueMappings.h; sourceTree = "<group>"; };
                E1F1E82D0C3C2BB9006DB391 /* XSLTExtensions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XSLTExtensions.cpp; sourceTree = "<group>"; };
                E1F1E82E0C3C2BB9006DB391 /* XSLTExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XSLTExtensions.h; sourceTree = "<group>"; };
-               E1FC456D16DCB9000010F7B2 /* CachedSVGDocumentClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedSVGDocumentClient.h; sourceTree = "<group>"; };
-               E1FC456F16DCB9770010F7B2 /* CachedSVGDocumentReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedSVGDocumentReference.cpp; sourceTree = "<group>"; };
-               E1FC457116DDF7220010F7B2 /* CachedRawResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedRawResourceClient.h; sourceTree = "<group>"; };
-               E1FC457316DDF7E30010F7B2 /* CachedFontClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFontClient.h; sourceTree = "<group>"; };
-               E1FC457516DE000F0010F7B2 /* StyleCustomFilterProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleCustomFilterProgram.cpp; path = style/StyleCustomFilterProgram.cpp; sourceTree = "<group>"; };
-               E1FC457716DF0A750010F7B2 /* PluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginView.h; sourceTree = "<group>"; };
-               E1FC457916DF0AD90010F7B2 /* PluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginStream.h; sourceTree = "<group>"; };
-               E1FC457B16DF0AF10010F7B2 /* PluginStreamClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginStreamClient.h; sourceTree = "<group>"; };
-               E1FC457D16DF0B880010F7B2 /* PluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginRequest.h; sourceTree = "<group>"; };
                E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGlobalData.h; sourceTree = "<group>"; };
                E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadGlobalData.cpp; sourceTree = "<group>"; };
                E406F3FB1198307D009D59D6 /* ColorData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorData.cpp; sourceTree = "<group>"; };
                                1ADA140F0E1AE5D900023EE5 /* PluginMainThreadScheduler.h */,
                                31D591B9166C2E6C00E6BF02 /* PlugInOriginHash.cpp */,
                                31D591BA166C2E6C00E6BF02 /* PlugInOriginHash.h */,
-                               E1FC457D16DF0B880010F7B2 /* PluginRequest.h */,
                                1AA8798F11CBE846003C664F /* PluginStrategy.h */,
-                               E1FC457916DF0AD90010F7B2 /* PluginStream.h */,
-                               E1FC457B16DF0AF10010F7B2 /* PluginStreamClient.h */,
-                               E1FC457716DF0A750010F7B2 /* PluginView.h */,
                                0AFDAC3C10F5448C00E1F3D2 /* PluginViewBase.h */,
                                76FF17E211235673001D61B5 /* PluginViewNone.cpp */,
                        );
                                BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */,
                                BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */,
                                BC64B4CA0CB4295D005F2B62 /* CachedFont.h */,
-                               E1FC457316DDF7E30010F7B2 /* CachedFontClient.h */,
                                BCB16C020979C3BD00467741 /* CachedImage.cpp */,
                                BCB16C030979C3BD00467741 /* CachedImage.h */,
                                319FBD5D15D2F444009640A6 /* CachedImageClient.h */,
                                D0EDA772143E303C0028E383 /* CachedRawResource.cpp */,
                                D0EDA773143E303C0028E383 /* CachedRawResource.h */,
-                               E1FC457116DDF7220010F7B2 /* CachedRawResourceClient.h */,
                                BCB16C060979C3BD00467741 /* CachedResource.cpp */,
                                BCB16C070979C3BD00467741 /* CachedResource.h */,
                                BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */,
                                D0BC54481443AC4A00E105DA /* CachedStyleSheetClient.h */,
                                A104F24114C71F7A009E2C23 /* CachedSVGDocument.cpp */,
                                A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */,
-                               E1FC456D16DCB9000010F7B2 /* CachedSVGDocumentClient.h */,
-                               E1FC456F16DCB9770010F7B2 /* CachedSVGDocumentReference.cpp */,
                                FB2C15C2165D64900039C9F8 /* CachedSVGDocumentReference.h */,
                                0753860014489E9800B78452 /* CachedTextTrack.cpp */,
                                0753860114489E9800B78452 /* CachedTextTrack.h */,
                                5038BE2D1472AD230095E0D1 /* StyleCachedShader.cpp */,
                                5038BE2E1472AD230095E0D1 /* StyleCachedShader.h */,
                                503D0CAD14B5B0BA00F32F57 /* StyleCustomFilterProgram.h */,
-                               E1FC457516DE000F0010F7B2 /* StyleCustomFilterProgram.cpp */,
                                BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */,
                                BC5EB8B60E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp */,
                                BC5EB8B70E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.h */,
                                977E2E0F12F0FC9C00C13380 /* XSSAuditorDelegate.h in Headers */,
                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
                                41B8CD4616D04591000E8CC0 /* SelectorCheckerFastPath.h in Headers */,
-                               E1FC456E16DCB9010010F7B2 /* CachedSVGDocumentClient.h in Headers */,
-                               E1FC457216DDF7250010F7B2 /* CachedRawResourceClient.h in Headers */,
-                               E1FC457416DDF7E60010F7B2 /* CachedFontClient.h in Headers */,
-                               E1FC457816DF0A750010F7B2 /* PluginView.h in Headers */,
-                               E1FC457A16DF0ADA0010F7B2 /* PluginStream.h in Headers */,
-                               E1FC457C16DF0AF10010F7B2 /* PluginStreamClient.h in Headers */,
-                               E1FC457E16DF0B880010F7B2 /* PluginRequest.h in Headers */,
                                49140257168E02EC002D6C6A /* TimelineTraceEventProcessor.h in Headers */,
                                 A024575216CEAA27000E5671 /* EXTDrawBuffers.h in Headers */,
                        );
                                977E2E0E12F0FC9C00C13380 /* XSSAuditorDelegate.cpp in Sources */,
                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
                                41B8CD4516D04591000E8CC0 /* SelectorCheckerFastPath.cpp in Sources */,
-                               E1FC457016DCB9770010F7B2 /* CachedSVGDocumentReference.cpp in Sources */,
-                               E1FC457616DE00100010F7B2 /* StyleCustomFilterProgram.cpp in Sources */,
                                49140256168E02E8002D6C6A /* TimelineTraceEventProcessor.cpp in Sources */,
                                E14A94D716DFDF950068DE82 /* BlobRegistry.cpp in Sources */,
                                 A024575116CEAA27000E5671 /* EXTDrawBuffers.cpp in Sources */,
index efe4851..c57b85f 100644 (file)
@@ -25,7 +25,6 @@
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "Page.h"
 #include "ScriptSourceCode.h"
index b61c96d..2a917f5 100644 (file)
@@ -27,6 +27,8 @@
 #include "JSNode.h"
 
 #include "Attr.h"
+#include "CachedImage.h"
+#include "CachedScript.h"
 #include "CDATASection.h"
 #include "Comment.h"
 #include "Document.h"
index b4dafc1..a605e63 100644 (file)
@@ -25,7 +25,7 @@
 #include "Event.h"
 #include "EventNames.h"
 #include "Frame.h"
-#include "FrameLoader.h"
+#include "FrameLoaderClient.h"
 #include "GCController.h"
 #include "HTMLPlugInElement.h"
 #include "InspectorInstrumentation.h"
index 97984dd..0355ece 100644 (file)
@@ -32,6 +32,7 @@
 #define ScriptSourceCode_h
 
 #include "CachedResourceHandle.h"
+#include "CachedScript.h"
 #include "CachedScriptSourceProvider.h"
 #include "KURL.h"
 #include <parser/SourceProvider.h>
@@ -40,8 +41,6 @@
 
 namespace WebCore {
 
-class CachedScript;
-
 class ScriptSourceCode {
 public:
     ScriptSourceCode(const String& source, const KURL& url = KURL(), const TextPosition& startPosition = TextPosition::minimumPosition())
index f227868..d37e985 100644 (file)
@@ -29,7 +29,6 @@
 #import "DOMInternal.h" // import first to make the private/public trick work
 #import "DOM.h"
 
-#import "CachedImage.h"
 #import "DOMElementInternal.h"
 #import "DOMHTMLCanvasElement.h"
 #import "DOMHTMLTableCellElementInternal.h"
index 5f3475d..9f5c7b4 100644 (file)
@@ -40,7 +40,6 @@
 #include "EventListener.h"
 #include "EventNames.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "HistogramSupport.h"
 #include "InspectorInstrumentation.h"
index 5d8762d..9546904 100644 (file)
@@ -35,7 +35,6 @@
 #include "DateExtension.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "InspectorInstrumentation.h"
 #include "Page.h"
index 753c4bd..15d8bb1 100644 (file)
@@ -39,7 +39,6 @@
 #include "ExceptionCode.h"
 #include "Frame.h"
 #include "FrameLoadRequest.h"
-#include "FrameLoader.h"
 #include "FrameView.h"
 #include "HTMLCollection.h"
 #include "HTMLDocument.h"
index 8cea24f..fc2e8c8 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef CSSCrossfadeValue_h
 #define CSSCrossfadeValue_h
 
+#include "CachedImage.h"
 #include "CachedImageClient.h"
 #include "CachedResourceHandle.h"
 #include "CSSImageGeneratorValue.h"
@@ -74,17 +75,15 @@ private:
         : CSSImageGeneratorValue(CrossfadeClass)
         , m_fromValue(fromValue)
         , m_toValue(toValue)
-        , m_crossfadeSubimageObserver(this)
-    {
-    }
+        , m_cachedFromImage(0)
+        , m_cachedToImage(0)
+        , m_crossfadeSubimageObserver(this) { }
 
     class CrossfadeSubimageObserverProxy : public CachedImageClient {
     public:
         CrossfadeSubimageObserverProxy(CSSCrossfadeValue* ownerValue)
-            : m_ownerValue(ownerValue)
-            , m_ready(false)
-        {
-        }
+        : m_ownerValue(ownerValue)
+        , m_ready(false) { }
 
         virtual ~CrossfadeSubimageObserverProxy() { }
         virtual void imageChanged(CachedImage*, const IntRect* = 0) OVERRIDE;
index da81ba4..0488d10 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CSSFontFaceSource_h
 #define CSSFontFaceSource_h
 
-#include "CachedFontClient.h"
+#include "CachedFont.h"
 #include "CachedResourceHandle.h"
 #include "Timer.h"
 #include <wtf/HashMap.h>
index 44c62a7..cb0dc8d 100644 (file)
@@ -41,7 +41,6 @@
 #include "Document.h"
 #include "FontCache.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "RenderObject.h"
 #include "Settings.h"
 #include "SimpleFontData.h"
index 4442696..568d0f3 100644 (file)
@@ -31,7 +31,6 @@
 #include "CachedResourceLoader.h"
 #include "CachedResourceRequest.h"
 #include "CachedResourceRequestInitiators.h"
-#include "CachedSVGDocument.h"
 #include "Document.h"
 #include "WebCoreMemoryInstrumentation.h"
 
index 04eef1a..9a3ac68 100644 (file)
 
 #include "CSSValue.h"
 #include "CachedResourceHandle.h"
+#include "CachedSVGDocument.h"
 
 namespace WebCore {
 
 class CachedResourceLoader;
-class CachedSVGDocument;
 
 class WebKitCSSSVGDocumentValue : public CSSValue {
 public:
index f3f89cd..0279925 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "Clipboard.h"
 
+#include "CachedImage.h"
 #include "FileList.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -39,6 +40,7 @@ Clipboard::Clipboard(ClipboardAccessPolicy policy, ClipboardType clipboardType)
     , m_effectAllowed("uninitialized")
     , m_dragStarted(false)
     , m_clipboardType(clipboardType)
+    , m_dragImage(0)
 {
 }
     
index 55eaa07..6e6e7bb 100644 (file)
@@ -39,6 +39,7 @@
 #include "InsertionPoint.h"
 #include "InspectorInstrumentation.h"
 #include "LoaderStrategy.h"
+#include "MemoryCache.h"
 #include "MutationEvent.h"
 #include "NodeRenderStyle.h"
 #include "NodeTraversal.h"
index 53798f1..1ca2822 100644 (file)
@@ -32,7 +32,6 @@
 #include "Element.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FTPDirectoryDocument.h"
 #include "HTMLDocument.h"
index 53d3a86..3996462 100644 (file)
@@ -30,7 +30,6 @@
 #include "CachedResourceHandle.h"
 #include <wtf/text/TextPosition.h>
 #include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
index a6e250b..73d82d1 100644 (file)
@@ -31,7 +31,6 @@
 #include "CrossOriginAccessControl.h"
 #include "Document.h"
 #include "DocumentParser.h"
-#include "Event.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "HTMLNames.h"
index ff42b95..5f98d75 100644 (file)
@@ -24,7 +24,6 @@
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
 #include <wtf/text/TextPosition.h>
-#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
index bac6372..0e1168b 100644 (file)
@@ -34,7 +34,6 @@
 #include "EventNames.h"
 #include "FocusController.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameView.h"
 #include "HistoryItem.h"
index 47d823e..2d0a7ce 100644 (file)
@@ -36,7 +36,6 @@
 #include "KURL.h"
 #include "MemoryCache.h"
 #include "PublicURLManager.h"
-#include "ResourceRequest.h"
 #include "ScriptExecutionContext.h"
 #include "SecurityOrigin.h"
 #include "ThreadableBlobRegistry.h"
index 4051628..9d19dad 100644 (file)
@@ -28,7 +28,6 @@
 #include "DNS.h"
 #include "EventNames.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameLoaderTypes.h"
 #include "HTMLImageElement.h"
@@ -38,7 +37,6 @@
 #include "MouseEvent.h"
 #include "PingLoader.h"
 #include "RenderImage.h"
-#include "ResourceRequest.h"
 #include "SecurityOrigin.h"
 #include "SecurityPolicy.h"
 #include "Settings.h"
index 50893c6..7e0bba4 100644 (file)
@@ -26,7 +26,6 @@
 
 #include "Attribute.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "HTMLDocument.h"
 #include "HTMLNames.h"
 #include "HTMLParamElement.h"
index 6539116..02c9cac 100644 (file)
@@ -37,7 +37,6 @@
 #include "EventNames.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "HTMLBRElement.h"
 #include "HTMLCollection.h"
 #include "HTMLDocument.h"
index c33e2f8..913496f 100644 (file)
@@ -28,7 +28,6 @@
 #include "CSSPropertyNames.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "HTMLDocument.h"
 #include "HTMLImageLoader.h"
 #include "HTMLNames.h"
index e2f9709..ff138e7 100644 (file)
@@ -30,7 +30,6 @@
 #include "Event.h"
 #include "EventNames.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "HTMLNames.h"
 #include "Length.h"
index fa6284d..8f6ec74 100644 (file)
@@ -29,7 +29,6 @@
 #include "DocumentLoader.h"
 #include "DocumentParser.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "HTMLNames.h"
 
 namespace WebCore {
index 36d33f9..7fb7f8f 100644 (file)
@@ -26,7 +26,6 @@
 #include "Attribute.h"
 #include "CSSPropertyNames.h"
 #include "CSSValueKeywords.h"
-#include "CachedImage.h"
 #include "EventNames.h"
 #include "FrameView.h"
 #include "HTMLDocument.h"
index f4d6758..eb70544 100644 (file)
@@ -26,7 +26,6 @@
 
 #include "Attribute.h"
 #include "CSSValueKeywords.h"
-#include "CachedImage.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "EventNames.h"
index 5fa8228..c617828 100644 (file)
@@ -28,7 +28,6 @@
 #include "ChromeClient.h"
 #include "CSSPropertyNames.h"
 #include "Document.h"
-#include "Event.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
index da24fa6..c6352fc 100644 (file)
@@ -31,7 +31,6 @@
 #include "EventNames.h"
 #include "ExceptionCodePlaceholder.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameView.h"
 #include "HTMLHtmlElement.h"
index 66325d4..fcb3440 100644 (file)
@@ -23,7 +23,6 @@
 #include "config.h"
 #include "ImageInputType.h"
 
-#include "CachedImage.h"
 #include "FormDataList.h"
 #include "HTMLFormElement.h"
 #include "HTMLImageLoader.h"
index 2c82a2c..f8a302c 100644 (file)
@@ -32,7 +32,6 @@
 #include "EventNames.h"
 #include "ExceptionCodePlaceholder.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "HTMLEmbedElement.h"
 #include "HTMLHtmlElement.h"
index c99e350..9456b61 100644 (file)
@@ -28,7 +28,6 @@
 #include "DocumentLoader.h"
 #include "ExceptionCodePlaceholder.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameView.h"
 #include "HTMLEmbedElement.h"
index a14619e..deb64b1 100644 (file)
@@ -37,7 +37,6 @@
 #include "ExceptionCode.h"
 #include "Extensions3D.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameView.h"
 #include "HTMLCanvasElement.h"
index fe018b6..9422a8c 100644 (file)
@@ -33,7 +33,6 @@
 #include "DocumentType.h"
 #include "Element.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "HTMLDocument.h"
 #include "HTMLElementFactory.h"
index 8f6a6b0..fbfbec1 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "Document.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "Settings.h"
 
 namespace WebCore {
index fe2e0ae..a7226dc 100644 (file)
@@ -28,9 +28,8 @@
 
 #include "PendingScript.h"
 #include <wtf/Deque.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/PassRefPtr.h>
 #include <wtf/text/TextPosition.h>
+#include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
index 3aa65a7..d6a40ff 100644 (file)
@@ -36,7 +36,7 @@
 #include "FormData.h"
 #include "FormDataList.h"
 #include "Frame.h"
-#include "FrameLoader.h"
+#include "FrameLoaderClient.h"
 #include "HTMLDocumentParser.h"
 #include "HTMLNames.h"
 #include "HTMLTokenizer.h"
index 1ac1288..b3c30ee 100644 (file)
@@ -31,7 +31,6 @@
 #include "Document.h"
 #include "FormData.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "HTMLParserIdioms.h"
 #include "InspectorValues.h"
index b844df2..84824e6 100644 (file)
@@ -32,7 +32,6 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
 #include "InspectorDebuggerAgent.h"
 
-#include "CachedResource.h"
 #include "ContentSearchUtils.h"
 #include "InjectedScript.h"
 #include "InjectedScriptManager.h"
index 9b8077d..2b0d644 100644 (file)
@@ -43,7 +43,6 @@
 #include "EntryArray.h"
 #include "EntryCallback.h"
 #include "ErrorCallback.h"
-#include "Event.h"
 #include "File.h"
 #include "FileCallback.h"
 #include "FileEntry.h"
index a3857d1..021eadd 100644 (file)
@@ -48,9 +48,6 @@
 #include "InspectorFrontendClient.h"
 #include "Page.h"
 #include "Pasteboard.h"
-#include "ResourceError.h"
-#include "ResourceRequest.h"
-#include "ResourceResponse.h"
 #include "ScriptFunctionCall.h"
 #include "UserGestureIndicator.h"
 
index 1544be7..86b1582 100644 (file)
@@ -36,7 +36,6 @@
 #include "ConsoleTypes.h"
 #include "Element.h"
 #include "EventContext.h"
-#include "FormData.h"
 #include "Frame.h"
 #include "HitTestResult.h"
 #include "Page.h"
@@ -56,17 +55,18 @@ class CharacterData;
 class DOMWindow;
 class DOMWrapperWorld;
 class Database;
-class DeviceOrientationData;
 class Document;
-class DocumentLoader;
 class Element;
 class EventContext;
+class DocumentLoader;
+class DeviceOrientationData;
 class GeolocationPosition;
 class GraphicsContext;
 class InspectorCSSAgent;
 class InspectorInstrumentation;
 class InspectorTimelineAgent;
 class InstrumentingAgents;
+class KURL;
 class Node;
 class RenderLayer;
 class RenderObject;
index f234bbe..699cc98 100644 (file)
@@ -49,7 +49,6 @@
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameView.h"
 #include "GeolocationController.h"
 #include "GeolocationError.h"
index 53ac0ba..fe97ff0 100644 (file)
@@ -32,9 +32,7 @@
 
 #include "NetworkResourcesData.h"
 
-#include "CachedResource.h"
 #include "DOMImplementation.h"
-#include "ResourceResponse.h"
 #include "SharedBuffer.h"
 #include "TextResourceDecoder.h"
 #include <wtf/MemoryInstrumentationHashMap.h>
index dac5262..dd91b4d 100644 (file)
@@ -29,9 +29,9 @@
 #ifndef NetworkResourcesData_h
 #define NetworkResourcesData_h
 
-#include "HTTPHeaderMap.h"
 #include "InspectorPageAgent.h"
 #include "TextResourceDecoder.h"
+
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
@@ -43,7 +43,6 @@
 namespace WebCore {
 
 class CachedResource;
-class FormData;
 class SharedBuffer;
 class TextResourceDecoder;
 
index 0486940..e5b7587 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "Document.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "NetworkingContext.h"
 #include "PlatformCookieJar.h"
 
index 7b50dab..23c6e1c 100644 (file)
@@ -28,7 +28,6 @@
 #include "CrossOriginAccessControl.h"
 
 #include "HTTPParsers.h"
-#include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "SecurityOrigin.h"
 #include <wtf/Threading.h>
index 0b2d272..5ee3dd1 100644 (file)
 #ifndef CrossOriginAccessControl_h
 #define CrossOriginAccessControl_h
 
-#include "ResourceHandleTypes.h"
+#include "ResourceHandle.h"
+#include "ResourceRequest.h"
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
-#include <wtf/text/StringHash.h>
 
 namespace WebCore {
 
 typedef HashSet<String, CaseFoldingHash> HTTPHeaderSet;
 
 class HTTPHeaderMap;
-class ResourceRequest;
 class ResourceResponse;
 class SecurityOrigin;
 
index 0d64338..2850492 100644 (file)
@@ -28,7 +28,7 @@
 #define CrossOriginPreflightResultCache_h
 
 #include "KURLHash.h"
-#include "ResourceHandleTypes.h"
+#include "ResourceHandle.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/PassOwnPtr.h>
index db4860c..12a38c0 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef DocumentThreadableLoader_h
 #define DocumentThreadableLoader_h
 
-#include "CachedRawResourceClient.h"
+#include "CachedRawResource.h"
 #include "CachedResourceHandle.h"
 #include "FrameLoaderTypes.h"
 #include "ThreadableLoader.h"
@@ -43,7 +43,6 @@
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
-    class CachedRawResource;
     class Document;
     class KURL;
     class ResourceRequest;
index 1e58294..6d247ba 100644 (file)
@@ -87,7 +87,6 @@
 #include "PluginData.h"
 #include "PluginDatabase.h"
 #include "PluginDocument.h"
-#include "PolicyChecker.h"
 #include "ProgressTracker.h"
 #include "ResourceHandle.h"
 #include "ResourceRequest.h"
@@ -211,7 +210,7 @@ private:
 FrameLoader::FrameLoader(Frame* frame, FrameLoaderClient* client)
     : m_frame(frame)
     , m_client(client)
-    , m_policyChecker(adoptPtr(new PolicyChecker(frame)))
+    , m_policyChecker(frame)
     , m_history(frame)
     , m_notifer(frame)
     , m_subframeLoader(frame)
index 423f6c3..f329272 100644 (file)
@@ -40,7 +40,8 @@
 #include "IconURL.h"
 #include "LayoutMilestones.h"
 #include "MixedContentChecker.h"
-#include "ResourceHandleTypes.h"
+#include "PolicyChecker.h"
+#include "ResourceHandle.h"
 #include "ResourceLoadNotifier.h"
 #include "SecurityContext.h"
 #include "SubframeLoader.h"
@@ -64,7 +65,6 @@ class FrameLoaderClient;
 class FrameNetworkingContext;
 class NavigationAction;
 class NetworkingContext;
-class PolicyChecker;
 class Page;
 class ResourceError;
 class ResourceRequest;
@@ -89,7 +89,7 @@ public:
 
     Frame* frame() const { return m_frame; }
 
-    PolicyChecker* policyChecker() const { return m_policyChecker.get(); }
+    PolicyChecker* policyChecker() const { return &m_policyChecker; }
     HistoryController* history() const { return &m_history; }
     ResourceLoadNotifier* notifier() const { return &m_notifer; }
     SubframeLoader* subframeLoader() const { return &m_subframeLoader; }
@@ -380,7 +380,7 @@ private:
     // FIXME: These should be OwnPtr<T> to reduce build times and simplify
     // header dependencies unless performance testing proves otherwise.
     // Some of these could be lazily created for memory savings on devices.
-    mutable OwnPtr<PolicyChecker> m_policyChecker;
+    mutable PolicyChecker m_policyChecker;
     mutable HistoryController m_history;
     mutable ResourceLoadNotifier m_notifer;
     mutable SubframeLoader m_subframeLoader;
index 70db42f..81a129d 100644 (file)
@@ -31,7 +31,6 @@
 #include "Event.h"
 #include "EventSender.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "HTMLNames.h"
 #include "HTMLObjectElement.h"
 #include "HTMLParserIdioms.h"
index 925af82..f59d4d5 100644 (file)
@@ -23,6 +23,7 @@
 #ifndef ImageLoader_h
 #define ImageLoader_h
 
+#include "CachedImage.h"
 #include "CachedImageClient.h"
 #include "CachedResourceHandle.h"
 #include <wtf/text/AtomicString.h>
index 6226de8..4c853da 100644 (file)
@@ -42,8 +42,6 @@
 
 namespace WebCore {
 
-class Document;
-class KURL;
 struct LinkRelAttribute;
 #if ENABLE(LINK_PRERENDER)
 class PrerenderHandle;
index 810572f..e52d536 100644 (file)
@@ -32,7 +32,6 @@
 
 #include "ApplicationCacheHost.h"
 #include "BackForwardController.h"
-#include "CachedRawResource.h"
 #include "CachedResourceLoader.h"
 #include "CachedResourceRequest.h"
 #include "Console.h"
 #include "InspectorInstrumentation.h"
 #include "MemoryCache.h"
 #include "Page.h"
-#include "PolicyChecker.h"
 #include "ProgressTracker.h"
 #include "ResourceBuffer.h"
 #include "ResourceError.h"
+#include "ResourceHandle.h"
 #include "SchemeRegistry.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
index 6519835..cabf2e1 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef MainResourceLoader_h
 #define MainResourceLoader_h
 
-#include "CachedRawResourceClient.h"
+#include "CachedRawResource.h"
 #include "CachedResourceHandle.h"
 #include "FrameLoaderTypes.h"
 #include "ResourceLoader.h"
@@ -44,7 +44,6 @@
 
 namespace WebCore {
 
-class CachedRawResource;
 class FormState;
 class ResourceRequest;
     
index 5c52c49..b8c293d 100644 (file)
@@ -33,7 +33,6 @@
 #include "DOMWindow.h"
 #include "Document.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "SchemeRegistry.h"
 #include "SecurityOrigin.h"
index 1cc2208..5442027 100644 (file)
 #include "Document.h"
 #include "FormData.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "InspectorInstrumentation.h"
 #include "Page.h"
 #include "ProgressTracker.h"
 #include "ResourceHandle.h"
-#include "ResourceRequest.h"
-#include "ResourceResponse.h"
 #include "SecurityOrigin.h"
 #include "SecurityPolicy.h"
 #include <wtf/OwnPtr.h>
index 6885c8f..5a4d6b3 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "FrameLoaderTypes.h"
 #include "PolicyCallback.h"
+#include "ResourceRequest.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
 
@@ -42,7 +43,6 @@ class FormState;
 class Frame;
 class NavigationAction;
 class ResourceError;
-class ResourceRequest;
 class ResourceResponse;
 
 class PolicyChecker {
index ee9c43a..92388ec 100644 (file)
@@ -29,8 +29,8 @@
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoader.h"
-#include "FrameLoaderClient.h"
 #include "FrameLoaderStateMachine.h"
+#include "FrameLoaderClient.h"
 #include "InspectorInstrumentation.h"
 #include "Logging.h"
 #include "ResourceResponse.h"
index 7a55088..1f68fb4 100644 (file)
@@ -38,7 +38,6 @@
 #include "ContentSecurityPolicy.h"
 #include "DiagnosticLoggingKeys.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "HTMLAppletElement.h"
 #include "HTMLFrameElementBase.h"
index 692bb97..27d6f3e 100644 (file)
@@ -33,7 +33,6 @@
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "Logging.h"
 #include "MemoryCache.h"
 #include "ResourceBuffer.h"
index 335a68e..0ba636b 100644 (file)
@@ -36,6 +36,7 @@
 #include "Document.h"
 #include "Logging.h"
 #include "ResourceBuffer.h"
+#include "ResourceHandle.h"
 #include "ScriptCallStack.h"
 #include "SecurityOrigin.h"
 #include "WebVTTParser.h"
index dfdad67..e7703ac 100644 (file)
 
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
+#include "CachedTextTrack.h"
 #include "Timer.h"
 #include "WebVTTParser.h"
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
-class CachedTextTrack;
 class Document;
 class TextTrackLoader;
 class ScriptExecutionContext;
index bfb43c1..78e38c1 100644 (file)
@@ -31,6 +31,7 @@
 #ifndef ThreadableLoader_h
 #define ThreadableLoader_h
 
+#include "ResourceHandle.h"
 #include "ResourceLoaderOptions.h"
 #include "SecurityOrigin.h"
 #include <wtf/Noncopyable.h>
index 184ef22..b6cb2dd 100644 (file)
@@ -44,7 +44,6 @@
 #include "ManifestParser.h"
 #include "Page.h"
 #include "ResourceBuffer.h"
-#include "ResourceHandle.h"
 #include "ScriptProfile.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
index 1a4af86..07651fe 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "DOMApplicationCache.h"
 #include "KURL.h"
+#include "ResourceHandle.h"
 #include "ResourceHandleClient.h"
 #include "SharedBuffer.h"
 #include <wtf/Noncopyable.h>
@@ -42,7 +43,6 @@ class ApplicationCacheResource;
 class Document;
 class DocumentLoader;
 class Frame;
-class ResourceHandle;
 class SecurityOrigin;
 
 enum ApplicationCacheUpdateOption {
index ad0e0e9..18fce65 100644 (file)
@@ -37,7 +37,6 @@
 #include "InspectorInstrumentation.h"
 #include "MainResourceLoader.h"
 #include "ProgressEvent.h"
-#include "ResourceHandle.h"
 #include "ResourceLoader.h"
 #include "ResourceRequest.h"
 #include "Settings.h"
index 0809729..d622aca 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "LegacyWebArchive.h"
 
-#include "CachedResource.h"
+#include "MemoryCache.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "Image.h"
 #include "KURLHash.h"
 #include "Logging.h"
-#include "MemoryCache.h"
+#include "markup.h"
+#include "Node.h"
 #include "Page.h"
 #include "Range.h"
 #include "ResourceBuffer.h"
 #include "Settings.h"
-#include "markup.h"
+#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
 #include <wtf/ListHashSet.h>
 #include <wtf/RetainPtr.h>
 
index 4eda279..611bf4a 100644 (file)
@@ -31,7 +31,6 @@
 #define STORE_FONT_CUSTOM_PLATFORM_DATA
 #endif
 
-#include "CachedFontClient.h"
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
 #include "CachedResourceLoader.h"
index ef4253c..5c28e2d 100644 (file)
@@ -76,6 +76,14 @@ private:
     friend class MemoryCache;
 };
 
+class CachedFontClient : public CachedResourceClient {
+public:
+    virtual ~CachedFontClient() { }
+    static CachedResourceClientType expectedType() { return FontType; }
+    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
+    virtual void fontLoaded(CachedFont*) { }
+};
+
 }
 
 #endif
diff --git a/Source/WebCore/loader/cache/CachedFontClient.h b/Source/WebCore/loader/cache/CachedFontClient.h
deleted file mode 100644 (file)
index 7cc2c42..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2007, 2008 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 CachedFontClient_h
-#define CachedFontClient_h
-
-#include "CachedResourceClient.h"
-
-namespace WebCore {
-
-class CachedFont;
-
-class CachedFontClient : public CachedResourceClient {
-public:
-    virtual ~CachedFontClient() { }
-    static CachedResourceClientType expectedType() { return FontType; }
-    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
-    virtual void fontLoaded(CachedFont*) { }
-};
-
-}
-
-#endif
index 2c25232..b7610be 100644 (file)
@@ -29,8 +29,8 @@
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
 #include "CachedResourceLoader.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "FrameLoaderTypes.h"
 #include "FrameView.h"
 #include "MemoryCache.h"
 #include "Page.h"
index 0a07497..de25cb9 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CachedRawResource.h"
 
-#include "CachedRawResourceClient.h"
+#include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
 #include "CachedResourceLoader.h"
 #include "ResourceBuffer.h"
index 663d024..518afc8 100644 (file)
 #define CachedRawResource_h
 
 #include "CachedResource.h"
+#include "CachedResourceClient.h"
 
 namespace WebCore {
-
-class CachedResourceClient;
+class CachedRawResourceCallback;
+class CachedRawResourceClient;
 class SubresourceLoader;
 
 class CachedRawResource : public CachedResource {
@@ -82,6 +83,22 @@ private:
     Vector<RedirectPair> m_redirectChain;
 };
 
+
+class CachedRawResourceClient : public CachedResourceClient {
+public:
+    virtual ~CachedRawResourceClient() { }
+    static CachedResourceClientType expectedType() { return RawResourceType; }
+    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
+
+    virtual void dataSent(CachedResource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
+    virtual void responseReceived(CachedResource*, const ResourceResponse&) { }
+    virtual void dataReceived(CachedResource*, const char* /* data */, int /* length */) { }
+    virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) { }
+#if PLATFORM(CHROMIUM)
+    virtual void dataDownloaded(CachedResource*, int) { }
+#endif
+};
+
 }
 
 #endif // CachedRawResource_h
diff --git a/Source/WebCore/loader/cache/CachedRawResourceClient.h b/Source/WebCore/loader/cache/CachedRawResourceClient.h
deleted file mode 100644 (file)
index 84f7933..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
-    Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
-    Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
-    Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef CachedRawResourceClient_h
-#define CachedRawResourceClient_h
-
-#include "CachedResourceClient.h"
-
-namespace WebCore {
-
-class CachedResource;
-class ResourceRequest;
-class ResourceResponse;
-
-class CachedRawResourceClient : public CachedResourceClient {
-public:
-    virtual ~CachedRawResourceClient() { }
-    static CachedResourceClientType expectedType() { return RawResourceType; }
-    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
-
-    virtual void dataSent(CachedResource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
-    virtual void responseReceived(CachedResource*, const ResourceResponse&) { }
-    virtual void dataReceived(CachedResource*, const char* /* data */, int /* length */) { }
-    virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) { }
-#if PLATFORM(CHROMIUM)
-    virtual void dataDownloaded(CachedResource*, int) { }
-#endif
-};
-
-}
-
-#endif // CachedRawResourceClient_h
index ca2e8e3..f05ee4c 100644 (file)
@@ -33,7 +33,6 @@
 #include "CrossOriginAccessControl.h"
 #include "Document.h"
 #include "DocumentLoader.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "InspectorInstrumentation.h"
 #include "KURL.h"
index 8d972e1..0df7693 100644 (file)
 #include "config.h"
 #include "CachedResourceHandle.h"
 
-#include "CachedResource.h"
 #include "WebCoreMemoryInstrumentation.h"
 
 namespace WebCore {
 
-CachedResourceHandleBase::CachedResourceHandleBase(CachedResource* resource)
-{
-    m_resource = resource;
-    if (m_resource)
-        m_resource->registerHandle(this);
-}
-
-CachedResourceHandleBase::CachedResourceHandleBase(const CachedResourceHandleBase& o)
-    : m_resource(o.m_resource)
-{
-    if (m_resource)
-        m_resource->registerHandle(this);
-}
-
-CachedResourceHandleBase::~CachedResourceHandleBase()
-{
-    if (m_resource)
-        m_resource->unregisterHandle(this);
-}
-
 void CachedResourceHandleBase::setResource(CachedResource* resource) 
 {
     if (resource == m_resource)
index ab272e6..4a13920 100644 (file)
 #ifndef CachedResourceHandle_h
 #define CachedResourceHandle_h
 
-#include <wtf/Forward.h>
+#include "CachedResource.h"
 
 namespace WebCore {
 
-    class CachedResource;
-
     class CachedResourceHandleBase {
     public:
-        ~CachedResourceHandleBase();
+        ~CachedResourceHandleBase() { if (m_resource) m_resource->unregisterHandle(this); }
         CachedResource* get() const { return m_resource; }
         
         bool operator!() const { return !m_resource; }
@@ -46,9 +44,9 @@ namespace WebCore {
         void reportMemoryUsage(MemoryObjectInfo*) const;
 
     protected:
-        CachedResourceHandleBase() : m_resource(0) { }
-        CachedResourceHandleBase(CachedResource*);
-        CachedResourceHandleBase(const CachedResourceHandleBase&);
+        CachedResourceHandleBase() : m_resource(0) {}
+        CachedResourceHandleBase(CachedResource* res) { m_resource = res; if (m_resource) m_resource->registerHandle(this); }
+        CachedResourceHandleBase(const CachedResourceHandleBase& o) : m_resource(o.m_resource) { if (m_resource) m_resource->registerHandle(this); }
 
         void setResource(CachedResource*);
         
index 08d3be8..83e59c4 100644 (file)
@@ -50,6 +50,13 @@ protected:
     RefPtr<TextResourceDecoder> m_decoder;
 };
 
+class CachedSVGDocumentClient : public CachedResourceClient {
+public:
+    virtual ~CachedSVGDocumentClient() { }
+    static CachedResourceClientType expectedType() { return SVGDocumentType; }
+    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
+};
+
 }
 
 #endif
diff --git a/Source/WebCore/loader/cache/CachedSVGDocumentClient.h b/Source/WebCore/loader/cache/CachedSVGDocumentClient.h
deleted file mode 100644 (file)
index e936c26..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com>
-    Copyright (C) 2011 Cosmin Truta <ctruta@gmail.com>
-    Copyright (C) 2012 University of Szeged
-    Copyright (C) 2012 Renata Hodovan <reni@webkit.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef CachedSVGDocumentClient_h
-#define CachedSVGDocumentClient_h
-
-#if ENABLE(SVG)
-
-#include "CachedResourceClient.h"
-
-namespace WebCore {
-
-class CachedSVGDocumentClient : public CachedResourceClient {
-public:
-    virtual ~CachedSVGDocumentClient() { }
-    static CachedResourceClientType expectedType() { return SVGDocumentType; }
-    virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
-};
-
-}
-
-#endif
-
-#endif // CachedSVGDocumentClient_h
diff --git a/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp b/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp
deleted file mode 100644 (file)
index 73c28cf..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2012 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:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS 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 APPLE OR ITS 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 "CachedSVGDocumentReference.h"
-
-#if ENABLE(SVG) && ENABLE(CSS_FILTERS)
-
-#include "CachedSVGDocument.h"
-
-namespace WebCore {
-
-CachedSVGDocumentReference::CachedSVGDocumentReference(CachedSVGDocument* document)
-    : m_document(document)
-{
-    m_document->addClient(this);
-}
-
-CachedSVGDocumentReference::~CachedSVGDocumentReference()
-{
-    m_document->removeClient(this);
-}
-
-}
-
-#endif
index 01df1e0..468030f 100644 (file)
 
 #if ENABLE(SVG) && ENABLE(CSS_FILTERS)
 #include "CachedResourceHandle.h"
-#include "CachedSVGDocumentClient.h"
+#include "CachedSVGDocument.h"
 
 namespace WebCore {
 
-class CachedSVGDocument;
-
 class CachedSVGDocumentReference : public CachedSVGDocumentClient {
 public:
-    CachedSVGDocumentReference(CachedSVGDocument*);
-    virtual ~CachedSVGDocumentReference();
+    CachedSVGDocumentReference(CachedSVGDocument* document) : m_document(document) { m_document->addClient(this); }
+    virtual ~CachedSVGDocumentReference() { m_document->removeClient(this); }
     CachedSVGDocument* document() { return m_document.get(); }
 private:
     CachedResourceHandle<CachedSVGDocument> m_document;
index 0674b0d..4c87530 100644 (file)
@@ -31,7 +31,6 @@
 
 namespace WebCore {
 class CachedCSSStyleSheet;
-class KURL;
 
 class CachedStyleSheetClient : public CachedResourceClient {
 public:
index 087ca8a..2373c6e 100644 (file)
 #include "config.h"
 #include "MemoryCache.h"
 
-#include "CachedResource.h"
+#include "CachedCSSStyleSheet.h"
+#include "CachedFont.h"
+#include "CachedImage.h"
+#include "CachedScript.h"
+#include "CachedXSLStyleSheet.h"
+#include "CachedResourceLoader.h"
 #include "CrossThreadTask.h"
 #include "Document.h"
 #include "FrameLoader.h"
@@ -32,6 +37,7 @@
 #include "Image.h"
 #include "Logging.h"
 #include "PublicSuffix.h"
+#include "ResourceHandle.h"
 #include "SecurityOrigin.h"
 #include "SecurityOriginHash.h"
 #include "WebCoreMemoryInstrumentation.h"
index 9c2cc5e..f5f525f 100644 (file)
@@ -25,6 +25,7 @@
 #ifndef Cache_h
 #define Cache_h
 
+#include "CachedResource.h"
 #include "SecurityOriginHash.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -39,11 +40,8 @@ class CachedCSSStyleSheet;
 class CachedResource;
 class CachedResourceLoader;
 class KURL;
-class ResourceRequest;
-class ResourceResponse;
 class ScriptExecutionContext;
 class SecurityOrigin;
-struct CrossThreadResourceRequestData;
 struct SecurityOriginHash;
 
 // This cache holds subresources used by Web pages: images, scripts, stylesheets, etc.
@@ -206,7 +204,7 @@ private:
     void evict(CachedResource*);
 
     static void removeRequestFromCacheImpl(ScriptExecutionContext*, const ResourceRequest&);
-    static void crossThreadRemoveRequestFromCache(ScriptExecutionContext*, PassOwnPtr<CrossThreadResourceRequestData>);
+    static void crossThreadRemoveRequestFromCache(ScriptExecutionContext*, PassOwnPtr<WebCore::CrossThreadResourceRequestData>);
 
     bool m_disabled;  // Whether or not the cache is enabled.
     bool m_pruneEnabled;
index ae38515..eae6890 100644 (file)
@@ -31,7 +31,6 @@
 #include "config.h"
 #include "CachedRawResource.h"
 
-#include "CachedRawResourceClient.h"
 #include "CachedResourceClient.h"
 #include "CachedResourceClientWalker.h"
 
index 436a97c..74faa95 100644 (file)
@@ -38,7 +38,6 @@
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "IconDatabase.h"
 #include "IconDatabaseBase.h"
index 95fd5a4..65e8bd5 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef IconLoader_h
 #define IconLoader_h
 
-#include "CachedRawResourceClient.h"
+#include "CachedRawResource.h"
 #include "CachedResourceHandle.h"
 #include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
index 2c33b08..c16b8f7 100644 (file)
@@ -31,6 +31,7 @@
 
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "ResourceHandle.h"
 
 #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
 #include "InspectorInstrumentation.h"
index 0b0779e..e475538 100644 (file)
@@ -29,7 +29,6 @@
 #include "DOMWindow.h"
 #include "DOMWrapperWorld.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 
 namespace WebCore {
index b86286c..2dd306e 100644 (file)
@@ -27,7 +27,6 @@
 #include "DragController.h"
 
 #if ENABLE(DRAG_SUPPORT)
-#include "CachedImage.h"
 #include "Clipboard.h"
 #include "ClipboardAccessPolicy.h"
 #include "CachedResourceLoader.h"
index 6449c48..5d06cac 100644 (file)
@@ -41,7 +41,6 @@
 #include "CachedResourceLoader.h"
 #include "DocumentType.h"
 #include "EditorClient.h"
-#include "Event.h"
 #include "EventNames.h"
 #include "FloatQuad.h"
 #include "FocusController.h"
@@ -92,7 +91,6 @@
 #include "markup.h"
 #include "npruntime_impl.h"
 #include "visible_units.h"
-#include <wtf/PassOwnPtr.h>
 #include <wtf/RefCountedLeakCounter.h>
 #include <wtf/StdLibExtras.h>
 
@@ -152,7 +150,7 @@ static inline float parentTextZoomFactor(Frame* frame)
 inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* frameLoaderClient)
     : m_page(page)
     , m_treeNode(this, parentFromOwnerElement(ownerElement))
-    , m_loader(adoptPtr(new FrameLoader(this, frameLoaderClient)))
+    , m_loader(this, frameLoaderClient)
     , m_navigationScheduler(this)
     , m_ownerElement(ownerElement)
     , m_script(this)
@@ -208,11 +206,6 @@ PassRefPtr<Frame> Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement,
     return frame.release();
 }
 
-void Frame::init()
-{
-    m_loader->init();
-}
-
 Frame::~Frame()
 {
     setView(0);
@@ -680,7 +673,7 @@ void Frame::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     info.ignoreMember(m_view);
     info.addMember(m_ownerElement, "ownerElement");
     info.addMember(m_page, "page");
-    info.addMember(*m_loader, "loader");
+    info.addMember(m_loader, "loader");
     info.ignoreMember(m_destructionObservers);
 }
 
index 4dad1de..7053eb2 100644 (file)
@@ -33,7 +33,7 @@
 #include "DragImage.h"
 #include "Editor.h"
 #include "EventHandler.h"
-#include "FrameLoaderClient.h"
+#include "FrameLoader.h"
 #include "FrameSelection.h"
 #include "FrameTree.h"
 #include "NavigationScheduler.h"
@@ -64,7 +64,6 @@ namespace WebCore {
 
     class Document;
     class FrameDestructionObserver;
-    class FrameLoader;
     class FrameView;
     class HTMLTableCellElement;
     class RegularExpression;
@@ -216,7 +215,7 @@ namespace WebCore {
 
         Page* m_page;
         mutable FrameTree m_treeNode;
-        mutable OwnPtr<FrameLoader> m_loader;
+        mutable FrameLoader m_loader;
         mutable NavigationScheduler m_navigationScheduler;
 
         HTMLFrameOwnerElement* m_ownerElement;
@@ -261,9 +260,14 @@ namespace WebCore {
         int m_activeDOMObjectsAndAnimationsSuspendedCount;
     };
 
+    inline void Frame::init()
+    {
+        m_loader.init();
+    }
+
     inline FrameLoader* Frame::loader() const
     {
-        return m_loader.get();
+        return &m_loader;
     }
 
     inline NavigationScheduler* Frame::navigationScheduler() const
index 0b5a430..d764b62 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
+#include "FrameLoaderTypes.h"
 
 namespace WebCore {
 
index 4f992a8..4a0c0bd 100644 (file)
@@ -38,7 +38,6 @@
 #include "DocumentLoader.h"
 #include "DocumentTiming.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "ResourceLoadTiming.h"
 #include "ResourceResponse.h"
 #include <wtf/CurrentTime.h>
index 2c1efb6..d652e4f 100644 (file)
@@ -28,7 +28,6 @@
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "Element.h"
-#include "Event.h"
 #include "Page.h"
 #include "PlatformMouseEvent.h"
 #include "VoidCallback.h"
index c0a0033..cd55b49 100644 (file)
@@ -40,6 +40,7 @@
 #include "InspectorInstrumentation.h"
 #include "Page.h"
 #include "PageCache.h"
+#include "ResourceHandle.h"
 #include "StorageMap.h"
 #include "TextAutosizer.h"
 #include <limits>
index 7ed880d..019f543 100644 (file)
@@ -36,7 +36,6 @@
 #include "CSSImageValue.h"
 #include "CSSPrimitiveValue.h"
 #include "CSSPropertyNames.h"
-#include "CachedImage.h"
 #include "ClipPathOperation.h"
 #include "FloatConversion.h"
 #include "IdentityTransformOperation.h"
index 7609663..a7f3635 100644 (file)
@@ -31,7 +31,6 @@
 #include "config.h"
 #include "Pasteboard.h"
 
-#include "CachedImage.h"
 #include "ClipboardChromium.h"
 #include "ClipboardUtilitiesChromium.h"
 #include "Document.h"
index e6bdef2..106f877 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "PrintContext.h"
 #include "ResourceError.h"
 #include "ResourceRequest.h"
index 0f367b0..656926e 100644 (file)
@@ -29,7 +29,6 @@
 #include "FilterOperation.h"
 
 #include "AnimationUtilities.h"
-#include "CachedSVGDocumentReference.h"
 
 namespace WebCore {
 
@@ -150,24 +149,6 @@ PassRefPtr<FilterOperation> DropShadowFilterOperation::blend(const FilterOperati
         WebCore::blend(fromColor, m_color, progress), m_type);
 }
 
-ReferenceFilterOperation::ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
-    : FilterOperation(type)
-    , m_url(url)
-    , m_fragment(fragment)
-{
-}
-
-ReferenceFilterOperation::~ReferenceFilterOperation()
-{
-}
-
-#if ENABLE(SVG)
-void ReferenceFilterOperation::setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference)
-{
-    m_cachedSVGDocumentReference = cachedSVGDocumentReference;
-}
-#endif
-
 } // namespace WebCore
 
 #endif // ENABLE(CSS_FILTERS)
index 9c1580e..fb9b676 100644 (file)
 #include <wtf/ThreadSafeRefCounted.h>
 #endif
 
+#if ENABLE(SVG)
+#include "CachedSVGDocumentReference.h"
+#endif
+
 // Annoyingly, wingdi.h #defines this.
 #ifdef PASSTHROUGH
 #undef PASSTHROUGH
@@ -48,8 +52,6 @@
 
 namespace WebCore {
 
-class CachedSVGDocumentReference;
-
 // CSS Filters
 
 #if PLATFORM(BLACKBERRY)
@@ -173,7 +175,7 @@ public:
 
 #if ENABLE(SVG)
     CachedSVGDocumentReference* cachedSVGDocumentReference() const { return m_cachedSVGDocumentReference.get(); }
-    void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference>);
+    void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference) { m_cachedSVGDocumentReference = cachedSVGDocumentReference; }
 #endif
 
     FilterEffect* filterEffect() const { return m_filterEffect.get(); }
@@ -189,9 +191,12 @@ private:
         return m_url == other->m_url;
     }
 
-    ReferenceFilterOperation(const String& url, const String& fragment, OperationType);
-
-    virtual ~ReferenceFilterOperation();
+    ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
+        : FilterOperation(type)
+        , m_url(url)
+        , m_fragment(fragment)
+    {
+    }
 
     String m_url;
     String m_fragment;
index fcebb3d..af9d6e2 100644 (file)
@@ -24,7 +24,6 @@
 
 #include "Document.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "GRefPtrGStreamer.h"
 #include "GStreamerVersioning.h"
 #include "MediaPlayer.h"
index 3153d24..754d55e 100644 (file)
@@ -22,7 +22,6 @@
 
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "PrintContext.h"
 #include "ResourceError.h"
 #include "ResourceRequest.h"
index d6d867e..7a7a3f9 100644 (file)
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "Pasteboard.h"
 
-#include "CachedImage.h"
 #include "ClipboardGtk.h"
 #include "DataObjectGtk.h"
 #include "DocumentFragment.h"
index bb4e62f..4238f80 100644 (file)
@@ -26,7 +26,6 @@
 #define PasteboardHelper_h
 
 #include "Frame.h"
-#include <glib-object.h>
 
 namespace WebCore {
 
index df35137..305a92f 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef ClipboardMac_h
 #define ClipboardMac_h
 
+#include "CachedImage.h"
 #include "CachedImageClient.h"
 #include "Clipboard.h"
 #include <wtf/RetainPtr.h>
index a5b29d9..0107732 100644 (file)
@@ -26,7 +26,6 @@
 #import "config.h"
 #import "ClipboardMac.h"
 
-#import "CachedImage.h"
 #import "CachedImageClient.h"
 #import "DOMElementInternal.h"
 #import "DragClient.h"
index 76481f5..7590f88 100644 (file)
@@ -27,7 +27,6 @@
 #import "HTMLConverter.h"
 
 #import "ArchiveResource.h"
-#import "CachedImage.h"
 #import "ColorMac.h"
 #import "Document.h"
 #import "DocumentLoader.h"
@@ -39,7 +38,6 @@
 #import "Element.h"
 #import "Font.h"
 #import "Frame.h"
-#import "FrameLoader.h"
 #import "HTMLNames.h"
 #import "HTMLParserIdioms.h"
 #import "LoaderNSURLExtras.h"
index 799bc69..5c934e3 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "Pasteboard.h"
 
-#import "CachedImage.h"
+#import "CachedResource.h"
 #import "ClipboardMac.h"
 #import "DOMRangeInternal.h"
 #import "Document.h"
 #import "ExceptionCodePlaceholder.h"
 #import "Frame.h"
 #import "FrameView.h"
-#import "FrameLoader.h"
 #import "FrameLoaderClient.h"
 #import "HitTestResult.h"
 #import "HTMLAnchorElement.h"
 #import "HTMLConverter.h"
-#import "HTMLNames.h"
 #import "htmlediting.h"
+#import "HTMLNames.h"
 #import "Image.h"
 #import "KURL.h"
 #import "LegacyWebArchive.h"
index 77bfccd..df80441 100644 (file)
@@ -25,6 +25,8 @@
 #include "config.h"
 #include "AuthenticationChallenge.h"
 
+#include "ResourceHandle.h"
+
 namespace WebCore {
 
 AuthenticationChallengeBase::AuthenticationChallengeBase()
index 9a1980a..0db772c 100644 (file)
@@ -31,6 +31,7 @@
 #include "Cookie.h"
 #include "KURL.h"
 #include "NetworkStorageSession.h"
+#include "ResourceHandle.h"
 #include "SoftLinking.h"
 #include <CFNetwork/CFHTTPCookiesPriv.h>
 #include <CoreFoundation/CoreFoundation.h>
index 3b55cce..ac081c7 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "ResourceRequestCFNet.h"
 
+#include "ResourceHandle.h"
 #include "ResourceRequest.h"
 
 #if USE(CFNETWORK)
index bdead31..6126271 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "CookieStorage.h"
 
+#import "ResourceHandle.h"
+
 #import "WebCoreSystemInterface.h"
 #import <wtf/RetainPtr.h>
 #import <wtf/UnusedParam.h>
index 547b69a..b44aa82 100644 (file)
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "Pasteboard.h"
 
-#include "CachedImage.h"
 #include "ClipboardQt.h"
 #include "DocumentFragment.h"
 #include "Editor.h"
index 2a49629..f906c1b 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "DOMPlugin.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "Page.h"
 #include "PluginData.h"
diff --git a/Source/WebCore/plugins/PluginRequest.h b/Source/WebCore/plugins/PluginRequest.h
deleted file mode 100644 (file)
index 9c1b30d..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Collabora Ltd. All rights reserved.
- * Copyright (C) 2009 Girish Ramakrishnan <girish@forwardbias.in>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 PluginRequest_h
-#define PluginRequest_h
-
-#include "FrameLoadRequest.h"
-
-namespace WebCore {
-
-class PluginRequest {
-    WTF_MAKE_NONCOPYABLE(PluginRequest); WTF_MAKE_FAST_ALLOCATED;
-public:
-    PluginRequest(const FrameLoadRequest& frameLoadRequest, bool sendNotification, void* notifyData, bool shouldAllowPopups)
-        : m_frameLoadRequest(frameLoadRequest)
-        , m_notifyData(notifyData)
-        , m_sendNotification(sendNotification)
-        , m_shouldAllowPopups(shouldAllowPopups)
-    {
-    }
-
-public:
-    const FrameLoadRequest& frameLoadRequest() const { return m_frameLoadRequest; }
-    void* notifyData() const { return m_notifyData; }
-    bool sendNotification() const { return m_sendNotification; }
-    bool shouldAllowPopups() const { return m_shouldAllowPopups; }
-
-private:
-    FrameLoadRequest m_frameLoadRequest;
-    void* m_notifyData;
-    bool m_sendNotification;
-    bool m_shouldAllowPopups;
-};
-
-} // namespace WebCore
-
-#endif
index 17ddbb1..55d1702 100644 (file)
@@ -31,7 +31,6 @@
 #include "KURL.h"
 #include "NetscapePlugInStreamLoader.h"
 #include "PluginQuirkSet.h"
-#include "PluginStreamClient.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "Timer.h"
@@ -50,6 +49,12 @@ namespace WebCore {
 
     enum PluginStreamState { StreamBeforeStarted, StreamStarted, StreamStopped };
 
+    class PluginStreamClient {
+    public:
+        virtual ~PluginStreamClient() {}
+        virtual void streamDidFinishLoading(PluginStream*) {}
+    };
+
     class PluginStream : public RefCounted<PluginStream>, private NetscapePlugInStreamLoaderClient {
     public:
         static PassRefPtr<PluginStream> create(PluginStreamClient* client, Frame* frame, const ResourceRequest& request, bool sendNotification, void* notifyData, const NPPluginFuncs* functions, NPP instance, const PluginQuirkSet& quirks)
diff --git a/Source/WebCore/plugins/PluginStreamClient.h b/Source/WebCore/plugins/PluginStreamClient.h
deleted file mode 100644 (file)
index a7e6102..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Collabora, Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. 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 PluginStreamClient_h
-#define PluginStreamClient_h
-
-namespace WebCore {
-
-class PluginStream;
-
-class PluginStreamClient {
-public:
-    virtual ~PluginStreamClient() { }
-    virtual void streamDidFinishLoading(PluginStream*) { }
-};
-
-} // namespace WebCore
-
-#endif
index 126bbbd..af0576f 100644 (file)
@@ -38,7 +38,6 @@
 #include "Element.h"
 #include "FocusController.h"
 #include "Frame.h"
-#include "FrameLoadRequest.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameTree.h"
@@ -57,8 +56,6 @@
 #include "PluginDebug.h"
 #include "PluginMainThreadScheduler.h"
 #include "PluginPackage.h"
-#include "PluginRequest.h"
-#include "PluginStream.h"
 #include "ProxyServer.h"
 #include "RenderBox.h"
 #include "RenderObject.h"
index 5692ccd..b333480 100644 (file)
 #ifndef PluginView_h
 #define PluginView_h
 
+#include "FrameLoadRequest.h"
 #include "IntRect.h"
-#include "KURL.h"
 #include "MediaCanStartListener.h"
 #include "PluginViewBase.h"
+#include "ResourceRequest.h"
 #include "Timer.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -42,7 +43,7 @@
 #include <wtf/text/CString.h>
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
-#include "PluginStreamClient.h"
+#include "PluginStream.h"
 #include "npruntime_internal.h"
 #endif
 
@@ -83,12 +84,12 @@ namespace JSC {
 #endif
 
 namespace WebCore {
-
     class Frame;
     class Image;
     class HTMLPlugInElement;
     class KeyboardEvent;
     class MouseEvent;
+    class KURL;
 #if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
     class PluginMessageThrottlerWin;
 #endif
@@ -98,7 +99,6 @@ namespace WebCore {
     class ResourceError;
     class ResourceResponse;
     class WheelEvent;
-    struct FrameLoadRequest;
 
     enum PluginStatus {
         PluginStatusCanNotFindPlugin,
@@ -106,6 +106,26 @@ namespace WebCore {
         PluginStatusLoadedSuccessfully
     };
 
+    class PluginRequest {
+        WTF_MAKE_NONCOPYABLE(PluginRequest); WTF_MAKE_FAST_ALLOCATED;
+    public:
+        PluginRequest(const FrameLoadRequest& frameLoadRequest, bool sendNotification, void* notifyData, bool shouldAllowPopups)
+            : m_frameLoadRequest(frameLoadRequest)
+            , m_notifyData(notifyData)
+            , m_sendNotification(sendNotification)
+            , m_shouldAllowPopups(shouldAllowPopups) { }
+    public:
+        const FrameLoadRequest& frameLoadRequest() const { return m_frameLoadRequest; }
+        void* notifyData() const { return m_notifyData; }
+        bool sendNotification() const { return m_sendNotification; }
+        bool shouldAllowPopups() const { return m_shouldAllowPopups; }
+    private:
+        FrameLoadRequest m_frameLoadRequest;
+        void* m_notifyData;
+        bool m_sendNotification;
+        bool m_shouldAllowPopups;
+    };
+
     class PluginManualLoader {
     public:
         virtual ~PluginManualLoader() {}
index 0e2f2ba..a5fe3a0 100644 (file)
@@ -22,7 +22,6 @@
 #include "config.h"
 #include "HitTestResult.h"
 
-#include "CachedImage.h"
 #include "DocumentMarkerController.h"
 #include "Frame.h"
 #include "FrameSelection.h"
index d020dc6..305bc7b 100644 (file)
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "InlineFlowBox.h"
 
+#include "CachedImage.h"
 #include "CSSPropertyNames.h"
 #include "Document.h"
 #include "EllipsisBox.h"
index befef4d..e7c95cb 100644 (file)
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "RenderBox.h"
 
+#include "CachedImage.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "Document.h"
index 1409011..aabe76c 100644 (file)
@@ -31,6 +31,7 @@
 #include "Font.h"
 #include "FontSelector.h"
 #include "Frame.h"
+#include "FrameLoaderClient.h"
 #include "GraphicsContext.h"
 #include "HTMLEmbedElement.h"
 #include "HTMLIFrameElement.h"
index 61cb591..cab3e44 100644 (file)
@@ -29,7 +29,6 @@
 #include "RenderImage.h"
 
 #include "BitmapImage.h"
-#include "CachedImage.h"
 #include "Font.h"
 #include "FontCache.h"
 #include "Frame.h"
index bacb1ed..0c3a79e 100644 (file)
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "RenderImageResource.h"
 
-#include "CachedImage.h"
 #include "Image.h"
 #include "RenderImageResourceStyleImage.h"
 #include "RenderObject.h"
@@ -37,6 +36,7 @@ namespace WebCore {
 
 RenderImageResource::RenderImageResource()
     : m_renderer(0)
+    , m_cachedImage(0)
 {
 }
 
@@ -89,16 +89,6 @@ void RenderImageResource::resetAnimation()
         m_renderer->repaint();
 }
 
-PassRefPtr<Image> RenderImageResource::image(int, int) const
-{
-    return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : nullImage();
-}
-
-bool RenderImageResource::errorOccurred() const
-{
-    return m_cachedImage && m_cachedImage->errorOccurred();
-}
-
 void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContainerSize)
 {
     ASSERT(m_renderer);
@@ -106,26 +96,6 @@ void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai
         m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize, m_renderer->style()->effectiveZoom());
 }
 
-bool RenderImageResource::usesImageContainerSize() const
-{
-    return m_cachedImage ? m_cachedImage->usesImageContainerSize() : false;
-}
-
-bool RenderImageResource::imageHasRelativeWidth() const
-{
-    return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false;
-}
-
-bool RenderImageResource::imageHasRelativeHeight() const
-{
-    return m_cachedImage ? m_cachedImage->imageHasRelativeHeight() : false;
-}
-
-LayoutSize RenderImageResource::imageSize(float multiplier) const
-{
-    return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier) : LayoutSize();
-}
-
 Image* RenderImageResource::nullImage()
 {
     return Image::nullImage();
index 28dbd31..4bc6e97 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef RenderImageResource_h
 #define RenderImageResource_h
 
+#include "CachedImage.h"
 #include "CachedResourceHandle.h"
 #include "Image.h"
 #include "LayoutSize.h"
@@ -54,15 +55,15 @@ public:
 
     void resetAnimation();
 
-    virtual PassRefPtr<Image> image(int width = 0, int height = 0) const;
-    virtual bool errorOccurred() const;
+    virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) const { return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : nullImage(); }
+    virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage->errorOccurred(); }
 
     virtual void setContainerSizeForRenderer(const IntSize&);
-    virtual bool usesImageContainerSize() const;
-    virtual bool imageHasRelativeWidth() const;
-    virtual bool imageHasRelativeHeight() const;
+    virtual bool usesImageContainerSize() const { return m_cachedImage ? m_cachedImage->usesImageContainerSize() : false; }
+    virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false; }
+    virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cachedImage->imageHasRelativeHeight() : false; }
 
-    virtual LayoutSize imageSize(float multiplier) const;
+    virtual LayoutSize imageSize(float multiplier) const { return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier) : LayoutSize(); }
 
     virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }
 
index 51cd809..ddb1344 100644 (file)
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "RenderImageResourceStyleImage.h"
 
-#include "CachedImage.h"
 #include "RenderObject.h"
 #include "StyleCachedImage.h"
 
index fcad75a..8a0e0c6 100644 (file)
@@ -60,7 +60,6 @@
 #include "FloatRect.h"
 #include "FocusController.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameSelection.h"
 #include "FrameTree.h"
index a8052f3..917eb1e 100644 (file)
@@ -32,7 +32,6 @@
 #include "AnimationController.h"
 #include "CanvasRenderingContext.h"
 #include "CSSPropertyNames.h"
-#include "CachedImage.h"
 #include "Chrome.h"
 #include "FontCache.h"
 #include "FrameView.h"
index 80ac3fb..e514a5a 100644 (file)
 
 #if ENABLE(CSS_FILTERS)
 
-#include "CachedResourceHandle.h"
-#include "CachedSVGDocumentClient.h"
+#if ENABLE(SVG)
+#include "CachedSVGDocument.h"
+#endif
+#include "FilterOperation.h"
 #include "LayoutRect.h"
 #include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
@@ -45,8 +47,6 @@
 
 namespace WebCore {
 
-class CachedSVGDocument;
-class Element;
 class FilterEffectRenderer;
 class FilterOperations;
 class RenderLayer;
index 701861c..f2c2fb3 100644 (file)
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "RenderListItem.h"
 
+#include "CachedImage.h"
 #include "HTMLNames.h"
 #include "HTMLOListElement.h"
 #include "RenderListMarker.h"
index 56a2e4a..cd21cea 100644 (file)
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "RenderListMarker.h"
 
+#include "CachedImage.h"
 #include "Document.h"
 #include "Font.h"
 #include "GraphicsContext.h"
index 838f57a..dadbb92 100644 (file)
 #include "config.h"
 #include "RenderSnapshottedPlugIn.h"
 
-#include "CachedImage.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "Cursor.h"
 #include "FEGaussianBlur.h"
 #include "Filter.h"
+#include "FrameLoaderClient.h"
 #include "FrameView.h"
 #include "Gradient.h"
 #include "HTMLPlugInImageElement.h"
index 700fe60..4d70e42 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "RenderTableCol.h"
 
+#include "CachedImage.h"
 #include "HTMLNames.h"
 #include "HTMLTableColElement.h"
 #include "RenderTable.h"
index 1ed4350..93c384c 100644 (file)
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "RenderTableRow.h"
 
+#include "CachedImage.h"
 #include "Document.h"
 #include "HTMLNames.h"
 #include "HitTestResult.h"
index 5b08925..46e7f57 100644 (file)
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "RenderTableSection.h"
+#include "CachedImage.h"
 #include "Document.h"
 #include "HitTestResult.h"
 #include "HTMLNames.h"
index 1523429..c2e0077 100644 (file)
@@ -34,7 +34,6 @@
 
 #include "CachedResourceHandle.h"
 #include "StyleShader.h"
-#include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
diff --git a/Source/WebCore/rendering/style/StyleCustomFilterProgram.cpp b/Source/WebCore/rendering/style/StyleCustomFilterProgram.cpp
deleted file mode 100644 (file)
index c02e8dc..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
- * Copyright (C) 2013 Apple 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:
- *
- * 1. Redistributions of source code must retain the above
- *    copyright notice, this list of conditions and the following
- *    disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “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 HOLDER 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 "StyleCustomFilterProgram.h"
-
-#if ENABLE(CSS_SHADERS)
-
-#include "CachedShader.h"
-
-namespace WebCore {
-
-String StyleCustomFilterProgram::vertexShaderString() const
-{
-    ASSERT(isLoaded());
-    return m_cachedVertexShader ? m_cachedVertexShader->shaderString() : String();
-}
-
-String StyleCustomFilterProgram::fragmentShaderString() const
-{
-    ASSERT(isLoaded());
-    return m_cachedFragmentShader ? m_cachedFragmentShader->shaderString() : String();
-}
-
-bool StyleCustomFilterProgram::isLoaded() const
-{
-    // Do not use the CachedResource:isLoaded method here, because it actually means !isLoading(),
-    // so missing and canceled resources will have isLoaded set to true, even if they are not loaded yet.
-    return (!m_cachedVertexShader || m_isVertexShaderLoaded)
-        && (!m_cachedFragmentShader || m_isFragmentShaderLoaded);
-}
-
-void StyleCustomFilterProgram::willHaveClients()
-{
-    if (m_vertexShader) {
-        m_cachedVertexShader = m_vertexShader->cachedShader();
-        m_cachedVertexShader->addClient(this);
-    }
-    if (m_fragmentShader) {
-        m_cachedFragmentShader = m_fragmentShader->cachedShader();
-        m_cachedFragmentShader->addClient(this);
-    }
-}
-
-void StyleCustomFilterProgram::didRemoveLastClient()
-{
-    if (m_cachedVertexShader) {
-        m_cachedVertexShader->removeClient(this);
-        m_cachedVertexShader = 0;
-        m_isVertexShaderLoaded = false;
-    }
-    if (m_cachedFragmentShader) {
-        m_cachedFragmentShader->removeClient(this);
-        m_cachedFragmentShader = 0;
-        m_isFragmentShaderLoaded = false;
-    }
-}
-
-void StyleCustomFilterProgram::notifyFinished(CachedResource* resource)
-{
-    if (resource->errorOccurred())
-        return;
-    // Note that m_cachedVertexShader might be equal to m_cachedFragmentShader and it would only get one event in that case.
-    if (resource == m_cachedVertexShader.get())
-        m_isVertexShaderLoaded = true;
-    if (resource == m_cachedFragmentShader.get())
-        m_isFragmentShaderLoaded = true;
-    if (isLoaded())
-        notifyClients();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(CSS_SHADERS)
index dc97da1..ae68d95 100644 (file)
 #define StyleCustomFilterProgram_h
 
 #if ENABLE(CSS_SHADERS)
-
 #include "CachedResourceClient.h"
 #include "CachedResourceHandle.h"
+#include "CachedShader.h"
 #include "CustomFilterProgram.h"
 #include "StyleShader.h"
 #include <wtf/FastAllocBase.h>
 
 namespace WebCore {
 
-class CachedShader;
+// CSS Shaders
 
 class StyleCustomFilterProgram : public CustomFilterProgram, public CachedResourceClient {
     WTF_MAKE_FAST_ALLOCATED;
@@ -56,12 +56,64 @@ public:
     void setFragmentShader(PassRefPtr<StyleShader> shader) { m_fragmentShader = shader; }
     StyleShader* fragmentShader() const { return m_fragmentShader.get(); }
     
-    virtual String vertexShaderString() const OVERRIDE;
-    virtual String fragmentShaderString() const OVERRIDE;
-    virtual bool isLoaded() const OVERRIDE;
-    virtual void willHaveClients() OVERRIDE;
-    virtual void didRemoveLastClient() OVERRIDE;
-    virtual void notifyFinished(CachedResource*) OVERRIDE;
+    virtual String vertexShaderString() const
+    {
+        ASSERT(isLoaded());
+        return m_cachedVertexShader.get() ? m_cachedVertexShader->shaderString() : String();
+    }
+    
+    virtual String fragmentShaderString() const
+    {
+        ASSERT(isLoaded());
+        return m_cachedFragmentShader.get() ? m_cachedFragmentShader->shaderString() : String();
+    }
+
+    virtual bool isLoaded() const
+    {
+        // Do not use the CachedResource:isLoaded method here, because it actually means !isLoading(),
+        // so missing and canceled resources will have isLoaded set to true, even if they are not loaded yet.
+        return (!m_cachedVertexShader.get() || m_isVertexShaderLoaded)
+            && (!m_cachedFragmentShader.get() || m_isFragmentShaderLoaded);
+    }
+
+    virtual void willHaveClients()
+    {
+        if (m_vertexShader) {
+            m_cachedVertexShader = m_vertexShader->cachedShader();
+            m_cachedVertexShader->addClient(this);
+        }
+        if (m_fragmentShader) {
+            m_cachedFragmentShader = m_fragmentShader->cachedShader();
+            m_cachedFragmentShader->addClient(this);
+        }
+    }
+    
+    virtual void didRemoveLastClient()
+    {
+        if (m_cachedVertexShader.get()) {
+            m_cachedVertexShader->removeClient(this);
+            m_cachedVertexShader = 0;
+            m_isVertexShaderLoaded = false;
+        }
+        if (m_cachedFragmentShader.get()) {
+            m_cachedFragmentShader->removeClient(this);
+            m_cachedFragmentShader = 0;
+            m_isFragmentShaderLoaded = false;
+        }
+    }
+    
+    virtual void notifyFinished(CachedResource* resource)
+    {
+        if (resource->errorOccurred())
+            return;
+        // Note that m_cachedVertexShader might be equal to m_cachedFragmentShader and it would only get one event in that case.
+        if (resource == m_cachedVertexShader.get())
+            m_isVertexShaderLoaded = true;
+        if (resource == m_cachedFragmentShader.get())
+            m_isFragmentShaderLoaded = true;
+        if (isLoaded())
+            notifyClients();
+    }
     
     CachedShader* cachedVertexShader() const { return m_vertexShader ? m_vertexShader->cachedShader() : 0; }
     CachedShader* cachedFragmentShader() const { return m_fragmentShader ? m_fragmentShader->cachedShader() : 0; }
index e236b67..edb4157 100644 (file)
@@ -22,6 +22,7 @@
 #define SVGFEImageElement_h
 
 #if ENABLE(SVG) && ENABLE(FILTERS)
+#include "CachedImage.h"
 #include "CachedResourceHandle.h"
 #include "ImageBuffer.h"
 #include "SVGAnimatedBoolean.h"
index 4800d75..2c7b512 100644 (file)
@@ -21,8 +21,7 @@
 #define SVGFontFaceUriElement_h
 
 #if ENABLE(SVG_FONTS)
-
-#include "CachedFontClient.h"
+#include "CachedFont.h"
 #include "CachedResourceHandle.h"
 #include "SVGElement.h"
 
@@ -42,7 +41,7 @@ private:
     SVGFontFaceUriElement(const QualifiedName&, Document*);
     
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
-    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0) OVERRIDE;
+    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
     virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
 
     void loadFont();
index e67f649..4f33d56 100644 (file)
@@ -23,7 +23,6 @@
 #if ENABLE(SVG)
 #include "SVGImageLoader.h"
 
-#include "CachedImage.h"
 #include "Event.h"
 #include "EventNames.h"
 #include "HTMLParserIdioms.h"
index 84cdefb..0f296b9 100644 (file)
@@ -30,7 +30,6 @@
 #include "Attribute.h"
 #include "CachedResourceLoader.h"
 #include "CachedResourceRequest.h"
-#include "CachedSVGDocument.h"
 #include "Document.h"
 #include "ElementShadow.h"
 #include "Event.h"
index 4046ef6..a7a1eaf 100644 (file)
@@ -22,8 +22,7 @@
 #define SVGUseElement_h
 
 #if ENABLE(SVG)
-#include "CachedResourceHandle.h"
-#include "CachedSVGDocumentClient.h"
+#include "CachedSVGDocument.h"
 #include "SVGAnimatedBoolean.h"
 #include "SVGAnimatedLength.h"
 #include "SVGExternalResourcesRequired.h"
index 0a2f7b0..63ee611 100644 (file)
@@ -22,6 +22,7 @@
 #include "SVGImageCache.h"
 
 #if ENABLE(SVG)
+#include "CachedImage.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "ImageBuffer.h"
index 0f2046f..b331676 100644 (file)
@@ -32,7 +32,6 @@
 #include "DocumentLoader.h"
 #include "DocumentWriter.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "HTMLIFrameElement.h"
 #include "PagePopup.h"
 #include "PagePopupClient.h"
index 8d263a7..b60213e 100644 (file)
@@ -37,7 +37,6 @@
 
 namespace WebCore {
 
-class CachedResourceLoader;
 class XSLImportRule;
     
 class XSLStyleSheet : public StyleSheet {
index 0b66796..503802c 100644 (file)
@@ -31,8 +31,8 @@
 #include "DOMWindow.h"
 #include "Document.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "ResourceError.h"
+#include "ResourceHandle.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "SecurityOrigin.h"
index db88c3f..4e1350e 100644 (file)
@@ -42,6 +42,7 @@
 #include "ImageLoader.h"
 #include "ProcessingInstruction.h"
 #include "ResourceError.h"
+#include "ResourceHandle.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "ScriptElement.h"
index b4f0e1e..c5cf5f6 100644 (file)
@@ -33,7 +33,6 @@
 #include "XMLErrors.h"
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
-#include <wtf/text/AtomicStringHash.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>
 
index 3e0cccf..50bb4ff 100644 (file)
@@ -46,6 +46,7 @@
 #include "HTMLTemplateElement.h"
 #include "ProcessingInstruction.h"
 #include "ResourceError.h"
+#include "ResourceHandle.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "ScriptElement.h"
index c8a65db..8502fdc 100644 (file)
@@ -1,3 +1,25 @@
+2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144422 and r144424.
+        http://trac.webkit.org/changeset/144422
+        http://trac.webkit.org/changeset/144424
+        https://bugs.webkit.org/show_bug.cgi?id=111167
+
+        Caused over 20 tests to fail assertion on Chromium Win port as
+        ASSERTION FAILED: m_platformRequestUpdated (Requested by
+        toyoshim on #webkit).
+
+        * src/ApplicationCacheHost.cpp:
+        * src/AssociatedURLLoader.cpp:
+        * src/EditorClientImpl.cpp:
+        * src/SharedWorkerRepository.cpp:
+        * src/WebDataSourceImpl.cpp:
+        * src/WebFrameImpl.h:
+        (WebCore):
+        * src/WebNode.cpp:
+        * src/WebSharedWorkerImpl.cpp:
+        * tests/FrameLoaderClientImplTest.cpp:
+
 2013-03-01  Jochen Eisinger  <jochen@chromium.org>
 
         REGRESSION(r144422): Broke compilation on chromium-mac
index dbfd450..a8f398e 100644 (file)
@@ -35,7 +35,6 @@
 #include "DOMApplicationCache.h"
 #include "DocumentLoader.h"
 #include "Frame.h"
-#include "FrameLoader.h"
 #include "InspectorApplicationCacheAgent.h"
 #include "InspectorInstrumentation.h"
 #include "Page.h"
index 6be9763..cebedfa 100644 (file)
@@ -35,7 +35,6 @@
 #include "DocumentThreadableLoader.h"
 #include "DocumentThreadableLoaderClient.h"
 #include "HTTPValidation.h"
-#include "ResourceError.h"
 #include "SubresourceLoader.h"
 #include "Timer.h"
 #include "WebApplicationCacheHost.h"
index 98303f4..0f32552 100644 (file)
@@ -36,7 +36,6 @@
 #include "HTMLNames.h"
 #include "KeyboardCodes.h"
 #include "KeyboardEvent.h"
-#include "NotImplemented.h"
 #include "PlatformKeyboardEvent.h"
 #include "RenderObject.h"
 #include "Settings.h"
index a7e27b7..45ae12b 100644 (file)
@@ -41,7 +41,6 @@
 #include "InspectorInstrumentation.h"
 #include "MessagePortChannel.h"
 #include "PlatformMessagePortChannelChromium.h"
-#include "ResourceResponse.h"
 #include "ScriptExecutionContext.h"
 #include "SharedWorker.h"
 #include "WebContentSecurityPolicy.h"
index 1a3f85a..490f298 100644 (file)
@@ -32,7 +32,6 @@
 #include "WebDataSourceImpl.h"
 
 #include "ApplicationCacheHostInternal.h"
-#include "FrameLoader.h"
 #include <public/WebURL.h>
 #include <public/WebURLError.h>
 #include <public/WebVector.h>
index b09bbba..0ce98fb 100644 (file)
@@ -50,7 +50,6 @@ class KURL;
 class Node;
 class Range;
 class SubstituteData;
-struct FrameLoadRequest;
 struct WindowFeatures;
 }
 
index 9872df3..8b4dc8a 100644 (file)
@@ -33,7 +33,6 @@
 
 #include "Document.h"
 #include "Element.h"
-#include "Event.h"
 #include "Frame.h"
 #include "FrameLoaderClientImpl.h"
 #include "Node.h"
index acd2ad1..f60bed1 100644 (file)
@@ -35,7 +35,6 @@
 #include "DatabaseTask.h"
 #include "Document.h"
 #include "FrameLoadRequest.h"
-#include "FrameLoader.h"
 #include "GroupSettings.h"
 #include "KURL.h"
 #include "MessageEvent.h"
index eebbdb0..12ca684 100644 (file)
@@ -32,7 +32,6 @@
 
 #include "FrameLoaderClientImpl.h"
 
-#include "FrameLoader.h"
 #include "KURL.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
index 3a7034e..1a841fa 100644 (file)
@@ -1,3 +1,17 @@
+2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144422 and r144424.
+        http://trac.webkit.org/changeset/144422
+        http://trac.webkit.org/changeset/144424
+        https://bugs.webkit.org/show_bug.cgi?id=111167
+
+        Caused over 20 tests to fail assertion on Chromium Win port as
+        ASSERTION FAILED: m_platformRequestUpdated (Requested by
+        toyoshim on #webkit).
+
+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+        * ewk/ewk_frame.cpp:
+
 2013-02-28  Alexey Proskuryakov  <ap@apple.com>
 
         Reduce amount of rebuilding when touching networking headers
index e03793d..b9d17e8 100644 (file)
@@ -38,7 +38,6 @@
 #include <FindOptions.h>
 #include <FloatSize.h>
 #include <FocusController.h>
-#include <FrameLoader.h>
 #include <FrameView.h>
 #include <HTMLInputElement.h>
 #include <InspectorController.h>
index 4153694..1d94de6 100644 (file)
@@ -29,7 +29,6 @@
 #include "EventHandler.h"
 #include "FocusController.h"
 #include "FrameLoadRequest.h"
-#include "FrameLoader.h"
 #include "FrameLoaderClientEfl.h"
 #include "FrameView.h"
 #include "HTMLCollection.h"
index 0b6e190..6af67c1 100644 (file)
@@ -1,3 +1,16 @@
+2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144422 and r144424.
+        http://trac.webkit.org/changeset/144422
+        http://trac.webkit.org/changeset/144424
+        https://bugs.webkit.org/show_bug.cgi?id=111167
+
+        Caused over 20 tests to fail assertion on Chromium Win port as
+        ASSERTION FAILED: m_platformRequestUpdated (Requested by
+        toyoshim on #webkit).
+
+        * webkit/webkitwebpolicydecision.cpp:
+
 2013-02-28  Alexey Proskuryakov  <ap@apple.com>
 
         Reduce amount of rebuilding when touching networking headers
index 6ffefbd..624ff9a 100644 (file)
@@ -20,8 +20,8 @@
 #include "config.h"
 #include "webkitwebpolicydecision.h"
 
-#include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "FrameLoaderTypes.h"
 #include "webkitwebframeprivate.h"
 #include "webkitwebpolicydecisionprivate.h"
 
index 9c9e54c..ae020b2 100644 (file)
@@ -1,3 +1,20 @@
+2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144422 and r144424.
+        http://trac.webkit.org/changeset/144422
+        http://trac.webkit.org/changeset/144424
+        https://bugs.webkit.org/show_bug.cgi?id=111167
+
+        Caused over 20 tests to fail assertion on Chromium Win port as
+        ASSERTION FAILED: m_platformRequestUpdated (Requested by
+        toyoshim on #webkit).
+
+        * DOM/WebDOMOperations.mm:
+        * Misc/WebNSPasteboardExtras.mm:
+        * WebCoreSupport/WebFrameNetworkingContext.mm:
+        * WebView/WebRenderLayer.mm:
+        * WebView/WebRenderNode.mm:
+
 2013-02-28  Alexey Proskuryakov  <ap@apple.com>
 
         Reduce amount of rebuilding when touching networking headers
index 88c1d86..8197fd2 100644 (file)
@@ -41,7 +41,6 @@
 #import <JavaScriptCore/APICast.h>
 #import <WebCore/Document.h>
 #import <WebCore/Frame.h>
-#import <WebCore/FrameLoader.h>
 #import <WebCore/HTMLInputElement.h>
 #import <WebCore/HTMLParserIdioms.h>
 #import <WebCore/JSElement.h>
index a4af935..e4404f7 100644 (file)
@@ -36,7 +36,6 @@
 #import "WebResourcePrivate.h"
 #import "WebURLsWithTitles.h"
 #import "WebViewPrivate.h"
-#import <WebCore/CachedImage.h>
 #import <WebCore/Element.h>
 #import <WebCore/Image.h>
 #import <WebCore/MIMETypeRegistry.h>
index de0ed85..3055f9e 100644 (file)
@@ -20,7 +20,6 @@
 
 #import "WebFrameNetworkingContext.h"
 
-#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderClient.h>
 #import <WebCore/NetworkStorageSession.h>
 #import <WebCore/Page.h>
index ebf3877..646dc1d 100644 (file)
@@ -27,7 +27,6 @@
 
 #import "WebFrameInternal.h"
 #import <WebCore/Frame.h>
-#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderClient.h>
 #import <WebCore/RenderLayer.h>
 #import <WebCore/RenderLayerBacking.h>
index 2392b99..9bed4bd 100644 (file)
@@ -30,7 +30,6 @@
 
 #import "WebFrameInternal.h"
 #import <WebCore/Frame.h>
-#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderClient.h>
 #import <WebCore/RenderText.h>
 #import <WebCore/RenderWidget.h>
index c6e380a..646cba3 100644 (file)
@@ -1,3 +1,17 @@
+2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144422 and r144424.
+        http://trac.webkit.org/changeset/144422
+        http://trac.webkit.org/changeset/144424
+        https://bugs.webkit.org/show_bug.cgi?id=111167
+
+        Caused over 20 tests to fail assertion on Chromium Win port as
+        ASSERTION FAILED: m_platformRequestUpdated (Requested by
+        toyoshim on #webkit).
+
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        * WebCoreSupport/QWebPageAdapter.cpp:
+
 2013-02-28  Alexey Proskuryakov  <ap@apple.com>
 
         Reduce amount of rebuilding when touching networking headers
index 11b0f26..7b92e50 100644 (file)
@@ -33,7 +33,6 @@
 #include "NotificationPresenterClientQt.h"
 
 #include "Document.h"
-#include "Event.h"
 #include "EventNames.h"
 #include "KURL.h"
 #include "Page.h"
index 5f0ca23..a4b542c 100644 (file)
@@ -41,7 +41,6 @@
 #include "DragSession.h"
 #include "EditorClientQt.h"
 #include "FocusController.h"
-#include "FrameLoadRequest.h"
 #include "FrameView.h"
 #if ENABLE(GEOLOCATION)
 #include "GeolocationClientMock.h"
index 56834e9..ce18add 100644 (file)
@@ -1,3 +1,35 @@
+2013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144422 and r144424.
+        http://trac.webkit.org/changeset/144422
+        http://trac.webkit.org/changeset/144424
+        https://bugs.webkit.org/show_bug.cgi?id=111167
+
+        Caused over 20 tests to fail assertion on Chromium Win port as
+        ASSERTION FAILED: m_platformRequestUpdated (Requested by
+        toyoshim on #webkit).
+
+        * NetworkProcess/HostRecord.h:
+        * NetworkProcess/NetworkResourceLoadScheduler.h:
+        * NetworkProcess/NetworkResourceLoader.h:
+        (WebCore):
+        * Shared/WebRenderLayer.cpp:
+        * Shared/WebRenderObject.cpp:
+        * WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp:
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+        * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        * WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp:
+        * WebProcess/Plugins/PDF/PDFPlugin.mm:
+        * WebProcess/Plugins/PluginView.cpp:
+        * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        * WebProcess/WebProcess.cpp:
+        * WebProcess/soup/WebProcessSoup.cpp:
+
 2013-03-01  Andras Becsi  <andras.becsi@digia.com>
 
         [Qt][WK2] Fix failing API tests after r143935
index 84611a1..d7497d7 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(NETWORK_PROCESS)
 
-#include <WebCore/ResourceLoadPriority.h>
+#include <WebCore/ResourceRequest.h>
 #include <wtf/Deque.h>
 #include <wtf/HashSet.h>
 #include <wtf/RefCounted.h>
index 0cadd04..78ce23f 100644 (file)
@@ -28,6 +28,7 @@
 
 #include "SchedulableLoader.h"
 #include <WebCore/ResourceLoaderOptions.h>
+#include <WebCore/ResourceRequest.h>
 #include <WebCore/Timer.h>
 #include <wtf/HashSet.h>
 
index 30fa94d..dfacb6c 100644 (file)
 #include "SchedulableLoader.h"
 #include <WebCore/ResourceHandleClient.h>
 #include <WebCore/ResourceLoaderOptions.h>
+#include <WebCore/ResourceRequest.h>
 
 namespace WebCore {
 class ResourceBuffer;
 class ResourceHandle;
-class ResourceRequest;
 }
 
 namespace WebKit {
index 31f1bbd..9b138fc 100644 (file)
@@ -29,7 +29,6 @@
 #include "WebPage.h"
 #include "WebString.h"
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameLoaderClient.h>
 #include <WebCore/RenderLayer.h>
 #include <WebCore/RenderLayerBacking.h>
index b72ff04..3a25edf 100644 (file)
@@ -29,7 +29,6 @@
 #include "WebPage.h"
 #include "WebString.h"
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameLoaderClient.h>
 #include <WebCore/RenderText.h>
 #include <WebCore/RenderView.h>
index 99b4743..0d110c5 100644 (file)
@@ -33,7 +33,6 @@
 #include "WebPage.h"
 #include "WebPageProxyMessages.h"
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/Geolocation.h>
 #include <WebCore/SecurityOrigin.h>
 
index b0177b5..06ddc3b 100644 (file)
@@ -34,7 +34,6 @@
 #include "WebFrame.h"
 #include "WebSecurityOrigin.h"
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
 
 using namespace WebCore;
index 1295359..77e0309 100644 (file)
@@ -31,7 +31,6 @@
 #include <JavaScriptCore/APICast.h>
 #include <WebCore/Document.h>
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/HTMLFrameElement.h>
 #include <WebCore/HTMLIFrameElement.h>
 #include <WebCore/HTMLInputElement.h>
index dcd063d..93939b5 100644 (file)
@@ -51,7 +51,6 @@
 #include <WebCore/ApplicationCache.h>
 #include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/GCController.h>
 #include <WebCore/GeolocationClient.h>
index a2b4a0b..d448e84 100644 (file)
@@ -31,7 +31,6 @@
 #include "WebFrameLoaderClient.h"
 #include <WebCore/DOMWindowExtension.h>
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <wtf/HashMap.h>
 
 using namespace WebCore;
index 460f4f6..2f59af9 100644 (file)
@@ -48,7 +48,6 @@
 #import <WebCore/FocusController.h>
 #import <WebCore/FormState.h>
 #import <WebCore/Frame.h>
-#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/HTMLElement.h>
index e630378..d9c2005 100644 (file)
@@ -44,7 +44,6 @@
 #include <WebCore/FocusController.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoadRequest.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameLoaderClient.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/GraphicsContext.h>
index e21280e..29c7e2e 100644 (file)
@@ -33,9 +33,7 @@
 #include "WebContextMenuItemData.h"
 #include "WebPage.h"
 #include <WebCore/ContextMenu.h>
-#include <WebCore/Event.h>
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
 #include <WebCore/UserGestureIndicator.h>
index 2611a27..e0bcbeb 100644 (file)
@@ -37,7 +37,6 @@
 #include <WebCore/DocumentFragment.h>
 #include <WebCore/FocusController.h>
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/HTMLInputElement.h>
 #include <WebCore/HTMLNames.h>
index a83de1d..61149fd 100644 (file)
@@ -57,7 +57,6 @@
 #include <WebCore/FormState.h>
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoadRequest.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/HTMLAppletElement.h>
 #include <WebCore/HTMLFormElement.h>
index 2a04c17..48ef937 100644 (file)
@@ -21,7 +21,6 @@
 #import "config.h"
 #import "WebFrameNetworkingContext.h"
 
-#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderClient.h>
 #import <WebCore/Page.h>
 #import <WebCore/ResourceError.h>
index 8be8d89..602de9b 100644 (file)
@@ -45,7 +45,6 @@
 #import <WebCore/AXObjectCache.h>
 #import <WebCore/FocusController.h>
 #import <WebCore/Frame.h>
-#import <WebCore/FrameLoader.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/HitTestResult.h>
 #import <WebCore/HTMLConverter.h>
index 1532e87..cb04367 100644 (file)
@@ -63,7 +63,6 @@
 #include <WebCore/Font.h>
 #include <WebCore/FontCache.h>
 #include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/GCController.h>
 #include <WebCore/GlyphPageTreeNode.h>
 #include <WebCore/IconDatabase.h>
index 1c9d332..aaef965 100644 (file)
@@ -37,7 +37,6 @@
 #include <WebCore/PageCache.h>
 #include <WebCore/ResourceHandle.h>
 #include <libsoup/soup-cache.h>
-#include <libsoup/soup.h>
 #include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>