OLD | NEW |
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 12 matching lines...) Expand all Loading... |
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
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 "config.h" | 32 #include "config.h" |
33 #include "core/platform/graphics/harfbuzz/HarfBuzzShaper.h" | 33 #include "platform/fonts/harfbuzz/HarfBuzzShaper.h" |
34 | 34 |
35 #include "RuntimeEnabledFeatures.h" | 35 #include "RuntimeEnabledFeatures.h" |
36 #include "core/platform/graphics/Font.h" | |
37 #include "core/platform/graphics/harfbuzz/HarfBuzzFace.h" | |
38 #include "hb-icu.h" | 36 #include "hb-icu.h" |
| 37 #include "platform/fonts/Font.h" |
| 38 #include "platform/fonts/harfbuzz/HarfBuzzFace.h" |
39 #include "platform/text/SurrogatePairAwareTextIterator.h" | 39 #include "platform/text/SurrogatePairAwareTextIterator.h" |
40 #include "wtf/MathExtras.h" | 40 #include "wtf/MathExtras.h" |
41 #include "wtf/unicode/Unicode.h" | 41 #include "wtf/unicode/Unicode.h" |
42 #include <unicode/normlzr.h> | 42 #include <unicode/normlzr.h> |
43 #include <unicode/uchar.h> | 43 #include <unicode/uchar.h> |
44 | 44 |
45 #include <list> | 45 #include <list> |
46 #include <map> | 46 #include <map> |
47 #include <string> | 47 #include <string> |
48 | 48 |
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
886 if (!foundToX) | 886 if (!foundToX) |
887 toX = m_run.rtl() ? 0 : m_totalWidth; | 887 toX = m_run.rtl() ? 0 : m_totalWidth; |
888 | 888 |
889 // Using floorf() and roundf() as the same as mac port. | 889 // Using floorf() and roundf() as the same as mac port. |
890 if (fromX < toX) | 890 if (fromX < toX) |
891 return FloatRect(floorf(point.x() + fromX), point.y(), roundf(toX - from
X), height); | 891 return FloatRect(floorf(point.x() + fromX), point.y(), roundf(toX - from
X), height); |
892 return FloatRect(floorf(point.x() + toX), point.y(), roundf(fromX - toX), he
ight); | 892 return FloatRect(floorf(point.x() + toX), point.y(), roundf(fromX - toX), he
ight); |
893 } | 893 } |
894 | 894 |
895 } // namespace WebCore | 895 } // namespace WebCore |
OLD | NEW |