[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.2.2-27-g91dab87
Gustavo Noronha Silva
gns at gnome.org
Thu Jul 15 21:13:13 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 1b768895fb57c2d0c217462abbb4d3d905dd0cc4
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Mar 20 05:29:01 2010 +0000
2010-03-19 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dan Bernstein.
WebCore::RenderButton::styleDidChange ReadAV at NULL (6739b7fe455ecb54a6812c0866c3b47c)
https://bugs.webkit.org/show_bug.cgi?id=34641
* fast/css/first-letter-block-form-controls-crash-expected.txt: Added.
* fast/css/first-letter-block-form-controls-crash.html: Added.
2010-03-19 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Dan Bernstein.
WebCore::RenderButton::styleDidChange ReadAV at NULL (6739b7fe455ecb54a6812c0866c3b47c)
https://bugs.webkit.org/show_bug.cgi?id=34641
Don't dig into buttons and menu lists when finding which element
should be modified by :first-letter pseudo class. Even before
this change, we didn't dig into inline buttons and menu lists as
they are replaced so this issue wasn't found long time.
Test: fast/css/first-letter-block-form-controls-crash.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::updateFirstLetter):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56297 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 277f268..7153855 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-19 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ WebCore::RenderButton::styleDidChange ReadAV at NULL (6739b7fe455ecb54a6812c0866c3b47c)
+ https://bugs.webkit.org/show_bug.cgi?id=34641
+
+ * fast/css/first-letter-block-form-controls-crash-expected.txt: Added.
+ * fast/css/first-letter-block-form-controls-crash.html: Added.
+
2010-06-01 Sergio Villar Senin <svillar at igalia.com>
Unskipping tests. No review necessary.
diff --git a/LayoutTests/fast/css/first-letter-block-form-controls-crash-expected.txt b/LayoutTests/fast/css/first-letter-block-form-controls-crash-expected.txt
new file mode 100644
index 0000000..809000b
--- /dev/null
+++ b/LayoutTests/fast/css/first-letter-block-form-controls-crash-expected.txt
@@ -0,0 +1,10 @@
+Test case for Bug 34641.
+
+
+
+
+
+
+
+
+No crash means PASS
diff --git a/LayoutTests/fast/css/first-letter-block-form-controls-crash.html b/LayoutTests/fast/css/first-letter-block-form-controls-crash.html
new file mode 100644
index 0000000..a032da7
--- /dev/null
+++ b/LayoutTests/fast/css/first-letter-block-form-controls-crash.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ .capitalize:first-letter {
+ text-transform: uppercase;
+ }
+ .block {
+ display: block;
+ }
+</style>
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+</head>
+<body>
+ <p>
+ Test case for <a href="https://bugs.webkit.org/show_bug.cgi?id=34641">Bug 34641</a>.
+ </p>
+
+ <div class="capitalize"><input class="block" type="submit"></div>
+ <div class="capitalize"><select class="block"><option>foo</select></div>
+ <div class="capitalize"><input class="block" type="text" value="foo"></div>
+ <div class="capitalize"><input class="block" type="checkbox"></div>
+ <div class="capitalize"><input class="block" type="radio"></div>
+ <div class="capitalize"><input class="block" type="file"></div>
+ <div class="capitalize"><textarea class="block"></textarea></div>
+ <div class="capitalize"><video class="block" controls></video></div>
+ <div class="capitalize"><audio class="block" controls></audio></div>
+ <!-- this makes WebKit recalc style -->
+ <style></style>
+ <p>No crash means PASS</p>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 523c437..e956ee2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-19 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ WebCore::RenderButton::styleDidChange ReadAV at NULL (6739b7fe455ecb54a6812c0866c3b47c)
+ https://bugs.webkit.org/show_bug.cgi?id=34641
+
+ Don't dig into buttons and menu lists when finding which element
+ should be modified by :first-letter pseudo class. Even before
+ this change, we didn't dig into inline buttons and menu lists as
+ they are replaced so this issue wasn't found long time.
+
+ Test: fast/css/first-letter-block-form-controls-crash.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::updateFirstLetter):
+
2010-03-18 Darin Adler <darin at apple.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 5e788a4..4a7363d 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -4639,7 +4639,7 @@ void RenderBlock::updateFirstLetter()
// Drill into inlines looking for our first text child.
RenderObject* currChild = firstLetterBlock->firstChild();
- while (currChild && currChild->needsLayout() && (!currChild->isReplaced() || currChild->isFloatingOrPositioned()) && !currChild->isText()) {
+ while (currChild && currChild->needsLayout() && ((!currChild->isReplaced() && !currChild->isRenderButton() && !currChild->isMenuList()) || currChild->isFloatingOrPositioned()) && !currChild->isText()) {
if (currChild->isFloatingOrPositioned()) {
if (currChild->style()->styleType() == FIRST_LETTER)
break;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list