[Chromium] Use OpenTypeVerticalData on Linux
authorbashi@chromium.org <bashi@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Sep 2012 23:35:07 +0000 (23:35 +0000)
committerbashi@chromium.org <bashi@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Sep 2012 23:35:07 +0000 (23:35 +0000)
commit490b85260b5a5eb735179864ccf2aa93be08abf5
treeb3c399207d048836c1464a1795ea2e7365e1a6c5
parent00c4d4f8a9788a8dbb5e808d02d998828d176aab
[Chromium] Use OpenTypeVerticalData on Linux
https://bugs.webkit.org/show_bug.cgi?id=97277

Reviewed by Tony Chang.

Source/WebCore:

Remove HarfBuzz dependency from GlyphPageTreeNodeSkia. Use OpenTypeVerticalData instead.

No new tests. Rebaselined existing tests.

* WebCore.gyp/WebCore.gyp: Added OpenTypeTypes.h and OpenTypeVerticalData.(cpp|h) for linux and android.
* platform/graphics/FontCache.cpp:
Inserted a space between > and > in typedef of FontVerticalDataCache so that making some compilers happy.
(WebCore):
* platform/graphics/SimpleFontData.h:
(SimpleFontData): Moved declaration of m_verticalData to avoid compile warnings.
* platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp:
(WebCore):
(WebCore::FontPlatformData::verticalData): Added.
(WebCore::FontPlatformData::openTypeTable): Added.
* platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h:
(WebCore):
(FontPlatformData):
* platform/graphics/skia/GlyphPageTreeNodeSkia.cpp: Removed substituteWithVerticalGlyphs().
(WebCore::GlyphPage::fill):

Source/WebKit/chromium:

* features.gypi: Enable OPENTYPE_VERTICAL on linux and android.

LayoutTests:

Rebaselined vertical writing test expectations.

* platform/chromium-linux/editing/selection/vertical-lr-ltr-extend-line-backward-br-expected.png:
* platform/chromium-linux/editing/selection/vertical-lr-ltr-extend-line-forward-br-expected.png:
* platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-backward-br-expected.png:
* platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-backward-p-expected.png:
* platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-backward-wrap-expected.png:
* platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-forward-br-expected.png:
* platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-forward-p-expected.png:
* platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-forward-wrap-expected.png:
* platform/chromium-linux/fast/dynamic/text-combine-expected.png:
* platform/chromium-linux/fast/repaint/japanese-rl-selection-repaint-expected.png:
* platform/chromium-linux/fast/text/international/text-spliced-font-expected.png:
* platform/chromium-linux/fast/writing-mode/Kusa-Makura-background-canvas-expected.png:
* platform/chromium-linux/fast/writing-mode/border-vertical-lr-expected.png:
* platform/chromium-linux/fast/writing-mode/japanese-lr-selection-expected.png:
* platform/chromium-linux/fast/writing-mode/japanese-lr-text-expected.png:
* platform/chromium-linux/fast/writing-mode/japanese-rl-selection-expected.png:
* platform/chromium-linux/fast/writing-mode/japanese-rl-text-expected.png:
* platform/chromium-linux/fast/writing-mode/japanese-rl-text-with-broken-font-expected.png:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@129273 268f45cc-cd09-0410-ab3c-d52691b4dbfc
28 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/chromium-linux/editing/selection/vertical-lr-ltr-extend-line-backward-br-expected.png
LayoutTests/platform/chromium-linux/editing/selection/vertical-lr-ltr-extend-line-forward-br-expected.png
LayoutTests/platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-backward-br-expected.png
LayoutTests/platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-backward-p-expected.png
LayoutTests/platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-backward-wrap-expected.png
LayoutTests/platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-forward-br-expected.png
LayoutTests/platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-forward-p-expected.png
LayoutTests/platform/chromium-linux/editing/selection/vertical-rl-ltr-extend-line-forward-wrap-expected.png
LayoutTests/platform/chromium-linux/fast/dynamic/text-combine-expected.png
LayoutTests/platform/chromium-linux/fast/repaint/japanese-rl-selection-repaint-expected.png
LayoutTests/platform/chromium-linux/fast/text/international/text-spliced-font-expected.png
LayoutTests/platform/chromium-linux/fast/writing-mode/Kusa-Makura-background-canvas-expected.png
LayoutTests/platform/chromium-linux/fast/writing-mode/border-vertical-lr-expected.png
LayoutTests/platform/chromium-linux/fast/writing-mode/japanese-lr-selection-expected.png
LayoutTests/platform/chromium-linux/fast/writing-mode/japanese-lr-text-expected.png
LayoutTests/platform/chromium-linux/fast/writing-mode/japanese-rl-selection-expected.png
LayoutTests/platform/chromium-linux/fast/writing-mode/japanese-rl-text-expected.png
LayoutTests/platform/chromium-linux/fast/writing-mode/japanese-rl-text-with-broken-font-expected.png
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/platform/graphics/FontCache.cpp
Source/WebCore/platform/graphics/SimpleFontData.h
Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp
Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.h
Source/WebCore/platform/graphics/skia/GlyphPageTreeNodeSkia.cpp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/features.gypi