⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 144530 in webkit


Ignore:
Timestamp:
Mar 1, 2013, 10:36:29 PM (13 years ago)
Author:
ap@apple.com
Message:

Reduce amount of rebuilding when touching networking headers
​https://bugs.webkit.org/show_bug.cgi?id=111035

Reviewed by Eric Seidel.

This uses a number of common unsurprising techniques. One interesting observation
is that including CachedResource related headers is very expensive. We can usually
get away with their Client counterparts, and with CachedResourceHandle.

  • page/Frame.cpp:
  • page/Frame.h: Don't include FrameLoader, greatly reducing include graph for most non-loader files. This required making Frame::init() non-inline - I'm not sure why it ever was.
  • loader/FrameLoader.cpp:
  • loader/FrameLoader.h: Even though FrameLoader is logically on loading side of WebCore, it's included in too many places. Not including PolicyChecker.h and ResourceHandle.h was among the largest wins. As a future improvement, we should probably convert other members to OwnPtrs.
  • css/CSSCrossfadeValue.h: Initializing CachedResourceHandle with 0 requires a definition of a class it holds, but default construction does not.
  • loader/CrossOriginAccessControl.h: This file among others only needs ResourceHandleTypes.h, not ResourceHandle.h. This header is semi-recent, so not all include sites were updated.
  • loader/cache/CachedFont.h:
  • loader/cache/CachedFontClient.h: Added.
  • loader/cache/CachedRawResource.h:
  • loader/cache/CachedRawResourceClient.h: Added.
  • loader/cache/CachedSVGDocument.h:
  • loader/cache/CachedSVGDocumentClient.h: Added. These types were defining client types in the same headers, making it impossible to avoid including networking headers through CachedResource. Moved clients into separate files.
  • plugins/PluginStream.h:
  • plugins/PluginStreamClient.h: Added. Similar situation here.
  • loader/cache/CachedResourceHandle.cpp:
  • loader/cache/CachedResourceHandle.h: Moved functions that need to know about CachedResource to .cpp file. This is another huge win. Added a destructor, so that CachedResource woudn't be needed in all files that include CachedResourceHandle.
  • loader/cache/CachedSVGDocumentReference.cpp: Added.
  • loader/cache/CachedSVGDocumentReference.h: Moved constructor and virtual function implementations to a .cpp file - they need not inlining, and this lets us avoid including CachedSVGDocument.h in the header.
  • platform/graphics/filters/FilterOperation.cpp:
  • platform/graphics/filters/FilterOperation.h: Avoid including CachedSVGDocumentReference.h. This is not such a big win now that CachedSVGDocumentReference.h itself is smaller, but FilterOperation is so clearly rendering code that it seems best to cut any ties with resources and loading. Added a virtual destrutor in .cpp file, because inline destructors in polymorphic classes are generally harmful (due to code bloat).
  • plugins/PluginRequest.h: Added.
  • plugins/PluginView.h: Moved PluginRequest into a separate file, it was out of place in a view hierarchy class file.
  • rendering/RenderImageResource.cpp:
  • rendering/RenderImageResource.h: Moved definitions of virtual functions to a .cpp file. Thre is no win from having them inline, and now we don't need CachedImage.h in the header.
  • rendering/style/StyleCustomFilterProgram.cpp: Added.
  • rendering/style/StyleCustomFilterProgram.h: Ditto.
  • 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/CSSFontFaceSource.h:
  • css/CSSFontSelector.cpp:
  • css/WebKitCSSSVGDocumentValue.cpp:
  • css/WebKitCSSSVGDocumentValue.h:
  • dom/Clipboard.cpp:
  • 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:
  • 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:
  • inspector/InspectorPageAgent.cpp:
  • inspector/NetworkResourcesData.cpp:
  • inspector/NetworkResourcesData.h:
  • loader/CookieJar.cpp:
  • loader/CrossOriginAccessControl.cpp:
  • loader/CrossOriginPreflightResultCache.h:
  • loader/DocumentThreadableLoader.h:
  • loader/ImageLoader.cpp:
  • loader/ImageLoader.h:
  • loader/LinkLoader.h:
  • loader/MainResourceLoader.cpp:
  • loader/MainResourceLoader.h:
  • loader/MixedContentChecker.cpp:
  • loader/PingLoader.cpp:
  • loader/PolicyChecker.h:
  • 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:
  • loader/appcache/ApplicationCacheHost.cpp:
  • loader/archive/cf/LegacyWebArchive.cpp:
  • loader/cache/CachedFont.cpp:
  • loader/cache/CachedImage.cpp:
  • loader/cache/CachedRawResource.cpp:
  • loader/cache/CachedResource.cpp:
  • loader/cache/CachedStyleSheetClient.h:
  • loader/cache/MemoryCache.cpp:
  • loader/cache/MemoryCache.h:
  • loader/chromium/CachedRawResourceChromium.cpp:
  • loader/icon/IconController.cpp:
  • loader/icon/IconLoader.h:
  • loader/mac/ResourceLoaderMac.mm:
  • page/DOMWindowExtension.cpp:
  • page/DragController.cpp:
  • 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/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/PluginView.cpp:
  • rendering/HitTestResult.cpp:
  • rendering/InlineFlowBox.cpp:
  • rendering/RenderBox.cpp:
  • rendering/RenderEmbeddedObject.cpp:
  • rendering/RenderImage.cpp:
  • 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:
  • svg/SVGFEImageElement.h:
  • svg/SVGFontFaceUriElement.h:
  • 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: Many self-evident changes - removing unnecessary header includes, adding smaller more local ones that are now necessary.
