WebKit merge 40722:40785 (part 1)

third_party/WebKit/WebCore/page/Frame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
@@ skipping 265 matching lines @@
     m_script.updateDocument();
 }
 
 Settings* Frame::settings() const
 {
     return m_page ? m_page->settings() : 0;
 }
 
 String Frame::selectedText() const
 {
-    return plainText(selection()->toRange().get());
+    return plainText(selection()->toNormalizedRange().get());
 }
 
 IntRect Frame::firstRectForRange(Range* range) const
 {
     int extraWidthToEndOfLine = 0;
     ExceptionCode ec = 0;
     ASSERT(range->startContainer(ec));
     ASSERT(range->endContainer(ec));
 
     InlineBox* startInlineBox;
@@ skipping 538 matching lines @@
         m_doc->updateStyleSelector();
 }
 
 bool Frame::shouldChangeSelection(const Selection& newSelection) const
 {
     return shouldChangeSelection(selection()->selection(), newSelection, newSelection.affinity(), false);
 }
 
 bool Frame::shouldChangeSelection(const Selection& oldSelection, const Selection& newSelection, EAffinity affinity, bool stillSelecting) const
 {
-    return editor()->client()->shouldChangeSelectedRange(oldSelection.toRange().get(), newSelection.toRange().get(),
+    return editor()->client()->shouldChangeSelectedRange(oldSelection.toNormalizedRange().get(), newSelection.toNormalizedRange().get(),
                                                          affinity, stillSelecting);
 }
 
 bool Frame::shouldDeleteSelection(const Selection& selection) const
 {
-    return editor()->client()->shouldDeleteRange(selection.toRange().get());
+    return editor()->client()->shouldDeleteRange(selection.toNormalizedRange().get());
 }
 
 bool Frame::isContentEditable() const 
 {
     if (m_editor.clientIsEditable())
         return true;
     if (!m_doc)
         return false;
     return m_doc->inDesignMode();
 }
@@ skipping 91 matching lines @@
 PassRefPtr<CSSComputedStyleDeclaration> Frame::selectionComputedStyle(Node*& nodeToRemove) const
 {
     nodeToRemove = 0;
 
     if (!document())
         return 0;
 
     if (selection()->isNone())
         return 0;
 
-    RefPtr<Range> range(selection()->toRange());
+    RefPtr<Range> range(selection()->toNormalizedRange());
     Position pos = range->editingStartPosition();
 
     Element *elem = pos.element();
     if (!elem)
         return 0;
     
     RefPtr<Element> styleElement = elem;
     ExceptionCode ec = 0;
 
     if (m_typingStyle) {
@@ skipping 226 matching lines @@
     IntRect selectionRect = root->selectionBounds(clipToVisibleContent);
     return clipToVisibleContent ? intersection(selectionRect, view->visibleContentRect()) : selectionRect;
 }
 
 void Frame::selectionTextRects(Vector<FloatRect>& rects, bool clipToVisibleContent) const
 {
     RenderView* root = contentRenderer();
     if (!root)
         return;
 
-    RefPtr<Range> selectedRange = selection()->toRange();
+    RefPtr<Range> selectedRange = selection()->toNormalizedRange();
 
     Vector<IntRect> intRects;
     selectedRange->addLineBoxRects(intRects, true);
 
     unsigned size = intRects.size();
     FloatRect visibleContentRect = m_view->visibleContentRect();
     for (unsigned i = 0; i < size; ++i)
         if (clipToVisibleContent)
             rects.append(intersection(intRects[i], visibleContentRect));
         else
@@ skipping 33 matching lines @@
         if (n->hasTagName(formTag))
             return static_cast<HTMLFormElement*>(n);
         else if (n->isHTMLElement() && static_cast<Element*>(n)->isFormControlElement())
             return static_cast<HTMLFormControlElement*>(n)->form();
     }
     
     // try walking forward in the node tree to find a form element
     return start ? scanForForm(start) : 0;
 }
 
-// FIXME: should this go in SelectionController?
 void Frame::revealSelection(const RenderLayer::ScrollAlignment& alignment) const
 {
     IntRect rect;
-    
-    switch (selection()->state()) {
-        case Selection::NONE:
+
+    switch (selection()->selectionType()) {
+        case Selection::NoSelection:
             return;
-            
-        case Selection::CARET:
+        case Selection::CaretSelection:
             rect = selection()->absoluteCaretBounds();
             break;
-            
-        case Selection::RANGE:
+        case Selection::RangeSelection:
             rect = enclosingIntRect(selectionBounds(false));
             break;
     }
 
     Position start = selection()->start();
-
     ASSERT(start.node());
     if (start.node() && start.node()->renderer()) {
         // FIXME: This code only handles scrolling the startContainer's layer, but
         // the selection rect could intersect more than just that. 
         // See <rdar://problem/4799899>.
-        if (RenderLayer *layer = start.node()->renderer()->enclosingLayer())
+        if (RenderLayer* layer = start.node()->renderer()->enclosingLayer())
             layer->scrollRectToVisible(rect, false, alignment, alignment);
     }
 }
 
 void Frame::revealCaret(const RenderLayer::ScrollAlignment& alignment) const
 {
     if (selection()->isNone())
         return;
 
     Position extent = selection()->extent();
@@ skipping 124 matching lines @@
         if (forward)
             searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), ec);
         else
             searchRange->setStart(shadowTreeRoot, 0, ec);
     }
 
     RefPtr<Range> resultRange(findPlainText(searchRange.get(), target, forward, caseFlag));
     // If we started in the selection and the found range exactly matches the existing selection, find again.
     // Build a selection with the found range to remove collapsed whitespace.
     // Compare ranges instead of selection objects to ignore the way that the current selection was made.
