summaryrefslogtreecommitdiffstats
path: root/content/browser/aura
diff options
context:
space:
mode:
authorgab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-14 18:13:56 +0000
committergab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-14 18:13:56 +0000
commitc6fae2fd79282d8fb34c72ea23a149017dc25bab (patch)
tree6f12f091d36ec0a4f194cba23d535284a75edf20 /content/browser/aura
parent70f6c86f2bee7239bc27e153f3e372afb405eaa9 (diff)
downloadchromium_src-c6fae2fd79282d8fb34c72ea23a149017dc25bab.zip
chromium_src-c6fae2fd79282d8fb34c72ea23a149017dc25bab.tar.gz
chromium_src-c6fae2fd79282d8fb34c72ea23a149017dc25bab.tar.bz2
Disable ImageTransportFactoryBrowserTest.TestLostContext in software compositing mode.
TBR=jbauman BUG=307037 Review URL: https://codereview.chromium.org/26190004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/aura')
-rw-r--r--content/browser/aura/image_transport_factory_browsertest.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/content/browser/aura/image_transport_factory_browsertest.cc b/content/browser/aura/image_transport_factory_browsertest.cc
index 233c06c..d669462 100644
--- a/content/browser/aura/image_transport_factory_browsertest.cc
+++ b/content/browser/aura/image_transport_factory_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/run_loop.h"
#include "content/browser/aura/image_transport_factory.h"
+#include "content/public/browser/gpu_data_manager.h"
#include "content/test/content_browser_test.h"
#include "gpu/GLES2/gl2extchromium.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -31,8 +32,13 @@ class MockImageTransportFactoryObserver : public ImageTransportFactoryObserver {
// Checks that upon context loss, the observer is called and the created
// resources are reset.
IN_PROC_BROWSER_TEST_F(ImageTransportFactoryBrowserTest, TestLostContext) {
+ // This test doesn't make sense in software compositing mode.
+ if (!GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor())
+ return;
+
ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
scoped_refptr<ui::Texture> texture = factory->CreateTransportClient(1.f);
+ ASSERT_TRUE(texture.get());
MockImageTransportFactoryObserver observer;
factory->AddObserver(&observer);