Changeset 154715 in webkit

Timestamp:

Aug 27, 2013 5:09:16 PM (11 years ago)

Author:

akling@apple.com

Message:

Make it less awkward to check if a Frame is the main Frame.
<​https://webkit.org/b/120382>

Reviewed by Anders Carlsson.

Added Page::frameIsMainFrame(const Frame*) so code that wants to find out if a given
Frame is a Page's main frame doesn't have to do a manual pointer compare.

• page/Page.h:

(WebCore::Page::frameIsMainFrame):

Added. Replaces (frame == &page->mainFrame()) idiom.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (5 diffs)
• WebCore/history/CachedPage.cpp (modified) (1 diff)
• WebCore/history/PageCache.cpp (modified) (2 diffs)
• WebCore/html/HTMLPlugInImageElement.cpp (modified) (1 diff)
• WebCore/html/ImageDocument.cpp (modified) (1 diff)
• WebCore/inspector/InspectorAgent.cpp (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (1 diff)
• WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• WebCore/inspector/InspectorPageAgent.cpp (modified) (2 diffs)
• WebCore/loader/FrameLoader.cpp (modified) (6 diffs)
• WebCore/loader/HistoryController.cpp (modified) (3 diffs)
• WebCore/page/DOMWindow.cpp (modified) (2 diffs)
• WebCore/page/Frame.cpp (modified) (2 diffs)
• WebCore/page/FrameView.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (1 diff)
• WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)
• WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebFrameView.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-27  Andreas Kling  <akling@apple.com>
+
+        Make it less awkward to check if a Frame is the main Frame.
+        <https://webkit.org/b/120382>
+
+        Reviewed by Anders Carlsson.
+
+        Added Page::frameIsMainFrame(const Frame*) so code that wants to find out if a given
+        Frame is a Page's main frame doesn't have to do a manual pointer compare.
+
+        * page/Page.h:
+        (WebCore::Page::frameIsMainFrame):
+
+            Added. Replaces (frame == &page->mainFrame()) idiom.
+
 2013-08-27  Morten Stenshorne  <mstensho@opera.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1275 +1275 @@
 
     if (Page* page = this->page()) {
-        if (frame() == &page->mainFrame()) {
+        if (page->frameIsMainFrame(frame())) {
             frameView->addPaintPendingMilestones(DidFirstPaintAfterSuppressedIncrementalRendering);
             if (page->requestedLayoutMilestones() & DidFirstLayoutAfterSuppressedIncrementalRendering)
@@ -2026 +2026 @@
     // subframes' documents have no wheel event handlers, then the count did not change,
     // unless the documents they are replacing had wheel event handlers.
-    if (page() && &page()->mainFrame() == m_frame)
+    if (page() && page()->frameIsMainFrame(m_frame))
         pageWheelEventHandlerCountChanged(*page());
 
@@ -2032 +2032 @@
     // FIXME: Doing this only for the main frame is insufficient.
     // A subframe could have touch event handlers.
-    if (hasTouchEventHandlers() && page() && &page()->mainFrame() == m_frame)
+    if (hasTouchEventHandlers() && page() && page()->frameIsMainFrame(m_frame))
         page()->chrome().client().needTouchEvents(true);
 #endif
@@ -2956 +2956 @@
 void Document::updateViewportArguments()
 {
-    if (page() && &page()->mainFrame() == frame()) {
+    if (page() && page()->frameIsMainFrame(frame())) {
 #ifndef NDEBUG
         m_didDispatchViewportPropertiesChanged = true;
@@ -4010 +4010 @@
             // https://bugs.webkit.org/show_bug.cgi?id=98698
             v->cacheCurrentScrollPosition();
-            if (page && &page->mainFrame() == m_frame) {
+            if (page && page->frameIsMainFrame(m_frame)) {
                 v->resetScrollbarsAndClearContentsSize();
                 if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())

trunk/Source/WebCore/history/CachedPage.cpp

@@ -78 +78 @@
 {
     ASSERT(m_cachedMainFrame);
-    ASSERT(page && &page->mainFrame() == &m_cachedMainFrame->view()->frame());
+    ASSERT(page && page->frameIsMainFrame(&m_cachedMainFrame->view()->frame()));
     ASSERT(!page->subframeCount());
 

trunk/Source/WebCore/history/PageCache.cpp

@@ -400 +400 @@
     for (HistoryItem* current = m_head; current; current = current->m_next) {
         CachedPage* cachedPage = current->m_cachedPage.get();
-        if (&cachedPage->cachedMainFrame()->view()->frame() == &page->mainFrame())
+        if (page->frameIsMainFrame(&cachedPage->cachedMainFrame()->view()->frame()))
             cachedPage->markForFullStyleRecalc();
     }
@@ -411 +411 @@
     for (HistoryItem* current = m_head; current; current = current->m_next) {
         CachedPage* cachedPage = current->m_cachedPage.get();
-        if (&cachedPage->cachedMainFrame()->view()->frame() == &page->mainFrame())
+        if (page->frameIsMainFrame(&cachedPage->cachedMainFrame()->view()->frame()))
             cachedPage->markForDeviceScaleChanged();
     }

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -604 +604 @@
     }
 
-    bool inMainFrame = document()->frame() == &document()->page()->mainFrame();
+    bool inMainFrame = document()->page()->frameIsMainFrame(document()->frame());
 
     if (document()->isPluginDocument() && inMainFrame) {

trunk/Source/WebCore/html/ImageDocument.cpp

@@ -374 +374 @@
 bool ImageDocument::shouldShrinkToFit() const
 {
-    return frame()->page()->settings().shrinksStandaloneImagesToFit() && &frame()->page()->mainFrame() == frame();
+    return frame()->settings().shrinksStandaloneImagesToFit() && frame()->page()->frameIsMainFrame(frame());
 }
 

trunk/Source/WebCore/inspector/InspectorAgent.cpp

@@ -142 +142 @@
 bool InspectorAgent::isMainResourceLoader(DocumentLoader* loader, const KURL& requestUrl)
 {
-    return loader->frame() == &m_inspectedPage->mainFrame() && requestUrl == loader->requestURL();
+    return m_inspectedPage->frameIsMainFrame(loader->frame()) && requestUrl == loader->requestURL();
 }
 

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -223 +223 @@
     // If the page is supposed to serve as InspectorFrontend notify inspector frontend
     // client that it's cleared so that the client can expose inspector bindings.
-    if (m_inspectorFrontendClient && frame == &m_page->mainFrame())
+    if (m_inspectorFrontendClient && m_page->frameIsMainFrame(frame))
         m_inspectorFrontendClient->windowObjectCleared();
 }

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -903 +903 @@
         return;
 
-    if (loader->frame() == &page->mainFrame()) {
+    if (page->frameIsMainFrame(loader->frame())) {
         if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
             consoleAgent->reset();

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -869 +869 @@
         return;
 
-    if (frame == &m_page->mainFrame())
+    if (m_page->frameIsMainFrame(frame))
         m_injectedScriptManager->discardInjectedScripts();
 
@@ -901 +901 @@
 void InspectorPageAgent::frameNavigated(DocumentLoader* loader)
 {
-    if (loader->frame() == &m_page->mainFrame()) {
+    if (m_page->frameIsMainFrame(loader->frame())) {
         m_scriptToEvaluateOnLoadOnce = m_pendingScriptToEvaluateOnLoadOnce;
         m_scriptPreprocessor = m_pendingScriptPreprocessor;

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1960 +1960 @@
     ASSERT(!m_frame.tree().parent());
     ASSERT(m_frame.page());
-    ASSERT(&m_frame.page()->mainFrame() == &m_frame);
+    ASSERT(m_frame.page()->frameIsMainFrame(&m_frame));
 
     m_frame.navigationScheduler().cancel();
@@ -2029 +2029 @@
 bool FrameLoader::isLoadingMainFrame() const
 {
-    return m_frame.page() && &m_frame.page()->mainFrame() == &m_frame;
+    return m_frame.page() && m_frame.page()->frameIsMainFrame(&m_frame);
 }
 
@@ -2179 +2179 @@
             m_progressTracker->progressCompleted();
             if (Page* page = m_frame.page()) {
-                if (&m_frame == &page->mainFrame())
+                if (page->frameIsMainFrame(&m_frame))
                     page->resetRelevantPaintedObjectCounter();
             }
@@ -2288 +2288 @@
 #if !ASSERT_DISABLED
     if (Page* page = m_frame.page())
-        ASSERT(&page->mainFrame() == &m_frame);
+        ASSERT(page->frameIsMainFrame(&m_frame));
 #endif
 
@@ -2862 +2862 @@
 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
     if (Page* page = m_frame.page()) {
-        if (&page->mainFrame() == &m_frame)
+        if (page->frameIsMainFrame(&m_frame))
             page->inspectorController()->resume();
     }
@@ -3329 +3329 @@
     InspectorInstrumentation::didCommitLoad(&m_frame, m_documentLoader.get());
 
-    if (&m_frame.page()->mainFrame() == &m_frame)
+    if (m_frame.page()->frameIsMainFrame(&m_frame))
         m_frame.page()->featureObserver()->didCommitLoad();
 

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -82 +82 @@
 
     Page* page = m_frame.page();
-    if (page && &page->mainFrame() == &m_frame)
+    if (page && page->frameIsMainFrame(&m_frame))
         item->setPageScaleFactor(page->pageScaleFactor());
 
@@ -135 +135 @@
     if (FrameView* view = m_frame.view()) {
         Page* page = m_frame.page();
-        if (page && &page->mainFrame() == &m_frame) {
+        if (page && page->frameIsMainFrame(&m_frame)) {
             if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
                 scrollingCoordinator->frameViewRootLayerDidChange(view);
@@ -141 +141 @@
 
         if (!view->wasScrolledByUser()) {
-            if (page && &page->mainFrame() == &m_frame && m_currentItem->pageScaleFactor())
+            if (page && page->frameIsMainFrame(&m_frame) && m_currentItem->pageScaleFactor())
                 page->setPageScaleFactor(m_currentItem->pageScaleFactor(), m_currentItem->scrollPoint());
             else

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -232 +232 @@
     if (!page)
         return false;
-    return frame == &page->mainFrame();
+    return page->frameIsMainFrame(frame);
 }
 
@@ -932 +932 @@
 
     // If we're a top level window, bring the window to the front.
-    if (m_frame == &page->mainFrame() && allowFocus)
+    if (page->frameIsMainFrame(m_frame) && allowFocus)
         page->chrome().focus();
 

trunk/Source/WebCore/page/Frame.cpp

@@ -707 +707 @@
     ASSERT(m_page);
 
-    bool isMainFrame = this == &m_page->mainFrame();
+    bool isMainFrame = m_page->frameIsMainFrame(this);
 
     if (isMainFrame && view())
@@ -880 +880 @@
     }
 
-    if (&page->mainFrame() == this)
+    if (page->frameIsMainFrame(this))
         pageCache()->markPagesForFullStyleRecalc(page);
 }

trunk/Source/WebCore/page/FrameView.cpp

@@ -413 +413 @@
 bool FrameView::isMainFrameView() const
 {
-    return frame().page() && &frame().page()->mainFrame() == &frame();
+    return frame().page() && frame().page()->frameIsMainFrame(&frame());
 }
 
@@ -2743 +2743 @@
     }
 
-    if (milestonesAchieved && page && &page->mainFrame() == &frame())
+    if (milestonesAchieved && page && page->frameIsMainFrame(&frame()))
         frame().loader().didLayout(milestonesAchieved);
+
 #if ENABLE(FONT_LOAD_EVENTS)
     if (RuntimeEnabledFeatures::fontLoadEventsEnabled())

trunk/Source/WebCore/page/Page.h

@@ -162 +162 @@
 
     Frame& mainFrame() const { return *m_mainFrame; }
+    bool frameIsMainFrame(const Frame* frame) { return frame == m_mainFrame.get(); }
 
     bool openedByDOM() const;

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -830 +830 @@
         return false;
     Page* page = frame().page();
-    return page && &page->mainFrame() == &frame() && view().frameView().isScrollable();
+    return page && page->frameIsMainFrame(&frame()) && view().frameView().isScrollable();
 }
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -122 +122 @@
     if (layer->isRootLayer()) {
         Page* page = renderer().frame().page();
-        if (page && &page->mainFrame() == &renderer().frame()) {
+        if (page && page->frameIsMainFrame(&renderer().frame())) {
             m_isMainFrameRenderViewLayer = true;
 

trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

@@ -1066 +1066 @@
     Frame* frame = core(m_webFrame.get());
     Page* page = frame->page();
-    BOOL forMainFrame = page && &page->mainFrame() == frame;
+    BOOL forMainFrame = page && page->frameIsMainFrame(frame);
     return [WebView _canHandleRequest:request.nsURLRequest(UpdateHTTPBody) forMainFrame:forMainFrame];
 }
@@ -1266 +1266 @@
     Frame* coreFrame = core(m_webFrame.get());
     Page* page = coreFrame->page();
-    bool isMainFrame = coreFrame == &page->mainFrame();
+    bool isMainFrame = page->frameIsMainFrame(coreFrame);
     if (isMainFrame && coreFrame->view())
         coreFrame->view()->setParentVisible(false);

trunk/Source/WebKit/mac/WebView/WebFrameView.mm

@@ -283 +283 @@
     // If this isn't the main frame, it must have an owner element set, or it
     // won't ever get installed in the view hierarchy.
-    ASSERT(frame == &frame->page()->mainFrame() || frame->ownerElement());
+    ASSERT(frame->page()->frameIsMainFrame(frame) || frame->ownerElement());
 
     FrameView* view = frame->view();