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

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: rebase Created 7 years, 5 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: 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 b014941161f07db92a9f757bab7a167cbcc3eeca..24c25b68c67523aab3cb544b90fdb478aee4aaeb 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"
@@ -112,16 +112,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 =
@@ -129,7 +129,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>

Powered by Google App Engine
This is Rietveld 408576698