[Chromium] Change back "linuxish" to "linux" and include WebFontRendering.cpp on...
authorwangxianzhu@chromium.org <wangxianzhu@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Jun 2012 16:55:20 +0000 (16:55 +0000)
committerwangxianzhu@chromium.org <wangxianzhu@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 18 Jun 2012 16:55:20 +0000 (16:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=89228

Reviewed by Tony Chang.

Source/WebKit/chromium:

* WebKit.gyp:
* public/linux/WebFontRendering.h:
(WebKit):
(WebFontRendering):
* public/linuxish/WebFontRendering.h: Removed.
* src/linux/WebFontRendering.cpp: Renamed from Source/WebKit/chromium/src/linuxish/WebFontRendering.cpp.
(WebKit):
(WebKit::WebFontRendering::setHinting):
(WebKit::WebFontRendering::setAutoHint):
(WebKit::WebFontRendering::setUseBitmaps):
(WebKit::WebFontRendering::setAntiAlias):
(WebKit::WebFontRendering::setSubpixelRendering):
(WebKit::WebFontRendering::setSubpixelPositioning):
(WebKit::WebFontRendering::setLCDOrder):
(WebKit::WebFontRendering::setLCDOrientation):

Tools:

* DumpRenderTree/chromium/LayoutTestController.cpp:
* DumpRenderTree/chromium/TestShellAndroid.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@120603 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/public/linux/WebFontRendering.h
Source/WebKit/chromium/public/linuxish/WebFontRendering.h [deleted file]
Source/WebKit/chromium/src/linux/WebFontRendering.cpp [moved from Source/WebKit/chromium/src/linuxish/WebFontRendering.cpp with 100% similarity]
Tools/ChangeLog
Tools/DumpRenderTree/chromium/LayoutTestController.cpp
Tools/DumpRenderTree/chromium/TestShellAndroid.cpp

index 0092494..b120f36 100644 (file)
@@ -1,3 +1,26 @@
+2012-06-18  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        [Chromium] Change back "linuxish" to "linux" and include WebFontRendering.cpp on Android
+        https://bugs.webkit.org/show_bug.cgi?id=89228
+
+        Reviewed by Tony Chang.
+
+        * WebKit.gyp:
+        * public/linux/WebFontRendering.h:
+        (WebKit):
+        (WebFontRendering):
+        * public/linuxish/WebFontRendering.h: Removed.
+        * src/linux/WebFontRendering.cpp: Renamed from Source/WebKit/chromium/src/linuxish/WebFontRendering.cpp.
+        (WebKit):
+        (WebKit::WebFontRendering::setHinting):
+        (WebKit::WebFontRendering::setAutoHint):
+        (WebKit::WebFontRendering::setUseBitmaps):
+        (WebKit::WebFontRendering::setAntiAlias):
+        (WebKit::WebFontRendering::setSubpixelRendering):
+        (WebKit::WebFontRendering::setSubpixelPositioning):
+        (WebKit::WebFontRendering::setLCDOrder):
+        (WebKit::WebFontRendering::setLCDOrientation):
+
 2012-06-18  Hironori Bono  <hbono@chromium.org>
 
         [chromium] Spellchecker should show suggestions only when right-clicking a misspelled word.
index 276c5a4..880b3b5 100644 (file)
                 'public/android/WebSandboxSupport.h',
                 'public/gtk/WebInputEventFactory.h',
                 'public/linux/WebFontRenderStyle.h',
+                'public/linux/WebFontRendering.h',
                 'public/linux/WebRenderTheme.h',
-                'public/linuxish/WebFontRendering.h',
                 'public/mac/WebInputEventFactory.h',
                 'public/mac/WebSandboxSupport.h',
                 'public/mac/WebScreenInfoFactory.h',
                 'src/PrerendererClientImpl.cpp',
                 'src/android/WebInputEventFactory.cpp',
                 'src/linux/WebFontInfo.cpp',
+                'src/linux/WebFontRendering.cpp',
                 'src/linux/WebFontRenderStyle.cpp',
                 'src/linux/WebRenderTheme.cpp',
-                'src/linuxish/WebFontRendering.cpp',
                 'src/x11/WebScreenInfoFactory.cpp',
                 'src/mac/WebInputEventFactory.mm',
                 'src/mac/WebScreenInfoFactory.mm',
                     'include_dirs': [
                         'public/x11',
                         'public/linux',
-                        'public/linuxish',
                     ],
                 }, { # else: use_x11 != 1
                     'sources/': [
                 ['OS=="android"', {
                     'include_dirs': [
                         'public/android',
-                        'public/linuxish',
+                        'public/linux', # We need linux/WebFontRendering.h on Android.
                     ],
                 }, { # else: OS!="android"
                     'sources/': [
                         ['exclude', '/android/'],
                     ],
                 }],
-                # FIXME: Here and other places duplicate rules in Chromium's build/filename_rules.gypi.
-                # However without the duplication, gyp_webkit fails at least on chromium-win-release.
-                ['OS!="android" and OS!="linux" and OS!="openbsd" and OS!="freebsd"', {
-                    'sources/': [
-                        ['exclude', '/linuxish/'],
-                    ],
-                }],
                 # TODO: we exclude CG.cpp on both sides of the below conditional. Move elsewhere?
                 ['OS=="mac"', {
                     'include_dirs': [
                     },
                 }],
             ],
+            'target_conditions': [
+                ['OS=="android"', {
+                    'sources/': [
+                        ['include', '^src/linux/WebFontRendering\\.cpp$'],
+                    ],
+                }],
+            ],
         },
         {
             'target_name': 'inspector_resources',
index 715432c..ae1bbb0 100644 (file)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-// FIXME: Remove once http://codereview.chromium.org/10544103/ is landed.
-#include "../linuxish/WebFontRendering.h"
+
+#ifndef WebFontRendering_h
+#define WebFontRendering_h
+
+#include "../platform/WebCommon.h"
+#include <SkFontHost.h>
+#include <SkPaint.h>
+
+namespace WebKit {
+
+class WebFontRendering {
+public:
+    // Set global font renderering preferences.
+
+    WEBKIT_EXPORT static void setHinting(SkPaint::Hinting);
+    WEBKIT_EXPORT static void setAutoHint(bool);
+    WEBKIT_EXPORT static void setUseBitmaps(bool);
+    WEBKIT_EXPORT static void setAntiAlias(bool);
+    WEBKIT_EXPORT static void setSubpixelRendering(bool);
+    WEBKIT_EXPORT static void setSubpixelPositioning(bool);
+    WEBKIT_EXPORT static void setLCDOrder(SkFontHost::LCDOrder);
+    WEBKIT_EXPORT static void setLCDOrientation(SkFontHost::LCDOrientation);
+};
+
+} // namespace WebKit
+
+#endif
diff --git a/Source/WebKit/chromium/public/linuxish/WebFontRendering.h b/Source/WebKit/chromium/public/linuxish/WebFontRendering.h
deleted file mode 100644 (file)
index ae1bbb0..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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 "../platform/WebCommon.h"
-#include <SkFontHost.h>
-#include <SkPaint.h>
-
-namespace WebKit {
-
-class WebFontRendering {
-public:
-    // Set global font renderering preferences.
-
-    WEBKIT_EXPORT static void setHinting(SkPaint::Hinting);
-    WEBKIT_EXPORT static void setAutoHint(bool);
-    WEBKIT_EXPORT static void setUseBitmaps(bool);
-    WEBKIT_EXPORT static void setAntiAlias(bool);
-    WEBKIT_EXPORT static void setSubpixelRendering(bool);
-    WEBKIT_EXPORT static void setSubpixelPositioning(bool);
-    WEBKIT_EXPORT static void setLCDOrder(SkFontHost::LCDOrder);
-    WEBKIT_EXPORT static void setLCDOrientation(SkFontHost::LCDOrientation);
-};
-
-} // namespace WebKit
-
-#endif
index e1e877c..b43f39f 100644 (file)
@@ -1,3 +1,13 @@
+2012-06-18  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        [Chromium] Change back "linuxish" to "linux" and include WebFontRendering.cpp on Android
+        https://bugs.webkit.org/show_bug.cgi?id=89228
+
+        Reviewed by Tony Chang.
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        * DumpRenderTree/chromium/TestShellAndroid.cpp:
+
 2012-06-18  Mario Sanchez Prada  <msanchez@igalia.com>
 
         [GTK] Get rid of DumpRenderTreeSupportGtk::{in|de}crementAccessibilityValue
index 1f64d65..120197e 100644 (file)
@@ -79,7 +79,7 @@
 #endif
 
 #if OS(LINUX) || OS(ANDROID)
-#include "linuxish/WebFontRendering.h"
+#include "linux/WebFontRendering.h"
 #endif
 
 using namespace WebCore;
index d32c864..ba182bb 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "TestShell.h"
 
-#include "linuxish/WebFontRendering.h"
+#include "linux/WebFontRendering.h"
 #include <android/log.h>
 #include <errno.h>
 #include <fcntl.h>