Add empty MainFrame class
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Sep 2013 15:09:01 +0000 (15:09 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Sep 2013 15:09:01 +0000 (15:09 +0000)
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.

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

121 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
Source/WebCore/bindings/js/PageScriptDebugServer.cpp
Source/WebCore/bindings/js/ScriptProfiler.cpp
Source/WebCore/bindings/js/ScriptState.cpp
Source/WebCore/css/MediaQueryEvaluator.cpp
Source/WebCore/dom/Document.cpp
Source/WebCore/history/CachedFrame.cpp
Source/WebCore/history/CachedPage.cpp
Source/WebCore/history/PageCache.cpp
Source/WebCore/html/HTMLPlugInImageElement.cpp
Source/WebCore/inspector/InspectorAgent.cpp
Source/WebCore/inspector/InspectorCanvasAgent.cpp
Source/WebCore/inspector/InspectorClient.cpp
Source/WebCore/inspector/InspectorDOMAgent.cpp
Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
Source/WebCore/inspector/InspectorFrontendHost.cpp
Source/WebCore/inspector/InspectorInputAgent.cpp
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorOverlay.cpp
Source/WebCore/inspector/InspectorPageAgent.cpp
Source/WebCore/inspector/PageRuntimeAgent.cpp
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/HistoryController.cpp
Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp
Source/WebCore/page/AutoscrollController.cpp
Source/WebCore/page/Chrome.cpp
Source/WebCore/page/ContextMenuController.cpp
Source/WebCore/page/DOMWindow.cpp
Source/WebCore/page/DragController.cpp
Source/WebCore/page/EventHandler.cpp
Source/WebCore/page/FocusController.cpp
Source/WebCore/page/Frame.cpp
Source/WebCore/page/Frame.h
Source/WebCore/page/FrameTree.cpp
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/GestureTapHighlighter.cpp
Source/WebCore/page/MainFrame.cpp [new file with mode: 0644]
Source/WebCore/page/MainFrame.h [new file with mode: 0644]
Source/WebCore/page/Page.cpp
Source/WebCore/page/Page.h
Source/WebCore/page/PageGroup.cpp
Source/WebCore/page/PageGroupLoadDeferrer.cpp
Source/WebCore/page/PageSerializer.cpp
Source/WebCore/page/PageThrottler.cpp
Source/WebCore/page/Settings.cpp
Source/WebCore/page/SpatialNavigation.cpp
Source/WebCore/page/mac/DragControllerMac.mm
Source/WebCore/page/mac/PageMac.cpp
Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm
Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
Source/WebCore/plugins/DOMMimeType.cpp
Source/WebCore/storage/StorageEventDispatcher.cpp
Source/WebCore/svg/graphics/SVGImage.cpp
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/Internals.cpp
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/AcceleratedCompositingContextEfl.cpp
Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp
Source/WebKit/efl/ewk/ewk_view.cpp
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
Source/WebKit/gtk/WebCoreSupport/GtkAdjustmentWatcher.cpp
Source/WebKit/gtk/webkit/webkitviewportattributes.cpp
Source/WebKit/gtk/webkit/webkitwebframe.cpp
Source/WebKit/gtk/webkit/webkitwebview.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebCoreSupport/WebDragClient.mm
Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
Source/WebKit/mac/WebCoreSupport/WebPlatformStrategies.mm
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebHTMLView.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp
Source/WebKit/win/WebCoreSupport/WebDragClient.cpp
Source/WebKit/win/WebDropSource.cpp
Source/WebKit/win/WebFrame.cpp
Source/WebKit/win/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp
Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit2/WebProcess/Plugins/PluginView.cpp
Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebContextMenuClientMac.mm
Source/WebKit2/WebProcess/WebPage/FindController.cpp
Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp
Source/WebKit2/WebProcess/WebPage/WebInspector.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
Source/WebKit2/WebProcess/WebPage/mac/LayerTreeHostMac.mm
Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeContext.mm
Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm
Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm
Tools/Scripts/webkitpy/style/checkers/cpp.py
Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py

index 1163020..7cc6322 100644 (file)
@@ -1745,6 +1745,7 @@ set(WebCore_SOURCES
     page/GroupSettings.cpp
     page/History.cpp
     page/Location.cpp
+    page/MainFrame.cpp
     page/MouseEventWithHitTestResults.cpp
     page/Navigator.cpp
     page/NavigatorBase.cpp
index 5c589ec..b75b922 100644 (file)
@@ -1,3 +1,90 @@
+2013-09-27  Darin Adler  <darin@apple.com>
+
+        Add empty MainFrame class
+        https://bugs.webkit.org/show_bug.cgi?id=121770
+
+        Reviewed by Andreas Kling.
+
+        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.
+
 2013-09-27  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         Add toWebKitCSS*Value functions to cast from CSSValue
index f1ff83f..34a9adc 100644 (file)
@@ -4211,6 +4211,8 @@ webcore_sources += \
        Source/WebCore/page/LayoutMilestones.h \
        Source/WebCore/page/Location.cpp \
        Source/WebCore/page/Location.h \
+       Source/WebCore/page/MainFrame.cpp \
+       Source/WebCore/page/MainFrame.h \
        Source/WebCore/page/MediaCanStartListener.h \
        Source/WebCore/page/MouseEventWithHitTestResults.cpp \
        Source/WebCore/page/MouseEventWithHitTestResults.h \
index 504d92d..8d000d5 100644 (file)
@@ -896,6 +896,7 @@ SOURCES += \
     page/GroupSettings.cpp \
     page/History.cpp \
     page/Location.cpp \
+    page/MainFrame.cpp \
     page/MouseEventWithHitTestResults.cpp \
     page/Navigator.cpp \
     page/NavigatorBase.cpp \
index f0aab86..d46634b 100644 (file)
@@ -859,6 +859,7 @@ __ZN7WebCore4Page14setMediaVolumeEf
 __ZN7WebCore4Page15addSchedulePairEN3WTF10PassRefPtrINS1_12SchedulePairEEE
 __ZN7WebCore4Page15didMoveOnscreenEv
 __ZN7WebCore4Page16countFindMatchesERKN3WTF6StringEjj
+__ZN7WebCore4Page16frameIsMainFrameEPKNS_5FrameE
 __ZN7WebCore4Page16setCanStartMediaEb
 __ZN7WebCore4Page16setDefersLoadingEb
 __ZN7WebCore4Page17willMoveOffscreenEv
index e3dfeb9..5895285 100644 (file)
     <ClCompile Include="..\page\animation\ImplicitAnimation.cpp" />
     <ClCompile Include="..\page\animation\KeyframeAnimation.cpp" />
     <ClCompile Include="..\page\Location.cpp" />
+    <ClCompile Include="..\page\MainFrame.cpp" />
     <ClCompile Include="..\page\MouseEventWithHitTestResults.cpp" />
     <ClCompile Include="..\page\Navigator.cpp" />
     <ClCompile Include="..\page\NavigatorBase.cpp" />
     <ClInclude Include="..\page\animation\ImplicitAnimation.h" />
     <ClInclude Include="..\page\animation\KeyframeAnimation.h" />
     <ClInclude Include="..\page\Location.h" />
+    <ClInclude Include="..\page\MainFrame.h" />
     <ClInclude Include="..\page\MouseEventWithHitTestResults.h" />
     <ClInclude Include="..\page\Navigator.h" />
     <ClInclude Include="..\page\NavigatorBase.h" />
index 1f0cd94..248d1a4 100644 (file)
     <ClCompile Include="..\page\Location.cpp">
       <Filter>page</Filter>
     </ClCompile>
+    <ClCompile Include="..\page\MainFrame.cpp">
+      <Filter>page</Filter>
+    </ClCompile>
     <ClCompile Include="..\page\PrintContext.cpp">
       <Filter>page</Filter>
     </ClCompile>
     <ClInclude Include="..\page\Location.h">
       <Filter>page</Filter>
     </ClInclude>
+    <ClInclude Include="..\page\MainFrame.h">
+      <Filter>page</Filter>
+    </ClInclude>
     <ClInclude Include="..\page\PrintContext.h">
       <Filter>page</Filter>
     </ClInclude>
index 0c4fb54..9503665 100644 (file)
                9326DC0C09DAD5D600AFC847 /* CharsetData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656581AC09D14EE6000E61D7 /* CharsetData.cpp */; };
                9327A94209968D1A0068A546 /* HTMLOptionsCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */; };
                932871C00B20DEB70049035A /* PlatformMenuDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 932871BF0B20DEB70049035A /* PlatformMenuDescription.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932AD70317EFA2C30038F8FF /* MainFrame.cpp */; };
