<!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>[169199] trunk</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/169199">169199</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 06:05:20 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Text markers don't paint on simple lines
https://bugs.webkit.org/show_bug.cgi?id=133177
Reviewed by Anders Carlsson.
Source/WebCore:
Marker painting code does not yet support simple lines.
Tests: fast/text/mark-matches-rendering-simple-lines.html
fast/text/mark-matches-rendering.html
* dom/DocumentMarkerController.cpp:
(WebCore::DocumentMarkerController::addMarker):
Force text blocks with markers to use line boxes.
* testing/Internals.cpp:
(WebCore::Internals::setMarkedTextMatchesAreHighlighted):
Expose this so we can make reftests for marker rendering.
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* fast/text/mark-matches-rendering-expected.html: Added.
* fast/text/mark-matches-rendering-simple-lines-expected.html: Added.
* fast/text/mark-matches-rendering-simple-lines.html: Added.
* fast/text/mark-matches-rendering.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentMarkerControllercpp">trunk/Source/WebCore/dom/DocumentMarkerController.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextmarkmatchesrenderingexpectedhtml">trunk/LayoutTests/fast/text/mark-matches-rendering-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextmarkmatchesrenderingsimplelinesexpectedhtml">trunk/LayoutTests/fast/text/mark-matches-rendering-simple-lines-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextmarkmatchesrenderingsimplelineshtml">trunk/LayoutTests/fast/text/mark-matches-rendering-simple-lines.html</a></li>
<li><a href="#trunkLayoutTestsfasttextmarkmatchesrenderinghtml">trunk/LayoutTests/fast/text/mark-matches-rendering.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169198 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-22 12:16:49 UTC (rev 169198)
+++ trunk/LayoutTests/ChangeLog 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-22 Antti Koivisto <antti@apple.com>
+
+ Text markers don't paint on simple lines
+ https://bugs.webkit.org/show_bug.cgi?id=133177
+
+ Reviewed by Anders Carlsson.
+
+ * fast/text/mark-matches-rendering-expected.html: Added.
+ * fast/text/mark-matches-rendering-simple-lines-expected.html: Added.
+ * fast/text/mark-matches-rendering-simple-lines.html: Added.
+ * fast/text/mark-matches-rendering.html: Added.
+
</ins><span class="cx"> 2014-05-22 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Split the grid-item-margin-auto-columns-rows.html test.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextmarkmatchesrenderingexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/mark-matches-rendering-expected.html (0 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/mark-matches-rendering-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/mark-matches-rendering-expected.html 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+<p style="display:inline-block; background-color:yellow">
+Quo usque tandem abutere, Catilina, patientia nostra?
+</p>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextmarkmatchesrenderingsimplelinesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/mark-matches-rendering-simple-lines-expected.html (0 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/mark-matches-rendering-simple-lines-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/mark-matches-rendering-simple-lines-expected.html 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<script>
+if (window.internals)
+ internals.settings.setSimpleLineLayoutEnabled(false);
+</script>
+<p>
+Quo usque tandem abutere, Catilina, patientia nostra?
+</p>
+<script>
+if (window.internals) {
+ internals.setMarkedTextMatchesAreHighlighted(true);
+ internals.countMatchesForText("ti", 0, "mark");
+}
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextmarkmatchesrenderingsimplelineshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/mark-matches-rendering-simple-lines.html (0 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/mark-matches-rendering-simple-lines.html (rev 0)
+++ trunk/LayoutTests/fast/text/mark-matches-rendering-simple-lines.html 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<p>
+Quo usque tandem abutere, Catilina, patientia nostra?
+</p>
+<script>
+if (window.internals) {
+ internals.setMarkedTextMatchesAreHighlighted(true);
+ internals.countMatchesForText("ti", 0, "mark");
+}
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextmarkmatchesrenderinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/mark-matches-rendering.html (0 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/mark-matches-rendering.html (rev 0)
+++ trunk/LayoutTests/fast/text/mark-matches-rendering.html 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<p style="display:inline-block; background-color:red">
+Quo usque tandem abutere, Catilina, patientia nostra?
+</p>
+<script>
+if (window.internals) {
+ internals.setMarkedTextMatchesAreHighlighted(true);
+ internals.countMatchesForText("Quo usque tandem abutere, Catilina, patientia nostra?", 0, "mark");
+}
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169198 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-22 12:16:49 UTC (rev 169198)
+++ trunk/Source/WebCore/ChangeLog 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-05-22 Antti Koivisto <antti@apple.com>
+
+ Text markers don't paint on simple lines
+ https://bugs.webkit.org/show_bug.cgi?id=133177
+
+ Reviewed by Anders Carlsson.
+
+ Marker painting code does not yet support simple lines.
+
+ Tests: fast/text/mark-matches-rendering-simple-lines.html
+ fast/text/mark-matches-rendering.html
+
+ * dom/DocumentMarkerController.cpp:
+ (WebCore::DocumentMarkerController::addMarker):
+
+ Force text blocks with markers to use line boxes.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setMarkedTextMatchesAreHighlighted):
+
+ Expose this so we can make reftests for marker rendering.
+
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2014-05-22 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Guard RenderObject::isRenderGrid() method
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentMarkerControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (169198 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2014-05-22 12:16:49 UTC (rev 169198)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -29,7 +29,8 @@
</span><span class="cx">
</span><span class="cx"> #include "NodeTraversal.h"
</span><span class="cx"> #include "Range.h"
</span><del>-#include "RenderObject.h"
</del><ins>+#include "RenderBlockFlow.h"
+#include "RenderText.h"
</ins><span class="cx"> #include "RenderedDocumentMarker.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include <stdio.h>
</span><span class="lines">@@ -166,6 +167,14 @@
</span><span class="cx"> if (newMarker.endOffset() == newMarker.startOffset())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (auto* renderer = node->renderer()) {
+ // FIXME: Factor the marker painting code out of InlineTextBox and teach simple line layout to use it.
+ if (renderer->isText())
+ toRenderText(*renderer).ensureLineBoxes();
+ else if (renderer->isRenderBlockFlow())
+ toRenderBlockFlow(*renderer).ensureLineBoxes();
+ }
+
</ins><span class="cx"> m_possiblyExistingMarkerTypes.add(newMarker.type());
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<MarkerList>& list = m_markers.add(node, nullptr).iterator->value;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (169198 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-05-22 12:16:49 UTC (rev 169198)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -801,6 +801,16 @@
</span><span class="cx"> range->ownerDocument().markers().addTextMatchMarker(range, isActive);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Internals::setMarkedTextMatchesAreHighlighted(bool flag, ExceptionCode& ec)
+{
+ Document* document = contextDocument();
+ if (!document || !document->frame()) {
+ ec = INVALID_ACCESS_ERR;
+ return;
+ }
+ document->frame()->editor().setMarkedTextMatchesAreHighlighted(flag);
+}
+
</ins><span class="cx"> void Internals::setScrollViewPosition(long x, long y, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (169198 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-05-22 12:16:49 UTC (rev 169198)
+++ trunk/Source/WebCore/testing/Internals.h 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> PassRefPtr<Range> markerRangeForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
</span><span class="cx"> String markerDescriptionForNode(Node*, const String& markerType, unsigned index, ExceptionCode&);
</span><span class="cx"> void addTextMatchMarker(const Range*, bool isActive);
</span><ins>+ void setMarkedTextMatchesAreHighlighted(bool, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> void setScrollViewPosition(long x, long y, ExceptionCode&);
</span><span class="cx"> void setPagination(const String& mode, int gap, ExceptionCode& ec) { setPagination(mode, gap, 0, ec); }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (169198 => 169199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2014-05-22 12:16:49 UTC (rev 169198)
+++ trunk/Source/WebCore/testing/Internals.idl 2014-05-22 13:05:20 UTC (rev 169199)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> [RaisesException] Range markerRangeForNode(Node node, DOMString markerType, unsigned long index);
</span><span class="cx"> [RaisesException] DOMString markerDescriptionForNode(Node node, DOMString markerType, unsigned long index);
</span><span class="cx"> void addTextMatchMarker(Range range, boolean isActive);
</span><ins>+ [RaisesException] void setMarkedTextMatchesAreHighlighted(boolean flag);
</ins><span class="cx">
</span><span class="cx"> [RaisesException] void setScrollViewPosition(long x, long y);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>