diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-30 20:02:51 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-30 20:02:51 +0000 |
| commit | d09344fde8e7822d9b91a571414f7ef49a36d973 (patch) | |
| tree | 2d111c366d263390184477b638ec635109486b44 /cc/output/geometry_binding.cc | |
| parent | 6f3bfdcd5bd26ed390eec9ec1f623bad26f135de (diff) | |
| download | chromium_src-d09344fde8e7822d9b91a571414f7ef49a36d973.zip chromium_src-d09344fde8e7822d9b91a571414f7ef49a36d973.tar.gz chromium_src-d09344fde8e7822d9b91a571414f7ef49a36d973.tar.bz2 | |
cc: Enable chromium_code:1 for cc.
Most of the build fixes have landed without the flag turned on for
now. This has the remaining fixes to get this flag enabled.
R=jamesr
BUG=
Review URL: https://chromiumcodereview.appspot.com/13297005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/geometry_binding.cc')
| -rw-r--r-- | cc/output/geometry_binding.cc | 14 |
1 files changed, 7 insertions, 7 deletions
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; } |