Title: [98599] trunk/Source/WebKit2
- Revision
- 98599
- Author
- carlo...@webkit.org
- Date
- 2011-10-27 10:27:15 -0700 (Thu, 27 Oct 2011)
Log Message
[Cairo] Implement ShareableBitmap::paint() when scaleFactor=1
https://bugs.webkit.org/show_bug.cgi?id=71027
Reviewed by Martin Robinson.
Fixes windowless plugins in GTK+ port.
* Shared/cairo/ShareableBitmapCairo.cpp:
(WebKit::ShareableBitmap::paint): When scaleFactor is 1, simply
call the paint method that doesn't receive a scaleFactor.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98598 => 98599)
--- trunk/Source/WebKit2/ChangeLog 2011-10-27 17:24:49 UTC (rev 98598)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-27 17:27:15 UTC (rev 98599)
@@ -1,3 +1,16 @@
+2011-10-27 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [Cairo] Implement ShareableBitmap::paint() when scaleFactor=1
+ https://bugs.webkit.org/show_bug.cgi?id=71027
+
+ Reviewed by Martin Robinson.
+
+ Fixes windowless plugins in GTK+ port.
+
+ * Shared/cairo/ShareableBitmapCairo.cpp:
+ (WebKit::ShareableBitmap::paint): When scaleFactor is 1, simply
+ call the paint method that doesn't receive a scaleFactor.
+
2011-10-27 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r98556.
Modified: trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp (98598 => 98599)
--- trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp 2011-10-27 17:24:49 UTC (rev 98598)
+++ trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp 2011-10-27 17:27:15 UTC (rev 98599)
@@ -55,10 +55,14 @@
context.platformContext()->drawSurfaceToContext(surface.get(), destRect, srcRect, &context);
}
-void ShareableBitmap::paint(GraphicsContext&, float /*scaleFactor*/, const IntPoint& /*dstPoint*/, const IntRect& /*srcRect*/)
+void ShareableBitmap::paint(GraphicsContext& context, float scaleFactor, const IntPoint& dstPoint, const IntRect& srcRect)
{
- // See <https://bugs.webkit.org/show_bug.cgi?id=64665>.
- notImplemented();
+ if (scaleFactor != 1) {
+ // See <https://bugs.webkit.org/show_bug.cgi?id=64665>.
+ notImplemented();
+ return;
+ }
+ paint(context, dstPoint, srcRect);
}
PassRefPtr<cairo_surface_t> ShareableBitmap::createCairoSurface()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
