<!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>[184339] 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/184339">184339</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-05-14 09:37:27 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix typo in RenderBox::instrinsicScrollbarLogicalWidth()
https://bugs.webkit.org/show_bug.cgi?id=144999
Reviewed by Sergio Villar Senin.
Rename RenderBox::instrinsicScrollbarLogicalWidth() to
RenderBox::intrinsicScrollbarLogicalWidth().
No new tests, no behavior changes.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeIntrinsicLogicalWidths):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeIntrinsicLogicalWidths):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::intrinsicScrollbarLogicalWidth):
(WebCore::RenderBox::instrinsicScrollbarLogicalWidth): Deleted.
* rendering/RenderBox.h:
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidths):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184338 => 184339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/ChangeLog 2015-05-14 16:37:27 UTC (rev 184339)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-05-14 Manuel Rego Casasnovas <rego@igalia.com>
+
+ Fix typo in RenderBox::instrinsicScrollbarLogicalWidth()
+ https://bugs.webkit.org/show_bug.cgi?id=144999
+
+ Reviewed by Sergio Villar Senin.
+
+ Rename RenderBox::instrinsicScrollbarLogicalWidth() to
+ RenderBox::intrinsicScrollbarLogicalWidth().
+
+ No new tests, no behavior changes.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeIntrinsicLogicalWidths):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::computeIntrinsicLogicalWidths):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::intrinsicScrollbarLogicalWidth):
+ (WebCore::RenderBox::instrinsicScrollbarLogicalWidth): Deleted.
+ * rendering/RenderBox.h:
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::computeIntrinsicLogicalWidths):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::computeIntrinsicLogicalWidths):
+
</ins><span class="cx"> 2015-05-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> SharedBuffer::createWithContentsOfFile should use map file routines
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (184338 => 184339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-05-14 16:37:27 UTC (rev 184339)
</span><span class="lines">@@ -2647,7 +2647,7 @@
</span><span class="cx">
</span><span class="cx"> maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
</span><span class="cx">
</span><del>- int scrollbarWidth = instrinsicScrollbarLogicalWidth();
</del><ins>+ int scrollbarWidth = intrinsicScrollbarLogicalWidth();
</ins><span class="cx"> maxLogicalWidth += scrollbarWidth;
</span><span class="cx"> minLogicalWidth += scrollbarWidth;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (184338 => 184339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-05-14 16:37:27 UTC (rev 184339)
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(tableCellWidth.value()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int scrollbarWidth = instrinsicScrollbarLogicalWidth();
</del><ins>+ int scrollbarWidth = intrinsicScrollbarLogicalWidth();
</ins><span class="cx"> maxLogicalWidth += scrollbarWidth;
</span><span class="cx"> minLogicalWidth += scrollbarWidth;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (184338 => 184339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-05-14 16:37:27 UTC (rev 184339)
</span><span class="lines">@@ -793,7 +793,7 @@
</span><span class="cx"> return includeHorizontalScrollbarSize() ? layer()->horizontalScrollbarHeight() : 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderBox::instrinsicScrollbarLogicalWidth() const
</del><ins>+int RenderBox::intrinsicScrollbarLogicalWidth() const
</ins><span class="cx"> {
</span><span class="cx"> if (!hasOverflowClip())
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (184338 => 184339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-05-14 16:37:27 UTC (rev 184339)
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx">
</span><span class="cx"> virtual int verticalScrollbarWidth() const;
</span><span class="cx"> int horizontalScrollbarHeight() const;
</span><del>- int instrinsicScrollbarLogicalWidth() const;
</del><ins>+ int intrinsicScrollbarLogicalWidth() const;
</ins><span class="cx"> int scrollbarLogicalHeight() const { return style().isHorizontalWritingMode() ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
</span><span class="cx"> virtual bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint());
</span><span class="cx"> virtual bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (184338 => 184339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-05-14 16:37:27 UTC (rev 184339)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx">
</span><span class="cx"> maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
</span><span class="cx">
</span><del>- LayoutUnit scrollbarWidth = instrinsicScrollbarLogicalWidth();
</del><ins>+ LayoutUnit scrollbarWidth = intrinsicScrollbarLogicalWidth();
</ins><span class="cx"> maxLogicalWidth += scrollbarWidth;
</span><span class="cx"> minLogicalWidth += scrollbarWidth;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (184338 => 184339)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-05-14 16:31:23 UTC (rev 184338)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-05-14 16:37:27 UTC (rev 184339)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx">
</span><span class="cx"> maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
</span><span class="cx">
</span><del>- LayoutUnit scrollbarWidth = instrinsicScrollbarLogicalWidth();
</del><ins>+ LayoutUnit scrollbarWidth = intrinsicScrollbarLogicalWidth();
</ins><span class="cx"> maxLogicalWidth += scrollbarWidth;
</span><span class="cx"> minLogicalWidth += scrollbarWidth;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>