Title: [171797] trunk/Source/WebCore
- Revision
- 171797
- Author
- stav...@adobe.com
- Date
- 2014-07-30 09:23:04 -0700 (Wed, 30 Jul 2014)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171796 => 171797)
--- 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)
@@ -1,3 +1,23 @@
+2014-07-30 Radu Stavila <stav...@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:
+
2014-07-30 Zan Dobersek <zdober...@igalia.com>
[TexMap] Move TextureMapperLayer::textureMapper() definition into the header
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (171796 => 171797)
--- 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)
@@ -1828,8 +1828,8 @@
|| isRenderFlowThread() || style().columnSpan() == ColumnSpanAll)
return true;
- if (view().selectionStart()) {
- Node* startElement = view().selectionStart()->node();
+ if (view().selectionUnsplitStart()) {
+ Node* startElement = view().selectionUnsplitStart()->node();
if (startElement && startElement->rootEditableElement() == element())
return true;
}
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (171796 => 171797)
--- 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)
@@ -96,10 +96,10 @@
RenderView::RenderView(Document& document, PassRef<RenderStyle> style)
: RenderBlockFlow(document, WTF::move(style))
, m_frameView(*document.view())
- , m_selectionStart(0)
- , m_selectionEnd(0)
- , m_selectionStartPos(-1)
- , m_selectionEndPos(-1)
+ , m_selectionUnsplitStart(0)
+ , m_selectionUnsplitEnd(0)
+ , m_selectionUnsplitStartPos(-1)
+ , m_selectionUnsplitEndPos(-1)
, m_rendererCount(0)
, m_maximalOutlineSize(0)
, m_lazyRepaintTimer(this, &RenderView::lazyRepaintTimerFired)
@@ -845,15 +845,16 @@
bool caretChanged = m_selectionWasCaret != frame().selection().isCaret();
m_selectionWasCaret = frame().selection().isCaret();
// Just return if the selection hasn't changed.
- if (m_selectionStart == start && m_selectionStartPos == startPos &&
- m_selectionEnd == end && m_selectionEndPos == endPos && !caretChanged)
+ if (m_selectionUnsplitStart == start && m_selectionUnsplitStartPos == startPos
+ && m_selectionUnsplitEnd == end && m_selectionUnsplitEndPos == endPos && !caretChanged) {
return;
+ }
// Set global positions for new selection.
- m_selectionStart = start;
- m_selectionStartPos = startPos;
- m_selectionEnd = end;
- m_selectionEndPos = endPos;
+ m_selectionUnsplitStart = start;
+ m_selectionUnsplitStartPos = startPos;
+ m_selectionUnsplitEnd = end;
+ m_selectionUnsplitEndPos = endPos;
// If there is no RenderNamedFlowThreads we follow the regular selection.
if (!hasRenderNamedFlowThreads()) {
@@ -1082,10 +1083,10 @@
void RenderView::getSelection(RenderObject*& startRenderer, int& startOffset, RenderObject*& endRenderer, int& endOffset) const
{
- startRenderer = m_selectionStart;
- startOffset = m_selectionStartPos;
- endRenderer = m_selectionEnd;
- endOffset = m_selectionEndPos;
+ startRenderer = m_selectionUnsplitStart;
+ startOffset = m_selectionUnsplitStartPos;
+ endRenderer = m_selectionUnsplitEnd;
+ endOffset = m_selectionUnsplitEndPos;
}
void RenderView::clearSelection()
Modified: trunk/Source/WebCore/rendering/RenderView.h (171796 => 171797)
--- 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)
@@ -89,8 +89,8 @@
void setSelection(RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode = RepaintNewXOROld);
void getSelection(RenderObject*& startRenderer, int& startOffset, RenderObject*& endRenderer, int& endOffset) const;
void clearSelection();
- RenderObject* selectionStart() const { return m_selectionStart; }
- RenderObject* selectionEnd() const { return m_selectionEnd; }
+ RenderObject* selectionUnsplitStart() const { return m_selectionUnsplitStart; }
+ RenderObject* selectionUnsplitEnd() const { return m_selectionUnsplitEnd; }
IntRect selectionBounds(bool clipToVisibleContent = true) const;
void repaintSelection() const;
@@ -313,10 +313,10 @@
private:
FrameView& m_frameView;
- RenderObject* m_selectionStart;
- RenderObject* m_selectionEnd;
- int m_selectionStartPos;
- int m_selectionEndPos;
+ RenderObject* m_selectionUnsplitStart;
+ RenderObject* m_selectionUnsplitEnd;
+ int m_selectionUnsplitStartPos;
+ int m_selectionUnsplitEndPos;
uint64_t m_rendererCount;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
