Source/platform/fonts/linux/FontPlatformDataLinux.cpp - Issue 559433002: Merge FontPlatformDataHarfBuzz and FontPlatformData headers

Side by Side Diff: Source/platform/fonts/linux/FontPlatformDataLinux.cpp

Issue 559433002: Merge FontPlatformDataHarfBuzz and FontPlatformData headers (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 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 | « Source/platform/fonts/harfbuzz/HarfBuzzFaceCoreText.cpp ('k') | Source/platform/fonts/mac/FontCacheMac.mm » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.	2 * Copyright (c) 2006, 2007, 2008, 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 16 matching lines...) Expand all Loading...
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 "config.h"	31 #include "config.h"

32 #include "public/platform/Platform.h"	32 #include "public/platform/Platform.h"

33	33

34 #include "SkTypeface.h"	34 #include "SkTypeface.h"

35 #include "platform/LayoutTestSupport.h"	35 #include "platform/LayoutTestSupport.h"

36 #include "platform/RuntimeEnabledFeatures.h"	36 #include "platform/RuntimeEnabledFeatures.h"

37 #include "platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h"	37 #include "platform/fonts/FontPlatformData.h"

38 #include "platform/graphics/GraphicsContext.h"	38 #include "platform/graphics/GraphicsContext.h"

39 #include "public/platform/linux/WebFontRenderStyle.h"	39 #include "public/platform/linux/WebFontRenderStyle.h"

40 #include "public/platform/linux/WebSandboxSupport.h"	40 #include "public/platform/linux/WebSandboxSupport.h"

41	41

42 namespace blink {	42 namespace blink {

43	43

44 static SkPaint::Hinting skiaHinting = SkPaint::kNormal_Hinting;	44 static SkPaint::Hinting skiaHinting = SkPaint::kNormal_Hinting;

45 static bool useSkiaAutoHint = true;	45 static bool useSkiaAutoHint = true;

46 static bool useSkiaBitmaps = true;	46 static bool useSkiaBitmaps = true;

47 static bool useSkiaAntiAlias = true;	47 static bool useSkiaAntiAlias = true;

(...skipping 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139 \|\| LayoutTestSupport::isRunningLayoutTest())	139 \|\| LayoutTestSupport::isRunningLayoutTest())

140 m_style.useSubpixelPositioning = useSkiaSubpixelPositioning;	140 m_style.useSubpixelPositioning = useSkiaSubpixelPositioning;

141 }	141 }

142	142

143 bool FontPlatformData::defaultUseSubpixelPositioning()	143 bool FontPlatformData::defaultUseSubpixelPositioning()

144 {	144 {

145 return FontDescription::subpixelPositioning();	145 return FontDescription::subpixelPositioning();

146 }	146 }

147	147

148 } // namespace blink	148 } // namespace blink

OLD	NEW