Log Message
[Chromium-Android] Use harfbuzz-ng instead of harfbuzz-old on Android https://bugs.webkit.org/show_bug.cgi?id=104410
Source/WebCore: Using harfbuzz-ng we can avoid many bugs of the obsolete harfbuzz-old. Reviewed by Eric Seidel. No new tests. No change of functionality. Existing tests should pass. * WebCore.gyp/WebCore.gyp: Use harfbuzz-ng on Android. Source/WebKit/chromium: Reviewed by Eric Seidel. * features.gypi: Enable harfbuzz-ng on Android.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138400 => 138401)
--- trunk/Source/WebCore/ChangeLog 2012-12-21 23:26:24 UTC (rev 138400)
+++ trunk/Source/WebCore/ChangeLog 2012-12-21 23:27:49 UTC (rev 138401)
@@ -1,3 +1,16 @@
+2012-12-21 Xianzhu Wang <[email protected]>
+
+ [Chromium-Android] Use harfbuzz-ng instead of harfbuzz-old on Android
+ https://bugs.webkit.org/show_bug.cgi?id=104410
+
+ Using harfbuzz-ng we can avoid many bugs of the obsolete harfbuzz-old.
+
+ Reviewed by Eric Seidel.
+
+ No new tests. No change of functionality. Existing tests should pass.
+
+ * WebCore.gyp/WebCore.gyp: Use harfbuzz-ng on Android.
+
2012-12-21 Joshua Bell <[email protected]>
IndexedDB: Combine openConnection and openConnectionWithVersion
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (138400 => 138401)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-12-21 23:26:24 UTC (rev 138400)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-12-21 23:27:49 UTC (rev 138401)
@@ -246,10 +246,6 @@
['use_x11==1 or OS=="android"', {
'webcore_include_dirs': [
'../platform/graphics/harfbuzz',
- ],
- }],
- ['use_x11==1', {
- 'webcore_include_dirs': [
'../platform/graphics/harfbuzz/ng',
],
}],
@@ -1702,7 +1698,7 @@
['exclude', 'platform/chromium/ScrollbarThemeChromiumDefault.h'],
],
}],
- ['use_x11 == 1', {
+ ['use_x11==1 or OS=="android"', {
'sources/': [
# Cherry-pick files excluded by the broader regular expressions above.
['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'],
@@ -1715,12 +1711,19 @@
['include', 'platform/graphics/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
['include', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
],
- }, { # use_x11==0
+ 'dependencies': [
+ '<(chromium_src_dir)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
+ ],
+ }, { # use_x11==0 and OS!="android"
'sources/': [
- ['exclude', 'Linux\\.cpp$'],
['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
],
}],
+ ['use_x11!=1', {
+ 'sources/': [
+ ['exclude', 'Linux\\.cpp$'],
+ ],
+ }],
['toolkit_uses_gtk == 1', {
'sources/': [
# Cherry-pick files excluded by the broader regular expressions above.
@@ -1731,16 +1734,6 @@
['exclude', 'Gtk\\.cpp$'],
],
}],
- ['use_x11==1', {
- 'dependencies': [
- '<(chromium_src_dir)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
- ],
- }],
- ['OS=="android"', {
- 'dependencies': [
- '<(chromium_src_dir)/third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
- ],
- }],
['OS=="mac"', {
# Necessary for Mac .mm stuff.
'include_dirs': [
@@ -1911,15 +1904,7 @@
['include', 'platform/graphics/chromium/GlyphPageTreeNodeLinux\\.cpp$'],
['exclude', 'platform/graphics/chromium/IconChromium\\.cpp$'],
['include', 'platform/graphics/chromium/VDMXParser\\.cpp$'],
- ['include', 'platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz\\.cpp$'],
- ['include', 'platform/graphics/harfbuzz/FontHarfBuzz\\.cpp$'],
- ['include', 'platform/graphics/harfbuzz/FontPlatformDataHarfBuzz\\.cpp$'],
- ['include', 'platform/graphics/harfbuzz/HarfBuzzSkia\\.cpp$'],
- ['include', 'platform/graphics/harfbuzz/HarfBuzzShaperBase\\.cpp$'],
- ['include', 'platform/graphics/opentype/OpenTypeTypes\\.h$'],
- ['include', 'platform/graphics/opentype/OpenTypeVerticalData\\.(cpp|h)$'],
['exclude', 'platform/graphics/skia/FontCacheSkia\\.cpp$'],
- ['include', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
],
}, { # OS!="android"
'sources/': [
Modified: trunk/Source/WebKit/chromium/ChangeLog (138400 => 138401)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-21 23:26:24 UTC (rev 138400)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-21 23:27:49 UTC (rev 138401)
@@ -1,3 +1,12 @@
+2012-12-21 Xianzhu Wang <[email protected]>
+
+ [Chromium-Android] Use harfbuzz-ng instead of harfbuzz-old on Android
+ https://bugs.webkit.org/show_bug.cgi?id=104410
+
+ Reviewed by Eric Seidel.
+
+ * features.gypi: Enable harfbuzz-ng on Android.
+
2012-12-21 Joshua Bell <[email protected]>
IndexedDB: Combine openConnection and openConnectionWithVersion
Modified: trunk/Source/WebKit/chromium/features.gypi (138400 => 138401)
--- trunk/Source/WebKit/chromium/features.gypi 2012-12-21 23:26:24 UTC (rev 138400)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-12-21 23:27:49 UTC (rev 138401)
@@ -235,7 +235,7 @@
'WTF_USE_SKIA_ON_MAC_CHROMIUM=1',
],
}],
- ['use_x11==1', {
+ ['use_x11==1 or OS=="android"', {
'feature_defines': [
'WTF_USE_HARFBUZZ_NG=1',
],
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-changes
