diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:35:04 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 16:35:04 +0000 |
| commit | 060448534ff6b708ec19220c63c4d86efbe87b50 (patch) | |
| tree | 047be1f580e7da573c772006cdd5290ba1cdf824 /cc/layers/video_layer_impl.cc | |
| parent | ed3e277f57affc9b369cb65e3720a1a8ee39b6e1 (diff) | |
| download | chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.zip chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.tar.gz chromium_src-060448534ff6b708ec19220c63c4d86efbe87b50.tar.bz2 | |
Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."
> cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
>
> And fix compile errors that it causes.
>
> Review URL: https://codereview.chromium.org/13206004
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/13316003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/video_layer_impl.cc')
| -rw-r--r-- | cc/layers/video_layer_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc index f87cacc..a0bfda1 100644 --- a/cc/layers/video_layer_impl.cc +++ b/cc/layers/video_layer_impl.cc @@ -354,7 +354,7 @@ bool VideoLayerImpl::FramePlane::AllocateData( resource_id = resource_provider->CreateResource( size, format, ResourceProvider::TextureUsageAny); - return resource_id != 0; + return resource_id; } void VideoLayerImpl::FramePlane::FreeData(ResourceProvider* resource_provider) { @@ -431,7 +431,7 @@ bool VideoLayerImpl::SetupFramePlanes(ResourceProvider* resource_provider) { 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, |