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/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();
