diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/dom/Position.cpp | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/dom/Position.cpp')
| -rw-r--r-- | WebCore/dom/Position.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/dom/Position.cpp b/WebCore/dom/Position.cpp index 8c03224..d56613e 100644 --- a/WebCore/dom/Position.cpp +++ b/WebCore/dom/Position.cpp @@ -751,13 +751,13 @@ bool Position::isCandidate() const return false; if (renderer->isBR()) - return m_offset == 0 && !nodeIsUserSelectNone(node()->parent()); + return !m_offset && !nodeIsUserSelectNone(node()->parentNode()); if (renderer->isText()) return !nodeIsUserSelectNone(node()) && inRenderedText(); if (isTableElement(node()) || editingIgnoresContent(node())) - return (atFirstEditingPositionForNode() || atLastEditingPositionForNode()) && !nodeIsUserSelectNone(node()->parent()); + return (atFirstEditingPositionForNode() || atLastEditingPositionForNode()) && !nodeIsUserSelectNone(node()->parentNode()); if (m_anchorNode->hasTagName(htmlTag)) return false; |