Title: [241040] trunk/Source/WebCore
- Revision
- 241040
- Author
- achristen...@apple.com
- Date
- 2019-02-06 12:13:15 -0800 (Wed, 06 Feb 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (241039 => 241040)
--- trunk/Source/WebCore/ChangeLog 2019-02-06 19:57:38 UTC (rev 241039)
+++ trunk/Source/WebCore/ChangeLog 2019-02-06 20:13:15 UTC (rev 241040)
@@ -1,3 +1,13 @@
+2019-02-06 Alex Christensen <achristen...@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.b...@softathome.com>
[SVG] fix SVGURIReference build by including SVGElement
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (241039 => 241040)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2019-02-06 19:57:38 UTC (rev 241039)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2019-02-06 20:13:15 UTC (rev 241040)
@@ -1640,7 +1640,9 @@
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 @@
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 @@
}
}
}
-
+#endif
CGFloat iconAspect = [result size].width / [result size].height;
size = largestRectWithAspectRatioInsideRect(iconAspect, FloatRect(0, 0, attachmentIconSize, attachmentIconSize)).size();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
