Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Side by Side Diff: third_party/WebKit/Source/platform/text/TextRun.cpp

Issue 2507063010: Moving string normalization out of HarfBuzz (Closed)
Patch Set: Merge w/HEAD Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/platform/text/TextRun.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 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 INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "platform/text/TextRun.h" 26 #include "platform/text/TextRun.h"
27 27
28 #include "platform/RuntimeEnabledFeatures.h"
28 #include "platform/text/Character.h" 29 #include "platform/text/Character.h"
29 30
30 namespace blink { 31 namespace blink {
31 32
32 struct ExpectedTextRunSize { 33 struct ExpectedTextRunSize {
33 DISALLOW_NEW(); 34 DISALLOW_NEW();
34 const void* pointer; 35 const void* pointer;
35 int integers[2]; 36 int integers[2];
36 float float1; 37 float float1;
37 float float2; 38 float float2;
(...skipping 12 matching lines...) Expand all
50 m_is8Bit = true; 51 m_is8Bit = true;
51 return; 52 return;
52 } 53 }
53 m_is8Bit = string.is8Bit(); 54 m_is8Bit = string.is8Bit();
54 if (m_is8Bit) 55 if (m_is8Bit)
55 m_data.characters8 = string.characters8(); 56 m_data.characters8 = string.characters8();
56 else 57 else
57 m_data.characters16 = string.characters16(); 58 m_data.characters16 = string.characters16();
58 } 59 }
59 60
61 std::unique_ptr<UChar[]> TextRun::normalizedUTF16(
62 unsigned* resultLength) const {
63 const UChar* source;
64 String stringFor8BitRun;
65 if (is8Bit()) {
66 stringFor8BitRun = String::make16BitFrom8BitSource(characters8(), length());
67 source = stringFor8BitRun.characters16();
68 } else {
69 source = characters16();
70 }
71
72 UChar* buffer = new UChar[m_len + 1];
73 *resultLength = 0;
74
75 bool error = false;
76 unsigned position = 0;
77 while (position < m_len) {
78 UChar32 character;
79 U16_NEXT(source, position, m_len, character);
80 // Don't normalize tabs as they are not treated as spaces for word-end.
81 if (normalizeSpace() &&
82 Character::isNormalizedCanvasSpaceCharacter(character)) {
83 character = spaceCharacter;
84 } else if (Character::treatAsSpace(character) &&
85 character != noBreakSpaceCharacter) {
86 character = spaceCharacter;
87 } else if (!RuntimeEnabledFeatures::
88 renderUnicodeControlCharactersEnabled() &&
89 Character::legacyTreatAsZeroWidthSpaceInComplexScript(
90 character)) {
91 character = zeroWidthSpaceCharacter;
92 } else if (Character::treatAsZeroWidthSpaceInComplexScript(character)) {
93 character = zeroWidthSpaceCharacter;
94 }
95
96 U16_APPEND(buffer, *resultLength, m_len, character, error);
97 DCHECK(!error);
98 }
99
100 DCHECK(*resultLength <= m_len);
101 return wrapArrayUnique(buffer);
102 }
103
60 } // namespace blink 104 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/text/TextRun.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698