[webkit-changes] [108814] trunk/Source/WebCore

Fri, 24 Feb 2012 09:26:42 -0800

Title: [108814] trunk/Source/WebCore
Revision
108814
Author
[email protected]
Date
2012-02-24 09:26:10 -0800 (Fri, 24 Feb 2012)

Log Message

Attempt to fix the Windows and WinCE build after changeset r108809
<http://trac.webkit.org/changeset/108809> (https://bugs.webkit.org/show_bug.cgi?id=38995)

Substitute styleLoadEventSender() for loadEventSender() in HTMLStyleElement.cpp
and substitute linkLoadEventSender() for loadEventSender() in HTMLLinkElement.cpp. 

* html/HTMLLinkElement.cpp:
(WebCore::linkLoadEventSender):
(WebCore::HTMLLinkElement::~HTMLLinkElement):
(WebCore::HTMLLinkElement::dispatchPendingLoadEvents):
(WebCore::HTMLLinkElement::dispatchPendingEvent):
(WebCore::HTMLLinkElement::notifyLoadedSheetAndAllCriticalSubresources):
* html/HTMLStyleElement.cpp:
(WebCore::styleLoadEventSender):
(WebCore::HTMLStyleElement::~HTMLStyleElement):
(WebCore::HTMLStyleElement::dispatchPendingLoadEvents):
(WebCore::HTMLStyleElement::dispatchPendingEvent):
(WebCore::HTMLStyleElement::notifyLoadedSheetAndAllCriticalSubresources):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (108813 => 108814)


--- trunk/Source/WebCore/ChangeLog	2012-02-24 17:25:44 UTC (rev 108813)
+++ trunk/Source/WebCore/ChangeLog	2012-02-24 17:26:10 UTC (rev 108814)
@@ -1,3 +1,24 @@
+2012-02-24  Daniel Bates  <[email protected]>
+
+        Attempt to fix the Windows and WinCE build after changeset r108809
+        <http://trac.webkit.org/changeset/108809> (https://bugs.webkit.org/show_bug.cgi?id=38995)
+
+        Substitute styleLoadEventSender() for loadEventSender() in HTMLStyleElement.cpp
+        and substitute linkLoadEventSender() for loadEventSender() in HTMLLinkElement.cpp. 
+
+        * html/HTMLLinkElement.cpp:
+        (WebCore::linkLoadEventSender):
+        (WebCore::HTMLLinkElement::~HTMLLinkElement):
+        (WebCore::HTMLLinkElement::dispatchPendingLoadEvents):
+        (WebCore::HTMLLinkElement::dispatchPendingEvent):
+        (WebCore::HTMLLinkElement::notifyLoadedSheetAndAllCriticalSubresources):
+        * html/HTMLStyleElement.cpp:
+        (WebCore::styleLoadEventSender):
+        (WebCore::HTMLStyleElement::~HTMLStyleElement):
+        (WebCore::HTMLStyleElement::dispatchPendingLoadEvents):
+        (WebCore::HTMLStyleElement::dispatchPendingEvent):
+        (WebCore::HTMLStyleElement::notifyLoadedSheetAndAllCriticalSubresources):
+
 2012-02-24  Peter Beverloo  <[email protected]>
 
         [Chromium] Fix Chromium Android build by building HarfBuzzShaperBase.cpp

Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (108813 => 108814)


--- trunk/Source/WebCore/html/HTMLLinkElement.cpp	2012-02-24 17:25:44 UTC (rev 108813)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp	2012-02-24 17:26:10 UTC (rev 108814)
@@ -52,7 +52,7 @@
 
 using namespace HTMLNames;
 
-static LinkEventSender& loadEventSender()
+static LinkEventSender& linkLoadEventSender()
 {
     DEFINE_STATIC_LOCAL(LinkEventSender, sharedLoadEventSender, (eventNames().loadEvent));
     return sharedLoadEventSender;
@@ -91,7 +91,7 @@
     if (inDocument())
         document()->removeStyleSheetCandidateNode(this);
 
-    loadEventSender().cancelEvent(this);
+    linkLoadEventSender().cancelEvent(this);
 }
 
 void HTMLLinkElement::setDisabledState(bool disabled)
@@ -373,12 +373,12 @@
 
 void HTMLLinkElement::dispatchPendingLoadEvents()
 {
-    loadEventSender().dispatchPendingEvents();
+    linkLoadEventSender().dispatchPendingEvents();
 }
 
 void HTMLLinkElement::dispatchPendingEvent(LinkEventSender* eventSender)
 {
-    ASSERT_UNUSED(eventSender, eventSender == &loadEventSender());
+    ASSERT_UNUSED(eventSender, eventSender == &linkLoadEventSender());
     if (m_loadedSheet)
         linkLoaded();
     else
@@ -390,7 +390,7 @@
     if (m_firedLoad)
         return;
     m_loadedSheet = !errorOccurred;
-    loadEventSender().dispatchEventSoon(this);
+    linkLoadEventSender().dispatchEventSoon(this);
     m_firedLoad = true;
 }

Modified: trunk/Source/WebCore/html/HTMLStyleElement.cpp (108813 => 108814)


--- trunk/Source/WebCore/html/HTMLStyleElement.cpp	2012-02-24 17:25:44 UTC (rev 108813)
+++ trunk/Source/WebCore/html/HTMLStyleElement.cpp	2012-02-24 17:26:10 UTC (rev 108814)
@@ -38,7 +38,7 @@
 
 using namespace HTMLNames;
 
-static StyleEventSender& loadEventSender()
+static StyleEventSender& styleLoadEventSender()
 {
     DEFINE_STATIC_LOCAL(StyleEventSender, sharedLoadEventSender, (eventNames().loadEvent));
     return sharedLoadEventSender;
@@ -62,7 +62,7 @@
     // Therefore we can't ASSERT(!m_isRegisteredWithScopingNode).
     StyleElement::clearDocumentData(document(), this);
 
-    loadEventSender().cancelEvent(this);
+    styleLoadEventSender().cancelEvent(this);
 }
 
 PassRefPtr<HTMLStyleElement> HTMLStyleElement::create(const QualifiedName& tagName, Document* document, bool createdByParser)
@@ -230,12 +230,12 @@
 
 void HTMLStyleElement::dispatchPendingLoadEvents()
 {
-    loadEventSender().dispatchPendingEvents();
+    styleLoadEventSender().dispatchPendingEvents();
 }
 
 void HTMLStyleElement::dispatchPendingEvent(StyleEventSender* eventSender)
 {
-    ASSERT_UNUSED(eventSender, eventSender == &loadEventSender());
+    ASSERT_UNUSED(eventSender, eventSender == &styleLoadEventSender());
     if (m_loadedSheet)
         dispatchEvent(Event::create(eventNames().loadEvent, false, false));
     else
@@ -247,7 +247,7 @@
     if (m_firedLoad)
         return;
     m_loadedSheet = !errorOccurred;
-    loadEventSender().dispatchEventSoon(this);
+    styleLoadEventSender().dispatchEventSoon(this);
     m_firedLoad = true;
 }
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to