+               932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 932AD70417EFA2C30038F8FF /* MainFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932E16090AF578340025F408 /* FrameLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 932E16080AF578340025F408 /* FrameLoader.cpp */; };
                93309DD6099E64920056E581 /* AppendNodeCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309D87099E64910056E581 /* AppendNodeCommand.cpp */; };
                93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309D88099E64910056E581 /* AppendNodeCommand.h */; };
                931D72F515FE695300C4C07E /* LayoutMilestones.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutMilestones.h; sourceTree = "<group>"; };
                9327A94109968D1A0068A546 /* HTMLOptionsCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOptionsCollection.cpp; sourceTree = "<group>"; };
                932871BF0B20DEB70049035A /* PlatformMenuDescription.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlatformMenuDescription.h; sourceTree = "<group>"; };
+               932AD70317EFA2C30038F8FF /* MainFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainFrame.cpp; sourceTree = "<group>"; };
+               932AD70417EFA2C30038F8FF /* MainFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainFrame.h; sourceTree = "<group>"; };
                932E16080AF578340025F408 /* FrameLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLoader.cpp; sourceTree = "<group>"; };
                93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; };
                93309D88099E64910056E581 /* AppendNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppendNodeCommand.h; sourceTree = "<group>"; };
                                BCE1C41A0D982980003B02F2 /* Location.cpp */,
                                BCE1C4190D982980003B02F2 /* Location.h */,
                                BCE1C4220D9829F2003B02F2 /* Location.idl */,
+                               932AD70317EFA2C30038F8FF /* MainFrame.cpp */,
+                               932AD70417EFA2C30038F8FF /* MainFrame.h */,
                                BC59DEFA169DEDD80016AC34 /* make_settings.pl */,
                                931BCC601124DFCB00BE70DD /* MediaCanStartListener.h */,
                                93EB355E09E37FD600F43799 /* MouseEventWithHitTestResults.cpp */,
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               932AD70617EFA2C40038F8FF /* MainFrame.h in Headers */,
                                FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */,
                                9A528E8417D7F52F00AA9518 /* FloatingObjects.h in Headers */,
                                FE4AADEE16D2C37400026FFC /* AbstractSQLStatement.h in Headers */,
                                84730D8C1248F0B300D3A9C9 /* FETurbulence.cpp in Sources */,
                                FD31609412B026F700C1A359 /* FFTConvolver.cpp in Sources */,
                                FD31609612B026F700C1A359 /* FFTFrame.cpp in Sources */,
+                               932AD70517EFA2C30038F8FF /* MainFrame.cpp in Sources */,
                                FD3160C012B0272A00C1A359 /* FFTFrameMac.cpp in Sources */,
                                976D6C80122B8A3D001FD1F7 /* File.cpp in Sources */,
                                934FE9E50B5CA539003E4A73 /* FileChooser.cpp in Sources */,
index 2d8bb83..60b8825 100644 (file)
@@ -48,7 +48,6 @@
 #import "ContextMenuController.h"
 #import "Editor.h"
 #import "Font.h"
-#import "Frame.h"
 #import "FrameLoaderClient.h"
 #import "FrameSelection.h"
 #import "HTMLAnchorElement.h"
@@ -59,6 +58,7 @@
 #import "HTMLNames.h"
 #import "HTMLTextAreaElement.h"
 #import "LocalizedStrings.h"
+#import "MainFrame.h"
 #import "Page.h"
 #import "RenderTextControl.h"
 #import "RenderView.h"
index bd62d0a..4d71bd9 100644 (file)
@@ -36,9 +36,9 @@
 
 #include "Document.h"
 #include "EventLoop.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "JSDOMWindowCustom.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "PluginView.h"
index b7d967a..2f9780c 100644 (file)
 
 #include "ScriptProfiler.h"
 
-#include "Frame.h"
 #include "GCController.h"
 #include "JSDOMBinding.h"
 #include "JSDOMWindow.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "ScriptObject.h"
 #include "ScriptState.h"
index 1a16369..96bebba 100644 (file)
@@ -32,8 +32,8 @@
 #include "ScriptState.h"
 
 #include "Document.h"
-#include "Frame.h"
 #include "JSDOMWindowBase.h"
+#include "MainFrame.h"
 #include "Node.h"
 #include "Page.h"
 #include "ScriptController.h"
index 7c766c4..c973235 100644 (file)
 #include "ChromeClient.h"
 #include "DOMWindow.h"
 #include "FloatRect.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "InspectorInstrumentation.h"
 #include "IntRect.h"
+#include "MainFrame.h"
 #include "MediaFeatureNames.h"
 #include "MediaList.h"
 #include "MediaQuery.h"
index 3230549..c0d1384 100644 (file)
@@ -67,7 +67,6 @@
 #include "ExceptionCode.h"
 #include "FontLoader.h"
 #include "FormController.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameView.h"
 #include "JSLazyEventListener.h"
 #include "Language.h"
 #include "Logging.h"
+#include "MainFrame.h"
 #include "MediaCanStartListener.h"
 #include "MediaQueryList.h"
 #include "MediaQueryMatcher.h"
index c528ca1..9f4864b 100644 (file)
 #include "EventNames.h"
 #include "ExceptionCode.h"
 #include "FocusController.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameView.h"
 #include "HistoryController.h"
 #include "HistoryItem.h"
 #include "Logging.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageTransitionEvent.h"
 #include "ScriptController.h"
index 8ddd331..19af56a 100644 (file)
@@ -29,8 +29,8 @@
 #include "Document.h"
 #include "Element.h"
 #include "FocusController.h"
-#include "Frame.h"
 #include "FrameView.h"
+#include "MainFrame.h"
 #include "Node.h"
 #include "Page.h"
 #include "Settings.h"
index c7164cf..acb3e57 100644 (file)
@@ -36,7 +36,6 @@
 #include "DeviceOrientationController.h"
 #include "Document.h"
 #include "DocumentLoader.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameLoaderStateMachine.h"
@@ -45,6 +44,7 @@
 #include "HistoryController.h"
 #include "HistoryItem.h"
 #include "Logging.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "Settings.h"
 #include "SharedWorkerRepository.h"
index 4caf4c9..6cfae5a 100644 (file)
@@ -34,6 +34,7 @@
 #include "JSDocumentFragment.h"
 #include "LocalizedStrings.h"
 #include "Logging.h"
+#include "MainFrame.h"
 #include "MouseEvent.h"
 #include "NodeList.h"
 #include "NodeRenderStyle.h"
index 0ce1e96..7302ae1 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "Document.h"
 #include "DocumentLoader.h"
-#include "Frame.h"
 #include "GraphicsContext.h"
 #include "InjectedScriptHost.h"
 #include "InjectedScriptManager.h"
@@ -46,6 +45,7 @@
 #include "InspectorState.h"
 #include "InspectorValues.h"
 #include "InstrumentingAgents.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "ResourceRequest.h"
 #include "ScriptController.h"
index 1b5157e..2e5ebb9 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "BindingVisitors.h"
 #include "DOMWindow.h"
-#include "Frame.h"
 #include "HTMLCanvasElement.h"
 #include "HTMLNames.h"
 #include "InjectedScript.h"
@@ -46,6 +45,7 @@
 #include "InspectorPageAgent.h"
 #include "InspectorState.h"
 #include "InstrumentingAgents.h"
+#include "MainFrame.h"
 #include "NodeList.h"
 #include "Page.h"
 #include "ScriptObject.h"
index 0702fa8..c672142 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "InspectorClient.h"
 
-#include "Frame.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "ScriptController.h"
 #include "ScriptSourceCode.h"
index acf99e4..715c36b 100644 (file)
@@ -60,7 +60,6 @@
 #include "EventTarget.h"
 #include "File.h"
 #include "FileList.h"
-#include "Frame.h"
 #include "FrameTree.h"
 #include "HTMLElement.h"
 #include "HTMLFrameOwnerElement.h"
@@ -79,6 +78,7 @@
 #include "InstrumentingAgents.h"
 #include "IntRect.h"
 #include "JSEventListener.h"
+#include "MainFrame.h"
 #include "MutationEvent.h"
 #include "Node.h"
 #include "NodeList.h"
index 56e3586..f3ce3f1 100644 (file)
@@ -38,7 +38,6 @@
 #include "DOMWrapperWorld.h"
 #include "Document.h"
 #include "FloatRect.h"
-#include "Frame.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoader.h"
 #include "FrameView.h"
@@ -46,6 +45,7 @@
 #include "InspectorController.h"
 #include "InspectorFrontendHost.h"
 #include "InspectorPageAgent.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "ScriptController.h"
 #include "ScriptFunctionCall.h"
index 03b6415..d97fd72 100644 (file)
 #include "DOMFileSystem.h"
 #include "DOMWrapperWorld.h"
 #include "Element.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "HitTestResult.h"
 #include "HTMLFrameOwnerElement.h"
 #include "InspectorAgent.h"
 #include "InspectorController.h"
 #include "InspectorFrontendClient.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "Pasteboard.h"
 #include "ResourceError.h"
