FrameView now notifies ScrollCoorinator of changes in its scrollable area set

Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 39 matching lines @@
 #include "core/page/FrameTree.h"
 #include "core/page/PageLifecycleNotifier.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/StorageClient.h"
 #include "core/page/ValidationMessageClient.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/TextAutosizer.h"
 #include "core/storage/StorageNamespace.h"
+#include "platform/graphics/GraphicsLayer.h"
 #include "platform/plugins/PluginData.h"
 #include "wtf/HashMap.h"
 #include "wtf/RefCountedLeakCounter.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/Base64.h"
 
 namespace blink {
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, pageCounter, ("Page"));
 
@@ skipping 107 matching lines @@
 String Page::mainThreadScrollingReasonsAsText()
 {
     if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
         return scrollingCoordinator->mainThreadScrollingReasonsAsText();
 
     return String();
 }
 
 PassRefPtrWillBeRawPtr<ClientRectList> Page::nonFastScrollableRects(const LocalFrame* frame)
 {
-    if (m_mainFrame->isLocalFrame() && deprecatedLocalMainFrame()->document())
-        deprecatedLocalMainFrame()->document()->updateLayout();
-
-    Vector<IntRect> rects;
     if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) {
         // Hits in compositing/iframes/iframe-composited-scrolling.html
         DisableCompositingQueryAsserts disabler;
-        rects = scrollingCoordinator->computeShouldHandleScrollGestureOnMainThreadRegion(frame, IntPoint()).rects();
+        scrollingCoordinator->updateAfterCompositingChangeIfNeeded();
     }
 
+    // Now retain non-fast scrollable regions
+    WebVector<WebRect> rects = frame->view()->layerForScrolling()->platformLayer()->nonFastScrollableRegion();
     Vector<FloatQuad> quads(rects.size());
     for (size_t i = 0; i < rects.size(); ++i)
         quads[i] = FloatRect(rects[i]);
     return ClientRectList::create(quads);
 }
 
 void Page::setMainFrame(Frame* mainFrame)
 {
     // Should only be called during initialization or swaps between local and
     // remote frames.
@@ skipping 430 matching lines @@
     , spellCheckerClient(nullptr)
     , storageClient(nullptr)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace blink