Commit f3d5c687 authored by bdash's avatar bdash

2007-01-18 Mitz Pettel <mitz@webkit.org>

        Reviewed by Maciej.

        - fix http://bugs.webkit.org/show_bug.cgi?id=12039
          Assertion failure in WebCore::Font::primaryFont

        Test: fast/text/font-initial.html

        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::applyProperty): Give 'font: initial' the
        Standard generic family. This makes the FontDescription different from
        that of the initial font of a GraphicsContext, ensuring that the latter
        will not be used.

2007-01-18  Mitz Pettel  <mitz@webkit.org>

        Reviewed by Maciej.

        - test for http://bugs.webkit.org/show_bug.cgi?id=12039
          Assertion failure in WebCore::Font::primaryFont

        * fast/text/font-initial-expected.checksum: Added.
        * fast/text/font-initial-expected.png: Added.
        * fast/text/font-initial-expected.txt: Added.
        * fast/text/font-initial.html: Added.


git-svn-id: svn://svn.chromium.org/blink/trunk@18971 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 877b7c1e
2007-01-18 Mitz Pettel <mitz@webkit.org>
Reviewed by Maciej.
- test for http://bugs.webkit.org/show_bug.cgi?id=12039
Assertion failure in WebCore::Font::primaryFont
* fast/text/font-initial-expected.checksum: Added.
* fast/text/font-initial-expected.png: Added.
* fast/text/font-initial-expected.txt: Added.
* fast/text/font-initial.html: Added.
2007-01-18 Mitz Pettel <mitz@webkit.org> 2007-01-18 Mitz Pettel <mitz@webkit.org>
Reviewed by Darin. Reviewed by Darin.
3d0e669d85afdb5d41be12ad3ca34834
\ No newline at end of file
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x18
RenderText {#text} at (0,0) size 53x18
text run at (0,0) width 53: "Test for "
RenderInline {I} at (0,0) size 620x18
RenderInline {A} at (0,0) size 301x18 [color=#0000EE]
RenderText {#text} at (53,0) size 301x18
text run at (53,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=12039"
RenderText {#text} at (354,0) size 319x18
text run at (354,0) width 4: " "
text run at (358,0) width 315: "Assertion failure in WebCore::Font::primaryFont"
RenderText {#text} at (673,0) size 4x18
text run at (673,0) width 4: "."
RenderBlock (anonymous) at (0,34) size 784x14
RenderInline {SPAN} at (0,0) size 30x14
RenderText {#text} at (0,0) size 30x14
text run at (0,0) width 30: "PASS"
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
<p>
Test for <i><a href="http://bugs.webkit.org/show_bug.cgi?id=12039">http://bugs.webkit.org/show_bug.cgi?id=12039</a>
Assertion failure in WebCore::Font::primaryFont</i>.
</p>
<span style="font: initial;">PASS</span>
<script>
// Makes the rendering code run even when not running as a pixel test.
if (window.layoutTestController)
layoutTestController.display();
</script>
2007-01-18 Mitz Pettel <mitz@webkit.org>
Reviewed by Maciej.
- fix http://bugs.webkit.org/show_bug.cgi?id=12039
Assertion failure in WebCore::Font::primaryFont
Test: fast/text/font-initial.html
* css/cssstyleselector.cpp:
(WebCore::CSSStyleSelector::applyProperty): Give 'font: initial' the
Standard generic family. This makes the FontDescription different from
that of the initial font of a GraphicsContext, ensuring that the latter
will not be used.
2007-01-18 Mitz Pettel <mitz@webkit.org> 2007-01-18 Mitz Pettel <mitz@webkit.org>
Reviewed by Darin. Reviewed by Darin.
......
...@@ -3569,6 +3569,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) ...@@ -3569,6 +3569,7 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
fontDirty = true; fontDirty = true;
} else if (isInitial) { } else if (isInitial) {
FontDescription fontDescription; FontDescription fontDescription;
fontDescription.setGenericFamily(FontDescription::StandardFamily);
style->setLineHeight(RenderStyle::initialLineHeight()); style->setLineHeight(RenderStyle::initialLineHeight());
if (style->setFontDescription(fontDescription)) if (style->setFontDescription(fontDescription))
fontDirty = true; fontDirty = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment