Pinch/Zoom Infrastructure & Plumbing CL (Prequel)

Source/web/tests/GraphicsLayerTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 47 matching lines @@
     explicit GraphicsLayerForTesting(GraphicsLayerClient* client)
         : GraphicsLayer(client) { };
 
     virtual blink::WebLayer* contentsLayer() const { return GraphicsLayer::contentsLayer(); }
 };
 
 class GraphicsLayerTest : public testing::Test {
 public:
     GraphicsLayerTest()
     {
+        m_clipLayer = adoptPtr(new GraphicsLayerForTesting(&m_client));
         m_graphicsLayer = adoptPtr(new GraphicsLayerForTesting(&m_client));
+        m_clipLayer->addChild(m_graphicsLayer.get());
+        m_graphicsLayer->platformLayer()->setScrollClipLayer(
+            m_clipLayer->platformLayer());
         m_platformLayer = m_graphicsLayer->platformLayer();
         m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting(WebUnitTestSupport::TestViewTypeUnitTest));
         ASSERT(m_layerTreeView);
-        m_layerTreeView->setRootLayer(*m_platformLayer);
+        m_layerTreeView->setRootLayer(*m_clipLayer->platformLayer());
+        m_layerTreeView->registerViewportLayers(
+            m_clipLayer->platformLayer(), m_graphicsLayer->platformLayer(), 0);
         m_layerTreeView->setViewportSize(WebSize(1, 1), WebSize(1, 1));
     }
 
     virtual ~GraphicsLayerTest()
     {
         m_graphicsLayer.clear();
         m_layerTreeView.clear();
     }
 
 protected:
     WebLayer* m_platformLayer;
     OwnPtr<GraphicsLayerForTesting> m_graphicsLayer;
+    OwnPtr<GraphicsLayerForTesting> m_clipLayer;
 
 private:
     OwnPtr<WebLayerTreeView> m_layerTreeView;
     MockGraphicsLayerClient m_client;
 };
 
 TEST_F(GraphicsLayerTest, updateLayerPreserves3DWithAnimations)
 {
     ASSERT_FALSE(m_platformLayer->hasActiveAnimation());
 
@@ skipping 70 matching lines @@
     EXPECT_FALSE(m_graphicsLayer->contentsLayer());
 
     m_graphicsLayer->setContentsToSolidColor(Color::white);
     EXPECT_TRUE(m_graphicsLayer->contentsLayer());
 
     m_graphicsLayer->setContentsToSolidColor(Color());
     EXPECT_FALSE(m_graphicsLayer->contentsLayer());
 }
 
 } // namespace