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

pdf/instance.cc

 // Copyright (c) 2012 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 "pdf/instance.h"
 
 #include <algorithm>  // for min()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 750 matching lines @@
 void Instance::OnPaint(const std::vector<pp::Rect>& paint_rects,
                        std::vector<PaintManager::ReadyRect>* ready,
                        std::vector<pp::Rect>* pending) {
   if (image_data_.is_null()) {
     DCHECK(plugin_size_.IsEmpty());
     return;
   }
   if (first_paint_) {
     first_paint_ = false;
     pp::Rect rect = pp::Rect(pp::Point(), plugin_size_);
-    unsigned int color = kBackgroundColorA << 24 |
-                         kBackgroundColorR << 16 |
-                         kBackgroundColorG << 8 |
-                         kBackgroundColorB;
-    FillRect(rect, color);
+    FillRect(rect, kBackgroundColor);
     ready->push_back(PaintManager::ReadyRect(rect, image_data_, true));
     *pending = paint_rects;
     return;
   }
 
   engine_->PrePaint();
 
   for (size_t i = 0; i < paint_rects.size(); i++) {
     // Intersect with plugin area since there could be pending invalidates from
     // when the plugin area was larger.
@@ skipping 231 matching lines @@
       plugin_size_.width() - v_scrollbar_thickness, 0);
   int height_without_scrollbar = std::max(
       plugin_size_.height() - h_scrollbar_thickness, 0);
   int left_width = available_area_.x();
   int right_start = available_area_.right();
   int right_width = abs(width_without_scrollbar - available_area_.right());
   int bottom = std::min(available_area_.bottom(), height_without_scrollbar);
 
   // Add the left, right, and bottom rectangles.  Note: we assume only
   // horizontal centering.
-  BackgroundPart part;
-  part.color = kBackgroundColorA << 24 |
-               kBackgroundColorR << 16 |
-               kBackgroundColorG << 8 |
-               kBackgroundColorB;
-  part.location = pp::Rect(0, 0, left_width, bottom);
+  BackgroundPart part = {
+    pp::Rect(0, 0, left_width, bottom),
+    kBackgroundColor
+  };
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
   part.location = pp::Rect(right_start, 0, right_width, bottom);
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
   part.location = pp::Rect(
       0, bottom, width_without_scrollbar, height_without_scrollbar - bottom);
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
 
@@ skipping 16 matching lines @@
 int Instance::GetDocumentPixelWidth() const {
   return static_cast<int>(ceil(document_size_.width() * zoom_ * device_scale_));
 }
 
 int Instance::GetDocumentPixelHeight() const {
   return static_cast<int>(ceil(document_size_.height() *
                                zoom_ *
                                device_scale_));
 }
 
-void Instance::FillRect(const pp::Rect& rect, unsigned int color) {
+void Instance::FillRect(const pp::Rect& rect, uint32 color) {
   DCHECK(!image_data_.is_null() || rect.IsEmpty());
-  unsigned int* buffer_start = static_cast<unsigned int*>(image_data_.data());
+  uint32* buffer_start = static_cast<uint32*>(image_data_.data());
   int stride = image_data_.stride();
-  unsigned int* ptr = buffer_start + rect.y() * stride / 4 + rect.x();
+  uint32* ptr = buffer_start + rect.y() * stride / 4 + rect.x();
   int height = rect.height();
   int width = rect.width();
   for (int y = 0; y < height; ++y) {
     for (int x = 0; x < width; ++x)
       *(ptr + x) = color;
-    ptr += stride /4;
+    ptr += stride / 4;
   }
 }
 
 void Instance::DocumentSizeUpdated(const pp::Size& size) {
   document_size_ = size;
 
   OnGeometryChanged(zoom_, device_scale_);
 }
 
 void Instance::Invalidate(const pp::Rect& rect) {
@@ skipping 1620 matching lines @@
   return instance_->HasScriptableMethod(name, exception);
 }
 
 pp::Var PDFScriptableObject::Call(const pp::Var& method,
                                   const std::vector<pp::Var>& args,
                                   pp::Var* exception) {
   return instance_->CallScriptableMethod(method, args, exception);
 }
 
 }  // namespace chrome_pdf