cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp

The flag flip will be a follow up once ChromeOS build is sorted out.

Review URL: https://codereview.chromium.org/13206004

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

5 files changed, 32 insertions, 32 deletions

diff --git a/cc/scheduler/frame_rate_controller.cc b/cc/scheduler/frame_rate_controller.cc
index 27b7ba6..93665da 100644
--- a/cc/scheduler/frame_rate_controller.cc
+++ b/cc/scheduler/frame_rate_controller.cc
@@ -39,8 +39,8 @@ FrameRateController::FrameRateController(scoped_refptr<TimeSource> timer)
       active_(false),
       swap_buffers_complete_supported_(true),
       is_time_source_throttling_(true),
-      thread_(NULL),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      thread_(NULL) {
   time_source_client_adapter_ =
       FrameRateControllerTimeSourceAdapter::Create(this);
   time_source_->SetClient(time_source_client_adapter_.get());
@@ -53,8 +53,8 @@ FrameRateController::FrameRateController(Thread* thread)
       active_(false),
       swap_buffers_complete_supported_(true),
       is_time_source_throttling_(false),
-      thread_(thread),
-      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
+      weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+      thread_(thread) {}
 
 FrameRateController::~FrameRateController() {
   if (is_time_source_throttling_)
diff --git a/cc/scheduler/rate_limiter.cc b/cc/scheduler/rate_limiter.cc
index df11acd..3508adf 100644
--- a/cc/scheduler/rate_limiter.cc
+++ b/cc/scheduler/rate_limiter.cc
@@ -20,10 +20,10 @@ scoped_refptr<RateLimiter> RateLimiter::Create(
 RateLimiter::RateLimiter(WebKit::WebGraphicsContext3D* context,
                          RateLimiterClient* client,
                          Thread* thread)
-    : thread_(thread),
-      context_(context),
+    : context_(context),
       active_(false),
-      client_(client) {
+      client_(client),
+      thread_(thread) {
   DCHECK(context);
 }
 
diff --git a/cc/scheduler/texture_uploader.cc b/cc/scheduler/texture_uploader.cc
index dd89e8c..de365de 100644
--- a/cc/scheduler/texture_uploader.cc
+++ b/cc/scheduler/texture_uploader.cc
@@ -33,7 +33,7 @@ static const size_t kUploadHistorySizeInitial = 100;
 static const double kDefaultEstimatedTexturesPerSecond = 48.0 * 60.0;
 
 // Flush interval when performing texture uploads.
-static const int kTextureUploadFlushPeriod = 4;
+static const size_t kTextureUploadFlushPeriod = 4;
 
 }  // anonymous namespace
 
diff --git a/cc/scheduler/texture_uploader_unittest.cc b/cc/scheduler/texture_uploader_unittest.cc
index d5c8e49..f4b4ce6 100644
--- a/cc/scheduler/texture_uploader_unittest.cc
+++ b/cc/scheduler/texture_uploader_unittest.cc
@@ -70,7 +70,7 @@ class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D {
                              WGC3Denum format,
                              WGC3Denum type,
                              const void* pixels) OVERRIDE {
-    EXPECT_EQ(GL_TEXTURE_2D, target);
+    EXPECT_EQ(static_cast<unsigned>(GL_TEXTURE_2D), target);
     EXPECT_EQ(0, level);
     EXPECT_LE(0, width);
     EXPECT_LE(0, height);
@@ -83,12 +83,12 @@ class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D {
     unsigned int bytes_per_pixel = 0;
     switch (format) {
       case GL_ALPHA:
-        EXPECT_EQ(GL_UNSIGNED_BYTE, type);
+        EXPECT_EQ(static_cast<unsigned>(GL_UNSIGNED_BYTE), type);
         bytes_per_pixel = 1;
         break;
       case GL_RGB:
-        EXPECT_NE(GL_UNSIGNED_SHORT_4_4_4_4, type);
-        EXPECT_NE(GL_UNSIGNED_SHORT_5_5_5_1, type);
+        EXPECT_NE(static_cast<unsigned>(GL_UNSIGNED_SHORT_4_4_4_4), type);
+        EXPECT_NE(static_cast<unsigned>(GL_UNSIGNED_SHORT_5_5_5_1), type);
         switch (type) {
           case GL_UNSIGNED_BYTE:
             bytes_per_pixel = 3;
@@ -99,7 +99,7 @@ class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D {
         }
         break;
       case GL_RGBA:
-        EXPECT_NE(GL_UNSIGNED_SHORT_5_6_5, type);
+        EXPECT_NE(static_cast<unsigned>(GL_UNSIGNED_SHORT_5_6_5), type);
         switch (type) {
           case GL_UNSIGNED_BYTE:
             bytes_per_pixel = 4;
@@ -113,11 +113,11 @@ class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D {
         }
         break;
       case GL_LUMINANCE:
-        EXPECT_EQ(GL_UNSIGNED_BYTE, type);
+        EXPECT_EQ(static_cast<unsigned>(GL_UNSIGNED_BYTE), type);
         bytes_per_pixel = 1;
         break;
       case GL_LUMINANCE_ALPHA:
-        EXPECT_EQ(GL_UNSIGNED_BYTE, type);
+        EXPECT_EQ(static_cast<unsigned>(GL_UNSIGNED_BYTE), type);
         bytes_per_pixel = 2;
         break;
     }
@@ -144,8 +144,8 @@ class TestWebGraphicsContext3DTextureUpload : public TestWebGraphicsContext3D {
   }
 
  private:
-  unsigned unpack_alignment_;
   unsigned result_available_;
+  unsigned unpack_alignment_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebGraphicsContext3DTextureUpload);
 };
@@ -169,19 +169,19 @@ TEST(TextureUploaderTest, NumBlockingUploads) {
       TextureUploader::Create(fake_context.get(), false, false);
 
   fake_context->SetResultAvailable(0);
-  EXPECT_EQ(0, uploader->NumBlockingUploads());
+  EXPECT_EQ(0u, uploader->NumBlockingUploads());
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
-  EXPECT_EQ(1, uploader->NumBlockingUploads());
+  EXPECT_EQ(1u, uploader->NumBlockingUploads());
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
-  EXPECT_EQ(2, uploader->NumBlockingUploads());
+  EXPECT_EQ(2u, uploader->NumBlockingUploads());
 
   fake_context->SetResultAvailable(1);
-  EXPECT_EQ(0, uploader->NumBlockingUploads());
+  EXPECT_EQ(0u, uploader->NumBlockingUploads());
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
-  EXPECT_EQ(0, uploader->NumBlockingUploads());
+  EXPECT_EQ(0u, uploader->NumBlockingUploads());
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
-  EXPECT_EQ(0, uploader->NumBlockingUploads());
+  EXPECT_EQ(0u, uploader->NumBlockingUploads());
 }
 
 TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking) {
@@ -191,21 +191,21 @@ TEST(TextureUploaderTest, MarkPendingUploadsAsNonBlocking) {
       TextureUploader::Create(fake_context.get(), false, false);
 
   fake_context->SetResultAvailable(0);
-  EXPECT_EQ(0, uploader->NumBlockingUploads());
+  EXPECT_EQ(0u, uploader->NumBlockingUploads());
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
-  EXPECT_EQ(2, uploader->NumBlockingUploads());
+  EXPECT_EQ(2u, uploader->NumBlockingUploads());
 
   uploader->MarkPendingUploadsAsNonBlocking();
-  EXPECT_EQ(0, uploader->NumBlockingUploads());
+  EXPECT_EQ(0u, uploader->NumBlockingUploads());
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
-  EXPECT_EQ(1, uploader->NumBlockingUploads());
+  EXPECT_EQ(1u, uploader->NumBlockingUploads());
 
   fake_context->SetResultAvailable(1);
-  EXPECT_EQ(0, uploader->NumBlockingUploads());
+  EXPECT_EQ(0u, uploader->NumBlockingUploads());
   UploadTexture(uploader.get(), GL_RGBA, gfx::Size(), NULL);
   uploader->MarkPendingUploadsAsNonBlocking();
-  EXPECT_EQ(0, uploader->NumBlockingUploads());
+  EXPECT_EQ(0u, uploader->NumBlockingUploads());
 }
 
 TEST(TextureUploaderTest, UploadContentsTest) {
diff --git a/cc/scheduler/vsync_time_source.cc b/cc/scheduler/vsync_time_source.cc
index 1483478..75314fb 100644
--- a/cc/scheduler/vsync_time_source.cc
+++ b/cc/scheduler/vsync_time_source.cc
@@ -12,10 +12,10 @@ scoped_refptr<VSyncTimeSource> VSyncTimeSource::Create(
 }
 
 VSyncTimeSource::VSyncTimeSource(VSyncProvider* vsync_provider)
-  : vsync_provider_(vsync_provider)
-  , client_(NULL)
-  , active_(false)
-  , notification_requested_(false) {}
+    : active_(false),
+      notification_requested_(false),
+      vsync_provider_(vsync_provider),
+      client_(NULL) {}
 
 VSyncTimeSource::~VSyncTimeSource() {}