Changeset 74401 in webkit

Timestamp:

Dec 20, 2010 11:30:09 PM (13 years ago)

Author:

yuzo@google.com

Message:

2010-12-20 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Eric Seidel.

Fix for Bug 26183 - [@font-face] font-family descriptor with multiple names should be discarded
​https://bugs.webkit.org/show_bug.cgi?id=26183

• fast/css/font-face-font-family-descriptor-expected.txt: Added.
• fast/css/font-face-font-family-descriptor.html: Added.
• platform/win/css2.1/resources/Mac-compatible-font-fallback.css: (@font-face): Rewrote @font-face rules that specify multiple font families.

2010-12-20 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Eric Seidel.

Fix for Bug 26183 - [@font-face] font-family descriptor with multiple names should be discarded
​https://bugs.webkit.org/show_bug.cgi?id=26183

Test: fast/css/font-face-font-family-descriptor.html

• css/CSSParser.cpp: (WebCore::CSSParser::createFontFaceRule): Consider @font-face rule invalid if its font-family descriptor has multiple (or zero) families.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/font-face-font-family-descriptor-expected.txt (added)
• LayoutTests/fast/css/font-face-font-family-descriptor.html (added)
• LayoutTests/platform/win/css2.1/resources/Mac-compatible-font-fallback.css (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSParser.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-20  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Fix for Bug 26183 - [@font-face] font-family descriptor with multiple names should be discarded
+        https://bugs.webkit.org/show_bug.cgi?id=26183
+
+        * fast/css/font-face-font-family-descriptor-expected.txt: Added.
+        * fast/css/font-face-font-family-descriptor.html: Added.
+        * platform/win/css2.1/resources/Mac-compatible-font-fallback.css:
+        (@font-face): Rewrote @font-face rules that specify multiple font families.
+
 2010-12-20  Yuta Kitamura  <yutak@chromium.org>
 

trunk/LayoutTests/platform/win/css2.1/resources/Mac-compatible-font-fallback.css

@@ -10 +10 @@
 
 @font-face {
-    font-family: 'times' '-webkit-serif';
+    font-family: '-webkit-serif';
     src: local('WebKit Layout Tests');
     unicode-range: U+25FE, U+262F, U+2798-279A;
@@ -16 +16 @@
 
 @font-face {
-    font-family: 'times' '-webkit-serif';
+    font-family: '-webkit-serif';
+    src: local('WebKit Layout Tests 2');
+    unicode-range: U+21E6-21E9;
+}
+
+@font-face {
+    font-family: 'times';
+    src: local('WebKit Layout Tests');
+    unicode-range: U+25FE, U+262F, U+2798-279A;
+}
+
+@font-face {
+    font-family: 'times';
     src: local('WebKit Layout Tests 2');
     unicode-range: U+21E6-21E9;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-20  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Fix for Bug 26183 - [@font-face] font-family descriptor with multiple names should be discarded
+        https://bugs.webkit.org/show_bug.cgi?id=26183
+
+        Test: fast/css/font-face-font-family-descriptor.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::createFontFaceRule): Consider @font-face rule
+        invalid if its font-family descriptor has multiple (or zero) families.
+
 2010-12-20  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/css/CSSParser.cpp

@@ -5575 +5575 @@
 {
     m_allowImportRules = m_allowNamespaceDeclarations = false;
-    RefPtr<CSSFontFaceRule> rule = CSSFontFaceRule::create(m_styleSheet);
     for (unsigned i = 0; i < m_numParsedProperties; ++i) {
         CSSProperty* property = m_parsedProperties[i];
@@ -5583 +5582 @@
             property->m_value = CSSValueList::createCommaSeparated();
             static_cast<CSSValueList*>(property->m_value.get())->append(value.release());
-        }
-    }
+        } else if (id == CSSPropertyFontFamily && static_cast<CSSValueList*>(property->m_value.get())->length() != 1) {
+            // Unlike font-family property, font-family descriptor in @font-face rule can take only one family name.
+            // See http://dev.w3.org/csswg/css3-fonts/#font-family-desc
+            clearProperties();
+            return 0;
+        }
+    }
+    RefPtr<CSSFontFaceRule> rule = CSSFontFaceRule::create(m_styleSheet);
     rule->setDeclaration(CSSMutableStyleDeclaration::create(rule.get(), m_parsedProperties, m_numParsedProperties));
     clearProperties();