Changeset 206097 in webkit

Timestamp:

Sep 19, 2016 9:01:08 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Only override URLParser::enabled if NSUserDefaults object exists
​https://bugs.webkit.org/show_bug.cgi?id=162131

Patch by Alex Christensen <​achristensen@webkit.org> on 2016-09-19
Reviewed by Sam Weinig.

• Shared/Cocoa/WebKit2InitializeCocoa.mm:

(WebKit::platformInitializeWebKit2):

• Shared/WebKit2Initialize.cpp:

When I enable URLParser by default, I will want the default to only be overwritten if there is a
NSUserDefaults key for URLParserEnabled. Right now it is setting URLParser::enabled to false always,
which isn't a problem because the default is also false. When the default is true, that will overwrite the default.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/WebKit2InitializeCocoa.mm (modified) (1 diff)
• Shared/WebKit2Initialize.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-19  Alex Christensen  <achristensen@webkit.org>
+
+        Only override URLParser::enabled if NSUserDefaults object exists
+        https://bugs.webkit.org/show_bug.cgi?id=162131
+
+        Reviewed by Sam Weinig.
+
+        * Shared/Cocoa/WebKit2InitializeCocoa.mm:
+        (WebKit::platformInitializeWebKit2):
+        * Shared/WebKit2Initialize.cpp:
+        When I enable URLParser by default, I will want the default to only be overwritten if there is a
+        NSUserDefaults key for URLParserEnabled.  Right now it is setting URLParser::enabled to false always,
+        which isn't a problem because the default is also false.  When the default is true, that will overwrite the default.
+
 2016-09-19  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit2/Shared/Cocoa/WebKit2InitializeCocoa.mm

@@ -41 +41 @@
     if (processType == UIProcess) {
         dispatch_once(&initOnce, ^ {
-            URLParser::setEnabled([[NSUserDefaults standardUserDefaults] boolForKey:@"URLParserEnabled"]);
+            NSString *key = @"URLParserEnabled";
+            if ([[NSUserDefaults standardUserDefaults] objectForKey:key])
+                URLParser::setEnabled([[NSUserDefaults standardUserDefaults] boolForKey:key]);
         });
     }

trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp

@@ -29 +29 @@
 #include "LogInitialization.h"
 #include <WebCore/LogInitialization.h>
-#include <WebCore/URLParser.h>
 #include <runtime/InitializeThreading.h>
 #include <wtf/MainThread.h>