Changeset 28555 in webkit

Timestamp:

Dec 7, 2007, 5:48:50 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Sam Weinig.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=16348 @font-face does not affect the default style

Test: fast/css/font-face-default-font.html

• dom/Document.cpp: (WebCore::Document::recalcStyle): Pass our font selector to Font::update() if we already have one.

LayoutTests:

Reviewed by Sam Weinig.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=16348 @font-face does not affect the default style

• fast/css/font-face-default-font.html: Added.
• platform/mac-leopard/fast/css: Added.
• platform/mac-leopard/fast/css/font-face-default-font-expected.checksum: Added.
• platform/mac-leopard/fast/css/font-face-default-font-expected.png: Added.
• platform/mac/fast/css/font-face-default-font-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/font-face-default-font.html (added)
• LayoutTests/platform/mac-leopard/fast/css (added)
• LayoutTests/platform/mac-leopard/fast/css/font-face-default-font-expected.checksum (added)
• LayoutTests/platform/mac-leopard/fast/css/font-face-default-font-expected.png (added)
• LayoutTests/platform/mac/fast/css/font-face-default-font-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-12-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=16348
+          @font-face does not affect the default style
+
+        * fast/css/font-face-default-font.html: Added.
+        * platform/mac-leopard/fast/css: Added.
+        * platform/mac-leopard/fast/css/font-face-default-font-expected.checksum: Added.
+        * platform/mac-leopard/fast/css/font-face-default-font-expected.png: Added.
+        * platform/mac/fast/css/font-face-default-font-expected.txt: Added.
+
 2007-12-07  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16348
+          @font-face does not affect the default style
+
+        Test: fast/css/font-face-default-font.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle): Pass our font selector to
+        Font::update() if we already have one.
+
 2007-12-07  Darin Adler  <darin@apple.com>
 

trunk/WebCore/dom/Document.cpp

@@ -1084 +1084 @@
 
         _style->setFontDescription(fontDescription);
-        _style->font().update(0);
+        _style->font().update(m_styleSelector->fontSelector());
         if (inCompatMode())
             _style->setHtmlHacks(true); // enable html specific rendering tricks