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/editing/JoinTextNodesCommand.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/editing/JoinTextNodesCommand.cpp')
-rw-r--r-- | Source/WebCore/editing/JoinTextNodesCommand.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/editing/JoinTextNodesCommand.cpp b/Source/WebCore/editing/JoinTextNodesCommand.cpp index 2766b84..86dd381 100644 --- a/Source/WebCore/editing/JoinTextNodesCommand.cpp +++ b/Source/WebCore/editing/JoinTextNodesCommand.cpp @@ -46,7 +46,7 @@ void JoinTextNodesCommand::doApply() return; ContainerNode* parent = m_text2->parentNode(); - if (!parent || !parent->isContentEditable()) + if (!parent || !parent->rendererIsEditable()) return; ExceptionCode ec = 0; @@ -63,7 +63,7 @@ void JoinTextNodesCommand::doUnapply() return; ContainerNode* parent = m_text2->parentNode(); - if (!parent || !parent->isContentEditable()) + if (!parent || !parent->rendererIsEditable()) return; ExceptionCode ec = 0; |