Revert of Move FrameHost::m_subframeCount to Page

third_party/WebKit/Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All
  * Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 102 matching lines @@
       m_useCounter(pageClients.chromeClient &&
                            pageClients.chromeClient->isSVGImageChromeClient()
                        ? UseCounter::SVGImageContext
                        : UseCounter::DefaultContext),
       m_openedByDOM(false),
       m_tabKeyCyclesThroughElements(true),
       m_suspended(false),
       m_deviceScaleFactor(1),
       m_visibilityState(PageVisibilityStateVisible),
       m_isCursorVisible(true),
-      m_subframeCount(0),
       m_frameHost(FrameHost::create(*this)) {
   ASSERT(m_editorClient);
 
   ASSERT(!allPages().contains(this));
   allPages().insert(this);
 }
 
 Page::~Page() {
   // willBeDestroyed() must be called before Page destruction.
   ASSERT(!m_mainFrame);
@@ skipping 248 matching lines @@
 }
 
 bool Page::isPageVisible() const {
   return visibilityState() == PageVisibilityStateVisible;
 }
 
 bool Page::isCursorVisible() const {
   return m_isCursorVisible;
 }
 
-#if DCHECK_IS_ON()
-void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) {
-  DCHECK_GE(expectedFrameCount, 0);
-
-  int actualFrameCount = 0;
-  for (; frame; frame = frame->tree().traverseNext())
-    ++actualFrameCount;
-
-  DCHECK_EQ(expectedFrameCount, actualFrameCount);
-}
-#endif
-
-int Page::subframeCount() const {
-#if DCHECK_IS_ON()
-  checkFrameCountConsistency(m_subframeCount + 1, mainFrame());
-#endif
-  return m_subframeCount;
-}
-
 void Page::settingsChanged(SettingsDelegate::ChangeType changeType) {
   switch (changeType) {
     case SettingsDelegate::StyleChange:
       setNeedsRecalcStyleInAllFrames();
       break;
     case SettingsDelegate::ViewportDescriptionChange:
       if (mainFrame() && mainFrame()->isLocalFrame()) {
         deprecatedLocalMainFrame()->document()->updateViewportDescription();
         // The text autosizer has dependencies on the viewport.
         if (TextAutosizer* textAutosizer =
@@ skipping 204 matching lines @@
     : chromeClient(nullptr),
       contextMenuClient(nullptr),
       editorClient(nullptr),
       spellCheckerClient(nullptr) {}
 
 Page::PageClients::~PageClients() {}
 
 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 }  // namespace blink