From 49233e234e5c787396cadb2cea33b31ae0cd65c1 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 20 Jun 2012 13:01:08 +0200
Subject: Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327
 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes
---
 Source/WebKit/chromium/src/linux/WebFontRenderStyle.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Source/WebKit/chromium/src/linux/WebFontRenderStyle.cpp')

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
-- 
cgit v1.2.1