<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[206120] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206120">206120</a></dd>
<dt>Author</dt> <dd>krollin@apple.com</dd>
<dt>Date</dt> <dd>2016-09-19 14:59:28 -0700 (Mon, 19 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/205275">r205275</a>): 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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLogMacrosh">trunk/Source/WebCore/platform/LogMacros.h</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingcpp">trunk/Source/WebCore/platform/Logging.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206119 => 206120)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-09-19 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(TEXT_AUTOSIZING) automatic text size adjustment code
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLogMacrosh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LogMacros.h (206119 => 206120)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx">
</span><del>-#if LOG_DISABLED && RELEASE_LOG_DISABLED
</del><ins>+#if LOG_DISABLED
</ins><span class="cx">
</span><span class="cx"> #define LOG_RESULT(channel, function) ((void)0)
</span><span class="cx"> #define LOG_WITH_STREAM(channel, commands) ((void)0)
</span><span class="lines">@@ -47,4 +47,4 @@
</span><span class="cx"> return stream.release().utf8().data(); \
</span><span class="cx"> });
</span><span class="cx">
</span><del>-#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</del><ins>+#endif // !LOG_DISABLED
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.cpp (206119 => 206120)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,10 +35,10 @@
</span><span class="cx"> #include <notify.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+namespace WebCore {
+
</ins><span class="cx"> #if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</span><span class="cx">
</span><del>-namespace WebCore {
-
</del><span class="cx"> #define DEFINE_WEBCORE_LOG_CHANNEL(name) DEFINE_LOG_CHANNEL(name, LOG_CHANNEL_WEBKIT_SUBSYSTEM)
</span><span class="cx"> WEBCORE_LOG_CHANNELS(DEFINE_WEBCORE_LOG_CHANNEL)
</span><span class="cx">
</span><span class="lines">@@ -93,11 +93,14 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
+
+#if !LOG_DISABLED
</ins><span class="cx"> void logFunctionResult(WTFLogChannel* channel, std::function<const char*()> function)
</span><span class="cx"> {
</span><span class="cx"> WTFLog(channel, "%s", function());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // !LOG_DISABLED
+
</ins><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (206119 => 206120)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !LOG_DISABLED || !RELEASE_LOG_DISABLED
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> double startTime = currentTime();
</span><span class="cx"> #endif
</span><span class="cx"> RetainPtr<CGImageRef> subImage(image);
</span></span></pre>
</div>
</div>
</body>
</html>