| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2008 Apple 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/editing/HTMLInterchange.h" | 27 #include "core/editing/serializers/HTMLInterchange.h" |
| 28 | 28 |
| 29 #include "core/dom/Text.h" | 29 #include "core/dom/Text.h" |
| 30 #include "core/editing/EditingUtilities.h" | 30 #include "core/editing/EditingUtilities.h" |
| 31 #include "core/layout/LayoutObject.h" | 31 #include "core/layout/LayoutObject.h" |
| 32 #include "core/layout/LayoutText.h" | 32 #include "core/layout/LayoutText.h" |
| 33 #include "wtf/text/CharacterNames.h" | 33 #include "wtf/text/CharacterNames.h" |
| 34 #include "wtf/text/StringBuilder.h" | 34 #include "wtf/text/StringBuilder.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 53 if (isCollapsibleWhitespace(in[i])) { | 53 if (isCollapsibleWhitespace(in[i])) { |
| 54 // count number of adjoining spaces | 54 // count number of adjoining spaces |
| 55 unsigned j = i + 1; | 55 unsigned j = i + 1; |
| 56 while (j < in.length() && isCollapsibleWhitespace(in[j])) | 56 while (j < in.length() && isCollapsibleWhitespace(in[j])) |
| 57 j++; | 57 j++; |
| 58 unsigned count = j - i; | 58 unsigned count = j - i; |
| 59 consumed = count; | 59 consumed = count; |
| 60 while (count) { | 60 while (count) { |
| 61 unsigned add = count % 3; | 61 unsigned add = count % 3; |
| 62 switch (add) { | 62 switch (add) { |
| 63 case 0: | 63 case 0: |
| 64 s.appendLiteral(convertedSpaceString); |
| 65 s.append(' '); |
| 66 s.appendLiteral(convertedSpaceString); |
| 67 add = 3; |
| 68 break; |
| 69 case 1: |
| 70 if (i == 0 || i + 1 == in.length()) // at start or end of st
ring |
| 71 s.appendLiteral(convertedSpaceString); |
| 72 else |
| 73 s.append(' '); |
| 74 break; |
| 75 case 2: |
| 76 if (i == 0) { |
| 77 // at start of string |
| 64 s.appendLiteral(convertedSpaceString); | 78 s.appendLiteral(convertedSpaceString); |
| 65 s.append(' '); | 79 s.append(' '); |
| 80 } else if (i + 2 == in.length()) { |
| 81 // at end of string |
| 66 s.appendLiteral(convertedSpaceString); | 82 s.appendLiteral(convertedSpaceString); |
| 67 add = 3; | 83 s.appendLiteral(convertedSpaceString); |
| 68 break; | 84 } else { |
| 69 case 1: | 85 s.appendLiteral(convertedSpaceString); |
| 70 if (i == 0 || i + 1 == in.length()) // at start or end o
f string | 86 s.append(' '); |
| 71 s.appendLiteral(convertedSpaceString); | 87 } |
| 72 else | 88 break; |
| 73 s.append(' '); | |
| 74 break; | |
| 75 case 2: | |
| 76 if (i == 0) { | |
| 77 // at start of string | |
| 78 s.appendLiteral(convertedSpaceString); | |
| 79 s.append(' '); | |
| 80 } else if (i + 2 == in.length()) { | |
| 81 // at end of string | |
| 82 s.appendLiteral(convertedSpaceString); | |
| 83 s.appendLiteral(convertedSpaceString); | |
| 84 } else { | |
| 85 s.appendLiteral(convertedSpaceString); | |
| 86 s.append(' '); | |
| 87 } | |
| 88 break; | |
| 89 } | 89 } |
| 90 count -= add; | 90 count -= add; |
| 91 } | 91 } |
| 92 } else | 92 } else { |
| 93 s.append(in[i]); | 93 s.append(in[i]); |
| 94 } |
| 94 i += consumed; | 95 i += consumed; |
| 95 } | 96 } |
| 96 | 97 |
| 97 return s.toString(); | 98 return s.toString(); |
| 98 } | 99 } |
| 99 | 100 |
| 100 } // namespace blink | 101 } // namespace blink |
| OLD | NEW |