2011-05-22 Jeff Miller <jeffm@apple.com>

Reviewed by Darin Adler. Don't call WebKit::initializeLogChannelsIfNecessary if logging is disabled https://bugs.webkit.org/show_bug.cgi?id=61249 * UIProcess/WebContext.cpp: (WebKit::WebContext::WebContext): Check #if !LOG_DISABLED, not #ifndef NDEBUG, to decide whether to call WebKit::initializeLogChannelsIfNecessary(). Canonical link: https://commits.webkit.org/76629@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@87031 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · May 22, 2011 · 5863ba1 · 5863ba1
1 parent 1b9ef36
commit 5863ba1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2011-05-22  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Don't call WebKit::initializeLogChannelsIfNecessary if logging is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=61249
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::WebContext): Check #if !LOG_DISABLED, not #ifndef NDEBUG, to decide whether to call WebKit::initializeLogChannelsIfNecessary().
+
 2011-05-21  Nancy Piedra  <nancy.piedra@nokia.com>
 
         Reviewed by Andreas Kling.

diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -129,7 +129,7 @@ WebContext::WebContext(ProcessModel processModel, const String& injectedBundlePa
 #endif
     , m_processTerminationEnabled(true)
 {
-#ifndef NDEBUG
+#if !LOG_DISABLED
     WebKit::initializeLogChannelsIfNecessary();
 #endif