Attachment 341688 Details for Bug 186158 – Patch

[patch] Patch

bug-186158-20180601062302.patch (text/plain), 1.55 KB, created by Dean Jackson on 2018-05-31 13:23:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2018-05-31 13:23:04 PDT

Size: 1.55 KB

patch

obsolete

>Subversion Revision: 232271
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c4ce7ec7632377d4de16e2d88cbcb9b773d1afb0..139ffc1a3cbfb30b85e12d92fd5e96a9af497e71 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-31  Dean Jackson  <dino@apple.com>
>+
>+        Don't paint the System Preview badge if the image isn't fully decoded
>+        https://bugs.webkit.org/show_bug.cgi?id=186158
>+        <rdar://problem/40454866>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Only paint the system preview badge if the image itself said
>+        that it succeeded in drawing.
>+
>+        * rendering/RenderImage.cpp:
>+        (WebCore::RenderImage::paintIntoRect): Check the ImageDrawResult.
>+
> 2018-05-30  Dean Jackson  <dino@apple.com>
> 
>         WebContent crashes with system preview content
>diff --git a/Source/WebCore/rendering/RenderImage.cpp b/Source/WebCore/rendering/RenderImage.cpp
>index 6e9a74dd8b477bb04878acbcd1a0f2ae9940e140..92422b362a412746f4589f1e6dc732ceb718e84b 100644
>--- a/Source/WebCore/rendering/RenderImage.cpp
>+++ b/Source/WebCore/rendering/RenderImage.cpp
>@@ -594,7 +594,7 @@ ImageDrawResult RenderImage::paintIntoRect(PaintInfo& paintInfo, const FloatRect
>         imageResource().cachedImage()->addPendingImageDrawingClient(*this);
> 
> #if USE(SYSTEM_PREVIEW)
>-    if (imageElement && imageElement->isSystemPreviewImage())
>+    if (imageElement && imageElement->isSystemPreviewImage() && drawResult == ImageDrawResult::DidDraw)
>         theme().paintSystemPreviewBadge(*img, paintInfo, rect);
> #endif
>

Flags:

graouts: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186158: 341688