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/InsertNodeBeforeCommand.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/InsertNodeBeforeCommand.cpp')
| -rw-r--r-- | Source/WebCore/editing/InsertNodeBeforeCommand.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/editing/InsertNodeBeforeCommand.cpp b/Source/WebCore/editing/InsertNodeBeforeCommand.cpp index 5fae45e..4b028e7 100644 --- a/Source/WebCore/editing/InsertNodeBeforeCommand.cpp +++ b/Source/WebCore/editing/InsertNodeBeforeCommand.cpp @@ -41,13 +41,13 @@ InsertNodeBeforeCommand::InsertNodeBeforeCommand(PassRefPtr<Node> insertChild, P ASSERT(m_refChild); ASSERT(m_refChild->parentNode()); - ASSERT(m_refChild->parentNode()->isContentEditable() || !m_refChild->parentNode()->attached()); + ASSERT(m_refChild->parentNode()->rendererIsEditable() || !m_refChild->parentNode()->attached()); } void InsertNodeBeforeCommand::doApply() { ContainerNode* parent = m_refChild->parentNode(); - if (!parent || !parent->isContentEditable()) + if (!parent || !parent->rendererIsEditable()) return; ExceptionCode ec; @@ -59,7 +59,7 @@ void InsertNodeBeforeCommand::doApply() void InsertNodeBeforeCommand::doUnapply() { - if (!m_insertChild->isContentEditable()) + if (!m_insertChild->rendererIsEditable()) return; // Need to notify this before actually deleting the text |