<!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>[190363] trunk/Source</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/190363">190363</a></dd>

<dt>Author</dt> <dd>timothy_horton@apple.com</dd>

<dt>Date</dt> <dd>2015-09-30 12:36:37 -0700 (Wed, 30 Sep 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Compute document marker rects at use time instead of paint time

https://bugs.webkit.org/show_bug.cgi?id=149643

Reviewed by Darin Adler.

* dom/DocumentMarkerController.cpp:

(WebCore::DocumentMarkerController::DocumentMarkerController):

(WebCore::DocumentMarkerController::detach):

Store and zero the Document backpointer.

(WebCore::DocumentMarkerController::addMarker):

(WebCore::DocumentMarkerController::addTextMatchMarker):

(WebCore::DocumentMarkerController::addDictationPhraseWithAlternativesMarker):

(WebCore::DocumentMarkerController::addDictationResultMarker):

(WebCore::DocumentMarkerController::copyMarkers):

Remove some useless comments.

(WebCore::updateRenderedRectsForMarker):

Use Range to compute the (unclipped, absolute) text rects, and store them

on the RenderedDocumentMarker.

(WebCore::DocumentMarkerController::invalidateRectsForAllMarkers):

(WebCore::DocumentMarkerController::invalidateRectsForMarkersInNode):

Mark the relevant markers' rects as invalid, and notify the ChromeClient.

(WebCore::DocumentMarkerController::updateRectsForInvalidatedMarkersOfType):

Run through all markers, computing rects for ones that don't have valid rects.

We will do layout (once) if necessary. However, this is most commonly

called from a place where layout should already be up to date, so this

should not happen often. updateRenderedRectsForMarker also asserts

that layout is up to date.

(WebCore::DocumentMarkerController::renderedRectsForMarkers):

Retrieve all markers of the given type, clip them by overflow clip and

frame clip, and return them to the caller.

(WebCore::DocumentMarkerController::addMarker):

(WebCore::DocumentMarkerController::markerContainingPoint):

(WebCore::DocumentMarkerController::markersFor):

(WebCore::DocumentMarkerController::repaintMarkers):

(WebCore::DocumentMarkerController::shiftMarkers):

(DocumentMarkerController::setMarkersActive):

(DocumentMarkerController::hasMarkers):

Modern iteration.

(WebCore::DocumentMarkerController::invalidateRenderedRectsForMarkersInRect): Deleted.

* dom/DocumentMarkerController.h:

* dom/Document.cpp:

(WebCore::Document::Document):

Pass the Document to the DocumentMarkerController.

* dom/RenderedDocumentMarker.h:

(WebCore::RenderedDocumentMarker::contains):

(WebCore::RenderedDocumentMarker::setUnclippedAbsoluteRects):

(WebCore::RenderedDocumentMarker::unclippedAbsoluteRects):

(WebCore::RenderedDocumentMarker::invalidate):

(WebCore::RenderedDocumentMarker::isValid):

(WebCore::RenderedDocumentMarker::addRenderedRect): Deleted.

(WebCore::RenderedDocumentMarker::renderedRects): Deleted.

Instead of keeping &quot;rendered&quot; rects, keep unclipped rects in absolute

document coordinates. Invalidation will happen wholesale instead of

based on dirty rects, because computation no longer happens at paint

time, so it's safe to throw all of the rects away.

Keep track of whether we have valid rects or not.

* editing/Editor.cpp:

(WebCore::Editor::countMatchesForText):

We don't need to do a fake whole-document paint just to compute the

document marker rects. They are computed on demand, using layout information

instead of paint-time information.

* page/ChromeClient.h:

Remove an unnecessary semicolon.

Add didInvalidateDocumentMarkerRects, which DocumentMarkerController

will call whenever document marker rects are invalidated (and when e.g.

the find holes PageOverlay should repaint itself).

* page/FrameView.cpp:

(WebCore::FrameView::layout):

Invalidate document marker's layout-computed rects after layout is complete.

They'll be lazily recomputed when next requested.

(WebCore::FrameView::willPaintContents):

Remove the pre-painting invalidation of document marker rects.

* rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paintTextMatchMarker):

(WebCore::InlineTextBox::paintDocumentMarker): Deleted.

(WebCore::InlineTextBox::computeRectForReplacementMarker): Deleted.

(WebCore::InlineTextBox::paintDocumentMarkers): Deleted.

Don't bother computing rendered rects for document markers at paint time.

Just do the actual painting work (which, for replacement markers, is

nothing at all).

* rendering/InlineTextBox.h:

* rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateLayerPositions):

(WebCore::RenderLayer::updateLayerPositionsAfterScroll):

When RenderLayers move, invalidate document marker rects.

* rendering/svg/SVGInlineFlowBox.cpp:

(WebCore::SVGInlineFlowBox::paint):

(WebCore::SVGInlineFlowBox::computeTextMatchMarkerRectForRenderer): Deleted.

* rendering/svg/SVGInlineFlowBox.h:

* rendering/svg/SVGRootInlineBox.cpp:

(WebCore::SVGRootInlineBox::paint):

Don't bother computing rendered rects for document markers at paint time.

* testing/Internals.cpp:

(WebCore::markerTypeFrom):

(WebCore::markerTypesFrom):

Add markerTypeFrom, which returns MarkerType enum values for the input string

instead of a MarkerTypes class.

(WebCore::Internals::dumpMarkerRects):

Dump all markers for the given type, and request them from DocumentMarkerController

instead of from the RenderedDocumentMarker, because we want fully clipped

rects, which can only be obtained from DocumentMarkerController.

* editing/FrameSelection.cpp:

(WebCore::FrameSelection::getTextRectangles):

Avoid enclosing unnecessarily, to avoid inflating zero-width text rects

to have a non-zero width. Callers appear to be OK with non-integral positions.

* testing/Internals.h:

* testing/Internals.idl:

* WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::didInvalidateDocumentMarkerRects):

* WebProcess/WebCoreSupport/WebChromeClient.h:

Plumb the notification about invalidated document marker rects through to FindController.

* WebProcess/WebPage/FindController.cpp:

(WebKit::FindController::updateFindUIAfterPageScroll):

Make a document-relative PageOverlay, so that we get fast scrolling.

(WebKit::FindController::rectsForTextMatchesInRect):

Return find hole rects in main-FrameView content coordinates, to 

match the document-relative page overlay.

We'll only return rects that intersect the passed-in rect, which

comes from the dirty rect passed to drawRect.

(WebKit::FindController::drawRect):

Inflate the dirty rect by the border width so that we hit all relevant

markers in each tile. Otherwise, we would end up missing the border of a marker

that touched the edge of a tile.

(WebKit::FindController::didInvalidateDocumentMarkerRects):

Repaint (for now, the entire overlay) when document marker rects change.

* WebProcess/WebPage/FindController.h:

* WebView/WebHTMLView.mm:

(-[WebHTMLView rectsForTextMatches]):

* WebView.cpp:

(WebView::rectsForTextMatches):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>

<li><a href="#trunkSourceWebCoredomDocumentMarkerControllercpp">trunk/Source/WebCore/dom/DocumentMarkerController.cpp</a></li>

<li><a href="#trunkSourceWebCoredomDocumentMarkerControllerh">trunk/Source/WebCore/dom/DocumentMarkerController.h</a></li>

<li><a href="#trunkSourceWebCoredomRenderedDocumentMarkerh">trunk/Source/WebCore/dom/RenderedDocumentMarker.h</a></li>

<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>

<li><a href="#trunkSourceWebCoreeditingFrameSelectioncpp">trunk/Source/WebCore/editing/FrameSelection.cpp</a></li>

<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>

<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</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>

<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineFlowBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp</a></li>

<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineFlowBoxh">trunk/Source/WebCore/rendering/svg/SVGInlineFlowBox.h</a></li>

<li><a href="#trunkSourceWebCorerenderingsvgSVGRootInlineBoxcpp">trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.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>

<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>

<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>

<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>

<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageFindControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp</a></li>

<li><a href="#trunkSourceWebKit2WebProcessWebPageFindControllerh">trunk/Source/WebKit2/WebProcess/WebPage/FindController.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190362 => 190363)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-09-30 19:16:51 UTC (rev 190362)

+++ trunk/Source/WebCore/ChangeLog        2015-09-30 19:36:37 UTC (rev 190363)

</span><span class="lines">@@ -1,3 +1,133 @@

</span><ins>+2015-09-30  Timothy Horton  &lt;timothy_horton@apple.com&gt;

+

+        Compute document marker rects at use time instead of paint time

+        https://bugs.webkit.org/show_bug.cgi?id=149643

+

+        Reviewed by Darin Adler.

+

+        * dom/DocumentMarkerController.cpp:

+        (WebCore::DocumentMarkerController::DocumentMarkerController):

+        (WebCore::DocumentMarkerController::detach):

+        Store and zero the Document backpointer.

+

