Changeset 206120 in webkit

Timestamp:

Sep 19, 2016 2:59:28 PM (8 years ago)

Author:

Keith Rollin

Message:

REGRESSION (r205275): LOG_WITH_STREAM() macros are all compiled in release builds now
​https://bugs.webkit.org/show_bug.cgi?id=162180

Reviewed by Simon Fraser.

Disable LOG_WITH_STREAM in release mode. Along with this, remove a
local variable in GraphcsContextCG.cpp in release mode that's no
longer referenced. And adjust logFunctionResult so that it gets
defined only in debug mode, too, to match its declaration in
LogMacros.h.

No new tests -- there are no tests for logging.

• platform/LogMacros.h:
• platform/Logging.cpp:
• platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::GraphicsContext::drawNativeImage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/LogMacros.h (modified) (2 diffs)
• platform/Logging.cpp (modified) (3 diffs)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-19  Keith Rollin  <krollin@apple.com>
+
+        REGRESSION (r205275): LOG_WITH_STREAM() macros are all compiled in release builds now
+        https://bugs.webkit.org/show_bug.cgi?id=162180
+
+        Reviewed by Simon Fraser.
+
+        Disable LOG_WITH_STREAM in release mode. Along with this, remove a
+        local variable in GraphcsContextCG.cpp in release mode that's no
+        longer referenced. And adjust logFunctionResult so that it gets
+        defined only in debug mode, too, to match its declaration in
+        LogMacros.h.
+
+        No new tests -- there are no tests for logging.
+
+        * platform/LogMacros.h:
+        * platform/Logging.cpp:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::drawNativeImage):
+
 2016-09-19  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/LogMacros.h

@@ -28 +28 @@
 #include <functional>
 
-#if LOG_DISABLED && RELEASE_LOG_DISABLED
+#if LOG_DISABLED
 
 #define LOG_RESULT(channel, function) ((void)0)
@@ -48 +48 @@
     });
 
-#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
+#endif // !LOG_DISABLED

trunk/Source/WebCore/platform/Logging.cpp

@@ -36 +36 @@
 #endif
 
+namespace WebCore {
+
 #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
-
-namespace WebCore {
 
 #define DEFINE_WEBCORE_LOG_CHANNEL(name) DEFINE_LOG_CHANNEL(name, LOG_CHANNEL_WEBKIT_SUBSYSTEM)
@@ -94 +94 @@
 #endif
 
+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
+
+#if !LOG_DISABLED
 void logFunctionResult(WTFLogChannel* channel, std::function<const char*()> function)
 {
@@ -99 +102 @@
 }
 
+#endif // !LOG_DISABLED
+
 } // namespace WebCore
-
-#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -176 +176 @@
     }
 
-#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
+#if !LOG_DISABLED
     double startTime = currentTime();
 #endif