| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "cc/base/region.h" | 10 #include "cc/base/region.h" |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 // OutputSurface implementation | 149 // OutputSurface implementation |
| 150 void BindFramebuffer() override { | 150 void BindFramebuffer() override { |
| 151 OutputSurface::BindFramebuffer(); | 151 OutputSurface::BindFramebuffer(); |
| 152 bind_framebuffer_count_ += 1; | 152 bind_framebuffer_count_ += 1; |
| 153 } | 153 } |
| 154 uint32_t GetFramebufferCopyTextureFormat() override { | 154 uint32_t GetFramebufferCopyTextureFormat() override { |
| 155 // TestContextProvider has no real framebuffer, just use RGB. | 155 // TestContextProvider has no real framebuffer, just use RGB. |
| 156 return GL_RGB; | 156 return GL_RGB; |
| 157 } | 157 } |
| 158 void SwapBuffers(CompositorFrame frame) override { | 158 void SwapBuffers(CompositorFrame frame) override { |
| 159 client_->DidSwapBuffers(); | |
| 160 } | 159 } |
| 161 void OnSwapBuffersComplete() override { client_->DidSwapBuffersComplete(); } | 160 void OnSwapBuffersComplete() override { client_->DidSwapBuffersComplete(); } |
| 162 | 161 |
| 163 void SetOverlayCandidateValidator(OverlayCandidateValidator* validator) { | 162 void SetOverlayCandidateValidator(OverlayCandidateValidator* validator) { |
| 164 overlay_candidate_validator_.reset(validator); | 163 overlay_candidate_validator_.reset(validator); |
| 165 } | 164 } |
| 166 | 165 |
| 167 OverlayCandidateValidator* GetOverlayCandidateValidator() const override { | 166 OverlayCandidateValidator* GetOverlayCandidateValidator() const override { |
| 168 return overlay_candidate_validator_.get(); | 167 return overlay_candidate_validator_.get(); |
| 169 } | 168 } |
| (...skipping 1479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1649 | 1648 |
| 1650 ReturnResourceInUseQuery(resource2); | 1649 ReturnResourceInUseQuery(resource2); |
| 1651 ReturnResourceInUseQuery(resource3); | 1650 ReturnResourceInUseQuery(resource3); |
| 1652 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); | 1651 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource1)); |
| 1653 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource2)); | 1652 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource2)); |
| 1654 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource3)); | 1653 EXPECT_FALSE(resource_provider_->InUseByConsumer(resource3)); |
| 1655 } | 1654 } |
| 1656 | 1655 |
| 1657 } // namespace | 1656 } // namespace |
| 1658 } // namespace cc | 1657 } // namespace cc |
| OLD | NEW |