From cbf967918e6fda42e92613544742d27d69b88c05 Mon Sep 17 00:00:00 2001
From: Suneel Kota <suneel.kota@samsung.com>
Date: Wed, 4 Oct 2017 10:26:36 +0000
Subject: [PATCH] [RLS] Use correct ScrollableArea in InspectorLayerTreeAgent

Scrolling Layer will be present in PLSA when RLS is enabled

TEST=http/tests/devtools/layers no longer crashes

Bug: 766497
Change-Id: Ie893969b482266f4da01e6171c1daf2a9b3386a2
Reviewed-on: https://chromium-review.googlesource.com/697191
Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
Reviewed-by: Steve Kobes <skobes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506356}
---
 AUTHORS                                                          | 1 +
 .../WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 08f8c059c26a31..68b689dd0079b6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -724,6 +724,7 @@ Sudarsana Babu Nagineni <sudarsana.nagineni@intel.com>
 Sudarshan Parthasarathy <sudarshan.p@samsung.com>
 Sujae Jo <sujae33.jo@gmail.com>
 Sujith S S <sujiths.s@samsung.com>
+Suneel Kota <suneel.kota@samsung.com>
 Sungguk Lim <limasdf@gmail.com>
 Sunghoon Kim <shoon.kim@lge.com>
 Sungmann Cho <sungmann.cho@gmail.com>
diff --git a/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp
index 9cfe17a2b0938a..43665cb4abb9a7 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorLayerTreeAgent.cpp
@@ -301,6 +301,7 @@ InspectorLayerTreeAgent::BuildLayerTree() {
   BuildLayerIdToNodeIdMap(compositor->RootLayer(), layer_id_to_node_id_map);
   int scrolling_layer_id = inspected_frames_->Root()
                                ->View()
+                               ->LayoutViewportScrollableArea()
                                ->LayerForScrolling()
                                ->PlatformLayer()
                                ->Id();