| Index: Source/core/editing/FrameSelection.cpp
|
| diff --git a/Source/core/editing/FrameSelection.cpp b/Source/core/editing/FrameSelection.cpp
|
| index 55db7b776bc49c8f96fb84cccf87fef731630808..2bdb784a54b5310dd898186f71a4e8263a04b8fa 100644
|
| --- a/Source/core/editing/FrameSelection.cpp
|
| +++ b/Source/core/editing/FrameSelection.cpp
|
| @@ -121,7 +121,7 @@ Element* FrameSelection::rootEditableElementOrDocumentElement() const
|
| return selectionRoot ? selectionRoot : m_frame->document()->documentElement();
|
| }
|
|
|
| -Node* FrameSelection::rootEditableElementOrTreeScopeRootNode() const
|
| +ContainerNode* FrameSelection::rootEditableElementOrTreeScopeRootNode() const
|
| {
|
| Element* selectionRoot = m_selection.rootEditableElement();
|
| if (selectionRoot)
|
| @@ -1346,7 +1346,7 @@ void FrameSelection::selectFrameElementInParentIfFullySelected()
|
|
|
| // Get to the <iframe> or <frame> (or even <object>) element in the parent frame.
|
| // FIXME: Doesn't work for OOPI.
|
| - Element* ownerElement = m_frame->deprecatedLocalOwner();
|
| + HTMLFrameOwnerElement* ownerElement = m_frame->deprecatedLocalOwner();
|
| if (!ownerElement)
|
| return;
|
| ContainerNode* ownerElementParent = ownerElement->parentNode();
|
| @@ -1624,7 +1624,7 @@ bool FrameSelection::shouldBlinkCaret() const
|
| if (m_frame->settings() && m_frame->settings()->caretBrowsingEnabled())
|
| return false;
|
|
|
| - Node* root = rootEditableElement();
|
| + Element* root = rootEditableElement();
|
| if (!root)
|
| return false;
|
|
|
| @@ -1813,10 +1813,10 @@ void FrameSelection::setSelectionFromNone()
|
| if (!isNone() || !(document->hasEditableStyle() || caretBrowsing))
|
| return;
|
|
|
| - Node* node = document->documentElement();
|
| - if (!node)
|
| + Element* documentElement = document->documentElement();
|
| + if (!documentElement)
|
| return;
|
| - Node* body = isHTMLBodyElement(*node) ? node : Traversal<HTMLBodyElement>::next(*node);
|
| + HTMLBodyElement* body = isHTMLBodyElement(*documentElement) ? toHTMLBodyElement(documentElement) : Traversal<HTMLBodyElement>::next(*documentElement);
|
| if (body)
|
| setSelection(VisibleSelection(firstPositionInOrBeforeNode(body), DOWNSTREAM));
|
| }
|
|
|