Attachment 341619 Details for Bug 186118 – Patch

[patch] Patch

bug-186118-20180531093552.patch (text/plain), 1.91 KB, created by Dean Jackson on 2018-05-30 16:35:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Jackson

Created: 2018-05-30 16:35:54 PDT

Size: 1.91 KB

patch

obsolete

>Subversion Revision: 232271
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4aa3a3da886e2ed35d40d8a9eae62e015a2f722f..048780a7fc2b20a946e876ec1c7630756e054f43 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-05-30  Dean Jackson  <dino@apple.com>
>+
>+        WebContent crashes with system preview content
>+        https://bugs.webkit.org/show_bug.cgi?id=186118
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We were receiving crash reports on iOS devices when getting
>+        platformContext() from a GraphicsContext. This usually
>+        occurred when the page was invisible. Debugging showed that
>+        it was trying to draw with a disabled context.
>+
>+        * rendering/RenderThemeIOS.mm:
>+        (WebCore::RenderThemeIOS::paintSystemPreviewBadge): Early
>+        return if the context has painting disabled.
>+
> 2018-05-29  Chris Dumez  <cdumez@apple.com>
> 
>         Avoid unnecessary String allocation in isPublicSuffix(const String&)
>diff --git a/Source/WebCore/rendering/RenderThemeIOS.mm b/Source/WebCore/rendering/RenderThemeIOS.mm
>index 7b181fc9682f4ddc47d123ba39b14c2898962fb5..2efbd0c5dbe01406faae3f686cf5a921a40c8d5c 100644
>--- a/Source/WebCore/rendering/RenderThemeIOS.mm
>+++ b/Source/WebCore/rendering/RenderThemeIOS.mm
>@@ -1852,7 +1852,13 @@ void RenderThemeIOS::paintSystemPreviewBadge(Image& image, const PaintInfo& pain
>     // Create a circle to be used for the clipping path in the badge, as well as the drop shadow.
>     RetainPtr<CGPathRef> circle = adoptCF(CGPathCreateWithRoundedRect(absoluteBadgeRect, badgeDimension / 2, badgeDimension / 2, nullptr));
> 
>-    CGContextRef ctx = paintInfo.context().platformContext();
>+    auto& graphicsContext = paintInfo.context();
>+    if (graphicsContext.paintingDisabled())
>+        return;
>+
>+    CGContextRef ctx = graphicsContext.platformContext();
>+    if (!ctx)
>+        return;
> 
>     CGContextSaveGState(ctx);
>

Flags:

mmaxfield: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186118: 341619