Changeset 17825 in webkit


Ignore:
Timestamp:
Nov 16, 2006 6:11:54 PM (17 years ago)
Author:
beidson
Message:

LayoutTests:

Reviewed and landed by Brady

Testcase for:
​http://bugs.webkit.org/show_bug.cgi?id=11590
Bug 11590: REGRESSION (r17726-r17742): Wikipedia page intermittently loads but doesn't render

  • fast/css/import-rule-regression-11590-expected.txt: Added.
  • fast/css/import-rule-regression-11590.html: Added.
  • fast/css/resources/imports.css: Added.
  • fast/css/resources/style.css: Added.

WebCore:

Reviewed and landed by Brady

Fixes ​http://bugs.webkit.org/show_bug.cgi?id=11590 -
REGRESSION (r17726-r17742): Wikipedia page intermittently loads but doesn't render
Fix the regression by setting m_loadCompleted correctly.

  • css/CSSStyleSheet.cpp: (WebCore::CSSStyleSheet::checkLoaded):
  • dom/Node.h: (WebCore::Node::sheetLoaded):
  • dom/ProcessingInstruction.cpp: (WebCore::ProcessingInstruction::sheetLoaded):
  • dom/ProcessingInstruction.h:
  • html/HTMLLinkElement.cpp: (WebCore::HTMLLinkElement::sheetLoaded):
  • html/HTMLLinkElement.h:
  • html/HTMLStyleElement.cpp: (WebCore::HTMLStyleElement::sheetLoaded):
  • html/HTMLStyleElement.h:
Location:
trunk
Files:
4 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r17798 r17825  
     12006-11-16  Rob Buis  <buis@kde.org>
     2
     3        Reviewed and landed by Brady
     4
     5        Testcase for:
     6        http://bugs.webkit.org/show_bug.cgi?id=11590
     7        Bug 11590: REGRESSION (r17726-r17742): Wikipedia page intermittently loads but doesn't render
     8
     9        * fast/css/import-rule-regression-11590-expected.txt: Added.
     10        * fast/css/import-rule-regression-11590.html: Added.
     11        * fast/css/resources/imports.css: Added.
     12        * fast/css/resources/style.css: Added.
     13
    1142006-11-15  Adele Peterson  <adele@apple.com>
    215

  • trunk/WebCore/ChangeLog

    r17824 r17825  
     12006-11-16  Rob Buis  <buis@kde.org>
     2
     3        Reviewed and landed by Brady
     4
     5        Fixes http://bugs.webkit.org/show_bug.cgi?id=11590 -
     6        REGRESSION (r17726-r17742): Wikipedia page intermittently loads but doesn't render
     7        Fix the regression by setting m_loadCompleted correctly.
     8
     9        * css/CSSStyleSheet.cpp:
     10        (WebCore::CSSStyleSheet::checkLoaded):
     11        * dom/Node.h:
     12        (WebCore::Node::sheetLoaded):
     13        * dom/ProcessingInstruction.cpp:
     14        (WebCore::ProcessingInstruction::sheetLoaded):
     15        * dom/ProcessingInstruction.h:
     16        * html/HTMLLinkElement.cpp:
     17        (WebCore::HTMLLinkElement::sheetLoaded):
     18        * html/HTMLLinkElement.h:
     19        * html/HTMLStyleElement.cpp:
     20        (WebCore::HTMLStyleElement::sheetLoaded):
     21        * html/HTMLStyleElement.h:
     22
    1232006-11-16  David Harrison  <harrison@apple.com>
    224

  • trunk/WebCore/css/CSSStyleSheet.cpp

    r17730 r17825  
    171171    if (parent())
    172172        parent()->checkLoaded();
    173     if (m_parentNode)
    174         m_parentNode->sheetLoaded();
    175     m_loadCompleted = true;
     173    m_loadCompleted = m_parentNode ? m_parentNode->sheetLoaded() : true;
    176174}
    177175

  • trunk/WebCore/dom/Node.h

    r17808 r17825  
    203203
    204204    // For <link> and <style> elements.
    205     virtual void sheetLoaded() { }
     205    virtual bool sheetLoaded() { return true; }
    206206
    207207    bool hasID() const { return m_hasId; }

  • trunk/WebCore/dom/ProcessingInstruction.cpp

    r17652 r17825  
    190190}
    191191
    192 void ProcessingInstruction::sheetLoaded()
    193 {
    194     if (!isLoading())
     192bool ProcessingInstruction::sheetLoaded()
     193{
     194    if (!isLoading()) {
    195195        document()->stylesheetLoaded();
     196    return true;
     197    }
     198    return false;
    196199}
    197200

  • trunk/WebCore/dom/ProcessingInstruction.h

    r16885 r17825  
    6363    void setCSSStyleSheet(CSSStyleSheet*);
    6464    bool isLoading() const;
    65     void sheetLoaded();
     65    virtual bool sheetLoaded();
    6666    virtual String toString() const;
    6767

  • trunk/WebCore/html/HTMLLinkElement.cpp

    r17652 r17825  
    236236}
    237237
    238 void HTMLLinkElement::sheetLoaded()
    239 {
    240     if (!isLoading() && !isDisabled() && !isAlternate())
     238bool HTMLLinkElement::sheetLoaded()
     239{
     240    if (!isLoading() && !isDisabled() && !isAlternate()) {
    241241        document()->stylesheetLoaded();
     242        return true;
     243    }
     244    return false;
    242245}
    243246

  • trunk/WebCore/html/HTMLLinkElement.h

    r17399 r17825  
    8282    virtual void setCSSStyleSheet(const String &url, const String& charset, const String &sheet);
    8383    bool isLoading() const;
    84     void sheetLoaded();
     84    virtual bool sheetLoaded();
    8585
    8686    bool isAlternate() const { return m_disabledState == 0 && m_alternate; }

  • trunk/WebCore/html/HTMLStyleElement.cpp

    r17136 r17825  
    112112}
    113113
    114 void HTMLStyleElement::sheetLoaded()
     114bool HTMLStyleElement::sheetLoaded()
    115115{
    116     if (!isLoading())
     116    if (!isLoading()) {
    117117        document()->stylesheetLoaded();
     118        return true;
     119    }
     120    return false;
    118121}
    119122

  • trunk/WebCore/html/HTMLStyleElement.h

    r14401 r17825  
    4848
    4949    bool isLoading() const;
    50     void sheetLoaded();
     50    virtual bool sheetLoaded();
    5151
    5252    bool disabled() const;
Note: See TracChangeset for help on using the changeset viewer.