Pass accurate contentsScale to LayerImpl.

cc/layer_unittest.cc

 // Copyright 2011 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 "config.h"
 
 #include "cc/layer.h"
 
 #include "cc/keyframed_animation_curve.h"
 #include "cc/layer_impl.h"
@@ skipping 534 matching lines @@
     testLayer->pushPropertiesTo(implLayer.get());
     EXPECT_FLOAT_RECT_EQ(FloatRect(FloatPoint::zero(), FloatSize(15, 15)), implLayer->updateRect());
 
     // If we do clear the LayerImpl side, then the next updateRect should be fresh without accumulation.
     implLayer->resetAllChangeTrackingForSubtree();
     testLayer->setNeedsDisplayRect(FloatRect(FloatPoint(10, 10), FloatSize(5, 5)));
     testLayer->pushPropertiesTo(implLayer.get());
     EXPECT_FLOAT_RECT_EQ(FloatRect(FloatPoint(10, 10), FloatSize(5, 5)), implLayer->updateRect());
 }
 
-class LayerWithContentScaling : public Layer {
-public:
-    explicit LayerWithContentScaling()
-        : Layer()
-    {
-    }
-
-    virtual bool needsContentsScale() const OVERRIDE
-    {
-        return true;
-    }
-
-    virtual void setNeedsDisplayRect(const FloatRect& dirtyRect) OVERRIDE
-    {
-        m_lastNeedsDisplayRect = dirtyRect;
-        Layer::setNeedsDisplayRect(dirtyRect);
-    }
-
-    void resetNeedsDisplay()
-    {
-        m_needsDisplay = false;
-    }
-
-    const FloatRect& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; }
-
-private:
-    virtual ~LayerWithContentScaling()
-    {
-    }
-
-    FloatRect m_lastNeedsDisplayRect;
-};
-
-TEST_F(LayerTest, checkContentsScaleChangeTriggersNeedsDisplay)
-{
-    scoped_refptr<LayerWithContentScaling> testLayer = make_scoped_refptr(new LayerWithContentScaling());
-    testLayer->setIsDrawable(true);
-    testLayer->setLayerTreeHost(m_layerTreeHost.get());
-
-    IntSize testBounds = IntSize(320, 240);
-    EXECUTE_AND_VERIFY_SET_NEEDS_COMMIT_BEHAVIOR(1, testLayer->setBounds(testBounds));
-
-    testLayer->resetNeedsDisplay();
-    EXPECT_FALSE(testLayer->needsDisplay());
-
-    EXECUTE_AND_VERIFY_SET_NEEDS_COMMIT_BEHAVIOR(1, testLayer->setContentsScale(testLayer->contentsScale() + 1.f));
-    EXPECT_TRUE(testLayer->needsDisplay());
-    EXPECT_FLOAT_RECT_EQ(FloatRect(0, 0, 320, 240), testLayer->lastNeedsDisplayRect());
-}
-
 class FakeLayerImplTreeHost : public LayerTreeHost {
 public:
     static scoped_ptr<FakeLayerImplTreeHost> create()
     {
         scoped_ptr<FakeLayerImplTreeHost> host(new FakeLayerImplTreeHost);
         // The initialize call will fail, since our client doesn't provide a valid GraphicsContext3D, but it doesn't matter in the tests that use this fake so ignore the return value.
         host->initialize();
         return host.Pass();
     }
 
@@ skipping 238 matching lines @@
     scoped_refptr<MockLayer> layer(new MockLayer);
     EXPECT_FALSE(layer->needsDisplay());
     layer->setBounds(IntSize(0, 10));
     EXPECT_FALSE(layer->needsDisplay());
     layer->setBounds(IntSize(10, 10));
     EXPECT_TRUE(layer->needsDisplay());
 }
 
 
 } // namespace