[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mitz at apple.com
mitz at apple.com
Mon Feb 21 00:28:39 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 2c6dad3a236a2477b2e0ad7fd400308f9a6bdf5c
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 1 00:30:40 2011 +0000
Inter-ideograph justification should apply to hiragana and katakana as well
https://bugs.webkit.org/show_bug.cgi?id=53464
Reviewed by Adele Peterson.
Source/WebCore:
Changed the test for expansion opportunities from isCJKIdeograph() to isCJKIdeographOrSymbol().
* platform/graphics/Font.cpp:
(WebCore::Font::expansionOpportunityCount):
* platform/graphics/WidthIterator.cpp:
(WebCore::WidthIterator::advance):
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::ComplexTextController::adjustGlyphsAndAdvances):
LayoutTests:
* platform/mac/fast/text/justify-ideograph-complex-expected.checksum:
* platform/mac/fast/text/justify-ideograph-complex-expected.png:
* platform/mac/fast/text/justify-ideograph-simple-expected.checksum:
* platform/mac/fast/text/justify-ideograph-simple-expected.png:
* platform/mac/fast/text/justify-ideograph-vertical-expected.checksum:
* platform/mac/fast/text/justify-ideograph-vertical-expected.png:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77173 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ff49781..6376c16 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-31 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Adele Peterson.
+
+ Inter-ideograph justification should apply to hiragana and katakana as well
+ https://bugs.webkit.org/show_bug.cgi?id=53464
+
+ * platform/mac/fast/text/justify-ideograph-complex-expected.checksum:
+ * platform/mac/fast/text/justify-ideograph-complex-expected.png:
+ * platform/mac/fast/text/justify-ideograph-simple-expected.checksum:
+ * platform/mac/fast/text/justify-ideograph-simple-expected.png:
+ * platform/mac/fast/text/justify-ideograph-vertical-expected.checksum:
+ * platform/mac/fast/text/justify-ideograph-vertical-expected.png:
+
2011-01-31 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed Chromium test expectation update.
diff --git a/LayoutTests/platform/mac/fast/text/justify-ideograph-complex-expected.checksum b/LayoutTests/platform/mac/fast/text/justify-ideograph-complex-expected.checksum
index b3d7151..1a6d88a 100644
--- a/LayoutTests/platform/mac/fast/text/justify-ideograph-complex-expected.checksum
+++ b/LayoutTests/platform/mac/fast/text/justify-ideograph-complex-expected.checksum
@@ -1 +1 @@
-0091eb5817d8785a9a9f3686f84932e6
\ No newline at end of file
+c93199bc034d2dde1298c069944eaaf8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/text/justify-ideograph-complex-expected.png b/LayoutTests/platform/mac/fast/text/justify-ideograph-complex-expected.png
index b634ceb..356888f 100644
Binary files a/LayoutTests/platform/mac/fast/text/justify-ideograph-complex-expected.png and b/LayoutTests/platform/mac/fast/text/justify-ideograph-complex-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/text/justify-ideograph-simple-expected.checksum b/LayoutTests/platform/mac/fast/text/justify-ideograph-simple-expected.checksum
index d40bc89..ffdeb86 100644
--- a/LayoutTests/platform/mac/fast/text/justify-ideograph-simple-expected.checksum
+++ b/LayoutTests/platform/mac/fast/text/justify-ideograph-simple-expected.checksum
@@ -1 +1 @@
-8494b6ff162ad9c96022a5f8fe2dc0d3
\ No newline at end of file
+58b2f0acbbfbf297b467c6beae080d12
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/text/justify-ideograph-simple-expected.png b/LayoutTests/platform/mac/fast/text/justify-ideograph-simple-expected.png
index fe4db76..15a03c3 100644
Binary files a/LayoutTests/platform/mac/fast/text/justify-ideograph-simple-expected.png and b/LayoutTests/platform/mac/fast/text/justify-ideograph-simple-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/text/justify-ideograph-vertical-expected.checksum b/LayoutTests/platform/mac/fast/text/justify-ideograph-vertical-expected.checksum
index a1d49b4..81f1294 100644
--- a/LayoutTests/platform/mac/fast/text/justify-ideograph-vertical-expected.checksum
+++ b/LayoutTests/platform/mac/fast/text/justify-ideograph-vertical-expected.checksum
@@ -1 +1 @@
-ee4ee736b11358ca0278cf9b558d021a
\ No newline at end of file
+0d64f4dc9cb92a79dceaa387a0ae9c63
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/text/justify-ideograph-vertical-expected.png b/LayoutTests/platform/mac/fast/text/justify-ideograph-vertical-expected.png
index 77ec7a3..13f02e2 100644
Binary files a/LayoutTests/platform/mac/fast/text/justify-ideograph-vertical-expected.png and b/LayoutTests/platform/mac/fast/text/justify-ideograph-vertical-expected.png differ
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bc42f51..eaeded4 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-31 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Adele Peterson.
+
+ Inter-ideograph justification should apply to hiragana and katakana as well
+ https://bugs.webkit.org/show_bug.cgi?id=53464
+
+ Changed the test for expansion opportunities from isCJKIdeograph() to isCJKIdeographOrSymbol().
+
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::expansionOpportunityCount):
+ * platform/graphics/WidthIterator.cpp:
+ (WebCore::WidthIterator::advance):
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
+
2011-01-31 Dimitri Glazkov <dglazkov at chromium.org>
Reviewed by James Robinson.
diff --git a/Source/WebCore/platform/graphics/Font.cpp b/Source/WebCore/platform/graphics/Font.cpp
index 0f8ebcb..cd48972 100644
--- a/Source/WebCore/platform/graphics/Font.cpp
+++ b/Source/WebCore/platform/graphics/Font.cpp
@@ -474,7 +474,7 @@ unsigned Font::expansionOpportunityCount(const UChar* characters, size_t length,
character = U16_GET_SUPPLEMENTARY(character, characters[i + 1]);
i++;
}
- if (expandAroundIdeographs && isCJKIdeograph(character)) {
+ if (expandAroundIdeographs && isCJKIdeographOrSymbol(character)) {
if (!isAfterExpansion)
count++;
count++;
@@ -495,7 +495,7 @@ unsigned Font::expansionOpportunityCount(const UChar* characters, size_t length,
character = U16_GET_SUPPLEMENTARY(characters[i - 2], character);
i--;
}
- if (expandAroundIdeographs && isCJKIdeograph(character)) {
+ if (expandAroundIdeographs && isCJKIdeographOrSymbol(character)) {
if (!isAfterExpansion)
count++;
count++;
diff --git a/Source/WebCore/platform/graphics/WidthIterator.cpp b/Source/WebCore/platform/graphics/WidthIterator.cpp
index 65c99fb..6d4fd95 100644
--- a/Source/WebCore/platform/graphics/WidthIterator.cpp
+++ b/Source/WebCore/platform/graphics/WidthIterator.cpp
@@ -175,7 +175,7 @@ void WidthIterator::advance(int offset, GlyphBuffer* glyphBuffer)
static bool expandAroundIdeographs = Font::canExpandAroundIdeographsInComplexText();
bool treatAsSpace = Font::treatAsSpace(c);
- if (treatAsSpace || (expandAroundIdeographs && Font::isCJKIdeograph(c))) {
+ if (treatAsSpace || (expandAroundIdeographs && Font::isCJKIdeographOrSymbol(c))) {
// Distribute the run's total expansion evenly over all expansion opportunities in the run.
if (m_expansion && (m_run.allowsTrailingExpansion() || (m_run.ltr() && currentCharacter + clusterLength < static_cast<size_t>(m_run.length()))
|| (m_run.rtl() && currentCharacter))) {
diff --git a/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp b/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
index a788ab5..7466978 100644
--- a/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
+++ b/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp
@@ -489,7 +489,7 @@ void ComplexTextController::adjustGlyphsAndAdvances()
advance.width += m_font.letterSpacing();
// Handle justification and word-spacing.
- if (treatAsSpace || Font::isCJKIdeograph(ch)) {
+ if (treatAsSpace || Font::isCJKIdeographOrSymbol(ch)) {
// Distribute the run's total expansion evenly over all expansion opportunities in the run.
if (m_expansion && (!lastGlyph || m_run.allowsTrailingExpansion())) {
float previousExpansion = m_expansion;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list