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

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

Reviewed by Andreas Kling.

Source/WebCore:

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

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

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

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

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

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

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

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

be a RefPtr<MainFrame>.

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

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

Source/WebKit/efl:

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

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

Source/WebKit/gtk:

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

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

Source/WebKit/mac:

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

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

Source/WebKit/qt:

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

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

Source/WebKit/win:

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

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

Source/WebKit2:

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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/page/PageSerializer.cpp

    r156260 r156543  
    3838#include "Document.h"
    3939#include "Element.h"
    40 #include "Frame.h"
    4140#include "HTMLFrameOwnerElement.h"
    4241#include "HTMLHeadElement.h"
     
    4948#include "Image.h"
    5049#include "MIMETypeRegistry.h"
     50#include "MainFrame.h"
    5151#include "MarkupAccumulator.h"
    5252#include "Page.h"
Note: See TracChangeset for help on using the changeset viewer.