| 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 <map> | 5 #include <map> |
| 6 #include <queue> | 6 #include <queue> |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/browser/browser_view_renderer.h" | 9 #include "android_webview/browser/browser_view_renderer.h" |
| 10 #include "android_webview/browser/child_frame.h" | 10 #include "android_webview/browser/child_frame.h" |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 int frame_number) = 0; | 299 int frame_number) = 0; |
| 300 | 300 |
| 301 void StartTest() override { | 301 void StartTest() override { |
| 302 frame_number_ = 0; | 302 frame_number_ = 0; |
| 303 AdvanceFrame(); | 303 AdvanceFrame(); |
| 304 } | 304 } |
| 305 | 305 |
| 306 void WillOnDraw() override { | 306 void WillOnDraw() override { |
| 307 if (next_frame_) { | 307 if (next_frame_) { |
| 308 compositor_->SetHardwareFrame(next_frame_->output_surface_id, | 308 compositor_->SetHardwareFrame(next_frame_->output_surface_id, |
| 309 std::move(next_frame_->frame)); | 309 std::move(*next_frame_->frame)); |
| 310 } | 310 } |
| 311 } | 311 } |
| 312 | 312 |
| 313 void DidOnDraw(bool success) override { | 313 void DidOnDraw(bool success) override { |
| 314 EXPECT_EQ(next_frame_ != nullptr, success); | 314 EXPECT_EQ(next_frame_ != nullptr, success); |
| 315 if (!AdvanceFrame()) { | 315 if (!AdvanceFrame()) { |
| 316 ui_task_runner_->PostTask(FROM_HERE, | 316 ui_task_runner_->PostTask(FROM_HERE, |
| 317 base::Bind(&ResourceRenderingTest::CheckResults, | 317 base::Bind(&ResourceRenderingTest::CheckResults, |
| 318 base::Unretained(this))); | 318 base::Unretained(this))); |
| 319 } | 319 } |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 } | 492 } |
| 493 | 493 |
| 494 private: | 494 private: |
| 495 std::unique_ptr<FakeFunctor> saved_functor_; | 495 std::unique_ptr<FakeFunctor> saved_functor_; |
| 496 OutputSurfaceResourceCountMap expected_return_count_; | 496 OutputSurfaceResourceCountMap expected_return_count_; |
| 497 }; | 497 }; |
| 498 | 498 |
| 499 RENDERING_TEST_F(RenderThreadManagerSwitchTest); | 499 RENDERING_TEST_F(RenderThreadManagerSwitchTest); |
| 500 | 500 |
| 501 } // namespace android_webview | 501 } // namespace android_webview |
| OLD | NEW |