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

Side by Side Diff: Source/platform/fonts/ScriptRunIterator.cpp

Issue 1330163005: Fix build with system icu (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 months 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 | « no previous file | 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "ScriptRunIterator.h" 6 #include "ScriptRunIterator.h"
7 7
8 #include "platform/Logging.h" 8 #include "platform/Logging.h"
9 #include "wtf/Threading.h" 9 #include "wtf/Threading.h"
10 10
11 #include <ubidi_props.h>
12
13 namespace blink { 11 namespace blink {
14 12
15 typedef ScriptData::PairedBracketType PairedBracketType; 13 typedef ScriptData::PairedBracketType PairedBracketType;
16 14
17 const int ScriptData::kMaxScriptCount = 20; 15 const int ScriptData::kMaxScriptCount = 20;
18 16
19 ScriptData::~ScriptData() 17 ScriptData::~ScriptData()
20 { 18 {
21 } 19 }
22 20
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 return true; 364 return true;
367 } 365 }
368 366
369 UScriptCode ScriptRunIterator::resolveCurrentScript() const 367 UScriptCode ScriptRunIterator::resolveCurrentScript() const
370 { 368 {
371 UScriptCode result = m_currentSet.at(0); 369 UScriptCode result = m_currentSet.at(0);
372 return result == USCRIPT_COMMON ? m_commonPreferred : result; 370 return result == USCRIPT_COMMON ? m_commonPreferred : result;
373 } 371 }
374 372
375 } // namespace blink 373 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698