| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 if (!reflector_) { | 93 if (!reflector_) { |
| 94 reflector_texture_.reset(); | 94 reflector_texture_.reset(); |
| 95 } else { | 95 } else { |
| 96 reflector_texture_.reset(new ReflectorTexture(context_provider())); | 96 reflector_texture_.reset(new ReflectorTexture(context_provider())); |
| 97 reflector_->OnSourceTextureMailboxUpdated(reflector_texture_->mailbox()); | 97 reflector_->OnSourceTextureMailboxUpdated(reflector_texture_->mailbox()); |
| 98 } | 98 } |
| 99 } | 99 } |
| 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) override { | 103 gfx::SwapResult result, |
| 104 const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) override { |
| 104 NOTREACHED(); | 105 NOTREACHED(); |
| 105 } | 106 } |
| 106 | 107 |
| 107 #if defined(OS_MACOSX) | 108 #if defined(OS_MACOSX) |
| 108 void SetSurfaceSuspendedForRecycle(bool suspended) override {} | 109 void SetSurfaceSuspendedForRecycle(bool suspended) override {} |
| 109 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override { | 110 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override { |
| 110 return false; | 111 return false; |
| 111 } | 112 } |
| 112 #endif | 113 #endif |
| 113 | 114 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 plane_2.plane_z_order = 1; | 224 plane_2.plane_z_order = 1; |
| 224 list.push_back(plane_1); | 225 list.push_back(plane_1); |
| 225 list.push_back(plane_2); | 226 list.push_back(plane_2); |
| 226 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); | 227 output_surface_->GetOverlayCandidateValidator()->CheckOverlaySupport(&list); |
| 227 EXPECT_FALSE(list[0].overlay_handled); | 228 EXPECT_FALSE(list[0].overlay_handled); |
| 228 } | 229 } |
| 229 #endif // defined(USE_OZONE) | 230 #endif // defined(USE_OZONE) |
| 230 | 231 |
| 231 } // namespace | 232 } // namespace |
| 232 } // namespace content | 233 } // namespace content |
| OLD | NEW |