This changelist fixes some issues with the NPAPI WMP plugin work in Chrome. ...

chrome/plugin/webplugin_delegate_stub.h

 // 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.
 
 #ifndef CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
 #define CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
 
 #include <queue>
 
 #include "base/gfx/rect.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "chrome/common/transport_dib.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/npapi/bindings/npapi.h"
 
 class PluginChannel;
 class WebPluginProxy;
 struct PluginMsg_Init_Params;
 struct PluginMsg_DidReceiveResponseParams;
+struct PluginMsg_UpdateGeometry_Param;
 struct PluginMsg_URLRequestReply_Params;
 class WebCursor;
 
 namespace WebKit {
 class WebInputEvent;
 }
 
-namespace webkit_glue {
-class WebPluginDelegate;
-}
+class WebPluginDelegateImpl;
 
 // Converts the IPC messages from WebPluginDelegateProxy into calls to the
 // actual WebPluginDelegate object.
 class WebPluginDelegateStub : public IPC::Channel::Listener,
                               public IPC::Message::Sender,
                               public base::RefCounted<WebPluginDelegateStub> {
  public:
   WebPluginDelegateStub(const std::string& mime_type, int instance_id,
                         PluginChannel* channel);
   ~WebPluginDelegateStub();
@@ skipping 22 matching lines @@
                                  intptr_t notify_data);
   void OnSetFocus();
   void OnHandleInputEvent(const WebKit::WebInputEvent* event,
                           bool* handled, WebCursor* cursor);
 
   void OnPaint(const gfx::Rect& damaged_rect);
   void OnDidPaint();
 
   void OnPrint(base::SharedMemoryHandle* shared_memory, size_t* size);
 
-  void OnUpdateGeometry(const gfx::Rect& window_rect,
-                        const gfx::Rect& clip_rect,
-                        const TransportDIB::Handle& windowless_buffer,
-                        const TransportDIB::Handle& background_buffer);
+  void OnUpdateGeometry(const PluginMsg_UpdateGeometry_Param& param);
   void OnGetPluginScriptableObject(int* route_id, intptr_t* npobject_ptr);
   void OnSendJavaScriptStream(const GURL& url,
                               const std::string& result,
                               bool success, bool notify_needed,
                               intptr_t notify_data);
 
   void OnDidReceiveManualResponse(
       const GURL& url,
       const PluginMsg_DidReceiveResponseParams& params);
   void OnDidReceiveManualData(const std::vector<char>& buffer);
   void OnDidFinishManualLoading();
   void OnDidManualLoadFail();
   void OnInstallMissingPlugin();
 
   void OnHandleURLRequestReply(
       const PluginMsg_URLRequestReply_Params& params);
 
   void CreateSharedBuffer(size_t size,
                           base::SharedMemory* shared_buf,
                           base::SharedMemoryHandle* remote_handle);
 
   std::string mime_type_;
   int instance_id_;
 
   scoped_refptr<PluginChannel> channel_;
 
-  webkit_glue::WebPluginDelegate* delegate_;
+  WebPluginDelegateImpl* delegate_;
   WebPluginProxy* webplugin_;
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebPluginDelegateStub);
 };
 
 #endif  // CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_