From 9c37ec87a718ea1ce6a8d435cab1e0d98179b74b Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Mon, 11 Mar 2013 21:26:17 -0400
Subject: [PATCH] bug 825341 - fix rebase of WrapObject landing on a CLOSED
 TREE

---
 content/base/src/nsRange.cpp | 4 ++--
 content/base/src/nsRange.h   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp
index 9a354b5e45d3..062e63428ec5 100644
--- a/content/base/src/nsRange.cpp
+++ b/content/base/src/nsRange.cpp
@@ -37,9 +37,9 @@
 using namespace mozilla;
 
 JSObject*
-nsRange::WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
+nsRange::WrapObject(JSContext* aCx, JSObject* aScope)
 {
-  return dom::RangeBinding::Wrap(aCx, aScope, this, aTriedToWrap);
+  return dom::RangeBinding::Wrap(aCx, aScope, this);
 }
 
 /******************************************************
diff --git a/content/base/src/nsRange.h b/content/base/src/nsRange.h
index afc27dcd4710..5e7e8babfc2c 100644
--- a/content/base/src/nsRange.h
+++ b/content/base/src/nsRange.h
@@ -196,8 +196,7 @@ public:
   already_AddRefed<nsClientRectList> GetClientRects(ErrorResult& aErr);
 
   nsINode* GetParentObject() const { return mOwner; }
-  virtual JSObject* WrapObject(JSContext* cx, JSObject* scope, bool* tried)
-    MOZ_OVERRIDE MOZ_FINAL;
+  virtual JSObject* WrapObject(JSContext* cx, JSObject* scope) MOZ_OVERRIDE MOZ_FINAL;
 
 private:
   // no copy's or assigns