diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/editing/SplitTextNodeCommand.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/editing/SplitTextNodeCommand.cpp')
| -rw-r--r-- | WebCore/editing/SplitTextNodeCommand.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/editing/SplitTextNodeCommand.cpp b/WebCore/editing/SplitTextNodeCommand.cpp index 1f38902..6c414f9 100644 --- a/WebCore/editing/SplitTextNodeCommand.cpp +++ b/WebCore/editing/SplitTextNodeCommand.cpp @@ -49,7 +49,7 @@ SplitTextNodeCommand::SplitTextNodeCommand(PassRefPtr<Text> text, int offset) void SplitTextNodeCommand::doApply() { - Node* parent = m_text2->parentNode(); + ContainerNode* parent = m_text2->parentNode(); if (!parent || !parent->isContentEditable()) return; @@ -87,7 +87,7 @@ void SplitTextNodeCommand::doReapply() if (!m_text1 || !m_text2) return; - Node* parent = m_text2->parentNode(); + ContainerNode* parent = m_text2->parentNode(); if (!parent || !parent->isContentEditable()) return; |