Revert of Streamline frame detach

Source/core/page/Page.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 116 matching lines @@
     // depends on this will generally have to be rewritten to propagate any
     // necessary state through all renderer processes for that page and/or
     // coordinate/rely on the browser process to help dispatch/coordinate work.
     LocalFrame* deprecatedLocalMainFrame() const { return toLocalFrame(m_mainFrame); }
 
     void documentDetached(Document*);
 
     bool openedByDOM() const;
     void setOpenedByDOM();
 
+    void incrementSubframeCount() { ++m_subframeCount; }
+    void decrementSubframeCount() { ASSERT(m_subframeCount); --m_subframeCount; }
+    int subframeCount() const { checkSubframeCountConsistency(); return m_subframeCount; }
+
     PageAnimator& animator() { return m_animator; }
     Chrome& chrome() const { return *m_chrome; }
     AutoscrollController& autoscrollController() const { return *m_autoscrollController; }
     DragCaretController& dragCaretController() const { return *m_dragCaretController; }
     DragController& dragController() const { return *m_dragController; }
     FocusController& focusController() const { return *m_focusController; }
     ContextMenuController& contextMenuController() const { return *m_contextMenuController; }
     InspectorController& inspectorController() const { return *m_inspectorController; }
     PointerLockController& pointerLockController() const { return *m_pointerLockController; }
     ValidationMessageClient& validationMessageClient() const { return *m_validationMessageClient; }
@@ skipping 27 matching lines @@
     void setDeviceScaleFactor(float);
     void setDeviceColorProfile(const Vector<char>&);
     void resetDeviceColorProfile();
 
     static void allVisitedStateChanged();
     static void visitedStateChanged(LinkHash visitedHash);
 
     StorageNamespace* sessionStorage(bool optionalCreate = true);
     StorageClient& storageClient() const { return *m_storageClient; }
 
+    // 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;
+
     PageVisibilityState visibilityState() const;
     void setVisibilityState(PageVisibilityState, bool);
 
     bool isCursorVisible() const;
     void setIsCursorVisible(bool isVisible) { m_isCursorVisible = isVisible; }
 
 #if ENABLE(ASSERT)
     void setIsPainting(bool painting) { m_isPainting = painting; }
     bool isPainting() const { return m_isPainting; }
 #endif
@@ skipping 17 matching lines @@
 
     void trace(Visitor*);
     void willBeDestroyed();
 
 protected:
     PageLifecycleNotifier& lifecycleNotifier();
 
 private:
     void initGroup();
 
+#if ENABLE(ASSERT)
+    void checkSubframeCountConsistency() const;
+#else
+    void checkSubframeCountConsistency() const { }
+#endif
+
     void setTimerAlignmentInterval(double);
 
     void setNeedsLayoutInAllFrames();
 
     // SettingsDelegate overrides.
     virtual void settingsChanged(SettingsDelegate::ChangeType) OVERRIDE;
 
     PageAnimator m_animator;
     const OwnPtr<AutoscrollController> m_autoscrollController;
     const OwnPtr<Chrome> m_chrome;
@@ skipping 23 matching lines @@
     mutable RefPtr<PluginData> m_pluginData;
 
     BackForwardClient* m_backForwardClient;
     EditorClient* const m_editorClient;
     SpellCheckerClient* const m_spellCheckerClient;
     StorageClient* m_storageClient;
     OwnPtrWillBeMember<ValidationMessageClient> m_validationMessageClient;
 
     UseCounter m_useCounter;
 
+    int m_subframeCount;
     bool m_openedByDOM;
 
     bool m_tabKeyCyclesThroughElements;
     bool m_defersLoading;
 
     float m_deviceScaleFactor;
 
     OwnPtr<StorageNamespace> m_sessionStorage;
 
     double m_timerAlignmentInterval;
 
     PageVisibilityState m_visibilityState;
 
     bool m_isCursorVisible;
 
 #if ENABLE(ASSERT)
     bool m_isPainting;
 #endif
 
     WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> > m_multisamplingChangedObservers;
 
     // 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.
     OwnPtrWillBeMember<FrameHost> m_frameHost;
 };
 
 } // namespace blink
 
 #endif // Page_h