| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/editing/FormatBlockCommand.h" | 27 #include "core/editing/FormatBlockCommand.h" |
| 28 | 28 |
| 29 #include "bindings/core/v8/ExceptionStatePlaceholder.h" | 29 #include "bindings/core/v8/ExceptionStatePlaceholder.h" |
| 30 #include "core/HTMLNames.h" | 30 #include "core/HTMLNames.h" |
| 31 #include "core/dom/Element.h" | 31 #include "core/dom/Element.h" |
| 32 #include "core/dom/Range.h" | 32 #include "core/dom/Range.h" |
| 33 #include "core/editing/VisibleUnits.h" | 33 #include "core/editing/VisibleUnits.h" |
| 34 #include "core/editing/htmlediting.h" | 34 #include "core/editing/htmlediting.h" |
| 35 #include "core/html/HTMLBRElement.h" |
| 35 #include "core/html/HTMLElement.h" | 36 #include "core/html/HTMLElement.h" |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 using namespace HTMLNames; | 40 using namespace HTMLNames; |
| 40 | 41 |
| 41 static Node* enclosingBlockToSplitTreeTo(Node* startNode); | 42 static Node* enclosingBlockToSplitTreeTo(Node* startNode); |
| 42 static bool isElementForFormatBlock(const QualifiedName& tagName); | 43 static bool isElementForFormatBlock(const QualifiedName& tagName); |
| 43 static inline bool isElementForFormatBlock(Node* node) | 44 static inline bool isElementForFormatBlock(Node* node) |
| 44 { | 45 { |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 return n; | 161 return n; |
| 161 if (isBlock(n)) | 162 if (isBlock(n)) |
| 162 lastBlock = n; | 163 lastBlock = n; |
| 163 if (isListElement(n)) | 164 if (isListElement(n)) |
| 164 return n->parentNode()->hasEditableStyle() ? n->parentNode() : n; | 165 return n->parentNode()->hasEditableStyle() ? n->parentNode() : n; |
| 165 } | 166 } |
| 166 return lastBlock; | 167 return lastBlock; |
| 167 } | 168 } |
| 168 | 169 |
| 169 } | 170 } |
| OLD | NEW |