Add Skia to CG adapter for plugins.

content/plugin/webplugin_proxy.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 "content/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_handle.h"
@@ skipping 332 matching lines @@
     CGRect source_rect = rect.ToCGRect();
     // Flip the rect we use to pull from the canvas, since it's upside-down.
     source_rect.origin.y = CGImageGetHeight(image) - rect.y() - rect.height();
     base::mac::ScopedCFTypeRef<CGImageRef> sub_image(
         CGImageCreateWithImageInRect(image, source_rect));
     CGContextDrawImage(windowless_context_, rect.ToCGRect(), sub_image);
   } else if (transparent_) {
     CGContextClearRect(windowless_context_, rect.ToCGRect());
   }
   CGContextClipToRect(windowless_context_, rect.ToCGRect());
-  delegate_->Paint(windowless_context_, rect);
+  delegate_->CGPaint(windowless_context_, rect);

[stuartmorgan, 2011/04/12 21:15:37]

This is another case where this whole codepath exists because of the fork
between CG and Skia; having CGPaint be public is a hack working around that.

I'm okay with you not fixing this for now (especially since this will need perf
testing when you unify it, and some tweaks like not drawing black or doing the
coordinate transforms on the Mac), but please put a TODO on this block for
unifying the Skia path.

[_cary, 2011/04/13 11:58:18]

Done.

   if (windowless_context_.get() == saved_context_weak)
     CGContextRestoreGState(windowless_context_);
 #else
   windowless_canvas_->save();
 
   // The given clip rect is relative to the plugin coordinate system.
   SkRect sk_rect = { SkIntToScalar(rect.x()),
                      SkIntToScalar(rect.y()),
                      SkIntToScalar(rect.right()),
                      SkIntToScalar(rect.bottom()) };
@@ skipping 283 matching lines @@
       resource_clients_.erase(index++);
     } else {
       index++;
     }
   }
 }
 
 void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) {
   Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
 }