Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

cc/layers/video_layer_impl.cc

 // Copyright 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 "cc/layers/video_layer_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/quads/io_surface_draw_quad.h"
@@ skipping 215 matching lines @@
           color_space = YUVVideoDrawQuad::JPEG;
         } else if (videoframe_color_space ==
                    media::VideoFrame::COLOR_SPACE_HD_REC709) {
           color_space = YUVVideoDrawQuad::REC_709;
         }
       }
 
       const gfx::Size ya_tex_size = coded_size;
       gfx::Size uv_tex_size;
 
-      if (frame_->format() == media::VideoFrame::NATIVE_TEXTURE) {
-        DCHECK_EQ(media::VideoFrame::TEXTURE_YUV_420, frame_->texture_format());
+      if (frame_->storage_type() == media::VideoFrame::STORAGE_TEXTURE) {
+        DCHECK_EQ(media::VideoFrame::I420, frame_->format());
         DCHECK_EQ(3u, frame_resources_.size());  // Alpha is not supported yet.
         DCHECK(visible_rect.origin().IsOrigin());
         DCHECK(visible_rect.size() == coded_size);
         uv_tex_size.SetSize((ya_tex_size.width() + 1) / 2,
                             (ya_tex_size.height() + 1) / 2);
       } else {
         uv_tex_size = media::VideoFrame::PlaneSize(
             frame_->format(), media::VideoFrame::kUPlane, coded_size);
         DCHECK(uv_tex_size ==
                media::VideoFrame::PlaneSize(
@@ skipping 159 matching lines @@
 void VideoLayerImpl::SetNeedsRedraw() {
   SetUpdateRect(gfx::UnionRects(update_rect(), gfx::Rect(bounds())));
   layer_tree_impl()->SetNeedsRedraw();
 }
 
 const char* VideoLayerImpl::LayerTypeAsString() const {
   return "cc::VideoLayerImpl";
 }
 
 }  // namespace cc