| 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 78091320adb0260610cf531080816249152df7f6..e538d6ce8e313d13d9a0d72d3b6d46c6bd7eb369 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
|
| @@ -329,6 +329,15 @@ 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();
|
| }
|
|
|
| @@ -371,7 +380,6 @@ 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());
|
| @@ -441,6 +449,16 @@ 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());
|
|
|