Merge WebKit at r62496: Initial merge by git

Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2

1 files changed, 23 insertions, 1 deletions

diff --git a/WebKit/mac/WebView/WebPreferences.mm b/WebKit/mac/WebView/WebPreferences.mm
index 0a192f9..a376458 100644
--- a/WebKit/mac/WebView/WebPreferences.mm
+++ b/WebKit/mac/WebView/WebPreferences.mm
@@ -360,7 +360,9 @@ static WebCacheModel cacheModelForMainBundle(void)
         [NSNumber numberWithBool:NO],   WebKitUsesProxiedOpenPanelPreferenceKey,
         [NSNumber numberWithUnsignedInt:4], WebKitPluginAllowedRunTimePreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitFrameFlatteningEnabledPreferenceKey,
-        [NSNumber numberWithBool:YES],   WebKitHTML5ParserEnabledPreferenceKey,
+        [NSNumber numberWithBool:YES],  WebKitHTML5ParserEnabledPreferenceKey,
+        [NSNumber numberWithBool:NO],   WebKitHTML5TreeBuilderEnabledPreferenceKey,
+        [NSNumber numberWithBool:YES],  WebKitDNSPrefetchingEnabledPreferenceKey,
         nil];
 
     // This value shouldn't ever change, which is assumed in the initialization of WebKitPDFDisplayModePreferenceKey above
@@ -755,6 +757,16 @@ static WebCacheModel cacheModelForMainBundle(void)
 
 @implementation WebPreferences (WebPrivate)
 
+- (BOOL)isDNSPrefetchingEnabled
+{
+    return [self _boolValueForKey:WebKitDNSPrefetchingEnabledPreferenceKey];
+}
+
+- (void)setDNSPrefetchingEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitDNSPrefetchingEnabledPreferenceKey];
+}
+
 - (BOOL)developerExtrasEnabled
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -1249,6 +1261,16 @@ static NSString *classIBCreatorID = nil;
     [self _setBoolValue:flag forKey:WebKitHTML5ParserEnabledPreferenceKey];
 }
 
+- (BOOL)html5TreeBuilderEnabled
+{
+    return [self _boolValueForKey:WebKitHTML5TreeBuilderEnabledPreferenceKey];
+}
+
+- (void)setHTML5TreeBuilderEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitHTML5TreeBuilderEnabledPreferenceKey];
+}
+
 - (BOOL)paginateDuringLayoutEnabled
 {
     return [self _boolValueForKey:WebKitPaginateDuringLayoutEnabledPreferenceKey];