Revert "Fix a ton of compiler warnings."

chrome/renderer/webplugin_delegate_proxy.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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 "chrome/renderer/webplugin_delegate_proxy.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <atlbase.h>
 #endif
@@ skipping 44 matching lines @@
 using WebKit::WebDragData;
 using WebKit::WebVector;
 using WebKit::WebString;
 
 // Proxy for WebPluginResourceClient.  The object owns itself after creation,
 // deleting itself after its callback has been called.
 class ResourceClientProxy : public WebPluginResourceClient {
  public:
   ResourceClientProxy(PluginChannelHost* channel, int instance_id)
     : channel_(channel), instance_id_(instance_id), resource_id_(0),
-      notify_needed_(false), notify_data_(0),
+      notify_needed_(false), notify_data_(NULL),
       multibyte_response_expected_(false) {
   }
 
   ~ResourceClientProxy() {
   }
 
   void Initialize(int resource_id, const GURL& url, bool notify_needed,
                   intptr_t notify_data, intptr_t existing_stream) {
     resource_id_ = resource_id;
     url_ = url;
@@ skipping 88 matching lines @@
     RenderView* render_view) {
   return new WebPluginDelegateProxy(mime_type, clsid, render_view);
 }
 
 WebPluginDelegateProxy::WebPluginDelegateProxy(const std::string& mime_type,
                                                const std::string& clsid,
                                                RenderView* render_view)
     : render_view_(render_view),
       plugin_(NULL),
       windowless_(false),
-      window_(0),
+      window_(NULL),
       mime_type_(mime_type),
       clsid_(clsid),
       npobject_(NULL),
       window_script_object_(NULL),
       sad_plugin_(NULL),
       invalidate_pending_(false),
       transparent_(false),
       page_url_(render_view_->webview()->GetMainFrame()->url()) {
 }
 
@@ skipping 473 matching lines @@
       CGBitmapContextGetData(bg_context));
   int full_bg_width = CGBitmapContextGetWidth(bg_context);
   int full_bg_height = CGBitmapContextGetHeight(bg_context);
   int bg_stride = CGBitmapContextGetBytesPerRow(bg_context);
   int bg_last_row = CGBitmapContextGetHeight(bg_context) - 1;
 
   int bytes_per_pixel = CGBitmapContextGetBitsPerPixel(context) / 8;
 #else
   const unsigned char* page_bytes = cairo_image_surface_get_data(page_surface);
   int page_stride = cairo_image_surface_get_stride(page_surface);
-  int page_start_x = static_cast<int>(page_x_double);
-  int page_start_y = static_cast<int>(page_y_double);
+  int page_start_x = page_x_double;
+  int page_start_y = page_y_double;
 
   skia::PlatformDevice& device =
       background_store_canvas_->getTopPlatformDevice();
   cairo_surface_t* bg_surface = cairo_get_target(device.beginPlatformPaint());
   DCHECK_EQ(cairo_surface_get_type(bg_surface), CAIRO_SURFACE_TYPE_IMAGE);
   DCHECK_EQ(cairo_image_surface_get_format(bg_surface), CAIRO_FORMAT_ARGB32);
   const unsigned char* bg_bytes = cairo_image_surface_get_data(bg_surface);
   int full_bg_width = cairo_image_surface_get_width(bg_surface);
   int full_bg_height = cairo_image_surface_get_height(bg_surface);
   int bg_stride = cairo_image_surface_get_stride(bg_surface);
@@ skipping 109 matching lines @@
 void WebPluginDelegateProxy::OnSetWindow(gfx::PluginWindowHandle window) {
   windowless_ = !window;
   window_ = window;
   if (plugin_)
     plugin_->SetWindow(window);
 }
 
 void WebPluginDelegateProxy::WillDestroyWindow() {
   DCHECK(window_);
   plugin_->WillDestroyWindow(window_);
-  window_ = 0;
+  window_ = NULL;
 }
 
 #if defined(OS_WIN)
 void WebPluginDelegateProxy::OnSetWindowlessPumpEvent(
       HANDLE modal_loop_pump_messages_event) {
   DCHECK(modal_loop_pump_messages_event_ == NULL);
 
   modal_loop_pump_messages_event_.reset(
       new base::WaitableEvent(modal_loop_pump_messages_event));
 }
@@ skipping 256 matching lines @@
     intptr_t existing_stream, bool notify_needed, intptr_t notify_data) {
   plugin_->InitiateHTTPRangeRequest(url.c_str(), range_info.c_str(),
                                     existing_stream, notify_needed,
                                     notify_data);
 }
 
 void WebPluginDelegateProxy::OnDeferResourceLoading(int resource_id,
                                                     bool defer) {
   plugin_->SetDeferResourceLoading(resource_id, defer);
 }