Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 4 insertions, 2 deletions

diff --git a/Source/WebKit/chromium/src/linux/WebFontRenderStyle.cpp b/Source/WebKit/chromium/src/linux/WebFontRenderStyle.cpp
index 0b864d1b1..0edf8410e 100644
--- a/Source/WebKit/chromium/src/linux/WebFontRenderStyle.cpp
+++ b/Source/WebKit/chromium/src/linux/WebFontRenderStyle.cpp
@@ -44,7 +44,8 @@ void WebFontRenderStyle::toFontRenderStyle(FontRenderStyle* out)
     out->useHinting = useHinting;
     out->hintStyle = hintStyle;
     out->useAntiAlias = useAntiAlias;
-    out->useSubpixel = useSubpixel;
+    out->useSubpixelRendering = useSubpixelRendering;
+    out->useSubpixelPositioning = useSubpixelPositioning;
 }
 
 void WebFontRenderStyle::setDefaults()
@@ -54,7 +55,8 @@ void WebFontRenderStyle::setDefaults()
     useHinting = 2;
     hintStyle = 0;
     useAntiAlias = 2;
-    useSubpixel = 2;
+    useSubpixelRendering = 2;
+    useSubpixelPositioning = 2;
 }
 
 } // namespace WebKit