| Index: Source/platform/fonts/FontDescription.cpp
|
| diff --git a/Source/platform/fonts/FontDescription.cpp b/Source/platform/fonts/FontDescription.cpp
|
| index 08cb72a6a3140d2b33192a38a25bec0a3ec6dea7..d5fad42b525a26d057f6288d25ea6649b66da1a9 100644
|
| --- a/Source/platform/fonts/FontDescription.cpp
|
| +++ b/Source/platform/fonts/FontDescription.cpp
|
| @@ -34,7 +34,7 @@
|
| #include "wtf/text/AtomicStringHash.h"
|
| #include "wtf/text/StringHash.h"
|
|
|
| -namespace WebCore {
|
| +namespace blink {
|
|
|
| struct SameSizeAsFontDescription {
|
| FontFamily familyList;
|
| @@ -161,20 +161,20 @@ void FontDescription::updateTypesettingFeatures() const
|
| case AutoTextRendering:
|
| break;
|
| case OptimizeSpeed:
|
| - m_typesettingFeatures &= ~(WebCore::Kerning | Ligatures);
|
| + m_typesettingFeatures &= ~(blink::Kerning | Ligatures);
|
| break;
|
| case GeometricPrecision:
|
| case OptimizeLegibility:
|
| - m_typesettingFeatures |= WebCore::Kerning | Ligatures;
|
| + m_typesettingFeatures |= blink::Kerning | Ligatures;
|
| break;
|
| }
|
|
|
| switch (kerning()) {
|
| case FontDescription::NoneKerning:
|
| - m_typesettingFeatures &= ~WebCore::Kerning;
|
| + m_typesettingFeatures &= ~blink::Kerning;
|
| break;
|
| case FontDescription::NormalKerning:
|
| - m_typesettingFeatures |= WebCore::Kerning;
|
| + m_typesettingFeatures |= blink::Kerning;
|
| break;
|
| case FontDescription::AutoKerning:
|
| break;
|
| @@ -199,9 +199,9 @@ void FontDescription::updateTypesettingFeatures() const
|
| if (discretionaryLigaturesState() == FontDescription::EnabledLigaturesState
|
| || historicalLigaturesState() == FontDescription::EnabledLigaturesState
|
| || contextualLigaturesState() == FontDescription::EnabledLigaturesState) {
|
| - m_typesettingFeatures |= WebCore::Ligatures;
|
| + m_typesettingFeatures |= blink::Ligatures;
|
| }
|
| }
|
| }
|
|
|
| -} // namespace WebCore
|
| +} // namespace blink
|
|
|