Title: [232367] trunk/Source/WebCore
Revision
232367
Author
[email protected]
Date
2018-05-31 13:37:04 -0700 (Thu, 31 May 2018)

Log Message

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 Antoine Quint.

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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (232366 => 232367)


--- trunk/Source/WebCore/ChangeLog	2018-05-31 20:19:41 UTC (rev 232366)
+++ trunk/Source/WebCore/ChangeLog	2018-05-31 20:37:04 UTC (rev 232367)
@@ -1,3 +1,17 @@
+2018-05-31  Dean Jackson  <[email protected]>
+
+        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 Antoine Quint.
+
+        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-31  David Kilzer  <[email protected]>
 
         Implement checked cast for DDResultRef once DDResultGetCFTypeID() is available

Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (232366 => 232367)


--- trunk/Source/WebCore/rendering/RenderImage.cpp	2018-05-31 20:19:41 UTC (rev 232366)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp	2018-05-31 20:37:04 UTC (rev 232367)
@@ -594,7 +594,7 @@
         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
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to