Changeset 156543 in webkit


Ignore:
Timestamp:
Sep 27, 2013 8:09:01 AM (11 years ago)
Author:
Darin Adler
Message:

Add empty MainFrame class
https://bugs.webkit.org/show_bug.cgi?id=121770

Reviewed by Andreas Kling.

Source/WebCore:

For now, MainFrame simply derives from Frame and adds nothing.
Next, we will make each Frame point back to its MainFrame.

  • CMakeLists.txt: Added MainFrame.cpp/h.
  • GNUmakefile.list.am: Ditto.
  • Target.pri: Ditto.
  • WebCore.exp.in: Ditto.
  • WebCore.vcxproj/WebCore.vcxproj: Ditto.
  • WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
  • WebCore.xcodeproj/project.pbxproj: Ditto.
  • page/Frame.cpp:

(WebCore::Frame::Frame): Use references instead of pointers for constructor.
(WebCore::Frame::create): Pass references instead of pointers to constructor.

  • page/Frame.h: Made constructor protected instead of private, and marked

destructor virtual explicitly. Also marked virtual functions OVERRIDE and FINAL.

  • page/MainFrame.cpp: Added.
  • page/MainFrame.h: Added.
  • page/Page.cpp:

(WebCore::Page::Page): Use MainFrame::create instead of Frame::create.
(WebCore::Page::frameIsMainFrame): Moved here, no longer inline.
(WebCore::Page::renderTreeSize): Use const Frame* instead of Frame*.
(WebCore::Page::checkSubframeCountConsistency): Ditto.

  • page/Page.h: Changed mainFrame() to return MainFrame& and m_mainFrame to

be a RefPtr<MainFrame>.

  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
  • bindings/js/PageScriptDebugServer.cpp:
  • bindings/js/ScriptProfiler.cpp:
  • bindings/js/ScriptState.cpp:
  • css/MediaQueryEvaluator.cpp:
  • dom/Document.cpp:
  • history/CachedFrame.cpp:
  • history/CachedPage.cpp:
  • history/PageCache.cpp:
  • html/HTMLPlugInImageElement.cpp:
  • inspector/InspectorAgent.cpp:
  • inspector/InspectorCanvasAgent.cpp:
  • inspector/InspectorClient.cpp:
  • inspector/InspectorDOMAgent.cpp:
  • inspector/InspectorFrontendClientLocal.cpp:
  • inspector/InspectorFrontendHost.cpp:
  • inspector/InspectorInputAgent.cpp:
  • inspector/InspectorInstrumentation.cpp:
  • inspector/InspectorOverlay.cpp:
  • inspector/InspectorPageAgent.cpp:
  • inspector/PageRuntimeAgent.cpp:
  • loader/FrameLoader.cpp:
  • loader/HistoryController.cpp:
  • loader/archive/mhtml/MHTMLArchive.cpp:
  • page/AutoscrollController.cpp:
  • page/Chrome.cpp:
  • page/ContextMenuController.cpp:
  • page/DOMWindow.cpp:
  • page/DragController.cpp:
  • page/EventHandler.cpp:
  • page/FocusController.cpp:
  • page/FrameTree.cpp:
  • page/FrameView.cpp:
  • page/GestureTapHighlighter.cpp:
  • page/PageGroup.cpp:
  • page/PageGroupLoadDeferrer.cpp:
  • page/PageSerializer.cpp:
  • page/PageThrottler.cpp:
  • page/Settings.cpp:
  • page/SpatialNavigation.cpp:
  • page/mac/DragControllerMac.mm:
  • page/mac/PageMac.cpp:
  • page/scrolling/ScrollingCoordinator.cpp:
  • page/scrolling/mac/ScrollingCoordinatorMac.mm:
  • platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
  • plugins/DOMMimeType.cpp:
  • storage/StorageEventDispatcher.cpp:
  • svg/graphics/SVGImage.cpp:
  • testing/InternalSettings.cpp:
  • testing/Internals.cpp:

Include MainFrame.h instead of Frame.h as needed.

Source/WebKit/efl:

  • WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
  • WebCoreSupport/InspectorClientEfl.cpp:
  • ewk/ewk_view.cpp:

Include MainFrame.h instead of Frame.h as needed.

Source/WebKit/gtk:

  • WebCoreSupport/AcceleratedCompositingContextGL.cpp:
  • WebCoreSupport/ChromeClientGtk.cpp:
  • WebCoreSupport/FrameLoaderClientGtk.cpp:
  • WebCoreSupport/GtkAdjustmentWatcher.cpp:
  • webkit/webkitwebframe.cpp:
  • webkit/webkitwebview.cpp:
  • webkit/webkitviewportattributes.cpp:

Include MainFrame.h instead of Frame.h as needed.

Source/WebKit/mac:

  • WebCoreSupport/WebDragClient.mm:
  • WebCoreSupport/WebInspectorClient.mm:
  • WebCoreSupport/WebPlatformStrategies.mm:
  • WebView/WebFrame.mm:
  • WebView/WebHTMLView.mm:
  • WebView/WebView.mm:

Include MainFrame.h instead of Frame.h as needed.

Source/WebKit/qt:

  • Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:
  • Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:
  • Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp:
  • Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp:
  • Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:
  • Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp:

Include MainFrame.h instead of Frame.h as needed.

Source/WebKit/win:

  • win/WebCoreSupport/WebDragClient.cpp:
  • win/WebCoreSupport/WebContextMenuClient.cpp:
  • win/WebDropSource.cpp:
  • win/WebFrame.cpp:
  • win/WebView.cpp:

Include MainFrame.h instead of Frame.h as needed.

Source/WebKit2:

  • WebProcess/FullScreen/WebFullScreenManager.cpp:
  • WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
  • WebProcess/InjectedBundle/InjectedBundle.cpp:
  • WebProcess/Plugins/PluginView.cpp:
  • WebProcess/Storage/StorageAreaMap.cpp:
  • WebProcess/WebCoreSupport/WebChromeClient.cpp:
  • WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
  • WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
  • WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
  • WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
  • WebProcess/WebPage/FindController.cpp:
  • WebProcess/WebPage/PageOverlay.cpp:
  • WebProcess/WebPage/WebInspector.cpp:
  • WebProcess/WebPage/WebPage.cpp:
  • WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp:
  • WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
  • WebProcess/WebPage/mac/LayerTreeHostMac.mm:
  • WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:
  • WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
  • WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
  • WebProcess/WebPage/mac/WebPageMac.mm:

Include MainFrame.h instead of Frame.h as needed.

