Revert 113895 - <video> decode in hardware!

webkit/media/webvideoframe_impl.cc

Index: webkit/media/webvideoframe_impl.cc
===================================================================
--- webkit/media/webvideoframe_impl.cc	(revision 113907)
+++ webkit/media/webvideoframe_impl.cc	(working copy)
@@ -43,8 +43,6 @@
 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())
@@ -77,15 +75,9 @@
 }
 
 const void* WebVideoFrameImpl::data(unsigned plane) const {
-  if (!video_frame_.get() || format() == FormatNativeTexture)
-    return NULL;
-  return static_cast<const void*>(video_frame_->data(plane));
+  if (video_frame_.get())
+    return static_cast<const void*>(video_frame_->data(plane));
+  return NULL;
 }
 
-unsigned WebVideoFrameImpl::textureId() const {
-  if (!video_frame_.get() || format() != FormatNativeTexture)
-    return 0;
-  return video_frame_->texture_id();
-}
-
 }  // namespace webkit_media
Property changes on: webkit/media/webvideoframe_impl.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/media/webvideoframe_impl.cc:r3734-4217,4606-5108,5177-5263