Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Unified Diff: content/browser/compositor/reflector_impl_unittest.cc

Issue 1821863002: Hook up ui::Compositor to Display's BeginFrameSource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Display member destruction order Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/compositor/reflector_impl_unittest.cc
diff --git a/content/browser/compositor/reflector_impl_unittest.cc b/content/browser/compositor/reflector_impl_unittest.cc
index e05af8b6d0f3651caf17dfb6bc16502f4f2c86a1..00e57c647d7fde0b9879afa1c42ed4ddbbc3891c 100644
--- a/content/browser/compositor/reflector_impl_unittest.cc
+++ b/content/browser/compositor/reflector_impl_unittest.cc
@@ -2,9 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/compositor/reflector_impl.h"
-
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "build/build_config.h"
@@ -13,6 +10,7 @@
#include "cc/test/test_web_graphics_context_3d.h"
#include "content/browser/compositor/browser_compositor_output_surface.h"
#include "content/browser/compositor/browser_compositor_overlay_candidate_validator.h"
+#include "content/browser/compositor/reflector_impl.h"
#include "content/browser/compositor/reflector_texture.h"
#include "content/browser/compositor/test/no_transport_image_transport_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -75,10 +73,12 @@ class TestOutputSurface : public BrowserCompositorOutputSurface {
public:
TestOutputSurface(
const scoped_refptr<cc::ContextProvider>& context_provider,
- const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
+ const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
+ base::SingleThreadTaskRunner* task_runner)
: BrowserCompositorOutputSurface(context_provider,
nullptr,
vsync_manager,
+ task_runner,
CreateTestValidatorOzone()) {
surface_size_ = gfx::Size(256, 256);
device_scale_factor_ = 1.f;
@@ -136,7 +136,8 @@ class ReflectorImplTest : public testing::Test {
context_provider_ =
cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create());
output_surface_ = std::unique_ptr<TestOutputSurface>(
- new TestOutputSurface(context_provider_, compositor_->vsync_manager()));
+ new TestOutputSurface(context_provider_, compositor_->vsync_manager(),
+ compositor_task_runner_.get()));
CHECK(output_surface_->BindToClient(&output_surface_client_));
root_layer_.reset(new ui::Layer(ui::LAYER_SOLID_COLOR));

Powered by Google App Engine
This is Rietveld 408576698