Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3825)

Unified Diff: cc/layers/video_layer_impl.cc

Issue 13206004: cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/tiled_layer_unittest.cc ('k') | cc/output/delegating_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/video_layer_impl.cc
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc
index a0bfda1f1ab7e0b29a9cdfe6dcda67dd86c35ab7..f87cacc628d1041b487cbde117c9362c5607f32f 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;
+ return resource_id != 0;
}
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, GL_LUMINANCE);
+ DCHECK_EQ(plane.format, static_cast<unsigned>(GL_LUMINANCE));
const uint8_t* software_plane_pixels = frame_->data(plane_index);
gfx::Rect image_rect(0,
0,
« no previous file with comments | « cc/layers/tiled_layer_unittest.cc ('k') | cc/output/delegating_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698