Changeset 103401 in webkit

Timestamp:

Dec 21, 2011 2:20:36 AM (12 years ago)

Author:

reni@webkit.org

Message:

Fulfill FIXME in HTMLLinkElement.h.
​https://bugs.webkit.org/show_bug.cgi?id=74278

Rename isStyleSheetLoading() method to styleSheetIsLoading().
This new one has the correct grammar.

Reviewed by Darin Adler.

No new tests because the functionality remains the same.

• dom/Document.cpp:

(WebCore::Document::recalcStyleSelector):

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::setDisabledState):
(WebCore::HTMLLinkElement::styleSheetIsLoading):
(WebCore::HTMLLinkElement::sheetLoaded):

• html/HTMLLinkElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• html/HTMLLinkElement.cpp (modified) (3 diffs)
• html/HTMLLinkElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-21  Renata Hodovan  <reni@webkit.org>
+
+        Fulfill FIXME in  HTMLLinkElement.h.
+        https://bugs.webkit.org/show_bug.cgi?id=74278
+
+        Rename isStyleSheetLoading() method to styleSheetIsLoading().
+        This new one has the correct grammar.
+
+        Reviewed by Darin Adler.
+
+        No new tests because the functionality remains the same.
+
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyleSelector):
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::setDisabledState):
+        (WebCore::HTMLLinkElement::styleSheetIsLoading):
+        (WebCore::HTMLLinkElement::sheetLoaded):
+        * html/HTMLLinkElement.h:
+
 2011-12-21  Yosifumi Inoue  <yosin@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3097 +3097 @@
                     continue;
                 enabledViaScript = linkElement->isEnabledViaScript();
-                if (linkElement->isStyleSheetLoading()) {
+                if (linkElement->styleSheetIsLoading()) {
                     // it is loading but we should still decide which style sheet set to use
                     if (!enabledViaScript && !title.isEmpty() && m_preferredStylesheetSet.isEmpty()) {

trunk/Source/WebCore/html/HTMLLinkElement.cpp

@@ -91 +91 @@
         // If we change the disabled state while the sheet is still loading, then we have to
         // perform three checks:
-        if (isStyleSheetLoading()) {
+        if (styleSheetIsLoading()) {
             // Check #1: The sheet becomes disabled while loading.
             if (m_disabledState == Disabled)
@@ -334 +334 @@
 }
 
-bool HTMLLinkElement::isStyleSheetLoading() const
+bool HTMLLinkElement::styleSheetIsLoading() const
 {
     if (m_loading)
@@ -355 +355 @@
 bool HTMLLinkElement::sheetLoaded()
 {
-    if (!isStyleSheetLoading()) {
+    if (!styleSheetIsLoading()) {
         removePendingSheet();
         return true;

trunk/Source/WebCore/html/HTMLLinkElement.h

@@ -54 +54 @@
     CSSStyleSheet* sheet() const { return m_sheet.get(); }
 
-    bool isStyleSheetLoading() const;
+    bool styleSheetIsLoading() const;
 
     bool isDisabled() const { return m_disabledState == Disabled; }