1 files changed, 8 insertions, 85 deletions

diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
index 3df7586e8..1793df15e 100644
--- a/Source/WebCore/page/Page.cpp
+++ b/Source/WebCore/page/Page.cpp
@@ -72,7 +72,6 @@
 #include "StyleResolver.h"
 #include "TextResourceDecoder.h"
 #include "VoidCallback.h"
-#include "WebCoreMemoryInstrumentation.h"
 #include "Widget.h"
 #include <wtf/HashMap.h>
 #include <wtf/RefCountedLeakCounter.h>
@@ -83,7 +82,6 @@
 namespace WebCore {
 
 static HashSet<Page*>* allPages;
-static const double hiddenPageTimerAlignmentInterval = 1.0; // once a second
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, pageCounter, ("Page"));
 
@@ -136,7 +134,7 @@ Page::Page(PageClients& pageClients)
     , m_theme(RenderTheme::themeForPage(this))
     , m_editorClient(pageClients.editorClient)
     , m_validationMessageClient(pageClients.validationMessageClient)
-    , m_subframeCount(0)
+    , m_frameCount(0)
     , m_openedByDOM(false)
     , m_tabKeyCyclesThroughElements(true)
     , m_defersLoading(false)
@@ -158,7 +156,6 @@ Page::Page(PageClients& pageClients)
     , m_canStartMedia(true)
     , m_viewMode(ViewModeWindowed)
     , m_minimumTimerInterval(Settings::defaultMinDOMTimerInterval())
-    , m_timerAlignmentInterval(Settings::defaultDOMTimerAlignmentInterval())
     , m_isEditable(false)
     , m_isOnscreen(true)
 #if ENABLE(PAGE_VISIBILITY_API)
@@ -654,7 +651,7 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin)
     FrameView* view = document->view();
 
     if (scale == m_pageScaleFactor) {
-        if (view && (view->scrollPosition() != origin || view->delegatesScrolling())) {
+        if (view && view->scrollPosition() != origin) {
             document->updateLayoutIgnorePendingStylesheets();
             view->setScrollPosition(origin);
         }
@@ -1028,23 +1025,6 @@ double Page::minimumTimerInterval() const
     return m_minimumTimerInterval;
 }
 
-void Page::setTimerAlignmentInterval(double interval)
-{
-    if (interval == m_timerAlignmentInterval)
-        return;
-
-    m_timerAlignmentInterval = interval;
-    for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNextWithWrap(false)) {
-        if (frame->document())
-            frame->document()->didChangeTimerAlignmentInterval();
-    }
-}
-
-double Page::timerAlignmentInterval() const
-{
-    return m_timerAlignmentInterval;
-}
-
 void Page::dnsPrefetchingStateChanged()
 {
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
@@ -1101,22 +1081,21 @@ void Page::privateBrowsingStateChanged()
 }
 
 #if !ASSERT_DISABLED
-void Page::checkSubframeCountConsistency() const
+void Page::checkFrameCountConsistency() const
 {
-    ASSERT(m_subframeCount >= 0);
+    ASSERT(m_frameCount >= 0);
 
-    int subframeCount = 0;
+    int frameCount = 0;
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext())
-        ++subframeCount;
+        ++frameCount;
 
-    ASSERT(m_subframeCount + 1 == subframeCount);
+    ASSERT(m_frameCount + 1 == frameCount);
 }
 #endif
 
-#if ENABLE(PAGE_VISIBILITY_API) || ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
+#if ENABLE(PAGE_VISIBILITY_API)
 void Page::setVisibilityState(PageVisibilityState visibilityState, bool isInitialState)
 {
-#if ENABLE(PAGE_VISIBILITY_API)
     if (m_visibilityState == visibilityState)
         return;
     m_visibilityState = visibilityState;
@@ -1129,21 +1108,8 @@ void Page::setVisibilityState(PageVisibilityState visibilityState, bool isInitia
         }
         m_mainFrame->dispatchVisibilityStateChangeEvent();
     }
-#endif
-
-#if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
-    if (visibilityState == WebCore::PageVisibilityStateHidden)
-        setTimerAlignmentInterval(hiddenPageTimerAlignmentInterval);
-    else
-        setTimerAlignmentInterval(Settings::defaultDOMTimerAlignmentInterval());
-#if !ENABLE(PAGE_VISIBILITY_API)
-    UNUSED_PARAM(isInitialState);
-#endif
-#endif
 }
-#endif // ENABLE(PAGE_VISIBILITY_API) || ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
 
-#if ENABLE(PAGE_VISIBILITY_API)
 PageVisibilityState Page::visibilityState() const
 {
     return m_visibilityState;
@@ -1267,49 +1233,6 @@ void Page::resetSeenPlugins()
     m_seenPlugins.clear();
 }
 
-void Page::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
-{
-    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Page);
-    info.addMember(m_chrome);
-    info.addMember(m_dragCaretController);
-
-#if ENABLE(DRAG_SUPPORT)
-    info.addMember(m_dragController);
-#endif
-    info.addMember(m_focusController);
-#if ENABLE(CONTEXT_MENUS)
-    info.addMember(m_contextMenuController);
-#endif
-#if ENABLE(INSPECTOR)
-    info.addMember(m_inspectorController);
-#endif
-#if ENABLE(POINTER_LOCK)
-    info.addMember(m_pointerLockController);
-#endif
-    info.addMember(m_scrollingCoordinator);
-    info.addMember(m_settings);
-    info.addMember(m_progress);
-    info.addMember(m_backForwardController);
-    info.addMember(m_mainFrame);
-    info.addMember(m_pluginData);
-    info.addMember(m_theme);
-    info.addMember(m_editorClient);
-    info.addMember(m_featureObserver);
-    info.addMember(m_groupName);
-    info.addMember(m_pagination);
-    info.addMember(m_userStyleSheetPath);
-    info.addMember(m_userStyleSheet);
-    info.addMember(m_singlePageGroup);
-    info.addMember(m_group);
-    info.addWeakPointer(m_debugger);
-    info.addMember(m_sessionStorage);
-    info.addMember(m_relevantUnpaintedRenderObjects);
-    info.addMember(m_relevantPaintedRegion);
-    info.addMember(m_relevantUnpaintedRegion);
-    info.addMember(m_alternativeTextClient);
-    info.addMember(m_seenPlugins);
-}
-
 Page::PageClients::PageClients()
     : alternativeTextClient(0)
     , chromeClient(0)