index 4690af1..80f9306 100644 (file)
 
 #include "Chrome.h"
 #include "EventHandler.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "IntPoint.h"
 #include "IntRect.h"
 #include "IntSize.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PlatformEvent.h"
 #include "PlatformKeyboardEvent.h"
index d5532c0..88ff862 100644 (file)
@@ -64,6 +64,7 @@
 #include "InspectorTimelineAgent.h"
 #include "InspectorWorkerAgent.h"
 #include "InstrumentingAgents.h"
+#include "MainFrame.h"
 #include "PageDebuggerAgent.h"
 #include "PageRuntimeAgent.h"
 #include "RenderObject.h"
index a46bfc5..7a9ecac 100644 (file)
 #include "DocumentLoader.h"
 #include "Element.h"
 #include "EmptyClients.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "InspectorClient.h"
 #include "InspectorOverlayPage.h"
 #include "InspectorValues.h"
+#include "MainFrame.h"
 #include "Node.h"
 #include "Page.h"
 #include "RenderBoxModelObject.h"
index 82028dd..d550014 100644 (file)
@@ -66,6 +66,7 @@
 #include "InspectorState.h"
 #include "InspectorValues.h"
 #include "InstrumentingAgents.h"
+#include "MainFrame.h"
 #include "MemoryCache.h"
 #include "Page.h"
 #include "RegularExpression.h"
index cda6caf..e401b60 100644 (file)
 #include "PageRuntimeAgent.h"
 
 #include "Document.h"
-#include "Frame.h"
 #include "InjectedScript.h"
 #include "InjectedScriptManager.h"
 #include "InspectorPageAgent.h"
 #include "InspectorState.h"
 #include "InstrumentingAgents.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageConsole.h"
 #include "ScriptController.h"
index 4b78e4a..38d7ca5 100644 (file)
@@ -60,7 +60,6 @@
 #include "FloatRect.h"
 #include "FormState.h"
 #include "FormSubmission.h"
-#include "Frame.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoaderClient.h"
 #include "FrameNetworkingContext.h"
@@ -81,6 +80,7 @@
 #include "LoaderStrategy.h"
 #include "Logging.h"
 #include "MIMETypeRegistry.h"
+#include "MainFrame.h"
 #include "MemoryCache.h"
 #include "Page.h"
 #include "PageActivityAssertionToken.h"
index f98c38c..9222cce 100644 (file)
@@ -35,7 +35,6 @@
 #include "CachedPage.h"
 #include "Document.h"
 #include "DocumentLoader.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameLoaderStateMachine.h"
@@ -43,6 +42,7 @@
 #include "FrameView.h"
 #include "HistoryItem.h"
 #include "Logging.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageCache.h"
 #include "PageGroup.h"
index f8315c9..c253f15 100644 (file)
 #include "config.h"
 
 #if ENABLE(MHTML)
+
 #include "MHTMLArchive.h"
 
 #include "Document.h"
-#include "Frame.h"
 #include "MHTMLParser.h"
 #include "MIMETypeRegistry.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageSerializer.h"
 #include "QuotedPrintable.h"
 #include "SchemeRegistry.h"
 #include "SharedBuffer.h"
-
+#include <time.h>
 #include <wtf/CryptographicallyRandomNumber.h>
 #include <wtf/DateMath.h>
 #include <wtf/GregorianDateTime.h>
@@ -53,8 +54,6 @@
 #if HAVE(SYS_TIME_H)
 #include <sys/time.h>
 #endif
-#include <time.h>
-
 
 namespace WebCore {
 
@@ -242,4 +241,5 @@ PassRefPtr<SharedBuffer> MHTMLArchive::generateMHTMLData(Page* page, bool useBin
 }
 
 }
+
 #endif
index c68adc4..2aff33a 100644 (file)
@@ -29,9 +29,9 @@
 #include "AutoscrollController.h"
 
 #include "EventHandler.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "HitTestResult.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "RenderBox.h"
 #include "RenderView.h"
index 2d7ac89..c71464f 100644 (file)
@@ -30,7 +30,6 @@
 #include "FileChooser.h"
 #include "FileList.h"
 #include "FloatRect.h"
-#include "Frame.h"
 #include "FrameTree.h"
 #include "Geolocation.h"
 #include "HTMLFormElement.h"
@@ -39,6 +38,7 @@
 #include "HitTestResult.h"
 #include "Icon.h"
 #include "InspectorInstrumentation.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageGroupLoadDeferrer.h"
 #include "PopupOpeningObserver.h"
index 4482982..3ad6777 100644 (file)
@@ -45,7 +45,6 @@
 #include "EventNames.h"
 #include "ExceptionCodePlaceholder.h"
 #include "FormState.h"
-#include "Frame.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
@@ -55,6 +54,7 @@
 #include "HitTestResult.h"
 #include "InspectorController.h"
 #include "LocalizedStrings.h"
+#include "MainFrame.h"
 #include "MouseEvent.h"
 #include "NavigationAction.h"
 #include "Node.h"
index 36bf2be..14963eb 100644 (file)
@@ -61,7 +61,6 @@
 #include "ExceptionCodePlaceholder.h"
 #include "FloatRect.h"
 #include "FocusController.h"
-#include "Frame.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
@@ -72,6 +71,7 @@
 #include "InspectorInstrumentation.h"
 #include "KURL.h"
 #include "Location.h"
+#include "MainFrame.h"
 #include "MediaQueryList.h"
 #include "MediaQueryMatcher.h"
 #include "MessageEvent.h"
index c97ff4d..fbb6a1e 100644 (file)
@@ -45,7 +45,6 @@
 #include "EventHandler.h"
 #include "ExceptionCodePlaceholder.h"
 #include "FloatRect.h"
-#include "Frame.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoader.h"
 #include "FrameSelection.h"
@@ -59,6 +58,7 @@
 #include "HitTestResult.h"
 #include "Image.h"
 #include "ImageOrientation.h"
+#include "MainFrame.h"
 #include "MoveSelectionCommand.h"
 #include "Page.h"
 #include "Pasteboard.h"
index 4dadd85..7f300a5 100644 (file)
@@ -47,7 +47,6 @@
 #include "FloatPoint.h"
 #include "FloatRect.h"
 #include "FocusController.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameSelection.h"
 #include "FrameTree.h"
@@ -62,6 +61,7 @@
 #include "Image.h"
 #include "InspectorInstrumentation.h"
 #include "KeyboardEvent.h"
+#include "MainFrame.h"
 #include "MouseEvent.h"
 #include "MouseEventWithHitTestResults.h"
 #include "Page.h"
index 2fa350c..7136a65 100644 (file)
@@ -38,7 +38,6 @@
 #include "EventHandler.h"
 #include "EventNames.h"
 #include "ExceptionCode.h"
-#include "Frame.h"
 #include "FrameSelection.h"
 #include "FrameTree.h"
 #include "FrameView.h"
@@ -49,6 +48,7 @@
 #include "HTMLTextAreaElement.h"
 #include "HitTestResult.h"
 #include "KeyboardEvent.h"
+#include "MainFrame.h"
 #include "NodeRenderingTraversal.h"
 #include "Page.h"
 #include "Range.h"
index e8214e4..4d88f7d 100644 (file)
@@ -66,6 +66,7 @@
 #include "InspectorInstrumentation.h"
 #include "JSDOMWindowShell.h"
 #include "Logging.h"
+#include "MainFrame.h"
 #include "MathMLNames.h"
 #include "MediaFeatureNames.h"
 #include "Navigator.h"
@@ -150,11 +151,11 @@ static inline float parentTextZoomFactor(Frame* frame)
     return parent->textZoomFactor();
 }
 
-inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* frameLoaderClient)
-    : m_page(page)
-    , m_settings(&page->settings())
+Frame::Frame(Page& page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient& frameLoaderClient)
+    : m_page(&page)
+    , m_settings(&page.settings())
     , m_treeNode(this, parentFromOwnerElement(ownerElement))
-    , m_loader(*this, *frameLoaderClient)
+    , m_loader(*this, frameLoaderClient)
     , m_navigationScheduler(this)
     , m_ownerElement(ownerElement)
     , m_script(createOwned<ScriptController>(*this))
@@ -170,7 +171,6 @@ inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader
     , m_inViewSourceMode(false)
     , m_activeDOMObjectsAndAnimationsSuspendedCount(0)
 {
-    ASSERT(page);
     AtomicString::init();
     HTMLNames::init();
     QualifiedName::init();
@@ -188,7 +188,7 @@ inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader
         setTiledBackingStoreEnabled(settings().tiledBackingStoreEnabled());
 #endif
     } else {
-        page->incrementSubframeCount();
+        page.incrementSubframeCount();
         ownerElement->setContentFrame(this);
     }
 
