Changeset 167080 in webkit

Timestamp:

Apr 10, 2014 12:03:20 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[Cairo] Implement ShareableBitmap::paint() with scale factor
​https://bugs.webkit.org/show_bug.cgi?id=64665

Patch by Owen Taylor <​otaylor@redhat.com> on 2014-04-10
Reviewed by Martin Robinson.

• Shared/cairo/ShareableBitmapCairo.cpp (WebKit::ShareableBitmap::paint):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/cairo/ShareableBitmapCairo.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-10  Owen Taylor  <otaylor@redhat.com>
+
+        [Cairo] Implement ShareableBitmap::paint() with scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=64665
+
+        Reviewed by Martin Robinson.
+
+        * Shared/cairo/ShareableBitmapCairo.cpp (WebKit::ShareableBitmap::paint):
+
 2014-04-10  Enrica Casucci  <enrica@apple.com>
 

trunk/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp

@@ -61 +61 @@
 void ShareableBitmap::paint(GraphicsContext& context, const IntPoint& dstPoint, const IntRect& srcRect)
 {
-    RefPtr<cairo_surface_t> surface = createSurfaceFromData(data(), m_size);
-    FloatRect destRect(dstPoint, srcRect.size());
-    context.platformContext()->drawSurfaceToContext(surface.get(), destRect, srcRect, &context);
+    paint(context, 1, dstPoint, srcRect);
 }
 
 void ShareableBitmap::paint(GraphicsContext& context, float scaleFactor, const IntPoint& dstPoint, const IntRect& srcRect)
 {
-    if (scaleFactor != 1) {
-        // See <https://bugs.webkit.org/show_bug.cgi?id=64665>.
-        notImplemented();
-        return;
-    }
-    paint(context, dstPoint, srcRect);
+    RefPtr<cairo_surface_t> surface = createSurfaceFromData(data(), m_size);
+    FloatRect destRect(dstPoint, srcRect.size());
+    FloatRect srcRectScaled(srcRect);
+    srcRectScaled.scale(scaleFactor);
+    context.platformContext()->drawSurfaceToContext(surface.get(), destRect, srcRectScaled, &context);
 }