[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
rwlbuis at webkit.org
rwlbuis at webkit.org
Wed Dec 22 17:57:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1d9f96f1d63b188adecfb36c93b2516046321899
Author: rwlbuis at webkit.org <rwlbuis at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 3 08:08:46 2010 +0000
2010-12-02 Rob Buis <rwlbuis at gmail.com>
Reviewed by Alexey Proskuryakov.
CSS 2.1 failure: at-import-*
https://bugs.webkit.org/show_bug.cgi?id=47153
Fix at-import-010.htm by only setting m_allowImportRules
to false when creating valid style or page rules.
Test: css2.1/t040105-import-10-b.html
* css/CSSParser.cpp:
(WebCore::CSSParser::createStyleRule):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73246 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0910b70..a94fb61 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-02 Rob Buis <rwlbuis at gmail.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ CSS 2.1 failure: at-import-*
+ https://bugs.webkit.org/show_bug.cgi?id=47153
+
+ Import the html4/at-import-010 test from the CSS2.1 Testsuite.
+
+ * css2.1/t040105-import-10-b.html: Added.
+ * platform/mac/css2.1/t040105-import-10-b-expected.checksum: Added.
+ * platform/mac/css2.1/t040105-import-10-b-expected.png: Added.
+ * platform/mac/css2.1/t040105-import-10-b-expected.txt: Added.
+
2010-12-02 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Andreas Kling.
diff --git a/LayoutTests/css2.1/t040105-import-10-b.html b/LayoutTests/css2.1/t040105-import-10-b.html
new file mode 100644
index 0000000..0846909
--- /dev/null
+++ b/LayoutTests/css2.1/t040105-import-10-b.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+ <head>
+ <title>CSS 2.1 Test Suite: At-rules</title>
+ <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#at-rules">
+ <style type="text/css">
+
+ # { background: red; }
+ :unknownpseudo { background: red; }
+ @import "support/import-green.css";
+
+ </style>
+ </head>
+ <body>
+ <p class="import">This sentence must be green.</p>
+ </body>
+</html>
diff --git a/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.checksum b/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.checksum
new file mode 100644
index 0000000..ad0df3f
--- /dev/null
+++ b/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.checksum
@@ -0,0 +1 @@
+b7763d24029a46b045e01c18f38d7d84
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.png b/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.png
new file mode 100644
index 0000000..791d69d
Binary files /dev/null and b/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.png differ
diff --git a/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.txt b/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.txt
new file mode 100644
index 0000000..15d7ade
--- /dev/null
+++ b/LayoutTests/platform/mac/css2.1/t040105-import-10-b-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x50
+ RenderBlock {HTML} at (0,0) size 800x50
+ RenderBody {BODY} at (8,16) size 784x18
+ RenderBlock {P} at (0,0) size 784x18 [color=#008000]
+ RenderText {#text} at (0,0) size 182x18
+ text run at (0,0) width 182: "This sentence must be green."
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 46a2030..aa82a1b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-02 Rob Buis <rwlbuis at gmail.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ CSS 2.1 failure: at-import-*
+ https://bugs.webkit.org/show_bug.cgi?id=47153
+
+ Fix at-import-010.htm by only setting m_allowImportRules
+ to false when creating valid style or page rules.
+
+ Test: css2.1/t040105-import-10-b.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::createStyleRule):
+
2010-12-02 Aaron Boodman <aa at chromium.org>
Reviewed by David Hyatt.
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index a59253d..12b8eea 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -5536,10 +5536,10 @@ WebKitCSSKeyframesRule* CSSParser::createKeyframesRule()
CSSRule* CSSParser::createStyleRule(Vector<CSSSelector*>* selectors)
{
- m_allowImportRules = m_allowNamespaceDeclarations = false;
CSSStyleRule* result = 0;
markRuleBodyEnd();
if (selectors) {
+ m_allowImportRules = m_allowNamespaceDeclarations = false;
RefPtr<CSSStyleRule> rule = CSSStyleRule::create(m_styleSheet, m_lastSelectorLineNumber);
rule->adoptSelectorVector(*selectors);
if (m_hasFontFaceOnlyValues)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list