Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (120219 => 120220)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-13 16:41:08 UTC (rev 120219)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-13 17:09:54 UTC (rev 120220)
@@ -1,3 +1,18 @@
+2012-06-13 Xianzhu Wang <[email protected]>
+
+ [Chromium] Let Android and Linux share WebFontRendering decl/impl.
+ https://bugs.webkit.org/show_bug.cgi?id=88802
+
+ Reviewed by Adam Barth.
+
+ * WebKit.gyp:
+ * public/linux/WebFontRendering.h: Temporarily forwards to the new file under linuxish.
+ * public/linuxish: Added.
+ * public/linuxish/WebFontRendering.h: Copied from chromium/public/linux/WebFontRendering.h.
+ * src/linux/WebFontRendering.cpp: Removed.
+ * src/linuxish: Added.
+ * src/linuxish/WebFontRendering.cpp: Copied from chromium/src/linux/WebFontRendering.cpp.
+
2012-06-13 Martin Kosiba <[email protected]>
[Chromium] WebFrameImpl::find doesn't work for searching from a selection.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (120219 => 120220)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-06-13 16:41:08 UTC (rev 120219)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-06-13 17:09:54 UTC (rev 120220)
@@ -284,8 +284,8 @@
'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',
@@ -428,9 +428,9 @@
'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',
@@ -776,11 +776,12 @@
'include_dirs': [
'public/x11',
'public/linux',
+ 'public/linuxish',
],
}, { # else: use_x11 != 1
'sources/': [
+ # FIXME: Put this rule in Chromium's build/filename_rules.gypi.
['exclude', '/x11/'],
- ['exclude', '/linux/'],
],
}],
['toolkit_uses_gtk == 1', {
@@ -790,19 +791,12 @@
'include_dirs': [
'public/gtk',
],
- }, { # else: toolkit_uses_gtk != 1
- 'sources/': [
- ['exclude', '/gtk/'],
- ],
}],
['OS=="android"', {
'include_dirs': [
'public/android',
+ 'public/linuxish',
],
- }, { # else: OS!="android"
- 'sources/': [
- ['exclude', '/android/'],
- ],
}],
# TODO: we exclude CG.cpp on both sides of the below conditional. Move elsewhere?
['OS=="mac"', {
@@ -814,7 +808,6 @@
],
}, { # else: OS!="mac"
'sources/': [
- ['exclude', '/mac/'],
['exclude', 'CG\\.cpp$'],
],
}],
@@ -823,7 +816,6 @@
'public/win',
],
}, { # else: OS!="win"
- 'sources/': [['exclude', '/win/']],
'variables': {
# FIXME: Turn on warnings on Windows.
'chromium_code': 1,
Modified: trunk/Source/WebKit/chromium/public/linux/WebFontRendering.h (120219 => 120220)
--- trunk/Source/WebKit/chromium/public/linux/WebFontRendering.h 2012-06-13 16:41:08 UTC (rev 120219)
+++ trunk/Source/WebKit/chromium/public/linux/WebFontRendering.h 2012-06-13 17:09:54 UTC (rev 120220)
@@ -27,29 +27,5 @@
* (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 setAntiAlias(bool);
- WEBKIT_EXPORT static void setSubpixelGlyphs(bool); // DEPRECATED: use setSubpixelRendering instead
- 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
+// FIXME: Remove once http://codereview.chromium.org/10544103/ is landed.
+#include "../linuxish/WebFontRendering.h"
Copied: trunk/Source/WebKit/chromium/public/linuxish/WebFontRendering.h (from rev 120219, trunk/Source/WebKit/chromium/public/linux/WebFontRendering.h) (0 => 120220)
--- trunk/Source/WebKit/chromium/public/linuxish/WebFontRendering.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/linuxish/WebFontRendering.h 2012-06-13 17:09:54 UTC (rev 120220)
@@ -0,0 +1,55 @@
+/*
+ * 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 setAntiAlias(bool);
+ WEBKIT_EXPORT static void setSubpixelGlyphs(bool); // DEPRECATED: use setSubpixelRendering instead
+ 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
Deleted: trunk/Source/WebKit/chromium/src/linux/WebFontRendering.cpp (120219 => 120220)
--- trunk/Source/WebKit/chromium/src/linux/WebFontRendering.cpp 2012-06-13 16:41:08 UTC (rev 120219)
+++ trunk/Source/WebKit/chromium/src/linux/WebFontRendering.cpp 2012-06-13 17:09:54 UTC (rev 120220)
@@ -1,82 +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.
- */
-
-#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::setSubpixelRendering(isSubpixelGlyphs);
-}
-
-// static
-void WebFontRendering::setSubpixelRendering(bool useSubpixelRendering)
-{
- FontPlatformData::setSubpixelRendering(useSubpixelRendering);
-}
-
-// static
-void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning)
-{
- FontPlatformData::setSubpixelPositioning(useSubpixelPositioning);
-}
-
-// static
-void WebFontRendering::setLCDOrder(SkFontHost::LCDOrder order)
-{
- SkFontHost::SetSubpixelOrder(order);
-}
-
-// static
-void WebFontRendering::setLCDOrientation(SkFontHost::LCDOrientation orientation)
-{
- SkFontHost::SetSubpixelOrientation(orientation);
-}
-
-} // namespace WebKit
Copied: trunk/Source/WebKit/chromium/src/linuxish/WebFontRendering.cpp (from rev 120219, trunk/Source/WebKit/chromium/src/linux/WebFontRendering.cpp) (0 => 120220)
--- trunk/Source/WebKit/chromium/src/linuxish/WebFontRendering.cpp (rev 0)
+++ trunk/Source/WebKit/chromium/src/linuxish/WebFontRendering.cpp 2012-06-13 17:09:54 UTC (rev 120220)
@@ -0,0 +1,82 @@
+/*
+ * 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::setSubpixelRendering(isSubpixelGlyphs);
+}
+
+// static
+void WebFontRendering::setSubpixelRendering(bool useSubpixelRendering)
+{
+ FontPlatformData::setSubpixelRendering(useSubpixelRendering);
+}
+
+// static
+void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning)
+{
+ FontPlatformData::setSubpixelPositioning(useSubpixelPositioning);
+}
+
+// static
+void WebFontRendering::setLCDOrder(SkFontHost::LCDOrder order)
+{
+ SkFontHost::SetSubpixelOrder(order);
+}
+
+// static
+void WebFontRendering::setLCDOrientation(SkFontHost::LCDOrientation orientation)
+{
+ SkFontHost::SetSubpixelOrientation(orientation);
+}
+
+} // namespace WebKit
