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

Unified Diff: content/browser/web_contents/web_contents_view_aura_browsertest.cc

Issue 21458003: Enable software compositing in renderer for win aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/renderer_host/render_widget_host_view_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_view_aura_browsertest.cc
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
index 27edfc9fda285e6f75fdedb3b9cb30f7bc027c3d..caa07a41346cfdf77d5117506945f16fb381e60c 100644
--- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc
+++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
@@ -24,6 +24,7 @@
#include "ui/aura/root_window.h"
#include "ui/aura/test/event_generator.h"
#include "ui/aura/window.h"
+#include "ui/compositor/compositor_setup.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
namespace content {
@@ -325,6 +326,9 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
// gesture.
IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
OverscrollScreenshot) {
+ // http://crbug.com/268644
+ if (ui::IsTestCompositorEnabled())
+ return;
ASSERT_NO_FATAL_FAILURE(
StartTestWithPage("files/overscroll_navigation.html"));
WebContentsImpl* web_contents =
@@ -419,6 +423,9 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
// RenderViewHost to be swapped out.
IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest,
ScreenshotForSwappedOutRenderViews) {
+ // http://crbug.com/268644
+ if (ui::IsTestCompositorEnabled())
+ return;
ASSERT_NO_FATAL_FAILURE(
StartTestWithPage("files/overscroll_navigation.html"));
// Create a new server with a different site.
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698