[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jamesr at google.com
jamesr at google.com
Wed Dec 22 16:23:29 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0346117d8e1b94b471c75b5979e2c0af3ce0eddc
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 22 23:04:10 2010 +0000
2010-11-22 James Robinson <jamesr at chromium.org>
Reviewed by Dimitri Glazkov.
[chromium] font-size:0 text runs should have zero width
https://bugs.webkit.org/show_bug.cgi?id=49871
Expands test to check width in addition to height.
* fast/text/font-size-zero-expected.txt:
* fast/text/font-size-zero.html:
* fast/text/script-tests/font-size-zero.js:
2010-11-22 James Robinson <jamesr at chromium.org>
Reviewed by Dimitri Glazkov.
[chromium] font-size:0 text runs should have zero width
https://bugs.webkit.org/show_bug.cgi?id=49871
Returns 0 from platformWidthForGlyph if the specified font size is 0.
Test: fast/text/font-size-zero.html
* platform/graphics/chromium/SimpleFontDataChromiumWin.cpp:
(WebCore::SimpleFontData::platformWidthForGlyph):
* platform/graphics/chromium/SimpleFontDataLinux.cpp:
(WebCore::SimpleFontData::platformWidthForGlyph):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72567 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9174dbb..fb20e6d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-22 James Robinson <jamesr at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [chromium] font-size:0 text runs should have zero width
+ https://bugs.webkit.org/show_bug.cgi?id=49871
+
+ Expands test to check width in addition to height.
+
+ * fast/text/font-size-zero-expected.txt:
+ * fast/text/font-size-zero.html:
+ * fast/text/script-tests/font-size-zero.js:
+
2010-11-22 Charlie Reis <creis at chromium.org>
Reviewed by Darin Fisher.
diff --git a/LayoutTests/fast/text/font-size-zero-expected.txt b/LayoutTests/fast/text/font-size-zero-expected.txt
index 0936902..20e0cfc 100644
--- a/LayoutTests/fast/text/font-size-zero-expected.txt
+++ b/LayoutTests/fast/text/font-size-zero-expected.txt
@@ -1,6 +1,7 @@
-Tests that text with font-size:0 has zero height.
+Tests that text with font-size:0 has zero height and width.
PASS s.getBoundingClientRect().height is 0
+PASS s.getBoundingClientRect().width is 0
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/text/font-size-zero.html b/LayoutTests/fast/text/font-size-zero.html
index 68214a5..7c57a6b 100644
--- a/LayoutTests/fast/text/font-size-zero.html
+++ b/LayoutTests/fast/text/font-size-zero.html
@@ -5,7 +5,7 @@
<script src="../js/resources/js-test-pre.js"></script>
</head>
<body>
-<p id="description">Tests that text with font-size:0 has zero height.</p>
+<p id="description">Tests that text with font-size:0 has zero height and width.</p>
<div id="console"></div>
<script src="script-tests/font-size-zero.js"></script>
<script src="../js/resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/text/script-tests/font-size-zero.js b/LayoutTests/fast/text/script-tests/font-size-zero.js
index 5b69f7f..a01d012 100644
--- a/LayoutTests/fast/text/script-tests/font-size-zero.js
+++ b/LayoutTests/fast/text/script-tests/font-size-zero.js
@@ -4,6 +4,7 @@ s.innerHTML = 'Text';
document.body.appendChild(s);
shouldBe("s.getBoundingClientRect().height", "0");
+shouldBe("s.getBoundingClientRect().width", "0");
document.body.removeChild(s);
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2a35ae5..8d39848 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-22 James Robinson <jamesr at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ [chromium] font-size:0 text runs should have zero width
+ https://bugs.webkit.org/show_bug.cgi?id=49871
+
+ Returns 0 from platformWidthForGlyph if the specified font size is 0.
+
+ Test: fast/text/font-size-zero.html
+
+ * platform/graphics/chromium/SimpleFontDataChromiumWin.cpp:
+ (WebCore::SimpleFontData::platformWidthForGlyph):
+ * platform/graphics/chromium/SimpleFontDataLinux.cpp:
+ (WebCore::SimpleFontData::platformWidthForGlyph):
+
2010-11-22 Charlie Reis <creis at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp b/WebCore/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp
index ea2eb7c..bcef1fe 100644
--- a/WebCore/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp
+++ b/WebCore/platform/graphics/chromium/SimpleFontDataChromiumWin.cpp
@@ -167,6 +167,9 @@ FloatRect SimpleFontData::platformBoundsForGlyph(Glyph) const
float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
{
+ if (!m_platformData.size())
+ return 0;
+
HDC dc = GetDC(0);
HGDIOBJ oldFont = SelectObject(dc, m_platformData.hfont());
diff --git a/WebCore/platform/graphics/chromium/SimpleFontDataLinux.cpp b/WebCore/platform/graphics/chromium/SimpleFontDataLinux.cpp
index e7ff9ee..c5190fc 100644
--- a/WebCore/platform/graphics/chromium/SimpleFontDataLinux.cpp
+++ b/WebCore/platform/graphics/chromium/SimpleFontDataLinux.cpp
@@ -53,6 +53,18 @@ static const size_t maxVDMXTableSize = 1024 * 1024; // 1 MB
void SimpleFontData::platformInit()
{
+ if (!m_platformData.size()) {
+ m_ascent = 0;
+ m_descent = 0;
+ m_lineGap = 0;
+ m_lineSpacing = 0;
+ m_avgCharWidth = 0;
+ m_maxCharWidth = 0;
+ m_xHeight = 0;
+ m_unitsPerEm = 0;
+ return;
+ }
+
SkPaint paint;
SkPaint::FontMetrics metrics;
@@ -177,6 +189,9 @@ FloatRect SimpleFontData::platformBoundsForGlyph(Glyph) const
float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
{
+ if (!m_platformData.size())
+ return 0;
+
SkASSERT(sizeof(glyph) == 2); // compile-time assert
SkPaint paint;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list