Move FrameHost::m_subframeCount to Page

third_party/WebKit/Source/core/frame/FrameHost.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 37 matching lines @@
 
 FrameHost::FrameHost(Page& page)
     : m_page(&page),
       m_visualViewport(VisualViewport::create(*this)),
       m_overscrollController(
           OverscrollController::create(*m_visualViewport,
                                        m_page->chromeClient())),
       m_eventHandlerRegistry(new EventHandlerRegistry(page)),
       m_consoleMessageStorage(new ConsoleMessageStorage()),
       m_globalRootScrollerController(
-          TopDocumentRootScrollerController::create(*this)),
-      m_subframeCount(0) {}
+          TopDocumentRootScrollerController::create(*this)) {}
 
 // Explicitly in the .cpp to avoid default constructor in .h
 FrameHost::~FrameHost() {}
 
 Page& FrameHost::page() {
   return *m_page;
 }
 
 const Page& FrameHost::page() const {
   return *m_page;
@@ skipping 46 matching lines @@
 
 DEFINE_TRACE(FrameHost) {
   visitor->trace(m_page);
   visitor->trace(m_visualViewport);
   visitor->trace(m_overscrollController);
   visitor->trace(m_eventHandlerRegistry);
   visitor->trace(m_consoleMessageStorage);
   visitor->trace(m_globalRootScrollerController);
 }
 
-#if DCHECK_IS_ON()
-void checkFrameCountConsistency(int expectedFrameCount, Frame* frame) {
-  ASSERT(expectedFrameCount >= 0);
+void FrameHost::incrementSubframeCount() {
+  page().incrementSubframeCount();
+}
 
-  int actualFrameCount = 0;
-  for (; frame; frame = frame->tree().traverseNext())
-    ++actualFrameCount;
-
-  ASSERT(expectedFrameCount == actualFrameCount);
+void FrameHost::decrementSubframeCount() {
+  page().decrementSubframeCount();
 }
-#endif
 
 int FrameHost::subframeCount() const {
-#if DCHECK_IS_ON()
-  checkFrameCountConsistency(m_subframeCount + 1, m_page->mainFrame());
-#endif
-  return m_subframeCount;
+  return page().subframeCount();
 }
 
 }  // namespace blink