Title: [179215] branches/safari-600.1.4.15-branch/Source/WebKit2
- Revision
- 179215
- Author
- [email protected]
- Date
- 2015-01-27 14:05:58 -0800 (Tue, 27 Jan 2015)
Log Message
Merged r177531. rdar://problem/19445868
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (179214 => 179215)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-27 22:02:36 UTC (rev 179214)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-27 22:05:58 UTC (rev 179215)
@@ -1,5 +1,22 @@
2015-01-27 Lucas Forschler <[email protected]>
+ Merge r177531
+
+ 2014-12-18 Chris Dumez <[email protected]>
+
+ Add missing availability annotation on @property _featureCounterEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=139794
+ <rdar://problem/19266254>
+
+ Rubber-stamped by Dan Bernstein.
+
+ Follow-up to r177526 adding availability annotation on @property
+ _featureCounterEnabled.
+
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+
+2015-01-27 Lucas Forschler <[email protected]>
+
Merge r177526
2014-12-18 Chris Dumez <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (179214 => 179215)
--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-01-27 22:02:36 UTC (rev 179214)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2015-01-27 22:05:58 UTC (rev 179215)
@@ -43,7 +43,7 @@
@property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
#if TARGET_OS_IPHONE
-@property (nonatomic, setter=_setFeatureCounterEnabled:) BOOL _featureCounterEnabled;
+@property (nonatomic, setter=_setFeatureCounterEnabled:) BOOL _featureCounterEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
#endif
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
