diff options
| -rw-r--r-- | cc/cc.gyp | 2 | ||||
| -rw-r--r-- | cc/cc_tests.gyp | 2 | ||||
| -rw-r--r-- | cc/output/geometry_binding.cc | 14 |
3 files changed, 9 insertions, 9 deletions
@@ -4,7 +4,7 @@ { 'variables': { - 'chromium_code': 0, + 'chromium_code': 1, 'cc_source_files': [ 'animation/animation.cc', 'animation/animation.h', diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 2f790a7..a32483e 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -4,7 +4,7 @@ { 'variables': { - 'chromium_code': 0, + 'chromium_code': 1, 'cc_unit_tests_source_files': [ 'animation/animation_unittest.cc', 'layers/content_layer_unittest.cc', diff --git a/cc/output/geometry_binding.cc b/cc/output/geometry_binding.cc index f1092ce..e3bf590 100644 --- a/cc/output/geometry_binding.cc +++ b/cc/output/geometry_binding.cc @@ -26,7 +26,7 @@ GeometryBinding::GeometryBinding(WebKit::WebGraphicsContext3D* context, Vertex v0, v1, v2, v3; }; struct QuadIndex { - uint16_t data[6]; + uint16 data[6]; }; COMPILE_ASSERT( @@ -55,12 +55,12 @@ GeometryBinding::GeometryBinding(WebKit::WebGraphicsContext3D* context, i * 4.0f + 3.0f }; Quad x = { v0, v1, v2, v3 }; quad_list[i] = x; - QuadIndex y = { { 0 + 4 * i, - 1 + 4 * i, - 2 + 4 * i, - 3 + 4 * i, - 0 + 4 * i, - 2 + 4 * i } }; + QuadIndex y = { { static_cast<uint16>(0 + 4 * i), + static_cast<uint16>(1 + 4 * i), + static_cast<uint16>(2 + 4 * i), + static_cast<uint16>(3 + 4 * i), + static_cast<uint16>(0 + 4 * i), + static_cast<uint16>(2 + 4 * i) } }; quad_index_list[i] = y; } |