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/MergeIdenticalElementsCommand.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/MergeIdenticalElementsCommand.cpp')
-rw-r--r-- | Source/WebCore/editing/MergeIdenticalElementsCommand.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/editing/MergeIdenticalElementsCommand.cpp b/Source/WebCore/editing/MergeIdenticalElementsCommand.cpp index ff59f49..4ee9436 100644 --- a/Source/WebCore/editing/MergeIdenticalElementsCommand.cpp +++ b/Source/WebCore/editing/MergeIdenticalElementsCommand.cpp @@ -42,7 +42,7 @@ MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(PassRefPtr<Element> void MergeIdenticalElementsCommand::doApply() { - if (m_element1->nextSibling() != m_element2 || !m_element1->isContentEditable() || !m_element2->isContentEditable()) + if (m_element1->nextSibling() != m_element2 || !m_element1->rendererIsEditable() || !m_element2->rendererIsEditable()) return; m_atChild = m_element2->firstChild(); @@ -68,7 +68,7 @@ void MergeIdenticalElementsCommand::doUnapply() RefPtr<Node> atChild = m_atChild.release(); ContainerNode* parent = m_element2->parentNode(); - if (!parent || !parent->isContentEditable()) + if (!parent || !parent->rendererIsEditable()) return; ExceptionCode ec = 0; |