WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/page/DOMSelection.cpp

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 280 matching lines @@
 PassRefPtr<Range> DOMSelection::getRangeAt(int index, ExceptionCode& ec)
 {
     if (!m_frame)
         return 0;
 
     if (index < 0 || index >= rangeCount()) {
         ec = INDEX_SIZE_ERR;
         return 0;
     }
 
+    // If you're hitting this, you've added broken multi-range selection support
+    ASSERT(rangeCount() == 1);
+
     const Selection& selection = m_frame->selection()->selection();
-    return selection.toRange();
+    return selection.firstRange();
 }
 
 void DOMSelection::removeAllRanges()
 {
     if (!m_frame)
         return;
     m_frame->selection()->clear();
 }
 
 void DOMSelection::addRange(Range* r)
 {
     if (!m_frame)
         return;
     if (!r)
         return;
 
     SelectionController* selection = m_frame->selection();
     
     if (selection->isNone()) {
         selection->setSelection(Selection(r));
         return;
     }
 
-    RefPtr<Range> range = selection->selection().toRange();
+    RefPtr<Range> range = selection->selection().toNormalizedRange();
     ExceptionCode ec = 0;
     if (r->compareBoundaryPoints(Range::START_TO_START, range.get(), ec) == -1) {
         // We don't support discontiguous selection. We don't do anything if r and range don't intersect.
         if (r->compareBoundaryPoints(Range::START_TO_END, range.get(), ec) > -1) {
             if (r->compareBoundaryPoints(Range::END_TO_END, range.get(), ec) == -1)
                 // The original range and r intersect.
                 selection->setSelection(Selection(r->startPosition(), range->endPosition(), DOWNSTREAM));
             else
                 // r contains the original range.
                 selection->setSelection(Selection(r));
@@ skipping 17 matching lines @@
         return;
 
     SelectionController* selection = m_frame->selection();
 
     if (selection->isNone())
         return;
 
     if (isCollapsed())
         selection->modify(SelectionController::EXTEND, SelectionController::BACKWARD, CharacterGranularity);
 
-    RefPtr<Range> selectedRange = selection->selection().toRange();
+    RefPtr<Range> selectedRange = selection->selection().toNormalizedRange();
 
     ExceptionCode ec = 0;
     selectedRange->deleteContents(ec);
     ASSERT(!ec);
     
     setBaseAndExtent(selectedRange->startContainer(ec), selectedRange->startOffset(ec), selectedRange->startContainer(ec), selectedRange->startOffset(ec), ec);
     ASSERT(!ec);
 }
 
 bool DOMSelection::containsNode(const Node* n, bool allowPartial) const
 {
     if (!m_frame)
         return false;
 
     SelectionController* selection = m_frame->selection();
 
     if (!n || selection->isNone())
         return false;
 
     Node* parentNode = n->parentNode();
     unsigned nodeIndex = n->nodeIndex();
-    RefPtr<Range> selectedRange = selection->selection().toRange();
+    RefPtr<Range> selectedRange = selection->selection().toNormalizedRange();
 
     if (!parentNode)
         return false;
 
     ExceptionCode ec = 0;
     bool nodeFullySelected = Range::compareBoundaryPoints(parentNode, nodeIndex, selectedRange->startContainer(ec), selectedRange->startOffset(ec)) >= 0
         && Range::compareBoundaryPoints(parentNode, nodeIndex + 1, selectedRange->endContainer(ec), selectedRange->endOffset(ec)) <= 0;
     ASSERT(!ec);
     if (nodeFullySelected)
         return true;
@@ skipping 14 matching lines @@
 
     // This doesn't (and shouldn't) select text node characters.
     setBaseAndExtent(n, 0, n, n->childNodeCount(), ec);
 }
 
 String DOMSelection::toString()
 {
     if (!m_frame)
         return String();
 
-    return plainText(m_frame->selection()->selection().toRange().get());
+    return plainText(m_frame->selection()->selection().toNormalizedRange().get());
 }
 
 } // namespace WebCore