From 675be045de61168f1de9310e410ead6d4a483a33 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 15 Mar 2012 10:58:56 +0100
Subject: [PATCH] Bug 735781 - Make sure nsScreen don't call RemoveObserver
 twice in a row. r=jlebar

---
 dom/base/nsGlobalWindow.cpp | 1 -
 dom/base/nsScreen.cpp       | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 61893d5693a..c65c4b24e18 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1313,7 +1313,6 @@ nsGlobalWindow::FreeInnerObjects()
   }
 
   if (mScreen) {
-    mScreen->Invalidate();
     mScreen = nsnull;
   }
 
diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp
index 02cd9a39bda..b2c209df674 100644
--- a/dom/base/nsScreen.cpp
+++ b/dom/base/nsScreen.cpp
@@ -84,12 +84,6 @@ nsScreen::Initialize()
                                "dom.screenBrightnessProperty.enabled");
 }
 
-void
-nsScreen::Invalidate()
-{
-  hal::UnregisterScreenOrientationObserver(this);
-}
-
 /* static */ already_AddRefed<nsScreen>
 nsScreen::Create(nsPIDOMWindow* aWindow)
 {
@@ -120,7 +114,7 @@ nsScreen::nsScreen()
 
 nsScreen::~nsScreen()
 {
-  Invalidate();
+  hal::UnregisterScreenOrientationObserver(this);
 }