<!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>[238347] releases/WebKitGTK/webkit-2.22/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/238347">238347</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2018-11-17 03:01:12 -0800 (Sat, 17 Nov 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/237487">r237487</a> - Fix release build with -DLOG_DISABLED=0
https://bugs.webkit.org/show_bug.cgi?id=190866

Reviewed by Xabier Rodriguez-Calvar.

No new tests since no functionality changed.

* platform/graphics/Font.cpp:
* platform/graphics/Font.h:
* platform/graphics/FontPlatformData.h:
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
* platform/graphics/freetype/FontPlatformDataFreeType.cpp:
* platform/graphics/win/FontPlatformDataWin.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontcpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFonth">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontPlatformDatah">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicswinFontPlatformDataWincpp">releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit222SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog (238346 => 238347)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog  2018-11-17 10:33:14 UTC (rev 238346)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/ChangeLog     2018-11-17 11:01:12 UTC (rev 238347)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2018-10-27  Charlie Turner  <cturner@igalia.com>
+
+        Fix release build with -DLOG_DISABLED=0
+        https://bugs.webkit.org/show_bug.cgi?id=190866
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        No new tests since no functionality changed.
+
+        * platform/graphics/Font.cpp:
+        * platform/graphics/Font.h:
+        * platform/graphics/FontPlatformData.h:
+        * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+        * platform/graphics/freetype/FontPlatformDataFreeType.cpp:
+        * platform/graphics/win/FontPlatformDataWin.cpp:
+
</ins><span class="cx"> 2018-11-16  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         An early return from updateSchedulingInfo can leave some variables uninitialized.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/Font.cpp (238346 => 238347)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/Font.cpp 2018-11-17 10:33:14 UTC (rev 238346)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/Font.cpp    2018-11-17 11:01:12 UTC (rev 238347)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx">     return *derivedFontData.brokenIdeographFont;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String Font::description() const
</span><span class="cx"> {
</span><span class="cx">     if (origin() == Origin::Remote)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/Font.h (238346 => 238347)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/Font.h   2018-11-17 10:33:14 UTC (rev 238346)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/Font.h      2018-11-17 11:01:12 UTC (rev 238347)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx">     bool isInterstitial() const { return m_isInterstitial; }
</span><span class="cx">     Visibility visibility() const { return m_visibility; }
</span><span class="cx"> 
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx">     String description() const;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontPlatformData.h (238346 => 238347)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontPlatformData.h       2018-11-17 10:33:14 UTC (rev 238346)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/FontPlatformData.h  2018-11-17 11:01:12 UTC (rev 238347)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">     RefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx">     String description() const;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (238346 => 238347)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm   2018-11-17 10:33:14 UTC (rev 238346)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm      2018-11-17 11:01:12 UTC (rev 238347)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx">     return nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String FontPlatformData::description() const
</span><span class="cx"> {
</span><span class="cx">     auto fontDescription = adoptCF(CFCopyDescription(font()));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (238346 => 238347)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp    2018-11-17 10:33:14 UTC (rev 238346)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp       2018-11-17 11:01:12 UTC (rev 238347)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx">     return m_scaledFont == other.m_scaledFont;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String FontPlatformData::description() const
</span><span class="cx"> {
</span><span class="cx">     return String();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit222SourceWebCoreplatformgraphicswinFontPlatformDataWincpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp (238346 => 238347)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp      2018-11-17 10:33:14 UTC (rev 238346)
+++ releases/WebKitGTK/webkit-2.22/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp 2018-11-17 11:01:12 UTC (rev 238347)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">     return buffer;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#ifndef NDEBUG
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx"> String FontPlatformData::description() const
</span><span class="cx"> {
</span><span class="cx">     return String();
</span></span></pre>
</div>
</div>

</body>
</html>