Title: [102580] trunk/Source/WebCore
- Revision
- 102580
- Author
- [email protected]
- Date
- 2011-12-12 07:13:18 -0800 (Mon, 12 Dec 2011)
Log Message
Fulfill FIXME in HTMLLinkElement.h.
https://bugs.webkit.org/show_bug.cgi?id=74278
Rename HTMLLinkElement::isLoading() to isStyleSheetLoading().
Reviewed by Andreas Kling.
No new tests because the functionality remains the same.
* dom/Document.cpp:
(WebCore::Document::recalcStyleSelector):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::setDisabledState):
(WebCore::HTMLLinkElement::isStyleSheetLoading):
(WebCore::HTMLLinkElement::sheetLoaded):
* html/HTMLLinkElement.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102579 => 102580)
--- trunk/Source/WebCore/ChangeLog 2011-12-12 14:54:34 UTC (rev 102579)
+++ trunk/Source/WebCore/ChangeLog 2011-12-12 15:13:18 UTC (rev 102580)
@@ -1,3 +1,22 @@
+2011-12-12 Renata Hodovan <[email protected]>
+
+ Fulfill FIXME in HTMLLinkElement.h.
+ https://bugs.webkit.org/show_bug.cgi?id=74278
+
+ Rename HTMLLinkElement::isLoading() to isStyleSheetLoading().
+
+ Reviewed by Andreas Kling.
+
+ No new tests because the functionality remains the same.
+
+ * dom/Document.cpp:
+ (WebCore::Document::recalcStyleSelector):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::setDisabledState):
+ (WebCore::HTMLLinkElement::isStyleSheetLoading):
+ (WebCore::HTMLLinkElement::sheetLoaded):
+ * html/HTMLLinkElement.h:
+
2011-11-25 Alexander Pavlov <[email protected]>
WebKit does not enumerate over CSS properties in HTMLElement.style
Modified: trunk/Source/WebCore/dom/Document.cpp (102579 => 102580)
--- trunk/Source/WebCore/dom/Document.cpp 2011-12-12 14:54:34 UTC (rev 102579)
+++ trunk/Source/WebCore/dom/Document.cpp 2011-12-12 15:13:18 UTC (rev 102580)
@@ -3104,7 +3104,7 @@
if (linkElement->isDisabled())
continue;
enabledViaScript = linkElement->isEnabledViaScript();
- if (linkElement->isLoading()) {
+ if (linkElement->isStyleSheetLoading()) {
// it is loading but we should still decide which style sheet set to use
if (!enabledViaScript && !title.isEmpty() && m_preferredStylesheetSet.isEmpty()) {
const AtomicString& rel = e->getAttribute(relAttr);
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (102579 => 102580)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2011-12-12 14:54:34 UTC (rev 102579)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2011-12-12 15:13:18 UTC (rev 102580)
@@ -90,7 +90,7 @@
if (oldDisabledState != m_disabledState) {
// If we change the disabled state while the sheet is still loading, then we have to
// perform three checks:
- if (isLoading()) {
+ if (isStyleSheetLoading()) {
// Check #1: The sheet becomes disabled while loading.
if (m_disabledState == Disabled)
removePendingSheet();
@@ -333,7 +333,7 @@
m_sheet->checkLoaded();
}
-bool HTMLLinkElement::isLoading() const
+bool HTMLLinkElement::isStyleSheetLoading() const
{
if (m_loading)
return true;
@@ -354,7 +354,7 @@
bool HTMLLinkElement::sheetLoaded()
{
- if (!isLoading()) {
+ if (!isStyleSheetLoading()) {
removePendingSheet();
return true;
}
Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (102579 => 102580)
--- trunk/Source/WebCore/html/HTMLLinkElement.h 2011-12-12 14:54:34 UTC (rev 102579)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2011-12-12 15:13:18 UTC (rev 102580)
@@ -53,8 +53,7 @@
CSSStyleSheet* sheet() const { return m_sheet.get(); }
- // FIXME: This should be renamed isStyleSheetLoading as this is only used for stylesheets.
- bool isLoading() const;
+ bool isStyleSheetLoading() const;
bool isDisabled() const { return m_disabledState == Disabled; }
bool isEnabledViaScript() const { return m_disabledState == EnabledViaScript; }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
