Update NPAPI header file to v24, apply Google modifications

webkit/glue/plugins/webplugin_delegate_impl_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <string>
 #include <vector>
@@ skipping 86 matching lines @@
       user_gesture_message_posted_(this),
       user_gesture_msg_factory_(this),
       null_event_factory_(this),
       last_mouse_x_(0),
       last_mouse_y_(0) {
   memset(&window_, 0, sizeof(window_));
 }
 
 WebPluginDelegateImpl::~WebPluginDelegateImpl() {
   FakePluginWindowTracker::SharedInstance()->RemoveFakeWindowForDelegate(
-      this, cg_context_.window);
+      this, reinterpret_cast<WindowRef>(cg_context_.window));
   DestroyInstance();
 }
 
 void WebPluginDelegateImpl::PluginDestroyed() {
   delete this;
 }
 
 bool WebPluginDelegateImpl::Initialize(const GURL& url,
                                        const std::vector<std::string>& arg_names,
                                        const std::vector<std::string>& arg_values,
@@ skipping 24 matching lines @@
   NPAPI::PluginInstance::SetInitializingInstance(old_instance);
 
   if (!start_result)
     return false;
 
   FakePluginWindowTracker* window_tracker =
       FakePluginWindowTracker::SharedInstance();
   cg_context_.window = window_tracker->GenerateFakeWindowForDelegate(this);
   cg_context_.context = NULL;
   Rect window_bounds = { 0, 0, window_rect_.height(), window_rect_.width() };
-  SetWindowBounds(cg_context_.window, kWindowContentRgn, &window_bounds);
+  SetWindowBounds(reinterpret_cast<WindowRef>(cg_context_.window),
+                  kWindowContentRgn, &window_bounds);
   window_.window = &cg_context_;
   window_.type = NPWindowTypeWindow;
 
   plugin->SetWindow(NULL);
   plugin_url_ = url.spec();
 
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       null_event_factory_.NewRunnableMethod(
           &WebPluginDelegateImpl::OnNullEvent),
       kPluginIdleThrottleDelayMs);
@@ skipping 188 matching lines @@
 
   window_.clipRect.top = 0;
   window_.clipRect.left = 0;
   window_.clipRect.bottom = window_rect_.height();
   window_.clipRect.right = window_rect_.width();
   window_.height = window_rect_.height();
   window_.width = window_rect_.width();
   window_.x = 0;
   window_.y = 0;
 
-  UpdateDummyWindowBoundsWithOffset(cg_context_.window, window_rect_.x(),
-                                    window_rect_.y(), window_rect_.width(),
-                                    window_rect_.height());
+  UpdateDummyWindowBoundsWithOffset(
+      reinterpret_cast<WindowRef>(cg_context_.window), window_rect_.x(),
+      window_rect_.y(), window_rect_.width(), window_rect_.height());
 
   NPError err = instance()->NPP_SetWindow(&window_);
   DCHECK(err == NPERR_NO_ERROR);
 }
 
 void WebPluginDelegateImpl::SetFocus() {
   NPEvent focus_event = { 0 };
   focus_event.what = NPEventType_GetFocusEvent;
   focus_event.when = TickCount();
   instance()->NPP_HandleEvent(&focus_event);
@@ skipping 148 matching lines @@
     last_mouse_y_ = np_event.where.v;
     return true;  // Let the recurring task actually send the event.
   }
 
   // If this is a mouse event, we need to make sure our dummy window has the
   // correct location before we send the event to the plugin, so that any
   // coordinate conversion the plugin does will work out.
   if (WebInputEventIsWebMouseEvent(event)) {
     const WebMouseEvent* mouse_event =
         static_cast<const WebMouseEvent*>(&event);
-    UpdateWindowLocation(cg_context_.window, *mouse_event);
+    UpdateWindowLocation(reinterpret_cast<WindowRef>(cg_context_.window),
+                         *mouse_event);
   }
   CGContextSaveGState(cg_context_.context);
   bool ret = instance()->NPP_HandleEvent(&np_event) != 0;
   CGContextRestoreGState(cg_context_.context);
   return ret;
 }
 
 WebPluginResourceClient* WebPluginDelegateImpl::CreateResourceClient(
     int resource_id, const GURL& url, bool notify_needed,
     intptr_t notify_data, intptr_t existing_stream) {
@@ skipping 24 matching lines @@
     np_event.modifiers |= btnState;
   np_event.where.h = last_mouse_x_;
   np_event.where.v = last_mouse_y_;
   instance()->NPP_HandleEvent(&np_event);
 
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       null_event_factory_.NewRunnableMethod(
           &WebPluginDelegateImpl::OnNullEvent),
       kPluginIdleThrottleDelayMs);
 }