Removing WebVideoFrameImpl::texture() and WebVideoFrameImpl::surfaceType().

They're no longer defined as of WebKit r91584.

Review URL: http://codereview.chromium.org/7495017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93954 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 20 deletions

diff --git a/webkit/glue/webvideoframe_impl.cc b/webkit/glue/webvideoframe_impl.cc
index f93386b..4440371 100644
--- a/webkit/glue/webvideoframe_impl.cc
+++ b/webkit/glue/webvideoframe_impl.cc
@@ -44,11 +44,6 @@ COMPILE_ASSERT_MATCHING_ENUM(FormatNV12, NV12);
 COMPILE_ASSERT_MATCHING_ENUM(FormatEmpty, EMPTY);
 COMPILE_ASSERT_MATCHING_ENUM(FormatASCII, ASCII);
 
-// TODO(scherkus): remove WebVideoFrame::SurfaceType from upstream WebKit.
-WebVideoFrame::SurfaceType WebVideoFrameImpl::surfaceType() const {
-  return WebVideoFrame::SurfaceTypeSystemMemory;
-}
-
 WebVideoFrame::Format WebVideoFrameImpl::format() const {
   if (video_frame_.get())
     return static_cast<WebVideoFrame::Format>(video_frame_->format());
@@ -85,10 +80,4 @@ const void* WebVideoFrameImpl::data(unsigned plane) const {
   return NULL;
 }
 
-// TODO(scherkus): remove WebVideoFrame::texture() from upstream WebKit.
-unsigned WebVideoFrameImpl::texture(unsigned plane) const {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
 }  // namespace webkit_glue
diff --git a/webkit/glue/webvideoframe_impl.h b/webkit/glue/webvideoframe_impl.h
index 52f7f1f..9cdf691 100644
--- a/webkit/glue/webvideoframe_impl.h
+++ b/webkit/glue/webvideoframe_impl.h
@@ -1,10 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 #ifndef WEBKIT_GLUE_WEBVIDEOFRAME_IMPL_H_
 #define WEBKIT_GLUE_WEBVIDEOFRAME_IMPL_H_
 
+#include "base/compiler_specific.h"
 #include "media/base/video_frame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 
@@ -18,14 +19,12 @@ class WebVideoFrameImpl : public WebKit::WebVideoFrame {
 
   WebVideoFrameImpl(scoped_refptr<media::VideoFrame> video_frame);
   virtual ~WebVideoFrameImpl();
-  virtual WebVideoFrame::SurfaceType surfaceType() const;
-  virtual WebVideoFrame::Format format() const;
-  virtual unsigned width() const;
-  virtual unsigned height() const;
-  virtual unsigned planes() const;
-  virtual int stride(unsigned plane) const;
-  virtual const void* data(unsigned plane) const;
-  virtual unsigned texture(unsigned plane) const;
+  virtual WebVideoFrame::Format format() const OVERRIDE;
+  virtual unsigned width() const OVERRIDE;
+  virtual unsigned height() const OVERRIDE;
+  virtual unsigned planes() const OVERRIDE;
+  virtual int stride(unsigned plane) const OVERRIDE;
+  virtual const void* data(unsigned plane) const OVERRIDE;
 
  private:
   scoped_refptr<media::VideoFrame> video_frame_;