<!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>[172090] branches/safari-600.1-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/172090">172090</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-05 15:18:17 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172013">r172013</a>. <rdar://problem/17837636></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreeditingSelectionRectGatherercpp">branches/safari-600.1-branch/Source/WebCore/editing/SelectionRectGatherer.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreeditingSelectionRectGathererh">branches/safari-600.1-branch/Source/WebCore/editing/SelectionRectGatherer.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCorerenderingRenderViewcpp">branches/safari-600.1-branch/Source/WebCore/rendering/RenderView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172089 => 172090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 22:15:18 UTC (rev 172089)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 22:18:17 UTC (rev 172090)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-08-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172013
+
+ 2014-08-04 Tim Horton <timothy_horton@apple.com>
+
+ Selection services menu dropdown is in the wrong place when selecting some text on Yelp
+ https://bugs.webkit.org/show_bug.cgi?id=135582
+ <rdar://problem/17837636>
+
+ Reviewed by Simon Fraser.
+
+ * editing/SelectionRectGatherer.cpp:
+ (WebCore::SelectionRectGatherer::addRect):
+ (WebCore::SelectionRectGatherer::addGapRects):
+ (WebCore::SelectionRectGatherer::addRects): Deleted.
+ Rename addRects to addGapRects for clarity.
+ Map rects and gapRects to absolute RenderView coordinates so that
+ they are in a form WebKit2 can use. Previously they were sometimes
+ relative to a different repaint container, but that information was
+ lost when moving through SelectionRectGatherer.
+
+ Ideally we would keep selection rects as full quads instead of rects
+ for more of their life, but that problem is much deeper than just SelectionRectGatherer.
+
+ * editing/SelectionRectGatherer.h:
+ Add a comment clarifying the coordinate space of the stored selection rects.
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::applySubtreeSelection):
+ Rename addRects to addGapRects for clarity.
+
+2014-08-05 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r172006
</span><span class="cx">
</span><span class="cx"> 2014-08-04 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreeditingSelectionRectGatherercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/editing/SelectionRectGatherer.cpp (172089 => 172090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/editing/SelectionRectGatherer.cpp 2014-08-05 22:15:18 UTC (rev 172089)
+++ branches/safari-600.1-branch/Source/WebCore/editing/SelectionRectGatherer.cpp 2014-08-05 22:18:17 UTC (rev 172090)
</span><span class="lines">@@ -40,15 +40,21 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectionRectGatherer::addRect(const LayoutRect& rect)
</del><ins>+void SelectionRectGatherer::addRect(RenderLayerModelObject *repaintContainer, const LayoutRect& rect)
</ins><span class="cx"> {
</span><del>- if (!rect.isEmpty())
- m_rects.append(rect);
</del><ins>+ if (!rect.isEmpty()) {
+ LayoutRect absoluteRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rect)).boundingBox());
+ m_rects.append(absoluteRect);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void SelectionRectGatherer::addRects(const GapRects& rects)
</del><ins>+void SelectionRectGatherer::addGapRects(RenderLayerModelObject *repaintContainer, const GapRects& rects)
</ins><span class="cx"> {
</span><del>- m_gapRects.append(rects);
</del><ins>+ GapRects absoluteGapRects;
+ absoluteGapRects.uniteLeft(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.left())).boundingBox()));
+ absoluteGapRects.uniteCenter(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.center())).boundingBox()));
+ absoluteGapRects.uniteRight(LayoutRect(repaintContainer->localToAbsoluteQuad(FloatQuad(rects.right())).boundingBox()));
+ m_gapRects.append(absoluteGapRects);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SelectionRectGatherer::Notifier::Notifier(SelectionRectGatherer& gatherer)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreeditingSelectionRectGathererh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/editing/SelectionRectGatherer.h (172089 => 172090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/editing/SelectionRectGatherer.h 2014-08-05 22:15:18 UTC (rev 172089)
+++ branches/safari-600.1-branch/Source/WebCore/editing/SelectionRectGatherer.h 2014-08-05 22:18:17 UTC (rev 172090)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class LayoutRect;
</span><ins>+class RenderLayerModelObject;
</ins><span class="cx"> class RenderView;
</span><span class="cx">
</span><span class="cx"> struct GapRects;
</span><span class="lines">@@ -44,8 +45,8 @@
</span><span class="cx"> public:
</span><span class="cx"> SelectionRectGatherer(RenderView&);
</span><span class="cx">
</span><del>- void addRect(const LayoutRect&);
- void addRects(const GapRects&);
</del><ins>+ void addRect(RenderLayerModelObject *repaintContainer, const LayoutRect&);
+ void addGapRects(RenderLayerModelObject *repaintContainer, const GapRects&);
</ins><span class="cx">
</span><span class="cx"> class Notifier {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(Notifier);
</span><span class="lines">@@ -61,6 +62,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RenderView& m_renderView;
</span><ins>+
+ // All rects are in RenderView coordinates.
</ins><span class="cx"> Vector<LayoutRect> m_rects;
</span><span class="cx"> Vector<GapRects> m_gapRects;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/rendering/RenderView.cpp (172089 => 172090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/rendering/RenderView.cpp 2014-08-05 22:15:18 UTC (rev 172089)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/RenderView.cpp 2014-08-05 22:18:17 UTC (rev 172090)
</span><span class="lines">@@ -996,7 +996,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> for (auto& rect : selectionInfo->rects())
</span><del>- m_selectionRectGatherer.addRect(rect);
</del><ins>+ m_selectionRectGatherer.addRect(selectionInfo->repaintContainer(), rect);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> newSelectedObjects.set(o, WTF::move(selectionInfo));
</span><span class="lines">@@ -1010,7 +1010,7 @@
</span><span class="cx"> cb = cb->containingBlock();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- m_selectionRectGatherer.addRects(blockInfo->rects());
</del><ins>+ m_selectionRectGatherer.addGapRects(blockInfo->repaintContainer(), blockInfo->rects());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>