Attachment 229062 Details for Bug 64665 – Patch

[patch] Patch

bug-64665-20140410114837.patch (text/plain), 2.10 KB, created by Martin Robinson on 2014-04-10 11:48:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Robinson

Created: 2014-04-10 11:48:58 PDT

Size: 2.10 KB

patch

obsolete

>Subversion Revision: 167075
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index c6001466108ffbaff0b47c45bb9b717583b55074..7cc944dcb8095e98e83bc921cd059d9ec0c0a8af 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,12 @@
>+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  Alexey Proskuryakov  <ap@apple.com>
> 
>         Gtk build fix.
>diff --git a/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp b/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp
>index c836c93098c9590ff13bccbfda1a3d0ebad94904..378bee722049610852d63103903482950305e7b7 100644
>--- a/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp
>+++ b/Source/WebKit2/Shared/cairo/ShareableBitmapCairo.cpp
>@@ -60,19 +60,16 @@ std::unique_ptr<GraphicsContext> ShareableBitmap::createGraphicsContext()
> 
> 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);
> }
> 
> PassRefPtr<cairo_surface_t> ShareableBitmap::createCairoSurface()

Actions: View | Formatted Diff | Diff

Attachments on bug 64665: 229062