Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(888)

Unified Diff: third_party/WebKit/Source/core/page/Page.h

Issue 2746873002: Revert of Move FrameHost::m_subframeCount to Page (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/page/Page.h
diff --git a/third_party/WebKit/Source/core/page/Page.h b/third_party/WebKit/Source/core/page/Page.h
index 24616cb5c723210962dcc08062faa1e176e25124..738c031e95a88ebf574aa2d56e51e3c517efac3f 100644
--- a/third_party/WebKit/Source/core/page/Page.h
+++ b/third_party/WebKit/Source/core/page/Page.h
@@ -235,18 +235,6 @@
bool isCursorVisible() const;
void setIsCursorVisible(bool isVisible) { m_isCursorVisible = isVisible; }
- // Don't allow more than a certain number of frames in a page.
- // This seems like a reasonable upper bound, and otherwise mutually
- // recursive frameset pages can quickly bring the program to its knees
- // with exponential growth in the number of frames.
- static const int maxNumberOfFrames = 1000;
- void incrementSubframeCount() { ++m_subframeCount; }
- void decrementSubframeCount() {
- DCHECK_GT(m_subframeCount, 0);
- --m_subframeCount;
- }
- int subframeCount() const;
-
void setDefaultPageScaleLimits(float minScale, float maxScale);
void setUserAgentPageScaleConstraints(
const PageScaleConstraints& newConstraints);
@@ -338,8 +326,6 @@
bool m_isPainting = false;
#endif
- int m_subframeCount;
-
// A pointer to all the interfaces provided to in-process Frames for this
// Page.
// FIXME: Most of the members of Page should move onto FrameHost.
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp ('k') | third_party/WebKit/Source/core/page/Page.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698