diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/editing/SelectionController.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/editing/SelectionController.cpp')
| -rw-r--r-- | Source/WebCore/editing/SelectionController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/editing/SelectionController.cpp b/Source/WebCore/editing/SelectionController.cpp index fa0c32d..a574b5a 100644 --- a/Source/WebCore/editing/SelectionController.cpp +++ b/Source/WebCore/editing/SelectionController.cpp @@ -1707,7 +1707,7 @@ static HTMLFormElement* scanForForm(Node* start) for (Node* node = start; node; node = node->traverseNextNode()) { if (node->hasTagName(formTag)) return static_cast<HTMLFormElement*>(node); - if (node->isHTMLElement() && static_cast<HTMLElement*>(node)->isFormControlElement()) + if (node->isHTMLElement() && toHTMLElement(node)->isFormControlElement()) return static_cast<HTMLFormControlElement*>(node)->form(); if (node->hasTagName(frameTag) || node->hasTagName(iframeTag)) { Node* childDocument = static_cast<HTMLFrameElementBase*>(node)->contentDocument(); @@ -1731,7 +1731,7 @@ HTMLFormElement* SelectionController::currentForm() const for (node = start; node; node = node->parentNode()) { if (node->hasTagName(formTag)) return static_cast<HTMLFormElement*>(node); - if (node->isHTMLElement() && static_cast<HTMLElement*>(node)->isFormControlElement()) + if (node->isHTMLElement() && toHTMLElement(node)->isFormControlElement()) return static_cast<HTMLFormControlElement*>(node)->form(); } @@ -1781,7 +1781,7 @@ void SelectionController::setSelectionFromNone() while (node && !node->hasTagName(bodyTag)) node = node->traverseNextNode(); if (node) - setSelection(VisibleSelection(Position(node, 0), DOWNSTREAM)); + setSelection(VisibleSelection(firstPositionInOrBeforeNode(node), DOWNSTREAM)); } bool SelectionController::shouldChangeSelection(const VisibleSelection& newSelection) const |