<!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>[172145] 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/172145">172145</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-08-06 08:04:09 -0700 (Wed, 06 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup InlineTextBox::paintSelection and ::localSelectionRect.
https://bugs.webkit.org/show_bug.cgi?id=135631
Reviewed by Darin Adler.
Covered by existing tests.
* rendering/InlineTextBox.cpp: Ideally these 2 functions should share some more code.
(WebCore::InlineTextBox::localSelectionRect): Local coordinates should not be snapped/enclosed.
This change could potentially break some selections. Should that be the case, they need to be addressed
separately.
(WebCore::InlineTextBox::paint):
(WebCore::InlineTextBox::paintSelection): Minor cleanup.
* rendering/InlineTextBox.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172144 => 172145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-06 15:01:29 UTC (rev 172144)
+++ trunk/Source/WebCore/ChangeLog 2014-08-06 15:04:09 UTC (rev 172145)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-06 Zalan Bujtas <zalan@apple.com>
+
+ Cleanup InlineTextBox::paintSelection and ::localSelectionRect.
+ https://bugs.webkit.org/show_bug.cgi?id=135631
+
+ Reviewed by Darin Adler.
+
+ Covered by existing tests.
+
+ * rendering/InlineTextBox.cpp: Ideally these 2 functions should share some more code.
+ (WebCore::InlineTextBox::localSelectionRect): Local coordinates should not be snapped/enclosed.
+ This change could potentially break some selections. Should that be the case, they need to be addressed
+ separately.
+ (WebCore::InlineTextBox::paint):
+ (WebCore::InlineTextBox::paintSelection): Minor cleanup.
+ * rendering/InlineTextBox.h:
+
</ins><span class="cx"> 2014-08-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Be able to disable gtk2 dependency
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (172144 => 172145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-08-06 15:01:29 UTC (rev 172144)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-08-06 15:04:09 UTC (rev 172145)
</span><span class="lines">@@ -281,17 +281,10 @@
</span><span class="cx"> // Avoid computing the font width when the entire line box is selected as an optimization.
</span><span class="cx"> if (sPos || ePos != static_cast<int>(m_len))
</span><span class="cx"> font.adjustSelectionRectForText(textRun, selectionRect, sPos, ePos);
</span><del>- IntRect snappedSelectionRect = enclosingIntRect(selectionRect);
- LayoutUnit logicalWidth = snappedSelectionRect.width();
- if (snappedSelectionRect.x() > logicalRight())
- logicalWidth = 0;
- else if (snappedSelectionRect.maxX() > logicalRight())
- logicalWidth = logicalRight() - snappedSelectionRect.x();
</del><ins>+ LayoutPoint topPoint = isHorizontal() ? LayoutPoint(selectionRect.x(), selectionTop) : LayoutPoint(selectionTop, selectionRect.x());
+ LayoutUnit width = isHorizontal() ? selectionRect.width() : selectionHeight;
+ LayoutUnit height = isHorizontal() ? selectionHeight : selectionRect.width();
</ins><span class="cx">
</span><del>- LayoutPoint topPoint = isHorizontal() ? LayoutPoint(snappedSelectionRect.x(), selectionTop) : LayoutPoint(selectionTop, snappedSelectionRect.x());
- LayoutUnit width = isHorizontal() ? logicalWidth : selectionHeight;
- LayoutUnit height = isHorizontal() ? selectionHeight : logicalWidth;
-
</del><span class="cx"> return LayoutRect(topPoint, LayoutSize(width, height));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -577,7 +570,7 @@
</span><span class="cx"> paintDocumentMarkers(context, boxOrigin, lineStyle, font, true);
</span><span class="cx">
</span><span class="cx"> if (haveSelection && !useCustomUnderlines)
</span><del>- paintSelection(context, boxOrigin, lineStyle, font, selectionPaintStyle.fillColor);
</del><ins>+ paintSelection(*context, boxOrigin, lineStyle, font, selectionPaintStyle.fillColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Page* page = renderer().frame().page()) {
</span><span class="lines">@@ -704,10 +697,10 @@
</span><span class="cx"> ePos = std::min(endPos - m_start, (int)m_len);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InlineTextBox::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, const RenderStyle& style, const Font& font, Color textColor)
</del><ins>+void InlineTextBox::paintSelection(GraphicsContext& context, const FloatPoint& boxOrigin, const RenderStyle& style, const Font& font, Color textColor)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(TEXT_SELECTION)
</span><del>- if (context->paintingDisabled())
</del><ins>+ if (context.paintingDisabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // See if we have a selection to paint at all.
</span><span class="lines">@@ -725,8 +718,8 @@
</span><span class="cx"> if (textColor == c)
</span><span class="cx"> c = Color(0xff - c.red(), 0xff - c.green(), 0xff - c.blue());
</span><span class="cx">
</span><del>- GraphicsContextStateSaver stateSaver(*context);
- updateGraphicsContext(*context, TextPaintStyle(c, style.colorSpace())); // Don't draw text at all!
</del><ins>+ GraphicsContextStateSaver stateSaver(context);
+ updateGraphicsContext(context, TextPaintStyle(c, style.colorSpace())); // Don't draw text at all!
</ins><span class="cx">
</span><span class="cx"> // If the text is truncated, let the thing being painted in the truncation
</span><span class="cx"> // draw its own highlight.
</span><span class="lines">@@ -744,16 +737,10 @@
</span><span class="cx"> if (respectHyphen)
</span><span class="cx"> ePos = textRun.length();
</span><span class="cx">
</span><del>- const RootInlineBox& rootBox = root();
- LayoutUnit selectionBottom = rootBox.selectionBottom();
- LayoutUnit selectionTop = rootBox.selectionTopAdjustedForPrecedingBlock();
-
- LayoutUnit deltaY = renderer().style().isFlippedLinesWritingMode() ? selectionBottom - logicalBottom() : logicalTop() - selectionTop;
- LayoutUnit selectionHeight = std::max<LayoutUnit>(0, selectionBottom - selectionTop);
-
- LayoutRect selectionRect = LayoutRect(boxOrigin.x(), boxOrigin.y() - deltaY, m_logicalWidth, selectionHeight);
</del><ins>+ LayoutUnit deltaY = renderer().style().isFlippedLinesWritingMode() ? selectionBottom() - logicalBottom() : logicalTop() - root().selectionTopAdjustedForPrecedingBlock();
+ LayoutRect selectionRect = LayoutRect(boxOrigin.x(), boxOrigin.y() - deltaY, m_logicalWidth, root().selectionHeightAdjustedForPrecedingBlock());
</ins><span class="cx"> font.adjustSelectionRectForText(textRun, selectionRect, sPos, ePos);
</span><del>- context->fillRect(directionalPixelSnappedForPainting(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), c, style.colorSpace());
</del><ins>+ context.fillRect(directionalPixelSnappedForPainting(selectionRect, renderer().document().deviceScaleFactor(), textRun.ltr()), c, style.colorSpace());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> UNUSED_PARAM(boxOrigin);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (172144 => 172145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2014-08-06 15:01:29 UTC (rev 172144)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2014-08-06 15:04:09 UTC (rev 172145)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void paintDecoration(GraphicsContext&, const FloatPoint& boxOrigin, TextDecoration, TextDecorationStyle, const ShadowData*, TextPainter&);
</span><del>- void paintSelection(GraphicsContext*, const FloatPoint& boxOrigin, const RenderStyle&, const Font&, Color textColor);
</del><ins>+ void paintSelection(GraphicsContext&, const FloatPoint& boxOrigin, const RenderStyle&, const Font&, Color textColor);
</ins><span class="cx"> void paintDocumentMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, const RenderStyle&, const Font&, bool grammar);
</span><span class="cx"> void paintTextMatchMarker(GraphicsContext*, const FloatPoint& boxOrigin, DocumentMarker*, const RenderStyle&, const Font&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>