summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangxianzhu <wangxianzhu@chromium.org>2015-06-29 12:35:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-29 19:36:18 +0000
commite9f3a8f5af8316c8550d59d233a502c17df846e4 (patch)
tree71804f3d629288881a6627447e0c3d7d3c205efa
parent3401f2836863aaee76e2115bc502820a149774c9 (diff)
downloadchromium_src-e9f3a8f5af8316c8550d59d233a502c17df846e4.zip
chromium_src-e9f3a8f5af8316c8550d59d233a502c17df846e4.tar.gz
chromium_src-e9f3a8f5af8316c8550d59d233a502c17df846e4.tar.bz2
Change wrong BeginDictionary() to BeginArray in RenderPassDrawQuad::ExtentValue()
The original code caused DCHECK failure when converting a RenderPassDrawQuad to TracedValue because FilterOperations::AsValueInto expects an array context. CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1213253002 Cr-Commit-Position: refs/heads/master@{#336615}
-rw-r--r--cc/quads/render_pass_draw_quad.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/quads/render_pass_draw_quad.cc b/cc/quads/render_pass_draw_quad.cc
index 1b03ec8..47c976b 100644
--- a/cc/quads/render_pass_draw_quad.cc
+++ b/cc/quads/render_pass_draw_quad.cc
@@ -93,9 +93,9 @@ void RenderPassDrawQuad::ExtendValue(
MathUtil::AddToTracedValue("mask_texture_size", mask_texture_size, value);
MathUtil::AddToTracedValue("mask_uv_scale", mask_uv_scale, value);
- value->BeginDictionary("filters");
+ value->BeginArray("filters");
filters.AsValueInto(value);
- value->EndDictionary();
+ value->EndArray();
MathUtil::AddToTracedValue("filters_scale", filters_scale, value);
value->BeginDictionary("background_filters");