Changeset 242923 in webkit

Timestamp:

Mar 13, 2019 5:17:23 PM (5 years ago)

Author:

timothy@apple.com

Message:

Unreviewed speculative build fix for watchOS after r242908.

• Shared/Cocoa/ArgumentCodersCocoa.mm:

(IPC::decodeObject):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/ArgumentCodersCocoa.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-13  Timothy Hatcher  <timothy@apple.com>
+
+        Unreviewed speculative build fix for watchOS after r242908.
+
+        * Shared/Cocoa/ArgumentCodersCocoa.mm:
+        (IPC::decodeObject):
+
 2019-03-13  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit/Shared/Cocoa/ArgumentCodersCocoa.mm

@@ -39 +39 @@
 #endif
 
-#if USE(APPKIT)
-#define PlatformFont NSFont
-#define PlatformFontDescriptor NSFontDescriptor
+#if PLATFORM(IOS_FAMILY)
+#import <UIKit/UIFont.h>
+#import <UIKit/UIFontDescriptor.h>
+#endif
+
+#if USE(APPKIT)
+using PlatformFont = NSFont;
+using PlatformFontDescriptor = NSFontDescriptor;
 #else
-#define PlatformFont UIFont
-#define PlatformFontDescriptor UIFontDescriptor
+using PlatformFont = UIFont;
+using PlatformFontDescriptor = UIFontDescriptor;
 #endif
 
@@ -437 +442 @@
     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);