diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/page/DOMSelection.cpp | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/page/DOMSelection.cpp')
| -rw-r--r-- | Source/WebCore/page/DOMSelection.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebCore/page/DOMSelection.cpp b/Source/WebCore/page/DOMSelection.cpp index 67c87d2..31ab956 100644 --- a/Source/WebCore/page/DOMSelection.cpp +++ b/Source/WebCore/page/DOMSelection.cpp @@ -101,7 +101,7 @@ Node* DOMSelection::anchorNode() const return 0; if (Node* shadowAncestor = selectionShadowAncestor(m_frame)) return shadowAncestor->parentNodeGuaranteedHostFree(); - return anchorPosition(visibleSelection()).deprecatedNode(); + return anchorPosition(visibleSelection()).containerNode(); } int DOMSelection::anchorOffset() const @@ -110,7 +110,7 @@ int DOMSelection::anchorOffset() const return 0; if (Node* shadowAncestor = selectionShadowAncestor(m_frame)) return shadowAncestor->nodeIndex(); - return anchorPosition(visibleSelection()).deprecatedEditingOffset(); + return anchorPosition(visibleSelection()).offsetInContainerNode(); } Node* DOMSelection::focusNode() const @@ -119,7 +119,7 @@ Node* DOMSelection::focusNode() const return 0; if (Node* shadowAncestor = selectionShadowAncestor(m_frame)) return shadowAncestor->parentNodeGuaranteedHostFree(); - return focusPosition(visibleSelection()).deprecatedNode(); + return focusPosition(visibleSelection()).containerNode(); } int DOMSelection::focusOffset() const @@ -128,7 +128,7 @@ int DOMSelection::focusOffset() const return 0; if (Node* shadowAncestor = selectionShadowAncestor(m_frame)) return shadowAncestor->nodeIndex(); - return focusPosition(visibleSelection()).deprecatedEditingOffset(); + return focusPosition(visibleSelection()).offsetInContainerNode(); } Node* DOMSelection::baseNode() const @@ -137,7 +137,7 @@ Node* DOMSelection::baseNode() const return 0; if (Node* shadowAncestor = selectionShadowAncestor(m_frame)) return shadowAncestor->parentNodeGuaranteedHostFree(); - return basePosition(visibleSelection()).deprecatedNode(); + return basePosition(visibleSelection()).containerNode(); } int DOMSelection::baseOffset() const @@ -146,7 +146,7 @@ int DOMSelection::baseOffset() const return 0; if (Node* shadowAncestor = selectionShadowAncestor(m_frame)) return shadowAncestor->nodeIndex(); - return basePosition(visibleSelection()).deprecatedEditingOffset(); + return basePosition(visibleSelection()).offsetInContainerNode(); } Node* DOMSelection::extentNode() const @@ -155,7 +155,7 @@ Node* DOMSelection::extentNode() const return 0; if (Node* shadowAncestor = selectionShadowAncestor(m_frame)) return shadowAncestor->parentNodeGuaranteedHostFree(); - return extentPosition(visibleSelection()).deprecatedNode(); + return extentPosition(visibleSelection()).containerNode(); } int DOMSelection::extentOffset() const @@ -164,7 +164,7 @@ int DOMSelection::extentOffset() const return 0; if (Node* shadowAncestor = selectionShadowAncestor(m_frame)) return shadowAncestor->nodeIndex(); - return extentPosition(visibleSelection()).deprecatedEditingOffset(); + return extentPosition(visibleSelection()).offsetInContainerNode(); } bool DOMSelection::isCollapsed() const |