cc: Refactor content scale/bounds into draw properties

cc/scrollbar_layer_unittest.cc

 // Copyright 2012 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 "cc/scrollbar_layer.h"
 
 #include "cc/scrollbar_animation_controller.h"
 #include "cc/scrollbar_layer_impl.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/fake_impl_proxy.h"
@@ skipping 120 matching lines @@
 class ScrollbarLayerTestMaxTextureSize : public ThreadedTest {
 public:
     ScrollbarLayerTestMaxTextureSize() {}
 
     void setScrollbarBounds(gfx::Size bounds) {
         m_bounds = bounds;
     }
 
     virtual void beginTest() OVERRIDE
     {
+        m_layerTreeHost->initializeRendererIfNeeded();
+
         scoped_ptr<WebKit::WebScrollbar> scrollbar(FakeWebScrollbar::create());
         m_scrollbarLayer = ScrollbarLayer::create(scrollbar.Pass(), m_painter, WebKit::FakeWebScrollbarThemeGeometry::create(), 1);
+        m_scrollbarLayer->setLayerTreeHost(m_layerTreeHost.get());
         m_scrollbarLayer->setBounds(m_bounds);
         m_layerTreeHost->rootLayer()->addChild(m_scrollbarLayer);
 
         m_scrollLayer = Layer::create();
         m_scrollbarLayer->setScrollLayerId(m_scrollLayer->id());
         m_layerTreeHost->rootLayer()->addChild(m_scrollLayer);
 
         postSetNeedsCommitToMainThread();
     }
 
     virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
-        m_layerTreeHost->initializeRendererIfNeeded();
-
         const int kMaxTextureSize = m_layerTreeHost->rendererCapabilities().maxTextureSize;
 
         // Check first that we're actually testing something.
         EXPECT_GT(m_scrollbarLayer->bounds().width(), kMaxTextureSize);
 
         EXPECT_EQ(m_scrollbarLayer->contentBounds().width(), kMaxTextureSize - 1);
         EXPECT_EQ(m_scrollbarLayer->contentBounds().height(), kMaxTextureSize - 1);
 
         endTest();
     }
@@ skipping 12 matching lines @@
 TEST_F(ScrollbarLayerTestMaxTextureSize, runTest) {
     WebKit::FakeWebGraphicsContext3D context;
     int max_size = 0;
     context.getIntegerv(GL_MAX_TEXTURE_SIZE, &max_size);
     setScrollbarBounds(gfx::Size(max_size + 100, max_size + 100));
     runTest(true);
 }
 
 }  // namespace
 }  // namespace cc