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

pdf/out_of_process_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/out_of_process_instance.h"
 
 #include <algorithm>  // for min/max()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 611 matching lines @@
     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(), image_data_.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));
   }
 
   if (!received_viewport_message_)
     return;
 
   engine_->PrePaint();
 
   for (size_t i = 0; i < paint_rects.size(); i++) {
     // Intersect with plugin area since there could be pending invalidates from
@@ skipping 70 matching lines @@
 
 void OutOfProcessInstance::CalculateBackgroundParts() {
   background_parts_.clear();
   int left_width = available_area_.x();
   int right_start = available_area_.right();
   int right_width = abs(plugin_size_.width() - available_area_.right());
   int bottom = std::min(available_area_.bottom(), plugin_size_.height());
 
   // 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, plugin_size_.width(), plugin_size_.height() - bottom);
   if (!part.location.IsEmpty())
     background_parts_.push_back(part);
 }
 
 int OutOfProcessInstance::GetDocumentPixelWidth() const {
   return static_cast<int>(ceil(document_size_.width() * zoom_ * device_scale_));
 }
 
 int OutOfProcessInstance::GetDocumentPixelHeight() const {
   return static_cast<int>(
       ceil(document_size_.height() * zoom_ * device_scale_));
 }
 
-void OutOfProcessInstance::FillRect(const pp::Rect& rect, unsigned int color) {
+void OutOfProcessInstance::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;
   }
 }
 
 void OutOfProcessInstance::DocumentSizeUpdated(const pp::Size& size) {
@@ skipping 649 matching lines @@
 pp::Point OutOfProcessInstance::BoundScrollOffsetToDocument(
     const pp::Point& scroll_offset) {
   int max_x = document_size_.width() * zoom_ - plugin_dip_size_.width();
   int x = std::max(std::min(scroll_offset.x(), max_x), 0);
   int max_y = document_size_.height() * zoom_ - plugin_dip_size_.height();
   int y = std::max(std::min(scroll_offset.y(), max_y), 0);
   return pp::Point(x, y);
 }
 
 }  // namespace chrome_pdf