<!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>[270206] trunk/Source</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/270206">270206</a></dd>
<dt>Author</dt> <dd>don.olmstead@sony.com</dd>
<dt>Date</dt> <dd>2020-11-27 12:38:10 -0800 (Fri, 27 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Non-unified build fixes, late November 2020 edition, take two
https://bugs.webkit.org/show_bug.cgi?id=219317

Unreviewed non-unified build fixes.


Source/WebCore:

* display/css/DisplayBox.cpp:
* layout/integration/LayoutIntegrationLineLayout.cpp:
* rendering/RenderBlockFlow.cpp:

Source/WebKit:

* Shared/WebPreferencesDefaultValues.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredisplaycssDisplayBoxcpp">trunk/Source/WebCore/display/css/DisplayBox.cpp</a></li>
<li><a href="#trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp">trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedWebPreferencesDefaultValuescpp">trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (270205 => 270206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-27 20:36:55 UTC (rev 270205)
+++ trunk/Source/WebCore/ChangeLog      2020-11-27 20:38:10 UTC (rev 270206)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2020-11-27  Don Olmstead  <don.olmstead@sony.com>
+
+        Non-unified build fixes, late November 2020 edition, take two
+        https://bugs.webkit.org/show_bug.cgi?id=219317
+
+        Unreviewed non-unified build fixes.
+
+        * display/css/DisplayBox.cpp:
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        * rendering/RenderBlockFlow.cpp:
+
</ins><span class="cx"> 2020-11-27  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [WinCairo][Clang] html/canvas/WebGLDrawBuffers.cpp(77,29): error: non-constant-expression cannot be narrowed from type 'WebCore::GraphicsContextGL::(anonymous enum at GraphicsContextGL.h:64:5)' to 'GCGLenum' (aka 'unsigned int') in initializer list
</span></span></pre></div>
<a id="trunkSourceWebCoredisplaycssDisplayBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/display/css/DisplayBox.cpp (270205 => 270206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/display/css/DisplayBox.cpp  2020-11-27 20:36:55 UTC (rev 270205)
+++ trunk/Source/WebCore/display/css/DisplayBox.cpp     2020-11-27 20:38:10 UTC (rev 270206)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
</span><span class="cx"> 
</span><span class="cx"> #include "FillLayer.h"
</span><ins>+#include "ShadowData.h"
</ins><span class="cx"> #include <wtf/IsoMallocInlines.h>
</span><span class="cx"> #include <wtf/text/TextStream.h>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorelayoutintegrationLayoutIntegrationLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp (270205 => 270206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp  2020-11-27 20:36:55 UTC (rev 270205)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp     2020-11-27 20:38:10 UTC (rev 270206)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "RenderChildIterator.h"
</span><span class="cx"> #include "RenderDescendantIterator.h"
</span><span class="cx"> #include "RenderImage.h"
</span><ins>+#include "RenderInline.h"
</ins><span class="cx"> #include "RenderLineBreak.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (270205 => 270206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp       2020-11-27 20:36:55 UTC (rev 270205)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp  2020-11-27 20:38:10 UTC (rev 270206)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><span class="cx"> #include "HTMLTextAreaElement.h"
</span><span class="cx"> #include "HitTestLocation.h"
</span><ins>+#include "InlineIterator.h"
</ins><span class="cx"> #include "InlineTextBox.h"
</span><span class="cx"> #include "LayoutIntegrationLineIterator.h"
</span><span class="cx"> #include "LayoutIntegrationLineLayout.h"
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (270205 => 270206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-11-27 20:36:55 UTC (rev 270205)
+++ trunk/Source/WebKit/ChangeLog       2020-11-27 20:38:10 UTC (rev 270206)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2020-11-27  Don Olmstead  <don.olmstead@sony.com>
</span><span class="cx"> 
</span><ins>+        Non-unified build fixes, late November 2020 edition, take two
+        https://bugs.webkit.org/show_bug.cgi?id=219317
+
+        Unreviewed non-unified build fixes.
+
+        * Shared/WebPreferencesDefaultValues.cpp:
+
+2020-11-27  Don Olmstead  <don.olmstead@sony.com>
+
</ins><span class="cx">         Fix build when ENABLE_RESOURCE_LOAD_STATISTICS is disabled
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=219316
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebPreferencesDefaultValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (270205 => 270206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp       2020-11-27 20:36:55 UTC (rev 270205)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp  2020-11-27 20:38:10 UTC (rev 270206)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebPreferencesDefaultValues.h"
</span><span class="cx"> 
</span><span class="cx"> #include <WebCore/RuntimeApplicationChecks.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include <WebCore/VersionChecks.h>
</span></span></pre>
</div>
</div>

</body>
</html>