Changeset 141447 in webkit

Timestamp:

Jan 31, 2013, 11:06:51 AM (12 years ago)

Author:

beidson@apple.com

Message:

Lack of a log level string should not obliterate compiled in logging channel state.
​https://bugs.webkit.org/show_bug.cgi?id=108502

Reviewed by Alexey Proskuryakov and Sam Weinig.

Source/WebKit/mac:

• Misc/WebKitLogging.m: If there's no log level string, leave the channel state alone.

Source/WebKit2:

• Platform/mac/Logging.mac.mm:

(WebKit::initializeLogChannel): If there's no log level string, leave the channel state alone.

Location:

trunk/Source

Files:

• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Misc/WebKitLogging.m (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Platform/mac/Logging.mac.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-01-31  Brady Eidson  <beidson@apple.com>
+
+        Lack of a log level string should not obliterate compiled in logging channel state.
+        https://bugs.webkit.org/show_bug.cgi?id=108502
+
+        Reviewed by Alexey Proskuryakov and Sam Weinig.
+
+        * Misc/WebKitLogging.m: If there's no log level string, leave the channel state alone.
+
 2013-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/mac/Misc/WebKitLogging.m

@@ -58 +58 @@
 static void initializeLogChannel(WTFLogChannel *channel)
 {
-    channel->state = WTFLogChannelOff;
     NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithUTF8String:channel->defaultName]];
+
+    // If there's no log level string from the user defaults, don't obliterate the compiled in values.
     if (logLevelString) {
+        channel->state = WTFLogChannelOff;
         unsigned logLevel;
         if (![[NSScanner scannerWithString:logLevelString] scanHexInt:&logLevel])

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-31  Brady Eidson  <beidson@apple.com>
+
+        Lack of a log level string should not obliterate compiled in logging channel state.
+        https://bugs.webkit.org/show_bug.cgi?id=108502
+
+        Reviewed by Alexey Proskuryakov and Sam Weinig.
+
+        * Platform/mac/Logging.mac.mm:
+        (WebKit::initializeLogChannel): If there's no log level string, leave the channel state alone.
+
 2013-01-31  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/Platform/mac/Logging.mac.mm

@@ -33 +33 @@
 void initializeLogChannel(WTFLogChannel* channel)
 {
-    channel->state = WTFLogChannelOff;
+    // If there is no log level string from the user defaults then don't change the logging channel at all.
     NSString *logLevelString = [[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithUTF8String:channel->defaultName]];
     if (!logLevelString)
         return;
-        
+
+    channel->state = WTFLogChannelOff;
+
     unsigned logLevel;
     if (![[NSScanner scannerWithString:logLevelString] scanHexInt:&logLevel])