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

Unified Diff: webkit/compositor_bindings/web_layer_unittest.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Apply code review comments Created 8 years, 1 month 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 | « webkit/compositor_bindings/web_layer_tree_view_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/web_layer_unittest.cc
diff --git a/webkit/compositor_bindings/web_layer_unittest.cc b/webkit/compositor_bindings/web_layer_unittest.cc
index 762be3c73c66542a40fdf6f7173c71ef4c1efc0a..dc70d69a06a485286b7f5b04efe07db6c10abfa9 100644
--- a/webkit/compositor_bindings/web_layer_unittest.cc
+++ b/webkit/compositor_bindings/web_layer_unittest.cc
@@ -5,8 +5,10 @@
#include "config.h"
#include <public/WebLayer.h>
+#include "cc/thread.h"
#include "cc/test/compositor_fake_web_graphics_context_3d.h"
#include "web_layer_impl.h"
+#include "web_layer_tree_view_impl.h"
#include "web_layer_tree_view_test_common.h"
#include <public/WebContentLayer.h>
#include <public/WebContentLayerClient.h>
@@ -50,7 +52,9 @@ public:
{
m_rootLayer.reset(WebLayer::create());
EXPECT_CALL(m_client, scheduleComposite()).Times(AnyNumber());
- m_view.reset(WebLayerTreeView::create(&m_client, *m_rootLayer, WebLayerTreeView::Settings()));
+ m_view.reset(new WebLayerTreeViewImpl(&m_client));
+ EXPECT_TRUE(m_view->initialize(WebLayerTreeView::Settings(), scoped_ptr<cc::Thread>(NULL)));
+ m_view->setRootLayer(*m_rootLayer);
EXPECT_TRUE(m_view);
Mock::VerifyAndClearExpectations(&m_client);
}
@@ -66,7 +70,7 @@ public:
protected:
MockWebLayerTreeViewClient m_client;
scoped_ptr<WebLayer> m_rootLayer;
- scoped_ptr<WebLayerTreeView> m_view;
+ scoped_ptr<WebLayerTreeViewImpl> m_view;
};
// Tests that the client gets called to ask for a composite if we change the
« no previous file with comments | « webkit/compositor_bindings/web_layer_tree_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698