Bug 665596: Get rid of loadlistenerproxy as it's no longer used. r=jst
authorJonas Sicking <jonas@sicking.cc>
Tue, 21 Jun 2011 08:12:33 -0700
changeset 71428 e9dc29b72255208d037c4b7635160396533a700e
parent 71427 e92f3523a97cb2adee94aa7611e50615886ea123
child 71429 629353683b7fa297a699e39a8f2e416a44091f91
push id8
push usergsharp@mozilla.com
push dateTue, 21 Jun 2011 15:44:36 +0000
treeherderfx-team@854df0c7239e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs665596
milestone7.0a1
Bug 665596: Get rid of loadlistenerproxy as it's no longer used. r=jst
content/base/src/Makefile.in
content/base/src/nsLoadListenerProxy.cpp
content/base/src/nsLoadListenerProxy.h
content/base/src/nsSyncLoadService.cpp
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -109,17 +109,16 @@ CPPSRCS		= \
 		nsFormData.cpp \
 		nsGenConImageContent.cpp \
 		nsGenericDOMDataNode.cpp \
 		nsGenericElement.cpp \
 		nsGkAtoms.cpp \
 		nsHTMLContentSerializer.cpp \
 		nsImageLoadingContent.cpp \
 		nsLineBreaker.cpp \
-		nsLoadListenerProxy.cpp \
 		nsMappedAttributeElement.cpp \
 		nsMappedAttributes.cpp \
 		nsNameSpaceManager.cpp \
 		nsNoDataProtocolContentPolicy.cpp \
 		nsNodeInfo.cpp \
 		nsNodeInfoManager.cpp \
 		nsNodeIterator.cpp \
 		nsNodeUtils.cpp \
deleted file mode 100644
--- a/content/base/src/nsLoadListenerProxy.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsLoadListenerProxy.h"
-#include "nsIDOMEvent.h"
-
-nsLoadListenerProxy::nsLoadListenerProxy(nsWeakPtr aParent) : mParent(aParent)
-{
-}
-
-nsLoadListenerProxy::~nsLoadListenerProxy()
-{
-}
-
-NS_IMPL_ISUPPORTS2(nsLoadListenerProxy, nsIDOMEventListener,
-                   nsIDOMLoadListener)
-
-NS_IMETHODIMP
-nsLoadListenerProxy::HandleEvent(nsIDOMEvent* aEvent)
-{
-  nsCOMPtr<nsIDOMLoadListener> listener(do_QueryReferent(mParent));
-
-  if (listener) {
-    return listener->HandleEvent(aEvent);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoadListenerProxy::Load(nsIDOMEvent* aEvent)
-{
-  nsCOMPtr<nsIDOMLoadListener> listener(do_QueryReferent(mParent));
-
-  if (listener) {
-    return listener->Load(aEvent);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoadListenerProxy::BeforeUnload(nsIDOMEvent* aEvent)
-{
-  nsCOMPtr<nsIDOMLoadListener> listener(do_QueryReferent(mParent));
-
-  if (listener) {
-    return listener->BeforeUnload(aEvent);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoadListenerProxy::Unload(nsIDOMEvent* aEvent)
-{
-  nsCOMPtr<nsIDOMLoadListener> listener(do_QueryReferent(mParent));
-
-  if (listener) {
-    return listener->Unload(aEvent);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoadListenerProxy::Abort(nsIDOMEvent* aEvent)
-{
-  nsCOMPtr<nsIDOMLoadListener> listener(do_QueryReferent(mParent));
-
-  if (listener) {
-    return listener->Abort(aEvent);
-  }
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoadListenerProxy::Error(nsIDOMEvent* aEvent)
-{
-  nsCOMPtr<nsIDOMLoadListener> listener(do_QueryReferent(mParent));
-
-  if (listener) {
-    return listener->Error(aEvent);
-  }
-  
-  return NS_OK;
-}
deleted file mode 100644
--- a/content/base/src/nsLoadListenerProxy.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsLoadListenerProxy_h
-#define nsLoadListenerProxy_h
-
-#include "nsIDOMLoadListener.h"
-#include "nsWeakReference.h"
-
-/////////////////////////////////////////////
-//
-// This class exists to prevent a circular reference between
-// the loaded document and the actual loader instance request. The
-// request owns the document. While the document is loading, 
-// the request is a load listener, held onto by the document.
-// The proxy class breaks the circularity by filling in as the
-// load listener and holding a weak reference to the request
-// object.
-//
-/////////////////////////////////////////////
-
-class nsLoadListenerProxy : public nsIDOMLoadListener {
-public:
-  nsLoadListenerProxy(nsWeakPtr aParent);
-  virtual ~nsLoadListenerProxy();
-
-  NS_DECL_ISUPPORTS
-
-  // nsIDOMEventListener
-  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
-
-  // nsIDOMLoadListener
-  NS_IMETHOD Load(nsIDOMEvent* aEvent);
-  NS_IMETHOD BeforeUnload(nsIDOMEvent* aEvent);
-  NS_IMETHOD Unload(nsIDOMEvent* aEvent);
-  NS_IMETHOD Abort(nsIDOMEvent* aEvent);
-  NS_IMETHOD Error(nsIDOMEvent* aEvent);
-
-protected:
-  nsWeakPtr  mParent;
-};
-
-#endif
--- a/content/base/src/nsSyncLoadService.cpp
+++ b/content/base/src/nsSyncLoadService.cpp
@@ -50,17 +50,16 @@
 #include "nsWeakReference.h"
 #include "nsIDocument.h"
 #include "nsIDOMDocument.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsContentUtils.h"
 #include "nsThreadUtils.h"
 #include "nsNetUtil.h"
 #include "nsAutoPtr.h"
-#include "nsLoadListenerProxy.h"
 #include "nsStreamUtils.h"
 #include "nsCrossSiteListenerProxy.h"
 
 /**
  * This class manages loading a single XML document
  */
 
 class nsSyncLoader : public nsIStreamListener,