+        (WebCore::DocumentMarkerController::addMarker):

+        (WebCore::DocumentMarkerController::addTextMatchMarker):

+        (WebCore::DocumentMarkerController::addDictationPhraseWithAlternativesMarker):

+        (WebCore::DocumentMarkerController::addDictationResultMarker):

+        (WebCore::DocumentMarkerController::copyMarkers):

+        Remove some useless comments.

+

+        (WebCore::updateRenderedRectsForMarker):

+        Use Range to compute the (unclipped, absolute) text rects, and store them

+        on the RenderedDocumentMarker.

+

+        (WebCore::DocumentMarkerController::invalidateRectsForAllMarkers):

+        (WebCore::DocumentMarkerController::invalidateRectsForMarkersInNode):

+        Mark the relevant markers' rects as invalid, and notify the ChromeClient.

+

+        (WebCore::DocumentMarkerController::updateRectsForInvalidatedMarkersOfType):

+        Run through all markers, computing rects for ones that don't have valid rects.

+        We will do layout (once) if necessary. However, this is most commonly

+        called from a place where layout should already be up to date, so this

+        should not happen often. updateRenderedRectsForMarker also asserts

+        that layout is up to date.

+

+        (WebCore::DocumentMarkerController::renderedRectsForMarkers):

+        Retrieve all markers of the given type, clip them by overflow clip and

+        frame clip, and return them to the caller.

+

+        (WebCore::DocumentMarkerController::addMarker):

+        (WebCore::DocumentMarkerController::markerContainingPoint):

+        (WebCore::DocumentMarkerController::markersFor):

+        (WebCore::DocumentMarkerController::repaintMarkers):

+        (WebCore::DocumentMarkerController::shiftMarkers):

+        (DocumentMarkerController::setMarkersActive):

+        (DocumentMarkerController::hasMarkers):

+        Modern iteration.

+        

+        (WebCore::DocumentMarkerController::invalidateRenderedRectsForMarkersInRect): Deleted.

+        * dom/DocumentMarkerController.h:

+

+        * dom/Document.cpp:

+        (WebCore::Document::Document):

+        Pass the Document to the DocumentMarkerController.

+

+        * dom/RenderedDocumentMarker.h:

+        (WebCore::RenderedDocumentMarker::contains):

+        (WebCore::RenderedDocumentMarker::setUnclippedAbsoluteRects):

+        (WebCore::RenderedDocumentMarker::unclippedAbsoluteRects):

+        (WebCore::RenderedDocumentMarker::invalidate):

+        (WebCore::RenderedDocumentMarker::isValid):

+        (WebCore::RenderedDocumentMarker::addRenderedRect): Deleted.

+        (WebCore::RenderedDocumentMarker::renderedRects): Deleted.

+        Instead of keeping &quot;rendered&quot; rects, keep unclipped rects in absolute

+        document coordinates. Invalidation will happen wholesale instead of

+        based on dirty rects, because computation no longer happens at paint

+        time, so it's safe to throw all of the rects away.

+        Keep track of whether we have valid rects or not.

+

+        * editing/Editor.cpp:

+        (WebCore::Editor::countMatchesForText):

+        We don't need to do a fake whole-document paint just to compute the

+        document marker rects. They are computed on demand, using layout information

+        instead of paint-time information.

+

+        * page/ChromeClient.h:

+        Remove an unnecessary semicolon.

+        Add didInvalidateDocumentMarkerRects, which DocumentMarkerController

+        will call whenever document marker rects are invalidated (and when e.g.

+        the find holes PageOverlay should repaint itself).

+

+        * page/FrameView.cpp:

+        (WebCore::FrameView::layout):

+        Invalidate document marker's layout-computed rects after layout is complete.

+        They'll be lazily recomputed when next requested.

+

+        (WebCore::FrameView::willPaintContents):

+        Remove the pre-painting invalidation of document marker rects.

+

+        * rendering/InlineTextBox.cpp:

+        (WebCore::InlineTextBox::paintTextMatchMarker):

+        (WebCore::InlineTextBox::paintDocumentMarker): Deleted.

+        (WebCore::InlineTextBox::computeRectForReplacementMarker): Deleted.

+        (WebCore::InlineTextBox::paintDocumentMarkers): Deleted.

+        Don't bother computing rendered rects for document markers at paint time.

+        Just do the actual painting work (which, for replacement markers, is

+        nothing at all).

+

+        * rendering/InlineTextBox.h:

+        * rendering/RenderLayer.cpp:

+        (WebCore::RenderLayer::updateLayerPositions):

