[webkit-changes] [129707] trunk/Source/WebCore

Wed, 26 Sep 2012 14:12:35 -0700

Title: [129707] trunk/Source/WebCore
Revision
129707
Author
[email protected]
Date
2012-09-26 14:13:38 -0700 (Wed, 26 Sep 2012)

Log Message

Rename Page::frameCount() to subframeCount(), and related
https://bugs.webkit.org/show_bug.cgi?id=97729

Reviewed by Alexey Proskuryakov.

Rename member functions and variables on Page that refer to
"frame count" to use "subframe count", since the main frame is
not included in the count.

* history/CachedFrame.cpp:
(WebCore::CachedFrame::CachedFrame):
(WebCore::CachedFrame::open):
* history/CachedPage.cpp:
(WebCore::CachedPage::restore):
* html/HTMLFrameElementBase.cpp:
(WebCore::HTMLFrameElementBase::isURLAllowed):
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::allowedToLoadFrameURL):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::closeAndRemoveChild):
* page/Frame.cpp:
(WebCore::Frame::Frame):
(WebCore::Frame::disconnectOwnerElement):
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::checkSubframeCountConsistency):
* page/Page.h:
(WebCore::Page::incrementSubframeCount):
(WebCore::Page::decrementSubframeCount):
(WebCore::Page::subframeCount):
(WebCore::Page::checkSubframeCountConsistency):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (129706 => 129707)


--- trunk/Source/WebCore/ChangeLog	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/ChangeLog	2012-09-26 21:13:38 UTC (rev 129707)
@@ -1,3 +1,37 @@
+2012-09-26  Simon Fraser  <[email protected]>
+
+        Rename Page::frameCount() to subframeCount(), and related
+        https://bugs.webkit.org/show_bug.cgi?id=97729
+
+        Reviewed by Alexey Proskuryakov.
+
+        Rename member functions and variables on Page that refer to
+        "frame count" to use "subframe count", since the main frame is
+        not included in the count.
+
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrame::CachedFrame):
+        (WebCore::CachedFrame::open):
+        * history/CachedPage.cpp:
+        (WebCore::CachedPage::restore):
+        * html/HTMLFrameElementBase.cpp:
+        (WebCore::HTMLFrameElementBase::isURLAllowed):
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::allowedToLoadFrameURL):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::closeAndRemoveChild):
+        * page/Frame.cpp:
+        (WebCore::Frame::Frame):
+        (WebCore::Frame::disconnectOwnerElement):
+        * page/Page.cpp:
+        (WebCore::Page::Page):
+        (WebCore::Page::checkSubframeCountConsistency):
+        * page/Page.h:
+        (WebCore::Page::incrementSubframeCount):
+        (WebCore::Page::decrementSubframeCount):
+        (WebCore::Page::subframeCount):
+        (WebCore::Page::checkSubframeCountConsistency):
+
 2012-09-26  Michael Saboff  <[email protected]>
 
         Unreviewed speculative build fix for clang.

Modified: trunk/Source/WebCore/history/CachedFrame.cpp (129706 => 129707)


--- trunk/Source/WebCore/history/CachedFrame.cpp	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/history/CachedFrame.cpp	2012-09-26 21:13:38 UTC (rev 129707)
@@ -191,7 +191,7 @@
         frame->tree()->removeChild(m_childFrames[i]->view()->frame());
 
     if (!m_isMainFrame)
-        frame->page()->decrementFrameCount();
+        frame->page()->decrementSubframeCount();
 
     frame->loader()->client()->didSaveToPageCache();
 
@@ -210,7 +210,7 @@
     m_view->frame()->loader()->open(*this);
 
     if (!m_isMainFrame)
-        m_view->frame()->page()->incrementFrameCount();
+        m_view->frame()->page()->incrementSubframeCount();
 }
 
 void CachedFrame::clear()

Modified: trunk/Source/WebCore/history/CachedPage.cpp (129706 => 129707)


--- trunk/Source/WebCore/history/CachedPage.cpp	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/history/CachedPage.cpp	2012-09-26 21:13:38 UTC (rev 129707)
@@ -74,7 +74,7 @@
 {
     ASSERT(m_cachedMainFrame);
     ASSERT(page && page->mainFrame() && page->mainFrame() == m_cachedMainFrame->view()->frame());
-    ASSERT(!page->frameCount());
+    ASSERT(!page->subframeCount());
 
     m_cachedMainFrame->open();

Modified: trunk/Source/WebCore/html/HTMLFrameElementBase.cpp (129706 => 129707)


--- trunk/Source/WebCore/html/HTMLFrameElementBase.cpp	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/html/HTMLFrameElementBase.cpp	2012-09-26 21:13:38 UTC (rev 129707)
@@ -67,7 +67,7 @@
     }
 
     if (Frame* parentFrame = document()->frame()) {
-        if (parentFrame->page()->frameCount() >= Page::maxNumberOfFrames)
+        if (parentFrame->page()->subframeCount() >= Page::maxNumberOfFrames)
             return false;
     }

Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (129706 => 129707)


