cc/test/layer_tree_test_common.cc - Issue 12212099: cc: remove FontAtlas

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/test/layer_tree_test_common.cc

Issue 12212099: cc: remove FontAtlas (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase to 182043 Created 7 years, 10 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:

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 052fef3746f8cf64ef5a9524f8d141e90a7caf7e..4bd689c70cfae20a5a3ba6204b275f2b26719445 100644

--- a/cc/test/layer_tree_test_common.cc

+++ b/cc/test/layer_tree_test_common.cc

@@ -7,7 +7,6 @@

#include "cc/animation.h"

#include "cc/animation_registrar.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"

@@ -227,11 +226,6 @@ public:

m_testHooks->scheduleComposite();

}

- virtual scoped_ptr<FontAtlas> createFontAtlas() OVERRIDE

- {

- return scoped_ptr<FontAtlas>();

- }

private:

explicit ThreadedMockLayerTreeHostClient(TestHooks* testHooks) : m_testHooks(testHooks) { }