content/browser/compositor/software_browser_compositor_output_surface_unittest.cc - Issue 161413002: Revert of Read compositor VSync information from platform, when possible

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 161413002: Revert of Read compositor VSync information from platform, when possible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/compositor/software_browser_compositor_output_surface.cc ('k') | content/browser/renderer_host/media/desktop_capture_device_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

diff --git a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc b/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

index 3f48d21632ee65fb6bd4763c1b5b59eca955a197..047346fcbb813858ab54b35087303ff3f31de8a8 100644

--- a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

+++ b/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

@@ -7,7 +7,6 @@

#include "content/browser/compositor/browser_compositor_output_surface_proxy.h"

#include "content/browser/compositor/software_browser_compositor_output_surface.h"

#include "testing/gtest/include/gtest/gtest.h"

-#include "ui/compositor/compositor.h"

#include "ui/compositor/test/context_factories_for_test.h"

#include "ui/gfx/vsync_provider.h"

@@ -80,8 +79,6 @@

SoftwareBrowserCompositorOutputSurfaceTest::

SoftwareBrowserCompositorOutputSurfaceTest() {

- // |message_loop_| is not used, but the main thread still has to exist for the

- // compositor to use.

message_loop_.reset(new base::MessageLoopForUI);

}

@@ -117,7 +114,8 @@

device.Pass(),

&surface_map_,

- compositor_->vsync_manager()));

+ compositor_->GetCompositorMessageLoop(),

+ compositor_->AsWeakPtr()));

}

TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) {