Add Skia to CG adapter for plugins.

webkit/plugins/ppapi/ppb_graphics_2d_impl.cc

 // 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.
 
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 10 matching lines @@
 #include "ui/gfx/rect.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #endif
 
+#if defined(OS_MACOSX) && defined(USE_SKIA)
+#include "skia/ext/skia_utils_mac.h"
+#endif
+
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
 // Converts a rect inside an image of the given dimensions. The rect may be
 // NULL to indicate it should be the entire image. If the rect is outside of
 // the image, this will do nothing and return false.
 bool ValidateAndConvertRect(const PP_Rect* rect,
                             int image_width, int image_height,
@@ skipping 464 matching lines @@
           NULL, backing_bitmap.getAddr32(0, 0),
           backing_bitmap.rowBytes() * backing_bitmap.height(), NULL));
   base::mac::ScopedCFTypeRef<CGImageRef> image(
       CGImageCreate(
           backing_bitmap.width(), backing_bitmap.height(),
           8, 32, backing_bitmap.rowBytes(),
           base::mac::GetSystemColorSpace(),
           kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host,
           data_provider, NULL, false, kCGRenderingIntentDefault));
 
+#if defined(USE_SKIA)
+  gfx::SkiaBitLocker bitLocker(canvas);
+  CGContextRef cgContext = bitLocker.cgContext();

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

Same question here; why use CG?

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

Done.

+#else
+  CGContextRef cgContext = canvas;
+#endif
   // Flip the transform
-  CGContextSaveGState(canvas);
-  float window_height = static_cast<float>(CGBitmapContextGetHeight(canvas));
-  CGContextTranslateCTM(canvas, 0, window_height);
-  CGContextScaleCTM(canvas, 1.0, -1.0);
+  CGContextSaveGState(cgContext);
+  float window_height = static_cast<float>(CGBitmapContextGetHeight(cgContext));
+  CGContextTranslateCTM(cgContext, 0, window_height);
+  CGContextScaleCTM(cgContext, 1.0, -1.0);
 
   // To avoid painting outside the plugin boundaries and clip instead of
   // scaling, CGContextDrawImage() must draw the full image using |bitmap_rect|
   // but the context must be clipped to the plugin using |bounds|.
 
   CGRect bitmap_rect;
   bitmap_rect.origin.x = plugin_rect.origin().x();
   bitmap_rect.origin.y = window_height - plugin_rect.origin().y() -
       backing_bitmap.height();
   bitmap_rect.size.width = backing_bitmap.width();
   bitmap_rect.size.height = backing_bitmap.height();
 
   CGRect bounds;
   bounds.origin.x = plugin_rect.origin().x();
   bounds.origin.y = window_height - plugin_rect.origin().y() -
       plugin_rect.height();
   bounds.size.width = plugin_rect.width();
   bounds.size.height = plugin_rect.height();
 
-  CGContextClipToRect(canvas, bounds);
+  CGContextClipToRect(cgContext, bounds);
 
   // TODO(brettw) bug 56673: do a direct memcpy instead of going through CG
   // if the is_always_opaque_ flag is set. Must ensure bitmap is still clipped.
 
-  CGContextDrawImage(canvas, bitmap_rect, image);
-  CGContextRestoreGState(canvas);
+  CGContextDrawImage(cgContext, bitmap_rect, image);
+  CGContextRestoreGState(cgContext);
 #else
   SkPaint paint;
   if (is_always_opaque_) {
     // When we know the device is opaque, we can disable blending for slightly
     // more optimized painting.
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
   }
 
   canvas->save();
   SkRect clip_rect = SkRect::MakeXYWH(SkIntToScalar(plugin_rect.origin().x()),
@@ skipping 121 matching lines @@
 }
 
 bool PPB_Graphics2D_Impl::HasPendingFlush() const {
   return !unpainted_flush_callback_.is_null() ||
          !painted_flush_callback_.is_null() ||
          offscreen_flush_pending_;
 }
 
 }  // namespace ppapi
 }  // namespace webkit