Title: [206120] trunk/Source/WebCore
- Revision
- 206120
- Author
- krol...@apple.com
- Date
- 2016-09-19 14:59:28 -0700 (Mon, 19 Sep 2016)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206119 => 206120)
--- trunk/Source/WebCore/ChangeLog 2016-09-19 21:25:15 UTC (rev 206119)
+++ trunk/Source/WebCore/ChangeLog 2016-09-19 21:59:28 UTC (rev 206120)
@@ -1,3 +1,23 @@
+2016-09-19 Keith Rollin <krol...@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 <daba...@apple.com>
Remove ENABLE(TEXT_AUTOSIZING) automatic text size adjustment code
Modified: trunk/Source/WebCore/platform/LogMacros.h (206119 => 206120)
--- trunk/Source/WebCore/platform/LogMacros.h 2016-09-19 21:25:15 UTC (rev 206119)
+++ trunk/Source/WebCore/platform/LogMacros.h 2016-09-19 21:59:28 UTC (rev 206120)
@@ -27,7 +27,7 @@
#include <functional>
-#if LOG_DISABLED && RELEASE_LOG_DISABLED
+#if LOG_DISABLED
#define LOG_RESULT(channel, function) ((void)0)
#define LOG_WITH_STREAM(channel, commands) ((void)0)
@@ -47,4 +47,4 @@
return stream.release().utf8().data(); \
});
-#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
+#endif // !LOG_DISABLED
Modified: trunk/Source/WebCore/platform/Logging.cpp (206119 => 206120)
--- trunk/Source/WebCore/platform/Logging.cpp 2016-09-19 21:25:15 UTC (rev 206119)
+++ trunk/Source/WebCore/platform/Logging.cpp 2016-09-19 21:59:28 UTC (rev 206120)
@@ -35,10 +35,10 @@
#include <notify.h>
#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)
WEBCORE_LOG_CHANNELS(DEFINE_WEBCORE_LOG_CHANNEL)
@@ -93,11 +93,14 @@
}
#endif
+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
+
+#if !LOG_DISABLED
void logFunctionResult(WTFLogChannel* channel, std::function<const char*()> function)
{
WTFLog(channel, "%s", function());
}
+#endif // !LOG_DISABLED
+
} // namespace WebCore
-
-#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (206119 => 206120)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-09-19 21:25:15 UTC (rev 206119)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-09-19 21:59:28 UTC (rev 206120)
@@ -175,7 +175,7 @@
return;
}
-#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
+#if !LOG_DISABLED
double startTime = currentTime();
#endif
RetainPtr<CGImageRef> subImage(image);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
