<!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>[179030] branches/safari-600.1.4.15-branch/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/179030">179030</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-01-23 15:05:05 -0800 (Fri, 23 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174297">r174297</a>. rdar://problem/19434944</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsFontcpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsFonth">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsWidthIteratorcpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreplatformgraphicsmacComplexTextControllercpp">branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderBlockLineLayoutcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderTextcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderTexth">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179029 => 179030)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 23:05:05 UTC (rev 179030)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2015-01-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174297
+
+ 2014-10-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Clean up interface to Font::expansionOpportunityCount()
+ https://bugs.webkit.org/show_bug.cgi?id=137355
+
+ Reviewed by Dean Jackson.
+
+ There are two overloads of Font::expansionOpportunityCount() which perform the same
+ operation. One overload takes a UChar*, the other takes an LChar*, and they both
+ take a length. This is the abstraction that StringView was designed to be. Instead
+ of forcing each caller to take a different overload based on if their data is
+ 8 bit or not, allow the caller to construct a StringView and pass that into
+ Font::expansionOpportunityCount() instead of a raw pointer/length.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::expansionOpportunityCountInternal): Original two functions,
+ renamed.
+ (WebCore::Font::expansionOpportunityCount): Takes a StringView, calls
+ expansionOpportunityCountInternal().
+ * platform/graphics/Font.h: Update signatures.
+ * platform/graphics/WidthIterator.cpp:
+ (WebCore::WidthIterator::WidthIterator): Use new signature to
+ Font::expansionOpportunityCount().
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::ComplexTextController): Ditto.
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment): Ditto.
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::stringView): Accessor to encapsulate character pointer
+ and length.
+ * rendering/RenderText.h: Signature of new accessor.
+
+2015-01-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r174233
</span><span class="cx">
</span><span class="cx"> 2014-10-01 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp (179029 => 179030)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.cpp 2015-01-23 23:05:05 UTC (rev 179030)
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> return isCJKIdeograph(c);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned Font::expansionOpportunityCount(const LChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion)
</del><ins>+unsigned Font::expansionOpportunityCountInternal(const LChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion)
</ins><span class="cx"> {
</span><span class="cx"> unsigned count = 0;
</span><span class="cx"> if (direction == LTR) {
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx"> return count;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned Font::expansionOpportunityCount(const UChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion)
</del><ins>+unsigned Font::expansionOpportunityCountInternal(const UChar* characters, size_t length, TextDirection direction, bool& isAfterExpansion)
</ins><span class="cx"> {
</span><span class="cx"> static bool expandAroundIdeographs = canExpandAroundIdeographsInComplexText();
</span><span class="cx"> unsigned count = 0;
</span><span class="lines">@@ -1041,6 +1041,13 @@
</span><span class="cx"> return count;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned Font::expansionOpportunityCount(const StringView& stringView, TextDirection direction, bool& isAfterExpansion)
+{
+ if (stringView.is8Bit())
+ return expansionOpportunityCountInternal(stringView.characters8(), stringView.length(), direction, isAfterExpansion);
+ return expansionOpportunityCountInternal(stringView.characters16(), stringView.length(), direction, isAfterExpansion);
+}
+
</ins><span class="cx"> bool Font::canReceiveTextEmphasis(UChar32 c)
</span><span class="cx"> {
</span><span class="cx"> if (U_GET_GC_MASK(c) & (U_GC_Z_MASK | U_GC_CN_MASK | U_GC_CC_MASK | U_GC_CF_MASK))
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.h (179029 => 179030)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.h 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/Font.h 2015-01-23 23:05:05 UTC (rev 179030)
</span><span class="lines">@@ -201,8 +201,7 @@
</span><span class="cx"> static bool isCJKIdeograph(UChar32);
</span><span class="cx"> static bool isCJKIdeographOrSymbol(UChar32);
</span><span class="cx">
</span><del>- static unsigned expansionOpportunityCount(const LChar*, size_t length, TextDirection, bool& isAfterExpansion);
- static unsigned expansionOpportunityCount(const UChar*, size_t length, TextDirection, bool& isAfterExpansion);
</del><ins>+ static unsigned expansionOpportunityCount(const StringView&, TextDirection, bool& isAfterExpansion);
</ins><span class="cx">
</span><span class="cx"> static void setShouldUseSmoothing(bool);
</span><span class="cx"> static bool shouldUseSmoothing();
</span><span class="lines">@@ -240,6 +239,9 @@
</span><span class="cx"> int offsetForPositionForComplexText(const TextRun&, float position, bool includePartialGlyphs) const;
</span><span class="cx"> void adjustSelectionRectForComplexText(const TextRun&, LayoutRect& selectionRect, int from, int to) const;
</span><span class="cx">
</span><ins>+ static unsigned expansionOpportunityCountInternal(const LChar*, size_t length, TextDirection, bool& isAfterExpansion);
+ static unsigned expansionOpportunityCountInternal(const UChar*, size_t length, TextDirection, bool& isAfterExpansion);
+
</ins><span class="cx"> friend struct WidthIterator;
</span><span class="cx"> friend class SVGTextRunRenderingContext;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsWidthIteratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp (179029 => 179030)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/WidthIterator.cpp 2015-01-23 23:05:05 UTC (rev 179030)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> m_expansionPerOpportunity = 0;
</span><span class="cx"> else {
</span><span class="cx"> bool isAfterExpansion = m_isAfterExpansion;
</span><del>- unsigned expansionOpportunityCount = m_run.is8Bit() ? Font::expansionOpportunityCount(m_run.characters8(), m_run.length(), m_run.ltr() ? LTR : RTL, isAfterExpansion) : Font::expansionOpportunityCount(m_run.characters16(), m_run.length(), m_run.ltr() ? LTR : RTL, isAfterExpansion);
</del><ins>+ unsigned expansionOpportunityCount = Font::expansionOpportunityCount(m_run.text(), m_run.ltr() ? LTR : RTL, isAfterExpansion);
</ins><span class="cx"> if (isAfterExpansion && !m_run.allowsTrailingExpansion())
</span><span class="cx"> expansionOpportunityCount--;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreplatformgraphicsmacComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (179029 => 179030)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-23 23:05:05 UTC (rev 179030)
</span><span class="lines">@@ -144,11 +144,7 @@
</span><span class="cx"> m_expansionPerOpportunity = 0;
</span><span class="cx"> else {
</span><span class="cx"> bool isAfterExpansion = m_afterExpansion;
</span><del>- unsigned expansionOpportunityCount;
- if (m_run.is8Bit())
- expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters8(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion);
- else
- expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters16(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion);
</del><ins>+ unsigned expansionOpportunityCount = Font::expansionOpportunityCount(m_run.text(), m_run.ltr() ? LTR : RTL, isAfterExpansion);
</ins><span class="cx"> if (isAfterExpansion && !m_run.allowsTrailingExpansion())
</span><span class="cx"> expansionOpportunityCount--;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp (179029 => 179030)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2015-01-23 23:05:05 UTC (rev 179030)
</span><span class="lines">@@ -676,11 +676,7 @@
</span><span class="cx"> if (textAlign == JUSTIFY && r != trailingSpaceRun) {
</span><span class="cx"> if (!isAfterExpansion)
</span><span class="cx"> toInlineTextBox(r->box())->setCanHaveLeadingExpansion(true);
</span><del>- unsigned opportunitiesInRun;
- if (rt.is8Bit())
- opportunitiesInRun = Font::expansionOpportunityCount(rt.characters8() + r->m_start, r->m_stop - r->m_start, r->box()->direction(), isAfterExpansion);
- else
- opportunitiesInRun = Font::expansionOpportunityCount(rt.characters16() + r->m_start, r->m_stop - r->m_start, r->box()->direction(), isAfterExpansion);
</del><ins>+ unsigned opportunitiesInRun = Font::expansionOpportunityCount(rt.stringView(r->m_start, r->m_stop), r->box()->direction(), isAfterExpansion);
</ins><span class="cx"> expansionOpportunities.append(opportunitiesInRun);
</span><span class="cx"> expansionOpportunityCount += opportunitiesInRun;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp (179029 => 179030)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp 2015-01-23 23:05:05 UTC (rev 179030)
</span><span class="lines">@@ -1525,4 +1525,11 @@
</span><span class="cx"> secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+StringView RenderText::stringView(int start, int stop) const
+{
+ if (is8Bit())
+ return StringView(characters8() + start, stop - start);
+ return StringView(characters16() + start, stop - start);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.h (179029 => 179030)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.h 2015-01-23 23:04:58 UTC (rev 179029)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.h 2015-01-23 23:05:05 UTC (rev 179030)
</span><span class="lines">@@ -156,6 +156,8 @@
</span><span class="cx"> void deleteLineBoxesBeforeSimpleLineLayout();
</span><span class="cx"> const SimpleLineLayout::Layout* simpleLineLayout() const;
</span><span class="cx">
</span><ins>+ StringView stringView(int start, int stop) const;
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual void computePreferredLogicalWidths(float leadWidth);
</span><span class="cx"> virtual void willBeDestroyed() override;
</span></span></pre>
</div>
</div>
</body>
</html>