Revert 191400 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/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/logging.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/quad_sink.h"
 #include "cc/layers/video_frame_provider_client_impl.h"
@@ skipping 336 matching lines @@
   return dimensions;
 }
 
 bool VideoLayerImpl::FramePlane::AllocateData(
     ResourceProvider* resource_provider) {
   if (resource_id)
     return true;
 
   resource_id = resource_provider->CreateResource(
       size, format, ResourceProvider::TextureUsageAny);
-  return resource_id != 0;
+  return resource_id;
 }
 
 void VideoLayerImpl::FramePlane::FreeData(ResourceProvider* resource_provider) {
   if (!resource_id)
     return;
 
   resource_provider->DeleteResource(resource_id);
   resource_id = 0;
 }
 
@@ skipping 56 matching lines @@
     video_renderer_->Paint(frame_,
                            lock.sk_canvas(),
                            frame_->visible_rect(),
                            0xff);
     return true;
   }
 
   for (size_t plane_index = 0; plane_index < plane_count; ++plane_index) {
     const VideoLayerImpl::FramePlane& plane = frame_planes_[plane_index];
     // Only planar formats planes should need upload.
-    DCHECK_EQ(plane.format, static_cast<unsigned>(GL_LUMINANCE));
+    DCHECK_EQ(plane.format, GL_LUMINANCE);
     const uint8_t* software_plane_pixels = frame_->data(plane_index);
     gfx::Rect image_rect(0,
                          0,
                          frame_->stride(plane_index),
                          plane.size.height());
     gfx::Rect source_rect(plane.size);
     resource_provider->SetPixels(plane.resource_id,
                                  software_plane_pixels,
                                  image_rect,
                                  source_rect,
@@ skipping 27 matching lines @@
 void VideoLayerImpl::SetProviderClientImpl(
     scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl) {
   provider_client_impl_ = provider_client_impl;
 }
 
 const char* VideoLayerImpl::LayerTypeAsString() const {
   return "VideoLayer";
 }
 
 }  // namespace cc