diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/editing/FormatBlockCommand.cpp | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/editing/FormatBlockCommand.cpp')
| -rw-r--r-- | Source/WebCore/editing/FormatBlockCommand.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/editing/FormatBlockCommand.cpp b/Source/WebCore/editing/FormatBlockCommand.cpp index e43f330..58157af 100644 --- a/Source/WebCore/editing/FormatBlockCommand.cpp +++ b/Source/WebCore/editing/FormatBlockCommand.cpp @@ -67,6 +67,9 @@ void FormatBlockCommand::formatRange(const Position& start, const Position& end, RefPtr<Range> range = Range::create(document(), start, endOfSelection); Element* refNode = enclosingBlockFlowElement(end); Element* root = editableRootForPosition(start); + // Root is null for elements with contenteditable=false. + if (!root) + return; if (isElementForFormatBlock(refNode->tagQName()) && start == startOfBlock(start) && (end == endOfBlock(end) || isNodeVisiblyContainedWithin(refNode, range.get())) && refNode != root && !root->isDescendantOf(refNode)) { |