Location:
trunk
Files:
2 added
119 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r156522 r156543  
    17461746    page/History.cpp
    17471747    page/Location.cpp
     1748    page/MainFrame.cpp
    17481749    page/MouseEventWithHitTestResults.cpp
    17491750    page/Navigator.cpp
  • trunk/Source/WebCore/ChangeLog

    r156542 r156543  
     12013-09-27  Darin Adler  <darin@apple.com>
     2
     3        Add empty MainFrame class
     4        https://bugs.webkit.org/show_bug.cgi?id=121770
     5
     6        Reviewed by Andreas Kling.
     7
     8        For now, MainFrame simply derives from Frame and adds nothing.
     9        Next, we will make each Frame point back to its MainFrame.
     10
     11        * CMakeLists.txt: Added MainFrame.cpp/h.
     12        * GNUmakefile.list.am: Ditto.
     13        * Target.pri: Ditto.
     14        * WebCore.exp.in: Ditto.
     15        * WebCore.vcxproj/WebCore.vcxproj: Ditto.
     16        * WebCore.vcxproj/WebCore.vcxproj.filters: Ditto.
     17        * WebCore.xcodeproj/project.pbxproj: Ditto.
     18
     19        * page/Frame.cpp:
     20        (WebCore::Frame::Frame): Use references instead of pointers for constructor.
     21        (WebCore::Frame::create): Pass references instead of pointers to constructor.
     22        * page/Frame.h: Made constructor protected instead of private, and marked
     23        destructor virtual explicitly. Also marked virtual functions OVERRIDE and FINAL.
     24
     25        * page/MainFrame.cpp: Added.
     26        * page/MainFrame.h: Added.
     27
     28        * page/Page.cpp:
     29        (WebCore::Page::Page): Use MainFrame::create instead of Frame::create.
     30        (WebCore::Page::frameIsMainFrame): Moved here, no longer inline.
     31        (WebCore::Page::renderTreeSize): Use const Frame* instead of Frame*.
     32        (WebCore::Page::checkSubframeCountConsistency): Ditto.
     33        * page/Page.h: Changed mainFrame() to return MainFrame& and m_mainFrame to
     34        be a RefPtr<MainFrame>.
     35
     36        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     37        * bindings/js/PageScriptDebugServer.cpp:
     38        * bindings/js/ScriptProfiler.cpp:
     39        * bindings/js/ScriptState.cpp:
     40        * css/MediaQueryEvaluator.cpp:
     41        * dom/Document.cpp:
     42        * history/CachedFrame.cpp:
     43        * history/CachedPage.cpp:
     44        * history/PageCache.cpp:
     45        * html/HTMLPlugInImageElement.cpp:
     46        * inspector/InspectorAgent.cpp:
     47        * inspector/InspectorCanvasAgent.cpp:
     48        * inspector/InspectorClient.cpp:
     49        * inspector/InspectorDOMAgent.cpp:
     50        * inspector/InspectorFrontendClientLocal.cpp:
     51        * inspector/InspectorFrontendHost.cpp:
     52        * inspector/InspectorInputAgent.cpp:
     53        * inspector/InspectorInstrumentation.cpp:
     54        * inspector/InspectorOverlay.cpp:
     55        * inspector/InspectorPageAgent.cpp:
     56        * inspector/PageRuntimeAgent.cpp:
     57        * loader/FrameLoader.cpp:
     58        * loader/HistoryController.cpp:
     59        * loader/archive/mhtml/MHTMLArchive.cpp:
     60        * page/AutoscrollController.cpp:
     61        * page/Chrome.cpp:
     62        * page/ContextMenuController.cpp:
     63        * page/DOMWindow.cpp:
     64        * page/DragController.cpp:
     65        * page/EventHandler.cpp:
     66        * page/FocusController.cpp:
     67        * page/FrameTree.cpp:
     68        * page/FrameView.cpp:
     69        * page/GestureTapHighlighter.cpp:
     70        * page/PageGroup.cpp:
     71        * page/PageGroupLoadDeferrer.cpp:
     72        * page/PageSerializer.cpp:
     73        * page/PageThrottler.cpp:
     74        * page/Settings.cpp:
     75        * page/SpatialNavigation.cpp:
     76        * page/mac/DragControllerMac.mm:
     77        * page/mac/PageMac.cpp:
     78        * page/scrolling/ScrollingCoordinator.cpp:
     79        * page/scrolling/mac/ScrollingCoordinatorMac.mm:
     80        * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp:
     81        * plugins/DOMMimeType.cpp:
     82        * storage/StorageEventDispatcher.cpp:
     83        * svg/graphics/SVGImage.cpp:
     84        * testing/InternalSettings.cpp:
     85        * testing/Internals.cpp:
     86        Include MainFrame.h instead of Frame.h as needed.
     87
    1882013-09-27  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    289
  • trunk/Source/WebCore/GNUmakefile.list.am

    r156522 r156543  
    42124212        Source/WebCore/page/Location.cpp \
    42134213        Source/WebCore/page/Location.h \
     4214        Source/WebCore/page/MainFrame.cpp \
     4215        Source/WebCore/page/MainFrame.h \
    42144216        Source/WebCore/page/MediaCanStartListener.h \
    42154217        Source/WebCore/page/MouseEventWithHitTestResults.cpp \
  • trunk/Source/WebCore/Target.pri

    r156458 r156543  
    897897    page/History.cpp \
    898898    page/Location.cpp \
     899    page/MainFrame.cpp \
    899900    page/MouseEventWithHitTestResults.cpp \
    900901    page/Navigator.cpp \
  • trunk/Source/WebCore/WebCore.exp.in

    r156522 r156543  
    860860__ZN7WebCore4Page15didMoveOnscreenEv
    861861__ZN7WebCore4Page16countFindMatchesERKN3WTF6StringEjj
     862__ZN7WebCore4Page16frameIsMainFrameEPKNS_5FrameE
    862863__ZN7WebCore4Page16setCanStartMediaEb
    863864__ZN7WebCore4Page16setDefersLoadingEb
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r156458 r156543  
    71787178    <ClCompile Include="..\page\animation\KeyframeAnimation.cpp" />
    71797179    <ClCompile Include="..\page\Location.cpp" />
     7180    <ClCompile Include="..\page\MainFrame.cpp" />
    71807181    <ClCompile Include="..\page\MouseEventWithHitTestResults.cpp" />
    71817182    <ClCompile Include="..\page\Navigator.cpp" />
     
    1882218823    <ClInclude Include="..\page\animation\KeyframeAnimation.h" />
    1882318824    <ClInclude Include="..\page\Location.h" />
     18825    <ClInclude Include="..\page\MainFrame.h" />
    1882418826    <ClInclude Include="..\page\MouseEventWithHitTestResults.h" />
    1882518827    <ClInclude Include="..\page\Navigator.h" />
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r156458 r156543  
    793793      <Filter>page</Filter>
    794794    </ClCompile>
     795    <ClCompile Include="..\page\MainFrame.cpp">
     796      <Filter>page</Filter>
     797    </ClCompile>
    795798    <ClCompile Include="..\page\PrintContext.cpp">
    796799      <Filter>page</Filter>
     
    77127715    </ClInclude>
    77137716    <ClInclude Include="..\page\Location.h">
     7717      <Filter>page</Filter>
     7718    </ClInclude>
     7719    <ClInclude Include="..\page\MainFrame.h">
    77147720      <Filter>page</Filter>
    77157721    </ClInclude>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r156522 r156543  
    28782878                9327A94209968D1A0068A546 /* HTMLOptionsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */; };
    28792879                932871C00B20DEB70049035A /* PlatformMenuDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
     2880                932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932AD70317EFA2C30038F8FF /* MainFrame.cpp */; };
     2881                932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 932AD70417EFA2C30038F8FF /* MainFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28802882                932E16090AF578340025F408 /* FrameLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932E16080AF578340025F408 /* FrameLoader.cpp */; };
    28812883                93309DD6099E64920056E581 /* AppendNodeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309D87099E64910056E581 /* AppendNodeCommand.cpp */; };
     
    94759477                9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOptionsCollection.cpp; sourceTree = "<group>"; };
    94769478                932871BF0B20DEB70049035A /* PlatformMenuDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlatformMenuDescription.h; sourceTree = "<group>"; };
     9479                932AD70317EFA2C30038F8FF /* MainFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainFrame.cpp; sourceTree = "<group>"; };
     9480                932AD70417EFA2C30038F8FF /* MainFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainFrame.h; sourceTree = "<group>"; };
    94779481                932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoader.cpp; sourceTree = "<group>"; };
    94789482                93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; };
     
    1530815312                                BCE1C4190D982980003B02F2 /* Location.h */,
    1530915313                                BCE1C4220D9829F2003B02F2 /* Location.idl */,
     15314                                932AD70317EFA2C30038F8FF /* MainFrame.cpp */,
     15315                                932AD70417EFA2C30038F8FF /* MainFrame.h */,
    1531015316                                BC59DEFA169DEDD80016AC34 /* make_settings.pl */,
    1531115317                                931BCC601124DFCB00BE70DD /* MediaCanStartListener.h */,
     
    2150321509                        buildActionMask = 2147483647;
    2150421510                        files = (
     21511                                932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */,
    2150521512                                FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */,
    2150621513                                9A528E8417D7F52F00AA9518 /* FloatingObjects.h in Headers */,
     
    2570925716                                FD31609412B026F700C1A359 /* FFTConvolver.cpp in Sources */,
    2571025717                                FD31609612B026F700C1A359 /* FFTFrame.cpp in Sources */,
     25718                                932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */,
    2571125719                                FD3160C012B0272A00C1A359 /* FFTFrameMac.cpp in Sources */,
    2571225720                                976D6C80122B8A3D001FD1F7 /* File.cpp in Sources */,
  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r156168 r156543  
    4949#import "Editor.h"
    5050#import "Font.h"
    51 #import "Frame.h"
    5251#import "FrameLoaderClient.h"
    5352#import "FrameSelection.h"
     
    6059#import "HTMLTextAreaElement.h"
    6160#import "LocalizedStrings.h"
     61#import "MainFrame.h"
    6262#import "Page.h"
    6363#import "RenderTextControl.h"
  • trunk/Source/WebCore/bindings/js/PageScriptDebugServer.cpp

    r155229 r156543  
    3737#include "Document.h"
    3838#include "EventLoop.h"
    39 #include "Frame.h"
    4039#include "FrameView.h"
    4140#include "JSDOMWindowCustom.h"
     41#include "MainFrame.h"
    4242#include "Page.h"
    4343#include "PageGroup.h"
  • trunk/Source/WebCore/bindings/js/ScriptProfiler.cpp

    r155736 r156543  
    3131#include "ScriptProfiler.h"
    3232
    33 #include "Frame.h"
    3433#include "GCController.h"
    3534#include "JSDOMBinding.h"
    3635#include "JSDOMWindow.h"
     36#include "MainFrame.h"
    3737#include "Page.h"
    3838#include "ScriptObject.h"
  • trunk/Source/WebCore/bindings/js/ScriptState.cpp

    r155736 r156543  
    3333
    3434#include "Document.h"
    35 #include "Frame.h"
    3635#include "JSDOMWindowBase.h"
     36#include "MainFrame.h"
    3737#include "Node.h"
    3838#include "Page.h"
  • trunk/Source/WebCore/css/MediaQueryEvaluator.cpp

    r156260 r156543  
    3838#include "DOMWindow.h"
    3939#include "FloatRect.h"
    40 #include "Frame.h"
    4140#include "FrameView.h"
    4241#include "InspectorInstrumentation.h"
    4342#include "IntRect.h"
     43#include "MainFrame.h"
    4444#include "MediaFeatureNames.h"
    4545#include "MediaList.h"
  • trunk/Source/WebCore/dom/Document.cpp

    r156444 r156543  
    6868#include "FontLoader.h"
    6969#include "FormController.h"
    70 #include "Frame.h"
    7170#include "FrameLoader.h"
    7271#include "FrameLoaderClient.h"
     
    104103#include "Language.h"
    105104#include "Logging.h"
     105#include "MainFrame.h"
    106106#include "MediaCanStartListener.h"
    107107#include "MediaQueryList.h"
  • trunk/Source/WebCore/history/CachedFrame.cpp

    r156270 r156543  
    3636#include "ExceptionCode.h"
    3737#include "FocusController.h"
    38 #include "Frame.h"
    3938#include "FrameLoader.h"
    4039#include "FrameLoaderClient.h"
     
    4342#include "HistoryItem.h"
    4443#include "Logging.h"
     44#include "MainFrame.h"
    4545#include "Page.h"
    4646#include "PageTransitionEvent.h"
  • trunk/Source/WebCore/history/CachedPage.cpp

    r155150 r156543  
    3030#include "Element.h"
    3131#include "FocusController.h"
    32 #include "Frame.h"
    3332#include "FrameView.h"
     33#include "MainFrame.h"
    3434#include "Node.h"
    3535#include "Page.h"
  • trunk/Source/WebCore/history/PageCache.cpp

    r155529 r156543  
    3737#include "Document.h"
    3838#include "DocumentLoader.h"
    39 #include "Frame.h"
    4039#include "FrameLoader.h"
    4140#include "FrameLoaderClient.h"
     
    4645#include "HistoryItem.h"
    4746#include "Logging.h"
     47#include "MainFrame.h"
    4848#include "Page.h"
    4949#include "Settings.h"
  • trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

    r156408 r156543  
    3535#include "LocalizedStrings.h"
    3636#include "Logging.h"
     37#include "MainFrame.h"
    3738#include "MouseEvent.h"
    3839#include "NodeList.h"
  • trunk/Source/WebCore/inspector/InspectorAgent.cpp

    r155736 r156543  
    3737#include "Document.h"
    3838#include "DocumentLoader.h"
    39 #include "Frame.h"
    4039#include "GraphicsContext.h"
    4140#include "InjectedScriptHost.h"
     
    4746#include "InspectorValues.h"
    4847#include "InstrumentingAgents.h"
     48#include "MainFrame.h"
    4949#include "Page.h"
    5050#include "ResourceRequest.h"
  • trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp

    r155736 r156543  
    3737#include "BindingVisitors.h"
    3838#include "DOMWindow.h"
    39 #include "Frame.h"
    4039#include "HTMLCanvasElement.h"
    4140#include "HTMLNames.h"
     
    4746#include "InspectorState.h"
    4847#include "InstrumentingAgents.h"
     48#include "MainFrame.h"
    4949#include "NodeList.h"
    5050#include "Page.h"
  • trunk/Source/WebCore/inspector/InspectorClient.cpp

    r154658 r156543  
    3535#include "InspectorClient.h"
    3636
    37 #include "Frame.h"
     37#include "MainFrame.h"
    3838#include "Page.h"
    3939#include "ScriptController.h"
  • trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

    r156289 r156543  
    6161#include "File.h"
    6262#include "FileList.h"
    63 #include "Frame.h"
    6463#include "FrameTree.h"
    6564#include "HTMLElement.h"
     
    8079#include "IntRect.h"
    8180#include "JSEventListener.h"
     81#include "MainFrame.h"
    8282#include "MutationEvent.h"
    8383#include "Node.h"
  • trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp

    r155736 r156543  
    3939#include "Document.h"
    4040#include "FloatRect.h"
    41 #include "Frame.h"
    4241#include "FrameLoadRequest.h"
    4342#include "FrameLoader.h"
     
    4746#include "InspectorFrontendHost.h"
    4847#include "InspectorPageAgent.h"
     48#include "MainFrame.h"
    4949#include "Page.h"
    5050#include "ScriptController.h"
  • trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp

    r155736 r156543  
    4141#include "DOMWrapperWorld.h"
    4242#include "Element.h"
    43 #include "Frame.h"
    4443#include "FrameLoader.h"
    4544#include "HitTestResult.h"
     
    4847#include "InspectorController.h"
    4948#include "InspectorFrontendClient.h"
     49#include "MainFrame.h"
    5050#include "Page.h"
    5151#include "Pasteboard.h"
  • trunk/Source/WebCore/inspector/InspectorInputAgent.cpp

    r154658 r156543  
    3737#include "Chrome.h"
    3838#include "EventHandler.h"
    39 #include "Frame.h"
    4039#include "FrameView.h"
    4140#include "IntPoint.h"
    4241#include "IntRect.h"
    4342#include "IntSize.h"
     43#include "MainFrame.h"
    4444#include "Page.h"
    4545#include "PlatformEvent.h"
  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r156422 r156543  
    6565#include "InspectorWorkerAgent.h"
    6666#include "InstrumentingAgents.h"
     67#include "MainFrame.h"
    6768#include "PageDebuggerAgent.h"
    6869#include "PageRuntimeAgent.h"
  • trunk/Source/WebCore/inspector/InspectorOverlay.cpp

    r156292 r156543  
    3636#include "Element.h"
    3737#include "EmptyClients.h"
    38 #include "Frame.h"
    3938#include "FrameView.h"
    4039#include "GraphicsContext.h"
     
    4241#include "InspectorOverlayPage.h"
    4342#include "InspectorValues.h"
     43#include "MainFrame.h"
    4444#include "Node.h"
    4545#include "Page.h"
  • trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

    r154828 r156543  
    6767#include "InspectorValues.h"
    6868#include "InstrumentingAgents.h"
     69#include "MainFrame.h"
    6970#include "MemoryCache.h"
    7071#include "Page.h"
  • trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp

    r155736 r156543  
    3636
    3737#include "Document.h"
    38 #include "Frame.h"
    3938#include "InjectedScript.h"
    4039#include "InjectedScriptManager.h"
     
    4241#include "InspectorState.h"
    4342#include "InstrumentingAgents.h"
     43#include "MainFrame.h"
    4444#include "Page.h"
    4545#include "PageConsole.h"
  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r155894 r156543  
    6161#include "FormState.h"
    6262#include "FormSubmission.h"
    63 #include "Frame.h"
    6463#include "FrameLoadRequest.h"
    6564#include "FrameLoaderClient.h"
     
    8281#include "Logging.h"
    8382#include "MIMETypeRegistry.h"
     83#include "MainFrame.h"
    8484#include "MemoryCache.h"
    8585#include "Page.h"
  • trunk/Source/WebCore/loader/HistoryController.cpp

    r155529 r156543  
    3636#include "Document.h"
    3737#include "DocumentLoader.h"
    38 #include "Frame.h"
    3938#include "FrameLoader.h"
    4039#include "FrameLoaderClient.h"
     
    4443#include "HistoryItem.h"
    4544#include "Logging.h"
     45#include "MainFrame.h"
    4646#include "Page.h"
    4747#include "PageCache.h"
  • trunk/Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp

    r154658 r156543  
    3232
    3333#if ENABLE(MHTML)
     34
    3435#include "MHTMLArchive.h"
    3536
    3637#include "Document.h"
    37 #include "Frame.h"
    3838#include "MHTMLParser.h"
    3939#include "MIMETypeRegistry.h"
     40#include "MainFrame.h"
    4041#include "Page.h"
    4142#include "PageSerializer.h"
     
    4344#include "SchemeRegistry.h"
    4445#include "SharedBuffer.h"
    45 
     46#include <time.h>
    4647#include <wtf/CryptographicallyRandomNumber.h>
    4748#include <wtf/DateMath.h>
     
    5455#include <sys/time.h>
    5556#endif
    56 #include <time.h>
    57 
    5857
    5958namespace WebCore {
     
    243242
    244243}
     244
    245245#endif
  • trunk/Source/WebCore/page/AutoscrollController.cpp

    r156158 r156543  
    3030
    3131#include "EventHandler.h"
    32 #include "Frame.h"
    3332#include "FrameView.h"
    3433#include "HitTestResult.h"
     34#include "MainFrame.h"
    3535#include "Page.h"
    3636#include "RenderBox.h"
  • trunk/Source/WebCore/page/Chrome.cpp

    r155731 r156543  
    3131#include "FileList.h"
    3232#include "FloatRect.h"
    33 #include "Frame.h"
    3433#include "FrameTree.h"
    3534#include "Geolocation.h"
     
    4039#include "Icon.h"
    4140#include "InspectorInstrumentation.h"
     41#include "MainFrame.h"
    4242#include "Page.h"
    4343#include "PageGroupLoadDeferrer.h"
  • trunk/Source/WebCore/page/ContextMenuController.cpp

    r155723 r156543  
    4646#include "ExceptionCodePlaceholder.h"
    4747#include "FormState.h"
    48 #include "Frame.h"
    4948#include "FrameLoadRequest.h"
    5049#include "FrameLoader.h"
     
    5655#include "InspectorController.h"
    5756#include "LocalizedStrings.h"
     57#include "MainFrame.h"
    5858#include "MouseEvent.h"
    5959#include "NavigationAction.h"
  • trunk/Source/WebCore/page/DOMWindow.cpp

    r156424 r156543  
    6262#include "FloatRect.h"
    6363#include "FocusController.h"
    64 #include "Frame.h"
    6564#include "FrameLoadRequest.h"
    6665#include "FrameLoader.h"
     
    7372#include "KURL.h"
    7473#include "Location.h"
     74#include "MainFrame.h"
    7575#include "MediaQueryList.h"
    7676#include "MediaQueryMatcher.h"
  • trunk/Source/WebCore/page/DragController.cpp

    r155785 r156543  
    4646#include "ExceptionCodePlaceholder.h"
    4747#include "FloatRect.h"
    48 #include "Frame.h"
    4948#include "FrameLoadRequest.h"
    5049#include "FrameLoader.h"
     
    6059#include "Image.h"
    6160#include "ImageOrientation.h"
     61#include "MainFrame.h"
    6262#include "MoveSelectionCommand.h"
    6363#include "Page.h"
  • trunk/Source/WebCore/page/EventHandler.cpp

    r156397 r156543  
    4848#include "FloatRect.h"
    4949#include "FocusController.h"
    50 #include "Frame.h"
    5150#include "FrameLoader.h"
    5251#include "FrameSelection.h"
     
    6362#include "InspectorInstrumentation.h"
    6463#include "KeyboardEvent.h"
     64#include "MainFrame.h"
    6565#include "MouseEvent.h"
    6666#include "MouseEventWithHitTestResults.h"
  • trunk/Source/WebCore/page/FocusController.cpp

    r156339 r156543  
    3939#include "EventNames.h"
    4040#include "ExceptionCode.h"
    41 #include "Frame.h"
    4241#include "FrameSelection.h"
    4342#include "FrameTree.h"
     
    5049#include "HitTestResult.h"
    5150#include "KeyboardEvent.h"
     51#include "MainFrame.h"
    5252#include "NodeRenderingTraversal.h"
    5353#include "Page.h"
  • trunk/Source/WebCore/page/Frame.cpp

    r156270 r156543  
    6767#include "JSDOMWindowShell.h"
    6868#include "Logging.h"
     69#include "MainFrame.h"
    6970#include "MathMLNames.h"
    7071#include "MediaFeatureNames.h"
     
    151152}
    152153
    153 inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* frameLoaderClient)
    154     : m_page(page)
    155     , m_settings(&page->settings())
     154Frame::Frame(Page& page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient& frameLoaderClient)
     155    : m_page(&page)
     156    , m_settings(&page.settings())
    156157    , m_treeNode(this, parentFromOwnerElement(ownerElement))
    157     , m_loader(*this, *frameLoaderClient)
     158    , m_loader(*this, frameLoaderClient)
    158159    , m_navigationScheduler(this)
    159160    , m_ownerElement(ownerElement)
     
    171172    , m_activeDOMObjectsAndAnimationsSuspendedCount(0)
    172173{
    173     ASSERT(page);
    174174    AtomicString::init();
    175175    HTMLNames::init();
     
    189189#endif
    190190    } else {
    191         page->incrementSubframeCount();
     191        page.incrementSubframeCount();
    192192        ownerElement->setContentFrame(this);
    193193    }
     
    205205PassRefPtr<Frame> Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client)
    206206{
    207     return adoptRef(new Frame(page, ownerElement, client));
     207    ASSERT(page);
     208    ASSERT(client);
     209    return adoptRef(new Frame(*page, ownerElement, *client));
    208210}
    209211
  • trunk/Source/WebCore/page/Frame.h

    r155591 r156543  
    101101            ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
    102102
    103         ~Frame();
     103        virtual ~Frame();
    104104
    105105        void addDestructionObserver(FrameDestructionObserver*);
     
    198198    // ========
    199199
     200    protected:
     201        Frame(Page&, HTMLFrameOwnerElement*, FrameLoaderClient&);
     202
    200203    private:
    201         Frame(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*);
    202 
    203204        void injectUserScriptsForWorld(DOMWrapperWorld*, const UserScriptVector&, UserScriptInjectionTime);
    204205
     
    243244    private:
    244245        // TiledBackingStoreClient interface
    245         virtual void tiledBackingStorePaintBegin();
    246         virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&);
    247         virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea);
    248         virtual IntRect tiledBackingStoreContentsRect();
    249         virtual IntRect tiledBackingStoreVisibleRect();
    250         virtual Color tiledBackingStoreBackgroundColor() const;
     246        virtual void tiledBackingStorePaintBegin() OVERRIDE FINAL;
     247        virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) OVERRIDE FINAL;
     248        virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) OVERRIDE FINAL;
     249        virtual IntRect tiledBackingStoreContentsRect() OVERRIDE FINAL;
     250        virtual IntRect tiledBackingStoreVisibleRect() OVERRIDE FINAL;
     251        virtual Color tiledBackingStoreBackgroundColor() const OVERRIDE FINAL;
    251252
    252253        OwnPtr<TiledBackingStore> m_tiledBackingStore;
  • trunk/Source/WebCore/page/FrameTree.cpp

    r155894 r156543  
    2323
    2424#include "Document.h"
    25 #include "Frame.h"
    2625#include "FrameView.h"
    2726#include "HTMLFrameOwnerElement.h"
     27#include "MainFrame.h"
    2828#include "Page.h"
    2929#include "PageGroup.h"
  • trunk/Source/WebCore/page/FrameView.cpp

    r156424 r156543  
    4242#include "FontCache.h"
    4343#include "FontLoader.h"
    44 #include "Frame.h"
    4544#include "FrameLoader.h"
    4645#include "FrameLoaderClient.h"
     
    5655#include "InspectorController.h"
    5756#include "InspectorInstrumentation.h"
     57#include "MainFrame.h"
    5858#include "OverflowEvent.h"
    5959#include "ProgressTracker.h"
  • trunk/Source/WebCore/page/GestureTapHighlighter.cpp

    r154658 r156543  
    3232
    3333#include "Element.h"
    34 #include "Frame.h"
    3534#include "FrameView.h"
    3635#include "GraphicsContext.h"
    3736#include "GraphicsTypes.h"
     37#include "MainFrame.h"
    3838#include "Node.h"
    3939#include "Page.h"
  • trunk/Source/WebCore/page/Page.cpp

    r156422 r156543  
    4242#include "FileSystem.h"
    4343#include "FocusController.h"
    44 #include "Frame.h"
    4544#include "FrameLoader.h"
    4645#include "FrameLoaderClient.h"
     
    5453#include "InspectorInstrumentation.h"
    5554#include "Logging.h"
     55#include "MainFrame.h"
    5656#include "MediaCanStartListener.h"
    5757#include "Navigator.h"
     
    143143    , m_progress(ProgressTracker::create())
    144144    , m_backForwardController(createOwned<BackForwardController>(*this, pageClients.backForwardClient))
    145     , m_mainFrame(Frame::create(this, 0, pageClients.loaderClientForMainFrame))
     145    , m_mainFrame(MainFrame::create(*this, *pageClients.loaderClientForMainFrame))
    146146    , m_theme(RenderTheme::themeForPage(this))
    147147    , m_editorClient(pageClients.editorClient)
     
    240240}
    241241
     242bool Page::frameIsMainFrame(const Frame* frame)
     243{
     244    return frame == m_mainFrame.get();
     245}
     246
    242247ArenaSize Page::renderTreeSize() const
    243248{
    244249    ArenaSize total(0, 0);
    245     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
     250    for (const Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
    246251        if (!frame->document())
    247252            continue;
     
    12331238
    12341239    int subframeCount = 0;
    1235     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
     1240    for (const Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
    12361241        ++subframeCount;
    12371242
  • trunk/Source/WebCore/page/Page.h

    r155529 r156543  
    7676class InspectorClient;
    7777class InspectorController;
     78class MainFrame;
    7879class MediaCanStartListener;
    7980class Node;
     
    162163    PlugInClient* plugInClient() const { return m_plugInClient; }
    163164
    164     Frame& mainFrame() const { return *m_mainFrame; }
    165     bool frameIsMainFrame(const Frame* frame) { return frame == m_mainFrame.get(); }
     165    MainFrame& mainFrame() { return *m_mainFrame; }
     166    const MainFrame& mainFrame() const { return *m_mainFrame; }
     167    bool frameIsMainFrame(const Frame*);
    166168
    167169    bool openedByDOM() const;
     
    465467
    466468    const OwnPtr<BackForwardController> m_backForwardController;
    467     const RefPtr<Frame> m_mainFrame;
     469    const RefPtr<MainFrame> m_mainFrame;
    468470
    469471    mutable RefPtr<PluginData> m_pluginData;
  • trunk/Source/WebCore/page/PageGroup.cpp

    r156422 r156543  
    3232#include "Document.h"
    3333#include "DocumentStyleSheetCollection.h"
    34 #include "Frame.h"
    3534#include "GroupSettings.h"
     35#include "MainFrame.h"
    3636#include "Page.h"
    3737#include "PageCache.h"
  • trunk/Source/WebCore/page/PageGroupLoadDeferrer.cpp

    r155731 r156543  
    2424#include "Document.h"
    2525#include "DocumentParser.h"
    26 #include "Frame.h"
     26#include "MainFrame.h"
    2727#include "Page.h"
    2828#include "PageGroup.h"
  • trunk/Source/WebCore/page/PageSerializer.cpp

    r156260 r156543  
    3838#include "Document.h"
    3939#include "Element.h"
    40 #include "Frame.h"
    4140#include "HTMLFrameOwnerElement.h"
    4241#include "HTMLHeadElement.h"
     
    4948#include "Image.h"
    5049#include "MIMETypeRegistry.h"
     50#include "MainFrame.h"
    5151#include "MarkupAccumulator.h"
    5252#include "Page.h"
  • trunk/Source/WebCore/page/PageThrottler.cpp

    r154658 r156543  
    2929#include "Chrome.h"
    3030#include "ChromeClient.h"
    31 #include "Frame.h"
     31#include "MainFrame.h"
    3232#include "Page.h"
    3333#include "PageActivityAssertionToken.h"
  • trunk/Source/WebCore/page/Settings.cpp

    r156337 r156543  
    3535#include "Font.h"
    3636#include "FontGenericFamilies.h"
    37 #include "Frame.h"
    3837#include "FrameTree.h"
    3938#include "FrameView.h"
     
    4140#include "HistoryItem.h"
    4241#include "InspectorInstrumentation.h"
     42#include "MainFrame.h"
    4343#include "Page.h"
    4444#include "PageCache.h"
  • trunk/Source/WebCore/page/SpatialNavigation.cpp

    r155507 r156543  
    3030#include "SpatialNavigation.h"
    3131
    32 #include "Frame.h"
    3332#include "FrameTree.h"
    3433#include "FrameView.h"
     
    3837#include "HTMLNames.h"
    3938#include "IntRect.h"
     39#include "MainFrame.h"
    4040#include "Node.h"
    4141#include "Page.h"
     
    4646namespace WebCore {
    4747
    48 static RectsAlignment alignmentForRects(FocusDirection, const LayoutRect&, const LayoutRect&, const LayoutSize& viewSize);
    4948static bool areRectsFullyAligned(FocusDirection, const LayoutRect&, const LayoutRect&);
    5049static bool areRectsPartiallyAligned(FocusDirection, const LayoutRect&, const LayoutRect&);
  • trunk/Source/WebCore/page/mac/DragControllerMac.mm

    r155731 r156543  
    2828
    2929#if ENABLE(DRAG_SUPPORT)
     30
    3031#import "Clipboard.h"
    3132#import "DOMElementInternal.h"
     
    3334#import "DragData.h"
    3435#import "Element.h"
    35 #import "Frame.h"
    3636#import "FrameView.h"
     37#import "MainFrame.h"
    3738#import "Page.h"
    3839#import "Pasteboard.h"
  • trunk/Source/WebCore/page/mac/PageMac.cpp

    r154558 r156543  
    2828
    2929#include "config.h"
     30#include "Page.h"
     31
    3032#include "DocumentLoader.h"
    31 #include "Frame.h"
    3233#include "FrameLoader.h"
    3334#include "FrameTree.h"
    34 #include "Page.h"
     35#include "MainFrame.h"
    3536
    3637namespace WebCore {
  • trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

    r155164 r156543  
    2929
    3030#include "Document.h"
    31 #include "Frame.h"
    3231#include "FrameView.h"
    3332#include "GraphicsLayer.h"
    3433#include "IntRect.h"
     34#include "MainFrame.h"
    3535#include "Page.h"
    3636#include "PlatformWheelEvent.h"
  • trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm

    r154658 r156543  
    3131
    3232#include "GraphicsLayer.h"
    33 #include "Frame.h"
    3433#include "FrameView.h"
    3534#include "IntRect.h"
     35#include "MainFrame.h"
    3636#include "Page.h"
    3737#include "PlatformWheelEvent.h"
     
    4949#include "ScrollingTree.h"
    5050#include "TiledBacking.h"
    51 
    5251#include <wtf/Functional.h>
    5352#include <wtf/MainThread.h>
  • trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp

    r154658 r156543  
    2828
    2929#if USE(COORDINATED_GRAPHICS)
     30
    3031#include "CompositingCoordinator.h"
    3132
    32 #include "Frame.h"
    3333#include "FrameView.h"
    3434#include "GraphicsContext.h"
    3535#include "InspectorController.h"
     36#include "MainFrame.h"
    3637#include "Page.h"
    3738#include "Settings.h"
    3839#include <wtf/CurrentTime.h>
    3940#include <wtf/TemporaryChange.h>
     41
     42// FIXME: Having this in the platform directory is a layering violation. This does not belong here.
    4043
    4144namespace WebCore {
  • trunk/Source/WebCore/plugins/DOMMimeType.cpp

    r155194 r156543  
    2121
    2222#include "DOMPlugin.h"
    23 #include "Frame.h"
    2423#include "FrameLoader.h"
    2524#include "FrameLoaderClient.h"
     25#include "MainFrame.h"
    2626#include "Page.h"
    2727#include "PluginData.h"
  • trunk/Source/WebCore/storage/StorageEventDispatcher.cpp

    r154658 r156543  
    3030#include "DOMWindow.h"
    3131#include "EventNames.h"
    32 #include "Frame.h"
    3332#include "InspectorInstrumentation.h"
     33#include "MainFrame.h"
    3434#include "Page.h"
    3535#include "PageGroup.h"
  • trunk/Source/WebCore/svg/graphics/SVGImage.cpp

    r156391 r156543  
    3434#include "DocumentLoader.h"
    3535#include "ElementIterator.h"
    36 #include "Frame.h"
    3736#include "FrameView.h"
    3837#include "ImageBuffer.h"
    3938#include "ImageObserver.h"
    4039#include "IntRect.h"
     40#include "MainFrame.h"
    4141#include "RenderSVGRoot.h"
    4242#include "RenderStyle.h"
  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r156435 r156543  
    3131#include "Document.h"
    3232#include "ExceptionCode.h"
    33 #include "Frame.h"
    3433#include "FrameView.h"
    3534#include "Language.h"
    3635#include "LocaleToScriptMapping.h"
     36#include "MainFrame.h"
    3737#include "Page.h"
    3838#include "PageGroup.h"
  • trunk/Source/WebCore/testing/Internals.cpp

    r156522 r156543  
    4747#include "ExceptionCode.h"
    4848#include "FormController.h"
    49 #include "Frame.h"
    5049#include "FrameLoader.h"
    5150#include "FrameView.h"
     
    6968#include "IntRect.h"
    7069#include "Language.h"
     70#include "MainFrame.h"
    7171#include "MallocStatistics.h"
    7272#include "MemoryCache.h"
  • trunk/Source/WebKit/efl/ChangeLog

    r156424 r156543  
     12013-09-27  Darin Adler  <darin@apple.com>
     2
     3        Add empty MainFrame class
     4        https://bugs.webkit.org/show_bug.cgi?id=121770
     5
     6        Reviewed by Andreas Kling.
     7
     8        * WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
     9        * WebCoreSupport/InspectorClientEfl.cpp:
     10        * ewk/ewk_view.cpp:
     11        Include MainFrame.h instead of Frame.h as needed.
     12
    1132013-09-25  Brent Fulgham  <bfulgham@apple.com>
    214
  • trunk/Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp

    r154658 r156543  
    2828#include "GraphicsLayerTextureMapper.h"
    2929#include "HostWindow.h"
     30#include "MainFrame.h"
    3031#include "PageClientEfl.h"
    3132#include "TextureMapperGL.h"
  • trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp

    r155475 r156543  
    2323
    2424#if ENABLE(INSPECTOR)
     25
    2526#include "EflInspectorUtilities.h"
    2627#include "InspectorController.h"
     28#include "MainFrame.h"
    2729#include "NotImplemented.h"
    2830#include "ewk_view_private.h"
  • trunk/Source/WebKit/efl/ewk/ewk_view.cpp

    r156424 r156543  
    3939#include "EventHandler.h"
    4040#include "FocusController.h"
    41 #include "Frame.h"
    4241#include "FrameLoaderClientEfl.h"
    4342#include "FrameSelection.h"
     
    5352#include "JSDOMWindow.h"
    5453#include "JSLock.h"
     54#include "MainFrame.h"
    5555#include "NetworkStorageSession.h"
    5656#include "Operations.h"
  • trunk/Source/WebKit/gtk/ChangeLog

    r156424 r156543  
     12013-09-27  Darin Adler  <darin@apple.com>
     2
     3        Add empty MainFrame class
     4        https://bugs.webkit.org/show_bug.cgi?id=121770
     5
     6        Reviewed by Andreas Kling.
     7
     8        * WebCoreSupport/AcceleratedCompositingContextGL.cpp:
     9        * WebCoreSupport/ChromeClientGtk.cpp:
     10        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     11        * WebCoreSupport/GtkAdjustmentWatcher.cpp:
     12        * webkit/webkitwebframe.cpp:
     13        * webkit/webkitwebview.cpp:
     14        * webkit/webkitviewportattributes.cpp:
     15        Include MainFrame.h instead of Frame.h as needed.
     16
    1172013-09-25  Brent Fulgham  <bfulgham@apple.com>
    218
  • trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp

    r156261 r156543  
    2323
    2424#include "CairoUtilities.h"
    25 #include "Frame.h"
    2625#include "FrameView.h"
    2726#include "GraphicsLayerTextureMapper.h"
    2827#include "GtkVersioning.h"
     28#include "MainFrame.h"
    2929#include "PlatformContextCairo.h"
    3030#include "Settings.h"
  • trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r155507 r156543  
    4747#include "IntRect.h"
    4848#include "KURL.h"
     49#include "MainFrame.h"
    4950#include "NavigationAction.h"
    5051#include "NotImplemented.h"
  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r155591 r156543  
    5353#include "Language.h"
    5454#include "MIMETypeRegistry.h"
     55#include "MainFrame.h"
    5556#include "MouseEvent.h"
    5657#include "NotImplemented.h"
  • trunk/Source/WebKit/gtk/WebCoreSupport/GtkAdjustmentWatcher.cpp

    r154658 r156543  
    2020#include "GtkAdjustmentWatcher.h"
    2121
    22 #include "Frame.h"
    2322#include "FrameView.h"
     23#include "MainFrame.h"
    2424#include "Page.h"
    2525#include "Scrollbar.h"
  • trunk/Source/WebKit/gtk/webkit/webkitviewportattributes.cpp

    r154658 r156543  
    2424#include "Chrome.h"
    2525#include "Document.h"
    26 #include "Frame.h"
     26#include "MainFrame.h"
    2727#include "Page.h"
    2828#include "webkitglobalsprivate.h"
  • trunk/Source/WebKit/gtk/webkit/webkitwebframe.cpp

    r154658 r156543  
    4949#include "JSDOMWindow.h"
    5050#include "JSElement.h"
     51#include "MainFrame.h"
    5152#include "PlatformContextCairo.h"
    5253#include "PrintContext.h"
  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r156424 r156543  
    7272#include "HitTestResult.h"
    7373#include "InspectorClientGtk.h"
     74#include "MainFrame.h"
    7475#include "MemoryCache.h"
    7576#include "MouseEventWithHitTestResults.h"
  • trunk/Source/WebKit/mac/ChangeLog

    r156522 r156543  
     12013-09-27  Darin Adler  <darin@apple.com>
     2
     3        Add empty MainFrame class
     4        https://bugs.webkit.org/show_bug.cgi?id=121770
     5
     6        Reviewed by Andreas Kling.
     7
     8        * WebCoreSupport/WebDragClient.mm:
     9        * WebCoreSupport/WebInspectorClient.mm:
     10        * WebCoreSupport/WebPlatformStrategies.mm:
     11        * WebView/WebFrame.mm:
     12        * WebView/WebHTMLView.mm:
     13        * WebView/WebView.mm:
     14        Include MainFrame.h instead of Frame.h as needed.
     15
    1162013-09-26  Eric Carlson  <eric.carlson@apple.com>
    217
  • trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm

    r154658 r156543  
    4747#import <WebCore/EditorClient.h>
    4848#import <WebCore/EventHandler.h>
    49 #import <WebCore/Frame.h>
    5049#import <WebCore/FrameView.h>
    5150#import <WebCore/Image.h>
     51#import <WebCore/MainFrame.h>
    5252#import <WebCore/Page.h>
    5353#import <WebCore/Pasteboard.h>
  • trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm

    r154828 r156543  
    4444#import "WebViewInternal.h"
    4545#import <algorithm>
    46 #import <WebCore/Frame.h>
    4746#import <WebCore/InspectorController.h>
    4847#import <WebCore/InspectorFrontendClient.h>
     48#import <WebCore/MainFrame.h>
    4949#import <WebCore/Page.h>
    5050#import <WebCore/ScriptController.h>
  • trunk/Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm

    r156350 r156543  
    3131#import <WebCore/BlockExceptions.h>
    3232#import <WebCore/Color.h>
     33#import <WebCore/MainFrame.h>
    3334#import <WebCore/Page.h>
    3435#import <WebCore/PageGroup.h>
  • trunk/Source/WebKit/mac/WebView/WebFrame.mm

    r155591 r156543  
    7070#import <WebCore/EventHandler.h>
    7171#import <WebCore/EventNames.h>
    72 #import <WebCore/Frame.h>
    7372#import <WebCore/FrameLoadRequest.h>
    7473#import <WebCore/FrameLoader.h>
     
    8281#import <WebCore/JSNode.h>
    8382#import <WebCore/LegacyWebArchive.h>
     83#import <WebCore/MainFrame.h>
    8484#import <WebCore/Page.h>
    8585#import <WebCore/PlatformEventFactoryMac.h>
  • trunk/Source/WebKit/mac/WebView/WebHTMLView.mm

    r155641 r156543  
    105105#import <WebCore/LegacyWebArchive.h>
    106106#import <WebCore/MIMETypeRegistry.h>
     107#import <WebCore/MainFrame.h>
    107108#import <WebCore/Page.h>
    108109#import <WebCore/PlatformEventFactoryMac.h>
  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r156522 r156543  
    132132#import <WebCore/ExceptionHandlers.h>
    133133#import <WebCore/FocusController.h>
    134 #import <WebCore/Frame.h>
    135134#import <WebCore/FrameLoader.h>
    136135#import <WebCore/FrameSelection.h>
     
    152151#import <WebCore/Logging.h>
    153152#import <WebCore/MIMETypeRegistry.h>
     153#import <WebCore/MainFrame.h>
    154154#import <WebCore/MemoryPressureHandler.h>
    155155#import <WebCore/NodeList.h>
  • trunk/Source/WebKit/qt/ChangeLog

    r156535 r156543  
     12013-09-27  Darin Adler  <darin@apple.com>
     2
     3        Add empty MainFrame class
     4        https://bugs.webkit.org/show_bug.cgi?id=121770
     5
     6        Reviewed by Andreas Kling.
     7
     8        * Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:
     9        * Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:
     10        * Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp:
     11        * Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     12        * Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp:
     13        * Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp:
     14        Include MainFrame.h instead of Frame.h as needed.
     15
    1162013-09-27  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    217
  • trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

    r155507 r156543  
    3838#include "FileChooser.h"
    3939#include "FileIconLoader.h"
    40 #include "Frame.h"
    4140#include "FrameLoadRequest.h"
    4241#include "FrameLoader.h"
     
    4443#include "FrameView.h"
    4544#include "Geolocation.h"
    46 #if USE(ACCELERATED_COMPOSITING)
    47 #include "GraphicsLayer.h"
    48 #endif
    4945#include "HTMLFormElement.h"
    5046#include "HitTestResult.h"
    5147#include "Icon.h"
     48#include "MainFrame.h"
    5249#include "NavigationAction.h"
    5350#include "NetworkingContext.h"
     
    6966#include "qwebsecurityorigin_p.h"
    7067#include "qwebsettings.h"
    71 
    7268#include <qabstractanimation.h>
    7369#include <qdebug.h>
     
    7672#include <wtf/CurrentTime.h>
    7773#include <wtf/OwnPtr.h>
     74
     75#if USE(ACCELERATED_COMPOSITING)
     76#include "GraphicsLayer.h"
     77#endif
    7878
    7979#if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA))
  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r156424 r156543  
    4040#include "FocusController.h"
    4141#include "Font.h"
    42 #include "Frame.h"
    4342#include "FrameLoadRequest.h"
    4443#include "FrameLoaderClientQt.h"
     
    5554#include "InspectorController.h"
    5655#include "JSNode.h"
     56#include "MainFrame.h"
    5757#include "NodeList.h"
    5858#include "NotificationPresenterClientQt.h"
  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r156330 r156543  
    5050#include "HistoryItem.h"
    5151#include "HitTestResult.h"
    52 #if ENABLE(ICONDATABASE)
    53 #include "IconDatabaseClientQt.h"
    54 #endif
    5552#include "JSDOMWindowBase.h"
    5653#include "MIMETypeRegistry.h"
     54#include "MainFrame.h"
    5755#include "MouseEvent.h"
    5856#include "NotImplemented.h"
     
    8381#include "qwebpluginfactory.h"
    8482#include "qwebsettings.h"
    85 
    8683#include <QCoreApplication>
    8784#include <QDebug>
     
    9390#include <wtf/OwnPtr.h>
    9491#include <wtf/text/StringBuilder.h>
     92
     93#if ENABLE(ICONDATABASE)
     94#include "IconDatabaseClientQt.h"
     95#endif
    9596
    9697static QMap<unsigned long, QString> dumpAssignedUrls;
  • trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp

    r154658 r156543  
    3232#include "InspectorClientQt.h"
    3333
    34 #include "Frame.h"
    3534#include "FrameView.h"
    3635#include "InspectorController.h"
    3736#include "InspectorFrontend.h"
    3837#include "InspectorServerQt.h"
     38#include "MainFrame.h"
    3939#include "NotImplemented.h"
    4040#include "Page.h"
  • trunk/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp

    r154658 r156543  
    3737#include "EventNames.h"
    3838#include "KURL.h"
     39#include "MainFrame.h"
    3940#include "Page.h"
    4041#include "QWebFrameAdapter.h"
  • trunk/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp

    r154983 r156543  
    2828#include "EventHandler.h"
    2929#include "FocusController.h"
    30 #include "Frame.h"
    3130#include "FrameLoadRequest.h"
    3231#include "FrameLoaderClientQt.h"
     
    3837#include "JSDOMWindowBase.h"
    3938#include "KURL.h"
     39#include "MainFrame.h"
    4040#include "NavigationScheduler.h"
    4141#include "NetworkingContext.h"
     
    5050#include "TextureMapperLayerClientQt.h"
    5151#include "TiledBackingStore.h"
    52 #if ENABLE(GESTURE_EVENTS)
    53 #include "PlatformGestureEvent.h"
    54 #include "WebEventConversion.h"
    55 #endif
    5652#include "htmlediting.h"
    5753#include "markup.h"
     
    6056#include "qwebsecurityorigin_p.h"
    6157#include "qwebsettings.h"
    62 
    6358#include <IntRect.h>
    6459#include <IntSize.h>
    6560#include <QFileInfo>
    6661#include <QNetworkRequest>
     62
     63#if ENABLE(GESTURE_EVENTS)
     64#include "PlatformGestureEvent.h"
     65#include "WebEventConversion.h"
     66#endif
    6767
    6868using namespace WebCore;
  • trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp

    r155672 r156543  
    3030#include "ContextMenuClientQt.h"
    3131#include "ContextMenuController.h"
    32 #if ENABLE(DEVICE_ORIENTATION)
    33 #include "DeviceMotionClientMock.h"
    34 #include "DeviceMotionController.h"
    35 #include "DeviceOrientationClientMock.h"
    36 #include "DeviceOrientationController.h"
    37 #if HAVE(QTSENSORS)
    38 #include "DeviceMotionClientQt.h"
    39 #include "DeviceOrientationClientQt.h"
    40 #endif
    41 #endif
    4232#include "DocumentLoader.h"
    4333#include "DragClientQt.h"
     
    5242#include "FrameSelection.h"
    5343#include "FrameView.h"
    54 #if ENABLE(GEOLOCATION)
    55 #include "GeolocationClientMock.h"
    56 #include "GeolocationController.h"
    57 #if HAVE(QTLOCATION)
    58 #include "GeolocationClientQt.h"
    59 #endif
    60 #endif
    6144#include "GeolocationPermissionClientQt.h"
    6245#include "HTMLFrameOwnerElement.h"
     
    6952#include "LocalizedStrings.h"
    7053#include "MIMETypeRegistry.h"
     54#include "MainFrame.h"
    7155#include "MemoryCache.h"
    7256#include "NetworkingContext.h"
     
    10791#include <QWheelEvent>
    10892
     93#if ENABLE(DEVICE_ORIENTATION)
     94#include "DeviceMotionClientMock.h"
     95#include "DeviceMotionController.h"
     96#include "DeviceOrientationClientMock.h"
     97#include "DeviceOrientationController.h"
     98#if HAVE(QTSENSORS)
     99#include "DeviceMotionClientQt.h"
     100#include "DeviceOrientationClientQt.h"
     101#endif
     102#endif
     103
     104#if ENABLE(GEOLOCATION)
     105#include "GeolocationClientMock.h"
     106#include "GeolocationController.h"
     107#if HAVE(QTLOCATION)
     108#include "GeolocationClientQt.h"
     109#endif
     110#endif
     111
    109112// from text/qfont.cpp
    110113QT_BEGIN_NAMESPACE
  • trunk/Source/WebKit/win/ChangeLog

    r156433 r156543  
     12013-09-27  Darin Adler  <darin@apple.com>
     2
     3        Add empty MainFrame class
     4        https://bugs.webkit.org/show_bug.cgi?id=121770
     5
     6        Reviewed by Andreas Kling.
     7
     8        * win/WebCoreSupport/WebDragClient.cpp:
     9        * win/WebCoreSupport/WebContextMenuClient.cpp:
     10        * win/WebDropSource.cpp:
     11        * win/WebFrame.cpp:
     12        * win/WebView.cpp:
     13        Include MainFrame.h instead of Frame.h as needed.
     14
    1152013-09-25  Roger Fong  <roger_fong@apple.com>
    216
  • trunk/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp

    r154658 r156543  
    3131#include "WebLocalizableStrings.h"
    3232#include "WebView.h"
    33 
    3433#include <WebCore/ContextMenu.h>
    3534#include <WebCore/ContextMenuController.h>
    3635#include <WebCore/Editor.h>
    3736#include <WebCore/Event.h>
    38 #include <WebCore/Frame.h>
     37#include <WebCore/FrameLoadRequest.h>
    3938#include <WebCore/FrameLoader.h>
    40 #include <WebCore/FrameLoadRequest.h>
     39#include <WebCore/MainFrame.h>
     40#include <WebCore/NotImplemented.h>
    4141#include <WebCore/Page.h>
    4242#include <WebCore/ResourceRequest.h>
    43 #include <WebCore/NotImplemented.h>
    4443
    4544using namespace WebCore;
  • trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp

    r154658 r156543  
    2626#include "config.h"
    2727#include "WebDragClient.h"
     28
    2829#include "WebDropSource.h"
    2930#include "WebKitGraphics.h"
    3031#include "WebView.h"
    31 
    3232#include <WebCore/Clipboard.h>
    3333#include <WebCore/DragController.h>
    3434#include <WebCore/DragData.h>
    3535#include <WebCore/EventHandler.h>
     36#include <WebCore/FrameView.h>
     37#include <WebCore/GraphicsContext.h>
     38#include <WebCore/MainFrame.h>
    3639#include <WebCore/Page.h>
    3740#include <WebCore/Pasteboard.h>
    3841#include <WebCore/PlatformMouseEvent.h>
    39 #include <WebCore/Frame.h>
    40 #include <WebCore/FrameView.h>
    41 #include <WebCore/GraphicsContext.h>
    4242#include <shlobj.h>
    4343
  • trunk/Source/WebKit/win/WebDropSource.cpp

    r154658 r156543  
    3333#include <WebCore/DragActions.h>
    3434#include <WebCore/EventHandler.h>
    35 #include <WebCore/Frame.h>
    3635#include <WebCore/FrameView.h>
     36#include <WebCore/MainFrame.h>
    3737#include <WebCore/Page.h>
    3838#include <WebCore/PlatformMouseEvent.h>
  • trunk/Source/WebKit/win/WebFrame.cpp

    r154658 r156543  
    6565#include <WebCore/EventHandler.h>
    6666#include <WebCore/FormState.h>
    67 #include <WebCore/Frame.h>
    6867#include <WebCore/FrameLoader.h>
    6968#include <WebCore/FrameLoadRequest.h>
     
    8281#include <WebCore/JSDOMWindow.h>
    8382#include <WebCore/KeyboardEvent.h>
     83#include <WebCore/MainFrame.h>
    8484#include <WebCore/MouseRelatedEvent.h>
    8585#include <WebCore/NotImplemented.h>
  • trunk/Source/WebKit/win/WebView.cpp

    r156433 r156543  
    9090#include <WebCore/FloatQuad.h>
    9191#include <WebCore/FocusController.h>
    92 #include <WebCore/Frame.h>
    9392#include <WebCore/FrameLoader.h>
    9493#include <WebCore/FrameSelection.h>
     
    112111#include <WebCore/Logging.h>
    113112#include <WebCore/MIMETypeRegistry.h>
     113#include <WebCore/MainFrame.h>
    114114#include <WebCore/MemoryCache.h>
    115115#include <WebCore/NotImplemented.h>
  • trunk/Source/WebKit2/ChangeLog

    r156535 r156543  
     12013-09-27  Darin Adler  <darin@apple.com>
     2
     3        Add empty MainFrame class
     4        https://bugs.webkit.org/show_bug.cgi?id=121770
     5
     6        Reviewed by Andreas Kling.
     7
     8        * WebProcess/FullScreen/WebFullScreenManager.cpp:
     9        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
     10        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     11        * WebProcess/Plugins/PluginView.cpp:
     12        * WebProcess/Storage/StorageAreaMap.cpp:
     13        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     14        * WebProcess/WebCoreSupport/WebContextMenuClient.cpp:
     15        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     16        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
     17        * WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm:
     18        * WebProcess/WebPage/FindController.cpp:
     19        * WebProcess/WebPage/PageOverlay.cpp:
     20        * WebProcess/WebPage/WebInspector.cpp:
     21        * WebProcess/WebPage/WebPage.cpp:
     22        * WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp:
     23        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
     24        * WebProcess/WebPage/mac/LayerTreeHostMac.mm:
     25        * WebProcess/WebPage/mac/RemoteLayerTreeContext.mm:
     26        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
     27        * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm:
     28        * WebProcess/WebPage/mac/WebPageMac.mm:
     29        Include MainFrame.h instead of Frame.h as needed.
     30
    1312013-09-27  Allan Sandfeld Jensen  <allan.jensen@digia.com>
    232
  • trunk/Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp

    r154877 r156543  
    3535#include <WebCore/Color.h>
    3636#include <WebCore/Element.h>
    37 #include <WebCore/Frame.h>
    3837#include <WebCore/FrameView.h>
     38#include <WebCore/MainFrame.h>
    3939#include <WebCore/Page.h>
    4040#include <WebCore/RenderLayer.h>
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

    r156063 r156543  
    4747#include "WebURL.h"
    4848#include "WebURLRequest.h"
    49 
    5049#include <WebCore/AXObjectCache.h>
    5150#include <WebCore/AccessibilityObject.h>
    52 #include <WebCore/Frame.h>
    5351#include <WebCore/KURL.h>
     52#include <WebCore/MainFrame.h>
    5453#include <WebCore/Page.h>
    5554#include <wtf/StdLibExtras.h>
  • trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

    r156424 r156543  
    5151#include <WebCore/ApplicationCache.h>
    5252#include <WebCore/ApplicationCacheStorage.h>
    53 #include <WebCore/Frame.h>
    5453#include <WebCore/FrameLoader.h>
    5554#include <WebCore/FrameView.h>
     
    6059#include <WebCore/JSDOMWindow.h>
    6160#include <WebCore/JSNotification.h>
     61#include <WebCore/MainFrame.h>
    6262#include <WebCore/Page.h>
    6363#include <WebCore/PageGroup.h>
  • trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

    r155888 r156543  
    4343#include <WebCore/EventHandler.h>
    4444#include <WebCore/FocusController.h>
    45 #include <WebCore/Frame.h>
    4645#include <WebCore/FrameLoadRequest.h>
    4746#include <WebCore/FrameLoader.h>
     
    5352#include <WebCore/HostWindow.h>
    5453#include <WebCore/MIMETypeRegistry.h>
     54#include <WebCore/MainFrame.h>
    5555#include <WebCore/MouseEvent.h>
    5656#include <WebCore/NetscapePlugInStreamLoader.h>
  • trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp

    r154658 r156543  
    3636#include "WebProcess.h"
    3737#include <WebCore/DOMWindow.h>
    38 #include <WebCore/Frame.h>
     38#include <WebCore/MainFrame.h>
    3939#include <WebCore/Page.h>
    4040#include <WebCore/PageGroup.h>
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r156472 r156543  
    5656#include <WebCore/FileChooser.h>
    5757#include <WebCore/FileIconLoader.h>
    58 #include <WebCore/Frame.h>
    5958#include <WebCore/FrameLoadRequest.h>
    6059#include <WebCore/FrameLoader.h>
     
    6564#include <WebCore/HTMLPlugInImageElement.h>
    6665#include <WebCore/Icon.h>
     66#include <WebCore/MainFrame.h>
    6767#include <WebCore/NotImplemented.h>
    6868#include <WebCore/Page.h>
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp

    r154658 r156543  
    3535#include <WebCore/ContextMenu.h>
    3636#include <WebCore/Event.h>
    37 #include <WebCore/Frame.h>
    3837#include <WebCore/FrameLoader.h>
     38#include <WebCore/MainFrame.h>
    3939#include <WebCore/NotImplemented.h>
    4040#include <WebCore/Page.h>
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r155615 r156543  
    5656#include <WebCore/DocumentLoader.h>
    5757#include <WebCore/FormState.h>
    58 #include <WebCore/Frame.h>
    5958#include <WebCore/FrameLoadRequest.h>
    6059#include <WebCore/FrameLoader.h>
     
    6564#include <WebCore/HistoryItem.h>
    6665#include <WebCore/MIMETypeRegistry.h>
     66#include <WebCore/MainFrame.h>
    6767#include <WebCore/MouseEvent.h>
    6868#include <WebCore/NotImplemented.h>
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp

    r156350 r156543  
    4343#include "WebProcessProxyMessages.h"
    4444#include <WebCore/Color.h>
    45 #include <WebCore/Frame.h>
    4645#include <WebCore/KURL.h>
    4746#include <WebCore/LoaderStrategy.h>
     47#include <WebCore/MainFrame.h>
    4848#include <WebCore/NetworkStorageSession.h>
    4949#include <WebCore/NetworkingContext.h>
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm

    r154658 r156543  
    3333#import "WebPage.h"
    3434#import "WebPageProxyMessages.h"
    35 #import <WebCore/Frame.h>
    3635#import <WebCore/FrameView.h>
     36#import <WebCore/MainFrame.h>
    3737#import <WebCore/Page.h>
    3838#import <wtf/text/WTFString.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp

    r154883 r156543  
    3636#include <WebCore/FloatQuad.h>
    3737#include <WebCore/FocusController.h>
    38 #include <WebCore/Frame.h>
    3938#include <WebCore/FrameView.h>
    4039#include <WebCore/GraphicsContext.h>
     40#include <WebCore/MainFrame.h>
    4141#include <WebCore/Page.h>
    4242#include <WebCore/PluginDocument.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp

    r154658 r156543  
    2929#include "WebPage.h"
    3030#include "WebProcess.h"
    31 #include <WebCore/Frame.h>
    3231#include <WebCore/FrameView.h>
    3332#include <WebCore/GraphicsContext.h>
     33#include <WebCore/MainFrame.h>
    3434#include <WebCore/Page.h>
    3535#include <WebCore/ScrollbarTheme.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp

    r154828 r156543  
    3434#include "WebPageCreationParameters.h"
    3535#include "WebProcess.h"
    36 #include <WebCore/Frame.h>
    3736#include <WebCore/InspectorController.h>
    3837#include <WebCore/InspectorFrontendChannel.h>
    3938#include <WebCore/InspectorFrontendClient.h>
     39#include <WebCore/MainFrame.h>
    4040#include <WebCore/Page.h>
    4141#include <WebCore/ScriptController.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r156472 r156543  
    9999#include <WebCore/FocusController.h>
    100100#include <WebCore/FormState.h>
    101 #include <WebCore/Frame.h>
    102101#include <WebCore/FrameLoadRequest.h>
    103102#include <WebCore/FrameLoaderTypes.h>
     
    112111#include <WebCore/KeyboardEvent.h>
    113112#include <WebCore/MIMETypeRegistry.h>
     113#include <WebCore/MainFrame.h>
    114114#include <WebCore/MouseEvent.h>
    115115#include <WebCore/Page.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp

    r154658 r156543  
    3131#include "WebPage.h"
    3232#include <WebCore/AXObjectCache.h>
    33 #include <WebCore/Frame.h>
     33#include <WebCore/MainFrame.h>
    3434#include <WebCore/Page.h>
    3535
  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

    r155533 r156543  
    4141#endif
    4242
    43 #include <WebCore/Frame.h>
    4443#include <WebCore/FrameView.h>
    4544#include <WebCore/GLContext.h>
    4645#include <WebCore/GraphicsLayerTextureMapper.h>
     46#include <WebCore/MainFrame.h>
    4747#include <WebCore/Page.h>
    4848#include <WebCore/Settings.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm

    r155414 r156543  
    3232#import "WebProcess.h"
    3333#import <QuartzCore/CATransaction.h>
    34 #import <WebCore/Frame.h>
    3534#import <WebCore/FrameView.h>
    3635#import <WebCore/GraphicsLayerCA.h>
     36#import <WebCore/MainFrame.h>
    3737#import <WebCore/PlatformCALayer.h>
    3838#import <WebCore/Settings.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm

    r154658 r156543  
    3131#import "RemoteLayerTreeHostMessages.h"
    3232#import "WebPage.h"
    33 #import <WebCore/Frame.h>
    3433#import <WebCore/FrameView.h>
     34#import <WebCore/MainFrame.h>
    3535#import <WebCore/Page.h>
    3636#import <wtf/PassOwnPtr.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

    r156472 r156543  
    3737#import "WebProcess.h"
    3838#import <QuartzCore/QuartzCore.h>
    39 #import <WebCore/Frame.h>
    4039#import <WebCore/FrameView.h>
    4140#import <WebCore/GraphicsContext.h>
    4241#import <WebCore/GraphicsLayerCA.h>
     42#import <WebCore/MainFrame.h>
    4343#import <WebCore/Page.h>
    4444#import <WebCore/RenderView.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm

    r154963 r156543  
    3636#import "WKStringCF.h"
    3737#import <WebCore/AXObjectCache.h>
    38 #import <WebCore/Frame.h>
    3938#import <WebCore/FrameView.h>
     39#import <WebCore/MainFrame.h>
    4040#import <WebCore/Page.h>
    4141#import <WebCore/ScrollView.h>
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r154877 r156543  
    4949#import <WebCore/EventHandler.h>
    5050#import <WebCore/FocusController.h>
    51 #import <WebCore/Frame.h>
    5251#import <WebCore/FrameLoader.h>
    5352#import <WebCore/FrameView.h>
     
    5655#import <WebCore/KeyboardEvent.h>
    5756#import <WebCore/MIMETypeRegistry.h>
     57#import <WebCore/MainFrame.h>
    5858#import <WebCore/NetworkingContext.h>
    5959#import <WebCore/Page.h>
  • trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

    r156403 r156543  
    517517        self._clean_lines = clean_lines
    518518        self._parameter_list = None
    519 
    520     def modifiers_and_return_type(self):
    521         """Returns the modifiers and the return type."""
    522         # Go backwards from where the function name is until we encounter one of several things:
    523         #   ';' or '{' or '}' or 'private:', etc. or '#' or return Position(0, 0)
    524         elided = self._clean_lines.elided
    525         start_modifiers = _rfind_in_lines(r';|\{|\}|((private|public|protected):)|(#.*)',
    526                                           elided, self.parameter_start_position, Position(0, 0))
    527         return SingleLineView(elided, start_modifiers, self.function_name_start_position).single_line.strip()
    528519
    529520    def parameter_list(self):
     
    15971588
    15981589
    1599 def check_function_definition_and_pass_ptr(type_text, row, location_description, error):
     1590def check_function_definition_and_pass_ptr(type_text, row, error):
    16001591    """Check that function definitions for use Pass*Ptr instead of *Ptr.
    16011592
    16021593    Args:
    1603        type_text: A string containing the type. (For return values, it may contain more than the type.)
     1594       type_text: A string containing the type.
    16041595       row: The row number of the type.
    1605        location_description: Used to indicate where the type is. This is either 'parameter' or 'return'.
    16061596       error: The function to call with any errors found.
    16071597    """
     
    16121602    type_name = bad_type_usage.group(0)
    16131603    error(row, 'readability/pass_ptr', 5,
    1614           'The %s type should use Pass%s instead of %s.' % (location_description, type_name, type_name))
     1604          'The parameter type should use Pass%s instead of %s.' % (type_name, type_name))
    16151605
    16161606
     
    16311621        return
    16321622
    1633     modifiers_and_return_type = function_state.modifiers_and_return_type()
    1634     check_function_definition_and_pass_ptr(modifiers_and_return_type, function_state.function_name_start_position.row, 'return', error)
    1635 
    16361623    parameter_list = function_state.parameter_list()
    16371624    for parameter in parameter_list:
    1638         check_function_definition_and_pass_ptr(parameter.type, parameter.row, 'parameter', error)
     1625        check_function_definition_and_pass_ptr(parameter.type, parameter.row, error)
    16391626
    16401627        # Do checks specific to function declarations and parameter names.
  • trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

    r156105 r156543  
    34413441            '{\n'
    34423442            '}',
    3443             'The return type should use PassRefPtr instead of RefPtr.  [readability/pass_ptr] [5]')
     3443            '')
    34443444        self.assert_pass_ptr_check(
    34453445            'OwnPtr<Type1> myFunction(int)\n'
Note: See TracChangeset for help on using the changeset viewer.