Attachment 361313 Details for Bug 194353 – Patch

[patch] Patch

bug-194353-20190206121254.patch (text/plain), 2.17 KB, created by Alex Christensen on 2019-02-06 12:12:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-02-06 12:12:55 PST

Size: 2.17 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 241039)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-02-06  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix WatchOS build
>+        https://bugs.webkit.org/show_bug.cgi?id=194353
>+
>+        Rubber stamped by Tim Horton and Wenson Hsieh.
>+
>+        * rendering/RenderThemeIOS.mm:
>+        (WebCore::iconForAttachment):
>+
> 2019-02-06  Olivier Blin  <olivier.blin@softathome.com>
> 
>         [SVG] fix SVGURIReference build by including SVGElement
>Index: Source/WebCore/rendering/RenderThemeIOS.mm
>===================================================================
>--- Source/WebCore/rendering/RenderThemeIOS.mm	(revision 241028)
>+++ Source/WebCore/rendering/RenderThemeIOS.mm	(working copy)
>@@ -1640,7 +1640,9 @@ static BOOL getAttachmentProgress(const 
> 
> static RetainPtr<UIImage> iconForAttachment(const RenderAttachment& attachment, FloatSize& size)
> {
>+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
>     auto documentInteractionController = adoptNS([PAL::allocUIDocumentInteractionControllerInstance() init]);
>+    ALLOW_DEPRECATED_DECLARATIONS_END
> 
>     String fileName;
>     if (File* file = attachment.attachmentElement().file())
>@@ -1658,14 +1660,18 @@ static RetainPtr<UIImage> iconForAttachm
>         else
>             UTI = UTIFromMIMEType(attachmentType);
> 
>+#if !PLATFORM(WATCHOS)
>         [documentInteractionController setUTI:static_cast<NSString *>(UTI)];
>+#endif
>     }
> 
>+    RetainPtr<UIImage> result;
>+#if !PLATFORM(WATCHOS)
>     NSArray *icons = [documentInteractionController icons];
>     if (!icons.count)
>         return nil;
> 
>-    RetainPtr<UIImage> result = icons.lastObject;
>+    result = icons.lastObject;
> 
>     BOOL useHeightForClosestMatch = [result size].height > [result size].width;
>     CGFloat bestMatchRatio = -1;
>@@ -1682,7 +1688,7 @@ static RetainPtr<UIImage> iconForAttachm
>             }
>         }
>     }
>-
>+#endif
>     CGFloat iconAspect = [result size].width / [result size].height;
>     size = largestRectWithAspectRatioInsideRect(iconAspect, FloatRect(0, 0, attachmentIconSize, attachmentIconSize)).size();
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194353: 361313