@@ -204,7 +204,9 @@ inline Frame::Frame(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoader
 
 PassRefPtr<Frame> Frame::create(Page* page, HTMLFrameOwnerElement* ownerElement, FrameLoaderClient* client)
 {
-    return adoptRef(new Frame(page, ownerElement, client));
+    ASSERT(page);
+    ASSERT(client);
+    return adoptRef(new Frame(*page, ownerElement, *client));
 }
 
 Frame::~Frame()
index 70306d9..624cba7 100644 (file)
@@ -100,7 +100,7 @@ namespace WebCore {
             bool useFixedLayout = false, ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
             ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
 
-        ~Frame();
+        virtual ~Frame();
 
         void addDestructionObserver(FrameDestructionObserver*);
         void removeDestructionObserver(FrameDestructionObserver*);
@@ -197,9 +197,10 @@ namespace WebCore {
 
     // ========
 
-    private:
-        Frame(Page*, HTMLFrameOwnerElement*, FrameLoaderClient*);
+    protected:
+        Frame(Page&, HTMLFrameOwnerElement*, FrameLoaderClient&);
 
+    private:
         void injectUserScriptsForWorld(DOMWrapperWorld*, const UserScriptVector&, UserScriptInjectionTime);
 
         HashSet<FrameDestructionObserver*> m_destructionObservers;
@@ -242,12 +243,12 @@ namespace WebCore {
 
     private:
         // TiledBackingStoreClient interface
-        virtual void tiledBackingStorePaintBegin();
-        virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&);
-        virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea);
-        virtual IntRect tiledBackingStoreContentsRect();
-        virtual IntRect tiledBackingStoreVisibleRect();
-        virtual Color tiledBackingStoreBackgroundColor() const;
+        virtual void tiledBackingStorePaintBegin() OVERRIDE FINAL;
+        virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) OVERRIDE FINAL;
+        virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) OVERRIDE FINAL;
+        virtual IntRect tiledBackingStoreContentsRect() OVERRIDE FINAL;
+        virtual IntRect tiledBackingStoreVisibleRect() OVERRIDE FINAL;
+        virtual Color tiledBackingStoreBackgroundColor() const OVERRIDE FINAL;
 
         OwnPtr<TiledBackingStore> m_tiledBackingStore;
 #endif
index 2083e6f..6430229 100644 (file)
@@ -22,9 +22,9 @@
 #include "FrameTree.h"
 
 #include "Document.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "HTMLFrameOwnerElement.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include <stdarg.h>
index 4fbf142..1a2a2cb 100644 (file)
@@ -41,7 +41,6 @@
 #include "FocusController.h"
 #include "FontCache.h"
 #include "FontLoader.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameSelection.h"
@@ -55,6 +54,7 @@
 #include "InspectorClient.h"
 #include "InspectorController.h"
 #include "InspectorInstrumentation.h"
+#include "MainFrame.h"
 #include "OverflowEvent.h"
 #include "ProgressTracker.h"
 #include "RenderArena.h"
index c327c1b..7b1c0ab 100644 (file)
 #include "GestureTapHighlighter.h"
 
 #include "Element.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "GraphicsTypes.h"
+#include "MainFrame.h"
 #include "Node.h"
 #include "Page.h"
 #include "RenderBoxModelObject.h"
diff --git a/Source/WebCore/page/MainFrame.cpp b/Source/WebCore/page/MainFrame.cpp
new file mode 100644 (file)
index 0000000..6a37eee
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+
+Copyright (C) 2013 Apple Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1.  Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+2.  Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "config.h"
+#include "MainFrame.h"
+
+namespace WebCore {
+
+inline MainFrame::MainFrame(Page& page, FrameLoaderClient& client)
+    : Frame(page, nullptr, client)
+{
+}
+
+RefPtr<MainFrame> MainFrame::create(Page& page, FrameLoaderClient& client)
+{
+    return adoptRef(new MainFrame(page, client));
+}
+
+}
diff --git a/Source/WebCore/page/MainFrame.h b/Source/WebCore/page/MainFrame.h
new file mode 100644 (file)
index 0000000..fe2bf2f
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+
+Copyright (C) 2013 Apple Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1.  Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+2.  Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef MainFrame_h
+#define MainFrame_h
+
+#include "Frame.h"
+
+namespace WebCore {
+
+class MainFrame FINAL : public Frame {
+public:
+    static RefPtr<MainFrame> create(Page&, FrameLoaderClient&);
+
+private:
+    MainFrame(Page&, FrameLoaderClient&);
+};
+
+}
+
+#endif
index 7c18ab9..836c347 100644 (file)
@@ -41,7 +41,6 @@
 #include "ExceptionCodePlaceholder.h"
 #include "FileSystem.h"
 #include "FocusController.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
 #include "FrameSelection.h"
@@ -53,6 +52,7 @@
 #include "InspectorController.h"
 #include "InspectorInstrumentation.h"
 #include "Logging.h"
+#include "MainFrame.h"
 #include "MediaCanStartListener.h"
 #include "Navigator.h"
 #include "NetworkStateNotifier.h"
@@ -142,7 +142,7 @@ Page::Page(PageClients& pageClients)
     , m_settings(Settings::create(this))
     , m_progress(ProgressTracker::create())
     , m_backForwardController(createOwned<BackForwardController>(*this, pageClients.backForwardClient))
-    , m_mainFrame(Frame::create(this, 0, pageClients.loaderClientForMainFrame))
+    , m_mainFrame(MainFrame::create(*this, *pageClients.loaderClientForMainFrame))
     , m_theme(RenderTheme::themeForPage(this))
     , m_editorClient(pageClients.editorClient)
     , m_plugInClient(pageClients.plugInClient)
@@ -239,10 +239,15 @@ Page::~Page()
     m_pageThrottler.clear();
 }
 
