Pepper cleanup: USE_SKIA is always true.

webkit/plugins/ppapi/ppb_graphics_2d_impl.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 490 matching lines @@
 // The |backing_bitmap| must be clipped to the |plugin_rect| to avoid painting
 // outside the plugin area. This can happen if the plugin has been resized since
 // PaintImageData verified the image is within the plugin size.
 void PPB_Graphics2D_Impl::Paint(WebKit::WebCanvas* canvas,
                                 const gfx::Rect& plugin_rect,
                                 const gfx::Rect& paint_rect) {
   TRACE_EVENT0("pepper", "PPB_Graphics2D_Impl::Paint");
   ImageDataAutoMapper auto_mapper(image_data_);
   const SkBitmap& backing_bitmap = *image_data_->GetMappedBitmap();
 
-#if defined(OS_MACOSX) && !defined(USE_SKIA)
-  SkAutoLockPixels lock(backing_bitmap);
-
-  base::mac::ScopedCFTypeRef<CGDataProviderRef> data_provider(
-      CGDataProviderCreateWithData(
-          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));
-
-  // Flip the transform
-  gfx::ScopedCGContextSaveGState save_gstate(canvas)
-  float window_height = static_cast<float>(CGBitmapContextGetHeight(canvas));
-  CGContextTranslateCTM(canvas, 0, window_height);
-  CGContextScaleCTM(canvas, 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();
-  // TODO(yzshen): We should take |paint_rect| into consideration as well.
-  CGContextClipToRect(canvas, bounds);
-
-  // TODO(jhorwich) Figure out if this code is even active anymore, and if so
-  // how to properly handle scaling.
-  DCHECK_EQ(1.0f, scale_);
-
-  // 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);
-#else
   gfx::Rect invalidate_rect = gfx::IntersectRects(plugin_rect, paint_rect);
   SkRect sk_invalidate_rect = gfx::RectToSkRect(invalidate_rect);
   SkAutoCanvasRestore auto_restore(canvas, true);
   canvas->clipRect(sk_invalidate_rect);
   gfx::Size pixel_image_size(image_data_->width(), image_data_->height());
   gfx::Size image_size = gfx::ToFlooredSize(
       gfx::ScaleSize(pixel_image_size, scale_));
 
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
@@ skipping 34 matching lines @@
   SkPoint origin;
   origin.set(SkIntToScalar(plugin_rect.x()), SkIntToScalar(plugin_rect.y()));
 
   SkPoint pixel_origin = origin;
   if (scale_ != 1.0f && scale_ > 0.0f) {
     float inverse_scale = 1.0f / scale_;
     pixel_origin.scale(inverse_scale);
     canvas->scale(scale_, scale_);
   }
   canvas->drawBitmap(image, pixel_origin.x(), pixel_origin.y(), &paint);
-#endif
 }
 
 void PPB_Graphics2D_Impl::ViewWillInitiatePaint() {
   // Move any "unpainted" callback to the painted state. See
   // |unpainted_flush_callback_| in the header for more.
   if (!unpainted_flush_callback_.is_null()) {
     DCHECK(painted_flush_callback_.is_null());
     std::swap(painted_flush_callback_, unpainted_flush_callback_);
   }
 }
@@ skipping 132 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