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 24 matching lines @@
 #include "core/page/scrolling/OverscrollController.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 
 namespace blink {
 
 FrameHost* FrameHost::create(Page& page) {
   return new FrameHost(page);
 }
 
-FrameHost::FrameHost(Page& page)
-    : m_page(&page),
-      m_subframeCount(0) {}
+FrameHost::FrameHost(Page& page) : m_page(&page) {}
 
 // 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 20 matching lines @@
 }
 
 const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const {
   return page().consoleMessageStorage();
 }
 
 DEFINE_TRACE(FrameHost) {
   visitor->trace(m_page);
 }
 
-#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