--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp	2012-09-26 21:13:38 UTC (rev 129707)
@@ -83,7 +83,7 @@
 {
     ASSERT(document());
     ASSERT(document()->frame());
-    if (document()->frame()->page()->frameCount() >= Page::maxNumberOfFrames)
+    if (document()->frame()->page()->subframeCount() >= Page::maxNumberOfFrames)
         return false;
 
     KURL completeURL = document()->completeURL(url);

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (129706 => 129707)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2012-09-26 21:13:38 UTC (rev 129707)
@@ -2332,7 +2332,7 @@
 
     child->setView(0);
     if (child->ownerElement() && child->page())
-        child->page()->decrementFrameCount();
+        child->page()->decrementSubframeCount();
     child->willDetachPage();
     child->detachFromPage();

Modified: trunk/Source/WebCore/page/Frame.cpp (129706 => 129707)


--- trunk/Source/WebCore/page/Frame.cpp	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/page/Frame.cpp	2012-09-26 21:13:38 UTC (rev 129707)
@@ -184,7 +184,7 @@
         setTiledBackingStoreEnabled(page->settings()->tiledBackingStoreEnabled());
 #endif
     } else {
-        page->incrementFrameCount();
+        page->incrementSubframeCount();
 
         // Make sure we will not end up with two frames referencing the same owner element.
         Frame*& contentFrameSlot = ownerElement->m_contentFrame;
@@ -704,7 +704,7 @@
             doc->clearAXObjectCache();
         m_ownerElement->m_contentFrame = 0;
         if (m_page)
-            m_page->decrementFrameCount();
+            m_page->decrementSubframeCount();
     }
     m_ownerElement = 0;
 }

Modified: trunk/Source/WebCore/page/Page.cpp (129706 => 129707)


--- trunk/Source/WebCore/page/Page.cpp	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/page/Page.cpp	2012-09-26 21:13:38 UTC (rev 129707)
@@ -134,7 +134,7 @@
     , m_theme(RenderTheme::themeForPage(this))
     , m_editorClient(pageClients.editorClient)
     , m_validationMessageClient(pageClients.validationMessageClient)
-    , m_frameCount(0)
+    , m_subframeCount(0)
     , m_openedByDOM(false)
     , m_tabKeyCyclesThroughElements(true)
     , m_defersLoading(false)
@@ -1081,15 +1081,15 @@
 }
 
 #if !ASSERT_DISABLED
-void Page::checkFrameCountConsistency() const
+void Page::checkSubframeCountConsistency() const
 {
-    ASSERT(m_frameCount >= 0);
+    ASSERT(m_subframeCount >= 0);
 
-    int frameCount = 0;
+    int subframeCount = 0;
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
-        ++frameCount;
+        ++subframeCount;
 
-    ASSERT(m_frameCount + 1 == frameCount);
+    ASSERT(m_subframeCount + 1 == subframeCount);
 }
 #endif

Modified: trunk/Source/WebCore/page/Page.h (129706 => 129707)


--- trunk/Source/WebCore/page/Page.h	2012-09-26 21:11:18 UTC (rev 129706)
+++ trunk/Source/WebCore/page/Page.h	2012-09-26 21:13:38 UTC (rev 129707)
@@ -172,9 +172,9 @@
         PageGroup& group() { if (!m_group) initGroup(); return *m_group; }
         PageGroup* groupPtr() { return m_group; } // can return 0
 
-        void incrementFrameCount() { ++m_frameCount; }
-        void decrementFrameCount() { ASSERT(m_frameCount); --m_frameCount; }
-        int frameCount() const { checkFrameCountConsistency(); return m_frameCount; }
+        void incrementSubframeCount() { ++m_subframeCount; }
+        void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
+        int subframeCount() const { checkSubframeCountConsistency(); return m_subframeCount; }
 
         Chrome* chrome() const { return m_chrome.get(); }
         DragCaretController* dragCaretController() const { return m_dragCaretController.get(); }
@@ -354,9 +354,9 @@
         void initGroup();
 
 #if ASSERT_DISABLED
-        void checkFrameCountConsistency() const { }
+        void checkSubframeCountConsistency() const { }
 #else
-        void checkFrameCountConsistency() const;
+        void checkSubframeCountConsistency() const;
 #endif
 
         MediaCanStartListener* takeAnyMediaCanStartListener();
@@ -399,7 +399,7 @@
 
         FeatureObserver m_featureObserver;
 
-        int m_frameCount;
+        int m_subframeCount;
         String m_groupName;
         bool m_openedByDOM;
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to