Title: [199258] trunk/Source
- Revision
- 199258
- Author
- [email protected]
- Date
- 2016-04-08 17:42:53 -0700 (Fri, 08 Apr 2016)
Log Message
[iOS Simulator] Build failure (property 'contentsFormat' not found on object of type 'LegacyTileLayer *')
https://bugs.webkit.org/show_bug.cgi?id=156415
Patch by Joseph Pecoraro <[email protected]> on 2016-04-08
Reviewed by Simon Fraser.
Source/WebCore:
* platform/spi/cocoa/QuartzCoreSPI.h:
Provide SPI forward declaration of the CALayer contentsFormat property.
Source/WebKit2:
* UIProcess/API/Cocoa/_WKElementAction.mm:
(-[_WKElementAction runActionWithElementInfo:]):
Use WeakObjCPtr instead of __weak to avoid build errors when not under ARC.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (199257 => 199258)
--- trunk/Source/WebCore/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
+++ trunk/Source/WebCore/ChangeLog 2016-04-09 00:42:53 UTC (rev 199258)
@@ -1,3 +1,13 @@
+2016-04-08 Joseph Pecoraro <[email protected]>
+
+ [iOS Simulator] Build failure (property 'contentsFormat' not found on object of type 'LegacyTileLayer *')
+ https://bugs.webkit.org/show_bug.cgi?id=156415
+
+ Reviewed by Simon Fraser.
+
+ * platform/spi/cocoa/QuartzCoreSPI.h:
+ Provide SPI forward declaration of the CALayer contentsFormat property.
+
2016-04-08 Alex Christensen <[email protected]>
Progress towards running CMake WebKit2 on Mac
Modified: trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (199257 => 199258)
--- trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-04-09 00:36:06 UTC (rev 199257)
+++ trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2016-04-09 00:42:53 UTC (rev 199258)
@@ -79,6 +79,9 @@
@property BOOL hitTestsAsOpaque;
@property BOOL needsLayoutOnGeometryChange;
@property BOOL shadowPathIsBounds;
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300
+@property (copy) NSString *contentsFormat;
+#endif
@end
@interface CATiledLayer ()
Modified: trunk/Source/WebKit2/ChangeLog (199257 => 199258)
--- trunk/Source/WebKit2/ChangeLog 2016-04-09 00:36:06 UTC (rev 199257)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-09 00:42:53 UTC (rev 199258)
@@ -1,3 +1,14 @@
+2016-04-08 Joseph Pecoraro <[email protected]>
+
+ [iOS Simulator] Build failure (property 'contentsFormat' not found on object of type 'LegacyTileLayer *')
+ https://bugs.webkit.org/show_bug.cgi?id=156415
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/Cocoa/_WKElementAction.mm:
+ (-[_WKElementAction runActionWithElementInfo:]):
+ Use WeakObjCPtr instead of __weak to avoid build errors when not under ARC.
+
2016-04-08 Alex Christensen <[email protected]>
Progress towards running CMake WebKit2 on Mac
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm (199257 => 199258)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm 2016-04-09 00:36:06 UTC (rev 199257)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKElementAction.mm 2016-04-09 00:42:53 UTC (rev 199258)
@@ -33,6 +33,7 @@
#import "GestureTypes.h"
#import "WKActionSheetAssistant.h"
#import "WKContentViewInteraction.h"
+#import "WeakObjCPtr.h"
#import "_WKActivatedElementInfoInternal.h"
#import <WebCore/LocalizedStrings.h>
#import <WebCore/SoftLinking.h>
@@ -51,7 +52,7 @@
RetainPtr<NSString> _title;
WKElementActionHandlerInternal _actionHandler;
WKElementActionDismissalHandler _dismissalHandler;
- __weak WKActionSheetAssistant *_defaultActionSheetAssistant;
+ WebKit::WeakObjCPtr<WKActionSheetAssistant> _defaultActionSheetAssistant;
}
- (id)_initWithTitle:(NSString *)title actionHandler:(WKElementActionHandlerInternal)handler type:(_WKElementActionType)type assistant:(WKActionSheetAssistant *)assistant
@@ -168,7 +169,7 @@
- (void)runActionWithElementInfo:(_WKActivatedElementInfo *)info
{
- [self _runActionWithElementInfo:info forActionSheetAssistant:_defaultActionSheetAssistant];
+ [self _runActionWithElementInfo:info forActionSheetAssistant:_defaultActionSheetAssistant.get().get()];
}
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
