diff options
| author | egraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-01 00:42:41 +0000 |
|---|---|---|
| committer | egraether@chromium.org <egraether@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-01 00:42:41 +0000 |
| commit | 27664a514b029b131906e4e8b2246f7afb5b34cd (patch) | |
| tree | 83845269db9094f758c5d02a8c1f33e1878269c7 /cc/test | |
| parent | 9c52413002109eed3ac64b2ec6c258dd67b2d941 (diff) | |
| download | chromium_src-27664a514b029b131906e4e8b2246f7afb5b34cd.zip chromium_src-27664a514b029b131906e4e8b2246f7afb5b34cd.tar.gz chromium_src-27664a514b029b131906e4e8b2246f7afb5b34cd.tar.bz2 | |
This change switches the compositor to the new WebLayerTreeViewClient::createFontAtlas() API. LayerTreeHost now manages whether a font atlas needs to be loaded.
commit order:
https://bugs.webkit.org/show_bug.cgi?id=102958
https://codereview.chromium.org/11413123
https://bugs.webkit.org/show_bug.cgi?id=102960
BUG=
Review URL: https://chromiumcodereview.appspot.com/11413123
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/fake_layer_tree_host_client.cc | 5 | ||||
| -rw-r--r-- | cc/test/fake_layer_tree_host_client.h | 3 | ||||
| -rw-r--r-- | cc/test/layer_tree_test_common.cc | 7 |
3 files changed, 15 insertions, 0 deletions
diff --git a/cc/test/fake_layer_tree_host_client.cc b/cc/test/fake_layer_tree_host_client.cc index cddece1..030142b 100644 --- a/cc/test/fake_layer_tree_host_client.cc +++ b/cc/test/fake_layer_tree_host_client.cc @@ -17,4 +17,9 @@ scoped_ptr<InputHandler> FakeLayerImplTreeHostClient::createInputHandler() return scoped_ptr<InputHandler>(); } +scoped_ptr<FontAtlas> FakeLayerImplTreeHostClient::createFontAtlas() +{ + return scoped_ptr<FontAtlas>(); +} + } diff --git a/cc/test/fake_layer_tree_host_client.h b/cc/test/fake_layer_tree_host_client.h index 5ca8168..321e926 100644 --- a/cc/test/fake_layer_tree_host_client.h +++ b/cc/test/fake_layer_tree_host_client.h @@ -5,6 +5,7 @@ #define CC_TEST_FAKE_LAYER_TREE_HOST_CLIENT_H_ #include "base/memory/scoped_ptr.h" +#include "cc/font_atlas.h" #include "cc/input_handler.h" #include "cc/layer_tree_host.h" #include "cc/test/compositor_fake_web_graphics_context_3d.h" @@ -30,6 +31,8 @@ public: // Used only in the single-threaded path. virtual void scheduleComposite() OVERRIDE { } + + virtual scoped_ptr<FontAtlas> createFontAtlas() OVERRIDE; }; } diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc index 8be9cf9..f24d8e6 100644 --- a/cc/test/layer_tree_test_common.cc +++ b/cc/test/layer_tree_test_common.cc @@ -7,6 +7,7 @@ #include "base/stl_util.h" #include "cc/active_animation.h" #include "cc/content_layer.h" +#include "cc/font_atlas.h" #include "cc/input_handler.h" #include "cc/layer.h" #include "cc/layer_animation_controller.h" @@ -25,6 +26,7 @@ #include <public/WebFilterOperation.h> #include <public/WebFilterOperations.h> +using cc::FontAtlas; using cc::InputHandler; using cc::Layer; using cc::LayerTreeHostImplClient; @@ -263,6 +265,11 @@ public: m_testHooks->scheduleComposite(); } + virtual scoped_ptr<FontAtlas> createFontAtlas() OVERRIDE + { + return scoped_ptr<FontAtlas>(); + } + private: explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks(testHooks) { } |