Changeset 63719 in webkit

Timestamp:

Jul 19, 2010 10:10:08 PM (14 years ago)

Author:

yuzo@google.com

Message:

2010-07-15 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Dan Bernstein.

Fix for Bug 42342 - Font download error for an @font-face rule invalidates other @font-face rules for the same font-family
​https://bugs.webkit.org/show_bug.cgi?id=42342

• fast/css/font-face-download-error-expected.txt: Added.
• fast/css/font-face-download-error.html: Added.

2010-07-15 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Dan Bernstein.

Fix for Bug 42342 - Font download error for an @font-face rule invalidates other @font-face rules for the same font-family
​https://bugs.webkit.org/show_bug.cgi?id=42342

Test: fast/css/font-face-download-error.html

• css/CSSSegmentedFontFace.cpp: (WebCore::CSSSegmentedFontFace::isValid): Valid if at least one font face is valid. (WebCore::CSSSegmentedFontFace::getFontData): Check validity for each font face.
• css/CSSSegmentedFontFace.h: Make isValid private.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/font-face-download-error-expected.txt (added)
• LayoutTests/fast/css/font-face-download-error.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSSegmentedFontFace.cpp (modified) (2 diffs)
• WebCore/css/CSSSegmentedFontFace.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-07-15  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Dan Bernstein.
+
+        Fix for Bug 42342 - Font download error for an @font-face rule invalidates other @font-face rules for the same font-family
+        https://bugs.webkit.org/show_bug.cgi?id=42342
+
+        * fast/css/font-face-download-error-expected.txt: Added.
+        * fast/css/font-face-download-error.html: Added.
+
 2010-07-19  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-15  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Dan Bernstein.
+
+        Fix for Bug 42342 - Font download error for an @font-face rule invalidates other @font-face rules for the same font-family
+        https://bugs.webkit.org/show_bug.cgi?id=42342
+
+        Test: fast/css/font-face-download-error.html
+
+        * css/CSSSegmentedFontFace.cpp:
+        (WebCore::CSSSegmentedFontFace::isValid): Valid if at least one font
+        face is valid.
+        (WebCore::CSSSegmentedFontFace::getFontData): Check validity for each
+        font face.
+        * css/CSSSegmentedFontFace.h: Make isValid private.
+
 2010-07-19  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/css/CSSSegmentedFontFace.cpp

@@ -62 +62 @@
 bool CSSSegmentedFontFace::isValid() const
 {
+    // Valid if at least one font face is valid.
     unsigned size = m_fontFaces.size();
     for (unsigned i = 0; i < size; i++) {
-        if (!m_fontFaces[i]->isValid())
-            return false;
+        if (m_fontFaces[i]->isValid())
+            return true;
     }
-    return true;
+    return false;
 }
 
@@ -98 +99 @@
     unsigned size = m_fontFaces.size();
     for (unsigned i = 0; i < size; i++) {
+        if (!m_fontFaces[i]->isValid())
+            continue;
         FontTraitsMask traitsMask = m_fontFaces[i]->traitsMask();
         bool syntheticBold = !(traitsMask & (FontWeight600Mask | FontWeight700Mask | FontWeight800Mask | FontWeight900Mask)) && (desiredTraitsMask & (FontWeight600Mask | FontWeight700Mask | FontWeight800Mask | FontWeight900Mask));

trunk/WebCore/css/CSSSegmentedFontFace.h

@@ -46 +46 @@
     ~CSSSegmentedFontFace();
 
-    bool isValid() const;
     CSSFontSelector* fontSelector() const { return m_fontSelector; }
 
@@ -59 +58 @@
 
     void pruneTable();
+    bool isValid() const;
 
     CSSFontSelector* m_fontSelector;