-    if (startInSelection && *Selection(resultRange.get()).toRange() == *selection.toRange()) {
+    if (startInSelection && *Selection(resultRange.get()).toNormalizedRange() == *selection.toNormalizedRange()) {
         searchRange = rangeOfContents(document());
         if (forward)
             setStart(searchRange.get(), selection.visibleEnd());
         else
             setEnd(searchRange.get(), selection.visibleStart());
 
         if (shadowTreeRoot) {
             ExceptionCode ec = 0;
             if (forward)
                 searchRange->setEnd(shadowTreeRoot, shadowTreeRoot->childNodeCount(), ec);
@@ skipping 293 matching lines @@
                     if (isContinuousGrammarCheckingEnabled) {
                         Selection oldSelectedSentence = Selection(startOfSentence(oldStart), endOfSentence(oldStart));   
                         if (oldSelectedSentence != newSelectedSentence)
                             editor()->markBadGrammar(oldSelectedSentence);
                     }
                 }
             }
 
             // This only erases markers that are in the first unit (word or sentence) of the selection.
             // Perhaps peculiar, but it matches AppKit.
-            if (RefPtr<Range> wordRange = newAdjacentWords.toRange())
+            if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())
                 document()->removeMarkers(wordRange.get(), DocumentMarker::Spelling);
-            if (RefPtr<Range> sentenceRange = newSelectedSentence.toRange())
+            if (RefPtr<Range> sentenceRange = newSelectedSentence.toNormalizedRange())
                 document()->removeMarkers(sentenceRange.get(), DocumentMarker::Grammar);
         }
 
         // When continuous spell checking is off, existing markers disappear after the selection changes.
         if (!isContinuousSpellCheckingEnabled)
             document()->removeMarkers(DocumentMarker::Spelling);
         if (!isContinuousGrammarCheckingEnabled)
             document()->removeMarkers(DocumentMarker::Grammar);
     }
 
@@ skipping 65 matching lines @@
         frameView->setParentVisible(true);
 
     if (ownerRenderer())
         ownerRenderer()->setWidget(frameView);
 
     if (HTMLFrameOwnerElement* owner = ownerElement())
         view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOff);
 }
 
 } // namespace WebCore