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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 150153003: Revert of aura: Remove old GL paths from RenderWidgetHostViewAura. (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 | « chrome/browser/about_flags.cc ('k') | content/browser/browser_plugin/browser_plugin_host_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/web_view_browsertest.cc
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc
index edf9272073eaa75848e3017e6e8d49d3ab3b42de..7f5211a22da4c0b96a0df7a6b57a9ae61d45536d 100644
--- a/chrome/browser/apps/web_view_browsertest.cc
+++ b/chrome/browser/apps/web_view_browsertest.cc
@@ -632,7 +632,8 @@
#if !defined(OS_CHROMEOS)
// This test ensures <webview> doesn't crash in SW rendering when autosize is
// turned on.
-#if defined(OS_MACOSX) || defined(USE_AURA)
+// Flaky on Windows http://crbug.com/299507
+#if defined(OS_WIN) || defined(OS_MACOSX)
#define MAYBE_AutoSizeSW DISABLED_AutoSizeSW
#else
#define MAYBE_AutoSizeSW AutoSizeSW
@@ -1863,12 +1864,9 @@
TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
}
-// Threaded compositing is always enabled on Aura.
-#if !defined(USE_AURA)
INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor,
WebViewCaptureTest,
::testing::Values(std::string(switches::kDisableThreadedCompositing)));
-#endif
// http://crbug.com/171744
#if !defined(OS_MACOSX)
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/browser_plugin/browser_plugin_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698