Title: [242923] trunk/Source/WebKit
- Revision
- 242923
- Author
- [email protected]
- Date
- 2019-03-13 17:17:23 -0700 (Wed, 13 Mar 2019)
Log Message
Unreviewed speculative build fix for watchOS after r242908.
* Shared/Cocoa/ArgumentCodersCocoa.mm:
(IPC::decodeObject):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (242922 => 242923)
--- trunk/Source/WebKit/ChangeLog 2019-03-14 00:06:03 UTC (rev 242922)
+++ trunk/Source/WebKit/ChangeLog 2019-03-14 00:17:23 UTC (rev 242923)
@@ -1,3 +1,10 @@
+2019-03-13 Timothy Hatcher <[email protected]>
+
+ Unreviewed speculative build fix for watchOS after r242908.
+
+ * Shared/Cocoa/ArgumentCodersCocoa.mm:
+ (IPC::decodeObject):
+
2019-03-13 Dean Jackson <[email protected]>
Block all plugins smaller than 5x5px
Modified: trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm (242922 => 242923)
--- trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm 2019-03-14 00:06:03 UTC (rev 242922)
+++ trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm 2019-03-14 00:17:23 UTC (rev 242923)
@@ -38,12 +38,17 @@
#import <WebCore/ColorMac.h>
#endif
+#if PLATFORM(IOS_FAMILY)
+#import <UIKit/UIFont.h>
+#import <UIKit/UIFontDescriptor.h>
+#endif
+
#if USE(APPKIT)
-#define PlatformFont NSFont
-#define PlatformFontDescriptor NSFontDescriptor
+using PlatformFont = NSFont;
+using PlatformFontDescriptor = NSFontDescriptor;
#else
-#define PlatformFont UIFont
-#define PlatformFontDescriptor UIFontDescriptor
+using PlatformFont = UIFont;
+using PlatformFontDescriptor = UIFontDescriptor;
#endif
namespace IPC {
@@ -436,13 +441,8 @@
#endif
case NSType::Dictionary:
return decodeDictionaryInternal(decoder);
-#if USE(APPKIT)
case NSType::Font:
return decodeFontInternal(decoder);
-#else
- case NSType::Font:
- return decodeFontInternal(decoder);
-#endif
case NSType::Number:
return decodeNumberInternal(decoder);
case NSType::SecureCoding:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
