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

Side by Side Diff: sky/engine/platform/fonts/harfbuzz/HarfBuzzFaceSkia.cpp

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 6 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) 2014 BlackBerry Limited. All rights reserved. 3 * Copyright (c) 2014 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 11 matching lines...) Expand all
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
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 "sky/engine/config.h"
33 #include "sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h" 32 #include "sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.h"
34 33
35 #include "sky/engine/platform/fonts/FontPlatformData.h" 34 #include "sky/engine/platform/fonts/FontPlatformData.h"
36 #include "sky/engine/platform/fonts/SimpleFontData.h" 35 #include "sky/engine/platform/fonts/SimpleFontData.h"
37 #include "sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h" 36 #include "sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.h"
38 #include "third_party/skia/include/core/SkPaint.h" 37 #include "third_party/skia/include/core/SkPaint.h"
39 #include "third_party/skia/include/core/SkPath.h" 38 #include "third_party/skia/include/core/SkPath.h"
40 #include "third_party/skia/include/core/SkPoint.h" 39 #include "third_party/skia/include/core/SkPoint.h"
41 #include "third_party/skia/include/core/SkRect.h" 40 #include "third_party/skia/include/core/SkRect.h"
42 #include "third_party/skia/include/core/SkTypeface.h" 41 #include "third_party/skia/include/core/SkTypeface.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 hb_font_t* font = hb_font_create(m_face); 231 hb_font_t* font = hb_font_create(m_face);
233 hb_font_set_funcs(font, harfBuzzSkiaGetFontFuncs(), hbFontData, destroyHarfB uzzFontData); 232 hb_font_set_funcs(font, harfBuzzSkiaGetFontFuncs(), hbFontData, destroyHarfB uzzFontData);
234 float size = m_platformData->size(); 233 float size = m_platformData->size();
235 int scale = SkiaScalarToHarfBuzzPosition(size); 234 int scale = SkiaScalarToHarfBuzzPosition(size);
236 hb_font_set_scale(font, scale, scale); 235 hb_font_set_scale(font, scale, scale);
237 hb_font_make_immutable(font); 236 hb_font_make_immutable(font);
238 return font; 237 return font;
239 } 238 }
240 239
241 } // namespace blink 240 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/platform/fonts/harfbuzz/HarfBuzzFace.cpp ('k') | sky/engine/platform/fonts/harfbuzz/HarfBuzzShaper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698