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

Unified Diff: content/browser/renderer_host/render_widget_host_view_browsertest.cc

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

Patch Set: cleanupcompositor: UseRealGLBindings in NetInternalsTest Created 7 years, 4 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/media/media_browsertest.cc ('k') | content/browser/web_contents/web_contents_view_aura_browsertest.cc » ('j') | content/public/test/browser_test_base.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5dc1ed4fd2587324d46f66dfaf808175b72872bf..2b47ff19315837ceafb1522d00af2c5d8c6fd8ba 100644

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

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

@@ -28,7 +28,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"

@@ -212,6 +211,18 @@ class RenderWidgetHostViewBrowserTest : public ContentBrowserTest {

class CompositingRenderWidgetHostViewBrowserTest

: public RenderWidgetHostViewBrowserTest {

public:

+ virtual void SetUp() OVERRIDE {

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

+ UseRealGLContexts();

+ // On legacy windows, these tests need real GL bindings to pass.

+#if defined(OS_WIN) && !defined(USE_AURA)

+ UseRealGLBindings();

+#endif

+ RenderWidgetHostViewBrowserTest::SetUp();

+ }

virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

// Note: Not appending kForceCompositingMode switch here, since not all bots

// support compositing. Some bots will run with compositing on, and others

@@ -330,15 +341,6 @@ class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {

// is enabled.

IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest,

CopyFromBackingStore) {

-#if defined(USE_AURA)

- if (ui::IsTestCompositorEnabled()) {

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

- "support copying from backing store.");

- // TODO(jbauman): Aura test compositor should support copying from backing

- // store. http://crbug.com/268644

- return;

- }

-#endif

RunBasicCopyFromBackingStoreTest();

}

@@ -381,6 +383,7 @@ IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest,

"not supported on this platform.");

return;

}

base::RunLoop run_loop;

scoped_refptr<media::VideoFrame> dest =

media::VideoFrame::CreateBlackFrame(frame_size());

@@ -414,15 +417,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(

@@ -450,16 +444,6 @@ IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTest, CopyTwice) {

return;

}

-#if defined(USE_AURA)

- if (ui::IsTestCompositorEnabled()) {

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

- "support copying to video frame.");

- // TODO(jbauman): Aura test compositor should support copying to video

- // frame. http://crbug.com/268644

- return;

- }

-#endif

base::RunLoop run_loop;

scoped_refptr<media::VideoFrame> first_output =

media::VideoFrame::CreateBlackFrame(frame_size());

@@ -496,23 +480,6 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture

allowable_error_(0),

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

- virtual void SetUp() OVERRIDE {

- ui::DisableTestCompositor();

- CompositingRenderWidgetHostViewBrowserTest::SetUp();

- }

- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

- // TODO(Hubbe): This code is very similar to some code in

- // gpu_feature_browsertest.cc, and should really be shared in a common

- // location.

- if (!command_line->HasSwitch(switches::kUseGpuInTests)) {

- CHECK(!command_line->HasSwitch(switches::kUseGL))

- << "kUseGL must not be set by test framework code!";

- command_line->AppendSwitchASCII(switches::kUseGL,

- gfx::kGLImplementationOSMesaName);

- }

void CopyFromCompositingSurfaceCallback(base::Closure quit_callback,

bool result,

const SkBitmap& bitmap) {