Commit ade301ac authored by darin@apple.com's avatar darin@apple.com

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156543 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ba169507
......@@ -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
......
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
......@@ -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 \
......
......@@ -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 \
......
......@@ -859,6 +859,7 @@ __ZN7WebCore4Page14setMediaVolumeEf
__ZN7WebCore4Page15addSchedulePairEN3WTF10PassRefPtrINS1_12SchedulePairEEE
__ZN7WebCore4Page15didMoveOnscreenEv
__ZN7WebCore4Page16countFindMatchesERKN3WTF6StringEjj
__ZN7WebCore4Page16frameIsMainFrameEPKNS_5FrameE
__ZN7WebCore4Page16setCanStartMediaEb
__ZN7WebCore4Page16setDefersLoadingEb
__ZN7WebCore4Page17willMoveOffscreenEv
......
......@@ -7177,6 +7177,7 @@
<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" />
......@@ -18821,6 +18822,7 @@
<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" />
......@@ -792,6 +792,9 @@
<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>
......@@ -7713,6 +7716,9 @@
<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>
......
......@@ -2877,6 +2877,8 @@
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 */; };
......@@ -9474,6 +9476,8 @@
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>"; };
......@@ -15307,6 +15311,8 @@
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 */,
......@@ -21502,6 +21508,7 @@
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 */,
......@@ -25708,6 +25715,7 @@
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 */,
......@@ -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"
......
......@@ -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"
......
......@@ -30,10 +30,10 @@
#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"
......
......@@ -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"
......
......@@ -37,10 +37,10 @@
#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"
......
......@@ -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"
......@@ -103,6 +102,7 @@
#include "JSLazyEventListener.h"
#include "Language.h"
#include "Logging.h"
#include "MainFrame.h"
#include "MediaCanStartListener.h"
#include "MediaQueryList.h"
#include "MediaQueryMatcher.h"
......
......@@ -35,13 +35,13 @@
#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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -34,7 +34,7 @@
#include "InspectorClient.h"
#include "Frame.h"
#include "MainFrame.h"
#include "Page.h"
#include "ScriptController.h"
#include "ScriptSourceCode.h"
......
......@@ -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"
......
......@@ -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"
......
......@@ -40,13 +40,13 @@
#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"
......
......@@ -36,11 +36,11 @@
#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"
......
......@@ -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"
......
......@@ -35,12 +35,12 @@
#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"
......
......@@ -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"
......
......@@ -35,12 +35,12 @@
#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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -31,18 +31,19 @@
#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
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -38,7 +38,6 @@
#include "EventHandler.h"
#include "EventNames.h"
#include "ExceptionCode.h"
#include "Frame.h"
#include "FrameSelection.h"
#include "FrameTree.h"