Make DOMWindowProperty::m_frame private

third_party/WebKit/Source/core/editing/DOMSelection.cpp

 /*
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google 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.
@@ skipping 63 matching lines @@
 {
 }
 
 void DOMSelection::clearTreeScope()
 {
     m_treeScope = nullptr;
 }
 
 bool DOMSelection::isAvailable() const
 {
-    return m_frame && m_frame->selection().isAvailable();
+    return frame() && frame()->selection().isAvailable();
 }
 
 const VisibleSelection& DOMSelection::visibleSelection() const
 {
-    DCHECK(m_frame);
-    return m_frame->selection().selection();
+    DCHECK(frame());
+    return frame()->selection().selection();
 }
 
 static Position anchorPosition(const VisibleSelection& selection)
 {
     Position anchor = selection.isBaseFirst() ? selection.start() : selection.end();
     return anchor.parentAnchoredEquivalent();
 }
 
 static Position focusPosition(const VisibleSelection& selection)
 {
@@ skipping 70 matching lines @@
 int DOMSelection::extentOffset() const
 {
     if (!isAvailable())
         return 0;
 
     return shadowAdjustedOffset(extentPosition(visibleSelection()));
 }
 
 bool DOMSelection::isCollapsed() const
 {
-    if (!isAvailable() || selectionShadowAncestor(m_frame))
+    if (!isAvailable() || selectionShadowAncestor(frame()))
         return true;
-    return !m_frame->selection().isRange();
+    return !frame()->selection().isRange();
 }
 
 String DOMSelection::type() const
 {
     if (!isAvailable())
         return String();
 
-    FrameSelection& selection = m_frame->selection();
+    FrameSelection& selection = frame()->selection();
 
     // This is a WebKit DOM extension, incompatible with an IE extension
     // IE has this same attribute, but returns "none", "text" and "control"
     // http://msdn.microsoft.com/en-us/library/ms534692(VS.85).aspx
     if (selection.isNone())
         return "None";
     if (selection.isCaret())
         return "Caret";
     return "Range";
 }
 
 int DOMSelection::rangeCount() const
 {
     if (!isAvailable())
         return 0;
-    return m_frame->selection().isNone() ? 0 : 1;
+    return frame()->selection().isNone() ? 0 : 1;
 }
 
 void DOMSelection::collapse(Node* node, int offset, ExceptionState& exceptionState)
 {
     if (!isAvailable())
         return;
 
     if (!node) {
-        UseCounter::count(m_frame, UseCounter::SelectionCollapseNull);
-        m_frame->selection().clear();
+        UseCounter::count(frame(), UseCounter::SelectionCollapseNull);
+        frame()->selection().clear();
         return;
     }
 
     if (offset < 0) {
         exceptionState.throwDOMException(IndexSizeError, String::number(offset) + " is not a valid offset.");
         return;
     }
 
     if (!isValidForPosition(node))
         return;
     Range::checkNodeWOffset(node, offset, exceptionState);
     if (exceptionState.hadException())
         return;
-    m_frame->selection().setSelection(VisibleSelection(Position(node, offset), m_frame->selection().isDirectional()));
+    frame()->selection().setSelection(VisibleSelection(Position(node, offset), frame()->selection().isDirectional()));
 }
 
 void DOMSelection::collapseToEnd(ExceptionState& exceptionState)
 {
     if (!isAvailable())
         return;
 
-    const VisibleSelection& selection = m_frame->selection().selection();
+    const VisibleSelection& selection = frame()->selection().selection();
 
     if (selection.isNone()) {
         exceptionState.throwDOMException(InvalidStateError, "there is no selection.");
         return;
     }
 
-    m_frame->selection().moveTo(selection.end(), SelDefaultAffinity);
+    frame()->selection().moveTo(selection.end(), SelDefaultAffinity);
 }
 
 void DOMSelection::collapseToStart(ExceptionState& exceptionState)
 {
     if (!isAvailable())
         return;
 
-    const VisibleSelection& selection = m_frame->selection().selection();
+    const VisibleSelection& selection = frame()->selection().selection();
 
     if (selection.isNone()) {
         exceptionState.throwDOMException(InvalidStateError, "there is no selection.");
         return;
     }
 
-    m_frame->selection().moveTo(selection.start(), SelDefaultAffinity);
+    frame()->selection().moveTo(selection.start(), SelDefaultAffinity);
 }
 
 void DOMSelection::empty()
 {
     if (!isAvailable())
         return;
-    m_frame->selection().clear();
+    frame()->selection().clear();
 }
 
 void DOMSelection::setBaseAndExtent(Node* baseNode, int baseOffset, Node* extentNode, int extentOffset, ExceptionState& exceptionState)
 {
     if (!isAvailable())
         return;
 
     if (baseOffset < 0) {
         exceptionState.throwDOMException(IndexSizeError, String::number(baseOffset) + " is not a valid base offset.");
         return;
     }
 
     if (extentOffset < 0) {
         exceptionState.throwDOMException(IndexSizeError, String::number(extentOffset) + " is not a valid extent offset.");
         return;
     }
 
     if (!baseNode || !extentNode)
-        UseCounter::count(m_frame, UseCounter::SelectionSetBaseAndExtentNull);
+        UseCounter::count(frame(), UseCounter::SelectionSetBaseAndExtentNull);
 
     if (!isValidForPosition(baseNode) || !isValidForPosition(extentNode))
         return;
 
     Position base = createPosition(baseNode, baseOffset);
     Position extent = createPosition(extentNode, extentOffset);
     const bool selectionHasDirection = true;
-    m_frame->selection().setSelection(VisibleSelection(base, extent, SelDefaultAffinity, selectionHasDirection));
+    frame()->selection().setSelection(VisibleSelection(base, extent, SelDefaultAffinity, selectionHasDirection));
 }
 
 void DOMSelection::modify(const String& alterString, const String& directionString, const String& granularityString)
 {
     if (!isAvailable())
         return;
 
     FrameSelection::EAlteration alter;
     if (equalIgnoringCase(alterString, "extend"))
         alter = FrameSelection::AlterationExtend;
@@ skipping 29 matching lines @@
         granularity = LineBoundary;
     else if (equalIgnoringCase(granularityString, "sentenceboundary"))
         granularity = SentenceBoundary;
     else if (equalIgnoringCase(granularityString, "paragraphboundary"))
         granularity = ParagraphBoundary;
     else if (equalIgnoringCase(granularityString, "documentboundary"))
         granularity = DocumentBoundary;
     else
         return;
 
-    m_frame->selection().modify(alter, direction, granularity);
+    frame()->selection().modify(alter, direction, granularity);
 }
 
 void DOMSelection::extend(Node* node, int offset, ExceptionState& exceptionState)
 {
     DCHECK(node);
 
     if (!isAvailable())
         return;
 
     if (offset < 0) {
         exceptionState.throwDOMException(IndexSizeError, String::number(offset) + " is not a valid offset.");
         return;
     }
     if (static_cast<unsigned>(offset) > node->lengthOfContents()) {
         exceptionState.throwDOMException(IndexSizeError, String::number(offset) + " is larger than the given node's length.");
         return;
     }
 
     if (!isValidForPosition(node))
         return;
 
-    const Position& base = m_frame->selection().base();
+    const Position& base = frame()->selection().base();
     const Position& extent = createPosition(node, offset);
     const bool selectionHasDirection = true;
     const VisibleSelection newSelection(base, extent, TextAffinity::Downstream, selectionHasDirection);
-    m_frame->selection().setSelection(newSelection);
+    frame()->selection().setSelection(newSelection);
 }
 
 Range* DOMSelection::getRangeAt(int index, ExceptionState& exceptionState)
 {
     if (!isAvailable())
         return nullptr;
 
     if (index < 0 || index >= rangeCount()) {
         exceptionState.throwDOMException(IndexSizeError, String::number(index) + " is not a valid index.");
         return nullptr;
     }
 
     // If you're hitting this, you've added broken multi-range selection support
     DCHECK_EQ(rangeCount(), 1);
 
     Position anchor = anchorPosition(visibleSelection());
     if (!anchor.anchorNode()->isInShadowTree())
-        return m_frame->selection().firstRange();
+        return frame()->selection().firstRange();
 
     Node* node = shadowAdjustedNode(anchor);
     if (!node) // crbug.com/595100
         return nullptr;
     if (!visibleSelection().isBaseFirst())
         return Range::create(*anchor.document(), focusNode(), focusOffset(), node, anchorOffset());
     return Range::create(*anchor.document(), node, anchorOffset(), focusNode(), focusOffset());
 }
 
 void DOMSelection::removeAllRanges()
 {
     if (!isAvailable())
         return;
-    m_frame->selection().clear();
+    frame()->selection().clear();
 }
 
 void DOMSelection::addRange(Range* newRange)
 {
     DCHECK(newRange);
 
     if (!isAvailable())
         return;
 
-    if (newRange->ownerDocument() != m_frame->document())
+    if (newRange->ownerDocument() != frame()->document())
         return;
 
     if (!newRange->isConnected()) {
         addConsoleError("The given range isn't in document.");
         return;
     }
 
-    FrameSelection& selection = m_frame->selection();
+    FrameSelection& selection = frame()->selection();
 
     if (newRange->ownerDocument() != selection.document()) {
         // "editing/selection/selection-in-iframe-removed-crash.html" goes here.
         return;
     }
 
     if (selection.isNone()) {
         selection.setSelectedRange(newRange, VP_DEFAULT_AFFINITY);
         return;
     }
@@ skipping 25 matching lines @@
     Range* merged = Range::create(originalRange->startContainer()->document(), start->startContainer(), start->startOffset(), end->endContainer(), end->endOffset());
     TextAffinity affinity = selection.selection().affinity();
     selection.setSelectedRange(merged, affinity);
 }
 
 void DOMSelection::deleteFromDocument()
 {
     if (!isAvailable())
         return;
 
-    FrameSelection& selection = m_frame->selection();
+    FrameSelection& selection = frame()->selection();
 
     if (selection.isNone())
         return;
 
     Range* selectedRange = createRange(selection.selection().toNormalizedEphemeralRange());
     if (!selectedRange)
         return;
 
     selectedRange->deleteContents(ASSERT_NO_EXCEPTION);
 
     setBaseAndExtent(selectedRange->startContainer(), selectedRange->startOffset(), selectedRange->startContainer(), selectedRange->startOffset(), ASSERT_NO_EXCEPTION);
 }
 
 bool DOMSelection::containsNode(const Node* n, bool allowPartial) const
 {
     DCHECK(n);
 
     if (!isAvailable())
         return false;
 
-    FrameSelection& selection = m_frame->selection();
+    FrameSelection& selection = frame()->selection();
 
-    if (m_frame->document() != n->document() || selection.isNone())
+    if (frame()->document() != n->document() || selection.isNone())
         return false;
 
     unsigned nodeIndex = n->nodeIndex();
     const EphemeralRange selectedRange = selection.selection().toNormalizedEphemeralRange();
 
     ContainerNode* parentNode = n->parentNode();
     if (!parentNode)
         return false;
 
     const Position startPosition = selectedRange.startPosition().toOffsetInAnchor();
@@ skipping 23 matching lines @@
     setBaseAndExtent(n, 0, n, n->countChildren(), exceptionState);
 }
 
 String DOMSelection::toString()
 {
     if (!isAvailable())
         return String();
 
     // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
-    m_frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+    frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
-    DocumentLifecycle::DisallowTransitionScope disallowTransition(m_frame->document()->lifecycle());
+    DocumentLifecycle::DisallowTransitionScope disallowTransition(frame()->document()->lifecycle());
 
-    const EphemeralRange range = m_frame->selection().selection().toNormalizedEphemeralRange();
+    const EphemeralRange range = frame()->selection().selection().toNormalizedEphemeralRange();
     return plainText(range, TextIteratorForSelectionToString);
 }
 
 Node* DOMSelection::shadowAdjustedNode(const Position& position) const
 {
     if (position.isNull())
         return 0;
 
     Node* containerNode = position.computeContainerNode();
     Node* adjustedNode = m_treeScope->ancestorInThisScope(containerNode);
@@ skipping 20 matching lines @@
         return 0;
 
     if (containerNode == adjustedNode)
         return position.computeOffsetInContainerNode();
 
     return adjustedNode->nodeIndex();
 }
 
 bool DOMSelection::isValidForPosition(Node* node) const
 {
-    DCHECK(m_frame);
+    DCHECK(frame());
     if (!node)
         return true;
-    return node->document() == m_frame->document() && node->isConnected();
+    return node->document() == frame()->document() && node->isConnected();
 }
 
 void DOMSelection::addConsoleError(const String& message)
 {
     if (m_treeScope)
         m_treeScope->document().addConsoleMessage(ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection)
 {
     visitor->trace(m_treeScope);
     DOMWindowProperty::trace(visitor);
 }
 
 } // namespace blink