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/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 400 matching lines @@
     np_cg_context_.context = context;
   }
 #endif
 #ifndef NP_NO_QUICKDRAW
   if (instance()->drawing_model() == NPDrawingModelQuickDraw)
     qd_manager_->SetTargetContext(context, window_rect.size());
 #endif
   UpdateGeometry(window_rect, clip_rect);
 }
 
-void WebPluginDelegateImpl::Paint(CGContextRef context, const gfx::Rect& rect) {
+void WebPluginDelegateImpl::Paint(WebKit::WebCanvas* canvas,
+    const gfx::Rect& rect) {

[brettw, 2011/05/18 20:15:46]

This should be indented to be aligned with the first arg

[_cary, 2011/05/19 12:28:38]

Done.

+#if defined(USE_SKIA)
+  gfx::SkiaBitLocker bitLocker(canvas);

[brettw, 2011/05/18 20:15:46]

Don't use camelCase for variable names:
  bitLocker -> bit_locker

[_cary, 2011/05/19 12:28:38]

Done.

+  CGContextRef context = bitLocker.cgContext();
+#else
+  CGContextRef context = canvas;
+#endif
+  CGPaint(context, rect);
+}
+
+void WebPluginDelegateImpl::CGPaint(CGContextRef context,
+    const gfx::Rect& rect) {

[brettw, 2011/05/18 20:15:46]

Align args.

[_cary, 2011/05/19 12:28:38]

Done.

   WindowlessPaint(context, rect);
 
 #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
 }
@@ skipping 703 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