| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/tiled_layer.h" | 7 #include "cc/tiled_layer.h" |
| 8 | 8 |
| 9 #include "cc/bitmap_content_layer_updater.h" | 9 #include "cc/bitmap_content_layer_updater.h" |
| 10 #include "cc/layer_painter.h" | 10 #include "cc/layer_painter.h" |
| 11 #include "cc/overdraw_metrics.h" | 11 #include "cc/overdraw_metrics.h" |
| 12 #include "cc/rendering_stats.h" | 12 #include "cc/rendering_stats.h" |
| 13 #include "cc/resource_update_controller.h" | 13 #include "cc/resource_update_controller.h" |
| 14 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread | 14 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread |
| 15 #include "cc/test/animation_test_common.h" | 15 #include "cc/test/animation_test_common.h" |
| 16 #include "cc/test/fake_graphics_context.h" | 16 #include "cc/test/fake_graphics_context.h" |
| 17 #include "cc/test/fake_layer_tree_host_client.h" | 17 #include "cc/test/fake_layer_tree_host_client.h" |
| 18 #include "cc/test/fake_proxy.h" | 18 #include "cc/test/fake_proxy.h" |
| 19 #include "cc/test/geometry_test_utils.h" | 19 #include "cc/test/geometry_test_utils.h" |
| 20 #include "cc/test/tiled_layer_test_common.h" | 20 #include "cc/test/tiled_layer_test_common.h" |
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 22 #include "ui/gfx/rect_conversions.h" | 22 #include "ui/gfx/rect_conversions.h" |
| 23 #include <public/WebTransformationMatrix.h> | 23 #include <public/WebTransformationMatrix.h> |
| 24 | 24 |
| 25 using namespace cc; | |
| 26 using namespace WebKitTests; | 25 using namespace WebKitTests; |
| 27 using WebKit::WebTransformationMatrix; | 26 using WebKit::WebTransformationMatrix; |
| 28 | 27 |
| 28 namespace cc { |
| 29 namespace { | 29 namespace { |
| 30 | 30 |
| 31 class TestOcclusionTracker : public OcclusionTracker { | 31 class TestOcclusionTracker : public OcclusionTracker { |
| 32 public: | 32 public: |
| 33 TestOcclusionTracker() | 33 TestOcclusionTracker() |
| 34 : OcclusionTracker(gfx::Rect(0, 0, 1000, 1000), true) | 34 : OcclusionTracker(gfx::Rect(0, 0, 1000, 1000), true) |
| 35 , m_layerClipRectInTarget(gfx::Rect(0, 0, 1000, 1000)) | 35 , m_layerClipRectInTarget(gfx::Rect(0, 0, 1000, 1000)) |
| 36 { | 36 { |
| 37 // Pretend we have visited a render surface. | 37 // Pretend we have visited a render surface. |
| 38 m_stack.push_back(StackObject()); | 38 m_stack.push_back(StackObject()); |
| (...skipping 1579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1618 EXPECT_RECT_EQ(gfx::Rect(), layer->trackingLayerPainter()->paintedRect()); | 1618 EXPECT_RECT_EQ(gfx::Rect(), layer->trackingLayerPainter()->paintedRect()); |
| 1619 updateTextures(); | 1619 updateTextures(); |
| 1620 | 1620 |
| 1621 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. | 1621 // Invalidate the entire layer in layer space. When painting, the rect given
to webkit should match the layer's bounds. |
| 1622 layer->setNeedsDisplayRect(layerRect); | 1622 layer->setNeedsDisplayRect(layerRect); |
| 1623 layer->update(*m_queue.get(), 0, m_stats); | 1623 layer->update(*m_queue.get(), 0, m_stats); |
| 1624 | 1624 |
| 1625 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); | 1625 EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect()); |
| 1626 } | 1626 } |
| 1627 | 1627 |
| 1628 } // anonymous namespace | 1628 } // namespace |
| 1629 } // namespace cc |
| OLD | NEW |