Location:
trunk/Source
Files:
7 added
208 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r144446 r144530  
    17341734    loader/cache/CachedShader.cpp
    17351735    loader/cache/CachedSVGDocument.cpp
     1736    loader/cache/CachedSVGDocumentReference.cpp
    17361737    loader/cache/CachedTextTrack.cpp
    17371738    loader/cache/CachedXSLStyleSheet.cpp
    … …  
    22562257    rendering/style/StyleCachedImage.cpp
    22572258    rendering/style/StyleCachedImageSet.cpp
     2259    rendering/style/StyleCustomFilterProgram.cpp
    22582260    rendering/style/StyleDeprecatedFlexibleBoxData.cpp
    22592261    rendering/style/StyleFilterData.cpp

  • trunk/Source/WebCore/ChangeLog

    r144529 r144530  
     12013-02-28  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reduce amount of rebuilding when touching networking headers
     4        https://bugs.webkit.org/show_bug.cgi?id=111035
     5
     6        Reviewed by Eric Seidel.
     7
     8        This uses a number of common unsurprising techniques. One interesting observation
     9        is that including CachedResource related headers is very expensive. We can usually
     10        get away with their Client counterparts, and with CachedResourceHandle.
     11
     12        * page/Frame.cpp:
     13        * page/Frame.h:
     14        Don't include FrameLoader, greatly reducing include graph for most non-loader files.
     15        This required making Frame::init() non-inline - I'm not sure why it ever was.
     16
     17        * loader/FrameLoader.cpp:
     18        * loader/FrameLoader.h:
     19        Even though FrameLoader is logically on loading side of WebCore, it's included in
     20        too many places. Not including PolicyChecker.h and ResourceHandle.h was among the
     21        largest wins. As a future improvement, we should probably convert other members
     22        to OwnPtrs.
     23
     24        * css/CSSCrossfadeValue.h: Initializing CachedResourceHandle with 0 requires a
     25        definition of a class it holds, but default construction does not.
     26
     27        * loader/CrossOriginAccessControl.h: This file among others only needs ResourceHandleTypes.h,
     28        not ResourceHandle.h. This header is semi-recent, so not all include sites were updated.
     29
     30        * loader/cache/CachedFont.h:
     31        * loader/cache/CachedFontClient.h: Added.
     32        * loader/cache/CachedRawResource.h:
     33        * loader/cache/CachedRawResourceClient.h: Added.
     34        * loader/cache/CachedSVGDocument.h:
     35        * loader/cache/CachedSVGDocumentClient.h: Added.
     36        These types were defining client types in the same headers, making it impossible
     37        to avoid including networking headers through CachedResource. Moved clients into
     38        separate files.
     39
     40        * plugins/PluginStream.h:
     41        * plugins/PluginStreamClient.h: Added.
     42        Similar situation here.
     43
     44        * loader/cache/CachedResourceHandle.cpp:
     45        * loader/cache/CachedResourceHandle.h:
     46        Moved functions that need to know about CachedResource to .cpp file. This is another
     47        huge win. Added a destructor, so that CachedResource woudn't be needed in all files
     48        that include CachedResourceHandle.
     49
     50        * loader/cache/CachedSVGDocumentReference.cpp: Added.
     51        * loader/cache/CachedSVGDocumentReference.h:
     52        Moved constructor and virtual function implementations to a .cpp file - they need
     53        not inlining, and this lets us avoid including CachedSVGDocument.h in the header.
     54
     55        * platform/graphics/filters/FilterOperation.cpp:
     56        * platform/graphics/filters/FilterOperation.h:
     57        Avoid including CachedSVGDocumentReference.h. This is not such a big win now that
     58        CachedSVGDocumentReference.h itself is smaller, but FilterOperation is so clearly
     59        rendering code that it seems best to cut any ties with resources and loading.
     60        Added a virtual destrutor in .cpp file, because inline destructors in polymorphic
     61        classes are generally harmful (due to code bloat).
     62
     63        * plugins/PluginRequest.h: Added.
     64        * plugins/PluginView.h:
     65        Moved PluginRequest into a separate file, it was out of place in a view hierarchy
     66        class file.
     67
     68        * rendering/RenderImageResource.cpp:
     69        * rendering/RenderImageResource.h:
     70        Moved definitions of virtual functions to a .cpp file. Thre is no win from having
     71        them inline, and now we don't need CachedImage.h in the header.
     72
     73        * rendering/style/StyleCustomFilterProgram.cpp: Added.
     74        * rendering/style/StyleCustomFilterProgram.h:
     75        Ditto.
     76
     77        * CMakeLists.txt:
     78        * GNUmakefile.list.am:
     79        * Modules/mediastream/RTCPeerConnection.cpp:
     80        * Modules/notifications/Notification.cpp:
     81        * Target.pri:
     82        * WebCore.exp.in:
     83        * WebCore.gypi:
     84        * WebCore.vcproj/WebCore.vcproj:
     85        * WebCore.vcxproj/WebCore.vcxproj:
     86        * WebCore.vcxproj/WebCore.vcxproj.filters:
     87        * WebCore.xcodeproj/project.pbxproj:
     88        * bindings/ScriptControllerBase.cpp:
     89        * bindings/js/JSNodeCustom.cpp:
     90        * bindings/js/ScriptController.cpp:
     91        * bindings/js/ScriptSourceCode.h:
     92        * bindings/objc/DOM.mm:
     93        * bindings/v8/ScriptController.cpp:
     94        * bindings/v8/V8DOMWindowShell.cpp:
     95        * bindings/v8/custom/V8DOMWindowCustom.cpp:
     96        * css/CSSFontFaceSource.h:
     97        * css/CSSFontSelector.cpp:
     98        * css/WebKitCSSSVGDocumentValue.cpp:
     99        * css/WebKitCSSSVGDocumentValue.h:
     100        * dom/Clipboard.cpp:
     101        * dom/ContainerNode.cpp:
     102        * dom/DOMImplementation.cpp:
     103        * dom/PendingScript.h:
     104        * dom/ScriptElement.cpp:
     105        * dom/ScriptElement.h:
     106        * history/CachedFrame.cpp:
     107        * html/DOMURL.cpp:
     108        * html/HTMLAnchorElement.cpp:
     109        * html/HTMLAppletElement.cpp:
     110        * html/HTMLElement.cpp:
     111        * html/HTMLEmbedElement.cpp:
     112        * html/HTMLFrameSetElement.cpp:
     113        * html/HTMLHtmlElement.cpp:
     114        * html/HTMLImageElement.cpp:
     115        * html/HTMLObjectElement.cpp:
     116        * html/HTMLPlugInElement.cpp:
     117        * html/ImageDocument.cpp:
     118        * html/ImageInputType.cpp:
     119        * html/MediaDocument.cpp:
     120        * html/PluginDocument.cpp:
     121        * html/canvas/WebGLRenderingContext.cpp:
     122        * html/parser/HTMLConstructionSite.cpp:
     123        * html/parser/HTMLParserOptions.cpp:
     124        * html/parser/HTMLScriptRunner.h:
     125        * html/parser/XSSAuditor.cpp:
     126        * html/parser/XSSAuditorDelegate.cpp:
     127        * inspector/InspectorDebuggerAgent.cpp:
     128        * inspector/InspectorFileSystemAgent.cpp:
     129        * inspector/InspectorFrontendHost.cpp:
     130        * inspector/InspectorInstrumentation.h:
     131        * inspector/InspectorPageAgent.cpp:
     132        * inspector/NetworkResourcesData.cpp:
     133        * inspector/NetworkResourcesData.h:
     134        * loader/CookieJar.cpp:
     135        * loader/CrossOriginAccessControl.cpp:
     136        * loader/CrossOriginPreflightResultCache.h:
     137        * loader/DocumentThreadableLoader.h:
     138        * loader/ImageLoader.cpp:
     139        * loader/ImageLoader.h:
     140        * loader/LinkLoader.h:
     141        * loader/MainResourceLoader.cpp:
     142        * loader/MainResourceLoader.h:
     143        * loader/MixedContentChecker.cpp:
     144        * loader/PingLoader.cpp:
     145        * loader/PolicyChecker.h:
     146        * loader/ProgressTracker.cpp:
     147        * loader/SubframeLoader.cpp:
     148        * loader/SubresourceLoader.cpp:
     149        * loader/TextTrackLoader.cpp:
     150        * loader/TextTrackLoader.h:
     151        * loader/ThreadableLoader.h:
     152        * loader/appcache/ApplicationCacheGroup.cpp:
     153        * loader/appcache/ApplicationCacheGroup.h:
     154        * loader/appcache/ApplicationCacheHost.cpp:
     155        * loader/archive/cf/LegacyWebArchive.cpp:
     156        * loader/cache/CachedFont.cpp:
     157        * loader/cache/CachedImage.cpp:
     158        * loader/cache/CachedRawResource.cpp:
     159        * loader/cache/CachedResource.cpp:
     160        * loader/cache/CachedStyleSheetClient.h:
     161        * loader/cache/MemoryCache.cpp:
     162        * loader/cache/MemoryCache.h:
     163        * loader/chromium/CachedRawResourceChromium.cpp:
     164        * loader/icon/IconController.cpp:
     165        * loader/icon/IconLoader.h:
     166        * loader/mac/ResourceLoaderMac.mm:
     167        * page/DOMWindowExtension.cpp:
     168        * page/DragController.cpp:
     169        * page/PerformanceNavigation.cpp:
     170        * page/PerformanceTiming.cpp:
     171        * page/PointerLockController.cpp:
     172        * page/Settings.cpp:
     173        * page/animation/CSSPropertyAnimation.cpp:
     174        * platform/chromium/PasteboardChromium.cpp:
     175        * platform/efl/ErrorsEfl.cpp:
     176        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
     177        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
     178        * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
     179        * platform/gtk/ErrorsGtk.cpp:
     180        * platform/gtk/PasteboardGtk.cpp:
     181        * platform/gtk/PasteboardHelper.h:
     182        * platform/mac/ClipboardMac.h:
     183        * platform/mac/ClipboardMac.mm:
     184        * platform/mac/HTMLConverter.mm:
     185        * platform/mac/PasteboardMac.mm:
     186        * platform/network/AuthenticationChallengeBase.cpp:
     187        * platform/network/cf/CookieJarCFNet.cpp:
     188        * platform/network/cf/ResourceRequestCFNet.cpp:
     189        * platform/network/mac/CookieStorageMac.mm:
     190        * platform/qt/PasteboardQt.cpp:
     191        * plugins/DOMMimeType.cpp:
     192        * plugins/PluginView.cpp:
     193        * rendering/HitTestResult.cpp:
     194        * rendering/InlineFlowBox.cpp:
     195        * rendering/RenderBox.cpp:
     196        * rendering/RenderEmbeddedObject.cpp:
     197        * rendering/RenderImage.cpp:
     198        * rendering/RenderImageResourceStyleImage.cpp:
     199        * rendering/RenderLayer.cpp:
     200        * rendering/RenderLayerBacking.cpp:
     201        * rendering/RenderLayerFilterInfo.h:
     202        * rendering/RenderListItem.cpp:
     203        * rendering/RenderListMarker.cpp:
     204        * rendering/RenderSnapshottedPlugIn.cpp:
     205        * rendering/RenderTableCol.cpp:
     206        * rendering/RenderTableRow.cpp:
     207        * rendering/RenderTableSection.cpp:
     208        * rendering/style/StyleCachedShader.h:
     209        * svg/SVGFEImageElement.h:
     210        * svg/SVGFontFaceUriElement.h:
     211        * svg/SVGImageLoader.cpp:
     212        * svg/SVGUseElement.cpp:
     213        * svg/SVGUseElement.h:
     214        * svg/graphics/SVGImageCache.cpp:
     215        * testing/MockPagePopupDriver.cpp:
     216        * xml/XSLStyleSheet.h:
     217        * xml/XSLTProcessorLibxslt.cpp:
     218        * xml/parser/XMLDocumentParser.cpp:
     219        * xml/parser/XMLDocumentParser.h:
     220        * xml/parser/XMLDocumentParserLibxml2.cpp:
     221        Many self-evident changes - removing unnecessary header includes, adding smaller
     222        more local ones that are now necessary.
     223
    12242013-03-01  David Hyatt  <hyatt@apple.com>
    2225

  • trunk/Source/WebCore/GNUmakefile.list.am

    r144446 r144530  
    39533953        Source/WebCore/loader/cache/CachedFont.cpp \
    39543954        Source/WebCore/loader/cache/CachedFont.h \
     3955        Source/WebCore/loader/cache/CachedFontClient.h \
    39553956        Source/WebCore/loader/cache/CachedImage.cpp \
    39563957        Source/WebCore/loader/cache/CachedImage.h \
    … …  
    39603961        Source/WebCore/loader/cache/CachedRawResource.cpp \
    39613962        Source/WebCore/loader/cache/CachedRawResource.h \
     3963        Source/WebCore/loader/cache/CachedRawResourceClient.h \
    39623964        Source/WebCore/loader/cache/CachedResource.cpp \
    39633965        Source/WebCore/loader/cache/CachedResource.h \
    … …  
    43224324        Source/WebCore/plugins/PluginPackage.h \
    43234325        Source/WebCore/plugins/PluginQuirkSet.h \
     4326        Source/WebCore/plugins/PluginRequest.h \
    43244327        Source/WebCore/plugins/PluginStrategy.h \
    43254328        Source/WebCore/plugins/PluginStream.cpp \
    43264329        Source/WebCore/plugins/PluginStream.h \
     4330        Source/WebCore/plugins/PluginStreamClient.h \
    43274331        Source/WebCore/plugins/PluginViewBase.h \
    43284332        Source/WebCore/plugins/PluginView.cpp \
    … …  
    46254629        Source/WebCore/rendering/style/StyleCachedShader.cpp \
    46264630        Source/WebCore/rendering/style/StyleCachedShader.h \
     4631        Source/WebCore/rendering/style/StyleCustomFilterProgram.cpp \
    46274632        Source/WebCore/rendering/style/StyleCustomFilterProgram.h \
    46284633        Source/WebCore/rendering/style/StyleDashboardRegion.h \
    … …  
    48094814        Source/WebCore/loader/cache/CachedSVGDocument.cpp \
    48104815        Source/WebCore/loader/cache/CachedSVGDocument.h \
     4816        Source/WebCore/loader/cache/CachedSVGDocumentClient.h \
     4817        Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp \
    48114818        Source/WebCore/loader/cache/CachedSVGDocumentReference.h \
    48124819        Source/WebCore/platform/graphics/SVGGlyph.cpp \

  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

    r144446 r144530  
    4040#include "ExceptionCode.h"
    4141#include "Frame.h"
     42#include "FrameLoader.h"
    4243#include "FrameLoaderClient.h"
    4344#include "MediaConstraintsImpl.h"

  • trunk/Source/WebCore/Modules/notifications/Notification.cpp

    r144446 r144530  
    4646#include "NotificationController.h"
    4747#include "NotificationPermissionCallback.h"
    48 #include "ResourceRequest.h"
    49 #include "ResourceResponse.h"
    50 #include "ThreadableLoader.h"
    5148#include "WindowFocusAllowedIndicator.h"
    52 #include "WorkerContext.h"
    5349
    5450namespace WebCore {

  • trunk/Source/WebCore/Target.pri

    r144464 r144530  
    852852    loader/cache/CachedShader.cpp \
    853853    loader/cache/CachedSVGDocument.cpp \
    854     loader/cache/CachedSVGDocument.h \
     854    loader/cache/CachedSVGDocumentReference.cpp \
    855855    loader/cache/CachedXSLStyleSheet.cpp \
    856856    loader/CookieJar.cpp \
    … …  
    12771277    rendering/style/StyleCachedImageSet.cpp \
    12781278    rendering/style/StyleCachedShader.cpp \
     1279    rendering/style/StyleCustomFilterProgram.cpp \
    12791280    rendering/style/StyleDeprecatedFlexibleBoxData.cpp \
    12801281    rendering/style/StyleFilterData.cpp \
    … …  
    20392040    loader/cache/CachedCSSStyleSheet.h \
    20402041    loader/cache/CachedFont.h \
     2042    loader/cache/CachedFontClient.h \
    20412043    loader/cache/CachedImage.h \
     2044    loader/cache/CachedRawResource.h \
     2045    loader/cache/CachedRawResourceClient.h \
    20422046    loader/cache/CachedResourceClientWalker.h \
    20432047    loader/cache/CachedResource.h \
    … …  
    20462050    loader/cache/CachedShader.h \
    20472051    loader/cache/CachedSVGDocument.h \
     2052    loader/cache/CachedSVGDocumentClient.h \
    20482053    loader/cache/CachedXSLStyleSheet.h \
    20492054    loader/cache/MemoryCache.h \
    … …  
    24352440    plugins/PluginMainThreadScheduler.h \
    24362441    plugins/PluginPackage.h \
     2442    plugins/PluginRequest.h \
    24372443    plugins/PluginStream.h \
     2444    plugins/PluginStreamClient.h \
    24382445    plugins/PluginView.h \
    24392446    plugins/win/PluginMessageThrottlerWin.h \

  • trunk/Source/WebCore/WebCore.exp.in

    r144499 r144530  
    842842__ZN7WebCore5Frame25setPageAndTextZoomFactorsEff
    843843__ZN7WebCore5Frame27resizePageRectsKeepingRatioERKNS_9FloatSizeES3_
     844__ZN7WebCore5Frame4initEv
    844845__ZN7WebCore5Frame6createEPNS_4PageEPNS_21HTMLFrameOwnerElementEPNS_17FrameLoaderClientE
    845846__ZN7WebCore5Frame7setViewEN3WTF10PassRefPtrINS_9FrameViewEEE

  • trunk/Source/WebCore/WebCore.gypi

    r144502 r144530  
    21272127            'loader/cache/CachedFont.cpp',
    21282128            'loader/cache/CachedFont.h',
     2129            'loader/cache/CachedFontClient.h',
    21292130            'loader/cache/CachedImage.cpp',
    21302131            'loader/cache/CachedRawResource.cpp',
     2132            'loader/cache/CachedRawResource.h',
     2133            'loader/cache/CachedRawResourceClient.h',
    21312134            'loader/cache/CachedResource.cpp',
    21322135            'loader/cache/CachedResourceClientWalker.h',
    … …  
    21412144            'loader/cache/CachedSVGDocument.cpp',
    21422145            'loader/cache/CachedSVGDocument.h',
     2146            'loader/cache/CachedSVGDocumentClient.h',
     2147            'loader/cache/CachedSVGDocumentReference.cpp',
    21432148            'loader/cache/CachedSVGDocumentReference.h',
    21442149            'loader/cache/CachedTextTrack.cpp',
    … …  
    23492354            'plugins/PluginPackageNone.cpp',
    23502355            'plugins/PluginQuirkSet.h',
     2356            'plugins/PluginRequest.h',
    23512357            'plugins/PluginStream.cpp',
    23522358            'plugins/PluginStream.h',
     2359            'plugins/PluginStreamClient.h',
    23532360            'plugins/PluginView.cpp',
    23542361            'plugins/PluginView.h',
    … …  
    26372644            'rendering/style/StyleCachedShader.cpp',
    26382645            'rendering/style/StyleCustomFilterProgram.h',
     2646            'rendering/style/StyleCustomFilterProgram.cpp',
    26392647            'rendering/style/StyleDeprecatedFlexibleBoxData.cpp',
    26402648            'rendering/style/StyleFilterData.cpp',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r144446 r144530  
    2848728487                                </File>
    2848828488                                <File
     28489                                        RelativePath="..\loader\cache\CachedFontClient.h"
     28490                                        >
     28491                                </File>
     28492                                <File
    2848928493                                        RelativePath="..\loader\cache\CachedImage.cpp"
    2849028494                                        >
    … …  
    2850328507                                </File>
    2850428508                                <File
     28509                                        RelativePath="..\loader\cache\CachedRawResourceClient.h"
     28510                                        >
     28511                                </File>
     28512                                <File
    2850528513                                        RelativePath="..\loader\cache\CachedResource.cpp"
    2850628514                                        >
    … …  
    2857628584                                <File
    2857728585                                        RelativePath="..\loader\cache\CachedSVGDocument.h"
     28586                                        >
     28587                                </File>
     28588                                <File
     28589                                        RelativePath="..\loader\cache\CachedSVGDocumentClient.h"
     28590                                        >
     28591                                </File>
     28592                                <File
     28593                                        RelativePath="..\loader\cache\CachedSVGDocumentReference.cpp"
    2857828594                                        >
    2857928595                                </File>
    … …  
    4669746713                                </File>
    4669846714                                <File
     46715                                        RelativePath="..\rendering\style\StyleCustomFilterProgram.cpp"
     46716                                        >
     46717                                </File>
     46718                                <File
    4669946719                                        RelativePath="..\rendering\style\StyleCustomFilterProgram.h"
    4670046720                                        >
    … …  
    7330873328                        </File>
    7330973329                        <File
     73330                                RelativePath="..\plugins\PluginRequest.h"
     73331                                >
     73332                        </File>
     73333                        <File
    7331073334                                RelativePath="..\plugins\PluginStrategy.h"
    7331173335                                >
    … …  
    7331773341                        <File
    7331873342                                RelativePath="..\plugins\PluginStream.h"
     73343                                >
     73344                        </File>
     73345                        <File
     73346                                RelativePath="..\plugins\PluginStreamClient.h"
    7331973347                                >
    7332073348                        </File>

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r144491 r144530  
    31023102    <ClCompile Include="..\loader\cache\CachedShader.cpp" />
    31033103    <ClCompile Include="..\loader\cache\CachedSVGDocument.cpp" />
     3104    <ClCompile Include="..\loader\cache\CachedSVGDocumentReference.cpp" />
    31043105    <ClCompile Include="..\loader\cache\CachedTextTrack.cpp" />
    31053106    <ClCompile Include="..\loader\cache\CachedXSLStyleSheet.cpp" />
    … …  
    49704971    </ClCompile>
    49714972    <ClCompile Include="..\rendering\style\StyleCachedShader.cpp" />
     4973    <ClCompile Include="..\rendering\style\StyleCustomFilterProgram.cpp" />
    49724974    <ClCompile Include="..\rendering\style\StyleDeprecatedFlexibleBoxData.cpp">
    49734975      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    … …  
    90529054    <ClInclude Include="..\loader\cache\CachedCSSStyleSheet.h" />
    90539055    <ClInclude Include="..\loader\cache\CachedFont.h" />
     9056    <ClInclude Include="..\loader\cache\CachedFontClient.h" />
    90549057    <ClInclude Include="..\loader\cache\CachedImage.h" />
    90559058    <ClInclude Include="..\loader\cache\CachedRawResource.h" />
     9059    <ClInclude Include="..\loader\cache\CachedRawResourceClient.h" />
    90569060    <ClInclude Include="..\loader\cache\CachedResource.h" />
    90579061    <ClInclude Include="..\loader\cache\CachedResourceClient.h" />
    … …  
    90659069    <ClInclude Include="..\loader\cache\CachedStyleSheetClient.h" />
    90669070    <ClInclude Include="..\loader\cache\CachedSVGDocument.h" />
     9071    <ClInclude Include="..\loader\cache\CachedSVGDocumentClient.h" />
    90679072    <ClInclude Include="..\loader\cache\CachedSVGDocumentReference.h" />
    90689073    <ClInclude Include="..\loader\cache\CachedTextTrack.h" />
    … …  
    1050510510    <ClInclude Include="..\plugins\PluginPackage.h" />
    1050610511    <ClInclude Include="..\plugins\PluginQuirkSet.h" />
     10512    <ClInclude Include="..\plugins\PluginRequest.h" />
    1050710513    <ClInclude Include="..\plugins\PluginStrategy.h" />
    1050810514    <ClInclude Include="..\plugins\PluginStream.h" />
     10515    <ClInclude Include="..\plugins\PluginStreamClient.h" />
    1050910516    <ClInclude Include="..\plugins\PluginView.h" />
    1051010517    <ClInclude Include="..\plugins\win\PluginMessageThrottlerWin.h" />

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r144491 r144530  
    24282428      <Filter>loader\cache</Filter>
    24292429    </ClCompile>
     2430    <ClCompile Include="..\loader\cache\CachedSVGDocumentReference.cpp">
     2431      <Filter>loader\cache</Filter>
     2432    </ClCompile>
    24302433    <ClCompile Include="..\loader\cache\CachedTextTrack.cpp">
    24312434      <Filter>loader\cache</Filter>
    … …  
    43044307    </ClCompile>
    43054308    <ClCompile Include="..\rendering\style\StyleCachedShader.cpp">
     4309      <Filter>rendering\style</Filter>
     4310    </ClCompile>
     4311    <ClCompile Include="..\rendering\style\StyleCustomFilterProgram.cpp">
    43064312      <Filter>rendering\style</Filter>
    43074313    </ClCompile>
    … …  
    91489154      <Filter>loader\cache</Filter>
    91499155    </ClInclude>
     9156    <ClInclude Include="..\loader\cache\CachedFontClient.h">
     9157      <Filter>loader\cache</Filter>
     9158    </ClInclude>
    91509159    <ClInclude Include="..\loader\cache\CachedImage.h">
    91519160      <Filter>loader\cache</Filter>
    … …  
    91549163      <Filter>loader\cache</Filter>
    91559164    </ClInclude>
     9165    <ClInclude Include="..\loader\cache\CachedRawResourceClient.h">
     9166      <Filter>loader\cache</Filter>
     9167    </ClInclude>
    91569168    <ClInclude Include="..\loader\cache\CachedResource.h">
    91579169      <Filter>loader\cache</Filter>
    … …  
    91879199      <Filter>loader\cache</Filter>
    91889200    </ClInclude>
     9201    <ClInclude Include="..\loader\cache\CachedSVGDocumentClient.h">
     9202      <Filter>loader\cache</Filter>
     9203    </ClInclude>
    91899204    <ClInclude Include="..\loader\cache\CachedSVGDocumentReference.h">
    91909205      <Filter>loader\cache</Filter>
    … …  
    1295212967      <Filter>plugins</Filter>
    1295312968    </ClInclude>
     12969    <ClInclude Include="..\plugins\PluginRequest.h">
     12970      <Filter>plugins</Filter>
     12971    </ClInclude>
    1295412972    <ClInclude Include="..\plugins\PluginStrategy.h">
    1295512973      <Filter>plugins</Filter>
    1295612974    </ClInclude>
    1295712975    <ClInclude Include="..\plugins\PluginStream.h">
     12976      <Filter>plugins</Filter>
     12977    </ClInclude>
     12978    <ClInclude Include="..\plugins\PluginStreamClient.h">
    1295812979      <Filter>plugins</Filter>
    1295912980    </ClInclude>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r144499 r144530  
    62846284                E1F1E82F0C3C2BB9006DB391 /* XSLTExtensions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1F1E82D0C3C2BB9006DB391 /* XSLTExtensions.cpp */; };
    62856285                E1F1E8300C3C2BB9006DB391 /* XSLTExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = E1F1E82E0C3C2BB9006DB391 /* XSLTExtensions.h */; };
     6286                E1FC456E16DCB9010010F7B2 /* CachedSVGDocumentClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC456D16DCB9000010F7B2 /* CachedSVGDocumentClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
     6287                E1FC457016DCB9770010F7B2 /* CachedSVGDocumentReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FC456F16DCB9770010F7B2 /* CachedSVGDocumentReference.cpp */; };
     6288                E1FC457216DDF7250010F7B2 /* CachedRawResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457116DDF7220010F7B2 /* CachedRawResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
     6289                E1FC457416DDF7E60010F7B2 /* CachedFontClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457316DDF7E30010F7B2 /* CachedFontClient.h */; };
     6290                E1FC457616DE00100010F7B2 /* StyleCustomFilterProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FC457516DE000F0010F7B2 /* StyleCustomFilterProgram.cpp */; };
     6291                E1FC457816DF0A750010F7B2 /* PluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457716DF0A750010F7B2 /* PluginView.h */; };
     6292                E1FC457A16DF0ADA0010F7B2 /* PluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457916DF0AD90010F7B2 /* PluginStream.h */; };
     6293                E1FC457C16DF0AF10010F7B2 /* PluginStreamClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457B16DF0AF10010F7B2 /* PluginStreamClient.h */; };
     6294                E1FC457E16DF0B880010F7B2 /* PluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FC457D16DF0B880010F7B2 /* PluginRequest.h */; };
    62866295                E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */; settings = {ATTRIBUTES = (Private, ); }; };
    62876296                E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */; };
    … …  
    1397213981                E1F1E82D0C3C2BB9006DB391 /* XSLTExtensions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XSLTExtensions.cpp; sourceTree = "<group>"; };
    1397313982                E1F1E82E0C3C2BB9006DB391 /* XSLTExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XSLTExtensions.h; sourceTree = "<group>"; };
     13983                E1FC456D16DCB9000010F7B2 /* CachedSVGDocumentClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedSVGDocumentClient.h; sourceTree = "<group>"; };
     13984                E1FC456F16DCB9770010F7B2 /* CachedSVGDocumentReference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachedSVGDocumentReference.cpp; sourceTree = "<group>"; };
     13985                E1FC457116DDF7220010F7B2 /* CachedRawResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedRawResourceClient.h; sourceTree = "<group>"; };
     13986                E1FC457316DDF7E30010F7B2 /* CachedFontClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFontClient.h; sourceTree = "<group>"; };
     13987                E1FC457516DE000F0010F7B2 /* StyleCustomFilterProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleCustomFilterProgram.cpp; path = style/StyleCustomFilterProgram.cpp; sourceTree = "<group>"; };
     13988                E1FC457716DF0A750010F7B2 /* PluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginView.h; sourceTree = "<group>"; };
     13989                E1FC457916DF0AD90010F7B2 /* PluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginStream.h; sourceTree = "<group>"; };
     13990                E1FC457B16DF0AF10010F7B2 /* PluginStreamClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginStreamClient.h; sourceTree = "<group>"; };
     13991                E1FC457D16DF0B880010F7B2 /* PluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginRequest.h; sourceTree = "<group>"; };
    1397413992                E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGlobalData.h; sourceTree = "<group>"; };
    1397513993                E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadGlobalData.cpp; sourceTree = "<group>"; };
    … …  
    1609216110                                31D591B9166C2E6C00E6BF02 /* PlugInOriginHash.cpp */,
    1609316111                                31D591BA166C2E6C00E6BF02 /* PlugInOriginHash.h */,
     16112                                E1FC457D16DF0B880010F7B2 /* PluginRequest.h */,
    1609416113                                1AA8798F11CBE846003C664F /* PluginStrategy.h */,
     16114                                E1FC457916DF0AD90010F7B2 /* PluginStream.h */,
     16115                                E1FC457B16DF0AF10010F7B2 /* PluginStreamClient.h */,
     16116                                E1FC457716DF0A750010F7B2 /* PluginView.h */,
    1609516117                                0AFDAC3C10F5448C00E1F3D2 /* PluginViewBase.h */,
    1609616118                                76FF17E211235673001D61B5 /* PluginViewNone.cpp */,
    … …  
    1986019882                                BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */,
    1986119883                                BC64B4CA0CB4295D005F2B62 /* CachedFont.h */,
     19884                                E1FC457316DDF7E30010F7B2 /* CachedFontClient.h */,
    1986219885                                BCB16C020979C3BD00467741 /* CachedImage.cpp */,
    1986319886                                BCB16C030979C3BD00467741 /* CachedImage.h */,
    … …  
    1986519888                                D0EDA772143E303C0028E383 /* CachedRawResource.cpp */,
    1986619889                                D0EDA773143E303C0028E383 /* CachedRawResource.h */,
     19890                                E1FC457116DDF7220010F7B2 /* CachedRawResourceClient.h */,
    1986719891                                BCB16C060979C3BD00467741 /* CachedResource.cpp */,
    1986819892                                BCB16C070979C3BD00467741 /* CachedResource.h */,
    … …  
    1988419908                                A104F24114C71F7A009E2C23 /* CachedSVGDocument.cpp */,
    1988519909                                A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */,
     19910                                E1FC456D16DCB9000010F7B2 /* CachedSVGDocumentClient.h */,
     19911                                E1FC456F16DCB9770010F7B2 /* CachedSVGDocumentReference.cpp */,
    1988619912                                FB2C15C2165D64900039C9F8 /* CachedSVGDocumentReference.h */,
    1988719913                                0753860014489E9800B78452 /* CachedTextTrack.cpp */,
    … …  
    2128721313                                5038BE2E1472AD230095E0D1 /* StyleCachedShader.h */,
    2128821314                                503D0CAD14B5B0BA00F32F57 /* StyleCustomFilterProgram.h */,
     21315                                E1FC457516DE000F0010F7B2 /* StyleCustomFilterProgram.cpp */,
    2128921316                                BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */,
    2129021317                                BC5EB8B60E8201BD00B25965 /* StyleDeprecatedFlexibleBoxData.cpp */,
    … …  
    2663526662                                FD537353137B651800008DCE /* ZeroPole.h in Headers */,
    2663626663                                41B8CD4616D04591000E8CC0 /* SelectorCheckerFastPath.h in Headers */,
     26664                                E1FC456E16DCB9010010F7B2 /* CachedSVGDocumentClient.h in Headers */,
     26665                                E1FC457216DDF7250010F7B2 /* CachedRawResourceClient.h in Headers */,
     26666                                E1FC457416DDF7E60010F7B2 /* CachedFontClient.h in Headers */,
     26667                                E1FC457816DF0A750010F7B2 /* PluginView.h in Headers */,
     26668                                E1FC457A16DF0ADA0010F7B2 /* PluginStream.h in Headers */,
     26669                                E1FC457C16DF0AF10010F7B2 /* PluginStreamClient.h in Headers */,
     26670                                E1FC457E16DF0B880010F7B2 /* PluginRequest.h in Headers */,
    2663726671                                49140257168E02EC002D6C6A /* TimelineTraceEventProcessor.h in Headers */,
    2663826672                                A024575216CEAA27000E5671 /* EXTDrawBuffers.h in Headers */,
    … …  
    2983029864                                FD537352137B651800008DCE /* ZeroPole.cpp in Sources */,
    2983129865                                41B8CD4516D04591000E8CC0 /* SelectorCheckerFastPath.cpp in Sources */,
     29866                                E1FC457016DCB9770010F7B2 /* CachedSVGDocumentReference.cpp in Sources */,
     29867                                E1FC457616DE00100010F7B2 /* StyleCustomFilterProgram.cpp in Sources */,
    2983229868                                49140256168E02E8002D6C6A /* TimelineTraceEventProcessor.cpp in Sources */,
    2983329869                                E14A94D716DFDF950068DE82 /* BlobRegistry.cpp in Sources */,

  • trunk/Source/WebCore/bindings/ScriptControllerBase.cpp

    r144446 r144530  
    2626#include "DocumentLoader.h"
    2727#include "Frame.h"
     28#include "FrameLoader.h"
    2829#include "FrameLoaderClient.h"
    2930#include "Page.h"

  • trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp

    r144446 r144530  
    2828
    2929#include "Attr.h"
    30 #include "CachedImage.h"
    31 #include "CachedScript.h"
    3230#include "CDATASection.h"
    3331#include "Comment.h"

  • trunk/Source/WebCore/bindings/js/ScriptController.cpp

    r144446 r144530  
    2626#include "EventNames.h"
    2727#include "Frame.h"
    28 #include "FrameLoaderClient.h"
     28#include "FrameLoader.h"
    2929#include "GCController.h"
    3030#include "HTMLPlugInElement.h"

  • trunk/Source/WebCore/bindings/js/ScriptSourceCode.h

    r144446 r144530  
    3333
    3434#include "CachedResourceHandle.h"
    35 #include "CachedScript.h"
    3635#include "CachedScriptSourceProvider.h"
    3736#include "KURL.h"
    … …  
    4140
    4241namespace WebCore {
     42
     43class CachedScript;
    4344
    4445class ScriptSourceCode {

  • trunk/Source/WebCore/bindings/objc/DOM.mm

    r144446 r144530  
    3030#import "DOM.h"
    3131
     32#import "CachedImage.h"
    3233#import "DOMElementInternal.h"
    3334#import "DOMHTMLCanvasElement.h"

  • trunk/Source/WebCore/bindings/v8/ScriptController.cpp

    r144446 r144530  
    4141#include "EventNames.h"
    4242#include "Frame.h"
     43#include "FrameLoader.h"
    4344#include "FrameLoaderClient.h"
    4445#include "HistogramSupport.h"

  • trunk/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp

    r144446 r144530  
    3636#include "DocumentLoader.h"
    3737#include "Frame.h"
     38#include "FrameLoader.h"
    3839#include "FrameLoaderClient.h"
    3940#include "InspectorInstrumentation.h"

  • trunk/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

    r144446 r144530  
    4040#include "Frame.h"
    4141#include "FrameLoadRequest.h"
     42#include "FrameLoader.h"
    4243#include "FrameView.h"
    4344#include "HTMLCollection.h"

  • trunk/Source/WebCore/css/CSSCrossfadeValue.h

    r144446 r144530  
    2727#define CSSCrossfadeValue_h
    2828
    29 #include "CachedImage.h"
    3029#include "CachedImageClient.h"
    3130#include "CachedResourceHandle.h"
    … …  
    7675        , m_fromValue(fromValue)
    7776        , m_toValue(toValue)
    78         , m_cachedFromImage(0)
    79         , m_cachedToImage(0)
    80         , m_crossfadeSubimageObserver(this) { }
     77        , m_crossfadeSubimageObserver(this)
     78    {
     79    }
    8180
    8281    class CrossfadeSubimageObserverProxy : public CachedImageClient {
    8382    public:
    8483        CrossfadeSubimageObserverProxy(CSSCrossfadeValue* ownerValue)
    85         : m_ownerValue(ownerValue)
    86         , m_ready(false) { }
     84            : m_ownerValue(ownerValue)
     85            , m_ready(false)
     86        {
     87        }
    8788
    8889        virtual ~CrossfadeSubimageObserverProxy() { }

  • trunk/Source/WebCore/css/CSSFontFaceSource.h

    r144446 r144530  
    2727#define CSSFontFaceSource_h
    2828
    29 #include "CachedFont.h"
     29#include "CachedFontClient.h"
    3030#include "CachedResourceHandle.h"
    3131#include "Timer.h"

  • trunk/Source/WebCore/css/CSSFontSelector.cpp

    r144446 r144530  
    4242#include "FontCache.h"
    4343#include "Frame.h"
     44#include "FrameLoader.h"
    4445#include "RenderObject.h"
    4546#include "Settings.h"

  • trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp

    r144446 r144530  
    3232#include "CachedResourceRequest.h"
    3333#include "CachedResourceRequestInitiators.h"
     34#include "CachedSVGDocument.h"
    3435#include "Document.h"
    3536#include "WebCoreMemoryInstrumentation.h"

  • trunk/Source/WebCore/css/WebKitCSSSVGDocumentValue.h

    r144446 r144530  
    2828#include "CSSValue.h"
    2929#include "CachedResourceHandle.h"
    30 #include "CachedSVGDocument.h"
    3130
    3231namespace WebCore {
    3332
    3433class CachedResourceLoader;
     34class CachedSVGDocument;
    3535
    3636class WebKitCSSSVGDocumentValue : public CSSValue {

  • trunk/Source/WebCore/dom/Clipboard.cpp

    r144446 r144530  
    2727#include "Clipboard.h"
    2828
    29 #include "CachedImage.h"
    3029#include "FileList.h"
    3130#include "Frame.h"
    … …  
    4140    , m_dragStarted(false)
    4241    , m_clipboardType(clipboardType)
    43     , m_dragImage(0)
    4442{
    4543}

  • trunk/Source/WebCore/dom/ContainerNode.cpp

    r144446 r144530  
    4040#include "InspectorInstrumentation.h"
    4141#include "LoaderStrategy.h"
    42 #include "MemoryCache.h"
    4342#include "MutationEvent.h"
    4443#include "NodeRenderStyle.h"

  • trunk/Source/WebCore/dom/DOMImplementation.cpp

    r144446 r144530  
    3333#include "ExceptionCode.h"
    3434#include "Frame.h"
     35#include "FrameLoader.h"
    3536#include "FrameLoaderClient.h"
    3637#include "FTPDirectoryDocument.h"

  • trunk/Source/WebCore/dom/PendingScript.h

    r144446 r144530  
    3131#include <wtf/text/TextPosition.h>
    3232#include <wtf/PassRefPtr.h>
     33#include <wtf/RefPtr.h>
    3334
    3435namespace WebCore {

  • trunk/Source/WebCore/dom/ScriptElement.cpp

    r144446 r144530  
    3232#include "Document.h"
    3333#include "DocumentParser.h"
     34#include "Event.h"
    3435#include "Frame.h"
    3536#include "FrameLoader.h"

  • trunk/Source/WebCore/dom/ScriptElement.h

    r144446 r144530  
    2525#include "CachedResourceHandle.h"
    2626#include <wtf/text/TextPosition.h>
     27#include <wtf/text/WTFString.h>
    2728
    2829namespace WebCore {

  • trunk/Source/WebCore/history/CachedFrame.cpp

    r144446 r144530  
    3535#include "FocusController.h"
    3636#include "Frame.h"
     37#include "FrameLoader.h"
    3738#include "FrameLoaderClient.h"
    3839#include "FrameView.h"

  • trunk/Source/WebCore/html/DOMURL.cpp

    r144446 r144530  
    3737#include "MemoryCache.h"
    3838#include "PublicURLManager.h"
     39#include "ResourceRequest.h"
    3940#include "ScriptExecutionContext.h"
    4041#include "SecurityOrigin.h"

  • trunk/Source/WebCore/html/HTMLAnchorElement.cpp

    r144446 r144530  
    2929#include "EventNames.h"
    3030#include "Frame.h"
     31#include "FrameLoader.h"
    3132#include "FrameLoaderClient.h"
    3233#include "FrameLoaderTypes.h"
    … …  
    3839#include "PingLoader.h"
    3940#include "RenderImage.h"
     41#include "ResourceRequest.h"
    4042#include "SecurityOrigin.h"
    4143#include "SecurityPolicy.h"

  • trunk/Source/WebCore/html/HTMLAppletElement.cpp

    r144446 r144530  
    2727#include "Attribute.h"
    2828#include "Frame.h"
     29#include "FrameLoader.h"
    2930#include "HTMLDocument.h"
    3031#include "HTMLNames.h"

  • trunk/Source/WebCore/html/HTMLElement.cpp

    r144446 r144530  
    3838#include "ExceptionCode.h"
    3939#include "Frame.h"
     40#include "FrameLoader.h"
    4041#include "HTMLBRElement.h"
    4142#include "HTMLCollection.h"

  • trunk/Source/WebCore/html/HTMLEmbedElement.cpp

    r144446 r144530  
    2929#include "DocumentLoader.h"
    3030#include "Frame.h"
     31#include "FrameLoader.h"
    3132#include "HTMLDocument.h"
    3233#include "HTMLImageLoader.h"

  • trunk/Source/WebCore/html/HTMLFrameSetElement.cpp

    r144446 r144530  
    3131#include "EventNames.h"
    3232#include "Frame.h"
     33#include "FrameLoader.h"
    3334#include "FrameLoaderClient.h"
    3435#include "HTMLNames.h"

  • trunk/Source/WebCore/html/HTMLHtmlElement.cpp

    r144446 r144530  
    3030#include "DocumentParser.h"
    3131#include "Frame.h"
     32#include "FrameLoader.h"
    3233#include "HTMLNames.h"
    3334

  • trunk/Source/WebCore/html/HTMLImageElement.cpp

    r144446 r144530  
    2727#include "CSSPropertyNames.h"
    2828#include "CSSValueKeywords.h"
     29#include "CachedImage.h"
    2930#include "EventNames.h"
    3031#include "FrameView.h"

  • trunk/Source/WebCore/html/HTMLObjectElement.cpp

    r144446 r144530  
    2727#include "Attribute.h"
    2828#include "CSSValueKeywords.h"
     29#include "CachedImage.h"
    2930#include "Chrome.h"
    3031#include "ChromeClient.h"

  • trunk/Source/WebCore/html/HTMLPlugInElement.cpp

    r144446 r144530  
    2929#include "CSSPropertyNames.h"
    3030#include "Document.h"
     31#include "Event.h"
    3132#include "Frame.h"
    3233#include "FrameLoader.h"

  • trunk/Source/WebCore/html/ImageDocument.cpp

    r144446 r144530  
    3232#include "ExceptionCodePlaceholder.h"
    3333#include "Frame.h"
     34#include "FrameLoader.h"
    3435#include "FrameLoaderClient.h"
    3536#include "FrameView.h"

  • trunk/Source/WebCore/html/ImageInputType.cpp

    r144446 r144530  
    2424#include "ImageInputType.h"
    2525
     26#include "CachedImage.h"
    2627#include "FormDataList.h"
    2728#include "HTMLFormElement.h"

  • trunk/Source/WebCore/html/MediaDocument.cpp

    r144446 r144530  
    3333#include "ExceptionCodePlaceholder.h"
    3434#include "Frame.h"
     35#include "FrameLoader.h"
    3536#include "FrameLoaderClient.h"
    3637#include "HTMLEmbedElement.h"

  • trunk/Source/WebCore/html/PluginDocument.cpp

    r144446 r144530  
    2929#include "ExceptionCodePlaceholder.h"
    3030#include "Frame.h"
     31#include "FrameLoader.h"
    3132#include "FrameLoaderClient.h"
    3233#include "FrameView.h"

  • trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

    r144446 r144530  
    3838#include "Extensions3D.h"
    3939#include "Frame.h"
     40#include "FrameLoader.h"
    4041#include "FrameLoaderClient.h"
    4142#include "FrameView.h"

  • trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp

    r144446 r144530  
    3434#include "Element.h"
    3535#include "Frame.h"
     36#include "FrameLoader.h"
    3637#include "FrameLoaderClient.h"
    3738#include "HTMLDocument.h"

  • trunk/Source/WebCore/html/parser/HTMLParserOptions.cpp

    r144446 r144530  
    2929#include "Document.h"
    3030#include "Frame.h"
     31#include "FrameLoader.h"
    3132#include "Settings.h"
    3233

  • trunk/Source/WebCore/html/parser/HTMLScriptRunner.h

    r144446 r144530  
    2929#include "PendingScript.h"
    3030#include <wtf/Deque.h>
     31#include <wtf/PassOwnPtr.h>
     32#include <wtf/PassRefPtr.h>
    3133#include <wtf/text/TextPosition.h>
    32 #include <wtf/PassRefPtr.h>
    3334
    3435namespace WebCore {

  • trunk/Source/WebCore/html/parser/XSSAuditor.cpp

    r144446 r144530  
    3737#include "FormDataList.h"
    3838#include "Frame.h"
    39 #include "FrameLoaderClient.h"
     39#include "FrameLoader.h"
    4040#include "HTMLDocumentParser.h"
    4141#include "HTMLNames.h"

  • trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp

    r144446 r144530  
    3232#include "FormData.h"
    3333#include "Frame.h"
     34#include "FrameLoader.h"
    3435#include "FrameLoaderClient.h"
    3536#include "HTMLParserIdioms.h"

  • trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

    r144446 r144530  
    3333#include "InspectorDebuggerAgent.h"
    3434
     35#include "CachedResource.h"
    3536#include "ContentSearchUtils.h"
    3637#include "InjectedScript.h"

  • trunk/Source/WebCore/inspector/InspectorFileSystemAgent.cpp

    r144446 r144530  
    4444#include "EntryCallback.h"
    4545#include "ErrorCallback.h"
     46#include "Event.h"
    4647#include "File.h"
    4748#include "FileCallback.h"

  • trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp

    r144446 r144530  
    4949#include "Page.h"
    5050#include "Pasteboard.h"
     51#include "ResourceError.h"
     52#include "ResourceRequest.h"
     53#include "ResourceResponse.h"
    5154#include "ScriptFunctionCall.h"
    5255#include "UserGestureIndicator.h"

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.h

    r144446 r144530  
    3737#include "Element.h"
    3838#include "EventContext.h"
     39#include "FormData.h"
    3940#include "Frame.h"
    4041#include "HitTestResult.h"
    … …  
    5657class DOMWrapperWorld;
    5758class Database;
     59class DeviceOrientationData;
    5860class Document;
     61class DocumentLoader;
    5962class Element;
    6063class EventContext;
    61 class DocumentLoader;
    62 class DeviceOrientationData;
    6364class GeolocationPosition;
    6465class GraphicsContext;
     66class HTTPHeaderMap;
    6567class InspectorCSSAgent;
    6668class InspectorInstrumentation;
    6769class InspectorTimelineAgent;
    6870class InstrumentingAgents;
    69 class KURL;
    7071class Node;
    7172class RenderLayer;

  • trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

    r144446 r144530  
    5050#include "DocumentLoader.h"
    5151#include "Frame.h"
     52#include "FrameLoader.h"
    5253#include "FrameView.h"
    5354#include "GeolocationController.h"

  • trunk/Source/WebCore/inspector/NetworkResourcesData.cpp

    r144446 r144530  
    3333#include "NetworkResourcesData.h"
    3434
     35#include "CachedResource.h"
    3536#include "DOMImplementation.h"
     37#include "ResourceResponse.h"
    3638#include "SharedBuffer.h"
    3739#include "TextResourceDecoder.h"

  • trunk/Source/WebCore/inspector/NetworkResourcesData.h

    r144446 r144530  
    3030#define NetworkResourcesData_h
    3131
     32#include "HTTPHeaderMap.h"
    3233#include "InspectorPageAgent.h"
    3334#include "TextResourceDecoder.h"
    34 
    3535#include <wtf/Deque.h>
    3636#include <wtf/HashMap.h>
    … …  
    4444
    4545class CachedResource;
     46class FormData;
    4647class SharedBuffer;
    4748class TextResourceDecoder;

  • trunk/Source/WebCore/loader/CookieJar.cpp

    r144446 r144530  
    2929#include "Document.h"
    3030#include "Frame.h"
     31#include "FrameLoader.h"
    3132#include "NetworkingContext.h"
    3233#include "PlatformCookieJar.h"

  • trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp

    r144446 r144530  
    2929
    3030#include "HTTPParsers.h"
     31#include "ResourceRequest.h"
    3132#include "ResourceResponse.h"
    3233#include "SecurityOrigin.h"

  • trunk/Source/WebCore/loader/CrossOriginAccessControl.h

    r144446 r144530  
    2828#define CrossOriginAccessControl_h
    2929
    30 #include "ResourceHandle.h"
    31 #include "ResourceRequest.h"
     30#include "ResourceHandleTypes.h"
    3231#include <wtf/Forward.h>
    3332#include <wtf/HashSet.h>
     33#include <wtf/text/StringHash.h>
    3434
    3535namespace WebCore {
    … …  
    3838
    3939class HTTPHeaderMap;
     40class ResourceRequest;
    4041class ResourceResponse;
    4142class SecurityOrigin;

  • trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h

    r144446 r144530  
    2929
    3030#include "KURLHash.h"
    31 #include "ResourceHandle.h"
     31#include "ResourceHandleTypes.h"
    3232#include <wtf/HashMap.h>
    3333#include <wtf/HashSet.h>

  • trunk/Source/WebCore/loader/DocumentThreadableLoader.h

    r144446 r144530  
    3232#define DocumentThreadableLoader_h
    3333
    34 #include "CachedRawResource.h"
     34#include "CachedRawResourceClient.h"
    3535#include "CachedResourceHandle.h"
    3636#include "FrameLoaderTypes.h"
    … …  
    4444
    4545namespace WebCore {
     46    class CachedRawResource;
    4647    class Document;
    4748    class KURL;

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r144446 r144530  
    8888#include "PluginDatabase.h"
    8989#include "PluginDocument.h"
     90#include "PolicyChecker.h"
    9091#include "ProgressTracker.h"
    9192#include "ResourceHandle.h"
    … …  
    211212    : m_frame(frame)
    212213    , m_client(client)
    213     , m_policyChecker(frame)
     214    , m_policyChecker(adoptPtr(new PolicyChecker(frame)))
    214215    , m_history(frame)
    215216    , m_notifer(frame)

  • trunk/Source/WebCore/loader/FrameLoader.h

    r144446 r144530  
    4141#include "LayoutMilestones.h"
    4242#include "MixedContentChecker.h"
    43 #include "PolicyChecker.h"
    44 #include "ResourceHandle.h"
     43#include "ResourceHandleTypes.h"
    4544#include "ResourceLoadNotifier.h"
    4645#include "SecurityContext.h"
    … …  
    6665class NavigationAction;
    6766class NetworkingContext;
     67class PolicyChecker;
    6868class Page;
    6969class ResourceError;
    … …  
    9090    Frame* frame() const { return m_frame; }
    9191
    92     PolicyChecker* policyChecker() const { return &m_policyChecker; }
     92    PolicyChecker* policyChecker() const { return m_policyChecker.get(); }
    9393    HistoryController* history() const { return &m_history; }
    9494    ResourceLoadNotifier* notifier() const { return &m_notifer; }
    … …  
    381381    // header dependencies unless performance testing proves otherwise.
    382382    // Some of these could be lazily created for memory savings on devices.
    383     mutable PolicyChecker m_policyChecker;
     383    mutable OwnPtr<PolicyChecker> m_policyChecker;
    384384    mutable HistoryController m_history;
    385385    mutable ResourceLoadNotifier m_notifer;

  • trunk/Source/WebCore/loader/ImageLoader.cpp

    r144446 r144530  
    3232#include "EventSender.h"
    3333#include "Frame.h"
     34#include "FrameLoader.h"
    3435#include "HTMLNames.h"
    3536#include "HTMLObjectElement.h"

  • trunk/Source/WebCore/loader/ImageLoader.h

    r144446 r144530  
    2424#define ImageLoader_h
    2525
    26 #include "CachedImage.h"
    2726#include "CachedImageClient.h"
    2827#include "CachedResourceHandle.h"

  • trunk/Source/WebCore/loader/LinkLoader.h

    r144446 r144530  
    4343namespace WebCore {
    4444
     45class Document;
     46class KURL;
    4547struct LinkRelAttribute;
    4648#if ENABLE(LINK_PRERENDER)

  • trunk/Source/WebCore/loader/MainResourceLoader.cpp

    r144446 r144530  
    3333#include "ApplicationCacheHost.h"
    3434#include "BackForwardController.h"
     35#include "CachedRawResource.h"
    3536#include "CachedResourceLoader.h"
    3637#include "CachedResourceRequest.h"
    … …  
    5051#include "MemoryCache.h"
    5152#include "Page.h"
     53#include "PolicyChecker.h"
    5254#include "ProgressTracker.h"
    5355#include "ResourceBuffer.h"
    5456#include "ResourceError.h"
    55 #include "ResourceHandle.h"
    5657#include "SchemeRegistry.h"
    5758#include "SecurityOrigin.h"

  • trunk/Source/WebCore/loader/MainResourceLoader.h

    r144446 r144530  
    3030#define MainResourceLoader_h
    3131
    32 #include "CachedRawResource.h"
     32#include "CachedRawResourceClient.h"
    3333#include "CachedResourceHandle.h"
    3434#include "FrameLoaderTypes.h"
    … …  
    4545namespace WebCore {
    4646
     47class CachedRawResource;
    4748class FormState;
    4849class ResourceRequest;

  • trunk/Source/WebCore/loader/MixedContentChecker.cpp

    r144446 r144530  
    3434#include "Document.h"
    3535#include "Frame.h"
     36#include "FrameLoader.h"
    3637#include "FrameLoaderClient.h"
    3738#include "SchemeRegistry.h"

  • trunk/Source/WebCore/loader/PingLoader.cpp

    r144446 r144530  
    3636#include "FormData.h"
    3737#include "Frame.h"
     38#include "FrameLoader.h"
    3839#include "FrameLoaderClient.h"
    3940#include "InspectorInstrumentation.h"
    … …  
    4142#include "ProgressTracker.h"
    4243#include "ResourceHandle.h"
     44#include "ResourceRequest.h"
     45#include "ResourceResponse.h"
    4346#include "SecurityOrigin.h"
    4447#include "SecurityPolicy.h"

  • trunk/Source/WebCore/loader/PolicyChecker.h

    r144446 r144530  
    3333#include "FrameLoaderTypes.h"
    3434#include "PolicyCallback.h"
    35 #include "ResourceRequest.h"
    3635#include <wtf/PassRefPtr.h>
    3736#include <wtf/text/WTFString.h>
    … …  
    4443class NavigationAction;
    4544class ResourceError;
     45class ResourceRequest;
    4646class ResourceResponse;
    4747

  • trunk/Source/WebCore/loader/ProgressTracker.cpp

    r144446 r144530  
    3030#include "Frame.h"
    3131#include "FrameLoader.h"
     32#include "FrameLoaderClient.h"
    3233#include "FrameLoaderStateMachine.h"
    33 #include "FrameLoaderClient.h"
    3434#include "InspectorInstrumentation.h"
    3535#include "Logging.h"

  • trunk/Source/WebCore/loader/SubframeLoader.cpp

    r144446 r144530  
    3939#include "DiagnosticLoggingKeys.h"
    4040#include "Frame.h"
     41#include "FrameLoader.h"
    4142#include "FrameLoaderClient.h"
    4243#include "HTMLAppletElement.h"

  • trunk/Source/WebCore/loader/SubresourceLoader.cpp

    r144446 r144530  
    3434#include "DocumentLoader.h"
    3535#include "Frame.h"
     36#include "FrameLoader.h"
    3637#include "Logging.h"
    3738#include "MemoryCache.h"

  • trunk/Source/WebCore/loader/TextTrackLoader.cpp

    r144446 r144530  
    3737#include "Logging.h"
    3838#include "ResourceBuffer.h"
    39 #include "ResourceHandle.h"
    4039#include "ScriptCallStack.h"
    4140#include "SecurityOrigin.h"

  • trunk/Source/WebCore/loader/TextTrackLoader.h

    r144446 r144530  
    3131#include "CachedResourceClient.h"
    3232#include "CachedResourceHandle.h"
    33 #include "CachedTextTrack.h"
    3433#include "Timer.h"
    3534#include "WebVTTParser.h"
    … …  
    3837namespace WebCore {
    3938
     39class CachedTextTrack;
    4040class Document;
    4141class TextTrackLoader;

  • trunk/Source/WebCore/loader/ThreadableLoader.h

    r144446 r144530  
    3232#define ThreadableLoader_h
    3333
    34 #include "ResourceHandle.h"
    3534#include "ResourceLoaderOptions.h"
    3635#include "SecurityOrigin.h"

  • trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

    r144446 r144530  
    4545#include "Page.h"
    4646#include "ResourceBuffer.h"
     47#include "ResourceHandle.h"
    4748#include "ScriptProfile.h"
    4849#include "SecurityOrigin.h"

  • trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h

    r144446 r144530  
    2929#include "DOMApplicationCache.h"
    3030#include "KURL.h"
    31 #include "ResourceHandle.h"
    3231#include "ResourceHandleClient.h"
    3332#include "SharedBuffer.h"
    … …  
    4443class DocumentLoader;
    4544class Frame;
     45class ResourceHandle;
    4646class SecurityOrigin;
    4747

  • trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.cpp

    r144446 r144530  
    3838#include "MainResourceLoader.h"
    3939#include "ProgressEvent.h"
     40#include "ResourceHandle.h"
    4041#include "ResourceLoader.h"
    4142#include "ResourceRequest.h"

  • trunk/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp

    r144446 r144530  
    3030#include "LegacyWebArchive.h"
    3131
    32 #include "MemoryCache.h"
     32#include "CachedResource.h"
    3333#include "Document.h"
    3434#include "DocumentLoader.h"
    … …  
    4343#include "KURLHash.h"
    4444#include "Logging.h"
    45 #include "markup.h"
    46 #include "Node.h"
     45#include "MemoryCache.h"
    4746#include "Page.h"
    4847#include "Range.h"
    4948#include "ResourceBuffer.h"
    5049#include "Settings.h"
    51 #include <wtf/text/CString.h>
    52 #include <wtf/text/WTFString.h>
     50#include "markup.h"
    5351#include <wtf/ListHashSet.h>
    5452#include <wtf/RetainPtr.h>

  • trunk/Source/WebCore/loader/cache/CachedFont.cpp

    r144446 r144530  
    3232#endif
    3333
     34#include "CachedFontClient.h"
    3435#include "CachedResourceClient.h"
    3536#include "CachedResourceClientWalker.h"

  • trunk/Source/WebCore/loader/cache/CachedFont.h

    r144446 r144530  
    7777};
    7878
    79 class CachedFontClient : public CachedResourceClient {
    80 public:
    81     virtual ~CachedFontClient() { }
    82     static CachedResourceClientType expectedType() { return FontType; }
    83     virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
    84     virtual void fontLoaded(CachedFont*) { }
    85 };
    86 
    8779}
    8880

  • trunk/Source/WebCore/loader/cache/CachedImage.cpp

    r144446 r144530  
    3030#include "CachedResourceClientWalker.h"
    3131#include "CachedResourceLoader.h"
     32#include "FrameLoader.h"
    3233#include "FrameLoaderClient.h"
    33 #include "FrameLoaderTypes.h"
    3434#include "FrameView.h"
    3535#include "MemoryCache.h"

  • trunk/Source/WebCore/loader/cache/CachedRawResource.cpp

    r144446 r144530  
    2727#include "CachedRawResource.h"
    2828
    29 #include "CachedResourceClient.h"
     29#include "CachedRawResourceClient.h"
    3030#include "CachedResourceClientWalker.h"
    3131#include "CachedResourceLoader.h"

  • trunk/Source/WebCore/loader/cache/CachedRawResource.h

    r144446 r144530  
    2525
    2626#include "CachedResource.h"
    27 #include "CachedResourceClient.h"
    2827
    2928namespace WebCore {
    30 class CachedRawResourceCallback;
    31 class CachedRawResourceClient;
     29
     30class CachedResourceClient;
    3231class SubresourceLoader;
    3332
    … …  
    8483};
    8584
    86 
    87 class CachedRawResourceClient : public CachedResourceClient {
    88 public:
    89     virtual ~CachedRawResourceClient() { }
    90     static CachedResourceClientType expectedType() { return RawResourceType; }
    91     virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
    92 
    93     virtual void dataSent(CachedResource*, unsigned long long /* bytesSent */, unsigned long long /* totalBytesToBeSent */) { }
    94     virtual void responseReceived(CachedResource*, const ResourceResponse&) { }
    95     virtual void dataReceived(CachedResource*, const char* /* data */, int /* length */) { }
    96     virtual void redirectReceived(CachedResource*, ResourceRequest&, const ResourceResponse&) { }
    97 #if PLATFORM(CHROMIUM)
    98     virtual void dataDownloaded(CachedResource*, int) { }
    99 #endif
    100 };
    101 
    10285}
    10386

  • trunk/Source/WebCore/loader/cache/CachedResource.cpp

    r144446 r144530  
    3434#include "Document.h"
    3535#include "DocumentLoader.h"
     36#include "FrameLoader.h"
    3637#include "FrameLoaderClient.h"
    3738#include "InspectorInstrumentation.h"

  • trunk/Source/WebCore/loader/cache/CachedResourceHandle.cpp

    r144446 r144530  
    2727#include "CachedResourceHandle.h"
    2828
     29#include "CachedResource.h"
    2930#include "WebCoreMemoryInstrumentation.h"
    3031
    3132namespace WebCore {
     33
     34CachedResourceHandleBase::CachedResourceHandleBase(CachedResource* resource)
     35{
     36    m_resource = resource;
     37    if (m_resource)
     38        m_resource->registerHandle(this);
     39}
     40
     41CachedResourceHandleBase::CachedResourceHandleBase(const CachedResourceHandleBase& o)
     42    : m_resource(o.m_resource)
     43{
     44    if (m_resource)
     45        m_resource->registerHandle(this);
     46}
     47
     48CachedResourceHandleBase::~CachedResourceHandleBase()
     49{
     50    if (m_resource)
     51        m_resource->unregisterHandle(this);
     52}
    3253
    3354void CachedResourceHandleBase::setResource(CachedResource* resource)

  • trunk/Source/WebCore/loader/cache/CachedResourceHandle.h

    r144446 r144530  
    2727#define CachedResourceHandle_h
    2828
    29 #include "CachedResource.h"
     29#include <wtf/Forward.h>
    3030
    3131namespace WebCore {
    3232
     33    class CachedResource;
     34
    3335    class CachedResourceHandleBase {
    3436    public:
    35         ~CachedResourceHandleBase() { if (m_resource) m_resource->unregisterHandle(this); }
     37        ~CachedResourceHandleBase();
    3638        CachedResource* get() const { return m_resource; }
    3739       
    … …  
    4547
    4648    protected:
    47         CachedResourceHandleBase() : m_resource(0) {}
    48         CachedResourceHandleBase(CachedResource* res) { m_resource = res; if (m_resource) m_resource->registerHandle(this); }
    49         CachedResourceHandleBase(const CachedResourceHandleBase& o) : m_resource(o.m_resource) { if (m_resource) m_resource->registerHandle(this); }
     49        CachedResourceHandleBase() : m_resource(0) { }
     50        CachedResourceHandleBase(CachedResource*);
     51        CachedResourceHandleBase(const CachedResourceHandleBase&);
    5052
    5153        void setResource(CachedResource*);

  • trunk/Source/WebCore/loader/cache/CachedSVGDocument.h

    r144446 r144530  
    5151};
    5252
    53 class CachedSVGDocumentClient : public CachedResourceClient {
    54 public:
    55     virtual ~CachedSVGDocumentClient() { }
    56     static CachedResourceClientType expectedType() { return SVGDocumentType; }
    57     virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
    58 };
    59 
    6053}
    6154

  • trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h

    r144446 r144530  
    2929#if ENABLE(SVG) && ENABLE(CSS_FILTERS)
    3030#include "CachedResourceHandle.h"
    31 #include "CachedSVGDocument.h"
     31#include "CachedSVGDocumentClient.h"
    3232
    3333namespace WebCore {
    3434
     35class CachedSVGDocument;
     36
    3537class CachedSVGDocumentReference : public CachedSVGDocumentClient {
    3638public:
    37     CachedSVGDocumentReference(CachedSVGDocument* document) : m_document(document) { m_document->addClient(this); }
    38     virtual ~CachedSVGDocumentReference() { m_document->removeClient(this); }
     39    CachedSVGDocumentReference(CachedSVGDocument*);
     40    virtual ~CachedSVGDocumentReference();
    3941    CachedSVGDocument* document() { return m_document.get(); }
    4042private:

  • trunk/Source/WebCore/loader/cache/CachedStyleSheetClient.h

    r144446 r144530  
    3232namespace WebCore {
    3333class CachedCSSStyleSheet;
     34class KURL;
    3435
    3536class CachedStyleSheetClient : public CachedResourceClient {

  • trunk/Source/WebCore/loader/cache/MemoryCache.cpp

    r144527 r144530  
    2424#include "MemoryCache.h"
    2525
    26 #include "CachedCSSStyleSheet.h"
    27 #include "CachedFont.h"
    28 #include "CachedImage.h"
    29 #include "CachedScript.h"
    30 #include "CachedXSLStyleSheet.h"
    31 #include "CachedResourceLoader.h"
     26#include "CachedResource.h"
    3227#include "CrossThreadTask.h"
    3328#include "Document.h"
    … …  
    3833#include "Logging.h"
    3934#include "PublicSuffix.h"
    40 #include "ResourceHandle.h"
    4135#include "SecurityOrigin.h"
    4236#include "SecurityOriginHash.h"

  • trunk/Source/WebCore/loader/cache/MemoryCache.h

    r144446 r144530  
    2626#define Cache_h
    2727
    28 #include "CachedResource.h"
    2928#include "SecurityOriginHash.h"
    3029#include <wtf/HashMap.h>
    … …  
    4140class CachedResourceLoader;
    4241class KURL;
     42class ResourceRequest;
     43class ResourceResponse;
    4344class ScriptExecutionContext;
    4445class SecurityOrigin;
     46struct CrossThreadResourceRequestData;
    4547struct SecurityOriginHash;
    4648
    … …  
    205207
    206208    static void removeRequestFromCacheImpl(ScriptExecutionContext*, const ResourceRequest&);
    207     static void crossThreadRemoveRequestFromCache(ScriptExecutionContext*, PassOwnPtr<WebCore::CrossThreadResourceRequestData>);
     209    static void crossThreadRemoveRequestFromCache(ScriptExecutionContext*, PassOwnPtr<CrossThreadResourceRequestData>);
    208210
    209211    bool m_disabled;  // Whether or not the cache is enabled.

  • trunk/Source/WebCore/loader/chromium/CachedRawResourceChromium.cpp

    r144446 r144530  
    3232#include "CachedRawResource.h"
    3333
     34#include "CachedRawResourceClient.h"
    3435#include "CachedResourceClient.h"
    3536#include "CachedResourceClientWalker.h"

  • trunk/Source/WebCore/loader/icon/IconController.cpp

    r144446 r144530  
    3939#include "DocumentLoader.h"
    4040#include "Frame.h"
     41#include "FrameLoader.h"
    4142#include "FrameLoaderClient.h"
    4243#include "IconDatabase.h"

  • trunk/Source/WebCore/loader/icon/IconLoader.h

    r144446 r144530  
    2727#define IconLoader_h
    2828
    29 #include "CachedRawResource.h"
     29#include "CachedRawResourceClient.h"
    3030#include "CachedResourceHandle.h"
    3131#include <wtf/Forward.h>

  • trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm

    r144446 r144530  
    3232#include "FrameLoader.h"
    3333#include "FrameLoaderClient.h"
    34 #include "ResourceHandle.h"
    3534
    3635#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)

  • trunk/Source/WebCore/page/DOMWindowExtension.cpp

    r144446 r144530  
    3030#include "DOMWrapperWorld.h"
    3131#include "Frame.h"
     32#include "FrameLoader.h"
    3233#include "FrameLoaderClient.h"
    3334

  • trunk/Source/WebCore/page/DragController.cpp

    r144446 r144530  
    2828
    2929#if ENABLE(DRAG_SUPPORT)
     30#include "CachedImage.h"
    3031#include "Clipboard.h"
    3132#include "ClipboardAccessPolicy.h"

  • trunk/Source/WebCore/page/Frame.cpp

    r144446 r144530  
    4242#include "DocumentType.h"
    4343#include "EditorClient.h"
     44#include "Event.h"
    4445#include "EventNames.h"
    4546#include "FloatQuad.h"
    … …  
    9293#include "npruntime_impl.h"
    9394#include "visible_units.h"
     95#include <wtf/PassOwnPtr.h>
    9496#include <wtf/RefCountedLeakCounter.h>
    9597#include <wtf/StdLibExtras.h>
    … …  
    151153    : m_page(page)
    152154    , m_treeNode(this, parentFromOwnerElement(ownerElement))
    153     , m_loader(this, frameLoaderClient)
     155    , m_loader(adoptPtr(new FrameLoader(this, frameLoaderClient)))
    154156    , m_navigationScheduler(this)
    155157    , m_ownerElement(ownerElement)
    … …  
    205207        page->setMainFrame(frame);
    206208    return frame.release();
     209}
     210
     211void Frame::init()
     212{
     213    m_loader->init();
    207214}
    208215
    … …  
    674681    info.addMember(m_ownerElement, "ownerElement");
    675682    info.addMember(m_page, "page");
    676     info.addMember(m_loader, "loader");
     683    info.addMember(*m_loader, "loader");
    677684    info.ignoreMember(m_destructionObservers);
    678685}

  • trunk/Source/WebCore/page/Frame.h

    r144446 r144530  
    3434#include "Editor.h"
    3535#include "EventHandler.h"
    36 #include "FrameLoader.h"
     36#include "FrameLoaderClient.h"
    3737#include "FrameSelection.h"
    3838#include "FrameTree.h"
    … …  
    6565    class Document;
    6666    class FrameDestructionObserver;
     67    class FrameLoader;
    6768    class FrameView;
    6869    class HTMLTableCellElement;
    … …  
    216217        Page* m_page;
    217218        mutable FrameTree m_treeNode;
    218         mutable FrameLoader m_loader;
     219        mutable OwnPtr<FrameLoader> m_loader;
    219220        mutable NavigationScheduler m_navigationScheduler;
    220221
    … …  
    261262    };
    262263
    263     inline void Frame::init()
    264     {
    265         m_loader.init();
    266     }
    267 
    268264    inline FrameLoader* Frame::loader() const
    269265    {
    270         return &m_loader;
     266        return m_loader.get();
    271267    }
    272268

  • trunk/Source/WebCore/page/PerformanceNavigation.cpp

    r144446 r144530  
    3636#include "DocumentLoader.h"
    3737#include "Frame.h"
    38 #include "FrameLoaderTypes.h"
     38#include "FrameLoader.h"
    3939
    4040namespace WebCore {

  • trunk/Source/WebCore/page/PerformanceTiming.cpp

    r144446 r144530  
    3939#include "DocumentTiming.h"
    4040#include "Frame.h"
     41#include "FrameLoader.h"
    4142#include "ResourceLoadTiming.h"
    4243#include "ResourceResponse.h"

  • trunk/Source/WebCore/page/PointerLockController.cpp

    r144446 r144530  
    2929#include "ChromeClient.h"
    3030#include "Element.h"
     31#include "Event.h"
    3132#include "Page.h"
    3233#include "PlatformMouseEvent.h"

  • trunk/Source/WebCore/page/Settings.cpp

    r144446 r144530  
    4141#include "Page.h"
    4242#include "PageCache.h"
    43 #include "ResourceHandle.h"
    4443#include "StorageMap.h"
    4544#include "TextAutosizer.h"

  • trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp

    r144446 r144530  
    3737#include "CSSPrimitiveValue.h"
    3838#include "CSSPropertyNames.h"
     39#include "CachedImage.h"
    3940#include "ClipPathOperation.h"
    4041#include "FloatConversion.h"

  • trunk/Source/WebCore/platform/chromium/PasteboardChromium.cpp

    r144446 r144530  
    3232#include "Pasteboard.h"
    3333
     34#include "CachedImage.h"
    3435#include "ClipboardChromium.h"
    3536#include "ClipboardUtilitiesChromium.h"

  • trunk/Source/WebCore/platform/efl/ErrorsEfl.cpp

    r144446 r144530  
    2929#include "DocumentLoader.h"
    3030#include "Frame.h"
     31#include "FrameLoader.h"
    3132#include "PrintContext.h"
    3233#include "ResourceError.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

    r144446 r144530  
    3030#include "MediaPlayerPrivateAVFoundation.h"
    3131
    32 #include "DocumentLoader.h"
    3332#include "Frame.h"
    3433#include "FrameView.h"

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

    r144446 r144530  
    3030
    3131#include "MediaPlayerPrivateAVFoundation.h"
     32#include <objc/objc.h>
    3233#include <wtf/HashMap.h>
    3334

  • trunk/Source/WebCore/platform/graphics/filters/FilterOperation.cpp

    r144446 r144530  
    3030
    3131#include "AnimationUtilities.h"
     32#include "CachedSVGDocumentReference.h"
    3233
    3334namespace WebCore {
    … …  
    150151}
    151152
     153ReferenceFilterOperation::ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
     154    : FilterOperation(type)
     155    , m_url(url)
     156    , m_fragment(fragment)
     157{
     158}
     159
     160ReferenceFilterOperation::~ReferenceFilterOperation()
     161{
     162}
     163
     164#if ENABLE(SVG)
     165void ReferenceFilterOperation::setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference)
     166{
     167    m_cachedSVGDocumentReference = cachedSVGDocumentReference;
     168}
     169#endif
     170
    152171} // namespace WebCore
    153172

  • trunk/Source/WebCore/platform/graphics/filters/FilterOperation.h

    r144446 r144530  
    4242#endif
    4343
    44 #if ENABLE(SVG)
    45 #include "CachedSVGDocumentReference.h"
    46 #endif
    47 
    4844// Annoyingly, wingdi.h #defines this.
    4945#ifdef PASSTHROUGH
    … …  
    5248
    5349namespace WebCore {
     50
     51class CachedSVGDocumentReference;
    5452
    5553// CSS Filters
    … …  
    176174#if ENABLE(SVG)
    177175    CachedSVGDocumentReference* cachedSVGDocumentReference() const { return m_cachedSVGDocumentReference.get(); }
    178     void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference> cachedSVGDocumentReference) { m_cachedSVGDocumentReference = cachedSVGDocumentReference; }
     176    void setCachedSVGDocumentReference(PassOwnPtr<CachedSVGDocumentReference>);
    179177#endif
    180178
    … …  
    192190    }
    193191
    194     ReferenceFilterOperation(const String& url, const String& fragment, OperationType type)
    195         : FilterOperation(type)
    196         , m_url(url)
    197         , m_fragment(fragment)
    198     {
    199     }
     192    ReferenceFilterOperation(const String& url, const String& fragment, OperationType);
     193
     194    virtual ~ReferenceFilterOperation();
    200195
    201196    String m_url;

  • trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp

    r144446 r144530  
    2525#include "Document.h"
    2626#include "Frame.h"
     27#include "FrameLoader.h"
    2728#include "GRefPtrGStreamer.h"
    2829#include "GStreamerVersioning.h"

  • trunk/Source/WebCore/platform/gtk/ErrorsGtk.cpp

    r144446 r144530  
    2323#include "DocumentLoader.h"
    2424#include "Frame.h"
     25#include "FrameLoader.h"
    2526#include "PrintContext.h"
    2627#include "ResourceError.h"

  • trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp

    r144446 r144530  
    2121#include "Pasteboard.h"
    2222
     23#include "CachedImage.h"
    2324#include "ClipboardGtk.h"
    2425#include "DataObjectGtk.h"

  • trunk/Source/WebCore/platform/gtk/PasteboardHelper.h

    r144446 r144530  
    2727
    2828#include "Frame.h"
     29#include <glib-object.h>
    2930
    3031namespace WebCore {

  • trunk/Source/WebCore/platform/mac/ClipboardMac.h

    r144446 r144530  
    2727#define ClipboardMac_h
    2828
    29 #include "CachedImage.h"
    3029#include "CachedImageClient.h"
    3130#include "Clipboard.h"

  • trunk/Source/WebCore/platform/mac/ClipboardMac.mm

    r144446 r144530  
    2727#import "ClipboardMac.h"
    2828
     29#import "CachedImage.h"
    2930#import "CachedImageClient.h"
    3031#import "DOMElementInternal.h"

  • trunk/Source/WebCore/platform/mac/HTMLConverter.mm

    r144446 r144530  
    2828
    2929#import "ArchiveResource.h"
     30#import "CachedImage.h"
    3031#import "ColorMac.h"
    3132#import "Document.h"
    … …  
    3940#import "Font.h"
    4041#import "Frame.h"
     42#import "FrameLoader.h"
    4143#import "HTMLNames.h"
    4244#import "HTMLParserIdioms.h"

  • trunk/Source/WebCore/platform/mac/PasteboardMac.mm

    r144483 r144530  
    2727#import "Pasteboard.h"
    2828
    29 #import "CachedResource.h"
     29#import "CachedImage.h"
    3030#import "ClipboardMac.h"
    3131#import "DOMRangeInternal.h"
    … …  
    3838#import "Frame.h"
    3939#import "FrameView.h"
     40#import "FrameLoader.h"
    4041#import "FrameLoaderClient.h"
    4142#import "HitTestResult.h"
    4243#import "HTMLAnchorElement.h"
    4344#import "HTMLConverter.h"
     45#import "HTMLNames.h"
    4446#import "htmlediting.h"
    45 #import "HTMLNames.h"
    4647#import "Image.h"
    4748#import "KURL.h"

  • trunk/Source/WebCore/platform/network/AuthenticationChallengeBase.cpp

    r144446 r144530  
    2525#include "config.h"
    2626#include "AuthenticationChallenge.h"
    27 
    28 #include "ResourceHandle.h"
    2927
    3028namespace WebCore {

  • trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp

    r144446 r144530  
    3232#include "KURL.h"
    3333#include "NetworkStorageSession.h"
    34 #include "ResourceHandle.h"
    3534#include "SoftLinking.h"
    3635#include <CFNetwork/CFHTTPCookiesPriv.h>

  • trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

    r144446 r144530  
    2727#include "ResourceRequestCFNet.h"
    2828
    29 #include "ResourceHandle.h"
    3029#include "ResourceRequest.h"
    3130

  • trunk/Source/WebCore/platform/network/mac/CookieStorageMac.mm

    r144446 r144530  
    2626#include "config.h"
    2727#include "CookieStorage.h"
    28 
    29 #import "ResourceHandle.h"
    3028
    3129#import "WebCoreSystemInterface.h"

  • trunk/Source/WebCore/platform/qt/PasteboardQt.cpp

    r144446 r144530  
    2929#include "Pasteboard.h"
    3030
     31#include "CachedImage.h"
    3132#include "ClipboardQt.h"
    3233#include "DocumentFragment.h"

  • trunk/Source/WebCore/plugins/DOMMimeType.cpp

    r144446 r144530  
    2222#include "DOMPlugin.h"
    2323#include "Frame.h"
     24#include "FrameLoader.h"
    2425#include "FrameLoaderClient.h"
    2526#include "Page.h"

  • trunk/Source/WebCore/plugins/PluginStream.h

    r144446 r144530  
    3232#include "NetscapePlugInStreamLoader.h"
    3333#include "PluginQuirkSet.h"
     34#include "PluginStreamClient.h"
    3435#include "ResourceRequest.h"
    3536#include "ResourceResponse.h"
    … …  
    4950
    5051    enum PluginStreamState { StreamBeforeStarted, StreamStarted, StreamStopped };
    51 
    52     class PluginStreamClient {
    53     public:
    54         virtual ~PluginStreamClient() {}
    55         virtual void streamDidFinishLoading(PluginStream*) {}
    56     };
    5752
    5853    class PluginStream : public RefCounted<PluginStream>, private NetscapePlugInStreamLoaderClient {

  • trunk/Source/WebCore/plugins/PluginView.cpp

    r144446 r144530  
    3939#include "FocusController.h"
    4040#include "Frame.h"
     41#include "FrameLoadRequest.h"
    4142#include "FrameLoader.h"
    4243#include "FrameLoaderClient.h"
    … …  
    5758#include "PluginMainThreadScheduler.h"
    5859#include "PluginPackage.h"
     60#include "PluginRequest.h"
     61#include "PluginStream.h"
    5962#include "ProxyServer.h"
    6063#include "RenderBox.h"

  • trunk/Source/WebCore/plugins/PluginView.h

    r144446 r144530  
    2929#define PluginView_h
    3030
    31 #include "FrameLoadRequest.h"
    3231#include "IntRect.h"
     32#include "KURL.h"
    3333#include "MediaCanStartListener.h"
    3434#include "PluginViewBase.h"
    35 #include "ResourceRequest.h"
    3635#include "Timer.h"
    3736#include <wtf/HashMap.h>
    … …  
    4443
    4544#if ENABLE(NETSCAPE_PLUGIN_API)
    46 #include "PluginStream.h"
     45#include "PluginStreamClient.h"
    4746#include "npruntime_internal.h"
    4847#endif
    … …  
    8584
    8685namespace WebCore {
     86
    8787    class Frame;
    8888    class Image;
    … …  
    9090    class KeyboardEvent;
    9191    class MouseEvent;
    92     class KURL;
    9392#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
    9493    class PluginMessageThrottlerWin;
    … …  
    10099    class ResourceResponse;
    101100    class WheelEvent;
     101    struct FrameLoadRequest;
    102102
    103103    enum PluginStatus {
    … …  
    105105        PluginStatusCanNotLoadPlugin,
    106106        PluginStatusLoadedSuccessfully
    107     };
    108 
    109     class PluginRequest {
    110         WTF_MAKE_NONCOPYABLE(PluginRequest); WTF_MAKE_FAST_ALLOCATED;
    111     public:
    112         PluginRequest(const FrameLoadRequest& frameLoadRequest, bool sendNotification, void* notifyData, bool shouldAllowPopups)
    113             : m_frameLoadRequest(frameLoadRequest)
    114             , m_notifyData(notifyData)
    115             , m_sendNotification(sendNotification)
    116             , m_shouldAllowPopups(shouldAllowPopups) { }
    117     public:
    118         const FrameLoadRequest& frameLoadRequest() const { return m_frameLoadRequest; }
    119         void* notifyData() const { return m_notifyData; }
    120         bool sendNotification() const { return m_sendNotification; }
    121         bool shouldAllowPopups() const { return m_shouldAllowPopups; }
    122     private:
    123         FrameLoadRequest m_frameLoadRequest;
    124         void* m_notifyData;
    125         bool m_sendNotification;
    126         bool m_shouldAllowPopups;
    127107    };
    128108

  • trunk/Source/WebCore/rendering/HitTestResult.cpp

    r144446 r144530  
    2323#include "HitTestResult.h"
    2424
     25#include "CachedImage.h"
    2526#include "DocumentMarkerController.h"
    2627#include "Frame.h"

  • trunk/Source/WebCore/rendering/InlineFlowBox.cpp

    r144446 r144530  
    2121#include "InlineFlowBox.h"
    2222
    23 #include "CachedImage.h"
    2423#include "CSSPropertyNames.h"
    2524#include "Document.h"

  • trunk/Source/WebCore/rendering/RenderBox.cpp

    r144497 r144530  
    2626#include "RenderBox.h"
    2727
    28 #include "CachedImage.h"
    2928#include "Chrome.h"
    3029#include "ChromeClient.h"

  • trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

    r144446 r144530  
    3232#include "FontSelector.h"
    3333#include "Frame.h"
    34 #include "FrameLoaderClient.h"
    3534#include "GraphicsContext.h"
    3635#include "HTMLEmbedElement.h"

  • trunk/Source/WebCore/rendering/RenderImage.cpp

    r144446 r144530  
    3030
    3131#include "BitmapImage.h"
     32#include "CachedImage.h"
    3233#include "Font.h"
    3334#include "FontCache.h"

  • trunk/Source/WebCore/rendering/RenderImageResource.cpp

    r144446 r144530  
    2929#include "RenderImageResource.h"
    3030
     31#include "CachedImage.h"
    3132#include "Image.h"
    3233#include "RenderImageResourceStyleImage.h"
    … …  
    3738RenderImageResource::RenderImageResource()
    3839    : m_renderer(0)
    39     , m_cachedImage(0)
    4040{
    4141}
    … …  
    9090}
    9191
     92PassRefPtr<Image> RenderImageResource::image(int, int) const
     93{
     94    return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : nullImage();
     95}
     96
     97bool RenderImageResource::errorOccurred() const
     98{
     99    return m_cachedImage && m_cachedImage->errorOccurred();
     100}
     101
    92102void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContainerSize)
    93103{
    … …  
    95105    if (m_cachedImage)
    96106        m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize, m_renderer->style()->effectiveZoom());
     107}
     108
     109bool RenderImageResource::usesImageContainerSize() const
     110{
     111    return m_cachedImage ? m_cachedImage->usesImageContainerSize() : false;
     112}
     113
     114bool RenderImageResource::imageHasRelativeWidth() const
     115{
     116    return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false;
     117}
     118
     119bool RenderImageResource::imageHasRelativeHeight() const
     120{
     121    return m_cachedImage ? m_cachedImage->imageHasRelativeHeight() : false;
     122}
     123
     124LayoutSize RenderImageResource::imageSize(float multiplier) const
     125{
     126    return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier) : LayoutSize();
    97127}
    98128

  • trunk/Source/WebCore/rendering/RenderImageResource.h

    r144446 r144530  
    2727#define RenderImageResource_h
    2828
    29 #include "CachedImage.h"
    3029#include "CachedResourceHandle.h"
    3130#include "Image.h"
    … …  
    5655    void resetAnimation();
    5756
    58     virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) const { return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : nullImage(); }
    59     virtual bool errorOccurred() const { return m_cachedImage && m_cachedImage->errorOccurred(); }
     57    virtual PassRefPtr<Image> image(int width = 0, int height = 0) const;
     58    virtual bool errorOccurred() const;
    6059
    6160    virtual void setContainerSizeForRenderer(const IntSize&);
    62     virtual bool usesImageContainerSize() const { return m_cachedImage ? m_cachedImage->usesImageContainerSize() : false; }
    63     virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false; }
    64     virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cachedImage->imageHasRelativeHeight() : false; }
     61    virtual bool usesImageContainerSize() const;
     62    virtual bool imageHasRelativeWidth() const;
     63    virtual bool imageHasRelativeHeight() const;
    6564
    66     virtual LayoutSize imageSize(float multiplier) const { return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier) : LayoutSize(); }
     65    virtual LayoutSize imageSize(float multiplier) const;
    6766
    6867    virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); }

  • trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.cpp

    r144446 r144530  
    2929#include "RenderImageResourceStyleImage.h"
    3030
     31#include "CachedImage.h"
    3132#include "RenderObject.h"
    3233#include "StyleCachedImage.h"

  • trunk/Source/WebCore/rendering/RenderLayer.cpp

    r144529 r144530  
    6262#include "FocusController.h"
    6363#include "Frame.h"
     64#include "FrameLoader.h"
    6465#include "FrameLoaderClient.h"
    6566#include "FrameSelection.h"

  • trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

    r144446 r144530  
    3333#include "CanvasRenderingContext.h"
    3434#include "CSSPropertyNames.h"
     35#include "CachedImage.h"
    3536#include "Chrome.h"
    3637#include "FontCache.h"

  • trunk/Source/WebCore/rendering/RenderLayerFilterInfo.h

    r144446 r144530  
    3333#if ENABLE(CSS_FILTERS)
    3434
    35 #if ENABLE(SVG)
    36 #include "CachedSVGDocument.h"
    37 #endif
    38 #include "FilterOperation.h"
     35#include "CachedResourceHandle.h"
     36#include "CachedSVGDocumentClient.h"
    3937#include "LayoutRect.h"
    4038#include <wtf/HashMap.h>
    … …  
    4846namespace WebCore {
    4947
     48class CachedSVGDocument;
     49class Element;
    5050class FilterEffectRenderer;
    5151class FilterOperations;

  • trunk/Source/WebCore/rendering/RenderListItem.cpp

    r144446 r144530  
    2525#include "RenderListItem.h"
    2626
    27 #include "CachedImage.h"
    2827#include "HTMLNames.h"
    2928#include "HTMLOListElement.h"

  • trunk/Source/WebCore/rendering/RenderListMarker.cpp

    r144446 r144530  
    2626#include "RenderListMarker.h"
    2727
    28 #include "CachedImage.h"
    2928#include "Document.h"
    3029#include "Font.h"

  • trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp

    r144446 r144530  
    2727#include "RenderSnapshottedPlugIn.h"
    2828
     29#include "CachedImage.h"
    2930#include "Chrome.h"
    3031#include "ChromeClient.h"
    … …  
    3233#include "FEGaussianBlur.h"
    3334#include "Filter.h"
    34 #include "FrameLoaderClient.h"
    3535#include "FrameView.h"
    3636#include "Gradient.h"

  • trunk/Source/WebCore/rendering/RenderTableCol.cpp

    r144446 r144530  
    2727#include "RenderTableCol.h"
    2828
    29 #include "CachedImage.h"
    3029#include "HTMLNames.h"
    3130#include "HTMLTableColElement.h"

  • trunk/Source/WebCore/rendering/RenderTableRow.cpp

    r144446 r144530  
    2626#include "RenderTableRow.h"
    2727
    28 #include "CachedImage.h"
    2928#include "Document.h"
    3029#include "HTMLNames.h"

  • trunk/Source/WebCore/rendering/RenderTableSection.cpp

    r144446 r144530  
    2626#include "config.h"
    2727#include "RenderTableSection.h"
    28 #include "CachedImage.h"
    2928#include "Document.h"
    3029#include "HitTestResult.h"

  • trunk/Source/WebCore/rendering/style/StyleCachedShader.h

    r144446 r144530  
    3535#include "CachedResourceHandle.h"
    3636#include "StyleShader.h"
     37#include <wtf/PassRefPtr.h>
    3738
    3839namespace WebCore {

  • trunk/Source/WebCore/rendering/style/StyleCustomFilterProgram.h

    r144446 r144530  
    3232
    3333#if ENABLE(CSS_SHADERS)
     34
    3435#include "CachedResourceClient.h"
    3536#include "CachedResourceHandle.h"
    36 #include "CachedShader.h"
    3737#include "CustomFilterProgram.h"
    3838#include "StyleShader.h"
    … …  
    4141namespace WebCore {
    4242
    43 // CSS Shaders
     43class CachedShader;
    4444
    4545class StyleCustomFilterProgram : public CustomFilterProgram, public CachedResourceClient {
    … …  
    5757    StyleShader* fragmentShader() const { return m_fragmentShader.get(); }
    5858   
    59     virtual String vertexShaderString() const
    60     {
    61         ASSERT(isLoaded());
    62         return m_cachedVertexShader.get() ? m_cachedVertexShader->shaderString() : String();
    63     }
    64    
    65     virtual String fragmentShaderString() const
    66     {
    67         ASSERT(isLoaded());
    68         return m_cachedFragmentShader.get() ? m_cachedFragmentShader->shaderString() : String();
    69     }
    70 
    71     virtual bool isLoaded() const
    72     {
    73         // Do not use the CachedResource:isLoaded method here, because it actually means !isLoading(),
    74         // so missing and canceled resources will have isLoaded set to true, even if they are not loaded yet.
    75         return (!m_cachedVertexShader.get() || m_isVertexShaderLoaded)
    76             && (!m_cachedFragmentShader.get() || m_isFragmentShaderLoaded);
    77     }
    78 
    79     virtual void willHaveClients()
    80     {
    81         if (m_vertexShader) {
    82             m_cachedVertexShader = m_vertexShader->cachedShader();
    83             m_cachedVertexShader->addClient(this);
    84         }
    85         if (m_fragmentShader) {
    86             m_cachedFragmentShader = m_fragmentShader->cachedShader();
    87             m_cachedFragmentShader->addClient(this);
    88         }
    89     }
    90    
    91     virtual void didRemoveLastClient()
    92     {
    93         if (m_cachedVertexShader.get()) {
    94             m_cachedVertexShader->removeClient(this);
    95             m_cachedVertexShader = 0;
    96             m_isVertexShaderLoaded = false;
    97         }
    98         if (m_cachedFragmentShader.get()) {
    99             m_cachedFragmentShader->removeClient(this);
    100             m_cachedFragmentShader = 0;
    101             m_isFragmentShaderLoaded = false;
    102         }
    103     }
    104    
    105     virtual void notifyFinished(CachedResource* resource)
    106     {
    107         if (resource->errorOccurred())
    108             return;
    109         // Note that m_cachedVertexShader might be equal to m_cachedFragmentShader and it would only get one event in that case.
    110         if (resource == m_cachedVertexShader.get())
    111             m_isVertexShaderLoaded = true;
    112         if (resource == m_cachedFragmentShader.get())
    113             m_isFragmentShaderLoaded = true;
    114         if (isLoaded())
    115             notifyClients();
    116     }
     59    virtual String vertexShaderString() const OVERRIDE;
     60    virtual String fragmentShaderString() const OVERRIDE;
     61    virtual bool isLoaded() const OVERRIDE;
     62    virtual void willHaveClients() OVERRIDE;
     63    virtual void didRemoveLastClient() OVERRIDE;
     64    virtual void notifyFinished(CachedResource*) OVERRIDE;
    11765   
    11866    CachedShader* cachedVertexShader() const { return m_vertexShader ? m_vertexShader->cachedShader() : 0; }

  • trunk/Source/WebCore/svg/SVGFEImageElement.h

    r144446 r144530  
    2323
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    25 #include "CachedImage.h"
    2625#include "CachedResourceHandle.h"
    2726#include "ImageBuffer.h"

  • trunk/Source/WebCore/svg/SVGFontFaceUriElement.h

    r144446 r144530  
    2222
    2323#if ENABLE(SVG_FONTS)
    24 #include "CachedFont.h"
     24
     25#include "CachedFontClient.h"
    2526#include "CachedResourceHandle.h"
    2627#include "SVGElement.h"
    … …  
    4243   
    4344    virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
    44     virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
     45    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0) OVERRIDE;
    4546    virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
    4647

  • trunk/Source/WebCore/svg/SVGImageLoader.cpp

    r144446 r144530  
    2424#include "SVGImageLoader.h"
    2525
     26#include "CachedImage.h"
    2627#include "Event.h"
    2728#include "EventNames.h"

  • trunk/Source/WebCore/svg/SVGUseElement.cpp

    r144446 r144530  
    3131#include "CachedResourceLoader.h"
    3232#include "CachedResourceRequest.h"
     33#include "CachedSVGDocument.h"
    3334#include "Document.h"
    3435#include "ElementShadow.h"

  • trunk/Source/WebCore/svg/SVGUseElement.h

    r144446 r144530  
    2323
    2424#if ENABLE(SVG)
    25 #include "CachedSVGDocument.h"
     25#include "CachedResourceHandle.h"
     26#include "CachedSVGDocumentClient.h"
    2627#include "SVGAnimatedBoolean.h"
    2728#include "SVGAnimatedLength.h"

  • trunk/Source/WebCore/svg/graphics/SVGImageCache.cpp

    r144446 r144530  
    2323
    2424#if ENABLE(SVG)
    25 #include "CachedImage.h"
    2625#include "FrameView.h"
    2726#include "GraphicsContext.h"

  • trunk/Source/WebCore/testing/MockPagePopupDriver.cpp

    r144446 r144530  
    3333#include "DocumentWriter.h"
    3434#include "Frame.h"
     35#include "FrameLoader.h"
    3536#include "HTMLIFrameElement.h"
    3637#include "PagePopup.h"

  • trunk/Source/WebCore/xml/XSLStyleSheet.h

    r144446 r144530  
    3838namespace WebCore {
    3939
     40class CachedResourceLoader;
    4041class XSLImportRule;
    4142   

  • trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp

    r144446 r144530  
    3232#include "Document.h"
    3333#include "Frame.h"
     34#include "FrameLoader.h"
    3435#include "ResourceError.h"
    35 #include "ResourceHandle.h"
    3636#include "ResourceRequest.h"
    3737#include "ResourceResponse.h"

  • trunk/Source/WebCore/xml/parser/XMLDocumentParser.cpp

    r144498 r144530  
    4343#include "ProcessingInstruction.h"
    4444#include "ResourceError.h"
    45 #include "ResourceHandle.h"
    4645#include "ResourceRequest.h"
    4746#include "ResourceResponse.h"

  • trunk/Source/WebCore/xml/parser/XMLDocumentParser.h

    r144498 r144530  
    3434#include <wtf/HashMap.h>
    3535#include <wtf/OwnPtr.h>
     36#include <wtf/text/AtomicStringHash.h>
    3637#include <wtf/text/CString.h>
    3738#include <wtf/text/StringHash.h>

  • trunk/Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

    r144498 r144530  
    4747#include "ProcessingInstruction.h"
    4848#include "ResourceError.h"
    49 #include "ResourceHandle.h"
    5049#include "ResourceRequest.h"
    5150#include "ResourceResponse.h"

  • trunk/Source/WebKit/chromium/ChangeLog

    r144523 r144530  
     12013-02-28  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reduce amount of rebuilding when touching networking headers
     4        https://bugs.webkit.org/show_bug.cgi?id=111035
     5
     6        Reviewed by Eric Seidel.
     7
     8        Adding includes that are now necessary because WebCore headers don't have them
     9        any more.
     10
     11        * src/ApplicationCacheHost.cpp:
     12        * src/AssociatedURLLoader.cpp:
     13        * src/EditorClientImpl.cpp:
     14        * src/SharedWorkerRepository.cpp:
     15        * src/WebDataSourceImpl.cpp:
     16        * src/WebFrameImpl.h:
     17        * src/WebNode.cpp:
     18        * src/WebSharedWorkerImpl.cpp:
     19        * tests/FrameLoaderClientImplTest.cpp:
     20
    1212013-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
    222

  • trunk/Source/WebKit/chromium/src/ApplicationCacheHost.cpp

    r144446 r144530  
    3636#include "DocumentLoader.h"
    3737#include "Frame.h"
     38#include "FrameLoader.h"
    3839#include "InspectorApplicationCacheAgent.h"
    3940#include "InspectorInstrumentation.h"

  • trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp

    r144446 r144530  
    3636#include "DocumentThreadableLoaderClient.h"
    3737#include "HTTPValidation.h"
     38#include "ResourceError.h"
    3839#include "SubresourceLoader.h"
    3940#include "Timer.h"

  • trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp

    r144446 r144530  
    3737#include "KeyboardCodes.h"
    3838#include "KeyboardEvent.h"
     39#include "NotImplemented.h"
    3940#include "PlatformKeyboardEvent.h"
    4041#include "RenderObject.h"

  • trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp

    r144446 r144530  
    4242#include "MessagePortChannel.h"
    4343#include "PlatformMessagePortChannelChromium.h"
     44#include "ResourceResponse.h"
    4445#include "ScriptExecutionContext.h"
    4546#include "SharedWorker.h"

  • trunk/Source/WebKit/chromium/src/WebDataSourceImpl.cpp

    r144446 r144530  
    3333
    3434#include "ApplicationCacheHostInternal.h"
     35#include "FrameLoader.h"
    3536#include <public/WebURL.h>
    3637#include <public/WebURLError.h>

  • trunk/Source/WebKit/chromium/src/WebFrameImpl.h

    r144446 r144530  
    5151class Range;
    5252class SubstituteData;
     53struct FrameLoadRequest;
    5354struct WindowFeatures;
    5455}

  • trunk/Source/WebKit/chromium/src/WebNode.cpp

    r144446 r144530  
    3434#include "Document.h"
    3535#include "Element.h"
     36#include "Event.h"
    3637#include "Frame.h"
    3738#include "FrameLoaderClientImpl.h"

  • trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp

    r144446 r144530  
    3636#include "Document.h"
    3737#include "FrameLoadRequest.h"
     38#include "FrameLoader.h"
    3839#include "GroupSettings.h"
    3940#include "KURL.h"

  • trunk/Source/WebKit/chromium/tests/FrameLoaderClientImplTest.cpp

    r144446 r144530  
    3333#include "FrameLoaderClientImpl.h"
    3434
     35#include "FrameLoader.h"
    3536#include "KURL.h"
    3637#include "WebFrameClient.h"

  • trunk/Source/WebKit/efl/ChangeLog

    r144524 r144530  
     12013-02-28  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reduce amount of rebuilding when touching networking headers
     4        https://bugs.webkit.org/show_bug.cgi?id=111035
     5
     6        Reviewed by Eric Seidel.
     7
     8        Adding includes that are now necessary because WebCore headers don't have them
     9        any more.
     10
     11        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
     12        * ewk/ewk_frame.cpp:
     13
    1142013-03-01  Jason Anderssen  <janderssen@gmail.com>
    215

  • trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp

    r144524 r144530  
    3939#include <FloatSize.h>
    4040#include <FocusController.h>
     41#include <FrameLoader.h>
    4142#include <FrameView.h>
    4243#include <HTMLInputElement.h>

  • trunk/Source/WebKit/efl/ewk/ewk_frame.cpp

    r144446 r144530  
    3030#include "FocusController.h"
    3131#include "FrameLoadRequest.h"
     32#include "FrameLoader.h"
    3233#include "FrameLoaderClientEfl.h"
    3334#include "FrameView.h"

  • trunk/Source/WebKit/gtk/ChangeLog

    r144524 r144530  
     12013-02-28  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reduce amount of rebuilding when touching networking headers
     4        https://bugs.webkit.org/show_bug.cgi?id=111035
     5
     6        Reviewed by Eric Seidel.
     7
     8        Adding includes that are now necessary because WebCore headers don't have them
     9        any more.
     10
     11        * webkit/webkitwebpolicydecision.cpp:
     12
    1132013-03-01  Jason Anderssen  <janderssen@gmail.com>
    214

  • trunk/Source/WebKit/gtk/webkit/webkitwebpolicydecision.cpp

    r144446 r144530  
    2121#include "webkitwebpolicydecision.h"
    2222
     23#include "FrameLoader.h"
    2324#include "FrameLoaderClient.h"
    24 #include "FrameLoaderTypes.h"
    2525#include "webkitwebframeprivate.h"
    2626#include "webkitwebpolicydecisionprivate.h"

  • trunk/Source/WebKit/mac/ChangeLog

    r144524 r144530  
     12013-02-28  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reduce amount of rebuilding when touching networking headers
     4        https://bugs.webkit.org/show_bug.cgi?id=111035
     5
     6        Reviewed by Eric Seidel.
     7
     8        Adding includes that are now necessary because WebCore headers don't have them
     9        any more.
     10
     11        * DOM/WebDOMOperations.mm:
     12        * Misc/WebNSPasteboardExtras.mm:
     13        * WebCoreSupport/WebFrameNetworkingContext.mm:
     14        * WebView/WebRenderLayer.mm:
     15        * WebView/WebRenderNode.mm:
     16
    1172013-03-01  Jason Anderssen  <janderssen@gmail.com>
    218

  • trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm

    r144524 r144530  
    4242#import <WebCore/Document.h>
    4343#import <WebCore/Frame.h>
     44#import <WebCore/FrameLoader.h>
    4445#import <WebCore/HTMLInputElement.h>
    4546#import <WebCore/HTMLParserIdioms.h>

  • trunk/Source/WebKit/mac/Misc/WebNSPasteboardExtras.mm

    r144446 r144530  
    3737#import "WebURLsWithTitles.h"
    3838#import "WebViewPrivate.h"
     39#import <WebCore/CachedImage.h>
    3940#import <WebCore/Element.h>
    4041#import <WebCore/Image.h>

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm

    r144495 r144530  
    2323#import "WebFrameInternal.h"
    2424#import "WebViewPrivate.h"
     25#import <WebCore/FrameLoader.h>
    2526#import <WebCore/FrameLoaderClient.h>
    2627#import <WebCore/NetworkStorageSession.h>

  • trunk/Source/WebKit/mac/WebView/WebRenderLayer.mm

    r144446 r144530  
    2828#import "WebFrameInternal.h"
    2929#import <WebCore/Frame.h>
     30#import <WebCore/FrameLoader.h>
    3031#import <WebCore/FrameLoaderClient.h>
    3132#import <WebCore/RenderLayer.h>

  • trunk/Source/WebKit/mac/WebView/WebRenderNode.mm

    r144446 r144530  
    3131#import "WebFrameInternal.h"
    3232#import <WebCore/Frame.h>
     33#import <WebCore/FrameLoader.h>
    3334#import <WebCore/FrameLoaderClient.h>
    3435#import <WebCore/RenderText.h>

  • trunk/Source/WebKit/qt/ChangeLog

    r144524 r144530  
     12013-02-28  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Reduce amount of rebuilding when touching networking headers
     4        https://bugs.webkit.org/show_bug.cgi?id=111035
     5
     6        Reviewed by Eric Seidel.
     7
     8        Adding includes that are now necessary because WebCore headers don't have them
     9        any more.
     10
     11        * WebCoreSupport/NotificationPresenterClientQt.cpp:
     12        * WebCoreSupport/QWebPageAdapter.cpp:
     13
    1142013-03-01  Jason Anderssen  <janderssen@gmail.com>
    215

  • trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

    r144446 r144530  
    3434
    3535#include "Document.h"
     36#include "Event.h"
    3637#include "EventNames.h"
    3738#include "KURL.h"

  • trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp

    r144446 r144530  
    4242#include "EditorClientQt.h"
    4343#include "FocusController.h"
     44#include "FrameLoadRequest.h"
    4445#include "FrameView.h"
    4546#if ENABLE(GEOLOCATION)

  • trunk/Source/WebKit2/ChangeLog

    r144528 r144530  
    1111        * Shared/mac/ChildProcessMac.mm:
    1212        (WebKit::ChildProcess::platformInitialize): Remove call to setpriority().
     13
     142013-02-28  Alexey Proskuryakov  <ap@apple.com>
     15
     16        Reduce amount of rebuilding when touching networking headers
     17        https://bugs.webkit.org/show_bug.cgi?id=111035
     18
     19        Reviewed by Eric Seidel.
     20
     21        Adding includes that are now necessary because WebCore headers don't have them
     22        any more.
     23
     24        * NetworkProcess/HostRecord.h:
     25        * NetworkProcess/NetworkResourceLoadScheduler.h:
     26        * NetworkProcess/NetworkResourceLoader.h:
     27        * Shared/WebRenderLayer.cpp:
     28        * Shared/WebRenderObject.cpp:
     29        * WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp:
     30        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
     31        * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
     32        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     33        * WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp:
     34        * WebProcess/Plugins/PDF/PDFPlugin.mm:
     35        * WebProcess/Plugins/PluginView.cpp:
     36        * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
     37        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
     38        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     39        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
     40        * WebProcess/WebPage/mac/WebPageMac.mm:
     41        * WebProcess/WebProcess.cpp:
     42        * WebProcess/soup/WebProcessSoup.cpp:
    1343
    14442013-02-28  Alexey Proskuryakov  <ap@apple.com>

  • trunk/Source/WebKit2/NetworkProcess/HostRecord.h

    r144446 r144530  
    2929#if ENABLE(NETWORK_PROCESS)
    3030
    31 #include <WebCore/ResourceRequest.h>
     31#include <WebCore/ResourceLoadPriority.h>
    3232#include <wtf/Deque.h>
    3333#include <wtf/HashSet.h>

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h

    r144446 r144530  
    2929#include "SchedulableLoader.h"
    3030#include <WebCore/ResourceLoaderOptions.h>
    31 #include <WebCore/ResourceRequest.h>
    3231#include <WebCore/Timer.h>
    3332#include <wtf/HashSet.h>

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

    r144446 r144530  
    3434#include <WebCore/ResourceHandleClient.h>
    3535#include <WebCore/ResourceLoaderOptions.h>
    36 #include <WebCore/ResourceRequest.h>
    3736
    3837namespace WebCore {
    3938class ResourceBuffer;
    4039class ResourceHandle;
     40class ResourceRequest;
    4141}
    4242

  • trunk/Source/WebKit2/Shared/WebRenderLayer.cpp

    r144446 r144530  
    3030#include "WebString.h"
    3131#include <WebCore/Frame.h>
     32#include <WebCore/FrameLoader.h>
    3233#include <WebCore/FrameLoaderClient.h>
    3334#include <WebCore/RenderLayer.h>

  • trunk/Source/WebKit2/Shared/WebRenderObject.cpp

    r144446 r144530  
    3030#include "WebString.h"
    3131#include <WebCore/Frame.h>
     32#include <WebCore/FrameLoader.h>
    3233#include <WebCore/FrameLoaderClient.h>
    3334#include <WebCore/RenderText.h>

  • trunk/Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp

    r144446 r144530  
    3434#include "WebPageProxyMessages.h"
    3535#include <WebCore/Frame.h>
     36#include <WebCore/FrameLoader.h>
    3637#include <WebCore/Geolocation.h>
    3738#include <WebCore/SecurityOrigin.h>

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

    r144524 r144530  
    3535#include "WebSecurityOrigin.h"
    3636#include <WebCore/Frame.h>
     37#include <WebCore/FrameLoader.h>
    3738#include <WebCore/FrameView.h>
    3839

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp

    r144446 r144530  
    3232#include <WebCore/Document.h>
    3333#include <WebCore/Frame.h>
     34#include <WebCore/FrameLoader.h>
    3435#include <WebCore/HTMLFrameElement.h>
    3536#include <WebCore/HTMLIFrameElement.h>

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r144446 r144530  
    5252#include <WebCore/ApplicationCacheStorage.h>
    5353#include <WebCore/Frame.h>
     54#include <WebCore/FrameLoader.h>
    5455#include <WebCore/FrameView.h>
    5556#include <WebCore/GCController.h>

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp

    r144446 r144530  
    3232#include <WebCore/DOMWindowExtension.h>
    3333#include <WebCore/Frame.h>
     34#include <WebCore/FrameLoader.h>
    3435#include <wtf/HashMap.h>
    3536

  • trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm

    r144446 r144530  
    4949#import <WebCore/FormState.h>
    5050#import <WebCore/Frame.h>
     51#import <WebCore/FrameLoader.h>
    5152#import <WebCore/FrameView.h>
    5253#import <WebCore/GraphicsContext.h>

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

    r144446 r144530  
    4545#include <WebCore/Frame.h>
    4646#include <WebCore/FrameLoadRequest.h>
     47#include <WebCore/FrameLoader.h>
    4748#include <WebCore/FrameLoaderClient.h>
    4849#include <WebCore/FrameView.h>

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp

    r144446 r144530  
    3434#include "WebPage.h"
    3535#include <WebCore/ContextMenu.h>
     36#include <WebCore/Event.h>
    3637#include <WebCore/Frame.h>
     38#include <WebCore/FrameLoader.h>
    3739#include <WebCore/NotImplemented.h>
    3840#include <WebCore/Page.h>

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

    r144446 r144530  
    3838#include <WebCore/FocusController.h>
    3939#include <WebCore/Frame.h>
     40#include <WebCore/FrameLoader.h>
    4041#include <WebCore/FrameView.h>
    4142#include <WebCore/HTMLInputElement.h>

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r144446 r144530  
    5858#include <WebCore/Frame.h>
    5959#include <WebCore/FrameLoadRequest.h>
     60#include <WebCore/FrameLoader.h>
    6061#include <WebCore/FrameView.h>
    6162#include <WebCore/HTMLAppletElement.h>

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

    r144495 r144530  
    2222#import "WebFrameNetworkingContext.h"
    2323
     24#import <WebCore/FrameLoader.h>
    2425#import <WebCore/FrameLoaderClient.h>
    2526#import <WebCore/Page.h>

  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r144446 r144530  
    4646#import <WebCore/FocusController.h>
    4747#import <WebCore/Frame.h>
     48#import <WebCore/FrameLoader.h>
    4849#import <WebCore/FrameView.h>
    4950#import <WebCore/HitTestResult.h>

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r144446 r144530  
    6464#include <WebCore/FontCache.h>
    6565#include <WebCore/Frame.h>
     66#include <WebCore/FrameLoader.h>
    6667#include <WebCore/GCController.h>
    6768#include <WebCore/GlyphPageTreeNode.h>

  • trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

    r144446 r144530  
    3838#include <WebCore/ResourceHandle.h>
    3939#include <libsoup/soup-cache.h>
     40#include <libsoup/soup.h>
    4041#include <wtf/gobject/GOwnPtr.h>
    4142#include <wtf/gobject/GRefPtr.h>
Note: See TracChangeset for help on using the changeset viewer.