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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzShaper.cpp

Issue 1847853004: Move Character.h from platform/fonts to platform/text (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 Google Inc. All rights reserved. 2 * Copyright (c) 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2013 BlackBerry Limited. All rights reserved. 3 * Copyright (C) 2013 BlackBerry Limited. 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 are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 14 matching lines...) Expand all
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32 #include "platform/fonts/shaping/HarfBuzzShaper.h" 32 #include "platform/fonts/shaping/HarfBuzzShaper.h"
33 33
34 #include "platform/Logging.h" 34 #include "platform/Logging.h"
35 #include "platform/fonts/Character.h"
36 #include "platform/fonts/Font.h" 35 #include "platform/fonts/Font.h"
37 #include "platform/fonts/FontFallbackIterator.h" 36 #include "platform/fonts/FontFallbackIterator.h"
38 #include "platform/fonts/GlyphBuffer.h" 37 #include "platform/fonts/GlyphBuffer.h"
39 #include "platform/fonts/UTF16TextIterator.h" 38 #include "platform/fonts/UTF16TextIterator.h"
40 #include "platform/fonts/shaping/HarfBuzzFace.h" 39 #include "platform/fonts/shaping/HarfBuzzFace.h"
41 #include "platform/fonts/shaping/RunSegmenter.h" 40 #include "platform/fonts/shaping/RunSegmenter.h"
42 #include "platform/fonts/shaping/ShapeResultInlineHeaders.h" 41 #include "platform/fonts/shaping/ShapeResultInlineHeaders.h"
42 #include "platform/text/Character.h"
43 #include "platform/text/TextBreakIterator.h" 43 #include "platform/text/TextBreakIterator.h"
44 #include "wtf/Compiler.h" 44 #include "wtf/Compiler.h"
45 #include "wtf/MathExtras.h" 45 #include "wtf/MathExtras.h"
46 #include "wtf/text/Unicode.h" 46 #include "wtf/text/Unicode.h"
47 47
48 #include <algorithm> 48 #include <algorithm>
49 #include <hb.h> 49 #include <hb.h>
50 #include <unicode/uchar.h> 50 #include <unicode/uchar.h>
51 #include <unicode/uscript.h> 51 #include <unicode/uscript.h>
52 52
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
679 result->m_width = run->m_width; 679 result->m_width = run->m_width;
680 result->m_numGlyphs = count; 680 result->m_numGlyphs = count;
681 ASSERT(result->m_numGlyphs == count); // no overflow 681 ASSERT(result->m_numGlyphs == count); // no overflow
682 result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright (); 682 result->m_hasVerticalOffsets = fontData->platformData().isVerticalAnyUpright ();
683 result->m_runs.append(run.release()); 683 result->m_runs.append(run.release());
684 return result.release(); 684 return result.release();
685 } 685 }
686 686
687 687
688 } // namespace blink 688 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698