Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / cc / layers / video_layer_impl.cc

diff --git a/src/cc/layers/video_layer_impl.cc b/src/cc/layers/video_layer_impl.cc
index e6e54a1..dad3159 100644 (file)
--- a/src/cc/layers/video_layer_impl.cc
+++ b/src/cc/layers/video_layer_impl.cc
@@ -128,8 +128,9 @@ void VideoLayerImpl::AppendQuads(QuadSink* quad_sink,
                                  AppendQuadsData* append_quads_data) {
   DCHECK(frame_.get());
 
-  SharedQuadState* shared_quad_state =
-      quad_sink->UseSharedQuadState(CreateSharedQuadState());
+  SharedQuadState* shared_quad_state = quad_sink->CreateSharedQuadState();
+  PopulateSharedQuadState(shared_quad_state);
+
   AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data);
 
   gfx::Rect quad_rect(content_bounds());
@@ -183,6 +184,10 @@ void VideoLayerImpl::AppendQuads(QuadSink* quad_sink,
       DCHECK_GE(frame_resources_.size(), 3u);
       if (frame_resources_.size() < 3u)
         break;
+      YUVVideoDrawQuad::ColorSpace color_space =
+          frame_->format() == media::VideoFrame::YV12J
+              ? YUVVideoDrawQuad::REC_601_JPEG
+              : YUVVideoDrawQuad::REC_601;
       gfx::RectF tex_coord_rect(
           tex_x_offset, tex_y_offset, tex_width_scale, tex_height_scale);
       scoped_ptr<YUVVideoDrawQuad> yuv_video_quad = YUVVideoDrawQuad::Create();
@@ -195,7 +200,8 @@ void VideoLayerImpl::AppendQuads(QuadSink* quad_sink,
           frame_resources_[0],
           frame_resources_[1],
           frame_resources_[2],
-          frame_resources_.size() > 3 ? frame_resources_[3] : 0);
+          frame_resources_.size() > 3 ? frame_resources_[3] : 0,
+          color_space);
       quad_sink->Append(yuv_video_quad.PassAs<DrawQuad>());
       break;
     }