Changeset 17825 in webkit
- Timestamp:
- Nov 16, 2006 6:11:54 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r17798 r17825 1 2006-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 1 14 2006-11-15 Adele Peterson <adele@apple.com> 2 15 -
trunk/WebCore/ChangeLog
r17824 r17825 1 2006-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 1 23 2006-11-16 David Harrison <harrison@apple.com> 2 24 -
trunk/WebCore/css/CSSStyleSheet.cpp
r17730 r17825 171 171 if (parent()) 172 172 parent()->checkLoaded(); 173 if (m_parentNode) 174 m_parentNode->sheetLoaded(); 175 m_loadCompleted = true; 173 m_loadCompleted = m_parentNode ? m_parentNode->sheetLoaded() : true; 176 174 } 177 175 -
trunk/WebCore/dom/Node.h
r17808 r17825 203 203 204 204 // For <link> and <style> elements. 205 virtual void sheetLoaded() {}205 virtual bool sheetLoaded() { return true; } 206 206 207 207 bool hasID() const { return m_hasId; } -
trunk/WebCore/dom/ProcessingInstruction.cpp
r17652 r17825 190 190 } 191 191 192 voidProcessingInstruction::sheetLoaded()193 { 194 if (!isLoading()) 192 bool ProcessingInstruction::sheetLoaded() 193 { 194 if (!isLoading()) { 195 195 document()->stylesheetLoaded(); 196 return true; 197 } 198 return false; 196 199 } 197 200 -
trunk/WebCore/dom/ProcessingInstruction.h
r16885 r17825 63 63 void setCSSStyleSheet(CSSStyleSheet*); 64 64 bool isLoading() const; 65 v oidsheetLoaded();65 virtual bool sheetLoaded(); 66 66 virtual String toString() const; 67 67 -
trunk/WebCore/html/HTMLLinkElement.cpp
r17652 r17825 236 236 } 237 237 238 voidHTMLLinkElement::sheetLoaded()239 { 240 if (!isLoading() && !isDisabled() && !isAlternate()) 238 bool HTMLLinkElement::sheetLoaded() 239 { 240 if (!isLoading() && !isDisabled() && !isAlternate()) { 241 241 document()->stylesheetLoaded(); 242 return true; 243 } 244 return false; 242 245 } 243 246 -
trunk/WebCore/html/HTMLLinkElement.h
r17399 r17825 82 82 virtual void setCSSStyleSheet(const String &url, const String& charset, const String &sheet); 83 83 bool isLoading() const; 84 v oidsheetLoaded();84 virtual bool sheetLoaded(); 85 85 86 86 bool isAlternate() const { return m_disabledState == 0 && m_alternate; } -
trunk/WebCore/html/HTMLStyleElement.cpp
r17136 r17825 112 112 } 113 113 114 voidHTMLStyleElement::sheetLoaded()114 bool HTMLStyleElement::sheetLoaded() 115 115 { 116 if (!isLoading()) 116 if (!isLoading()) { 117 117 document()->stylesheetLoaded(); 118 return true; 119 } 120 return false; 118 121 } 119 122 -
trunk/WebCore/html/HTMLStyleElement.h
r14401 r17825 48 48 49 49 bool isLoading() const; 50 v oidsheetLoaded();50 virtual bool sheetLoaded(); 51 51 52 52 bool disabled() const;
Note: See TracChangeset
for help on using the changeset viewer.