| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved. |
| 4 * Copyright (C) 2011 Igalia S.L. | 4 * Copyright (C) 2011 Igalia S.L. |
| 5 * Copyright (C) 2011 Motorola Mobility. All rights reserved. | 5 * Copyright (C) 2011 Motorola Mobility. All rights reserved. |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 return takeResults(); | 196 return takeResults(); |
| 197 } | 197 } |
| 198 | 198 |
| 199 template<typename Strategy> | 199 template<typename Strategy> |
| 200 void StyledMarkupSerializer<Strategy>::wrapWithNode(ContainerNode& node, typenam
e StyledMarkupAccumulator::RangeFullySelectsNode rangeFullySelectsNode) | 200 void StyledMarkupSerializer<Strategy>::wrapWithNode(ContainerNode& node, typenam
e StyledMarkupAccumulator::RangeFullySelectsNode rangeFullySelectsNode) |
| 201 { | 201 { |
| 202 StringBuilder markup; | 202 StringBuilder markup; |
| 203 if (node.isElementNode()) | 203 if (node.isElementNode()) |
| 204 m_markupAccumulator.appendElement(markup, toElement(node), convertBlocks
ToInlines() && isBlock(&node), rangeFullySelectsNode); | 204 m_markupAccumulator.appendElement(markup, toElement(node), convertBlocks
ToInlines() && isBlock(&node), rangeFullySelectsNode); |
| 205 else | 205 else |
| 206 m_markupAccumulator.appendStartMarkup(markup, node, 0); | 206 m_markupAccumulator.appendStartMarkup(markup, node); |
| 207 m_reversedPrecedingMarkup.append(markup.toString()); | 207 m_reversedPrecedingMarkup.append(markup.toString()); |
| 208 if (node.isElementNode()) | 208 if (node.isElementNode()) |
| 209 m_markupAccumulator.appendEndTag(toElement(node)); | 209 m_markupAccumulator.appendEndTag(toElement(node)); |
| 210 } | 210 } |
| 211 | 211 |
| 212 template<typename Strategy> | 212 template<typename Strategy> |
| 213 void StyledMarkupSerializer<Strategy>::wrapWithStyleNode(StylePropertySet* style
, bool isBlock) | 213 void StyledMarkupSerializer<Strategy>::wrapWithStyleNode(StylePropertySet* style
, bool isBlock) |
| 214 { | 214 { |
| 215 StringBuilder openTag; | 215 StringBuilder openTag; |
| 216 m_markupAccumulator.appendStyleNodeOpenTag(openTag, style, isBlock); | 216 m_markupAccumulator.appendStyleNodeOpenTag(openTag, style, isBlock); |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 lastClosed = parent; | 330 lastClosed = parent; |
| 331 } | 331 } |
| 332 } | 332 } |
| 333 | 333 |
| 334 return lastClosed; | 334 return lastClosed; |
| 335 } | 335 } |
| 336 | 336 |
| 337 template class StyledMarkupSerializer<EditingStrategy>; | 337 template class StyledMarkupSerializer<EditingStrategy>; |
| 338 | 338 |
| 339 } // namespace blink | 339 } // namespace blink |
| OLD | NEW |