| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "cc/output/gl_renderer.h" | 5 #include "cc/output/gl_renderer.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "cc/base/math_util.h" | 9 #include "cc/base/math_util.h" |
| 10 #include "cc/debug/test_web_graphics_context_3d.h" | 10 #include "cc/debug/test_web_graphics_context_3d.h" |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 root_render_pass->SetNew( | 151 root_render_pass->SetNew( |
| 152 render_pass_id, gfx::Rect(), gfx::Rect(), gfx::Transform()); | 152 render_pass_id, gfx::Rect(), gfx::Rect(), gfx::Transform()); |
| 153 render_passes_in_draw_order_.push_back(root_render_pass.Pass()); | 153 render_passes_in_draw_order_.push_back(root_render_pass.Pass()); |
| 154 } | 154 } |
| 155 | 155 |
| 156 // RendererClient methods. | 156 // RendererClient methods. |
| 157 virtual gfx::Rect DeviceViewport() const OVERRIDE { | 157 virtual gfx::Rect DeviceViewport() const OVERRIDE { |
| 158 static gfx::Size fake_size(1, 1); | 158 static gfx::Size fake_size(1, 1); |
| 159 return gfx::Rect(fake_size); | 159 return gfx::Rect(fake_size); |
| 160 } | 160 } |
| 161 virtual gfx::Rect DeviceClip() const OVERRIDE { |
| 162 return DeviceViewport(); |
| 163 } |
| 161 virtual float DeviceScaleFactor() const OVERRIDE { | 164 virtual float DeviceScaleFactor() const OVERRIDE { |
| 162 return scale_factor_; | 165 return scale_factor_; |
| 163 } | 166 } |
| 164 virtual const LayerTreeSettings& Settings() const OVERRIDE { | 167 virtual const LayerTreeSettings& Settings() const OVERRIDE { |
| 165 static LayerTreeSettings fake_settings; | 168 static LayerTreeSettings fake_settings; |
| 166 return fake_settings; | 169 return fake_settings; |
| 167 } | 170 } |
| 168 virtual void SetFullRootLayerDamage() OVERRIDE { | 171 virtual void SetFullRootLayerDamage() OVERRIDE { |
| 169 set_full_root_layer_damage_count_++; | 172 set_full_root_layer_damage_count_++; |
| 170 } | 173 } |
| (...skipping 1453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1624 base::MessageLoop::current()->Run(); | 1627 base::MessageLoop::current()->Run(); |
| 1625 | 1628 |
| 1626 // The sync point should have happened. | 1629 // The sync point should have happened. |
| 1627 EXPECT_EQ(1, sync_point_callback_count); | 1630 EXPECT_EQ(1, sync_point_callback_count); |
| 1628 EXPECT_EQ(1, other_callback_count); | 1631 EXPECT_EQ(1, other_callback_count); |
| 1629 } | 1632 } |
| 1630 #endif // OS_ANDROID | 1633 #endif // OS_ANDROID |
| 1631 | 1634 |
| 1632 } // namespace | 1635 } // namespace |
| 1633 } // namespace cc | 1636 } // namespace cc |
| OLD | NEW |