summaryrefslogtreecommitdiffstats
path: root/cc/test/layer_tree_json_parser.cc
diff options
context:
space:
mode:
authorthildebr@chromium.org <thildebr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-19 06:49:28 +0000
committerthildebr@chromium.org <thildebr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-19 06:49:28 +0000
commita9d4d4f8ff5b837ff736c6019aae93386582e4d3 (patch)
tree3c2268be6b030bba8385dba19435ac002ed7ae92 /cc/test/layer_tree_json_parser.cc
parent696bfd03c9ca0be794b3189cea1f6bd7ed16d5ba (diff)
downloadchromium_src-a9d4d4f8ff5b837ff736c6019aae93386582e4d3.zip
chromium_src-a9d4d4f8ff5b837ff736c6019aae93386582e4d3.tar.gz
chromium_src-a9d4d4f8ff5b837ff736c6019aae93386582e4d3.tar.bz2
Rendering context information added to SharedQuadState
Context IDs given to DrawQuads to identify when a rendering context changes, and whether or not a DrawQuad is in a 3D sorting context. Review URL: https://codereview.chromium.org/332873005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_json_parser.cc')
-rw-r--r--cc/test/layer_tree_json_parser.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index e94bbea..f177e118 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -130,8 +130,10 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
new_layer->SetHaveScrollEventHandlers(scroll_handler);
bool is_3d_sorted;
- if (dict->GetBoolean("Is3DSorted", &is_3d_sorted))
- new_layer->SetIs3dSorted(is_3d_sorted);
+ if (dict->GetBoolean("Is3DSorted", &is_3d_sorted)) {
+ // A non-zero context ID will put the layer into a 3D sorting context
+ new_layer->Set3dSortingContextId(1);
+ }
if (dict->HasKey("TouchRegion")) {
success &= dict->GetList("TouchRegion", &list);