Fixes for re-enabling more MSVC level 4 warnings: content/renderer/ edition

content/renderer/gpu/compositor_software_output_device.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/gpu/compositor_software_output_device.h"
 
 #include "base/logging.h"
 #include "cc/output/software_frame_data.h"
 #include "content/child/child_shared_bitmap_manager.h"
 #include "content/renderer/render_process.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/gfx/skia_util.h"
 
+namespace {
+
+static const size_t kInvalidIndex = static_cast<size_t>(-1);

[jamesr, 2014/07/07 22:48:07]

the anonymous namespace and the 'static' are redundant, aren't they? could you
pick one?

[Peter Kasting, 2014/07/07 22:52:18]

Yes.  Sorry.  Dropping the "static".

+
+}  // namespace
+
 namespace content {
 
 CompositorSoftwareOutputDevice::Buffer::Buffer(
     unsigned id,
     scoped_ptr<cc::SharedBitmap> bitmap)
     : id_(id), shared_bitmap_(bitmap.Pass()), free_(true), parent_(NULL) {}
 
 CompositorSoftwareOutputDevice::Buffer::~Buffer() {
 }
 
@@ skipping 21 matching lines @@
       *result = damage;
       return true;
     }
     current = current->parent_;
   }
 
   return false;
 }
 
 CompositorSoftwareOutputDevice::CompositorSoftwareOutputDevice()
-    : current_index_(-1),
+    : current_index_(kInvalidIndex),
       next_buffer_id_(1),
       shared_bitmap_manager_(
           RenderThreadImpl::current()->shared_bitmap_manager()) {
   DetachFromThread();
 }
 
 CompositorSoftwareOutputDevice::~CompositorSoftwareOutputDevice() {
   DCHECK(CalledOnValidThread());
 }
 
@@ skipping 36 matching lines @@
 
   // Keep non-ACKed buffers in awaiting_ack_ until they get acknowledged.
   for (size_t i = 0; i < buffers_.size(); ++i) {
     if (!buffers_[i]->free()) {
       awaiting_ack_.push_back(buffers_[i]);
       buffers_[i] = NULL;
     }
   }
 
   buffers_.clear();
-  current_index_ = -1;
+  current_index_ = kInvalidIndex;
   viewport_pixel_size_ = viewport_pixel_size;
 }
 
 void CompositorSoftwareOutputDevice::DiscardBackbuffer() {
   // Keep non-ACKed buffers in awaiting_ack_ until they get acknowledged.
   for (size_t i = 0; i < buffers_.size(); ++i) {
     if (!buffers_[i]->free()) {
       awaiting_ack_.push_back(buffers_[i]);
       buffers_[i] = NULL;
     }
   }
   buffers_.clear();
-  current_index_ = -1;
+  current_index_ = kInvalidIndex;
 }
 
 void CompositorSoftwareOutputDevice::EnsureBackbuffer() {
 }
 
 SkCanvas* CompositorSoftwareOutputDevice::BeginPaint(
     const gfx::Rect& damage_rect) {
   DCHECK(CalledOnValidThread());
 
   Buffer* previous = NULL;
-  if (current_index_ != size_t(-1))
+  if (current_index_ != kInvalidIndex)
     previous = buffers_[current_index_];
   current_index_ = FindFreeBuffer(current_index_ + 1);
   Buffer* current = buffers_[current_index_];
   DCHECK(current->free());
   current->SetFree(false);
 
   // Set up a canvas for the current front buffer.
   SkImageInfo info = SkImageInfo::MakeN32Premul(viewport_pixel_size_.width(),
                                                 viewport_pixel_size_.height());
   SkBitmap bitmap;
@@ skipping 68 matching lines @@
     return;
   } else {
     it = std::find_if(awaiting_ack_.begin(), awaiting_ack_.end(),
                       CompareById(id));
     DCHECK(it != awaiting_ack_.end());
     awaiting_ack_.erase(it);
   }
 }
 
 }  // namespace content