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

Unified Diff: trunk/src/content/browser/compositor/image_transport_factory_browsertest.cc

Issue 137853019: Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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
Index: trunk/src/content/browser/compositor/image_transport_factory_browsertest.cc
===================================================================
--- trunk/src/content/browser/compositor/image_transport_factory_browsertest.cc (revision 245194)
+++ trunk/src/content/browser/compositor/image_transport_factory_browsertest.cc (working copy)
@@ -1,69 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/run_loop.h"
-#include "cc/output/context_provider.h"
-#include "content/browser/compositor/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 "gpu/command_buffer/client/gles2_interface.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "ui/compositor/compositor.h"
-
-namespace content {
-namespace {
-
-class ImageTransportFactoryBrowserTest : public ContentBrowserTest {
- public:
- ImageTransportFactoryBrowserTest() {}
-
- virtual void SetUp() OVERRIDE {
- UseRealGLContexts();
- ContentBrowserTest::SetUp();
- }
-};
-
-class MockImageTransportFactoryObserver : public ImageTransportFactoryObserver {
- public:
- MOCK_METHOD0(OnLostResources, void());
-};
-
-// 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);
-
- base::RunLoop run_loop;
- EXPECT_CALL(observer, OnLostResources())
- .WillOnce(testing::InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
-
- ui::ContextFactory* context_factory = ui::ContextFactory::GetInstance();
-
- gpu::gles2::GLES2Interface* gl =
- context_factory->SharedMainThreadContextProvider()->ContextGL();
- gl->LoseContextCHROMIUM(GL_GUILTY_CONTEXT_RESET_ARB,
- GL_INNOCENT_CONTEXT_RESET_ARB);
-
- // We have to flush to make sure that the client side gets a chance to notice
- // the context is gone.
- gl->Flush();
-
- run_loop.Run();
- EXPECT_EQ(0u, texture->PrepareTexture());
-
- factory->RemoveObserver(&observer);
-}
-
-} // anonymous namespace
-} // namespace content

Powered by Google App Engine
This is Rietveld 408576698