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

Unified Diff: cc/test/layer_tree_test_common.cc

Issue 11413123: cc: switch to new WebLayerTreeViewClient API for requesting font atlas (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixing tests 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
Index: cc/test/layer_tree_test_common.cc
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index 8be9cf95a54714ff710a6c5d4d30a04189c8cbd8..f24d8e687e6be4bad8fb0f8fbe5ea12924edb821 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) { }

Powered by Google App Engine
This is Rietveld 408576698