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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@129707 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 99891ab..629b2e2 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,37 @@
+2012-09-26 Simon Fraser <simon.fraser@apple.com>
+
+ 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 <msaboff@apple.com>
Unreviewed speculative build fix for clang.
diff --git a/Source/WebCore/history/CachedFrame.cpp b/Source/WebCore/history/CachedFrame.cpp
index 926dbc8..1212fd9 100644
--- a/Source/WebCore/history/CachedFrame.cpp
+++ b/Source/WebCore/history/CachedFrame.cpp
@@ -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()
diff --git a/Source/WebCore/history/CachedPage.cpp b/Source/WebCore/history/CachedPage.cpp
index 11636f6..a816902 100644
--- a/Source/WebCore/history/CachedPage.cpp
+++ b/Source/WebCore/history/CachedPage.cpp
@@ -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();
diff --git a/Source/WebCore/html/HTMLFrameElementBase.cpp b/Source/WebCore/html/HTMLFrameElementBase.cpp
index eaa3549..d7882f3 100644
--- a/Source/WebCore/html/HTMLFrameElementBase.cpp
+++ b/Source/WebCore/html/HTMLFrameElementBase.cpp
@@ -67,7 +67,7 @@
}
if (Frame* parentFrame = document()->frame()) {
- if (parentFrame->page()->frameCount() >= Page::maxNumberOfFrames)
+ if (parentFrame->page()->subframeCount() >= Page::maxNumberOfFrames)
return false;
}
diff --git a/Source/WebCore/html/HTMLPlugInImageElement.cpp b/Source/WebCore/html/HTMLPlugInImageElement.cpp
index 4954e36..491166e 100644
--- a/Source/WebCore/html/HTMLPlugInImageElement.cpp
+++ b/Source/WebCore/html/HTMLPlugInImageElement.cpp
@@ -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);
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index 67fa503..db39b21 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -2332,7 +2332,7 @@
child->setView(0);
if (child->ownerElement() && child->page())
- child->page()->decrementFrameCount();
+ child->page()->decrementSubframeCount();
child->willDetachPage();
child->detachFromPage();
diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp
index a7aaf95..3fab620 100644
--- a/Source/WebCore/page/Frame.cpp
+++ b/Source/WebCore/page/Frame.cpp
@@ -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;
}
diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
index 1793df1..b8799fb 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
@@ -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
diff --git a/Source/WebCore/page/Page.h b/Source/WebCore/page/Page.h
index cd6c665..7466162 100644
--- a/Source/WebCore/page/Page.h
+++ b/Source/WebCore/page/Page.h
@@ -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;
