Linux: splice together RendererPreferences and SkFontHost

Dan Erat has been working down, plumbing the user's font settings from
XSETTINGS in the UI thread of the browser to RendererPreferences in
the renderer. At the same time, I've been working upwards:
implementing subpixel rendering support in Skia and adding an
interface to it in WebCore.

This patch joins the two together. It adds an API surface to the
WebKit API for configuring the font preferences and adds code to
translate from RendererPreferences to that API. It's a little
unfortunate that we need four sets of enums around the code base for
things like the hinting level, but each is supposed to be self
contained and adding a dependancy would much more grevious.

BUG=12179
http://codereview.chromium.org/159152


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21493 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 127 insertions, 0 deletions

diff --git a/webkit/api/public/linux/WebFontRendering.h b/webkit/api/public/linux/WebFontRendering.h
new file mode 100644
index 0000000..6fb0e10
--- /dev/null
+++ b/webkit/api/public/linux/WebFontRendering.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebFontRendering_h
+#define WebFontRendering_h
+
+#include "../WebCommon.h"
+
+#include <SkPaint.h>
+#include <SkFontHost.h>
+
+namespace WebKit {
+
+    class WebFontRendering {
+    public:
+        // Set global font renderering preferences.
+
+        WEBKIT_API static void setHinting(SkPaint::Hinting);
+        WEBKIT_API static void setAntiAlias(bool on);
+        WEBKIT_API static void setSubpixelGlyphs(bool on);
+        WEBKIT_API static void setLCDOrder(SkFontHost::LCDOrder);
+        WEBKIT_API static void setLCDOrientation(SkFontHost::LCDOrientation);
+    };
+
+} // namespace WebKit
+
+#endif
diff --git a/webkit/api/src/linux/WebFontRendering.cpp b/webkit/api/src/linux/WebFontRendering.cpp
new file mode 100644
index 0000000..b9862f5
--- /dev/null
+++ b/webkit/api/src/linux/WebFontRendering.cpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebFontRendering.h"
+
+#include "FontPlatformData.h"
+
+using WebCore::FontPlatformData;
+
+namespace WebKit {
+
+// static
+void WebFontRendering::setHinting(SkPaint::Hinting hinting)
+{
+    FontPlatformData::setHinting(hinting);
+}
+
+// static
+void WebFontRendering::setAntiAlias(bool isAntiAlias)
+{
+    FontPlatformData::setAntiAlias(isAntiAlias);
+}
+
+// static
+void WebFontRendering::setSubpixelGlyphs(bool isSubpixelGlyphs)
+{
+    FontPlatformData::setSubpixelGlyphs(isSubpixelGlyphs);
+}
+
+// static
+void WebFontRendering::setLCDOrder(SkFontHost::LCDOrder order)
+{
+    SkFontHost::SetSubpixelOrder(order);
+}
+
+// static
+void WebFontRendering::setLCDOrientation(SkFontHost::LCDOrientation orientation)
+{
+    SkFontHost::SetSubpixelOrientation(orientation);
+}
+
+} // namespace WebKit
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 7b96e29..632d56e 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -973,6 +973,7 @@
       ],
       'sources': [
         'api/public/gtk/WebInputEventFactory.h',
+        'api/public/linux/WebFontRendering.h',
         'api/public/x11/WebScreenInfoFactory.h',
         'api/public/mac/WebInputEventFactory.h',
         'api/public/mac/WebScreenInfoFactory.h',
@@ -1034,6 +1035,7 @@
         'api/src/gtk/WebFontInfo.cpp',
         'api/src/gtk/WebFontInfo.h',
         'api/src/gtk/WebInputEventFactory.cpp',
+        'api/src/linux/WebFontRendering.cpp',
         'api/src/x11/WebScreenInfoFactory.cpp',
         'api/src/mac/WebInputEventFactory.mm',
         'api/src/mac/WebScreenInfoFactory.mm',
@@ -1091,6 +1093,7 @@
           'sources/': [
             ['exclude', '/gtk/'],
             ['exclude', '/x11/'],
+            ['exclude', '/linux/'],
           ],
         }],
         ['OS=="mac"', {