<!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>[176507] 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/176507">176507</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-11-22 11:37:08 -0800 (Sat, 22 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make locale part of the SimpleLineLayout::FlowContent::Style
https://bugs.webkit.org/show_bug.cgi?id=139004
Reviewed by Zalan Bujtas.
That's the only part of style not extracted out of RenderStyle in the constructor.
* rendering/SimpleLineLayoutFlowContents.cpp:
(WebCore::SimpleLineLayout::FlowContents::Style::Style):
(WebCore::SimpleLineLayout::FlowContents::FlowContents):
(WebCore::SimpleLineLayout::FlowContents::appendNextRendererContentIfNeeded):
* rendering/SimpleLineLayoutFlowContents.h:
Also remove RenderBlockFlow member since it is now unused.
(WebCore::SimpleLineLayout::FlowContents::Style::Style): Deleted.
Move to cpp.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176506 => 176507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-22 19:07:26 UTC (rev 176506)
+++ trunk/Source/WebCore/ChangeLog 2014-11-22 19:37:08 UTC (rev 176507)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-11-22 Antti Koivisto <antti@apple.com>
+
+ Make locale part of the SimpleLineLayout::FlowContent::Style
+ https://bugs.webkit.org/show_bug.cgi?id=139004
+
+ Reviewed by Zalan Bujtas.
+
+ That's the only part of style not extracted out of RenderStyle in the constructor.
+
+ * rendering/SimpleLineLayoutFlowContents.cpp:
+ (WebCore::SimpleLineLayout::FlowContents::Style::Style):
+ (WebCore::SimpleLineLayout::FlowContents::FlowContents):
+ (WebCore::SimpleLineLayout::FlowContents::appendNextRendererContentIfNeeded):
+ * rendering/SimpleLineLayoutFlowContents.h:
+
+ Also remove RenderBlockFlow member since it is now unused.
+
+ (WebCore::SimpleLineLayout::FlowContents::Style::Style): Deleted.
+
+ Move to cpp.
+
</ins><span class="cx"> 2014-11-22 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] Accessible names missing for imagemap images and links
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp (176506 => 176507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2014-11-22 19:07:26 UTC (rev 176506)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2014-11-22 19:37:08 UTC (rev 176507)
</span><span class="lines">@@ -33,16 +33,28 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace SimpleLineLayout {
</span><span class="cx">
</span><ins>+FlowContents::Style::Style(const RenderStyle& style)
+ : font(style.font())
+ , textAlign(style.textAlign())
+ , collapseWhitespace(style.collapseWhiteSpace())
+ , preserveNewline(style.preserveNewline())
+ , wrapLines(style.autoWrap())
+ , breakWordOnOverflow(style.overflowWrap() == BreakOverflowWrap && (wrapLines || preserveNewline))
+ , spaceWidth(font.width(TextRun(&space, 1)))
+ , tabWidth(collapseWhitespace ? 0 : style.tabSize())
+ , locale(style.locale())
+{
+}
+
</ins><span class="cx"> FlowContents::FlowContents(const RenderBlockFlow& flow)
</span><del>- : m_flow(flow)
- , m_style(flow.style())
</del><ins>+ : m_style(flow.style())
</ins><span class="cx"> , m_lineBreakIterator(downcast<RenderText>(*flow.firstChild()).text(), flow.style().locale())
</span><span class="cx"> , m_lastRendererIndex(0)
</span><span class="cx"> {
</span><span class="cx"> unsigned startPosition = 0;
</span><del>- for (const RenderText* textRenderer = downcast<RenderText>(m_flow.firstChild()); textRenderer; textRenderer = downcast<RenderText>(textRenderer->nextSibling())) {
- unsigned contentLength = textRenderer->text()->length();
- m_textRanges.append(std::make_pair(startPosition, textRenderer));
</del><ins>+ for (auto& textChild : childrenOfType<RenderText>(flow)) {
+ unsigned contentLength = textChild.text()->length();
+ m_textRanges.append(std::make_pair(startPosition, &textChild));
</ins><span class="cx"> startPosition += contentLength;
</span><span class="cx"> }
</span><span class="cx"> // End item.
</span><span class="lines">@@ -157,7 +169,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> ++m_lastRendererIndex;
</span><del>- m_lineBreakIterator.resetStringAndReleaseIterator(string + String(nextRenderer->text()), m_flow.style().locale(), LineBreakIteratorModeUAX14);
</del><ins>+ m_lineBreakIterator.resetStringAndReleaseIterator(string + String(nextRenderer->text()), m_style.locale, LineBreakIteratorModeUAX14);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h (176506 => 176507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2014-11-22 19:07:26 UTC (rev 176506)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2014-11-22 19:37:08 UTC (rev 176507)
</span><span class="lines">@@ -51,19 +51,8 @@
</span><span class="cx"> bool resolveRendererPositions(const RenderText&, unsigned& startPosition, unsigned& endPosition) const;
</span><span class="cx"> const RenderText* renderer(unsigned position, unsigned* startPosition = nullptr) const;
</span><span class="cx">
</span><del>- class Style {
- public:
- Style(const RenderStyle& style)
- : font(style.font())
- , textAlign(style.textAlign())
- , collapseWhitespace(style.collapseWhiteSpace())
- , preserveNewline(style.preserveNewline())
- , wrapLines(style.autoWrap())
- , breakWordOnOverflow(style.overflowWrap() == BreakOverflowWrap && (wrapLines || preserveNewline))
- , spaceWidth(font.width(TextRun(&space, 1)))
- , tabWidth(collapseWhitespace ? 0 : style.tabSize())
- {
- }
</del><ins>+ struct Style {
+ explicit Style(const RenderStyle&);
</ins><span class="cx">
</span><span class="cx"> const Font& font;
</span><span class="cx"> ETextAlign textAlign;
</span><span class="lines">@@ -73,6 +62,7 @@
</span><span class="cx"> bool breakWordOnOverflow;
</span><span class="cx"> float spaceWidth;
</span><span class="cx"> unsigned tabWidth;
</span><ins>+ AtomicString locale;
</ins><span class="cx"> };
</span><span class="cx"> const Style& style() const { return m_style; }
</span><span class="cx">
</span><span class="lines">@@ -81,7 +71,6 @@
</span><span class="cx"> unsigned nextNonWhitespacePosition(unsigned position, unsigned& spaceCount) const;
</span><span class="cx"> float runWidth(const RenderText&, unsigned from, unsigned to, float xPosition) const;
</span><span class="cx">
</span><del>- const RenderBlockFlow& m_flow;
</del><span class="cx"> const Style m_style;
</span><span class="cx"> mutable LazyLineBreakIterator m_lineBreakIterator;
</span><span class="cx"> Vector<std::pair<unsigned, const RenderText*>> m_textRanges;
</span></span></pre>
</div>
</div>
</body>
</html>