cc/test/layer_tree_json_parser.cc - Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL

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_json_parser.cc

Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Backup 2013.10.29 Created 7 years, 2 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_json_parser.cc

diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc

index af24571be9f0fd21891311562e38a66fbd84970e..5cb507e500d22d3c9b94593a76ca0e5ae62531c3 100644

--- a/cc/test/layer_tree_json_parser.cc

+++ b/cc/test/layer_tree_json_parser.cc

@@ -101,8 +101,9 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,

new_layer->SetContentsOpaque(contents_opaque);

bool scrollable;

+ // TODO(wjmaclean) Fix the JSON layer parsing format.

if (dict->GetBoolean("Scrollable", &scrollable))

- new_layer->SetScrollable(scrollable);

+ new_layer->SetScrollable(scrollable ? new_layer.get() : NULL);

success &= dict->GetList("DrawTransform", &list);

double transform[16];