Revert 113895 - <video> decode in hardware!

webkit/media/webvideoframe_impl.cc

 // 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.
 
 #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 25 matching lines @@
 COMPILE_ASSERT_MATCHING_ENUM(FormatRGB555, RGB555);
 COMPILE_ASSERT_MATCHING_ENUM(FormatRGB565, RGB565);
 COMPILE_ASSERT_MATCHING_ENUM(FormatRGB24, RGB24);
 COMPILE_ASSERT_MATCHING_ENUM(FormatRGB32, RGB32);
 COMPILE_ASSERT_MATCHING_ENUM(FormatRGBA, RGBA);
 COMPILE_ASSERT_MATCHING_ENUM(FormatYV12, YV12);
 COMPILE_ASSERT_MATCHING_ENUM(FormatYV16, YV16);
 COMPILE_ASSERT_MATCHING_ENUM(FormatNV12, NV12);
 COMPILE_ASSERT_MATCHING_ENUM(FormatEmpty, EMPTY);
 COMPILE_ASSERT_MATCHING_ENUM(FormatASCII, ASCII);
-COMPILE_ASSERT_MATCHING_ENUM(FormatI420, I420);
-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();
@@ skipping 12 matching lines @@
   return 0;
 }
 
 int WebVideoFrameImpl::stride(unsigned plane) const {
   if (video_frame_.get())
     return static_cast<int>(video_frame_->stride(plane));
   return 0;
 }
 
 const void* WebVideoFrameImpl::data(unsigned plane) const {
-  if (!video_frame_.get() || format() == FormatNativeTexture)
-    return NULL;
-  return static_cast<const void*>(video_frame_->data(plane));
-}
-
-unsigned WebVideoFrameImpl::textureId() const {
-  if (!video_frame_.get() || format() != FormatNativeTexture)
-    return 0;
-  return video_frame_->texture_id();
+  if (video_frame_.get())
+    return static_cast<const void*>(video_frame_->data(plane));
+  return NULL;
 }
 
 }  // namespace webkit_media