+        (WebCore::RenderLayer::updateLayerPositionsAfterScroll):

+        When RenderLayers move, invalidate document marker rects.

+

+        * rendering/svg/SVGInlineFlowBox.cpp:

+        (WebCore::SVGInlineFlowBox::paint):

+        (WebCore::SVGInlineFlowBox::computeTextMatchMarkerRectForRenderer): Deleted.

+        * rendering/svg/SVGInlineFlowBox.h:

+        * rendering/svg/SVGRootInlineBox.cpp:

+        (WebCore::SVGRootInlineBox::paint):

+        Don't bother computing rendered rects for document markers at paint time.

+

+        * testing/Internals.cpp:

+        (WebCore::markerTypeFrom):

+        (WebCore::markerTypesFrom):

+        Add markerTypeFrom, which returns MarkerType enum values for the input string

+        instead of a MarkerTypes class.

+

+        (WebCore::Internals::dumpMarkerRects):

+        Dump all markers for the given type, and request them from DocumentMarkerController

+        instead of from the RenderedDocumentMarker, because we want fully clipped

+        rects, which can only be obtained from DocumentMarkerController.

+

+        * editing/FrameSelection.cpp:

+        (WebCore::FrameSelection::getTextRectangles):

+        Avoid enclosing unnecessarily, to avoid inflating zero-width text rects

+        to have a non-zero width. Callers appear to be OK with non-integral positions.

+

+        * testing/Internals.h:

+        * testing/Internals.idl:

+

</ins><span class="cx"> 2015-09-30  Eric Carlson  &lt;eric.carlson@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         REGRESSION(r190262): User media unit test failures after r190262

</span></span></pre></div>

<a id="trunkSourceWebCoredomDocumentcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (190362 => 190363)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2015-09-30 19:16:51 UTC (rev 190362)

+++ trunk/Source/WebCore/dom/Document.cpp        2015-09-30 19:36:37 UTC (rev 190363)

</span><span class="lines">@@ -457,7 +457,7 @@

</span><span class="cx">     , m_frameElementsShouldIgnoreScrolling(false)

</span><span class="cx">     , m_updateFocusAppearanceRestoresSelection(false)

</span><span class="cx">     , m_ignoreDestructiveWriteCount(0)

</span><del>-    , m_markers(std::make_unique&lt;DocumentMarkerController&gt;())

</del><ins>+    , m_markers(std::make_unique&lt;DocumentMarkerController&gt;(*this))

</ins><span class="cx">     , m_updateFocusAppearanceTimer(*this, &amp;Document::updateFocusAppearanceTimerFired)

</span><span class="cx">     , m_cssTarget(nullptr)

</span><span class="cx">     , m_processingLoadEvent(false)

</span></span></pre></div>

<a id="trunkSourceWebCoredomDocumentMarkerControllercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (190362 => 190363)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp        2015-09-30 19:16:51 UTC (rev 190362)

+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp        2015-09-30 19:36:37 UTC (rev 190363)

</span><span class="lines">@@ -27,9 +27,13 @@

</span><span class="cx"> #include &quot;config.h&quot;

</span><span class="cx"> #include &quot;DocumentMarkerController.h&quot;

</span><span class="cx"> 

</span><ins>+#include &quot;Chrome.h&quot;

+#include &quot;ChromeClient.h&quot;

+#include &quot;MainFrame.h&quot;

</ins><span class="cx"> #include &quot;NodeTraversal.h&quot;

</span><span class="cx"> #include &quot;Range.h&quot;

</span><span class="cx"> #include &quot;RenderBlockFlow.h&quot;

</span><ins>+#include &quot;RenderLayer.h&quot;

</ins><span class="cx"> #include &quot;RenderText.h&quot;

</span><span class="cx"> #include &quot;RenderedDocumentMarker.h&quot;

</span><span class="cx"> #include &quot;TextIterator.h&quot;

</span><span class="lines">@@ -42,8 +46,8 @@

</span><span class="cx">     return m_possiblyExistingMarkerTypes.intersects(types);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-DocumentMarkerController::DocumentMarkerController()

-    : m_possiblyExistingMarkerTypes(0)

</del><ins>+DocumentMarkerController::DocumentMarkerController(Document&amp; document)

+    : m_document(document)

</ins><span class="cx"> {

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -59,7 +63,6 @@

</span><span class="cx"> 

</span><span class="cx"> void DocumentMarkerController::addMarker(Range* range, DocumentMarker::MarkerType type, const String&amp; description)

</span><span class="cx"> {