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

webkit/media/webvideoframe_impl.cc

 // 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 "webkit/media/webvideoframe_impl.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 
@@ skipping 30 matching lines @@
 COMPILE_ASSERT_MATCHING_ENUM(FormatNativeTexture, NATIVE_TEXTURE);
 
 WebVideoFrame::Format WebVideoFrameImpl::format() const {
   if (video_frame_.get())
     return static_cast<WebVideoFrame::Format>(video_frame_->format());
   return WebVideoFrame::FormatInvalid;
 }
 
 unsigned WebVideoFrameImpl::width() const {
   if (video_frame_.get())
-    return video_frame_->width();
+    return video_frame_->data_size().width();
   return 0;
 }
 
 unsigned WebVideoFrameImpl::height() const {
   if (video_frame_.get())
-    return video_frame_->height();
+    return video_frame_->data_size().height();
   return 0;
 }
 
 unsigned WebVideoFrameImpl::planes() const {
   if (!video_frame_.get())
     return 0;
   switch (video_frame_->format()) {
     case media::VideoFrame::RGB32:
       return 1;
     case media::VideoFrame::YV12:
@@ skipping 28 matching lines @@
   return video_frame_->texture_id();
 }
 
 unsigned WebVideoFrameImpl::textureTarget() const {
   if (!video_frame_.get() || format() != FormatNativeTexture)
     return 0;
   return video_frame_->texture_target();
 }
 
 }  // namespace webkit_media