[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hamaji at chromium.org
hamaji at chromium.org
Wed Dec 22 11:26:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ab2382d0c2fc3c63ba3863b23344405e374fe746
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 23 08:37:15 2010 +0000
2010-07-23 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Kent Tamura.
Backslash isn't transcoded in <input>
https://bugs.webkit.org/show_bug.cgi?id=42878
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
2010-07-23 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Kent Tamura.
Backslash isn't transcoded in <input>
https://bugs.webkit.org/show_bug.cgi?id=42878
* editing/selection/find-yensign-and-backslash-expected.txt:
* platform/mac/fast/text/backslash-to-yen-sign-euc-expected.checksum:
* platform/mac/fast/text/backslash-to-yen-sign-euc-expected.png:
* platform/mac/fast/text/backslash-to-yen-sign-euc-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63957 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 36ee8e3..2bfa198 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
2010-07-23 Shinichiro Hamaji <hamaji at chromium.org>
+ Reviewed by Kent Tamura.
+
+ Backslash isn't transcoded in <input>
+ https://bugs.webkit.org/show_bug.cgi?id=42878
+
+ * editing/selection/find-yensign-and-backslash-expected.txt:
+ * platform/mac/fast/text/backslash-to-yen-sign-euc-expected.checksum:
+ * platform/mac/fast/text/backslash-to-yen-sign-euc-expected.png:
+ * platform/mac/fast/text/backslash-to-yen-sign-euc-expected.txt:
+
+2010-07-23 Shinichiro Hamaji <hamaji at chromium.org>
+
Unreviewed. Put a failing result for now.
Backslash is transcoded into yen sign even when non japanese font is specified
diff --git a/LayoutTests/editing/selection/find-yensign-and-backslash-expected.txt b/LayoutTests/editing/selection/find-yensign-and-backslash-expected.txt
index 3ed2130..baa0493 100644
--- a/LayoutTests/editing/selection/find-yensign-and-backslash-expected.txt
+++ b/LayoutTests/editing/selection/find-yensign-and-backslash-expected.txt
@@ -3,9 +3,9 @@
Results
We can find a backslash in EUC-JP page by finding a yen sign: PASS
-We can find a backslash in EUC-JP text control by finding a yen sign: FAIL
+We can find a backslash in EUC-JP text control by finding a yen sign: PASS
We can find a backslash in Shift_JIS_X0213-2000 page by finding a yen sign: PASS
-We can find a backslash in Shift_JIS_X0213-2000 text control by finding a yen sign: FAIL
+We can find a backslash in Shift_JIS_X0213-2000 text control by finding a yen sign: PASS
We can NOT find a backslash in UTF8 page by finding a yen sign: PASS
We can NOT find a backslash in UTF8 text control by finding a yen sign: PASS
diff --git a/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.checksum b/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.checksum
index a3e3476..af31927 100644
--- a/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.checksum
+++ b/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.checksum
@@ -1 +1 @@
-286a8869d5eb858feeefe72a4d4f5da7
\ No newline at end of file
+a5e945bf841c506d5ffe6a9feb1cb63a
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.png b/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.png
index 0a3a758..ab842e8 100644
Binary files a/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.png and b/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.txt b/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.txt
index 9c1a1fb..80c7929 100644
--- a/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/backslash-to-yen-sign-euc-expected.txt
@@ -261,95 +261,95 @@ layer at (0,0) size 785x729
RenderText {#text} at (368,0) size 4x18
text run at (368,0) width 4: "\\"
RenderBlock {DIV} at (0,389) size 769x18
- RenderInline {SPAN} at (0,0) size 338x16
- RenderText {#text} at (0,1) size 324x16
- text run at (0,1) width 324: "Using font \"caption\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (324,1) size 7x16
- text run at (324,1) width 7: "\\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (331,1) size 7x16
- text run at (331,1) width 7: "\\"
+ RenderInline {SPAN} at (0,0) size 344x16
+ RenderText {#text} at (0,1) size 326x16
+ text run at (0,1) width 326: "Using font \"caption\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (326,1) size 9x16
+ text run at (326,1) width 9: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (335,1) size 9x16
+ text run at (335,1) width 9: "\x{A5}"
RenderBlock {DIV} at (0,407) size 769x18
- RenderInline {SPAN} at (0,0) size 318x16
- RenderText {#text} at (0,1) size 304x16
- text run at (0,1) width 304: "Using font \"icon\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (304,1) size 7x16
- text run at (304,1) width 7: "\\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (311,1) size 7x16
- text run at (311,1) width 7: "\\"
+ RenderInline {SPAN} at (0,0) size 324x16
+ RenderText {#text} at (0,1) size 306x16
+ text run at (0,1) width 306: "Using font \"icon\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (306,1) size 9x16
+ text run at (306,1) width 9: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (315,1) size 9x16
+ text run at (315,1) width 9: "\x{A5}"
RenderBlock {DIV} at (0,425) size 769x18
- RenderInline {SPAN} at (0,0) size 327x16
- RenderText {#text} at (0,1) size 313x16
- text run at (0,1) width 313: "Using font \"menu\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (313,1) size 7x16
- text run at (313,1) width 7: "\\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (320,1) size 7x16
- text run at (320,1) width 7: "\\"
+ RenderInline {SPAN} at (0,0) size 333x16
+ RenderText {#text} at (0,1) size 315x16
+ text run at (0,1) width 315: "Using font \"menu\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (315,1) size 9x16
+ text run at (315,1) width 9: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (324,1) size 9x16
+ text run at (324,1) width 9: "\x{A5}"
RenderBlock {DIV} at (0,443) size 769x18
- RenderInline {SPAN} at (0,0) size 380x16
- RenderText {#text} at (0,1) size 366x16
- text run at (0,1) width 366: "Using font \"message-box\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (366,1) size 7x16
- text run at (366,1) width 7: "\\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (373,1) size 7x16
- text run at (373,1) width 7: "\\"
+ RenderInline {SPAN} at (0,0) size 386x16
+ RenderText {#text} at (0,1) size 368x16
+ text run at (0,1) width 368: "Using font \"message-box\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (368,1) size 9x16
+ text run at (368,1) width 9: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (377,1) size 9x16
+ text run at (377,1) width 9: "\x{A5}"
RenderBlock {DIV} at (0,461) size 769x18
- RenderInline {SPAN} at (0,0) size 322x13
- RenderText {#text} at (0,3) size 310x13
- text run at (0,3) width 310: "Using font \"small-caption\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 6x13
- RenderText {#text} at (310,3) size 6x13
- text run at (310,3) width 6: "\\"
- RenderInline {SPAN} at (0,0) size 6x13
- RenderText {#text} at (316,3) size 6x13
- text run at (316,3) width 6: "\\"
+ RenderInline {SPAN} at (0,0) size 325x13
+ RenderText {#text} at (0,3) size 311x13
+ text run at (0,3) width 311: "Using font \"small-caption\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 7x13
+ RenderText {#text} at (311,3) size 7x13
+ text run at (311,3) width 7: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 7x13
+ RenderText {#text} at (318,3) size 7x13
+ text run at (318,3) width 7: "\x{A5}"
RenderBlock {DIV} at (0,479) size 769x18
- RenderInline {SPAN} at (0,0) size 279x12
- RenderText {#text} at (0,4) size 267x12
- text run at (0,4) width 267: "Using font \"status-bar\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 6x12
- RenderText {#text} at (267,4) size 6x12
- text run at (267,4) width 6: "\\"
- RenderInline {SPAN} at (0,0) size 6x12
- RenderText {#text} at (273,4) size 6x12
- text run at (273,4) width 6: "\\"
+ RenderInline {SPAN} at (0,0) size 282x12
+ RenderText {#text} at (0,4) size 268x12
+ text run at (0,4) width 268: "Using font \"status-bar\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 7x12
+ RenderText {#text} at (268,4) size 7x12
+ text run at (268,4) width 7: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 7x12
+ RenderText {#text} at (275,4) size 7x12
+ text run at (275,4) width 7: "\x{A5}"
RenderBlock {DIV} at (0,497) size 769x18
- RenderInline {SPAN} at (0,0) size 303x11
- RenderText {#text} at (0,5) size 293x11
- text run at (0,5) width 293: "Using font \"-webkit-mini-control\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 5x11
- RenderText {#text} at (293,5) size 5x11
- text run at (293,5) width 5: "\\"
- RenderInline {SPAN} at (0,0) size 5x11
- RenderText {#text} at (298,5) size 5x11
- text run at (298,5) width 5: "\\"
+ RenderInline {SPAN} at (0,0) size 306x11
+ RenderText {#text} at (0,5) size 294x11
+ text run at (0,5) width 294: "Using font \"-webkit-mini-control\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 6x11
+ RenderText {#text} at (294,5) size 6x11
+ text run at (294,5) width 6: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 6x11
+ RenderText {#text} at (300,5) size 6x11
+ text run at (300,5) width 6: "\x{A5}"
RenderBlock {DIV} at (0,515) size 769x18
- RenderInline {SPAN} at (0,0) size 371x13
- RenderText {#text} at (0,3) size 359x13
- text run at (0,3) width 359: "Using font \"-webkit-small-control\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 6x13
- RenderText {#text} at (359,3) size 6x13
- text run at (359,3) width 6: "\\"
- RenderInline {SPAN} at (0,0) size 6x13
- RenderText {#text} at (365,3) size 6x13
- text run at (365,3) width 6: "\\"
+ RenderInline {SPAN} at (0,0) size 374x13
+ RenderText {#text} at (0,3) size 360x13
+ text run at (0,3) width 360: "Using font \"-webkit-small-control\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 7x13
+ RenderText {#text} at (360,3) size 7x13
+ text run at (360,3) width 7: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 7x13
+ RenderText {#text} at (367,3) size 7x13
+ text run at (367,3) width 7: "\x{A5}"
RenderBlock {DIV} at (0,533) size 769x18
- RenderInline {SPAN} at (0,0) size 394x16
- RenderText {#text} at (0,1) size 380x16
- text run at (0,1) width 380: "Using font \"-webkit-control\". expected: backslash, actual: \\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (380,1) size 7x16
- text run at (380,1) width 7: "\\"
- RenderInline {SPAN} at (0,0) size 7x16
- RenderText {#text} at (387,1) size 7x16
- text run at (387,1) width 7: "\\"
+ RenderInline {SPAN} at (0,0) size 400x16
+ RenderText {#text} at (0,1) size 382x16
+ text run at (0,1) width 382: "Using font \"-webkit-control\". expected: backslash, actual: \x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (382,1) size 9x16
+ text run at (382,1) width 9: "\x{A5}"
+ RenderInline {SPAN} at (0,0) size 9x16
+ RenderText {#text} at (391,1) size 9x16
+ text run at (391,1) width 9: "\x{A5}"
RenderBlock {DIV} at (0,551) size 769x18
RenderInline {SPAN} at (0,0) size 404x18
RenderText {#text} at (0,0) size 388x18
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5b5cfa9..0e782f0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-23 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ Backslash isn't transcoded in <input>
+ https://bugs.webkit.org/show_bug.cgi?id=42878
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+
2010-07-22 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index e9b3b80..6974055 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -4623,8 +4623,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
FontDescription fontDescription;
RenderTheme::defaultTheme()->systemFont(primitiveValue->getIdent(), fontDescription);
- fontDescription.setIsSpecifiedFont(true);
-
+
// Double-check and see if the theme did anything. If not, don't bother updating the font.
if (fontDescription.isAbsoluteSize()) {
// Make sure the rendering mode and printer font settings are updated.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list