diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 17:02:53 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-12 17:02:53 +0000 |
| commit | 832c83b1cd554367fed1c53b5d249c6492d08d89 (patch) | |
| tree | ea45ee264319cdbed70df84c4ee3e63ee0da816c /content/browser/renderer_host/render_widget_host_view_browsertest.cc | |
| parent | 7acc14bd5882774433acdf9e29bf6c1b67ed3565 (diff) | |
| download | chromium_src-832c83b1cd554367fed1c53b5d249c6492d08d89.zip chromium_src-832c83b1cd554367fed1c53b5d249c6492d08d89.tar.gz chromium_src-832c83b1cd554367fed1c53b5d249c6492d08d89.tar.bz2 | |
Disable 2 CompositingRenderWidgetHostViewBrowserTestTabCapture tests in software compositing mode.
NOTRY=True
TBR=jbauman
BUG=306789
Review URL: https://codereview.chromium.org/26220003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_view_browsertest.cc')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_browsertest.cc | 13 |
1 files changed, 13 insertions, 0 deletions
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 0db748f..e9dc4d6 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -12,6 +12,7 @@ #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/port/browser/render_widget_host_view_frame_subscriber.h" #include "content/port/browser/render_widget_host_view_port.h" +#include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_paths.h" @@ -767,6 +768,12 @@ IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTestTabCapture, IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTestTabCapture, CopyFromCompositingSurface_Origin_Scaled) { +#if defined(USE_AURA) + // TODO(gpu): Fix this test in software compositing mode: + // http://crbug.com/306789. + if (!content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) + return; +#endif gfx::Rect copy_rect(400, 300); gfx::Size output_size(200, 100); gfx::Size expected_bitmap_size = output_size; @@ -798,6 +805,12 @@ IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTestTabCapture, IN_PROC_BROWSER_TEST_F(CompositingRenderWidgetHostViewBrowserTestTabCapture, CopyFromCompositingSurface_Cropped_Scaled) { +#if defined(USE_AURA) + // TODO(gpu): Fix this test in software compositing mode: + // http://crbug.com/306789. + if (!content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) + return; +#endif // Grab 60x60 pixels from the center of the tab contents. gfx::Rect copy_rect(400, 300); copy_rect = gfx::Rect(copy_rect.CenterPoint() - gfx::Vector2d(30, 30), |