diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/dom/Position.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/dom/Position.cpp')
| -rw-r--r-- | WebCore/dom/Position.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/dom/Position.cpp b/WebCore/dom/Position.cpp index 7861fbe..65b7261 100644 --- a/WebCore/dom/Position.cpp +++ b/WebCore/dom/Position.cpp @@ -739,7 +739,7 @@ bool Position::isCandidate() const return m_offset == 0 && !nodeIsUserSelectNone(node()->parent()); if (renderer->isText()) - return inRenderedText() && !nodeIsUserSelectNone(node()); + return !nodeIsUserSelectNone(node()) && inRenderedText(); if (isTableElement(node()) || editingIgnoresContent(node())) return (atFirstEditingPositionForNode() || atLastEditingPositionForNode()) && !nodeIsUserSelectNone(node()->parent()); |