[compositor-worker] root scrolling layer is associated with document scrolling element

third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <gtest/gtest.h>
 #include <memory>
+#include "core/dom/DOMNodeIds.h"
 #include "core/frame/FrameView.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
+#include "platform/graphics/CompositorElementId.h"
 #include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/CompositorMutation.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
@@ skipping 136 matching lines @@
   EXPECT_TRUE(!tallLayer);
 
   Element* proxiedElement = document->getElementById("proxied-transform");
   WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
   EXPECT_TRUE(proxiedLayer->compositorMutableProperties() &
               CompositorMutableProperty::kTransform);
   EXPECT_FALSE(proxiedLayer->compositorMutableProperties() &
                (CompositorMutableProperty::kScrollLeft |
                 CompositorMutableProperty::kScrollTop |
                 CompositorMutableProperty::kOpacity));
-  EXPECT_TRUE(proxiedLayer->elementId());
+  EXPECT_EQ(proxiedLayer->elementId(),
+            createCompositorElementId(DOMNodeIds::idForNode(proxiedElement),
+                                      CompositorSubElementId::Primary));
 
   Element* scrollElement = document->getElementById("proxied-scroller");
   WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);
   EXPECT_TRUE(scrollLayer->compositorMutableProperties() &
               (CompositorMutableProperty::kScrollLeft |
                CompositorMutableProperty::kScrollTop));
   EXPECT_FALSE(scrollLayer->compositorMutableProperties() &
                (CompositorMutableProperty::kTransform |
                 CompositorMutableProperty::kOpacity));
-  EXPECT_TRUE(scrollLayer->elementId());
+  EXPECT_EQ(scrollLayer->elementId(),
+            createCompositorElementId(DOMNodeIds::idForNode(scrollElement),
+                                      CompositorSubElementId::Scroll));
 
+  // Root scroll layer gets document node id.
   WebLayer* rootScrollLayer = getRootScrollLayer();
   EXPECT_TRUE(rootScrollLayer->compositorMutableProperties() &
               (CompositorMutableProperty::kScrollLeft |
                CompositorMutableProperty::kScrollTop));
   EXPECT_FALSE(rootScrollLayer->compositorMutableProperties() &
                (CompositorMutableProperty::kTransform |
                 CompositorMutableProperty::kOpacity));
 
-  EXPECT_TRUE(rootScrollLayer->elementId());
+  EXPECT_EQ(rootScrollLayer->elementId(),
+            createCompositorElementId(DOMNodeIds::idForNode(document),
+                                      CompositorSubElementId::Scroll));
 }
 
 TEST_P(CompositorWorkerTest, noProxies) {
   // This case is identical to compositor-proxy-basic, but no proxies have
   // actually been created.
   registerMockedHttpURLLoad("compositor-proxy-plumbing-no-proxies.html");
   navigateTo(m_baseURL + "compositor-proxy-plumbing-no-proxies.html");
 
   forceFullCompositingUpdate();
 
@@ skipping 168 matching lines @@
 
     const String& opacityValue =
         document->domWindow()
             ->getComputedStyle(proxiedElement, String())
             ->getPropertyValueInternal(CSSPropertyOpacity);
     EXPECT_EQ("0.8", opacityValue);
   }
 }
 
 }  // namespace blink