Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / cc / quads / picture_draw_quad.cc

diff --git a/src/cc/quads/picture_draw_quad.cc b/src/cc/quads/picture_draw_quad.cc
index 37bb07e..af120a4 100644 (file)
--- a/src/cc/quads/picture_draw_quad.cc
+++ b/src/cc/quads/picture_draw_quad.cc
@@ -4,6 +4,7 @@
 
 #include "cc/quads/picture_draw_quad.h"
 
+#include "base/debug/trace_event_argument.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/resources/platform_color.h"
@@ -16,10 +17,6 @@ PictureDrawQuad::PictureDrawQuad() {
 PictureDrawQuad::~PictureDrawQuad() {
 }
 
-scoped_ptr<PictureDrawQuad> PictureDrawQuad::Create() {
-  return make_scoped_ptr(new PictureDrawQuad);
-}
-
 void PictureDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
                              const gfx::Rect& rect,
                              const gfx::Rect& opaque_rect,
@@ -83,9 +80,11 @@ const PictureDrawQuad* PictureDrawQuad::MaterialCast(const DrawQuad* quad) {
   return static_cast<const PictureDrawQuad*>(quad);
 }
 
-void PictureDrawQuad::ExtendValue(base::DictionaryValue* value) const {
+void PictureDrawQuad::ExtendValue(base::debug::TracedValue* value) const {
   ContentDrawQuadBase::ExtendValue(value);
-  value->Set("content_rect", MathUtil::AsValue(content_rect).release());
+  value->BeginArray("content_rect");
+  MathUtil::AddToTracedValue(content_rect, value);
+  value->EndArray();
   value->SetDouble("contents_scale", contents_scale);
   value->SetInteger("texture_format", texture_format);
   // TODO(piman): picture_pile?