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/htmlediting.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/htmlediting.cpp')
-rw-r--r-- | WebCore/editing/htmlediting.cpp | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/WebCore/editing/htmlediting.cpp b/WebCore/editing/htmlediting.cpp index 53b5d7e..f8f02b9 100644 --- a/WebCore/editing/htmlediting.cpp +++ b/WebCore/editing/htmlediting.cpp @@ -465,39 +465,6 @@ bool isSpecialElement(const Node *n) return false; } -// Checks if a string is a valid tag for the FormatBlockCommand function of execCommand. Expects lower case strings. -bool validBlockTag(const AtomicString& blockTag) -{ - if (blockTag.isEmpty()) - return false; - - DEFINE_STATIC_LOCAL(HashSet<AtomicString>, blockTags, ()); - if (blockTags.isEmpty()) { - blockTags.add(addressTag.localName()); - blockTags.add(articleTag.localName()); - blockTags.add(asideTag.localName()); - blockTags.add(blockquoteTag.localName()); - blockTags.add(ddTag.localName()); - blockTags.add(divTag.localName()); - blockTags.add(dlTag.localName()); - blockTags.add(dtTag.localName()); - blockTags.add(footerTag.localName()); - blockTags.add(h1Tag.localName()); - blockTags.add(h2Tag.localName()); - blockTags.add(h3Tag.localName()); - blockTags.add(h4Tag.localName()); - blockTags.add(h5Tag.localName()); - blockTags.add(h6Tag.localName()); - blockTags.add(headerTag.localName()); - blockTags.add(hgroupTag.localName()); - blockTags.add(navTag.localName()); - blockTags.add(pTag.localName()); - blockTags.add(preTag.localName()); - blockTags.add(sectionTag.localName()); - } - return blockTags.contains(blockTag); -} - static Node* firstInSpecialElement(const Position& pos) { // FIXME: This begins at pos.node(), which doesn't necessarily contain pos (suppose pos was [img, 0]). See <rdar://problem/5027702>. @@ -739,7 +706,7 @@ HTMLElement* enclosingList(Node* node) Node* root = highestEditableRoot(Position(node, 0)); - for (Node* n = node->parentNode(); n; n = n->parentNode()) { + for (ContainerNode* n = node->parentNode(); n; n = n->parentNode()) { if (n->hasTagName(ulTag) || n->hasTagName(olTag)) return static_cast<HTMLElement*>(n); if (n == root) @@ -1069,6 +1036,9 @@ bool lineBreakExistsAtPosition(const Position& position) if (position.anchorNode()->hasTagName(brTag) && position.atFirstEditingPositionForNode()) return true; + if (!position.anchorNode()->renderer()) + return false; + if (!position.anchorNode()->isTextNode() || !position.anchorNode()->renderer()->style()->preserveNewline()) return false; |