+bool Page::frameIsMainFrame(const Frame* frame)
+{
+    return frame == m_mainFrame.get();
+}
+
 ArenaSize Page::renderTreeSize() const
 {
     ArenaSize total(0, 0);
-    for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
+    for (const Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
         if (!frame->document())
             continue;
         if (RenderArena* arena = frame->document()->renderArena()) {
@@ -1232,7 +1237,7 @@ void Page::checkSubframeCountConsistency() const
     ASSERT(m_subframeCount >= 0);
 
     int subframeCount = 0;
-    for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
+    for (const Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
         ++subframeCount;
 
     ASSERT(m_subframeCount + 1 == subframeCount);
index 55c2562..56b0542 100644 (file)
@@ -75,6 +75,7 @@ class HaltablePlugin;
 class HistoryItem;
 class InspectorClient;
 class InspectorController;
+class MainFrame;
 class MediaCanStartListener;
 class Node;
 class PageActivityAssertionToken;
@@ -161,8 +162,9 @@ public:
     EditorClient* editorClient() const { return m_editorClient; }
     PlugInClient* plugInClient() const { return m_plugInClient; }
 
-    Frame& mainFrame() const { return *m_mainFrame; }
-    bool frameIsMainFrame(const Frame* frame) { return frame == m_mainFrame.get(); }
+    MainFrame& mainFrame() { return *m_mainFrame; }
+    const MainFrame& mainFrame() const { return *m_mainFrame; }
+    bool frameIsMainFrame(const Frame*);
 
     bool openedByDOM() const;
     void setOpenedByDOM();
@@ -464,7 +466,7 @@ private:
     const OwnPtr<ProgressTracker> m_progress;
 
     const OwnPtr<BackForwardController> m_backForwardController;
-    const RefPtr<Frame> m_mainFrame;
+    const RefPtr<MainFrame> m_mainFrame;
 
     mutable RefPtr<PluginData> m_pluginData;
 
index 1ad1a56..111da18 100644 (file)
@@ -31,8 +31,8 @@
 #include "DOMWrapperWorld.h"
 #include "Document.h"
 #include "DocumentStyleSheetCollection.h"
-#include "Frame.h"
 #include "GroupSettings.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageCache.h"
 #include "SecurityOrigin.h"
index 5c6d82e..51cb945 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "Document.h"
 #include "DocumentParser.h"
-#include "Frame.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "ScriptRunner.h"
index 9b90fcb..75ed9a4 100644 (file)
@@ -37,7 +37,6 @@
 #include "CachedImage.h"
 #include "Document.h"
 #include "Element.h"
-#include "Frame.h"
 #include "HTMLFrameOwnerElement.h"
 #include "HTMLHeadElement.h"
 #include "HTMLImageElement.h"
@@ -48,6 +47,7 @@
 #include "HTTPParsers.h"
 #include "Image.h"
 #include "MIMETypeRegistry.h"
+#include "MainFrame.h"
 #include "MarkupAccumulator.h"
 #include "Page.h"
 #include "RenderElement.h"
index 71a9fc7..8cf94ba 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "Chrome.h"
 #include "ChromeClient.h"
-#include "Frame.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageActivityAssertionToken.h"
 
index c0432d0..c8d34f4 100644 (file)
 #include "Document.h"
 #include "Font.h"
 #include "FontGenericFamilies.h"
-#include "Frame.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "HTMLMediaElement.h"
 #include "HistoryItem.h"
 #include "InspectorInstrumentation.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageCache.h"
 #include "StorageMap.h"
index 0f32efc..1a268f4 100644 (file)
@@ -29,7 +29,6 @@
 #include "config.h"
 #include "SpatialNavigation.h"
 
-#include "Frame.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "HTMLAreaElement.h"
@@ -37,6 +36,7 @@
 #include "HTMLMapElement.h"
 #include "HTMLNames.h"
 #include "IntRect.h"
+#include "MainFrame.h"
 #include "Node.h"
 #include "Page.h"
 #include "RenderInline.h"
@@ -45,7 +45,6 @@
 
 namespace WebCore {
 
-static RectsAlignment alignmentForRects(FocusDirection, const LayoutRect&, const LayoutRect&, const LayoutSize& viewSize);
 static bool areRectsFullyAligned(FocusDirection, const LayoutRect&, const LayoutRect&);
 static bool areRectsPartiallyAligned(FocusDirection, const LayoutRect&, const LayoutRect&);
 static bool areRectsMoreThanFullScreenApart(FocusDirection, const LayoutRect& curRect, const LayoutRect& targetRect, const LayoutSize& viewSize);
index 69ebd6b..ab63cdf 100644 (file)
 #import "DragController.h"
 
 #if ENABLE(DRAG_SUPPORT)
+
 #import "Clipboard.h"
 #import "DOMElementInternal.h"
 #import "DragClient.h"
 #import "DragData.h"
 #import "Element.h"
-#import "Frame.h"
 #import "FrameView.h"
+#import "MainFrame.h"
 #import "Page.h"
 #import "Pasteboard.h"
 
index fbd9edf..212b117 100644 (file)
  */
 
 #include "config.h"
+#include "Page.h"
+
 #include "DocumentLoader.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameTree.h"
-#include "Page.h"
+#include "MainFrame.h"
 
 namespace WebCore {
 
index 7ec957a..aa118f9 100644 (file)
 #include "ScrollingCoordinator.h"
 
 #include "Document.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "GraphicsLayer.h"
 #include "IntRect.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PlatformWheelEvent.h"
 #include "PluginViewBase.h"
index 31c5b6a..536084d 100644 (file)
@@ -30,9 +30,9 @@
 #import "ScrollingCoordinatorMac.h"
 
 #include "GraphicsLayer.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "IntRect.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PlatformWheelEvent.h"
 #include "PluginViewBase.h"
@@ -48,7 +48,6 @@
 #include "ScrollingThread.h"
 #include "ScrollingTree.h"
 #include "TiledBacking.h"
-
 #include <wtf/Functional.h>
 #include <wtf/MainThread.h>
 #include <wtf/PassRefPtr.h>
index b0e9a17..d0968b9 100644 (file)
 #include "config.h"
 
 #if USE(COORDINATED_GRAPHICS)
+
 #include "CompositingCoordinator.h"
 
-#include "Frame.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
 #include "InspectorController.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "Settings.h"
 #include <wtf/CurrentTime.h>
 #include <wtf/TemporaryChange.h>
 
+// FIXME: Having this in the platform directory is a layering violation. This does not belong here.
+
 namespace WebCore {
 
 PassOwnPtr<CompositingCoordinator> CompositingCoordinator::create(Page* page, CompositingCoordinator::Client* client)
index 3dd3f7a..3e1ef9a 100644 (file)
@@ -20,9 +20,9 @@
 #include "DOMMimeType.h"
 
 #include "DOMPlugin.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PluginData.h"
 #include "Settings.h"
index d7dc7b5..2e2f285 100644 (file)
@@ -29,8 +29,8 @@
 #include "Document.h"
 #include "DOMWindow.h"
 #include "EventNames.h"
-#include "Frame.h"
 #include "InspectorInstrumentation.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "SecurityOrigin.h"
index 75e12bd..e6c8a17 100644 (file)
 #include "Chrome.h"
 #include "DocumentLoader.h"
 #include "ElementIterator.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "ImageBuffer.h"
 #include "ImageObserver.h"
 #include "IntRect.h"
+#include "MainFrame.h"
 #include "RenderSVGRoot.h"
 #include "RenderStyle.h"
 #include "SVGDocument.h"
index ce02372..a4cb958 100644 (file)
 #include "CaptionUserPreferences.h"
 #include "Document.h"
 #include "ExceptionCode.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "Language.h"
 #include "LocaleToScriptMapping.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "PageGroup.h"
 #include "RuntimeEnabledFeatures.h"
index 20ad8fa..4e90623 100644 (file)
@@ -46,7 +46,6 @@
 #include "EventHandler.h"
 #include "ExceptionCode.h"
 #include "FormController.h"
-#include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameView.h"
 #include "HTMLInputElement.h"
@@ -68,6 +67,7 @@
 #include "InternalSettings.h"
 #include "IntRect.h"
 #include "Language.h"
+#include "MainFrame.h"
 #include "MallocStatistics.h"
 #include "MemoryCache.h"
 #include "MemoryInfo.h"
index 2783443..1579761 100644 (file)
@@ -1,3 +1,15 @@
+2013-09-27  Darin Adler  <darin@apple.com>
+
+        Add empty MainFrame class
+        https://bugs.webkit.org/show_bug.cgi?id=121770
+
+        Reviewed by Andreas Kling.
+
+        * WebCoreSupport/AcceleratedCompositingContextEfl.cpp:
+        * WebCoreSupport/InspectorClientEfl.cpp:
+        * ewk/ewk_view.cpp:
+        Include MainFrame.h instead of Frame.h as needed.
+
 2013-09-25  Brent Fulgham  <bfulgham@apple.com>
 
         Refactor RuntimeEnabledFeatures as a Singleton.
index 9fa102d..0f1f6c9 100644 (file)
@@ -27,6 +27,7 @@
 #include "GraphicsContext3D.h"
 #include "GraphicsLayerTextureMapper.h"
 #include "HostWindow.h"
+#include "MainFrame.h"
 #include "PageClientEfl.h"
 #include "TextureMapperGL.h"
 #include "TextureMapperLayer.h"
index 012f6e8..eaeb99f 100644 (file)
 #include "InspectorClientEfl.h"
 
 #if ENABLE(INSPECTOR)
+
 #include "EflInspectorUtilities.h"
 #include "InspectorController.h"
+#include "MainFrame.h"
 #include "NotImplemented.h"
 #include "ewk_view_private.h"
 #include <wtf/text/CString.h>
index a0ef9c5..e10b79b 100644 (file)
@@ -38,7 +38,6 @@
 #include "EflScreenUtilities.h"
 #include "EventHandler.h"
 #include "FocusController.h"
-#include "Frame.h"
 #include "FrameLoaderClientEfl.h"
 #include "FrameSelection.h"
 #include "FrameView.h"
@@ -52,6 +51,7 @@
 #include "JSDOMBinding.h"
 #include "JSDOMWindow.h"
 #include "JSLock.h"
+#include "MainFrame.h"
 #include "NetworkStorageSession.h"
 #include "Operations.h"
 #include "PageClientEfl.h"
index a421b5e..2cdac8f 100644 (file)
@@ -1,3 +1,19 @@
+2013-09-27  Darin Adler  <darin@apple.com>
+
+        Add empty MainFrame class
+        https://bugs.webkit.org/show_bug.cgi?id=121770
+
+        Reviewed by Andreas Kling.
+
+        * 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.
+
 2013-09-25  Brent Fulgham  <bfulgham@apple.com>
 
         Refactor RuntimeEnabledFeatures as a Singleton.
index 47ac290..9e3d3a0 100644 (file)
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL)
 
 #include "CairoUtilities.h"
-#include "Frame.h"
 #include "FrameView.h"
 #include "GraphicsLayerTextureMapper.h"
 #include "GtkVersioning.h"
+#include "MainFrame.h"
 #include "PlatformContextCairo.h"
 #include "Settings.h"
 #include "TextureMapperGL.h"
index 1c0985a..d315170 100644 (file)
@@ -46,6 +46,7 @@
 #include "InspectorController.h"
 #include "IntRect.h"
 #include "KURL.h"
+#include "MainFrame.h"
 #include "NavigationAction.h"
 #include "NotImplemented.h"
 #include "PopupMenuClient.h"
index 1dc2076..1d883eb 100644 (file)
@@ -52,6 +52,7 @@
 #include "JSDOMWindow.h"
 #include "Language.h"
 #include "MIMETypeRegistry.h"
+#include "MainFrame.h"
 #include "MouseEvent.h"
 #include "NotImplemented.h"
 #include "Page.h"
index 1acddf5..9115984 100644 (file)
@@ -19,8 +19,8 @@
 #include "config.h"
 #include "GtkAdjustmentWatcher.h"
 
-#include "Frame.h"
 #include "FrameView.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "Scrollbar.h"
 #include "webkitwebviewprivate.h"
index fda3ea3..ed7a51b 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "Chrome.h"
 #include "Document.h"
-#include "Frame.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "webkitglobalsprivate.h"
 #include "webkitviewportattributesprivate.h"
index 6d1f944..ebbc483 100644 (file)
@@ -48,6 +48,7 @@
 #include "JSDOMBinding.h"
 #include "JSDOMWindow.h"
 #include "JSElement.h"
+#include "MainFrame.h"
 #include "PlatformContextCairo.h"
 #include "PrintContext.h"
 #include "RenderListItem.h"
index c712c9a..eea343d 100644 (file)
@@ -71,6 +71,7 @@
 #include "HitTestRequest.h"
 #include "HitTestResult.h"
 #include "InspectorClientGtk.h"
+#include "MainFrame.h"
 #include "MemoryCache.h"
 #include "MouseEventWithHitTestResults.h"
 #include "NotImplemented.h"
index bb10c04..b11017a 100644 (file)
@@ -1,3 +1,18 @@
+2013-09-27  Darin Adler  <darin@apple.com>
+
+        Add empty MainFrame class
+        https://bugs.webkit.org/show_bug.cgi?id=121770
+
+        Reviewed by Andreas Kling.
+
+        * 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.
+
 2013-09-26  Eric Carlson  <eric.carlson@apple.com>
 
         [MediaStream] make MediaStream testable
index 2d03097..4fc48f2 100644 (file)
@@ -46,9 +46,9 @@
 #import <WebCore/Editor.h>
 #import <WebCore/EditorClient.h>
 #import <WebCore/EventHandler.h>
-#import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/Image.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <WebCore/Pasteboard.h>
 
index 51ef78b..a945b2d 100644 (file)
@@ -43,9 +43,9 @@
 #import "WebUIDelegate.h"
 #import "WebViewInternal.h"
 #import <algorithm>
-#import <WebCore/Frame.h>
 #import <WebCore/InspectorController.h>
 #import <WebCore/InspectorFrontendClient.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <WebCore/ScriptController.h>
 #import <WebCore/ScriptValue.h>
index d811441..05d6cb8 100644 (file)
@@ -30,6 +30,7 @@
 #import "WebPluginPackage.h"
 #import <WebCore/BlockExceptions.h>
 #import <WebCore/Color.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <WebCore/PageGroup.h>
 #import <WebCore/PlatformCookieJar.h>
index 8ad9dda..a5a1115 100644 (file)
@@ -69,7 +69,6 @@
 #import <WebCore/Editor.h>
 #import <WebCore/EventHandler.h>
 #import <WebCore/EventNames.h>
-#import <WebCore/Frame.h>
 #import <WebCore/FrameLoadRequest.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/FrameLoaderStateMachine.h>
@@ -81,6 +80,7 @@
 #import <WebCore/HitTestResult.h>
 #import <WebCore/JSNode.h>
 #import <WebCore/LegacyWebArchive.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <WebCore/PlatformEventFactoryMac.h>
 #import <WebCore/PluginData.h>
index 0b2a62d..ee0affa 100644 (file)
 #import <WebCore/KeyboardEvent.h>
 #import <WebCore/LegacyWebArchive.h>
 #import <WebCore/MIMETypeRegistry.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <WebCore/PlatformEventFactoryMac.h>
 #import <WebCore/Range.h>
index 1a96e03..432e025 100644 (file)
 #import <WebCore/EventHandler.h>
 #import <WebCore/ExceptionHandlers.h>
 #import <WebCore/FocusController.h>
-#import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/FrameSelection.h>
 #import <WebCore/FrameTree.h>
 #import <WebCore/JSNotification.h>
 #import <WebCore/Logging.h>
 #import <WebCore/MIMETypeRegistry.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/MemoryPressureHandler.h>
 #import <WebCore/NodeList.h>
 #import <WebCore/Notification.h>
index e46cf19..d981607 100644 (file)
@@ -1,3 +1,18 @@
+2013-09-27  Darin Adler  <darin@apple.com>
+
+        Add empty MainFrame class
+        https://bugs.webkit.org/show_bug.cgi?id=121770
+
+        Reviewed by Andreas Kling.
+
+        * 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.
+
 2013-09-27  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         [Qt] Fix force_static_libs_as_shared in WebKit2
index 9bcbcab..b90050c 100644 (file)
 #include "Document.h"
 #include "FileChooser.h"
 #include "FileIconLoader.h"
-#include "Frame.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClientQt.h"
 #include "FrameView.h"
 #include "Geolocation.h"
-#if USE(ACCELERATED_COMPOSITING)
-#include "GraphicsLayer.h"
-#endif
 #include "HTMLFormElement.h"
 #include "HitTestResult.h"
 #include "Icon.h"
+#include "MainFrame.h"
 #include "NavigationAction.h"
 #include "NetworkingContext.h"
 #include "NotImplemented.h"
@@ -68,7 +65,6 @@
 #include "qwebsecurityorigin.h"
 #include "qwebsecurityorigin_p.h"
 #include "qwebsettings.h"
-
 #include <qabstractanimation.h>
 #include <qdebug.h>
 #include <qeventloop.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/OwnPtr.h>
 
+#if USE(ACCELERATED_COMPOSITING)
+#include "GraphicsLayer.h"
+#endif
+
 #if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA))
 #include "FullScreenVideoQt.h"
 #include "HTMLMediaElement.h"
index 9600922..f45a7b8 100644 (file)
@@ -39,7 +39,6 @@
 #include "Element.h"
 #include "FocusController.h"
 #include "Font.h"
-#include "Frame.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoaderClientQt.h"
 #include "FrameView.h"
@@ -54,6 +53,7 @@
 #include "HistoryItem.h"
 #include "InspectorController.h"
 #include "JSNode.h"
+#include "MainFrame.h"
 #include "NodeList.h"
 #include "NotificationPresenterClientQt.h"
 #include "Page.h"
index 1981fd1..afe13c1 100644 (file)
 #include "HTTPStatusCodes.h"
 #include "HistoryItem.h"
 #include "HitTestResult.h"
-#if ENABLE(ICONDATABASE)
-#include "IconDatabaseClientQt.h"
-#endif
 #include "JSDOMWindowBase.h"
 #include "MIMETypeRegistry.h"
+#include "MainFrame.h"
 #include "MouseEvent.h"
 #include "NotImplemented.h"
 #include "Page.h"
@@ -82,7 +80,6 @@
 #include "qwebhistoryinterface.h"
 #include "qwebpluginfactory.h"
 #include "qwebsettings.h"
-
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFileInfo>
 #include <wtf/OwnPtr.h>
 #include <wtf/text/StringBuilder.h>
 
+#if ENABLE(ICONDATABASE)
+#include "IconDatabaseClientQt.h"
+#endif
+
 static QMap<unsigned long, QString> dumpAssignedUrls;
 
 // Compare with the file "WebKit/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm".
index 05a3756..67c6821 100644 (file)
 #include "config.h"
 #include "InspectorClientQt.h"
 
-#include "Frame.h"
 #include "FrameView.h"
 #include "InspectorController.h"
 #include "InspectorFrontend.h"
 #include "InspectorServerQt.h"
+#include "MainFrame.h"
 #include "NotImplemented.h"
 #include "Page.h"
 #include "QWebFrameAdapter.h"
index e89a143..fe62d5e 100644 (file)
@@ -36,6 +36,7 @@
 #include "Event.h"
 #include "EventNames.h"
 #include "KURL.h"
+#include "MainFrame.h"
 #include "Page.h"
 #include "QWebFrameAdapter.h"
 #include "QWebPageAdapter.h"
index 7633bf7..7f9df3f 100644 (file)
@@ -27,7 +27,6 @@
 #include "DocumentLoader.h"
 #include "EventHandler.h"
 #include "FocusController.h"
-#include "Frame.h"
 #include "FrameLoadRequest.h"
 #include "FrameLoaderClientQt.h"
 #include "FrameView.h"
@@ -37,6 +36,7 @@
 #include "InspectorController.h"
 #include "JSDOMWindowBase.h"
 #include "KURL.h"
+#include "MainFrame.h"
 #include "NavigationScheduler.h"
 #include "NetworkingContext.h"
 #include "NodeList.h"
 #include "SubstituteData.h"
 #include "TextureMapperLayerClientQt.h"
 #include "TiledBackingStore.h"
-#if ENABLE(GESTURE_EVENTS)
-#include "PlatformGestureEvent.h"
-#include "WebEventConversion.h"
-#endif
 #include "htmlediting.h"
 #include "markup.h"
 #include "qt_runtime.h"
 #include "qwebsecurityorigin.h"
 #include "qwebsecurityorigin_p.h"
 #include "qwebsettings.h"
-
 #include <IntRect.h>
 #include <IntSize.h>
 #include <QFileInfo>
 #include <QNetworkRequest>
 
+#if ENABLE(GESTURE_EVENTS)
+#include "PlatformGestureEvent.h"
+#include "WebEventConversion.h"
+#endif
+
 using namespace WebCore;
 
 static inline ResourceRequestCachePolicy cacheLoadControlToCachePolicy(uint cacheLoadControl)
index d266526..9f7b1d3 100644 (file)
 #include "ContextMenu.h"
 #include "ContextMenuClientQt.h"
 #include "ContextMenuController.h"
-#if ENABLE(DEVICE_ORIENTATION)
-#include "DeviceMotionClientMock.h"
-#include "DeviceMotionController.h"
-#include "DeviceOrientationClientMock.h"
-#include "DeviceOrientationController.h"
-#if HAVE(QTSENSORS)
-#include "DeviceMotionClientQt.h"
-#include "DeviceOrientationClientQt.h"
-#endif
-#endif
 #include "DocumentLoader.h"
 #include "DragClientQt.h"
 #include "DragController.h"
 #include "FrameLoadRequest.h"
 #include "FrameSelection.h"
 #include "FrameView.h"
-#if ENABLE(GEOLOCATION)
-#include "GeolocationClientMock.h"
-#include "GeolocationController.h"
-#if HAVE(QTLOCATION)
-#include "GeolocationClientQt.h"
-#endif
-#endif
 #include "GeolocationPermissionClientQt.h"
 #include "HTMLFrameOwnerElement.h"
 #include "HTMLInputElement.h"
@@ -68,6 +51,7 @@
 #include "InspectorServerQt.h"
 #include "LocalizedStrings.h"
 #include "MIMETypeRegistry.h"
+#include "MainFrame.h"
 #include "MemoryCache.h"
 #include "NetworkingContext.h"
 #include "NodeList.h"
 #include <QTouchEvent>
 #include <QWheelEvent>
 
+#if ENABLE(DEVICE_ORIENTATION)
+#include "DeviceMotionClientMock.h"
+#include "DeviceMotionController.h"
+#include "DeviceOrientationClientMock.h"
+#include "DeviceOrientationController.h"
+#if HAVE(QTSENSORS)
+#include "DeviceMotionClientQt.h"
+#include "DeviceOrientationClientQt.h"
+#endif
+#endif
+
+#if ENABLE(GEOLOCATION)
+#include "GeolocationClientMock.h"
+#include "GeolocationController.h"
+#if HAVE(QTLOCATION)
+#include "GeolocationClientQt.h"
+#endif
+#endif
+
 // from text/qfont.cpp
 QT_BEGIN_NAMESPACE
 extern Q_GUI_EXPORT int qt_defaultDpi();
index 4fc5cff..ea10675 100644 (file)
@@ -1,3 +1,17 @@
+2013-09-27  Darin Adler  <darin@apple.com>
+
+        Add empty MainFrame class
+        https://bugs.webkit.org/show_bug.cgi?id=121770
+
+        Reviewed by Andreas Kling.
+
+        * 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.
+
 2013-09-25  Roger Fong  <roger_fong@apple.com>
 
         [Windows] Attempting to scroll from a non-scrollable layer results the main document getting scrolled.
index c733775..ec28008 100644 (file)
 #include "WebElementPropertyBag.h"
 #include "WebLocalizableStrings.h"
 #include "WebView.h"
-
 #include <WebCore/ContextMenu.h>
 #include <WebCore/ContextMenuController.h>
 #include <WebCore/Editor.h>
 #include <WebCore/Event.h>
-#include <WebCore/Frame.h>
-#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameLoadRequest.h>
+#include <WebCore/FrameLoader.h>
+#include <WebCore/MainFrame.h>
+#include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
 #include <WebCore/ResourceRequest.h>
-#include <WebCore/NotImplemented.h>
 
 using namespace WebCore;
 
index d5ad6d2..7255b73 100644 (file)
 
 #include "config.h"
 #include "WebDragClient.h"
+
 #include "WebDropSource.h"
 #include "WebKitGraphics.h"
 #include "WebView.h"
-
 #include <WebCore/Clipboard.h>
 #include <WebCore/DragController.h>
 #include <WebCore/DragData.h>
 #include <WebCore/EventHandler.h>
+#include <WebCore/FrameView.h>
+#include <WebCore/GraphicsContext.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/Pasteboard.h>
 #include <WebCore/PlatformMouseEvent.h>
-#include <WebCore/Frame.h>
-#include <WebCore/FrameView.h>
-#include <WebCore/GraphicsContext.h>
 #include <shlobj.h>
 
 using namespace WebCore;
index ffc47f3..57a83b3 100644 (file)
@@ -32,8 +32,8 @@
 #include <WebCore/Cursor.h>
 #include <WebCore/DragActions.h>
 #include <WebCore/EventHandler.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/PlatformMouseEvent.h>
 #include <wtf/CurrentTime.h>
index ab71945..7a9f2d4 100644 (file)
@@ -64,7 +64,6 @@
 #include <WebCore/Event.h>
 #include <WebCore/EventHandler.h>
 #include <WebCore/FormState.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameLoadRequest.h>
 #include <WebCore/FrameTree.h>
@@ -81,6 +80,7 @@
 #include <WebCore/HTMLPlugInElement.h>
 #include <WebCore/JSDOMWindow.h>
 #include <WebCore/KeyboardEvent.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/MouseRelatedEvent.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
index 12429ca..f3f8153 100644 (file)
@@ -89,7 +89,6 @@
 #include <WebCore/FileSystem.h>
 #include <WebCore/FloatQuad.h>
 #include <WebCore/FocusController.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameSelection.h>
 #include <WebCore/FrameTree.h>
 #include <WebCore/KeyboardEvent.h>
 #include <WebCore/Logging.h>
 #include <WebCore/MIMETypeRegistry.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/MemoryCache.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
index e499f59..3008880 100644 (file)
@@ -1,3 +1,33 @@
+2013-09-27  Darin Adler  <darin@apple.com>
+
+        Add empty MainFrame class
+        https://bugs.webkit.org/show_bug.cgi?id=121770
+
+        Reviewed by Andreas Kling.
+
+        * 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.
+
 2013-09-27  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         [Qt] Fix force_static_libs_as_shared in WebKit2
index 718820c..ef75e4a 100644 (file)
@@ -34,8 +34,8 @@
 #include "WebPage.h"
 #include <WebCore/Color.h>
 #include <WebCore/Element.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/RenderLayer.h>
 #include <WebCore/RenderLayerBacking.h>
index 6915d90..26ddb81 100644 (file)
 #include "WebString.h"
 #include "WebURL.h"
 #include "WebURLRequest.h"
-
 #include <WebCore/AXObjectCache.h>
 #include <WebCore/AccessibilityObject.h>
-#include <WebCore/Frame.h>
 #include <WebCore/KURL.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <wtf/StdLibExtras.h>
 
index c8c077e..5ee11d1 100644 (file)
@@ -50,7 +50,6 @@
 #include <JavaScriptCore/JSLock.h>
 #include <WebCore/ApplicationCache.h>
 #include <WebCore/ApplicationCacheStorage.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/GCController.h>
@@ -59,6 +58,7 @@
 #include <WebCore/GeolocationPosition.h>
 #include <WebCore/JSDOMWindow.h>
 #include <WebCore/JSNotification.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/PageGroup.h>
 #include <WebCore/PrintContext.h>
index d3683e7..a0e7a96 100644 (file)
@@ -42,7 +42,6 @@
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/EventHandler.h>
 #include <WebCore/FocusController.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameLoadRequest.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameLoaderClient.h>
@@ -52,6 +51,7 @@
 #include <WebCore/HTMLPlugInImageElement.h>
 #include <WebCore/HostWindow.h>
 #include <WebCore/MIMETypeRegistry.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/MouseEvent.h>
 #include <WebCore/NetscapePlugInStreamLoader.h>
 #include <WebCore/NetworkingContext.h>
index 0a85289..bb21dd4 100644 (file)
@@ -35,7 +35,7 @@
 #include "WebPageGroupProxy.h"
 #include "WebProcess.h"
 #include <WebCore/DOMWindow.h>
-#include <WebCore/Frame.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/PageGroup.h>
 #include <WebCore/Storage.h>
index 6abbcd6..1b3618f 100644 (file)
@@ -55,7 +55,6 @@
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/FileChooser.h>
 #include <WebCore/FileIconLoader.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameLoadRequest.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
@@ -64,6 +63,7 @@
 #include <WebCore/HTMLParserIdioms.h>
 #include <WebCore/HTMLPlugInImageElement.h>
 #include <WebCore/Icon.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
 #include <WebCore/SecurityOrigin.h>
index eec8168..eff5ad2 100644 (file)
@@ -34,8 +34,8 @@
 #include "WebPage.h"
 #include <WebCore/ContextMenu.h>
 #include <WebCore/Event.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
 #include <WebCore/UserGestureIndicator.h>
index 9b6090e..25a8a2a 100644 (file)
@@ -55,7 +55,6 @@
 #include <WebCore/DOMWrapperWorld.h>
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/FormState.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameLoadRequest.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
@@ -64,6 +63,7 @@
 #include <WebCore/HistoryController.h>
 #include <WebCore/HistoryItem.h>
 #include <WebCore/MIMETypeRegistry.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/MouseEvent.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/Page.h>
index 44d59f2..6f2d2dc 100644 (file)
@@ -42,9 +42,9 @@
 #include "WebProcess.h"
 #include "WebProcessProxyMessages.h"
 #include <WebCore/Color.h>
-#include <WebCore/Frame.h>
 #include <WebCore/KURL.h>
 #include <WebCore/LoaderStrategy.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/NetworkStorageSession.h>
 #include <WebCore/NetworkingContext.h>
 #include <WebCore/Page.h>
index 0726922..cad5e12 100644 (file)
@@ -32,8 +32,8 @@
 #import "WebCoreArgumentCoders.h"
 #import "WebPage.h"
 #import "WebPageProxyMessages.h"
-#import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <wtf/text/WTFString.h>
 
index e935ef5..6c10625 100644 (file)
@@ -35,9 +35,9 @@
 #include <WebCore/DocumentMarkerController.h>
 #include <WebCore/FloatQuad.h>
 #include <WebCore/FocusController.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/GraphicsContext.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/PluginDocument.h>
 
index b1f91e9..12413d9 100644 (file)
@@ -28,9 +28,9 @@
 
 #include "WebPage.h"
 #include "WebProcess.h"
-#include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/GraphicsContext.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/ScrollbarTheme.h>
 #include <wtf/CurrentTime.h>
index c4bec9a..1a8e781 100644 (file)
 #include "WebPage.h"
 #include "WebPageCreationParameters.h"
 #include "WebProcess.h"
-#include <WebCore/Frame.h>
 #include <WebCore/InspectorController.h>
 #include <WebCore/InspectorFrontendChannel.h>
 #include <WebCore/InspectorFrontendClient.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/ScriptController.h>
 #include <WebCore/ScriptValue.h>
index 898d084..770fb6b 100644 (file)
@@ -98,7 +98,6 @@
 #include <WebCore/EventHandler.h>
 #include <WebCore/FocusController.h>
 #include <WebCore/FormState.h>
-#include <WebCore/Frame.h>
 #include <WebCore/FrameLoadRequest.h>
 #include <WebCore/FrameLoaderTypes.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/JSDOMWindow.h>
 #include <WebCore/KeyboardEvent.h>
 #include <WebCore/MIMETypeRegistry.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/MouseEvent.h>
 #include <WebCore/Page.h>
 #include <WebCore/PlatformKeyboardEvent.h>
index 4dbe9d9..577a967 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "WebPage.h"
 #include <WebCore/AXObjectCache.h>
-#include <WebCore/Frame.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 
 using namespace WebKit;
index 4fb0596..5b36563 100644 (file)
 #include <GL/gl.h>
 #endif
 
-#include <WebCore/Frame.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/GLContext.h>
 #include <WebCore/GraphicsLayerTextureMapper.h>
+#include <WebCore/MainFrame.h>
 #include <WebCore/Page.h>
 #include <WebCore/Settings.h>
 #include <wtf/CurrentTime.h>
index 9f62a46..392718b 100644 (file)
@@ -31,9 +31,9 @@
 #import "WebPage.h"
 #import "WebProcess.h"
 #import <QuartzCore/CATransaction.h>
-#import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/GraphicsLayerCA.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/PlatformCALayer.h>
 #import <WebCore/Settings.h>
 
index d5d3431..b864540 100644 (file)
@@ -30,8 +30,8 @@
 #import "RemoteLayerTreeTransaction.h"
 #import "RemoteLayerTreeHostMessages.h"
 #import "WebPage.h"
-#import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <wtf/PassOwnPtr.h>
 #import <wtf/TemporaryChange.h>
index a0fbc9c..46b1049 100644 (file)
 #import "WebPageProxyMessages.h"
 #import "WebProcess.h"
 #import <QuartzCore/QuartzCore.h>
-#import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/GraphicsContext.h>
 #import <WebCore/GraphicsLayerCA.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <WebCore/RenderView.h>
 #import <WebCore/Settings.h>
index 27bdeae..3fc492c 100644 (file)
@@ -35,8 +35,8 @@
 #import "WKString.h"
 #import "WKStringCF.h"
 #import <WebCore/AXObjectCache.h>
-#import <WebCore/Frame.h>
 #import <WebCore/FrameView.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/Page.h>
 #import <WebCore/ScrollView.h>
 #import <WebCore/Scrollbar.h>
index 2722f7e..ca4550f 100644 (file)
 #import <WebCore/AXObjectCache.h>
 #import <WebCore/EventHandler.h>
 #import <WebCore/FocusController.h>
-#import <WebCore/Frame.h>
 #import <WebCore/FrameLoader.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/HTMLConverter.h>
 #import <WebCore/HitTestResult.h>
 #import <WebCore/KeyboardEvent.h>
 #import <WebCore/MIMETypeRegistry.h>
+#import <WebCore/MainFrame.h>
 #import <WebCore/NetworkingContext.h>
 #import <WebCore/Page.h>
 #import <WebCore/PlatformKeyboardEvent.h>
index 71e07c8..b391823 100644 (file)
@@ -517,15 +517,6 @@ class _FunctionState(object):
         self._clean_lines = clean_lines
         self._parameter_list = None
 
-    def modifiers_and_return_type(self):
-        """Returns the modifiers and the return type."""
-        # Go backwards from where the function name is until we encounter one of several things:
-        #   ';' or '{' or '}' or 'private:', etc. or '#' or return Position(0, 0)
-        elided = self._clean_lines.elided
-        start_modifiers = _rfind_in_lines(r';|\{|\}|((private|public|protected):)|(#.*)',
-                                          elided, self.parameter_start_position, Position(0, 0))
-        return SingleLineView(elided, start_modifiers, self.function_name_start_position).single_line.strip()
-
     def parameter_list(self):
         if not self._parameter_list:
             # Store the final result as a tuple since that is immutable.
@@ -1596,13 +1587,12 @@ def _check_parameter_name_against_text(parameter, text, error):
     return True
 
 
-def check_function_definition_and_pass_ptr(type_text, row, location_description, error):
+def check_function_definition_and_pass_ptr(type_text, row, error):
     """Check that function definitions for use Pass*Ptr instead of *Ptr.
 
     Args:
-       type_text: A string containing the type. (For return values, it may contain more than the type.)
+       type_text: A string containing the type.
        row: The row number of the type.
-       location_description: Used to indicate where the type is. This is either 'parameter' or 'return'.
        error: The function to call with any errors found.
     """
     match_ref_ptr = '(?=\W|^)RefPtr(?=\W)'
@@ -1611,7 +1601,7 @@ def check_function_definition_and_pass_ptr(type_text, row, location_description,
         return
     type_name = bad_type_usage.group(0)
     error(row, 'readability/pass_ptr', 5,
-          'The %s type should use Pass%s instead of %s.' % (location_description, type_name, type_name))
+          'The parameter type should use Pass%s instead of %s.' % (type_name, type_name))
 
 
 def check_function_definition(filename, file_extension, clean_lines, line_number, function_state, error):
@@ -1630,12 +1620,9 @@ def check_function_definition(filename, file_extension, clean_lines, line_number
     if line_number != function_state.body_start_position.row:
         return
 
-    modifiers_and_return_type = function_state.modifiers_and_return_type()
-    check_function_definition_and_pass_ptr(modifiers_and_return_type, function_state.function_name_start_position.row, 'return', error)
-
     parameter_list = function_state.parameter_list()
     for parameter in parameter_list:
-        check_function_definition_and_pass_ptr(parameter.type, parameter.row, 'parameter', error)
+        check_function_definition_and_pass_ptr(parameter.type, parameter.row, error)
 
         # Do checks specific to function declarations and parameter names.
         if not function_state.is_declaration or not parameter.name:
index 8d9d4fc..ddf0ad6 100644 (file)
@@ -3440,7 +3440,7 @@ class PassPtrTest(CppStyleTestBase):
             'RefPtr<Type1> myFunction(int)\n'
             '{\n'
             '}',
-            'The return type should use PassRefPtr instead of RefPtr.  [readability/pass_ptr] [5]')
+            '')
         self.assert_pass_ptr_check(
             'OwnPtr<Type1> myFunction(int)\n'
             '{\n'