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/RemoveNodeCommand.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/RemoveNodeCommand.cpp')
| -rw-r--r-- | Source/WebCore/editing/RemoveNodeCommand.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/editing/RemoveNodeCommand.cpp b/Source/WebCore/editing/RemoveNodeCommand.cpp index 94e3e62..4a52492 100644 --- a/Source/WebCore/editing/RemoveNodeCommand.cpp +++ b/Source/WebCore/editing/RemoveNodeCommand.cpp @@ -42,7 +42,7 @@ RemoveNodeCommand::RemoveNodeCommand(PassRefPtr<Node> node) void RemoveNodeCommand::doApply() { ContainerNode* parent = m_node->parentNode(); - if (!parent || !parent->isContentEditable()) + if (!parent || !parent->rendererIsEditable()) return; m_parent = parent; @@ -56,7 +56,7 @@ void RemoveNodeCommand::doUnapply() { RefPtr<ContainerNode> parent = m_parent.release(); RefPtr<Node> refChild = m_refChild.release(); - if (!parent || !parent->isContentEditable()) + if (!parent || !parent->rendererIsEditable()) return; ExceptionCode ec; |