| Index: cc/layer_tree_host_unittest.cc
|
| diff --git a/cc/layer_tree_host_unittest.cc b/cc/layer_tree_host_unittest.cc
|
| index 0556f14d0e67b8ab74ffe8af09ed92f79f3495a6..86be12240e0427791dada0797da779d21a307ac6 100644
|
| --- a/cc/layer_tree_host_unittest.cc
|
| +++ b/cc/layer_tree_host_unittest.cc
|
| @@ -1130,7 +1130,7 @@ public:
|
| m_testLayer = testLayer;
|
| }
|
|
|
| - virtual void paintContents(SkCanvas*, const IntRect&, FloatRect&) OVERRIDE
|
| + virtual void paintContents(SkCanvas*, const gfx::Rect&, gfx::RectF&) OVERRIDE
|
| {
|
| // Set layer opacity to 0.
|
| if (m_testLayer)
|
| @@ -1216,7 +1216,7 @@ class MockContentLayerClient : public ContentLayerClient {
|
| public:
|
| bool drawsContent() const { return true; }
|
| MOCK_CONST_METHOD0(preserves3D, bool());
|
| - void paintContents(SkCanvas*, const IntRect&, FloatRect&) OVERRIDE { }
|
| + void paintContents(SkCanvas*, const gfx::Rect&, gfx::RectF&) OVERRIDE { }
|
| void notifySyncRequired() { }
|
| };
|
|
|
| @@ -1273,6 +1273,7 @@ TEST_F(LayerTreeHostTestDoNotSkipLayersWithAnimatedOpacity, runMultiThread)
|
| runTest(true);
|
| }
|
|
|
| +
|
| class LayerTreeHostTestDeviceScaleFactorScalesViewportAndLayers : public LayerTreeHostTest {
|
| public:
|
|
|
| @@ -2679,10 +2680,10 @@ void EvictionTestLayer::update(ResourceUpdateQueue& queue, const OcclusionTracke
|
| createTextureIfNeeded();
|
| if (!m_texture.get())
|
| return;
|
| - IntRect fullRect(0, 0, 10, 10);
|
|
|
| + gfx::Rect fullRect(0, 0, 10, 10);
|
| ResourceUpdate upload = ResourceUpdate::Create(
|
| - m_texture.get(), &m_bitmap, fullRect, fullRect, IntSize());
|
| + m_texture.get(), &m_bitmap, fullRect, fullRect, gfx::Vector2d());
|
| queue.appendFullUpload(upload);
|
| }
|
|
|
|
|