Changeset 241040 in webkit

Timestamp:

Feb 6, 2019 12:13:15 PM (5 years ago)

Author:

achristensen@apple.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeIOS.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1641 +1641 @@
 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;
@@ -1659 +1661 @@
             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;
@@ -1683 +1689 @@
         }
     }
-
+#endif
     CGFloat iconAspect = [result size].width / [result size].height;
     size = largestRectWithAspectRatioInsideRect(iconAspect, FloatRect(0, 0, attachmentIconSize, attachmentIconSize)).size();