content/browser/renderer_host/render_widget_host_view_browsertest.cc - Issue 21052007: aura: Clean up compositor initialization/destruction.

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/renderer_host/render_widget_host_view_browsertest.cc

Issue 21052007: aura: Clean up compositor initialization/destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanupcompositor: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

Index: content/browser/renderer_host/render_widget_host_view_browsertest.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc

index 25dd8ce884201c0d7c8b1c8f2ade77a3cfa097ca..056b2b9d5cd6dbc0aa41eb0c69544c3f598ba318 100644

--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc

+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc

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

#include "third_party/skia/include/core/SkCanvas.h"

#include "third_party/skia/include/core/SkDevice.h"

#include "ui/base/ui_base_switches.h"

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

#include "ui/gfx/size_conversions.h"

#include "ui/gl/gl_switches.h"

@@ -405,15 +404,6 @@ IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest,

"supported on this platform.");

return;

}

-#if defined(USE_AURA)

- if (ui::IsTestCompositorEnabled()) {

- LOG(WARNING) << ("Blindly passing this test: Aura test compositor doesn't "

- "support frame subscription.");

- // TODO(miu): Aura test compositor should support frame subscription for

- // testing. http://crbug.com/240572

- return;

- }

-#endif

base::RunLoop run_loop;

scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber(

@@ -478,7 +468,9 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture

test_url_("data:text/html,<!doctype html>") {}

virtual void SetUp() OVERRIDE {

- ui::DisableTestCompositor();

+ // We expect real pixel output for these tests.

+ DoNotUseTestContexts();

CompositingRenderWidgetHostViewBrowserTest::SetUp();

}

« no previous file with comments | « content/browser/gpu/gpu_pixel_browsertest.cc ('k') | content/public/test/browser_test_base.h » ('j') | ui/compositor/compositor.cc » ('J')