From f5a0429a7d09de9f2256701e2efb6bdc8a214fa1 Mon Sep 17 00:00:00 2001
From: Matthew Schranz <schranz.m@gmail.com>
Date: Sat, 17 Dec 2011 01:02:42 -0500
Subject: [PATCH] Bug 334573 - Changed nsLoadBlockingPLDOMEvent to
 nsLoadBlockingAsyncDOMEvent.  r=sicking

---
 content/base/src/nsFrameLoader.cpp         |  4 ++--
 content/base/src/nsImageLoadingContent.cpp |  2 +-
 content/events/public/nsAsyncDOMEvent.h    | 10 +++++-----
 content/events/src/nsAsyncDOMEvent.cpp     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp
index 4e1f3e2c341..46597c31661 100644
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -400,8 +400,8 @@ nsFrameLoader::FireErrorEvent()
 {
   if (mOwnerContent) {
     nsRefPtr<nsAsyncDOMEvent> event =
-      new nsLoadBlockingPLDOMEvent(mOwnerContent, NS_LITERAL_STRING("error"),
-                                   false, false);
+      new nsLoadBlockingAsyncDOMEvent(mOwnerContent, NS_LITERAL_STRING("error"),
+                                      false, false);
     event->PostDOMEvent();
   }
 }
diff --git a/content/base/src/nsImageLoadingContent.cpp b/content/base/src/nsImageLoadingContent.cpp
index aad89772317..3a3f3a253e7 100644
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -970,7 +970,7 @@ nsImageLoadingContent::FireEvent(const nsAString& aEventType)
   nsCOMPtr<nsINode> thisNode = do_QueryInterface(this);
 
   nsRefPtr<nsAsyncDOMEvent> event =
-    new nsLoadBlockingPLDOMEvent(thisNode, aEventType, false, false);
+    new nsLoadBlockingAsyncDOMEvent(thisNode, aEventType, false, false);
   event->PostDOMEvent();
   
   return NS_OK;
diff --git a/content/events/public/nsAsyncDOMEvent.h b/content/events/public/nsAsyncDOMEvent.h
index 7858fcc584c..c5be619c05d 100644
--- a/content/events/public/nsAsyncDOMEvent.h
+++ b/content/events/public/nsAsyncDOMEvent.h
@@ -78,10 +78,10 @@ public:
   bool                  mDispatchChromeOnly;
 };
 
-class nsLoadBlockingPLDOMEvent : public nsAsyncDOMEvent {
+class nsLoadBlockingAsyncDOMEvent : public nsAsyncDOMEvent {
 public:
-  nsLoadBlockingPLDOMEvent(nsINode *aEventNode, const nsAString& aEventType,
-                           bool aBubbles, bool aDispatchChromeOnly)
+  nsLoadBlockingAsyncDOMEvent(nsINode *aEventNode, const nsAString& aEventType,
+                              bool aBubbles, bool aDispatchChromeOnly)
     : nsAsyncDOMEvent(aEventNode, aEventType, aBubbles, aDispatchChromeOnly),
       mBlockedDoc(aEventNode->OwnerDoc())
   {
@@ -90,7 +90,7 @@ public:
     }
   }
 
-  nsLoadBlockingPLDOMEvent(nsINode *aEventNode, nsIDOMEvent *aEvent)
+  nsLoadBlockingAsyncDOMEvent(nsINode *aEventNode, nsIDOMEvent *aEvent)
     : nsAsyncDOMEvent(aEventNode, aEvent),
       mBlockedDoc(aEventNode->OwnerDoc())
   {
@@ -99,7 +99,7 @@ public:
     }
   }
   
-  ~nsLoadBlockingPLDOMEvent();
+  ~nsLoadBlockingAsyncDOMEvent();
 
   nsCOMPtr<nsIDocument> mBlockedDoc;
 };
diff --git a/content/events/src/nsAsyncDOMEvent.cpp b/content/events/src/nsAsyncDOMEvent.cpp
index 8e9c515fd7d..35dd01aeaac 100644
--- a/content/events/src/nsAsyncDOMEvent.cpp
+++ b/content/events/src/nsAsyncDOMEvent.cpp
@@ -92,7 +92,7 @@ void nsAsyncDOMEvent::RunDOMEventWhenSafe()
   nsContentUtils::AddScriptRunner(this);
 }
 
-nsLoadBlockingPLDOMEvent::~nsLoadBlockingPLDOMEvent()
+nsLoadBlockingAsyncDOMEvent::~nsLoadBlockingAsyncDOMEvent()
 {
   if (mBlockedDoc) {
     mBlockedDoc->UnblockOnload(true);