OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. |
3 * Copyright (C) 2010 Google Inc. All rights reserved. | 3 * Copyright (C) 2010 Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 VisiblePosition endOfSelection = selection.visibleEnd(); | 83 VisiblePosition endOfSelection = selection.visibleEnd(); |
84 ASSERT(!startOfSelection.isNull()); | 84 ASSERT(!startOfSelection.isNull()); |
85 ASSERT(!endOfSelection.isNull()); | 85 ASSERT(!endOfSelection.isNull()); |
86 RefPtr<ContainerNode> startScope = nullptr; | 86 RefPtr<ContainerNode> startScope = nullptr; |
87 int startIndex = indexForVisiblePosition(startOfSelection, startScope); | 87 int startIndex = indexForVisiblePosition(startOfSelection, startScope); |
88 RefPtr<ContainerNode> endScope = nullptr; | 88 RefPtr<ContainerNode> endScope = nullptr; |
89 int endIndex = indexForVisiblePosition(endOfSelection, endScope); | 89 int endIndex = indexForVisiblePosition(endOfSelection, endScope); |
90 | 90 |
91 formatSelection(startOfSelection, endOfSelection); | 91 formatSelection(startOfSelection, endOfSelection); |
92 | 92 |
93 document().updateLayoutIgnorePendingStylesheets(); | 93 document().updateLayout(); |
94 | 94 |
95 ASSERT(startScope == endScope); | 95 ASSERT(startScope == endScope); |
96 ASSERT(startIndex >= 0); | 96 ASSERT(startIndex >= 0); |
97 ASSERT(startIndex <= endIndex); | 97 ASSERT(startIndex <= endIndex); |
98 if (startScope == endScope && startIndex >= 0 && startIndex <= endIndex) { | 98 if (startScope == endScope && startIndex >= 0 && startIndex <= endIndex) { |
99 VisiblePosition start(visiblePositionForIndex(startIndex, startScope.get
())); | 99 VisiblePosition start(visiblePositionForIndex(startIndex, startScope.get
())); |
100 VisiblePosition end(visiblePositionForIndex(endIndex, endScope.get())); | 100 VisiblePosition end(visiblePositionForIndex(endIndex, endScope.get())); |
101 if (start.isNotNull() && end.isNotNull()) | 101 if (start.isNotNull() && end.isNotNull()) |
102 setEndingSelection(VisibleSelection(start, end, endingSelection().is
Directional())); | 102 setEndingSelection(VisibleSelection(start, end, endingSelection().is
Directional())); |
103 } | 103 } |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
232 | 232 |
233 PassRefPtr<HTMLElement> ApplyBlockElementCommand::createBlockElement() const | 233 PassRefPtr<HTMLElement> ApplyBlockElementCommand::createBlockElement() const |
234 { | 234 { |
235 RefPtr<HTMLElement> element = createHTMLElement(document(), m_tagName); | 235 RefPtr<HTMLElement> element = createHTMLElement(document(), m_tagName); |
236 if (m_inlineStyle.length()) | 236 if (m_inlineStyle.length()) |
237 element->setAttribute(HTMLNames::styleAttr, m_inlineStyle); | 237 element->setAttribute(HTMLNames::styleAttr, m_inlineStyle); |
238 return element.release(); | 238 return element.release(); |
239 } | 239 } |
240 | 240 |
241 } | 241 } |
OLD | NEW |