Add Skia to CG adapter for plugins.

webkit/plugins/npapi/webplugin_delegate_impl.h

 // Copyright (c) 2011 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 WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 #define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 
 #include <string>
 #include <list>
 
@@ skipping 83 matching lines @@
   // WebPluginDelegate implementation
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
                           const std::vector<std::string>& arg_values,
                           WebPlugin* plugin,
                           bool load_manually);
   virtual void PluginDestroyed();
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
                               const gfx::Rect& clip_rect);
   virtual void Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect);
+#if defined(OS_MACOSX)
+  // FIXME: This is a temporary workaround to allow the Darwin / Skia port to
+  // share code with the Darwin / CG port. Later, this will be removed and
+  // all callers will use the Paint defined above.
+  void CGPaint(CGContextRef context, const gfx::Rect& rect);

[stuartmorgan, 2011/04/13 15:19:10]

This still needs to be moved out of the block of WebPluginDelegate
implementation functions.

[_cary, 2011/04/13 16:22:43]

Done.

+#endif
   virtual void Print(gfx::NativeDrawingContext context);
   virtual void SetFocus(bool focused);
   virtual bool HandleInputEvent(const WebKit::WebInputEvent& event,
                                 WebKit::WebCursorInfo* cursor_info);
   virtual NPObject* GetPluginScriptableObject();
   virtual void DidFinishLoadWithReason(
       const GURL& url, NPReason reason, int notify_id);
   virtual int GetProcessId();
   virtual void SendJavaScriptStream(const GURL& url,
                                     const std::string& result,
@@ skipping 399 matching lines @@
   // True if NPP_New did not return an error.
   bool creation_succeeded_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl);
 };
 
 }  // namespace npapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_