| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/run_loop.h" | 5 #include "base/run_loop.h" |
| 6 #include "base/single_thread_task_runner.h" | 6 #include "base/single_thread_task_runner.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "cc/test/fake_output_surface_client.h" | 8 #include "cc/test/fake_output_surface_client.h" |
| 9 #include "cc/test/test_context_provider.h" | 9 #include "cc/test/test_context_provider.h" |
| 10 #include "cc/test/test_web_graphics_context_3d.h" | 10 #include "cc/test/test_web_graphics_context_3d.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 | 100 |
| 101 void OnGpuSwapBuffersCompleted( | 101 void OnGpuSwapBuffersCompleted( |
| 102 const std::vector<ui::LatencyInfo>& latency_info, | 102 const std::vector<ui::LatencyInfo>& latency_info, |
| 103 gfx::SwapResult result, | 103 gfx::SwapResult result, |
| 104 const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override { | 104 const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override { |
| 105 NOTREACHED(); | 105 NOTREACHED(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 #if defined(OS_MACOSX) | 108 #if defined(OS_MACOSX) |
| 109 void SetSurfaceSuspendedForRecycle(bool suspended) override {} | 109 void SetSurfaceSuspendedForRecycle(bool suspended) override {} |
| 110 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override { | |
| 111 return false; | |
| 112 } | |
| 113 #endif | 110 #endif |
| 114 | 111 |
| 115 private: | 112 private: |
| 116 std::unique_ptr<ReflectorTexture> reflector_texture_; | 113 std::unique_ptr<ReflectorTexture> reflector_texture_; |
| 117 }; | 114 }; |
| 118 | 115 |
| 119 const gfx::Rect kSubRect(0, 0, 64, 64); | 116 const gfx::Rect kSubRect(0, 0, 64, 64); |
| 120 | 117 |
| 121 } // namespace | 118 } // namespace |
| 122 | 119 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 plane_2.plane_z_order = 1; | 221 plane_2.plane_z_order = 1; |
| 225 list.push_back(plane_1); | 222 list.push_back(plane_1); |
| 226 list.push_back(plane_2); | 223 list.push_back(plane_2); |
| 227 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); | 224 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); |
| 228 EXPECT_FALSE(list[0].overlay_handled); | 225 EXPECT_FALSE(list[0].overlay_handled); |
| 229 } | 226 } |
| 230 #endif // defined(USE_OZONE) | 227 #endif // defined(USE_OZONE) |
| 231 | 228 |
| 232 } // namespace | 229 } // namespace |
| 233 } // namespace content | 230 } // namespace content |
| OLD | NEW |