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

Side by Side Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 131443007: aura: Remove old GL paths from RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: dcheck 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "apps/ui/native_app_window.h" 5 #include "apps/ui/native_app_window.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/apps/app_browsertest_util.h" 9 #include "chrome/browser/apps/app_browsertest_util.h"
10 #include "chrome/browser/automation/automation_util.h" 10 #include "chrome/browser/automation/automation_util.h"
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 return; 625 return;
626 #endif 626 #endif
627 627
628 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) 628 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize"))
629 << message_; 629 << message_;
630 } 630 }
631 631
632 #if !defined(OS_CHROMEOS) 632 #if !defined(OS_CHROMEOS)
633 // This test ensures <webview> doesn't crash in SW rendering when autosize is 633 // This test ensures <webview> doesn't crash in SW rendering when autosize is
634 // turned on. 634 // turned on.
635 // Flaky on Windows http://crbug.com/299507 635 #if defined(OS_MACOSX) || defined(USE_AURA)
636 #if defined(OS_WIN) || defined(OS_MACOSX)
637 #define MAYBE_AutoSizeSW DISABLED_AutoSizeSW 636 #define MAYBE_AutoSizeSW DISABLED_AutoSizeSW
638 #else 637 #else
639 #define MAYBE_AutoSizeSW AutoSizeSW 638 #define MAYBE_AutoSizeSW AutoSizeSW
640 #endif 639 #endif
641 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_AutoSizeSW) { 640 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_AutoSizeSW) {
642 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize")) 641 ASSERT_TRUE(RunPlatformAppTest("platform_apps/web_view/autosize"))
643 << message_; 642 << message_;
644 } 643 }
645 #endif 644 #endif
646 645
(...skipping 1206 matching lines...) Expand 10 before | Expand all | Expand 10 after
1853 } 1852 }
1854 }; 1853 };
1855 1854
1856 // <webview> screenshot capture fails with ubercomp. 1855 // <webview> screenshot capture fails with ubercomp.
1857 // See http://crbug.com/327035. 1856 // See http://crbug.com/327035.
1858 IN_PROC_BROWSER_TEST_P(WebViewCaptureTest, 1857 IN_PROC_BROWSER_TEST_P(WebViewCaptureTest,
1859 DISABLED_Shim_ScreenshotCapture) { 1858 DISABLED_Shim_ScreenshotCapture) {
1860 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); 1859 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
1861 } 1860 }
1862 1861
1862 // Threaded compositing is always enabled on Aura.
1863 #if !defined(USE_AURA)
1863 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor, 1864 INSTANTIATE_TEST_CASE_P(WithoutThreadedCompositor,
1864 WebViewCaptureTest, 1865 WebViewCaptureTest,
1865 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); 1866 ::testing::Values(std::string(switches::kDisableThreadedCompositing)));
1867 #endif
1866 1868
1867 // http://crbug.com/171744 1869 // http://crbug.com/171744
1868 #if !defined(OS_MACOSX) 1870 #if !defined(OS_MACOSX)
1869 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor, 1871 INSTANTIATE_TEST_CASE_P(WithThreadedCompositor,
1870 WebViewCaptureTest, 1872 WebViewCaptureTest,
1871 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); 1873 ::testing::Values(std::string(switches::kEnableThreadedCompositing)));
1872 #endif 1874 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698