| Index: cc/trees/layer_tree_host_unittest_no_message_loop.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_no_message_loop.cc b/cc/trees/layer_tree_host_unittest_no_message_loop.cc
|
| index 4930e86b7871bf35d07363f183c4012abf269537..aa5a5080928bb483273090c91871a214d77c72bd 100644
|
| --- a/cc/trees/layer_tree_host_unittest_no_message_loop.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_no_message_loop.cc
|
| @@ -28,10 +28,10 @@ namespace {
|
| class NoMessageLoopOutputSurface : public OutputSurface {
|
| public:
|
| NoMessageLoopOutputSurface() : OutputSurface(TestContextProvider::Create()) {}
|
| - virtual ~NoMessageLoopOutputSurface() {}
|
| + ~NoMessageLoopOutputSurface() override {}
|
|
|
| // OutputSurface overrides.
|
| - virtual void SwapBuffers(CompositorFrame* frame) override {
|
| + void SwapBuffers(CompositorFrame* frame) override {
|
| DCHECK(client_);
|
| client_->DidSwapBuffers();
|
| client_->DidSwapBuffersComplete();
|
| @@ -53,34 +53,32 @@ class LayerTreeHostNoMessageLoopTest
|
| virtual ~LayerTreeHostNoMessageLoopTest() {}
|
|
|
| // LayerTreeHostClient overrides.
|
| - virtual void WillBeginMainFrame(int frame_id) override {}
|
| - virtual void BeginMainFrame(const BeginFrameArgs& args) override {}
|
| - virtual void DidBeginMainFrame() override {}
|
| - virtual void Layout() override {}
|
| - virtual void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
|
| - const gfx::Vector2d& outer_delta,
|
| - float page_scale,
|
| - float top_controls_delta) override {}
|
| - virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
|
| - float page_scale,
|
| - float top_controls_delta) override {}
|
| - virtual void RequestNewOutputSurface(bool fallback) override {
|
| + void WillBeginMainFrame(int frame_id) override {}
|
| + void BeginMainFrame(const BeginFrameArgs& args) override {}
|
| + void DidBeginMainFrame() override {}
|
| + void Layout() override {}
|
| + void ApplyViewportDeltas(const gfx::Vector2d& inner_delta,
|
| + const gfx::Vector2d& outer_delta,
|
| + float page_scale,
|
| + float top_controls_delta) override {}
|
| + void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
|
| + float page_scale,
|
| + float top_controls_delta) override {}
|
| + void RequestNewOutputSurface(bool fallback) override {
|
| layer_tree_host_->SetOutputSurface(
|
| make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface));
|
| }
|
| - virtual void DidInitializeOutputSurface() override {
|
| + void DidInitializeOutputSurface() override {
|
| did_initialize_output_surface_ = true;
|
| }
|
| - virtual void WillCommit() override {}
|
| - virtual void DidCommit() override { did_commit_ = true; }
|
| - virtual void DidCommitAndDrawFrame() override {
|
| - did_commit_and_draw_frame_ = true;
|
| - }
|
| - virtual void DidCompleteSwapBuffers() override {}
|
| + void WillCommit() override {}
|
| + void DidCommit() override { did_commit_ = true; }
|
| + void DidCommitAndDrawFrame() override { did_commit_and_draw_frame_ = true; }
|
| + void DidCompleteSwapBuffers() override {}
|
|
|
| // LayerTreeHostSingleThreadClient overrides.
|
| - virtual void DidPostSwapBuffers() override {}
|
| - virtual void DidAbortSwapBuffers() override {}
|
| + void DidPostSwapBuffers() override {}
|
| + void DidAbortSwapBuffers() override {}
|
|
|
| void RunTest() {
|
| no_loop_thread_.Start();
|
| @@ -88,7 +86,7 @@ class LayerTreeHostNoMessageLoopTest
|
| }
|
|
|
| // base::DelegateSimpleThread::Delegate override.
|
| - virtual void Run() override {
|
| + void Run() override {
|
| ASSERT_FALSE(base::MessageLoopProxy::current().get());
|
| RunTestWithoutMessageLoop();
|
| EXPECT_FALSE(base::MessageLoopProxy::current().get());
|
| @@ -137,7 +135,7 @@ class LayerTreeHostNoMessageLoopTest
|
| class LayerTreeHostNoMessageLoopSmokeTest
|
| : public LayerTreeHostNoMessageLoopTest {
|
| protected:
|
| - virtual void RunTestWithoutMessageLoop() override {
|
| + void RunTestWithoutMessageLoop() override {
|
| gfx::Size size(100, 100);
|
|
|
| // Set up root layer.
|
| @@ -164,7 +162,7 @@ class LayerTreeHostNoMessageLoopDelegatedLayer
|
| : public LayerTreeHostNoMessageLoopTest,
|
| public DelegatedFrameResourceCollectionClient {
|
| protected:
|
| - virtual void RunTestWithoutMessageLoop() override {
|
| + void RunTestWithoutMessageLoop() override {
|
| resource_collection_ = new DelegatedFrameResourceCollection;
|
| frame_provider_ = new DelegatedFrameProvider(
|
| resource_collection_.get(), CreateFrameDataWithResource(998));
|
| @@ -198,7 +196,7 @@ class LayerTreeHostNoMessageLoopDelegatedLayer
|
| }
|
|
|
| // DelegatedFrameResourceCollectionClient overrides.
|
| - virtual void UnusedResourcesAreAvailable() override {}
|
| + void UnusedResourcesAreAvailable() override {}
|
|
|
| private:
|
| scoped_ptr<DelegatedFrameData> CreateFrameDataWithResource(
|
|
|