summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_tree_json_parser.cc
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 00:16:16 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 00:16:16 +0000
commitd993e033fecdb11e600dfb2e6770c5cf76fd4b72 (patch)
tree1a5b15ce198c0b8f151aae4a42d1ca968e6cf8d6 /cc/test/layer_tree_json_parser.cc
parent0dd13cb7686e3b5500bc15a3ac876ae65eb9b484 (diff)
downloadchromium_src-d993e033fecdb11e600dfb2e6770c5cf76fd4b72.zip
chromium_src-d993e033fecdb11e600dfb2e6770c5cf76fd4b72.tar.gz
chromium_src-d993e033fecdb11e600dfb2e6770c5cf76fd4b72.tar.bz2
cc: Add page scale zooming perf test
R=danakj@chromium.org BUG=none Review URL: https://chromiumcodereview.appspot.com/16352005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_json_parser.cc')
-rw-r--r--cc/test/layer_tree_json_parser.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index de7fc70..669010e 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -77,6 +77,10 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
if (dict->GetDouble("Opacity", &opacity))
new_layer->SetOpacity(opacity);
+ bool scrollable;
+ if (dict->GetBoolean("Scrollable", &scrollable))
+ new_layer->SetScrollable(scrollable);
+
success &= dict->GetList("DrawTransform", &list);
double transform[16];
for (int i = 0; i < 16; ++i)