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

Side by Side Diff: content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

Issue 145293007: ui: No more TestCompositor. Use NullDraw contexts in unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testsnulldraw: Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "cc/output/compositor_frame.h" 6 #include "cc/output/compositor_frame.h"
7 #include "content/browser/compositor/browser_compositor_output_surface_proxy.h" 7 #include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
8 #include "content/browser/compositor/software_browser_compositor_output_surface. h" 8 #include "content/browser/compositor/software_browser_compositor_output_surface. h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/compositor/test/context_factories_for_test.h" 10 #include "ui/compositor/test/context_factories_for_test.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 SoftwareBrowserCompositorOutputSurfaceTest:: 80 SoftwareBrowserCompositorOutputSurfaceTest::
81 SoftwareBrowserCompositorOutputSurfaceTest() { 81 SoftwareBrowserCompositorOutputSurfaceTest() {
82 message_loop_.reset(new base::MessageLoopForUI); 82 message_loop_.reset(new base::MessageLoopForUI);
83 } 83 }
84 84
85 SoftwareBrowserCompositorOutputSurfaceTest:: 85 SoftwareBrowserCompositorOutputSurfaceTest::
86 ~SoftwareBrowserCompositorOutputSurfaceTest() {} 86 ~SoftwareBrowserCompositorOutputSurfaceTest() {}
87 87
88 void SoftwareBrowserCompositorOutputSurfaceTest::SetUp() { 88 void SoftwareBrowserCompositorOutputSurfaceTest::SetUp() {
89 ui::InitializeContextFactoryForTests(false); 89 bool enable_pixel_output = false;
90 ui::InitializeContextFactoryForTests(enable_pixel_output);
90 ui::Compositor::Initialize(); 91 ui::Compositor::Initialize();
91 92
92 compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget)); 93 compositor_.reset(new ui::Compositor(gfx::kNullAcceleratedWidget));
93 surface_proxy_ = 94 surface_proxy_ =
94 new content::BrowserCompositorOutputSurfaceProxy(&surface_map_); 95 new content::BrowserCompositorOutputSurfaceProxy(&surface_map_);
95 } 96 }
96 97
97 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() { 98 void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() {
98 output_surface_.reset(); 99 output_surface_.reset();
99 compositor_.reset(); 100 compositor_.reset();
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 137
137 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( 138 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>(
138 output_surface_->software_device()->GetVSyncProvider()); 139 output_surface_->software_device()->GetVSyncProvider());
139 EXPECT_EQ(0, vsync_provider->call_count()); 140 EXPECT_EQ(0, vsync_provider->call_count());
140 141
141 cc::CompositorFrame frame; 142 cc::CompositorFrame frame;
142 output_surface_->SwapBuffers(&frame); 143 output_surface_->SwapBuffers(&frame);
143 144
144 EXPECT_EQ(1, vsync_provider->call_count()); 145 EXPECT_EQ(1, vsync_provider->call_count());
145 } 146 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698