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

pdf/pdf_engine.h

 // 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.
 
 #ifndef PDF_PDF_ENGINE_H_
 #define PDF_PDF_ENGINE_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 11 matching lines @@
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/rect.h"
 #include "ppapi/cpp/size.h"
 #include "ppapi/cpp/url_loader.h"
 
 namespace pp {
 class InputEvent;
 }
 
-#define kBackgroundColorR 204
-#define kBackgroundColorG 204
-#define kBackgroundColorB 204
-#define kBackgroundColorA 255
+const uint32 kBackgroundColor = 0xFFCCCCCC;

[Peter Kasting, 2014/07/08 21:28:25]

The old #defines treated the relevant values as signed, which caused signedness
mismatches when combining them into a uint32.  Using a const uint32 instead of a
macro for this kind of thing both solves this problem and makes a variety of
places shorter, but requires a pdfium change.

 
 namespace chrome_pdf {
 
 class Stream;
 
 #if defined(OS_MACOSX)
 const uint32 kDefaultKeyModifier = PP_INPUTEVENT_MODIFIER_METAKEY;
 #else  // !OS_MACOSX
 const uint32 kDefaultKeyModifier = PP_INPUTEVENT_MODIFIER_CONTROLKEY;
 #endif  // OS_MACOSX
@@ skipping 264 matching lines @@
                                      void* bitmap_buffer) = 0;
   virtual bool GetPDFDocInfo(const void* pdf_buffer,
                              int buffer_size,
                              int* page_count,
                              double* max_page_width) = 0;
 };
 
 }  // namespace chrome_pdf
 
 #endif  // PDF_PDF_ENGINE_H_