Title: [206097] trunk/Source/WebKit2
- Revision
- 206097
- Author
- commit-qu...@webkit.org
- Date
- 2016-09-19 09:01:08 -0700 (Mon, 19 Sep 2016)
Log Message
Only override URLParser::enabled if NSUserDefaults object exists
https://bugs.webkit.org/show_bug.cgi?id=162131
Patch by Alex Christensen <achristen...@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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (206096 => 206097)
--- trunk/Source/WebKit2/ChangeLog 2016-09-19 14:31:16 UTC (rev 206096)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-19 16:01:08 UTC (rev 206097)
@@ -1,3 +1,17 @@
+2016-09-19 Alex Christensen <achristen...@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 <pecor...@apple.com>
Web Inspector: Bring the inspected page's window forward when activating element search
Modified: trunk/Source/WebKit2/Shared/Cocoa/WebKit2InitializeCocoa.mm (206096 => 206097)
--- trunk/Source/WebKit2/Shared/Cocoa/WebKit2InitializeCocoa.mm 2016-09-19 14:31:16 UTC (rev 206096)
+++ trunk/Source/WebKit2/Shared/Cocoa/WebKit2InitializeCocoa.mm 2016-09-19 16:01:08 UTC (rev 206097)
@@ -40,7 +40,9 @@
// We don't want to use NSUserDefaults in the child processes.
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]);
});
}
}
Modified: trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp (206096 => 206097)
--- trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2016-09-19 14:31:16 UTC (rev 206096)
+++ trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2016-09-19 16:01:08 UTC (rev 206097)
@@ -28,7 +28,6 @@
#include "LogInitialization.h"
#include <WebCore/LogInitialization.h>
-#include <WebCore/URLParser.h>
#include <runtime/InitializeThreading.h>
#include <wtf/MainThread.h>
#include <wtf/RunLoop.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
