| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (c) 2012 Google Inc. All rights reserved. | 2  * Copyright (c) 2012 Google 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 are | 5  * modification, are permitted provided that the following conditions are | 
| 6  * met: | 6  * met: | 
| 7  * | 7  * | 
| 8  *     * Redistributions of source code must retain the above copyright | 8  *     * Redistributions of source code must retain the above copyright | 
| 9  * notice, this list of conditions and the following disclaimer. | 9  * notice, this list of conditions and the following disclaimer. | 
| 10  *     * Redistributions in binary form must reproduce the above | 10  *     * Redistributions in binary form must reproduce the above | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 23  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 
| 24  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
| 25  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
| 26  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 27  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 29  */ | 29  */ | 
| 30 | 30 | 
| 31 #include "platform/fonts/shaping/HarfBuzzFace.h" | 31 #include "platform/fonts/shaping/HarfBuzzFace.h" | 
| 32 | 32 | 
|  | 33 #include <memory> | 
| 33 #include "platform/Histogram.h" | 34 #include "platform/Histogram.h" | 
| 34 #include "platform/fonts/FontCache.h" | 35 #include "platform/fonts/FontCache.h" | 
| 35 #include "platform/fonts/FontPlatformData.h" | 36 #include "platform/fonts/FontPlatformData.h" | 
| 36 #include "platform/fonts/SimpleFontData.h" | 37 #include "platform/fonts/SimpleFontData.h" | 
| 37 #include "platform/fonts/UnicodeRangeSet.h" | 38 #include "platform/fonts/UnicodeRangeSet.h" | 
| 38 #include "platform/fonts/shaping/HarfBuzzShaper.h" | 39 #include "platform/fonts/shaping/HarfBuzzShaper.h" | 
| 39 #include "platform/fonts/skia/SkiaTextMetrics.h" | 40 #include "platform/fonts/skia/SkiaTextMetrics.h" | 
| 40 #include "wtf/HashMap.h" | 41 #include "wtf/HashMap.h" | 
| 41 #include "wtf/MathExtras.h" | 42 #include "wtf/MathExtras.h" | 
| 42 #include "wtf/PtrUtil.h" | 43 #include "wtf/PtrUtil.h" | 
| 43 #include <memory> |  | 
| 44 | 44 | 
| 45 #include <hb-ot.h> | 45 #include <hb-ot.h> | 
| 46 #include <hb.h> | 46 #include <hb.h> | 
| 47 #if OS(MACOSX) | 47 #if OS(MACOSX) | 
| 48 #include <hb-coretext.h> | 48 #include <hb-coretext.h> | 
| 49 #endif | 49 #endif | 
| 50 | 50 | 
| 51 #include <SkPaint.h> | 51 #include <SkPaint.h> | 
| 52 #include <SkPath.h> | 52 #include <SkPath.h> | 
| 53 #include <SkPoint.h> | 53 #include <SkPoint.h> | 
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 389 | 389 | 
| 390   // TODO crbug.com/674879 - Connect variation axis parameters to future | 390   // TODO crbug.com/674879 - Connect variation axis parameters to future | 
| 391   // HarfBuzz API here. | 391   // HarfBuzz API here. | 
| 392   ASSERT(m_harfBuzzFontData->m_simpleFontData); | 392   ASSERT(m_harfBuzzFontData->m_simpleFontData); | 
| 393   int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size()); | 393   int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size()); | 
| 394   hb_font_set_scale(m_unscaledFont, scale, scale); | 394   hb_font_set_scale(m_unscaledFont, scale, scale); | 
| 395   return m_unscaledFont; | 395   return m_unscaledFont; | 
| 396 } | 396 } | 
| 397 | 397 | 
| 398 }  // namespace blink | 398 }  // namespace blink | 
| OLD | NEW | 
|---|