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

Unified Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 21026005: aura: Remove CreateOffscreenContext from ui::ContextFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: offscreencontext: clang-format Created 7 years, 4 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 | « cc/test/test_web_graphics_context_3d.cc ('k') | content/browser/aura/gpu_process_transport_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_context.cc
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index 1787d31ddf3b4ca74c4064d6e8a8ac47506be111..43843692013ee27db48e20788f4346e78e79a2f3 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -5,6 +5,7 @@
#include "cc/trees/layer_tree_host.h"
#include "base/basictypes.h"
+#include "cc/debug/fake_context_provider.h"
#include "cc/layers/content_layer.h"
#include "cc/layers/heads_up_display_layer.h"
#include "cc/layers/io_surface_layer.h"
@@ -19,7 +20,6 @@
#include "cc/test/fake_content_layer.h"
#include "cc/test/fake_content_layer_client.h"
#include "cc/test/fake_content_layer_impl.h"
-#include "cc/test/fake_context_provider.h"
#include "cc/test/fake_delegated_renderer_layer.h"
#include "cc/test/fake_delegated_renderer_layer_impl.h"
#include "cc/test/fake_layer_tree_host_client.h"
@@ -115,16 +115,16 @@ class LayerTreeHostContextTest : public LayerTreeTest {
context3d.PassAs<WebGraphicsContext3D>()).PassAs<OutputSurface>();
}
- scoped_ptr<TestWebGraphicsContext3D> CreateOffscreenContext3d() {
+ scoped_ptr<WebKit::WebGraphicsContext3D> CreateOffscreenContext3d() {
if (!context3d_)
- return scoped_ptr<TestWebGraphicsContext3D>();
+ return scoped_ptr<WebKit::WebGraphicsContext3D>();
++times_offscreen_created_;
if (times_to_fail_create_offscreen_) {
--times_to_fail_create_offscreen_;
ExpectCreateToFail();
- return scoped_ptr<TestWebGraphicsContext3D>();
+ return scoped_ptr<WebKit::WebGraphicsContext3D>();
}
scoped_ptr<TestWebGraphicsContext3D> offscreen_context3d =
@@ -132,7 +132,7 @@ class LayerTreeHostContextTest : public LayerTreeTest {
DCHECK(offscreen_context3d);
context3d_->add_share_group_context(offscreen_context3d.get());
- return offscreen_context3d.Pass();
+ return offscreen_context3d.PassAs<WebKit::WebGraphicsContext3D>();
}
virtual scoped_refptr<cc::ContextProvider>
« no previous file with comments | « cc/test/test_web_graphics_context_3d.cc ('k') | content/browser/aura/gpu_process_transport_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698