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

CrOS bots are unhappy

> cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp
> 
> And fix compile errors that it causes.
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=191364
> 
> Review URL: https://codereview.chromium.org/13206004

TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/13334005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191414 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 31 insertions, 33 deletions

diff --git a/cc/output/delegating_renderer.cc b/cc/output/delegating_renderer.cc
index a1763e3..997b699 100644
--- a/cc/output/delegating_renderer.cc
+++ b/cc/output/delegating_renderer.cc
@@ -85,6 +85,7 @@ bool DelegatingRenderer::Initialize() {
   bool has_set_visibility = true;
   bool has_io_surface = true;
   bool has_arb_texture_rect = true;
+  bool has_gpu_memory_manager = true;
   bool has_egl_image = true;
   for (size_t i = 0; i < extensions.size(); ++i) {
     if (extensions[i] == "GL_EXT_read_format_bgra")
@@ -95,6 +96,8 @@ bool DelegatingRenderer::Initialize() {
       has_io_surface = true;
     else if (extensions[i] == "GL_ARB_texture_rectangle")
       has_arb_texture_rect = true;
+    else if (extensions[i] == "GL_CHROMIUM_gpu_memory_manager")
+      has_gpu_memory_manager = true;
     else if (extensions[i] == "GL_OES_EGL_image_external")
       has_egl_image = true;
   }
diff --git a/cc/output/geometry_binding.cc b/cc/output/geometry_binding.cc
index f1092ce..20bd666 100644
--- a/cc/output/geometry_binding.cc
+++ b/cc/output/geometry_binding.cc
@@ -16,6 +16,14 @@ GeometryBinding::GeometryBinding(WebKit::WebGraphicsContext3D* context,
     : context_(context),
       quad_vertices_vbo_(0),
       quad_elements_vbo_(0) {
+  float vertices[] = {
+      quad_vertex_rect.x(), quad_vertex_rect.bottom(), 0.0f, 0.0f,
+      1.0f, quad_vertex_rect.x(), quad_vertex_rect.y(), 0.0f,
+      0.0f, 0.0f, quad_vertex_rect.right(), quad_vertex_rect.y(),
+      0.0f, 1.0f, 0.0f, quad_vertex_rect.right(),
+      quad_vertex_rect.bottom(), 0.0f, 1.0f, 1.0f
+  };
+
   struct Vertex {
     float a_position[3];
     float a_texCoord[2];
@@ -39,28 +47,18 @@ GeometryBinding::GeometryBinding(WebKit::WebGraphicsContext3D* context,
   Quad quad_list[8];
   QuadIndex quad_index_list[8];
   for (int i = 0; i < 8; i++) {
-    Vertex v0 = { { quad_vertex_rect.x(), quad_vertex_rect.bottom(), 0.0f, },
-                  { 0.0f, 1.0f, },
-                  i * 4.0f + 0.0f };
-    Vertex v1 = { { quad_vertex_rect.x(), quad_vertex_rect.y(), 0.0f, },
-                  { 0.0f, 0.0f, },
+    Vertex v0 = { quad_vertex_rect.x(), quad_vertex_rect.bottom(), 0.0f, 0.0f,
+                  1.0f, i * 4.0f + 0.0f };
+    Vertex v1 = { quad_vertex_rect.x(), quad_vertex_rect.y(), 0.0f, 0.0f, 0.0f,
                   i * 4.0f + 1.0f };
-    Vertex v2 = { { quad_vertex_rect.right(), quad_vertex_rect.y(), 0.0f, },
-                  { 1.0f, .0f, },
-                  i * 4.0f + 2.0f };
-    Vertex v3 = { { quad_vertex_rect.right(),
-                    quad_vertex_rect.bottom(),
-                    0.0f, },
-                  { 1.0f, 1.0f, },
-                  i * 4.0f + 3.0f };
+    Vertex v2 = { quad_vertex_rect.right(), quad_vertex_rect.y(), 0.0f, 1.0f,
+                  0.0f, i * 4.0f + 2.0f };
+    Vertex v3 = { quad_vertex_rect.right(), quad_vertex_rect.bottom(), 0.0f,
+                  1.0f, 1.0f, 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 = { 0 + 4 * i, 1 + 4 * i, 2 + 4 * i, 3 + 4 * i, 0 + 4 * i,
+                    2 + 4 * i };
     quad_index_list[i] = y;
   }
 
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 6d35914..4eac4cd 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -140,24 +140,23 @@ bool GLRenderer::Initialize() {
   // Use the SwapBuffers callback only with the threaded proxy.
   if (client_->HasImplThread())
     capabilities_.using_swap_complete_callback =
-        extensions.count("GL_CHROMIUM_swapbuffers_complete_callback") > 0;
+        extensions.count("GL_CHROMIUM_swapbuffers_complete_callback");
   if (capabilities_.using_swap_complete_callback)
     context_->setSwapBuffersCompleteCallbackCHROMIUM(this);
 
   capabilities_.using_set_visibility =
-      extensions.count("GL_CHROMIUM_set_visibility") > 0;
+      extensions.count("GL_CHROMIUM_set_visibility");
 
-  if (extensions.count("GL_CHROMIUM_iosurface") > 0)
-    DCHECK(extensions.count("GL_ARB_texture_rectangle") > 0);
+  if (extensions.count("GL_CHROMIUM_iosurface"))
+    DCHECK(extensions.count("GL_ARB_texture_rectangle"));
 
   capabilities_.using_gpu_memory_manager =
-      extensions.count("GL_CHROMIUM_gpu_memory_manager") > 0 &&
+      extensions.count("GL_CHROMIUM_gpu_memory_manager") &&
       Settings().use_memory_management;
   if (capabilities_.using_gpu_memory_manager)
     context_->setMemoryAllocationChangedCallbackCHROMIUM(this);
 
-  capabilities_.using_egl_image =
-      extensions.count("GL_OES_EGL_image_external") > 0;
+  capabilities_.using_egl_image = extensions.count("GL_OES_EGL_image_external");
 
   capabilities_.max_texture_size = resource_provider_->max_texture_size();
   capabilities_.best_texture_format = resource_provider_->best_texture_format();
@@ -168,12 +167,12 @@ bool GLRenderer::Initialize() {
   // Check for texture fast paths. Currently we always use MO8 textures,
   // so we only need to avoid POT textures if we have an NPOT fast-path.
   capabilities_.avoid_pow2_textures =
-      extensions.count("GL_CHROMIUM_fast_NPOT_MO8_textures") > 0;
+      extensions.count("GL_CHROMIUM_fast_NPOT_MO8_textures");
 
   capabilities_.using_offscreen_context3d = true;
 
   is_using_bind_uniform_ =
-      extensions.count("GL_CHROMIUM_bind_uniform_location") > 0;
+      extensions.count("GL_CHROMIUM_bind_uniform_location");
 
   // Make sure scissoring starts as disabled.
   GLC(context_, context_->disable(GL_SCISSOR_TEST));
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 9bbed71..9a7f281 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -861,7 +861,7 @@ TEST(GLRendererTest2, ActiveTextureState) {
 
   cc::DirectRenderer::DrawingFrame drawing_frame;
   renderer.BeginDrawingFrame(&drawing_frame);
-  EXPECT_EQ(static_cast<unsigned>(GL_TEXTURE0), context->active_texture());
+  EXPECT_EQ(context->active_texture(), GL_TEXTURE0);
 
   for (cc::QuadList::BackToFrontIterator
            it = pass->quad_list.BackToFrontBegin();
@@ -870,7 +870,7 @@ TEST(GLRendererTest2, ActiveTextureState) {
     renderer.DoDrawQuad(&drawing_frame, *it);
   }
   renderer.FinishDrawingQuadList();
-  EXPECT_EQ(static_cast<unsigned>(GL_TEXTURE0), context->active_texture());
+  EXPECT_EQ(context->active_texture(), GL_TEXTURE0);
   Mock::VerifyAndClearExpectations(context);
 }
 
diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
index 534b46d..9abb7f5 100644
--- a/cc/output/output_surface.cc
+++ b/cc/output/output_surface.cc
@@ -64,7 +64,7 @@ bool OutputSurface::BindToClient(
   set<string> extensions(extensions_list.begin(), extensions_list.end());
 
   has_gl_discard_backbuffer_ =
-      extensions.count("GL_CHROMIUM_discard_backbuffer") > 0;
+      extensions.count("GL_CHROMIUM_discard_backbuffer");
 
   return true;
 }
diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc
index ade2b90..bdef48f 100644
--- a/cc/output/software_renderer_unittest.cc
+++ b/cc/output/software_renderer_unittest.cc
@@ -81,9 +81,7 @@ class SoftwareRendererTest : public testing::Test, public RendererClient {
 
 TEST_F(SoftwareRendererTest, SolidColorQuad) {
   gfx::Size outer_size(100, 100);
-#if !defined(OS_ANDROID)
   int outer_pixels = outer_size.width() * outer_size.height();
-#endif
   gfx::Size inner_size(98, 98);
   gfx::Rect outer_rect(outer_size);
   gfx::Rect inner_rect(gfx::Point(1, 1), inner_size);