<!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>[171797] 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/171797">171797</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-07-30 09:23:04 -0700 (Wed, 30 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Member name collision in RenderView and SelectionSubtreeRoot
https://bugs.webkit.org/show_bug.cgi?id=135233
Reviewed by Mihnea Ovidenie.
The selectionStart/End members in RenderView have been renamed to fix confusion caused by the fact that
RenderView inherits SelectionSubtreeRoot, which also has the same selectionStart/End members.
No new tests required, no new functionality.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::isSelectionRoot):
* rendering/RenderView.cpp:
(WebCore::RenderView::RenderView):
(WebCore::RenderView::setSelection):
(WebCore::RenderView::getSelection):
* rendering/RenderView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171796 => 171797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-30 10:52:33 UTC (rev 171796)
+++ trunk/Source/WebCore/ChangeLog 2014-07-30 16:23:04 UTC (rev 171797)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-07-30 Radu Stavila <stavila@adobe.com>
+
+ Member name collision in RenderView and SelectionSubtreeRoot
+ https://bugs.webkit.org/show_bug.cgi?id=135233
+
+ Reviewed by Mihnea Ovidenie.
+
+ The selectionStart/End members in RenderView have been renamed to fix confusion caused by the fact that
+ RenderView inherits SelectionSubtreeRoot, which also has the same selectionStart/End members.
+
+ No new tests required, no new functionality.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::isSelectionRoot):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::RenderView):
+ (WebCore::RenderView::setSelection):
+ (WebCore::RenderView::getSelection):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2014-07-30 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [TexMap] Move TextureMapperLayer::textureMapper() definition into the header
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (171796 => 171797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-07-30 10:52:33 UTC (rev 171796)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-07-30 16:23:04 UTC (rev 171797)
</span><span class="lines">@@ -1828,8 +1828,8 @@
</span><span class="cx"> || isRenderFlowThread() || style().columnSpan() == ColumnSpanAll)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (view().selectionStart()) {
- Node* startElement = view().selectionStart()->node();
</del><ins>+ if (view().selectionUnsplitStart()) {
+ Node* startElement = view().selectionUnsplitStart()->node();
</ins><span class="cx"> if (startElement && startElement->rootEditableElement() == element())
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (171796 => 171797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-07-30 10:52:33 UTC (rev 171796)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-07-30 16:23:04 UTC (rev 171797)
</span><span class="lines">@@ -96,10 +96,10 @@
</span><span class="cx"> RenderView::RenderView(Document& document, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderBlockFlow(document, WTF::move(style))
</span><span class="cx"> , m_frameView(*document.view())
</span><del>- , m_selectionStart(0)
- , m_selectionEnd(0)
- , m_selectionStartPos(-1)
- , m_selectionEndPos(-1)
</del><ins>+ , m_selectionUnsplitStart(0)
+ , m_selectionUnsplitEnd(0)
+ , m_selectionUnsplitStartPos(-1)
+ , m_selectionUnsplitEndPos(-1)
</ins><span class="cx"> , m_rendererCount(0)
</span><span class="cx"> , m_maximalOutlineSize(0)
</span><span class="cx"> , m_lazyRepaintTimer(this, &RenderView::lazyRepaintTimerFired)
</span><span class="lines">@@ -845,15 +845,16 @@
</span><span class="cx"> bool caretChanged = m_selectionWasCaret != frame().selection().isCaret();
</span><span class="cx"> m_selectionWasCaret = frame().selection().isCaret();
</span><span class="cx"> // Just return if the selection hasn't changed.
</span><del>- if (m_selectionStart == start && m_selectionStartPos == startPos &&
- m_selectionEnd == end && m_selectionEndPos == endPos && !caretChanged)
</del><ins>+ if (m_selectionUnsplitStart == start && m_selectionUnsplitStartPos == startPos
+ && m_selectionUnsplitEnd == end && m_selectionUnsplitEndPos == endPos && !caretChanged) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Set global positions for new selection.
</span><del>- m_selectionStart = start;
- m_selectionStartPos = startPos;
- m_selectionEnd = end;
- m_selectionEndPos = endPos;
</del><ins>+ m_selectionUnsplitStart = start;
+ m_selectionUnsplitStartPos = startPos;
+ m_selectionUnsplitEnd = end;
+ m_selectionUnsplitEndPos = endPos;
</ins><span class="cx">
</span><span class="cx"> // If there is no RenderNamedFlowThreads we follow the regular selection.
</span><span class="cx"> if (!hasRenderNamedFlowThreads()) {
</span><span class="lines">@@ -1082,10 +1083,10 @@
</span><span class="cx">
</span><span class="cx"> void RenderView::getSelection(RenderObject*& startRenderer, int& startOffset, RenderObject*& endRenderer, int& endOffset) const
</span><span class="cx"> {
</span><del>- startRenderer = m_selectionStart;
- startOffset = m_selectionStartPos;
- endRenderer = m_selectionEnd;
- endOffset = m_selectionEndPos;
</del><ins>+ startRenderer = m_selectionUnsplitStart;
+ startOffset = m_selectionUnsplitStartPos;
+ endRenderer = m_selectionUnsplitEnd;
+ endOffset = m_selectionUnsplitEndPos;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderView::clearSelection()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (171796 => 171797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2014-07-30 10:52:33 UTC (rev 171796)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-07-30 16:23:04 UTC (rev 171797)
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> void setSelection(RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode = RepaintNewXOROld);
</span><span class="cx"> void getSelection(RenderObject*& startRenderer, int& startOffset, RenderObject*& endRenderer, int& endOffset) const;
</span><span class="cx"> void clearSelection();
</span><del>- RenderObject* selectionStart() const { return m_selectionStart; }
- RenderObject* selectionEnd() const { return m_selectionEnd; }
</del><ins>+ RenderObject* selectionUnsplitStart() const { return m_selectionUnsplitStart; }
+ RenderObject* selectionUnsplitEnd() const { return m_selectionUnsplitEnd; }
</ins><span class="cx"> IntRect selectionBounds(bool clipToVisibleContent = true) const;
</span><span class="cx"> void repaintSelection() const;
</span><span class="cx">
</span><span class="lines">@@ -313,10 +313,10 @@
</span><span class="cx"> private:
</span><span class="cx"> FrameView& m_frameView;
</span><span class="cx">
</span><del>- RenderObject* m_selectionStart;
- RenderObject* m_selectionEnd;
- int m_selectionStartPos;
- int m_selectionEndPos;
</del><ins>+ RenderObject* m_selectionUnsplitStart;
+ RenderObject* m_selectionUnsplitEnd;
+ int m_selectionUnsplitStartPos;
+ int m_selectionUnsplitEndPos;
</ins><span class="cx">
</span><span class="cx"> uint64_t m_rendererCount;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>