From e5d4dbe72c42b4c50eecb581071df97ece1d8a12 Mon Sep 17 00:00:00 2001
From: "dougt%meer.net" <dougt%meer.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Dec 2007 17:36:32 +0000
Subject: [PATCH] Relanding 363089. Renaming of variable. r/sr=brendan. a=vlad.

git-svn-id: svn://10.0.0.236/trunk@241672 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/gtk/src/EmbedPrivate.cpp          | 26 +++++++++----------
 .../embedding/browser/gtk/src/EmbedPrivate.h  |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
index 1325fe4ce9a..68a80159289 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
+++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp
@@ -402,8 +402,8 @@ EmbedPrivate::Destroy(void)
 
   // detach our event listeners and release the event receiver
   DetachListeners();
-  if (mEventReceiver)
-    mEventReceiver = nsnull;
+  if (mEventTarget)
+    mEventTarget = nsnull;
 
   // destroy our child window
   mWindow->ReleaseChildren();
@@ -722,7 +722,7 @@ EmbedPrivate::ContentStateChange(void)
 
   GetListener();
 
-  if (!mEventReceiver)
+  if (!mEventTarget)
     return;
 
   AttachListeners();
@@ -803,7 +803,7 @@ EmbedPrivate::ChildFocusOut(void)
 void
 EmbedPrivate::GetListener(void)
 {
-  if (mEventReceiver)
+  if (mEventTarget)
     return;
 
   nsCOMPtr<nsPIDOMWindow> piWin;
@@ -812,7 +812,7 @@ EmbedPrivate::GetListener(void)
   if (!piWin)
     return;
 
-  mEventReceiver = do_QueryInterface(piWin->GetChromeEventHandler());
+  mEventTarget = do_QueryInterface(piWin->GetChromeEventHandler());
 }
 
 // attach key and mouse event listeners
@@ -820,7 +820,7 @@ EmbedPrivate::GetListener(void)
 void
 EmbedPrivate::AttachListeners(void)
 {
-  if (!mEventReceiver || mListenersAttached)
+  if (!mEventTarget || mListenersAttached)
     return;
 
   nsIDOMEventListener *eventListener =
@@ -828,21 +828,21 @@ EmbedPrivate::AttachListeners(void)
 
   // add the key listener
   nsresult rv;
-  rv = mEventReceiver->AddEventListenerByIID(eventListener,
+  rv = mEventTarget->AddEventListenerByIID(eventListener,
 					     NS_GET_IID(nsIDOMKeyListener));
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to add key listener\n");
     return;
   }
 
-  rv = mEventReceiver->AddEventListenerByIID(eventListener,
+  rv = mEventTarget->AddEventListenerByIID(eventListener,
 					     NS_GET_IID(nsIDOMMouseListener));
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to add mouse listener\n");
     return;
   }
 
-  rv = mEventReceiver->AddEventListenerByIID(eventListener,
+  rv = mEventTarget->AddEventListenerByIID(eventListener,
                                              NS_GET_IID(nsIDOMUIListener));
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to add UI listener\n");
@@ -856,14 +856,14 @@ EmbedPrivate::AttachListeners(void)
 void
 EmbedPrivate::DetachListeners(void)
 {
-  if (!mListenersAttached || !mEventReceiver)
+  if (!mListenersAttached || !mEventTarget)
     return;
 
   nsIDOMEventListener *eventListener =
     static_cast<nsIDOMEventListener *>(static_cast<nsIDOMKeyListener *>(mEventListener));
 
   nsresult rv;
-  rv = mEventReceiver->RemoveEventListenerByIID(eventListener,
+  rv = mEventTarget->RemoveEventListenerByIID(eventListener,
 						NS_GET_IID(nsIDOMKeyListener));
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to remove key listener\n");
@@ -871,14 +871,14 @@ EmbedPrivate::DetachListeners(void)
   }
 
   rv =
-    mEventReceiver->RemoveEventListenerByIID(eventListener,
+    mEventTarget->RemoveEventListenerByIID(eventListener,
 					     NS_GET_IID(nsIDOMMouseListener));
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to remove mouse listener\n");
     return;
   }
 
-  rv = mEventReceiver->RemoveEventListenerByIID(eventListener,
+  rv = mEventTarget->RemoveEventListenerByIID(eventListener,
 						NS_GET_IID(nsIDOMUIListener));
   if (NS_FAILED(rv)) {
     NS_WARNING("Failed to remove UI listener\n");
diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h
index 04660383902..17ac0fd1258 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h
+++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h
@@ -136,7 +136,7 @@ class EmbedPrivate {
   nsCOMPtr<nsISHistory>          mSessionHistory;
 
   // our event receiver
-  nsCOMPtr<nsPIDOMEventTarget>   mEventReceiver;
+  nsCOMPtr<nsPIDOMEventTarget>   mEventTarget;
 
   // the currently loaded uri
   nsString                       mURI;