Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

media/tools/player_x11/x11_video_renderer.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/tools/player_x11/x11_video_renderer.h"
 
 #include <dlfcn.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xrender.h>
 #include <X11/extensions/Xcomposite.h>
 
@@ skipping 65 matching lines @@
 }
 
 X11VideoRenderer::~X11VideoRenderer() {
   if (image_)
     XDestroyImage(image_);
   if (use_render_)
     XRenderFreePicture(display_, picture_);
 }
 
 void X11VideoRenderer::Paint(media::VideoFrame* video_frame) {
-  int width = video_frame->width();
-  int height = video_frame->height();
+  int width = video_frame->data_size().width();
+  int height = video_frame->data_size().height();
 
   if (!image_)
     Initialize(width, height);
 
   // Check if we need to reallocate our XImage.
   if (image_->width != width || image_->height != height) {
     XDestroyImage(image_);
     image_ = CreateImage(display_, width, height);
   }
 
   // Convert YUV frame to RGB.
   DCHECK(video_frame->format() == media::VideoFrame::YV12 ||
          video_frame->format() == media::VideoFrame::YV16);
   DCHECK(video_frame->stride(media::VideoFrame::kUPlane) ==
          video_frame->stride(media::VideoFrame::kVPlane));
 
   DCHECK(image_->data);
   media::YUVType yuv_type =
       (video_frame->format() == media::VideoFrame::YV12) ?
       media::YV12 : media::YV16;
   media::ConvertYUVToRGB32(video_frame->data(media::VideoFrame::kYPlane),
                            video_frame->data(media::VideoFrame::kUPlane),
                            video_frame->data(media::VideoFrame::kVPlane),
                            (uint8*)image_->data,
-                           video_frame->width(),
-                           video_frame->height(),
+                           video_frame->data_size().width(),
+                           video_frame->data_size().height(),
                            video_frame->stride(media::VideoFrame::kYPlane),
                            video_frame->stride(media::VideoFrame::kUPlane),
                            image_->bytes_per_line,
                            yuv_type);
 
   if (use_render_) {
     // If XRender is used, we'll upload the image to a pixmap. And then
     // creats a picture from the pixmap and composite the picture over
     // the picture represending the window.
 
@@ skipping 75 matching lines @@
 
     XRenderPictFormat* pictformat = XRenderFindVisualFormat(
         display_,
         attr.visual);
     CHECK(pictformat) << "XRender does not support default visual";
 
     picture_ = XRenderCreatePicture(display_, window_, pictformat, 0, NULL);
     CHECK(picture_) << "Backing picture not created";
   }
 }