Changeset 102580 in webkit
- Timestamp:
- Dec 12, 2011 7:13:18 AM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r102578 r102580 1 2011-12-12 Renata Hodovan <reni@webkit.org> 2 3 Fulfill FIXME in HTMLLinkElement.h. 4 https://bugs.webkit.org/show_bug.cgi?id=74278 5 6 Rename HTMLLinkElement::isLoading() to isStyleSheetLoading(). 7 8 Reviewed by Andreas Kling. 9 10 No new tests because the functionality remains the same. 11 12 * dom/Document.cpp: 13 (WebCore::Document::recalcStyleSelector): 14 * html/HTMLLinkElement.cpp: 15 (WebCore::HTMLLinkElement::setDisabledState): 16 (WebCore::HTMLLinkElement::isStyleSheetLoading): 17 (WebCore::HTMLLinkElement::sheetLoaded): 18 * html/HTMLLinkElement.h: 19 1 20 2011-11-25 Alexander Pavlov <apavlov@chromium.org> 2 21 -
trunk/Source/WebCore/dom/Document.cpp
r102523 r102580 3105 3105 continue; 3106 3106 enabledViaScript = linkElement->isEnabledViaScript(); 3107 if (linkElement->is Loading()) {3107 if (linkElement->isStyleSheetLoading()) { 3108 3108 // it is loading but we should still decide which style sheet set to use 3109 3109 if (!enabledViaScript && !title.isEmpty() && m_preferredStylesheetSet.isEmpty()) { -
trunk/Source/WebCore/html/HTMLLinkElement.cpp
r99742 r102580 91 91 // If we change the disabled state while the sheet is still loading, then we have to 92 92 // perform three checks: 93 if (is Loading()) {93 if (isStyleSheetLoading()) { 94 94 // Check #1: The sheet becomes disabled while loading. 95 95 if (m_disabledState == Disabled) … … 334 334 } 335 335 336 bool HTMLLinkElement::is Loading() const336 bool HTMLLinkElement::isStyleSheetLoading() const 337 337 { 338 338 if (m_loading) … … 355 355 bool HTMLLinkElement::sheetLoaded() 356 356 { 357 if (!is Loading()) {357 if (!isStyleSheetLoading()) { 358 358 removePendingSheet(); 359 359 return true; -
trunk/Source/WebCore/html/HTMLLinkElement.h
r98300 r102580 54 54 CSSStyleSheet* sheet() const { return m_sheet.get(); } 55 55 56 // FIXME: This should be renamed isStyleSheetLoading as this is only used for stylesheets. 57 bool isLoading() const; 56 bool isStyleSheetLoading() const; 58 57 59 58 bool isDisabled() const { return m_disabledState == Disabled; }
Note: See TracChangeset
for help on using the changeset viewer.