Title: [201037] branches/safari-602.1.32-branch/Source/WebKit2
- Revision
- 201037
- Author
- [email protected]
- Date
- 2016-05-17 12:12:24 -0700 (Tue, 17 May 2016)
Log Message
Merge r200975. rdar://problem/24529203
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201036 => 201037)
--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 19:04:04 UTC (rev 201036)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 19:12:24 UTC (rev 201037)
@@ -1,5 +1,19 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200975. rdar://problem/24529203
+
+ 2016-05-16 Anders Carlsson <[email protected]>
+
+ Add a WKA extension point for WKPreferences SPI
+ https://bugs.webkit.org/show_bug.cgi?id=157762
+ rdar://problem/24529203
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200974. rdar://problem/26304845
2016-05-16 David Kilzer <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (201036 => 201037)
--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-05-17 19:04:04 UTC (rev 201036)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-05-17 19:12:24 UTC (rev 201037)
@@ -449,6 +449,10 @@
_preferences->setEnabledForFeature(value, *feature->_experimentalFeature);
}
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKPreferencesPrivateMethods.mm>
+#endif
+
@end
#endif // WK_API_ENABLED
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
