| Index: Source/core/platform/graphics/skia/SimpleFontDataSkia.cpp
|
| diff --git a/Source/core/platform/graphics/skia/SimpleFontDataSkia.cpp b/Source/core/platform/graphics/skia/SimpleFontDataSkia.cpp
|
| index 56eef1e333893ea0730ecae6e0e0af779910ceba..6a89201f7ecd4b705889b84d74bc73286b2b883e 100644
|
| --- a/Source/core/platform/graphics/skia/SimpleFontDataSkia.cpp
|
| +++ b/Source/core/platform/graphics/skia/SimpleFontDataSkia.cpp
|
| @@ -40,7 +40,7 @@
|
| #include "core/platform/graphics/chromium/VDMXParser.h"
|
| #include "wtf/unicode/Unicode.h"
|
|
|
| -#if OS(WINDOWS)
|
| +#if OS(WIN)
|
| #include "core/platform/win/HWndDC.h"
|
| #endif
|
|
|
| @@ -132,7 +132,7 @@ void SimpleFontData::platformInit()
|
| // In WebKit/WebCore/platform/graphics/SimpleFontData.cpp, m_spaceWidth is
|
| // calculated for us, but we need to calculate m_maxCharWidth and
|
| // m_avgCharWidth in order for text entry widgets to be sized correctly.
|
| -#if OS(WINDOWS)
|
| +#if OS(WIN)
|
| m_maxCharWidth = SkScalarRound(metrics.fMaxCharWidth);
|
| #else
|
| // FIXME: This seems incorrect and should probably use fMaxCharWidth as
|
|
|