Add Skia to CG adapter for plugins.

webkit/plugins/npapi/webplugin_delegate_impl_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #import <QuartzCore/QuartzCore.h>
 
 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #include <string>
@@ skipping 19 matching lines @@
 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
 
 #ifndef NP_NO_CARBON
 #include "webkit/plugins/npapi/carbon_plugin_window_tracker_mac.h"
 #endif
 
 #ifndef NP_NO_QUICKDRAW
 #include "webkit/plugins/npapi/quickdraw_drawing_manager_mac.h"
 #endif
 
+#if defined(USE_SKIA)
+#include "skia/ext/platform_canvas.h"
+#include "skia/ext/skia_utils_mac.h"
+#endif
+
 using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
 
 // Important implementation notes: The Mac definition of NPAPI, particularly
 // the distinction between windowed and windowless modes, differs from the
 // Windows and Linux definitions.  Most of those differences are
 // accomodated by the WebPluginDelegate class.
@@ skipping 412 matching lines @@
 
 #ifndef NP_NO_QUICKDRAW
   // Paint events are our cue to dump the current plugin bits into the buffer
   // context if we are dealing with a QuickDraw plugin.
   if (instance()->drawing_model() == NPDrawingModelQuickDraw) {
     qd_manager_->UpdateContext();
   }
 #endif
 }
 
+#if defined(USE_SKIA)
+void WebPluginDelegateImpl::Paint(WebKit::WebCanvas* canvas,

[stuartmorgan, 2011/04/12 17:35:51]

I don't suppose there's a less confusing way to do these defines? Having the #if
wrapping one function in the header and the other in the implementation looks
like a mistake; I had to read it a few times to understand that it wasn't.

[_cary, 2011/04/12 21:03:55]

Done.

+    const gfx::Rect& rect) {
+  gfx::SkiaBitLocker bitLocker(canvas);

[stuartmorgan, 2011/04/12 17:35:51]

Does this have the same transparency-preserving properties that the CG version
has, so that transparent plugins will composite correctly without the background
store?

[_cary, 2011/04/12 21:03:55]

Yes, the Skia bitmap preserves alpha so transparent compositing works.

+  Paint(bitLocker.cgContext(), rect);
+}
+#endif
+
 void WebPluginDelegateImpl::Print(CGContextRef context) {
   NOTIMPLEMENTED();
 }
 
 bool WebPluginDelegateImpl::PlatformHandleInputEvent(
     const WebInputEvent& event, WebCursorInfo* cursor_info) {
   DCHECK(cursor_info != NULL);
 
   // If we get an event before we've set up the plugin, bail.
   if (!have_called_set_window_)
@@ skipping 696 matching lines @@
   qd_manager_->SetFastPathEnabled(enabled);
   qd_port_.port = qd_manager_->port();
   WindowlessSetWindow();
   // Send a paint event so that the new buffer gets updated immediately.
   WindowlessPaint(buffer_context_, clip_rect_);
 }
 #endif  // !NP_NO_QUICKDRAW
 
 }  // namespace npapi
 }  // namespace webkit