diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 23:18:17 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 23:18:17 +0000 |
| commit | 16f1477629252f905088b90b88edbaf9bd53f676 (patch) | |
| tree | cd3021d47b3a961586090a8b5d20d33f13bac83e /cc/resource_update_controller_unittest.cc | |
| parent | dfca4c3357d346e496a847b7657e96ab97e0c4a4 (diff) | |
| download | chromium_src-16f1477629252f905088b90b88edbaf9bd53f676.zip chromium_src-16f1477629252f905088b90b88edbaf9bd53f676.tar.gz chromium_src-16f1477629252f905088b90b88edbaf9bd53f676.tar.bz2 | |
Revert 165050 - Remove WebKit::Platform dependencies from cc
This removes all dependencies on the static WebKit::Platform pointer from cc.
The biggest change is implementing cc::Thread on top of base::MessageLoopProxy
instead of WebKit::WebThread. For the main thread cc::Thread simply binds to
the current thread's MessageLoopProxy. For the impl thread, the bindings layer
(specifically webkit/compositor_bindings/web_compositor_impl) extracts the
MessageLoopProxy out of the passed in WebThread.
BUG=144539
Review URL: https://codereview.chromium.org/11344004
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/11347050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resource_update_controller_unittest.cc')
| -rw-r--r-- | cc/resource_update_controller_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc index ca3c3b8..850581a 100644 --- a/cc/resource_update_controller_unittest.cc +++ b/cc/resource_update_controller_unittest.cc @@ -11,6 +11,7 @@ #include "cc/test/fake_web_graphics_context_3d.h" #include "cc/test/scheduler_test_common.h" #include "cc/test/tiled_layer_test_common.h" +#include "cc/test/web_compositor_initializer.h" #include "testing/gtest/include/gtest/gtest.h" #include <public/WebThread.h> @@ -65,6 +66,7 @@ public: ResourceUpdateControllerTest() : m_queue(make_scoped_ptr(new ResourceUpdateQueue)) , m_textureManager(PrioritizedTextureManager::create(60*1024*1024, 1024, Renderer::ContentPool)) + , m_compositorInitializer(m_thread.get()) , m_fullUploadCountExpected(0) , m_partialCountExpected(0) , m_totalUploadCountExpected(0) @@ -186,6 +188,7 @@ protected: scoped_ptr<ResourceUpdateQueue> m_queue; scoped_ptr<PrioritizedTexture> m_textures[4]; scoped_ptr<WebThread> m_thread; + WebCompositorInitializer m_compositorInitializer; scoped_ptr<PrioritizedTextureManager> m_textureManager; SkBitmap m_bitmap; |