[RootLayerScrolls] Annotate non-fast-scroll regions to correct layer

third_party/WebKit/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.
@@ skipping 155 matching lines @@
 }
 
 ScrollingCoordinator* Page::scrollingCoordinator() {
   if (!m_scrollingCoordinator && m_settings->getAcceleratedCompositingEnabled())
     m_scrollingCoordinator = ScrollingCoordinator::create(this);
 
   return m_scrollingCoordinator.get();
 }
 
 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
+  DisableCompositingQueryAsserts disabler;
   if (ScrollingCoordinator* scrollingCoordinator =
           this->scrollingCoordinator()) {
     // Hits in compositing/iframes/iframe-composited-scrolling.html
-    DisableCompositingQueryAsserts disabler;
     scrollingCoordinator->updateAfterCompositingChangeIfNeeded();
   }
 
-  if (!frame->view()->layerForScrolling())
+  GraphicsLayer* layer =
+      frame->view()->layoutViewportScrollableArea()->layerForScrolling();
+  if (!layer)
     return ClientRectList::create();
-
-  // Now retain non-fast scrollable regions
-  return ClientRectList::create(frame->view()
-                                    ->layerForScrolling()
-                                    ->platformLayer()
-                                    ->nonFastScrollableRegion());
+  return ClientRectList::create(
+      layer->platformLayer()->nonFastScrollableRegion());
 }
 
 void Page::setMainFrame(Frame* mainFrame) {
   // Should only be called during initialization or swaps between local and
   // remote frames.
   // FIXME: Unfortunately we can't assert on this at the moment, because this
   // is called in the base constructor for both LocalFrame and RemoteFrame,
   // when the vtables for the derived classes have not yet been setup.
   m_mainFrame = mainFrame;
 }
@@ skipping 342 matching lines @@
     : chromeClient(nullptr),
       contextMenuClient(nullptr),
       editorClient(nullptr),
       spellCheckerClient(nullptr) {}
 
 Page::PageClients::~PageClients() {}
 
 template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 }  // namespace blink