Title: [163567] trunk/Source/WebKit2
- Revision
- 163567
- Author
- [email protected]
- Date
- 2014-02-06 15:29:43 -0800 (Thu, 06 Feb 2014)
Log Message
Add preferences property to WKWebViewConfiguration
https://bugs.webkit.org/show_bug.cgi?id=128337
Reviewed by Sam Weinig.
Also use RetainPtr for processClass and preferences so we won't leak them.
* UIProcess/API/Cocoa/WKWebViewConfiguration.h:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration processClass]):
(-[WKWebViewConfiguration setProcessClass:]):
(-[WKWebViewConfiguration preferences]):
(-[WKWebViewConfiguration setPreferences:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163566 => 163567)
--- trunk/Source/WebKit2/ChangeLog 2014-02-06 23:24:36 UTC (rev 163566)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-06 23:29:43 UTC (rev 163567)
@@ -1,5 +1,22 @@
2014-02-06 Anders Carlsson <[email protected]>
+ Add preferences property to WKWebViewConfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=128337
+
+ Reviewed by Sam Weinig.
+
+ Also use RetainPtr for processClass and preferences so we won't leak them.
+
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration processClass]):
+ (-[WKWebViewConfiguration setProcessClass:]):
+ (-[WKWebViewConfiguration preferences]):
+ (-[WKWebViewConfiguration setPreferences:]):
+
+2014-02-06 Anders Carlsson <[email protected]>
+
Add a remoteObjectRegistry property to WKWebView
https://bugs.webkit.org/show_bug.cgi?id=128331
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (163566 => 163567)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-02-06 23:24:36 UTC (rev 163566)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-02-06 23:29:43 UTC (rev 163567)
@@ -28,6 +28,7 @@
#if WK_API_ENABLED
+@class WKPreferences;
@class WKProcessClass;
/*! A @link WKWebViewConfiguration @/link is a collection of properties used to initialize a web
@@ -47,6 +48,8 @@
*/
@property (nonatomic, strong) WKProcessClass *processClass;
+@property (nonatomic, strong) WKPreferences *preferences;
+
@end
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (163566 => 163567)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-02-06 23:24:36 UTC (rev 163566)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-02-06 23:29:43 UTC (rev 163567)
@@ -28,17 +28,43 @@
#if WK_API_ENABLED
-@implementation WKWebViewConfiguration
+#import <wtf/RetainPtr.h>
+@implementation WKWebViewConfiguration {
+ RetainPtr<WKProcessClass> _processClass;
+ RetainPtr<WKPreferences> _preferences;
+}
+
- (id)copyWithZone:(NSZone *)zone
{
WKWebViewConfiguration *configuration = [[[self class] allocWithZone:zone] init];
- configuration.processClass = _processClass;
+ configuration.processClass = _processClass.get();
+ configuration.preferences = _preferences.get();
return configuration;
}
+- (WKProcessClass *)processClass
+{
+ return _processClass.get();
+}
+
+- (void)setProcessClass:(WKProcessClass *)processClass
+{
+ _processClass = processClass;
+}
+
+- (WKPreferences *)preferences
+{
+ return _preferences.get();
+}
+
+- (void)setPreferences:(WKPreferences *)preferences
+{
+ _preferences = preferences;
+}
+
@end
#endif // WK_API_ENABLED
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
