Changeset 171797 in webkit

Timestamp:

Jul 30, 2014, 9:23:04 AM (11 years ago)

Author:

stavila@adobe.com

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderView.cpp (modified) (3 diffs)
• rendering/RenderView.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2014-07-30  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1829 +1829 @@
         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;

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -97 +97 @@
     : 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)
@@ -846 +846 @@
     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)
-        return;
+    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.
@@ -1083 +1084 @@
 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;
 }
 

trunk/Source/WebCore/rendering/RenderView.h

@@ -90 +90 @@
     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;
@@ -314 +314 @@
     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;