From 4412714dedc27f87be98faaf003c6678ce2f0518 Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Fri, 25 Jun 2010 18:50:23 +0900
Subject: [PATCH 001/172] Bug 573910 - switch nsApplicationAccessible to
 nsAccessible::Append/RemoveChild, r=davidb, sr=roc

---
 accessible/public/nsIAccessibilityService.h   |  6 +--
 .../src/atk/nsApplicationAccessibleWrap.cpp   | 27 +++++-----
 .../src/atk/nsApplicationAccessibleWrap.h     |  8 +--
 .../src/base/nsAccessibilityService.cpp       | 49 ++++++++-----------
 accessible/src/base/nsAccessibilityService.h  |  5 +-
 .../src/base/nsApplicationAccessible.cpp      | 38 ++++++--------
 accessible/src/base/nsApplicationAccessible.h |  6 +--
 accessible/src/base/nsRootAccessible.cpp      | 10 ++--
 widget/src/gtk2/nsAccessibilityHelper.cpp     |  8 +--
 9 files changed, 64 insertions(+), 93 deletions(-)

diff --git a/accessible/public/nsIAccessibilityService.h b/accessible/public/nsIAccessibilityService.h
index f8ab5e11a69d..77b7f91e4410 100644
--- a/accessible/public/nsIAccessibilityService.h
+++ b/accessible/public/nsIAccessibilityService.h
@@ -132,10 +132,8 @@ public:
    * Adds/remove ATK root accessible for gtk+ native window to/from children
    * of the application accessible.
    */
-  virtual nsresult AddNativeRootAccessible(void *aAtkAccessible,
-                                           nsIAccessible **aAccessible) = 0;
-  virtual nsresult
-    RemoveNativeRootAccessible(nsIAccessible *aRootAccessible) = 0;
+  virtual nsAccessible* AddNativeRootAccessible(void* aAtkAccessible) = 0;
+  virtual void RemoveNativeRootAccessible(nsAccessible* aRootAccessible) = 0;
 
   /**
    * Used to describe sort of changes leading to accessible tree invalidation.
diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
index fce39d7e7afe..2b1c6cf67337 100644
--- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp
+++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
@@ -653,16 +653,13 @@ gboolean fireRootAccessibleAddedCB(gpointer data)
     return FALSE;
 }
 
-nsresult
-nsApplicationAccessibleWrap::AddRootAccessible(nsIAccessible *aRootAccWrap)
+PRBool
+nsApplicationAccessibleWrap::AppendChild(nsAccessible *aChild)
 {
-    NS_ENSURE_ARG_POINTER(aRootAccWrap);
+    if (!nsApplicationAccessible::AppendChild(aChild))
+      return PR_FALSE;
 
-    // add by weak reference
-    nsresult rv = nsApplicationAccessible::AddRootAccessible(aRootAccWrap);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    AtkObject *atkAccessible = nsAccessibleWrap::GetAtkObject(aRootAccWrap);
+    AtkObject *atkAccessible = nsAccessibleWrap::GetAtkObject(aChild);
     atk_object_set_parent(atkAccessible, mAtkObject);
 
     PRUint32 count = mChildren.Length();
@@ -680,22 +677,20 @@ nsApplicationAccessibleWrap::AddRootAccessible(nsIAccessible *aRootAccWrap)
       g_timeout_add(0, fireRootAccessibleAddedCB, eventData);
     }
 
-    return NS_OK;
+    return PR_TRUE;
 }
 
-nsresult
-nsApplicationAccessibleWrap::RemoveRootAccessible(nsIAccessible *aRootAccWrap)
+PRBool
+nsApplicationAccessibleWrap::RemoveChild(nsAccessible* aChild)
 {
-    NS_ENSURE_ARG_POINTER(aRootAccWrap);
+    PRInt32 index = aChild->GetIndexInParent();
 
-    PRInt32 index = mChildren.IndexOf(aRootAccWrap);
-
-    AtkObject *atkAccessible = nsAccessibleWrap::GetAtkObject(aRootAccWrap);
+    AtkObject *atkAccessible = nsAccessibleWrap::GetAtkObject(aChild);
     atk_object_set_parent(atkAccessible, NULL);
     g_signal_emit_by_name(mAtkObject, "children_changed::remove", index,
                           atkAccessible, NULL);
 
-    return nsApplicationAccessible::RemoveRootAccessible(aRootAccWrap);
+    return nsApplicationAccessible::RemoveChild(aChild);
 }
 
 void
diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.h b/accessible/src/atk/nsApplicationAccessibleWrap.h
index 9991c4b69c90..b3f03bb05f70 100644
--- a/accessible/src/atk/nsApplicationAccessibleWrap.h
+++ b/accessible/src/atk/nsApplicationAccessibleWrap.h
@@ -57,12 +57,12 @@ public:
     // nsAccessNode
     virtual PRBool Init();
 
+    // nsAccessible
+    virtual PRBool AppendChild(nsAccessible* aChild);
+    virtual PRBool RemoveChild(nsAccessible* aChild);
+
     // return the atk object for app root accessible
     NS_IMETHOD GetNativeInterface(void **aOutAccessible);
-
-    // nsApplicationAccessible
-    virtual nsresult AddRootAccessible(nsIAccessible *aRootAccWrap);
-    virtual nsresult RemoveRootAccessible(nsIAccessible *aRootAccWrap);
 };
 
 #endif   /* __NS_APP_ROOT_ACCESSIBLE_H__ */
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 668be79428f7..29ef684f8388 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -1901,45 +1901,36 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent *aContent,
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessibilityService (DON'T put methods here)
 
-nsresult
-nsAccessibilityService::AddNativeRootAccessible(void *aAtkAccessible,
-                                                nsIAccessible **aRootAccessible)
-{
+nsAccessible*
+nsAccessibilityService::AddNativeRootAccessible(void* aAtkAccessible)
+ {
 #ifdef MOZ_ACCESSIBILITY_ATK
-  nsNativeRootAccessibleWrap* rootAccWrap =
-    new nsNativeRootAccessibleWrap((AtkObject*)aAtkAccessible);
-
-  *aRootAccessible = static_cast<nsIAccessible*>(rootAccWrap);
-  NS_ADDREF(*aRootAccessible);
-
-  nsApplicationAccessible *applicationAcc =
+  nsApplicationAccessible* applicationAcc =
     nsAccessNode::GetApplicationAccessible();
-  NS_ENSURE_STATE(applicationAcc);
+  if (!applicationAcc)
+    return nsnull;
 
-  applicationAcc->AddRootAccessible(*aRootAccessible);
+  nsNativeRootAccessibleWrap* nativeRootAcc =
+     new nsNativeRootAccessibleWrap((AtkObject*)aAtkAccessible);
+  if (!nativeRootAcc)
+    return nsnull;
 
-  return NS_OK;
-#else
-  return NS_ERROR_NOT_IMPLEMENTED;
+  if (applicationAcc->AppendChild(nativeRootAcc))
+    return nativeRootAcc;
 #endif
-}
 
-nsresult
-nsAccessibilityService::RemoveNativeRootAccessible(nsIAccessible *aRootAccessible)
+  return nsnull;
+ }
+
+void
+nsAccessibilityService::RemoveNativeRootAccessible(nsAccessible* aAccessible)
 {
 #ifdef MOZ_ACCESSIBILITY_ATK
-  void* atkAccessible;
-  aRootAccessible->GetNativeInterface(&atkAccessible);
-
-  nsApplicationAccessible *applicationAcc =
+  nsApplicationAccessible* applicationAcc =
     nsAccessNode::GetApplicationAccessible();
-  NS_ENSURE_STATE(applicationAcc);
 
-  applicationAcc->RemoveRootAccessible(aRootAccessible);
-
-  return NS_OK;
-#else
-  return NS_ERROR_NOT_IMPLEMENTED;
+  if (applicationAcc)
+    applicationAcc->RemoveChild(aAccessible);
 #endif
 }
 
diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h
index 15d551b9ae22..f4683055924d 100644
--- a/accessible/src/base/nsAccessibilityService.h
+++ b/accessible/src/base/nsAccessibilityService.h
@@ -114,9 +114,8 @@ public:
   virtual nsresult CreateHTMLCaptionAccessible(nsIFrame *aFrame,
                                                nsIAccessible **aAccessible);
 
-  virtual nsresult AddNativeRootAccessible(void *aAtkAccessible,
-                                           nsIAccessible **aAccessible);
-  virtual nsresult RemoveNativeRootAccessible(nsIAccessible *aRootAccessible);
+  virtual nsAccessible* AddNativeRootAccessible(void* aAtkAccessible);
+  virtual void RemoveNativeRootAccessible(nsAccessible* aRootAccessible);
 
   virtual nsresult InvalidateSubtreeFor(nsIPresShell *aPresShell,
                                         nsIContent *aContent,
diff --git a/accessible/src/base/nsApplicationAccessible.cpp b/accessible/src/base/nsApplicationAccessible.cpp
index 7906235513d3..4dbf2f822449 100644
--- a/accessible/src/base/nsApplicationAccessible.cpp
+++ b/accessible/src/base/nsApplicationAccessible.cpp
@@ -414,8 +414,8 @@ nsApplicationAccessible::GetParent()
 void
 nsApplicationAccessible::InvalidateChildren()
 {
-  // Do nothing because application children are kept updated by
-  // AddRootAccessible() and RemoveRootAccessible() method calls.
+  // Do nothing because application children are kept updated by AppendChild()
+  // and RemoveChild() method calls.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -428,8 +428,8 @@ nsApplicationAccessible::CacheChildren()
   // children are requested because empty InvalidateChldren() prevents its
   // repeated calls.
 
-  // Basically children are kept updated by Add/RemoveRootAccessible method
-  // calls. However if there are open windows before accessibility was started
+  // Basically children are kept updated by Append/RemoveChild method calls.
+  // However if there are open windows before accessibility was started
   // then we need to make sure root accessibles for open windows are created so
   // that all root accessibles are stored in application accessible children
   // array.
@@ -481,30 +481,22 @@ nsApplicationAccessible::GetSiblingAtOffset(PRInt32 aOffset, nsresult* aError)
 ////////////////////////////////////////////////////////////////////////////////
 // Public methods
 
-nsresult
-nsApplicationAccessible::AddRootAccessible(nsIAccessible *aRootAccessible)
+PRBool
+nsApplicationAccessible::AppendChild(nsAccessible* aChild)
 {
-  NS_ENSURE_ARG_POINTER(aRootAccessible);
+  if (!mChildren.AppendElement(aChild))
+    return PR_FALSE;
 
-  nsRefPtr<nsAccessible> rootAcc = do_QueryObject(aRootAccessible);
-
-  if (!mChildren.AppendElement(rootAcc))
-    return NS_ERROR_FAILURE;
-
-  rootAcc->SetParent(this);
-
-  return NS_OK;
+  aChild->SetParent(this);
+  return PR_TRUE;
 }
 
-nsresult
-nsApplicationAccessible::RemoveRootAccessible(nsIAccessible *aRootAccessible)
+PRBool
+nsApplicationAccessible::RemoveChild(nsAccessible* aChild)
 {
-  NS_ENSURE_ARG_POINTER(aRootAccessible);
-
-  // It's not needed to void root accessible parent because this method is
-  // called on root accessible shutdown and its parent will be cleared
-  // properly.
-  return mChildren.RemoveElement(aRootAccessible) ? NS_OK : NS_ERROR_FAILURE;
+  // It's not needed to unbind root accessible from parent because this method
+  // is called when root accessible is shutdown and it'll be unbound properly.
+  return mChildren.RemoveElement(aChild);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/accessible/src/base/nsApplicationAccessible.h b/accessible/src/base/nsApplicationAccessible.h
index e8b65ec25fd1..41bf2d31cc86 100644
--- a/accessible/src/base/nsApplicationAccessible.h
+++ b/accessible/src/base/nsApplicationAccessible.h
@@ -116,10 +116,8 @@ public:
   virtual nsAccessible* GetParent();
 
   virtual void InvalidateChildren();
-
-  // nsApplicationAccessible
-  virtual nsresult AddRootAccessible(nsIAccessible *aRootAccWrap);
-  virtual nsresult RemoveRootAccessible(nsIAccessible *aRootAccWrap);
+  virtual PRBool AppendChild(nsAccessible* aChild);
+  virtual PRBool RemoveChild(nsAccessible* aChild);
 
 protected:
 
diff --git a/accessible/src/base/nsRootAccessible.cpp b/accessible/src/base/nsRootAccessible.cpp
index a47f6c209aa4..cc8bfc258ed4 100644
--- a/accessible/src/base/nsRootAccessible.cpp
+++ b/accessible/src/base/nsRootAccessible.cpp
@@ -831,11 +831,9 @@ PRBool
 nsRootAccessible::Init()
 {
   nsApplicationAccessible *applicationAcc = GetApplicationAccessible();
-  if (!applicationAcc)
+  if (!applicationAcc || !applicationAcc->AppendChild(this))
     return PR_FALSE;
 
-  applicationAcc->AddRootAccessible(this);
-
   return nsDocAccessibleWrap::Init();
 }
 
@@ -850,7 +848,7 @@ nsRootAccessible::Shutdown()
   if (!applicationAcc)
     return;
 
-  applicationAcc->RemoveRootAccessible(this);
+  applicationAcc->RemoveChild(this);
 
   mCurrentARIAMenubar = nsnull;
 
@@ -940,8 +938,8 @@ nsRootAccessible::GetRelationByType(PRUint32 aRelationType,
 nsAccessible*
 nsRootAccessible::GetParent()
 {
-  // Parent has been setted in nsApplicationAccesible::AddRootAccessible()
-  // when root accessible was intialized.
+  // Parent has been set in nsApplicationAccesible::AppendChild() when root
+  // accessible was initialized.
   return mParent;
 }
 
diff --git a/widget/src/gtk2/nsAccessibilityHelper.cpp b/widget/src/gtk2/nsAccessibilityHelper.cpp
index c93c12db0537..16c192664eae 100644
--- a/widget/src/gtk2/nsAccessibilityHelper.cpp
+++ b/widget/src/gtk2/nsAccessibilityHelper.cpp
@@ -54,19 +54,19 @@ gint RunDialog(GtkDialog* aDialog)
 
   nsCOMPtr<nsIAccessibilityService> accService =
     do_GetService ("@mozilla.org/accessibilityService;1");
-  nsCOMPtr<nsIAccessible> accessible;
 
   // Attach the dialog accessible to app accessible tree
+  nsAccessible* windowAcc = nsnull;
   if (accService) {
     AtkObject* gailWindow = gtk_widget_get_accessible(GTK_WIDGET(aDialog));
-    accService->AddNativeRootAccessible(gailWindow, getter_AddRefs(accessible));
+    windowAcc = accService->AddNativeRootAccessible(gailWindow);
   }
 
   gint result = gtk_dialog_run (aDialog);
 
   // Deattach the dialog accessible
-  if (accService && accessible) {
-    accService->RemoveNativeRootAccessible(accessible);
+  if (accService && windowAcc) {
+    accService->RemoveNativeRootAccessible(windowAcc);
   }
 
   return result;

From 5e880dbc8a004b9329ee1872826366591922e01a Mon Sep 17 00:00:00 2001
From: timeless <timeless@bemail.org>
Date: Fri, 25 Jun 2010 20:49:02 +0900
Subject: [PATCH 002/172] Bug 573934 - Crash with Last pass addon on trying to
 edit passwords/user names in Lastpass (no primaryColumn
 [@nsCoreUtils::IsColumnHiddenm, r=surkov

---
 accessible/src/xul/nsXULTreeAccessible.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/accessible/src/xul/nsXULTreeAccessible.cpp b/accessible/src/xul/nsXULTreeAccessible.cpp
index 49bf246fad5c..e7ac8217afc8 100644
--- a/accessible/src/xul/nsXULTreeAccessible.cpp
+++ b/accessible/src/xul/nsXULTreeAccessible.cpp
@@ -1124,7 +1124,8 @@ nsXULTreeItemAccessibleBase::IsExpandable()
       nsCOMPtr<nsITreeColumn> primaryColumn;
       if (columns) {
         columns->GetPrimaryColumn(getter_AddRefs(primaryColumn));
-        if (!nsCoreUtils::IsColumnHidden(primaryColumn))
+        if (primaryColumn &&
+            !nsCoreUtils::IsColumnHidden(primaryColumn))
           return PR_TRUE;
       }
     }

From fcce45e7242923cc6f813858146c51016f292785 Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Fri, 25 Jun 2010 07:18:56 -0400
Subject: [PATCH 003/172] Bug 574581 - "Conditional jump or move depends on
 uninitialised value(s)" in ThebesLayerOGL::EnsureSurface(). r=jones.chris.g

--HG--
extra : rebase_source : 6934d7596614430ae5366da61b2a0846fd90c311
---
 gfx/layers/opengl/ThebesLayerOGL.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gfx/layers/opengl/ThebesLayerOGL.cpp b/gfx/layers/opengl/ThebesLayerOGL.cpp
index deb77c94a1f5..7be496444807 100644
--- a/gfx/layers/opengl/ThebesLayerOGL.cpp
+++ b/gfx/layers/opengl/ThebesLayerOGL.cpp
@@ -78,6 +78,7 @@ ThebesLayerOGL::ThebesLayerOGL(LayerManagerOGL *aManager)
   , LayerOGL(aManager)
   , mTexture(0)
   , mOffscreenFormat(gfxASurface::ImageFormatUnknown)
+  , mOffscreenSize(-1,-1)
 {
   mImplData = static_cast<LayerOGL*>(this);
 }

From f48d5e9dd00d4e782b75c0f1b38e883f069a6020 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 25 Jun 2010 14:02:24 +0200
Subject: [PATCH 004/172] Bug 569586  - XPCOM compilation failure on mingw-w64
 due to pointer to int cast loosing precision. r=benjamin

--HG--
extra : rebase_source : e4d0b0b110992af5f397aea52c36a5f5ed9f56c5
---
 xpcom/base/nsStackWalk.cpp   | 2 +-
 xpcom/ds/nsWindowsRegKey.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xpcom/base/nsStackWalk.cpp b/xpcom/base/nsStackWalk.cpp
index a091af95e6cb..bac8fc27cabb 100644
--- a/xpcom/base/nsStackWalk.cpp
+++ b/xpcom/base/nsStackWalk.cpp
@@ -1031,7 +1031,7 @@ NS_DescribeCodeAddress(void *aPC, nsCodeAddressDetails *aDetails)
         // This just makes sure we get good info if available.
         //
 
-        DWORD addr = (DWORD)aPC;
+        DWORD_PTR addr = (DWORD_PTR)aPC;
         IMAGEHLP_MODULE modInfo;
         IMAGEHLP_LINE lineInfo;
         BOOL modInfoRes;
diff --git a/xpcom/ds/nsWindowsRegKey.cpp b/xpcom/ds/nsWindowsRegKey.cpp
index 8e7cc1df4e30..0fa484f006cf 100644
--- a/xpcom/ds/nsWindowsRegKey.cpp
+++ b/xpcom/ds/nsWindowsRegKey.cpp
@@ -139,7 +139,7 @@ nsWindowsRegKey::OpenChild(const nsAString &path, PRUint32 mode,
   if (!child)
     return NS_ERROR_OUT_OF_MEMORY;
   
-  nsresult rv = child->Open((PRUint32) mKey, path, mode);
+  nsresult rv = child->Open((uintptr_t) mKey, path, mode);
   if (NS_FAILED(rv))
     return rv;
 
@@ -157,7 +157,7 @@ nsWindowsRegKey::CreateChild(const nsAString &path, PRUint32 mode,
   if (!child)
     return NS_ERROR_OUT_OF_MEMORY;
   
-  nsresult rv = child->Create((PRUint32) mKey, path, mode);
+  nsresult rv = child->Create((uintptr_t) mKey, path, mode);
   if (NS_FAILED(rv))
     return rv;
 

From 629079c1ebd34c3371abe1a531bcc4f7172ea305 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 25 Jun 2010 14:06:26 +0200
Subject: [PATCH 005/172] Bug 449292 - gfxHarfBuzzShaper.cpp mingw fix.
 r=jfkthame

--HG--
extra : rebase_source : 4a9dae1e9123206f89ff6d6197a32752077570ee
---
 gfx/thebes/src/gfxHarfBuzzShaper.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gfx/thebes/src/gfxHarfBuzzShaper.cpp b/gfx/thebes/src/gfxHarfBuzzShaper.cpp
index db3c09f674f3..45c68e495692 100644
--- a/gfx/thebes/src/gfxHarfBuzzShaper.cpp
+++ b/gfx/thebes/src/gfxHarfBuzzShaper.cpp
@@ -407,8 +407,8 @@ gfxHarfBuzzShaper::InitTextRun(gfxContext *aContext,
     hb_buffer_set_script(buffer, hb_script_t(aRunScript));
 //    hb_buffer_set_language(buffer, HB_OT_TAG_DEFAULT_LANGUAGE);
 
-    hb_buffer_add_utf16(buffer, aString + aRunStart, aRunLength,
-                        0, aRunLength);
+    hb_buffer_add_utf16(buffer, reinterpret_cast<const uint16_t*>(aString + aRunStart),
+                        aRunLength, 0, aRunLength);
 
     hb_shape(font, mHBFace, buffer, features.Elements(), features.Length());
 

From 289901d403ebac71c86e0367f341e9f5c9aef386 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 25 Jun 2010 14:09:22 +0200
Subject: [PATCH 006/172] Bug 569590 - nsNativeAppSupportWin.cpp compilation
 failure on mingw-w64 due to pointer to int casts loosing precision r=timeless

--HG--
extra : rebase_source : 7d8365f7e7a8a507b55a21c232b1df2d819e4a09
---
 toolkit/xre/nsNativeAppSupportWin.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/toolkit/xre/nsNativeAppSupportWin.cpp b/toolkit/xre/nsNativeAppSupportWin.cpp
index b234a229c304..4a85b7c13e86 100644
--- a/toolkit/xre/nsNativeAppSupportWin.cpp
+++ b/toolkit/xre/nsNativeAppSupportWin.cpp
@@ -389,7 +389,7 @@ nsNativeAppSupportWin::CheckConsole() {
                 // all cases.  See http://support.microsoft.com/support/kb/articles/q105/3/05.asp.
 
                 // stdout
-                int hCrt = ::_open_osfhandle( (long)GetStdHandle( STD_OUTPUT_HANDLE ),
+                int hCrt = ::_open_osfhandle( (intptr_t)GetStdHandle( STD_OUTPUT_HANDLE ),
                                             _O_TEXT );
                 if ( hCrt != -1 ) {
                     FILE *hf = ::_fdopen( hCrt, "w" );
@@ -402,7 +402,7 @@ nsNativeAppSupportWin::CheckConsole() {
                 }
 
                 // stderr
-                hCrt = ::_open_osfhandle( (long)::GetStdHandle( STD_ERROR_HANDLE ),
+                hCrt = ::_open_osfhandle( (intptr_t)::GetStdHandle( STD_ERROR_HANDLE ),
                                           _O_TEXT );
                 if ( hCrt != -1 ) {
                     FILE *hf = ::_fdopen( hCrt, "w" );
@@ -646,7 +646,7 @@ struct MessageWindow {
             // Get current window and return its window handle.
             nsCOMPtr<nsIDOMWindowInternal> win;
             GetMostRecentWindow( 0, getter_AddRefs( win ) );
-            return win ? (long)hwndForDOMWindow( win ) : 0;
+            return win ? (LRESULT)hwndForDOMWindow( win ) : 0;
         }
         return DefWindowProc( msgWindow, msg, wp, lp );
     }
@@ -1160,8 +1160,6 @@ nsNativeAppSupportWin::HandleDDENotification( UINT uType,       // transaction t
 #if MOZ_DEBUG_DDE
             printf( "Handling dde request: [%s]...\n", (char*)request );
 #endif
-            // Default is to open in current window.
-            PRBool new_window = PR_FALSE;
 
             nsAutoString url;
             ParseDDEArg((const WCHAR*) request, 0, url);
@@ -1261,7 +1259,7 @@ void nsNativeAppSupportWin::ParseDDEArg( const WCHAR* args, int index, nsString&
 
 // Utility to parse out argument from a DDE item string.
 void nsNativeAppSupportWin::ParseDDEArg( HSZ args, int index, nsString& aString) {
-    DWORD argLen = DdeQueryStringW( mInstance, args, NULL, NULL, CP_WINUNICODE );
+    DWORD argLen = DdeQueryStringW( mInstance, args, NULL, 0, CP_WINUNICODE );
     // there wasn't any string, so return empty string
     if ( !argLen ) return;
     nsAutoString temp;

From e3b73e2d7b20058855b3135eb978182d42856f0e Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 25 Jun 2010 14:10:54 +0200
Subject: [PATCH 007/172] Bug 569608 - gfxTextRunWordCache.cpp compilation
 failure on mingw-w64 due to pointer to long cast loosing precision r=vladimir

--HG--
extra : rebase_source : 3142d17d9c28beb1a2034a555b2ffe4a95e71f9c
---
 gfx/thebes/src/gfxTextRunWordCache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/thebes/src/gfxTextRunWordCache.cpp b/gfx/thebes/src/gfxTextRunWordCache.cpp
index 294dea25280e..1e4b0bb1ec21 100644
--- a/gfx/thebes/src/gfxTextRunWordCache.cpp
+++ b/gfx/thebes/src/gfxTextRunWordCache.cpp
@@ -945,7 +945,7 @@ TextRunWordCache::CacheHashEntry::HashKey(const KeyTypePointer aKey)
     PRUint32 fontSetGen;
     LL_L2UI(fontSetGen, aKey->mUserFontSetGeneration);
 
-    return aKey->mStringHash + fontSetGen + (long)aKey->mFontOrGroup + aKey->mAppUnitsPerDevUnit +
+    return aKey->mStringHash + fontSetGen + (PRUint32)(intptr_t)aKey->mFontOrGroup + aKey->mAppUnitsPerDevUnit +
         aKey->mIsDoubleByteText + aKey->mIsRTL*2 + aKey->mEnabledOptionalLigatures*4 +
         aKey->mOptimizeSpeed*8;
 }

From 8dbc202a27571d0b0b93a2e237597bdf1bf17ea5 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 25 Jun 2010 14:13:17 +0200
Subject: [PATCH 008/172] Bug 569587  - nsBidiKeyboard.cpp compilation failure
 on mingw-w64 due to pointer to int casts loosing precision r=roc

--HG--
extra : rebase_source : 35f06b84e0445a946607bdae61e5feadab45b361
---
 widget/src/windows/nsBidiKeyboard.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/widget/src/windows/nsBidiKeyboard.cpp b/widget/src/windows/nsBidiKeyboard.cpp
index 6b27f2435dbe..3bd96b33c9eb 100644
--- a/widget/src/windows/nsBidiKeyboard.cpp
+++ b/widget/src/windows/nsBidiKeyboard.cpp
@@ -158,12 +158,12 @@ nsresult nsBidiKeyboard::SetupBidiKeyboards()
     locale = buf[keyboards];
     if (IsRTLLanguage(locale)) {
       _snwprintf(mRTLKeyboard, KL_NAMELENGTH, L"%.*x", KL_NAMELENGTH - 1,
-                 LANGIDFROMLCID((DWORD)locale));
+                 LANGIDFROMLCID((DWORD_PTR)locale));
       isRTLKeyboardSet = PR_TRUE;
     }
     else {
       _snwprintf(mLTRKeyboard, KL_NAMELENGTH, L"%.*x", KL_NAMELENGTH - 1,
-                 LANGIDFROMLCID((DWORD)locale));
+                 LANGIDFROMLCID((DWORD_PTR)locale));
       isLTRKeyboardSet = PR_TRUE;
     }
   }
@@ -213,7 +213,7 @@ nsresult nsBidiKeyboard::SetupBidiKeyboards()
 PRBool nsBidiKeyboard::IsRTLLanguage(HKL aLocale)
 {
   LOCALESIGNATURE localesig;
-  return (::GetLocaleInfoW(PRIMARYLANGID((DWORD)aLocale),
+  return (::GetLocaleInfoW(PRIMARYLANGID((DWORD_PTR)aLocale),
                            LOCALE_FONTSIGNATURE,
                            (LPWSTR)&localesig,
                            (sizeof(localesig)/sizeof(WCHAR))) &&

From b12784751c23e65ae654d7dccc571f6f48e2eb82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 25 Jun 2010 14:19:12 +0200
Subject: [PATCH 009/172] Bug 574435 - Hide the menu bar by default on Win
 Vista and 7. r=gavin

--HG--
extra : rebase_source : b09d158f092ac116577a5ae91eb4eedca2305948
---
 browser/base/content/browser.js             | 11 +++++-
 browser/base/content/win6BrowserOverlay.xul | 44 +++++++++++++++++++++
 browser/base/jar.mn                         |  6 +++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 browser/base/content/win6BrowserOverlay.xul

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a2c67ed8504c..f445f232ebe3 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4640,8 +4640,15 @@ var TabsOnTop = {
 
 #ifdef MENUBAR_CAN_AUTOHIDE
 function updateAppButtonDisplay() {
-  document.getElementById("appmenu-button-container").hidden =
-    document.getElementById("toolbar-menubar").getAttribute("autohide") != "true";
+  var menubarHidden =
+    document.getElementById("toolbar-menubar").getAttribute("autohide") == "true";
+
+  document.getElementById("appmenu-button-container").hidden = !menubarHidden;
+
+  if (menubarHidden)
+    document.documentElement.setAttribute("chromemargin", "0,-1,-1,-1");
+  else
+    document.documentElement.removeAttribute("chromemargin");
 }
 #endif
 
diff --git a/browser/base/content/win6BrowserOverlay.xul b/browser/base/content/win6BrowserOverlay.xul
new file mode 100644
index 000000000000..c2dbaf3fb34b
--- /dev/null
+++ b/browser/base/content/win6BrowserOverlay.xul
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
+#
+# ***** 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 the Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Dão Gottwald <dao@mozilla.com> (Original Author)
+#
+# 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 *****
+
+<overlay id="win6-browser-overlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <toolbar id="toolbar-menubar"
+           autohide="true"/>
+</overlay>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 6b1051af84de..21fdaa9cca88 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -6,6 +6,9 @@ browser.jar:
 %  overlay chrome://global/content/console.xul chrome://browser/content/jsConsoleOverlay.xul
 %  overlay chrome://mozapps/content/update/updates.xul chrome://browser/content/softwareUpdateOverlay.xul
 #endif
+#ifdef XP_WIN
+%  overlay chrome://browser/content/browser.xul chrome://browser/content/win6BrowserOverlay.xul os=WINNT osversion>=6
+#endif
 %  overlay chrome://global/content/viewSource.xul chrome://browser/content/viewSourceOverlay.xul
 %  overlay chrome://global/content/viewPartialSource.xul chrome://browser/content/viewSourceOverlay.xul
 %  style chrome://global/content/customizeToolbar.xul chrome://browser/content/browser.css
@@ -59,6 +62,9 @@ browser.jar:
 *       content/browser/softwareUpdateOverlay.xul  (content/softwareUpdateOverlay.xul)
 #endif
 *       content/browser/viewSourceOverlay.xul         (content/viewSourceOverlay.xul)
+#ifdef XP_WIN
+*       content/browser/win6BrowserOverlay.xul        (content/win6BrowserOverlay.xul)
+#endif
 # the following files are browser-specific overrides
 *       content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html

From e2e6234ae2ef6b684f1578ecf467a93e6bbfe864 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Fri, 25 Jun 2010 14:20:33 +0200
Subject: [PATCH 010/172] Bug 573326 - In the toolbar customization window,
 hide the toolbarbutton label and replicate it on the wrapper. r=gavin

--HG--
extra : rebase_source : d70c7db9eac07e0df16b1ca824802654395278eb
---
 toolkit/content/customizeToolbar.css | 5 +++++
 toolkit/content/customizeToolbar.js  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/toolkit/content/customizeToolbar.css b/toolkit/content/customizeToolbar.css
index 6bb38ce087e5..89a753e8f221 100644
--- a/toolkit/content/customizeToolbar.css
+++ b/toolkit/content/customizeToolbar.css
@@ -57,3 +57,8 @@
 #main-box > box {
   overflow: hidden; 
 }
+
+/* Hide the toolbarbutton label because we replicate it on the wrapper */
+toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-text {
+  display: none;
+}
diff --git a/toolkit/content/customizeToolbar.js b/toolkit/content/customizeToolbar.js
index a0c7183668a3..587e09c44ac7 100644
--- a/toolkit/content/customizeToolbar.js
+++ b/toolkit/content/customizeToolbar.js
@@ -455,6 +455,8 @@ function cleanUpItemForPalette(aItem, aWrapper)
 
   if (aItem.hasAttribute("title"))
     aWrapper.setAttribute("title", aItem.getAttribute("title"));
+  else if (aItem.hasAttribute("label"))
+    aWrapper.setAttribute("title", aItem.getAttribute("label"));
   else if (isSpecialItem(aItem)) {
     var stringBundle = document.getElementById("stringBundle");
     // Remove the common "toolbar" prefix to generate the string name.

From eb59bf141ef4e7ac1b42c5e0ada8d070b0918f85 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Fri, 25 Jun 2010 14:23:10 +0200
Subject: [PATCH 011/172] Bug 573698 - When looking for tooltips, don't look at
 SVG elements if SVG is disabled. r=gavin

--HG--
extra : rebase_source : 2700089c813b5c7976855f9ed09caf5cb0a56fc2
---
 browser/base/content/browser.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index f445f232ebe3..e19d213ce954 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2673,7 +2673,11 @@ function FillInHTMLTooltip(tipElement)
   var titleText = null;
   var XLinkTitleText = null;
   var SVGTitleText = null;
+#ifdef MOZ_SVG
   var lookingForSVGTitle = true;
+#else
+  var lookingForSVGTitle = false;
+#endif // MOZ_SVG
   var direction = tipElement.ownerDocument.dir;
 
   while (!titleText && !XLinkTitleText && !SVGTitleText && tipElement) {

From d8a28816248acf1ea38bb526de8280d8974aacb7 Mon Sep 17 00:00:00 2001
From: "Mike Kristoffersen ext:(%3E)" <mkristoffersen@mozilla.com>
Date: Fri, 25 Jun 2010 14:25:31 +0200
Subject: [PATCH 012/172] Bug 562181 - Add support for MozOrientation on Qt.
 r=dougt

--HG--
rename : widget/src/android/nsAccelerometerAndroid.cpp => dom/system/android/nsAccelerometerSystem.cpp
rename : widget/src/android/nsAccelerometerAndroid.h => dom/system/android/nsAccelerometerSystem.h
rename : widget/src/cocoa/nsAccelerometerX.h => dom/system/cocoa/nsAccelerometerSystem.h
rename : widget/src/cocoa/nsAccelerometerX.mm => dom/system/cocoa/nsAccelerometerSystem.mm
rename : widget/src/xpwidgets/nsAccelerometer.cpp => dom/system/nsAccelerometer.cpp
rename : widget/src/xpwidgets/nsAccelerometer.h => dom/system/nsAccelerometer.h
rename : widget/src/gtk2/nsAccelerometerUnix.cpp => dom/system/unix/nsAccelerometerSystem.cpp
rename : widget/src/gtk2/nsAccelerometerUnix.h => dom/system/unix/nsAccelerometerSystem.h
rename : widget/src/windows/nsAccelerometerWin.cpp => dom/system/windows/nsAccelerometerSystem.cpp
rename : widget/src/windows/nsAccelerometerWin.h => dom/system/windows/nsAccelerometerSystem.h
rename : widget/public/nsIAccelerometer.idl => xpcom/system/nsIAccelerometer.idl
extra : rebase_source : f9c352566a6d4088e8d448587214fb87402a4dc3
---
 dom/Makefile.in                               |  1 +
 dom/base/nsGlobalWindow.cpp                   |  3 +-
 dom/system/Makefile.in                        | 80 +++++++++++++++++++
 dom/system/android/Makefile.in                | 59 ++++++++++++++
 .../system/android/nsAccelerometerSystem.cpp  | 12 +--
 .../system/android/nsAccelerometerSystem.h    | 12 +--
 dom/system/cocoa/Makefile.in                  | 58 ++++++++++++++
 .../system/cocoa/nsAccelerometerSystem.h      | 10 +--
 .../system/cocoa/nsAccelerometerSystem.mm     | 38 ++++-----
 .../system}/nsAccelerometer.cpp               |  0
 .../system}/nsAccelerometer.h                 |  6 ++
 dom/system/unix/Makefile.in                   | 58 ++++++++++++++
 .../system/unix/nsAccelerometerSystem.cpp     | 18 ++---
 .../system/unix/nsAccelerometerSystem.h       | 14 ++--
 dom/system/windows/Makefile.in                | 58 ++++++++++++++
 .../system/windows/nsAccelerometerSystem.cpp  | 24 +++---
 .../system/windows/nsAccelerometerSystem.h    | 10 +--
 layout/build/Makefile.in                      | 31 +++++++
 layout/build/nsLayoutModule.cpp               | 23 ++++++
 widget/public/Makefile.in                     |  1 -
 widget/public/nsWidgetsCID.h                  |  6 --
 widget/src/android/Makefile.in                |  2 +-
 widget/src/android/nsAppShell.cpp             |  4 +-
 widget/src/android/nsWidgetFactory.cpp        |  9 +--
 widget/src/build/nsWinWidgetFactory.cpp       |  8 --
 widget/src/cocoa/Makefile.in                  |  1 -
 widget/src/cocoa/nsWidgetFactory.mm           |  6 --
 widget/src/gtk2/Makefile.in                   |  1 -
 widget/src/gtk2/nsWidgetFactory.cpp           |  6 --
 widget/src/windows/Makefile.in                |  1 -
 widget/src/xpwidgets/Makefile.in              |  1 -
 xpcom/system/Makefile.in                      |  1 +
 .../system}/nsIAccelerometer.idl              |  0
 33 files changed, 449 insertions(+), 113 deletions(-)
 create mode 100644 dom/system/Makefile.in
 create mode 100644 dom/system/android/Makefile.in
 rename widget/src/android/nsAccelerometerAndroid.cpp => dom/system/android/nsAccelerometerSystem.cpp (88%)
 rename widget/src/android/nsAccelerometerAndroid.h => dom/system/android/nsAccelerometerSystem.h (89%)
 create mode 100644 dom/system/cocoa/Makefile.in
 rename widget/src/cocoa/nsAccelerometerX.h => dom/system/cocoa/nsAccelerometerSystem.h (91%)
 rename widget/src/cocoa/nsAccelerometerX.mm => dom/system/cocoa/nsAccelerometerSystem.mm (94%)
 rename {widget/src/xpwidgets => dom/system}/nsAccelerometer.cpp (100%)
 rename {widget/src/xpwidgets => dom/system}/nsAccelerometer.h (93%)
 create mode 100644 dom/system/unix/Makefile.in
 rename widget/src/gtk2/nsAccelerometerUnix.cpp => dom/system/unix/nsAccelerometerSystem.cpp (94%)
 rename widget/src/gtk2/nsAccelerometerUnix.h => dom/system/unix/nsAccelerometerSystem.h (89%)
 create mode 100644 dom/system/windows/Makefile.in
 rename widget/src/windows/nsAccelerometerWin.cpp => dom/system/windows/nsAccelerometerSystem.cpp (96%)
 rename widget/src/windows/nsAccelerometerWin.h => dom/system/windows/nsAccelerometerSystem.h (92%)
 rename {widget/public => xpcom/system}/nsIAccelerometer.idl (100%)

diff --git a/dom/Makefile.in b/dom/Makefile.in
index 3f8e157058c8..fae851fd05a9 100644
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -81,6 +81,7 @@ DIRS += \
   locales \
   plugins \
   indexedDB \
+  system \
   $(NULL)
 
 ifdef ENABLE_TESTS
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 61c3c438b3f7..f9b41b554cf5 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -86,8 +86,7 @@
 #include "nsCanvasFrame.h"
 #include "nsIWidget.h"
 #include "nsIBaseWindow.h"
-#include "nsIAccelerometer.h"
-#include "nsWidgetsCID.h"
+#include "nsAccelerometer.h"
 #include "nsIContent.h"
 #include "nsIContentViewerEdit.h"
 #include "nsIDocShell.h"
diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in
new file mode 100644
index 000000000000..a4a3c179fa5b
--- /dev/null
+++ b/dom/system/Makefile.in
@@ -0,0 +1,80 @@
+# ***** 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
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH       = ../..
+topsrcdir   = @top_srcdir@
+srcdir      = @srcdir@
+VPATH       = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE          = dom
+LIBRARY_NAME    = domsystem_s
+LIBXUL_LIBRARY  = 1
+
+ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
+DIRS = unix
+endif
+
+ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
+DIRS = windows
+endif
+
+ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
+DIRS = cocoa
+endif
+
+ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT)))
+DIRS = android
+endif
+
+CPPSRCS     = \
+    nsAccelerometer.cpp \
+    $(NULL)
+
+EXPORTS     = \
+    nsAccelerometer.h \
+    $(NULL)
+
+include $(topsrcdir)/config/config.mk
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+LIBXUL_LIBRARY   = 1
+FORCE_STATIC_LIB = 1
+EXPORT_LIBRARY = 1
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in
new file mode 100644
index 000000000000..478b4d228710
--- /dev/null
+++ b/dom/system/android/Makefile.in
@@ -0,0 +1,59 @@
+# ***** 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 build system.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Mike Kristoffersen <mikek@mikek.dk>
+#
+# 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 *****
+
+DEPTH       = ../../..
+topsrcdir   = @top_srcdir@
+srcdir      = @srcdir@
+VPATH       = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE      = dom
+LIBRARY_NAME    = domsystemandroid_s
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+LIBXUL_LIBRARY   = 1
+FORCE_STATIC_LIB = 1
+EXPORT_LIBRARY = 1
+
+include $(topsrcdir)/config/config.mk
+
+CPPSRCS     = \
+        nsAccelerometerSystem.cpp \
+        $(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/widget/src/android/nsAccelerometerAndroid.cpp b/dom/system/android/nsAccelerometerSystem.cpp
similarity index 88%
rename from widget/src/android/nsAccelerometerAndroid.cpp
rename to dom/system/android/nsAccelerometerSystem.cpp
index 7fce6d481dcd..8debd3ca6bbc 100644
--- a/widget/src/android/nsAccelerometerAndroid.cpp
+++ b/dom/system/android/nsAccelerometerSystem.cpp
@@ -34,29 +34,29 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsAccelerometerAndroid.h"
+#include "nsAccelerometerSystem.h"
 
 #include "AndroidBridge.h"
 
 using namespace mozilla;
 
-extern nsAccelerometerAndroid *gAccel;
+extern nsAccelerometerSystem *gAccel;
 
-nsAccelerometerAndroid::nsAccelerometerAndroid()
+nsAccelerometerSystem::nsAccelerometerSystem()
 {
     gAccel = this;
 }
 
-nsAccelerometerAndroid::~nsAccelerometerAndroid()
+nsAccelerometerSystem::~nsAccelerometerSystem()
 {
 }
 
-void nsAccelerometerAndroid::Startup()
+void nsAccelerometerSystem::Startup()
 {
     AndroidBridge::Bridge()->EnableAccelerometer(true);
 }
 
-void nsAccelerometerAndroid::Shutdown()
+void nsAccelerometerSystem::Shutdown()
 {
     AndroidBridge::Bridge()->EnableAccelerometer(false);
 }
diff --git a/widget/src/android/nsAccelerometerAndroid.h b/dom/system/android/nsAccelerometerSystem.h
similarity index 89%
rename from widget/src/android/nsAccelerometerAndroid.h
rename to dom/system/android/nsAccelerometerSystem.h
index 417a80fa9c87..8d6cf3c060d8 100644
--- a/widget/src/android/nsAccelerometerAndroid.h
+++ b/dom/system/android/nsAccelerometerSystem.h
@@ -34,21 +34,21 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsAccelerometerAndroid_h
-#define nsAccelerometerAndroid_h
+#ifndef nsAccelerometerSystem_h
+#define nsAccelerometerSystem_h
 
 #include "nsAccelerometer.h"
 
-class nsAccelerometerAndroid : public nsAccelerometer
+class nsAccelerometerSystem : public nsAccelerometer
 {
 public:
-  nsAccelerometerAndroid();
-  virtual ~nsAccelerometerAndroid();
+  nsAccelerometerSystem();
+  virtual ~nsAccelerometerSystem();
 
 private:
   virtual void Startup();
   virtual void Shutdown();
 };
 
-#endif /* nsAccelerometerAndroid_h */
+#endif /* nsAccelerometerSystem_h */
 
diff --git a/dom/system/cocoa/Makefile.in b/dom/system/cocoa/Makefile.in
new file mode 100644
index 000000000000..aa50e19c3531
--- /dev/null
+++ b/dom/system/cocoa/Makefile.in
@@ -0,0 +1,58 @@
+# ***** 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 build system.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Mike Kristoffersen <mikek@mikek.dk>
+#
+# 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 *****
+
+DEPTH       = ../../..
+topsrcdir   = @top_srcdir@
+srcdir      = @srcdir@
+VPATH       = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE      = dom
+LIBRARY_NAME    = domsystemcocoa_s
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+LIBXUL_LIBRARY   = 1
+FORCE_STATIC_LIB = 1
+EXPORT_LIBRARY = 1
+
+include $(topsrcdir)/config/config.mk
+
+CMMSRCS     = \
+        nsAccelerometerSystem.mm \
+        $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/widget/src/cocoa/nsAccelerometerX.h b/dom/system/cocoa/nsAccelerometerSystem.h
similarity index 91%
rename from widget/src/cocoa/nsAccelerometerX.h
rename to dom/system/cocoa/nsAccelerometerSystem.h
index c70459087e5d..0ba7da7b14c1 100644
--- a/widget/src/cocoa/nsAccelerometerX.h
+++ b/dom/system/cocoa/nsAccelerometerSystem.h
@@ -34,19 +34,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsAccelerometerX_h
-#define nsAccelerometerX_h
+#ifndef nsAccelerometerSystem_h
+#define nsAccelerometerSystem_h
 
 #include <IOKit/IOKitLib.h>
 #include <mach/mach_port.h>
 
 #include "nsAccelerometer.h"
 
-class nsAccelerometerX : public nsAccelerometer
+class nsAccelerometerSystem : public nsAccelerometer
 {
  public:
-  nsAccelerometerX();
-  ~nsAccelerometerX();
+  nsAccelerometerSystem();
+  ~nsAccelerometerSystem();
 
   void Startup();
   void Shutdown();
diff --git a/widget/src/cocoa/nsAccelerometerX.mm b/dom/system/cocoa/nsAccelerometerSystem.mm
similarity index 94%
rename from widget/src/cocoa/nsAccelerometerX.mm
rename to dom/system/cocoa/nsAccelerometerSystem.mm
index f248524765b2..655ea39791fa 100644
--- a/widget/src/cocoa/nsAccelerometerX.mm
+++ b/dom/system/cocoa/nsAccelerometerSystem.mm
@@ -34,7 +34,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsAccelerometerX.h"
+#include "nsAccelerometerSystem.h"
 #include "nsIServiceManager.h"
 #include "stdlib.h"
 
@@ -45,11 +45,11 @@
 #define MODEL_NAME_LENGTH 64
 static char gModelName[MODEL_NAME_LENGTH];
 
-nsAccelerometerX::nsAccelerometerX()
+nsAccelerometerSystem::nsAccelerometerSystem()
 {
 }
 
-nsAccelerometerX::~nsAccelerometerX()
+nsAccelerometerSystem::~nsAccelerometerSystem()
 {
 }
 
@@ -72,9 +72,9 @@ typedef struct
 #define SMSDATA_USED_SIZE (sizeof(SmsData) - SMSDATA_PADDING_SIZE)
 
 void
-nsAccelerometerX::UpdateHandler(nsITimer *aTimer, void *aClosure)
+nsAccelerometerSystem::UpdateHandler(nsITimer *aTimer, void *aClosure)
 {
-  nsAccelerometerX *self = reinterpret_cast<nsAccelerometerX *>(aClosure);
+  nsAccelerometerSystem *self = reinterpret_cast<nsAccelerometerSystem *>(aClosure);
   if (!self) {
     NS_ERROR("no self");
     return;
@@ -87,7 +87,7 @@ nsAccelerometerX::UpdateHandler(nsITimer *aTimer, void *aClosure)
 
   if (!input || !output)
     return;
-    
+
   memset(input, 0, bufferLen);
   memset(output, 0, bufferLen);
 
@@ -115,14 +115,14 @@ nsAccelerometerX::UpdateHandler(nsITimer *aTimer, void *aClosure)
   }
 
   SmsData *data = (SmsData*) output;
-  
+
   float xf, yf, zf;
 
   // we want to normalize the return result from the chip to
   // something between -1 and 1 where 0 is the balance point.
 
   const int normalizeFactor = 250.5;
-  
+
   if (!strcmp(gModelName, "MacBookPro5,1")) {
     xf = ((float)data->x) / normalizeFactor;
     yf = (((float)data->y) / normalizeFactor) * -1;
@@ -146,7 +146,7 @@ nsAccelerometerX::UpdateHandler(nsITimer *aTimer, void *aClosure)
   self->AccelerationChanged( xf, yf, zf );
 }
 
-void nsAccelerometerX::Startup()
+void nsAccelerometerSystem::Startup()
 {
   // we can fail, and that just means the caller will not see any changes.
 
@@ -154,31 +154,31 @@ void nsAccelerometerX::Startup()
   kern_return_t result = ::IOMasterPort(MACH_PORT_NULL, &port);
   if (result != kIOReturnSuccess)
     return;
-  
+
   CFMutableDictionaryRef  dict = ::IOServiceMatching("SMCMotionSensor");
   if (!dict)
     return;
-  
+
   io_iterator_t iter;
   result = ::IOServiceGetMatchingServices(port, dict, &iter);
   if (result != kIOReturnSuccess)
     return;
-  
+
   io_object_t device = ::IOIteratorNext(iter);
 
   ::IOObjectRelease(iter);
-  
+
   if (!device)
     return;
-  
+
   result = ::IOServiceOpen(device, mach_task_self(), 0, &mSmsConnection);
   ::IOObjectRelease(device);
-  
+
   if (result != kIOReturnSuccess)
     return;
-  
+
   mach_port_deallocate(mach_task_self(), port);
-  
+
   /* get the version of the hardware we are running on. */
   int mib[2];
   size_t len = MODEL_NAME_LENGTH;
@@ -194,11 +194,11 @@ void nsAccelerometerX::Startup()
                                        nsITimer::TYPE_REPEATING_SLACK);
 }
 
-void nsAccelerometerX::Shutdown()
+void nsAccelerometerSystem::Shutdown()
 {
   if (mSmsConnection)
     ::IOServiceClose(mSmsConnection);
-  
+
   if (mUpdateTimer) {
     mUpdateTimer->Cancel();
     mUpdateTimer = nsnull;
diff --git a/widget/src/xpwidgets/nsAccelerometer.cpp b/dom/system/nsAccelerometer.cpp
similarity index 100%
rename from widget/src/xpwidgets/nsAccelerometer.cpp
rename to dom/system/nsAccelerometer.cpp
diff --git a/widget/src/xpwidgets/nsAccelerometer.h b/dom/system/nsAccelerometer.h
similarity index 93%
rename from widget/src/xpwidgets/nsAccelerometer.h
rename to dom/system/nsAccelerometer.h
index 0f87d52e60ed..f8d1f3cc69cf 100644
--- a/widget/src/xpwidgets/nsAccelerometer.h
+++ b/dom/system/nsAccelerometer.h
@@ -42,6 +42,12 @@
 #include "nsCOMPtr.h"
 #include "nsITimer.h"
 
+#define NS_ACCELEROMETER_CID \
+{ 0xecba5203, 0x77da, 0x465a, \
+{ 0x86, 0x5e, 0x78, 0xb7, 0xaf, 0x10, 0xd8, 0xf7 } }
+
+#define NS_ACCELEROMETER_CONTRACTID "@mozilla.org/accelerometer;1"
+
 class nsIDOMWindow;
 
 class nsAccelerometer : public nsIAccelerometer
diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in
new file mode 100644
index 000000000000..b498b728463b
--- /dev/null
+++ b/dom/system/unix/Makefile.in
@@ -0,0 +1,58 @@
+# ***** 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 build system.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Mike Kristoffersen <mikek@mikek.dk>
+#
+# 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 *****
+
+DEPTH       = ../../..
+topsrcdir   = @top_srcdir@
+srcdir      = @srcdir@
+VPATH       = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE      = dom
+LIBRARY_NAME    = domsystemunix_s
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+LIBXUL_LIBRARY   = 1
+FORCE_STATIC_LIB = 1
+EXPORT_LIBRARY = 1
+
+include $(topsrcdir)/config/config.mk
+
+CPPSRCS     = \
+        nsAccelerometerSystem.cpp \
+        $(NULL)
+
+include $(topsrcdir)/config/rules.mk
\ No newline at end of file
diff --git a/widget/src/gtk2/nsAccelerometerUnix.cpp b/dom/system/unix/nsAccelerometerSystem.cpp
similarity index 94%
rename from widget/src/gtk2/nsAccelerometerUnix.cpp
rename to dom/system/unix/nsAccelerometerSystem.cpp
index 4d6802ea5bca..bb4e59bac0ba 100644
--- a/widget/src/gtk2/nsAccelerometerUnix.cpp
+++ b/dom/system/unix/nsAccelerometerSystem.cpp
@@ -36,13 +36,13 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include <unistd.h>
-#include "nsAccelerometerUnix.h"
+#include "nsAccelerometerSystem.h"
 #include "nsIServiceManager.h"
 
 typedef struct {
   const char* mPosition;
   const char* mCalibrate;
-  nsAccelerometerUnixDriver mToken;
+  nsAccelerometerSystemDriver mToken;
 } Accelerometer;
 
 static const Accelerometer gAccelerometers[] = {
@@ -64,21 +64,21 @@ static const Accelerometer gAccelerometers[] = {
    eHPdv7Sensor},
 };
 
-nsAccelerometerUnix::nsAccelerometerUnix() :
+nsAccelerometerSystem::nsAccelerometerSystem() :
   mPositionFile(NULL),
   mCalibrateFile(NULL),
   mType(eNoSensor)
 {
 }
 
-nsAccelerometerUnix::~nsAccelerometerUnix()
+nsAccelerometerSystem::~nsAccelerometerSystem()
 {
 }
 
 void
-nsAccelerometerUnix::UpdateHandler(nsITimer *aTimer, void *aClosure)
+nsAccelerometerSystem::UpdateHandler(nsITimer *aTimer, void *aClosure)
 {
-  nsAccelerometerUnix *self = reinterpret_cast<nsAccelerometerUnix *>(aClosure);
+  nsAccelerometerSystem *self = reinterpret_cast<nsAccelerometerSystem *>(aClosure);
   if (!self) {
     NS_ERROR("no self");
     return;
@@ -190,7 +190,7 @@ nsAccelerometerUnix::UpdateHandler(nsITimer *aTimer, void *aClosure)
   self->AccelerationChanged( xf, yf, zf );
 }
 
-void nsAccelerometerUnix::Startup()
+void nsAccelerometerSystem::Startup()
 {
   // Accelerometers in Linux are used by reading a file (yay UNIX!), which is
   // in a slightly different location depending on the driver.
@@ -213,7 +213,7 @@ void nsAccelerometerUnix::Startup()
 
   if (mType == eNoSensor)
     return;
-  
+
   mUpdateTimer = do_CreateInstance("@mozilla.org/timer;1");
   if (mUpdateTimer)
     mUpdateTimer->InitWithFuncCallback(UpdateHandler,
@@ -222,7 +222,7 @@ void nsAccelerometerUnix::Startup()
                                        nsITimer::TYPE_REPEATING_SLACK);
 }
 
-void nsAccelerometerUnix::Shutdown()
+void nsAccelerometerSystem::Shutdown()
 {
   if (mPositionFile) {
     fclose(mPositionFile);
diff --git a/widget/src/gtk2/nsAccelerometerUnix.h b/dom/system/unix/nsAccelerometerSystem.h
similarity index 89%
rename from widget/src/gtk2/nsAccelerometerUnix.h
rename to dom/system/unix/nsAccelerometerSystem.h
index 7cf0dbdf53be..5971ce39c83e 100644
--- a/widget/src/gtk2/nsAccelerometerUnix.h
+++ b/dom/system/unix/nsAccelerometerSystem.h
@@ -35,13 +35,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsAccelerometerUnix_h
-#define nsAccelerometerUnix_h
+#ifndef nsAccelerometerSystem_h
+#define nsAccelerometerSystem_h
 
 #include <unistd.h>
 #include "nsAccelerometer.h"
 
-enum nsAccelerometerUnixDriver
+enum nsAccelerometerSystemDriver
 {
   eNoSensor,
   eAppleSensor,
@@ -50,18 +50,18 @@ enum nsAccelerometerUnixDriver
   eHPdv7Sensor
 };
 
-class nsAccelerometerUnix : public nsAccelerometer
+class nsAccelerometerSystem : public nsAccelerometer
 {
  public:
-  nsAccelerometerUnix();
-  ~nsAccelerometerUnix();
+  nsAccelerometerSystem();
+  ~nsAccelerometerSystem();
 
   void Startup();
   void Shutdown();
 
   FILE* mPositionFile;
   FILE* mCalibrateFile;
-  nsAccelerometerUnixDriver mType;
+  nsAccelerometerSystemDriver mType;
 
   nsCOMPtr<nsITimer> mUpdateTimer;
   static void UpdateHandler(nsITimer *aTimer, void *aClosure);
diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in
new file mode 100644
index 000000000000..bdbb71a4316a
--- /dev/null
+++ b/dom/system/windows/Makefile.in
@@ -0,0 +1,58 @@
+# ***** 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 build system.
+#
+# The Initial Developer of the Original Code is Mozilla Foundation
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Mike Kristoffersen <mikek@mikek.dk>
+#
+# 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 *****
+
+DEPTH       = ../../..
+topsrcdir   = @top_srcdir@
+srcdir      = @srcdir@
+VPATH       = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE      = dom
+LIBRARY_NAME    = domsystemwindows_s
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+LIBXUL_LIBRARY   = 1
+FORCE_STATIC_LIB = 1
+EXPORT_LIBRARY = 1
+
+include $(topsrcdir)/config/config.mk
+
+CPPSRCS     = \
+        nsAccelerometerSystem.cpp \
+        $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/widget/src/windows/nsAccelerometerWin.cpp b/dom/system/windows/nsAccelerometerSystem.cpp
similarity index 96%
rename from widget/src/windows/nsAccelerometerWin.cpp
rename to dom/system/windows/nsAccelerometerSystem.cpp
index bdf720f562a0..c4d309e70cc4 100644
--- a/widget/src/windows/nsAccelerometerWin.cpp
+++ b/dom/system/windows/nsAccelerometerSystem.cpp
@@ -35,14 +35,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsAccelerometerWin.h"
+#include "nsAccelerometerSystem.h"
 #include "nsIServiceManager.h"
 #include "windows.h"
 
 #ifdef WINCE_WINDOWS_MOBILE
 
 ////////////////////////////
-// HTC 
+// HTC
 ////////////////////////////
 
 
@@ -91,7 +91,7 @@ PRBool
 HTCSensor::Startup()
 {
   HMODULE hSensorLib = LoadLibraryW(L"HTCSensorSDK.dll");
-  
+
   if (!hSensorLib)
     return PR_FALSE;
 
@@ -183,8 +183,8 @@ typedef struct
   FLOAT z;     /**< Z-direction value */
 } SmiAccelerometerVector;
 
-/** 
- *  Specifies the capabilities of the Accelerometer device. 
+/**
+ *  Specifies the capabilities of the Accelerometer device.
  */
 typedef struct
 {
@@ -450,13 +450,13 @@ ThinkPadSensor::GetValues(double *x, double *y, double *z)
 
 #endif
 
-nsAccelerometerWin::nsAccelerometerWin(){}
-nsAccelerometerWin::~nsAccelerometerWin(){}
+nsAccelerometerSystem::nsAccelerometerSystem(){}
+nsAccelerometerSystem::~nsAccelerometerSystem(){}
 
 void
-nsAccelerometerWin::UpdateHandler(nsITimer *aTimer, void *aClosure)
+nsAccelerometerSystem::UpdateHandler(nsITimer *aTimer, void *aClosure)
 {
-  nsAccelerometerWin *self = reinterpret_cast<nsAccelerometerWin *>(aClosure);
+  nsAccelerometerSystem *self = reinterpret_cast<nsAccelerometerSystem *>(aClosure);
   if (!self || !self->mSensor) {
     NS_ERROR("no self or sensor");
     return;
@@ -466,7 +466,7 @@ nsAccelerometerWin::UpdateHandler(nsITimer *aTimer, void *aClosure)
   self->AccelerationChanged(x, y, z);
 }
 
-void nsAccelerometerWin::Startup()
+void nsAccelerometerSystem::Startup()
 {
   NS_ASSERTION(!mSensor, "mSensor should be null.  Startup called twice?");
 
@@ -499,7 +499,7 @@ void nsAccelerometerWin::Startup()
     started = mSensor->Startup();
 
 #endif
-  
+
   if (!started)
     return;
 
@@ -511,7 +511,7 @@ void nsAccelerometerWin::Startup()
                                        nsITimer::TYPE_REPEATING_SLACK);
 }
 
-void nsAccelerometerWin::Shutdown()
+void nsAccelerometerSystem::Shutdown()
 {
   if (mUpdateTimer) {
     mUpdateTimer->Cancel();
diff --git a/widget/src/windows/nsAccelerometerWin.h b/dom/system/windows/nsAccelerometerSystem.h
similarity index 92%
rename from widget/src/windows/nsAccelerometerWin.h
rename to dom/system/windows/nsAccelerometerSystem.h
index 2c76e268792a..2ff277f345a5 100644
--- a/widget/src/windows/nsAccelerometerWin.h
+++ b/dom/system/windows/nsAccelerometerSystem.h
@@ -34,8 +34,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsAccelerometerWin_h
-#define nsAccelerometerWin_h
+#ifndef nsAccelerometerSystem_h
+#define nsAccelerometerSystem_h
 
 #include "nsAccelerometer.h"
 #include "nsAutoPtr.h"
@@ -48,11 +48,11 @@ class Sensor
   virtual void GetValues(double *x, double *y, double *z) = 0;
 };
 
-class nsAccelerometerWin : public nsAccelerometer
+class nsAccelerometerSystem : public nsAccelerometer
 {
  public:
-  nsAccelerometerWin();
-  ~nsAccelerometerWin();
+  nsAccelerometerSystem();
+  ~nsAccelerometerSystem();
 
   void Startup();
   void Shutdown();
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index 7b77211ffcc1..d3358be33e91 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -104,6 +104,7 @@ SHARED_LIBRARY_LIBS = \
 	$(DEPTH)/dom/src/storage/$(LIB_PREFIX)jsdomstorage_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/src/offline/$(LIB_PREFIX)jsdomoffline_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/src/geolocation/$(LIB_PREFIX)jsdomgeolocation_s.$(LIB_SUFFIX) \
+	$(DEPTH)/dom/system/$(LIB_PREFIX)domsystem_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/src/threads/$(LIB_PREFIX)domthreads_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/indexedDB/$(LIB_PREFIX)dom_indexeddb_s.$(LIB_SUFFIX) \
 	$(DEPTH)/editor/libeditor/text/$(LIB_PREFIX)texteditor_s.$(LIB_SUFFIX) \
@@ -112,6 +113,36 @@ SHARED_LIBRARY_LIBS = \
 	$(DEPTH)/caps/src/$(LIB_PREFIX)caps_s.$(LIB_SUFFIX) \
 	$(NULL)
 
+ifneq (,$(filter qt gtk2,$(MOZ_WIDGET_TOOLKIT)))
+SHARED_LIBRARY_LIBS += \
+	$(DEPTH)/dom/system/unix/$(LIB_PREFIX)domsystemunix_s.$(LIB_SUFFIX) \
+	$(NULL)
+LOCAL_INCLUDES	+= \
+	-I$(topsrcdir)/dom/system/unix \
+	$(NULL)
+else ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
+SHARED_LIBRARY_LIBS += \
+	$(DEPTH)/dom/system/windows/$(LIB_PREFIX)domsystemwindows_s.$(LIB_SUFFIX) \
+	$(NULL)
+LOCAL_INCLUDES	+= \
+	-I$(topsrcdir)/dom/system/windows \
+	$(NULL)
+else ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
+SHARED_LIBRARY_LIBS += \
+	$(DEPTH)/dom/system/cocoa/$(LIB_PREFIX)domsystemcocoa_s.$(LIB_SUFFIX) \
+ 	$(NULL)
+LOCAL_INCLUDES	+= \
+	-I$(topsrcdir)/dom/system/cocoa \
+	$(NULL)
+else ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT)))
+SHARED_LIBRARY_LIBS += \
+	$(DEPTH)/dom/system/android/$(LIB_PREFIX)domsystemandroid_s.$(LIB_SUFFIX) \
+ 	$(NULL)
+LOCAL_INCLUDES	+= \
+	-I$(topsrcdir)/dom/system/android \
+	$(NULL)
+endif
+
 ifdef MOZ_VORBIS
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index eaa7297486e6..ada8c7cc8ad4 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -279,6 +279,12 @@ static void Shutdown();
 #endif
 
 #include "nsGeolocation.h"
+#if defined(XP_UNIX)    || \
+    defined(_WINDOWS)   || \
+    defined(machintosh) || \
+    defined(android)
+#include "nsAccelerometerSystem.h"
+#endif
 #include "nsCSPService.h"
 
 // Transformiix
@@ -311,6 +317,12 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMParser)
 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsDOMStorageManager,
                                          nsDOMStorageManager::GetInstance)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsChannelPolicy)
+#if defined(XP_UNIX)    || \
+    defined(_WINDOWS)   || \
+    defined(machintosh) || \
+    defined(android)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccelerometerSystem)
+#endif
 
 //-----------------------------------------------------------------------------
 
@@ -1639,6 +1651,17 @@ static const nsModuleComponentInfo gLayoutComponents[] = {
       NS_EVENTLISTENERSERVICE_CONTRACTID,
       CreateEventListenerService },
 
+#if defined(XP_UNIX)    || \
+    defined(_WINDOWS)   || \
+    defined(machintosh) || \
+    defined(android)
+    { "Accelerometer",
+       NS_ACCELEROMETER_CID,
+       NS_ACCELEROMETER_CONTRACTID,
+       nsAccelerometerSystemConstructor
+     },
+#endif
+
     { "Global Message Manager",
       NS_GLOBALMESSAGEMANAGER_CID,
       NS_GLOBALMESSAGEMANAGER_CONTRACTID,
diff --git a/widget/public/Makefile.in b/widget/public/Makefile.in
index 8beba266d419..1e28f9f918e5 100644
--- a/widget/public/Makefile.in
+++ b/widget/public/Makefile.in
@@ -84,7 +84,6 @@ EXPORTS		+= \
 endif
 
 XPIDLSRCS	= \
-		nsIAccelerometer.idl \
 		nsIAppShell.idl \
 		nsIFilePicker.idl \
 		nsIToolkit.idl \
diff --git a/widget/public/nsWidgetsCID.h b/widget/public/nsWidgetsCID.h
index 84e31e3b14f0..4802f0a07911 100644
--- a/widget/public/nsWidgetsCID.h
+++ b/widget/public/nsWidgetsCID.h
@@ -194,9 +194,3 @@
 { 0x06beec76, 0xa183, 0x4d9f, \
 { 0x85, 0xdd, 0x08, 0x5f, 0x26, 0xda, 0x56, 0x5a } }
 
-#define NS_ACCELEROMETER_CID \
-{ 0xecba5203, 0x77da, 0x465a, \
-{ 0x86, 0x5e, 0x78, 0xb7, 0xaf, 0x10, 0xd8, 0xf7 } }
-
-#define NS_ACCELEROMETER_CONTRACTID "@mozilla.org/accelerometer;1"
-
diff --git a/widget/src/android/Makefile.in b/widget/src/android/Makefile.in
index 23b8283e66d0..f49a0bbcfd38 100644
--- a/widget/src/android/Makefile.in
+++ b/widget/src/android/Makefile.in
@@ -62,7 +62,6 @@ CPPSRCS	= \
 	nsLookAndFeel.cpp \
 	nsScreenManagerAndroid.cpp \
 	nsIdleServiceAndroid.cpp \
-	nsAccelerometerAndroid.cpp \
 	$(NULL)
 
 NOT_THERE_YET_CPPSRCS = \
@@ -98,6 +97,7 @@ DEFINES += -D_IMPL_NS_WIDGET
 
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/widget/src/xpwidgets \
+	-I$(topsrcdir)/dom/system/android \
 	-I$(srcdir) \
 	$(NULL)
 
diff --git a/widget/src/android/nsAppShell.cpp b/widget/src/android/nsAppShell.cpp
index 2c8cb0b74dcb..9afeb5ced3ae 100644
--- a/widget/src/android/nsAppShell.cpp
+++ b/widget/src/android/nsAppShell.cpp
@@ -49,7 +49,7 @@
 #include "prenv.h"
 
 #include "AndroidBridge.h"
-#include "nsAccelerometerAndroid.h"
+#include "nsAccelerometerSystem.h"
 #include <android/log.h>
 #include <pthread.h>
 
@@ -70,7 +70,7 @@ using namespace mozilla;
 PRLogModuleInfo *gWidgetLog = nsnull;
 #endif
 
-nsAccelerometerAndroid *gAccel = nsnull;
+nsAccelerometerSystem *gAccel = nsnull;
 nsIGeolocationUpdate *gLocationCallback = nsnull;
 
 nsAppShell *nsAppShell::gAppShell = nsnull;
diff --git a/widget/src/android/nsWidgetFactory.cpp b/widget/src/android/nsWidgetFactory.cpp
index e7844bfe1efb..8f1733d283b5 100644
--- a/widget/src/android/nsWidgetFactory.cpp
+++ b/widget/src/android/nsWidgetFactory.cpp
@@ -49,14 +49,12 @@
 #include "nsAppShellSingleton.h"
 #include "nsScreenManagerAndroid.h"
 
-#include "nsAccelerometerAndroid.h"
 #include "nsIdleServiceAndroid.h"
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsToolkit)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerAndroid)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccelerometerAndroid)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceAndroid)
 
 
@@ -89,12 +87,7 @@ static const nsModuleComponentInfo components[] =
     { "Android Idle Service",
       NS_IDLE_SERVICE_CID,
       "@mozilla.org/widget/idleservice;1",
-      nsIdleServiceAndroidConstructor },
-    { "Accelerometer",
-      NS_ACCELEROMETER_CID,
-      NS_ACCELEROMETER_CONTRACTID,
-      nsAccelerometerAndroidConstructor },
-
+      nsIdleServiceAndroidConstructor }
 };
 
 static void
diff --git a/widget/src/build/nsWinWidgetFactory.cpp b/widget/src/build/nsWinWidgetFactory.cpp
index 706b443b9bdb..5519567304be 100644
--- a/widget/src/build/nsWinWidgetFactory.cpp
+++ b/widget/src/build/nsWinWidgetFactory.cpp
@@ -78,9 +78,6 @@
 #include "nsPrintSession.h"
 #endif
 
-#include "nsAccelerometerWin.h"
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccelerometerWin)
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(ChildWindow)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
@@ -213,11 +210,6 @@ static const nsModuleComponentInfo components[] =
     nsBidiKeyboardConstructor },
 #endif
 
-  { "Accelerometer",
-    NS_ACCELEROMETER_CID,
-    NS_ACCELEROMETER_CONTRACTID,
-    nsAccelerometerWinConstructor },
-
 #ifdef NS_PRINTING
   { "nsPrintOptionsWin",
     NS_PRINTSETTINGSSERVICE_CID,
diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in
index 1ea291d9d68b..4d44ace8b7a0 100644
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -88,7 +88,6 @@ CMMSRCS = \
 		nsPrintOptionsX.mm \
 		nsPrintSettingsX.mm \
 		nsIdleServiceX.mm \
-		nsAccelerometerX.mm \
 		nsCocoaTextInputHandler.mm \
 		nsMacDockSupport.mm \
 		nsStandaloneNativeMenu.mm \
diff --git a/widget/src/cocoa/nsWidgetFactory.mm b/widget/src/cocoa/nsWidgetFactory.mm
index 75b11c53f388..6ea558b5e0fe 100644
--- a/widget/src/cocoa/nsWidgetFactory.mm
+++ b/widget/src/cocoa/nsWidgetFactory.mm
@@ -57,7 +57,6 @@
 
 #include "nsLookAndFeel.h"
 
-#include "nsAccelerometerX.h"
 #include "nsSound.h"
 #include "nsIdleServiceX.h"
 
@@ -73,7 +72,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsToolkit)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccelerometerX)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard)
@@ -135,10 +133,6 @@ static const nsModuleComponentInfo gComponents[] =
     NS_SOUND_CID,
     "@mozilla.org/sound;1",
     nsSoundConstructor },
-  { "Accelerometer",
-    NS_ACCELEROMETER_CID,
-    NS_ACCELEROMETER_CONTRACTID,
-    nsAccelerometerXConstructor },
   { "Transferable",
     NS_TRANSFERABLE_CID,
     "@mozilla.org/widget/transferable;1",
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
index 3f25f5775c23..7868061ad00d 100644
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -78,7 +78,6 @@ CPPSRCS		= \
 		nsScreenManagerGtk.cpp \
 		nsImageToPixbuf.cpp \
 		nsAccessibilityHelper.cpp \
-		nsAccelerometerUnix.cpp \
 		nsGtkIMModule.cpp \
 		$(NULL)
 
diff --git a/widget/src/gtk2/nsWidgetFactory.cpp b/widget/src/gtk2/nsWidgetFactory.cpp
index 5aa391763b0c..bba1d97c566f 100644
--- a/widget/src/gtk2/nsWidgetFactory.cpp
+++ b/widget/src/gtk2/nsWidgetFactory.cpp
@@ -55,7 +55,6 @@
 #include "nsBidiKeyboard.h"
 #include "nsNativeKeyBindings.h"
 #include "nsScreenManagerGtk.h"
-#include "nsAccelerometerUnix.h"
 
 #ifdef NS_PRINTING
 #include "nsPrintOptionsGTK.h"
@@ -102,7 +101,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerGtk)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImageToPixbuf)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccelerometerUnix)
 
 
 #ifdef NATIVE_THEME_SUPPORT
@@ -254,10 +252,6 @@ static const nsModuleComponentInfo components[] =
       NS_SOUND_CID,
       "@mozilla.org/sound;1",
       nsSoundConstructor },
-    { "Accelerometer",
-       NS_ACCELEROMETER_CID,
-       NS_ACCELEROMETER_CONTRACTID,
-       nsAccelerometerUnixConstructor },
     { "Transferable",
       NS_TRANSFERABLE_CID,
       "@mozilla.org/widget/transferable;1",
diff --git a/widget/src/windows/Makefile.in b/widget/src/windows/Makefile.in
index 958a3ed2c836..245d95e06884 100644
--- a/widget/src/windows/Makefile.in
+++ b/widget/src/windows/Makefile.in
@@ -64,7 +64,6 @@ CPPSRCS		= \
 	nsSound.cpp \
 	nsIMM32Handler.cpp \
 	WindowHook.cpp \
-	nsAccelerometerWin.cpp \
 	WinTaskbar.cpp \
 	TaskbarPreview.cpp \
 	TaskbarTabPreview.cpp \
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index c2b75987fe42..5ec94401056f 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -68,7 +68,6 @@ CPPSRCS		= \
 		nsWidgetAtoms.cpp \
 		nsIdleService.cpp \
 		nsClipboardPrivacyHandler.cpp \
-		nsAccelerometer.cpp \
 		$(NULL)
 
 ifneq (,$(filter beos os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
diff --git a/xpcom/system/Makefile.in b/xpcom/system/Makefile.in
index d244591fc5ba..0d1cd70119fa 100644
--- a/xpcom/system/Makefile.in
+++ b/xpcom/system/Makefile.in
@@ -52,6 +52,7 @@ XPIDLSRCS = \
         nsIGnomeVFSService.idl \
         nsIBlocklistService.idl \
         nsIGIOService.idl \
+        nsIAccelerometer.idl \
         $(NULL)
 
 ifdef MOZ_CRASHREPORTER
diff --git a/widget/public/nsIAccelerometer.idl b/xpcom/system/nsIAccelerometer.idl
similarity index 100%
rename from widget/public/nsIAccelerometer.idl
rename to xpcom/system/nsIAccelerometer.idl

From 10660f93fb7a797a309b57c2564b30d49bab6989 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 25 Jun 2010 14:26:50 +0200
Subject: [PATCH 013/172] Bug 570949 - Fix mingw compilation. r=ted

--HG--
extra : rebase_source : 9aa909f76f4995c3be91402995ab0b5eabe96204
---
 configure.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 193dbab604b3..d437a161e9a2 100644
--- a/configure.in
+++ b/configure.in
@@ -5911,7 +5911,7 @@ if test -n "$MOZ_WEBM"; then
 
     dnl Detect if we can use an assembler to compile optimized assembly for libvpx.
     dnl For Win32 (MSVC) we must use MASM.
-    if test "$OS_ARCH" = "WINNT" -a "$CPU_ARCH" = "x86" -a "$GNU_CC" != "yes"; then
+    if test "$OS_ARCH" = "WINNT" -a "$CPU_ARCH" = "x86" -a -z "$GNU_CC"; then
         AC_MSG_CHECKING([for MASM assembler])
         AC_CHECK_PROGS(VPX_AS, ml, "")
         if test -n "$VPX_AS"; then
@@ -5946,8 +5946,10 @@ if test -n "$MOZ_WEBM"; then
           VPX_X86_ASM=1
         ;;
         WINNT:x86_64)
-          VPX_ASFLAGS="-f x64 -rnasm -pnasm"
-          VPX_X86_ASM=1
+          if test -z "$GNU_CC"; then
+            VPX_ASFLAGS="-f x64 -rnasm -pnasm"
+            VPX_X86_ASM=1
+          fi
         ;;
         esac
       fi # end have YASM

From 6c13344d9a27ad502757ca6d60b9a866d0ae02d9 Mon Sep 17 00:00:00 2001
From: "mcdavis941.bugs@gmail.com" <mcdavis941.bugs@gmail.com>
Date: Fri, 25 Jun 2010 14:29:07 +0200
Subject: [PATCH 014/172] Bug 571842 - add classes to split menu for CSS
 addressability. r=dao

--HG--
extra : rebase_source : 29efb4b168ed74a99d53cf5d254af3aad2407daa
---
 browser/base/content/browser.xul | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 38b92c3fe22c..492ea8b65304 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -401,8 +401,9 @@
         <menuitem id="appmenu_sendLink"
                   label="&sendPageCmd.label;"
                   command="Browser:SendLink"/>
-        <hbox flex="1">
+        <hbox flex="1" class="split-menuitem">
           <menuitem id="appmenu_print"
+                    class="split-menuitem-item"
                     flex="1"
                     label="&appMenuPrintCmd.label;"
                     key="printKb"

From 9e8dbd5673b1d5f8f894b45dad3ae190d2e49208 Mon Sep 17 00:00:00 2001
From: John Daggett <jdaggett@mozilla.com>
Date: Fri, 25 Jun 2010 21:43:10 +0900
Subject: [PATCH 015/172] Bug 561304. Use GDI shaper by default on XP and
 handle bitmap fonts better. r=jkew

---
 gfx/thebes/public/gfxFont.h                   |   1 +
 gfx/thebes/src/gfxFont.cpp                    |   4 +-
 gfx/thebes/src/gfxGDIFont.cpp                 | 118 +++++++++++++++---
 gfx/thebes/src/gfxGDIFont.h                   |   6 +-
 gfx/thebes/src/gfxGDIFontList.cpp             |  29 ++++-
 gfx/thebes/src/gfxGDIFontList.h               |   4 +
 gfx/thebes/src/gfxGDIShaper.cpp               |   5 +
 .../line-breaking/non-breakable-2-ref.html    |  36 ++++++
 .../line-breaking/non-breakable-2.html        |  36 ++++++
 layout/reftests/line-breaking/reftest.list    |   1 +
 10 files changed, 217 insertions(+), 23 deletions(-)
 create mode 100644 layout/reftests/line-breaking/non-breakable-2-ref.html
 create mode 100644 layout/reftests/line-breaking/non-breakable-2.html

diff --git a/gfx/thebes/public/gfxFont.h b/gfx/thebes/public/gfxFont.h
index a12147bd31b9..acbc33b8cb7e 100644
--- a/gfx/thebes/public/gfxFont.h
+++ b/gfx/thebes/public/gfxFont.h
@@ -210,6 +210,7 @@ public:
         return TestCharacterMap(ch);
     }
 
+    virtual PRBool SkipDuringSystemFallback() { return PR_FALSE; }
     virtual PRBool TestCharacterMap(PRUint32 aCh);
     nsresult InitializeUVSMap();
     PRUint16 GetUVSGlyph(PRUint32 aCh, PRUint32 aVS);
diff --git a/gfx/thebes/src/gfxFont.cpp b/gfx/thebes/src/gfxFont.cpp
index a6e8f8145f1e..5650e3519f65 100644
--- a/gfx/thebes/src/gfxFont.cpp
+++ b/gfx/thebes/src/gfxFont.cpp
@@ -566,7 +566,9 @@ gfxFontFamily::FindFontForChar(FontSearch *aMatchData)
     PRUint32 numFonts = mAvailableFonts.Length();
     for (PRUint32 i = 0; i < numFonts; i++) {
         gfxFontEntry *fe = mAvailableFonts[i];
-        if (!fe)
+
+        // skip certain fonts during system fallback
+        if (!fe || fe->SkipDuringSystemFallback())
             continue;
 
         PRInt32 rank = 0;
diff --git a/gfx/thebes/src/gfxGDIFont.cpp b/gfx/thebes/src/gfxGDIFont.cpp
index 9d9ac4e1c856..d8f4e74a7b5d 100644
--- a/gfx/thebes/src/gfxGDIFont.cpp
+++ b/gfx/thebes/src/gfxGDIFont.cpp
@@ -45,6 +45,7 @@
 #include "gfxHarfBuzzShaper.h"
 #include "gfxWindowsPlatform.h"
 #include "gfxContext.h"
+#include "gfxUnicodeProperties.h"
 
 #include "cairo-win32.h"
 
@@ -100,11 +101,7 @@ gfxGDIFont::~gfxGDIFont()
 void
 gfxGDIFont::CreatePlatformShaper()
 {
-    if (static_cast<GDIFontEntry*>(mFontEntry.get())->mForceGDI) {
-        mPlatformShaper = new gfxGDIShaper(this);
-    } else {
-        mPlatformShaper = new gfxUniscribeShaper(this);
-    }
+    mPlatformShaper = new gfxGDIShaper(this);
 }
 
 gfxFont*
@@ -114,6 +111,31 @@ gfxGDIFont::CopyWithAntialiasOption(AntialiasOption anAAOption)
                           &mStyle, mNeedsBold, anAAOption);
 }
 
+static PRBool
+UseUniscribe(gfxTextRun *aTextRun,
+             const PRUnichar *aString,
+             PRUint32 aRunStart,
+             PRUint32 aRunLength)
+{
+    PRUint32 flags = aTextRun->GetFlags();
+    PRBool useGDI;
+
+    PRBool isXP = (gfxWindowsPlatform::WindowsOSVersion() 
+                       < gfxWindowsPlatform::kWindowsVista);
+
+    // bug 561304 - Uniscribe bug produces bad positioning at certain
+    // font sizes on XP, so default to GDI on XP using logic of 3.6
+
+    useGDI = isXP &&
+             (flags &
+               (gfxTextRunFactory::TEXT_OPTIMIZE_SPEED | 
+                gfxTextRunFactory::TEXT_IS_RTL)
+             ) == gfxTextRunFactory::TEXT_OPTIMIZE_SPEED;
+
+    return !useGDI ||
+        ScriptIsComplex(aString + aRunStart, aRunLength, SIC_COMPLEX) == S_OK;
+}
+
 PRBool
 gfxGDIFont::InitTextRun(gfxContext *aContext,
                         gfxTextRun *aTextRun,
@@ -129,22 +151,84 @@ gfxGDIFont::InitTextRun(gfxContext *aContext,
         NS_WARNING("invalid font! expect incorrect text rendering");
         return PR_FALSE;
     }
-    PRBool ok = gfxFont::InitTextRun(aContext, aTextRun, aString,
-                                     aRunStart, aRunLength, aRunScript);
-    if (!ok && mPlatformShaper) {
-        // shaping failed; if we were using uniscribe, fall back to GDI
-        GDIFontEntry *fe = static_cast<GDIFontEntry*>(GetFontEntry());
-        if (!fe->mForceGDI) {
-            NS_WARNING("uniscribe failed, switching to GDI shaper");
-            fe->mForceGDI = PR_TRUE;
-            mPlatformShaper = new gfxGDIShaper(this);
-            ok = mPlatformShaper->InitTextRun(aContext, aTextRun, aString,
-                                              aRunStart, aRunLength,
+
+    PRBool ok = PR_FALSE;
+
+    if (mHarfBuzzShaper) {
+        if (gfxPlatform::GetPlatform()->UseHarfBuzzLevel() >=
+            gfxUnicodeProperties::ScriptShapingLevel(aRunScript)) {
+            ok = mHarfBuzzShaper->InitTextRun(aContext, aTextRun, aString,
+                                              aRunStart, aRunLength, 
                                               aRunScript);
-            NS_WARN_IF_FALSE(ok, "GDI shaper failed!");
         }
     }
 
+    if (!ok) {
+        GDIFontEntry *fe = static_cast<GDIFontEntry*>(GetFontEntry());
+
+        if (UseUniscribe(aTextRun, aString, aRunStart, aRunLength)
+            && !fe->mForceGDI)
+        {
+            // first try Uniscribe
+            if (!mUniscribeShaper) {
+                mUniscribeShaper = new gfxUniscribeShaper(this);
+            }
+
+            ok = mUniscribeShaper->InitTextRun(aContext, aTextRun, aString,
+                                               aRunStart, aRunLength, 
+                                               aRunScript);
+            if (ok) {
+                return PR_TRUE;
+            }
+
+            // fallback to GDI shaping
+            if (!mPlatformShaper) {
+                CreatePlatformShaper();
+            }
+
+            ok = mPlatformShaper->InitTextRun(aContext, aTextRun, aString,
+                                              aRunStart, aRunLength, 
+                                              aRunScript);
+
+        } else {
+            // first use GDI
+            if (!mPlatformShaper) {
+                CreatePlatformShaper();
+            }
+
+            ok = mPlatformShaper->InitTextRun(aContext, aTextRun, aString,
+                                              aRunStart, aRunLength, 
+                                              aRunScript);
+
+            if (ok) {
+                return PR_TRUE;
+            }
+
+            // first try Uniscribe
+            if (!mUniscribeShaper) {
+                mUniscribeShaper = new gfxUniscribeShaper(this);
+            }
+
+            // use Uniscribe shaping
+            ok = mUniscribeShaper->InitTextRun(aContext, aTextRun, aString,
+                                               aRunStart, aRunLength, 
+                                               aRunScript);
+        }
+
+#if DEBUG
+        if (!ok) {
+            NS_ConvertUTF16toUTF8 name(GetName());
+            char msg[256];
+
+            sprintf(msg, 
+                    "text shaping with both uniscribe and GDI failed for"
+                    " font: %s",
+                    name.get());
+            NS_WARNING(msg);
+        }
+#endif
+    }
+
     return ok;
 }
 
diff --git a/gfx/thebes/src/gfxGDIFont.h b/gfx/thebes/src/gfxGDIFont.h
index 2e71737632b3..4c2cc5563ef1 100644
--- a/gfx/thebes/src/gfxGDIFont.h
+++ b/gfx/thebes/src/gfxGDIFont.h
@@ -59,7 +59,7 @@ public:
 
     virtual ~gfxGDIFont();
 
-    HFONT GetHFONT() const { return mFont; }
+    HFONT GetHFONT() { if (!mMetrics) Initialize(); return mFont; }
 
     gfxFloat GetAdjustedSize() const { return mAdjustedSize; }
 
@@ -96,6 +96,10 @@ protected:
 
     void FillLogFont(LOGFONTW& aLogFont, gfxFloat aSize);
 
+    // mPlatformShaper is used for the GDI shaper, mUniscribeShaper
+    // for the Uniscribe version if needed
+    nsAutoPtr<gfxFontShaper>   mUniscribeShaper;
+
     HFONT                 mFont;
     cairo_font_face_t    *mFontFace;
     cairo_scaled_font_t  *mScaledFont;
diff --git a/gfx/thebes/src/gfxGDIFontList.cpp b/gfx/thebes/src/gfxGDIFontList.cpp
index 5c90f0250ef1..f39e5398d2c8 100644
--- a/gfx/thebes/src/gfxGDIFontList.cpp
+++ b/gfx/thebes/src/gfxGDIFontList.cpp
@@ -205,6 +205,14 @@ GDIFontEntry::GDIFontEntry(const nsAString& aFaceName, gfxWindowsFontType aFontT
 nsresult
 GDIFontEntry::ReadCMAP()
 {
+    // skip non-SFNT fonts completely
+    if (mFontType != GFX_FONT_TYPE_PS_OPENTYPE && 
+        mFontType != GFX_FONT_TYPE_TT_OPENTYPE &&
+        mFontType != GFX_FONT_TYPE_TRUETYPE) 
+    {
+        return NS_ERROR_FAILURE;
+    }
+
     // attempt this once, if errors occur leave a blank cmap
     if (mCmapInitialized)
         return NS_OK;
@@ -290,6 +298,8 @@ GDIFontEntry::FillLogFont(LOGFONTW *aLogFont, PRBool aItalic,
     aLogFont->lfQuality        = (aUseCleartype ? CLEARTYPE_QUALITY : DEFAULT_QUALITY);
 }
 
+#define MISSING_GLYPH 0x1F
+
 PRBool 
 GDIFontEntry::TestCharacterMap(PRUint32 aCh)
 {
@@ -327,13 +337,24 @@ GDIFontEntry::TestCharacterMap(PRUint32 aCh)
         WORD glyph[1];
 
         PRBool hasGlyph = PR_FALSE;
+
+        // Bug 573038 - in some cases GetGlyphIndicesW returns 0xFFFF for a 
+        // missing glyph or 0x1F in other cases to indicate the "invalid" 
+        // glyph.  Map both cases to "not found"
         if (IsType1() || mForceGDI) {
-            // Type1 fonts and uniscribe APIs don't get along.  ScriptGetCMap will return E_HANDLE
-            DWORD ret = GetGlyphIndicesW(dc, str, 1, glyph, GGI_MARK_NONEXISTING_GLYPHS);
-            if (ret != GDI_ERROR && glyph[0] != 0xFFFF)
+            // Type1 fonts and uniscribe APIs don't get along.  
+            // ScriptGetCMap will return E_HANDLE
+            DWORD ret = GetGlyphIndicesW(dc, str, 1, 
+                                         glyph, GGI_MARK_NONEXISTING_GLYPHS);
+            if (ret != GDI_ERROR
+                && glyph[0] != 0xFFFF 
+                && glyph[0] != MISSING_GLYPH)
+            {
                 hasGlyph = PR_TRUE;
+            }
         } else {
-            // ScriptGetCMap works better than GetGlyphIndicesW for things like bitmap/vector fonts
+            // ScriptGetCMap works better than GetGlyphIndicesW 
+            // for things like bitmap/vector fonts
             SCRIPT_CACHE sc = NULL;
             HRESULT rv = ScriptGetCMap(dc, &sc, str, 1, 0, glyph);
             if (rv == S_OK)
diff --git a/gfx/thebes/src/gfxGDIFontList.h b/gfx/thebes/src/gfxGDIFontList.h
index bfa502b51452..761a7786445a 100644
--- a/gfx/thebes/src/gfxGDIFontList.h
+++ b/gfx/thebes/src/gfxGDIFontList.h
@@ -271,6 +271,10 @@ public:
         return mUnicodeRanges.test(range);
     }
 
+    virtual PRBool SkipDuringSystemFallback() { 
+        return !HasCmapTable(); // explicitly skip non-SFNT fonts
+    }
+
     virtual PRBool TestCharacterMap(PRUint32 aCh);
 
     // create a font entry for a font with a given name
diff --git a/gfx/thebes/src/gfxGDIShaper.cpp b/gfx/thebes/src/gfxGDIShaper.cpp
index bfa7cfefc0d1..70ef821e30df 100644
--- a/gfx/thebes/src/gfxGDIShaper.cpp
+++ b/gfx/thebes/src/gfxGDIShaper.cpp
@@ -72,6 +72,11 @@ gfxGDIShaper::InitTextRun(gfxContext *aContext,
     if (ret == GDI_ERROR) {
         return PR_FALSE;
     }
+
+    for (int k = 0; k < aRunLength; k++) {
+        if (glyphs[k] == 0xFFFF)
+            return PR_FALSE;
+    }
  
     SIZE size;
     nsAutoTArray<int,500> partialWidthArray;
diff --git a/layout/reftests/line-breaking/non-breakable-2-ref.html b/layout/reftests/line-breaking/non-breakable-2-ref.html
new file mode 100644
index 000000000000..3e8302de1188
--- /dev/null
+++ b/layout/reftests/line-breaking/non-breakable-2-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<style type="text/css"> body {text-rendering: optimizeLegibility;} p { margin: 5px 1em; width: 0; white-space: nowrap; } p > span { background-color: silver; } </style>
+</head>
+<body>
+
+<p>abcdef&nbsp;abcdef</p>
+<p>abcdef)&nbsp;(abcdef</p>
+<p>abcdef<br>&nbsp;abcdef</p>
+<p><span>abcdef&nbsp;<br>abcdef</span></p>
+<p>abcdef&nbsp;&nbsp;&nbsp;abcdef</p>
+
+<!-- U+2007 is FIGURE SPACE -->
+<p>abcdef&#x2007;abcdef</p>
+<p>abcdef)&#x2007;(abcdef</p>
+<p>abcdef<br>&#x2007;abcdef</p>
+<p><span>abcdef&#x2007;<br>abcdef</span></p>
+<p>abcdef&#x2007;&#x2007;&#x2007;abcdef</p>
+
+<!-- U+2011 is NON-BREAKING HYPHEN -->
+<p>abcdef&#x2011;abcdef</p>
+<p>abcdef)&#x2011;(abcdef</p>
+<p>abcdef<br>&#x2011;abcdef</p>
+<p>abcdef&#x2011;<br>abcdef</p>
+<p>abcdef&#x2011;&#x2011;&#x2011;abcdef</p>
+
+<!-- U+202F is NARROW NO-BREAK SPACE -->
+<p>abcdef&#x202F;abcdef</p>
+<p>abcdef)&#x202F;(abcdef</p>
+<p>abcdef<br>&#x202F;abcdef</p>
+<p><span>abcdef&#x202F;<br>abcdef</span></p>
+<p>abcdef&#x202F;&#x202F;&#x202F;abcdef</p>
+
+</body>
+</html>
diff --git a/layout/reftests/line-breaking/non-breakable-2.html b/layout/reftests/line-breaking/non-breakable-2.html
new file mode 100644
index 000000000000..8bc301bbcb8f
--- /dev/null
+++ b/layout/reftests/line-breaking/non-breakable-2.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<style type="text/css"> body {text-rendering: optimizeLegibility;} p { margin: 5px 1em; width: 0; } p > span { background-color: silver; } </style>
+</head>
+<body>
+
+<p>abcdef&nbsp;abcdef</p>
+<p>abcdef)&nbsp;(abcdef</p>
+<p>abcdef &nbsp;abcdef</p>
+<p><span>abcdef&nbsp; abcdef</span></p>
+<p>abcdef&nbsp;&nbsp;&nbsp;abcdef</p>
+
+<!-- U+2007 is FIGURE SPACE -->
+<p>abcdef&#x2007;abcdef</p>
+<p>abcdef)&#x2007;(abcdef</p>
+<p>abcdef &#x2007;abcdef</p>
+<p><span>abcdef&#x2007; abcdef</span></p>
+<p>abcdef&#x2007;&#x2007;&#x2007;abcdef</p>
+
+<!-- U+2011 is NON-BREAKING HYPHEN -->
+<p>abcdef&#x2011;abcdef</p>
+<p>abcdef)&#x2011;(abcdef</p>
+<p>abcdef &#x2011;abcdef</p>
+<p>abcdef&#x2011; abcdef</p>
+<p>abcdef&#x2011;&#x2011;&#x2011;abcdef</p>
+
+<!-- U+202F is NARROW NO-BREAK SPACE -->
+<p>abcdef&#x202F;abcdef</p>
+<p>abcdef)&#x202F;(abcdef</p>
+<p>abcdef &#x202F;abcdef</p>
+<p><span>abcdef&#x202F; abcdef</span></p>
+<p>abcdef&#x202F;&#x202F;&#x202F;abcdef</p>
+
+</body>
+</html>
diff --git a/layout/reftests/line-breaking/reftest.list b/layout/reftests/line-breaking/reftest.list
index 53728523c8e0..8fb894d28d42 100644
--- a/layout/reftests/line-breaking/reftest.list
+++ b/layout/reftests/line-breaking/reftest.list
@@ -12,6 +12,7 @@ random-if(MOZ_WIDGET_TOOLKIT=="cocoa") == ja-3.html ja-3-ref.html
 == leaders-1.html leaders-1-ref.html
 == markup-src-1.html markup-src-1-ref.html
 == non-breakable-1.html non-breakable-1-ref.html
+== non-breakable-2.html non-breakable-2-ref.html
 == numerics-1.html numerics-1-ref.html
 == parentheses-1.html parentheses-1-ref.html
 == quotationmarks-1.html quotationmarks-1-ref.html

From 5fb0a6803f66fa9612a99dd7966fe6c21ad6bddc Mon Sep 17 00:00:00 2001
From: "Alexander L. Slovesnik" <unghost@mozilla-russia.org>
Date: Fri, 25 Jun 2010 15:55:12 +0200
Subject: [PATCH 016/172] Bug 571129 - contextMenuSearchText should have
 numbered arguments. r=pike

---
 browser/locales/en-US/chrome/browser/browser.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index a80688a1b59a..8da51baa0b81 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -13,7 +13,9 @@ droponhomemsg=Do you want this document to be your new home page?
 
 # context menu strings
 
-contextMenuSearchText=Search %S for "%S"
+# LOCALIZATION NOTE (contextMenuSearchText): %1$S is the search engine,
+# %2$S is the selection string.
+contextMenuSearchText=Search %1$S for "%2$S"
 contextMenuSearchText.accesskey=S
 
 blockImages=Block Images from %S

From 93dec03fb8fe256645157a265d85cf9c6d00c704 Mon Sep 17 00:00:00 2001
From: "hasse@jasajudeju.se" <hasse@jasajudeju.se>
Date: Fri, 25 Jun 2010 15:55:54 +0200
Subject: [PATCH 017/172] Bug 454501 - Fix access keys in the PKCS#11 Device.
 r=kaie

---
 security/manager/pki/resources/content/load_device.xul | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/security/manager/pki/resources/content/load_device.xul b/security/manager/pki/resources/content/load_device.xul
index 408e3edea438..0f38a9b74807 100644
--- a/security/manager/pki/resources/content/load_device.xul
+++ b/security/manager/pki/resources/content/load_device.xul
@@ -57,11 +57,13 @@
 
   <description>&loaddevice.info;</description>
   <hbox align="center">
-    <label value="&loaddevice.modname;" accesskey="&loaddevice.modname.accesskey;"/>
+    <label value="&loaddevice.modname;" accesskey="&loaddevice.modname.accesskey;"
+           control="device_name"/>
     <textbox id="device_name" flex="1" value="&loaddevice.modname.default;"/>
   </hbox>
   <hbox align="center">
-    <label value="&loaddevice.filename;" accesskey="&loaddevice.filename.accesskey;"/>
+    <label value="&loaddevice.filename;" accesskey="&loaddevice.filename.accesskey;"
+           control="device_path"/>
     <textbox id="device_path" flex="1"/>
     <button label="&loaddevice.browse;" flex="1" 
             accesskey="&loaddevice.browse.accesskey;" oncommand="doBrowseFiles();"/>

From d5d387b4f66bf8b3a50610e9bfc8472aeee8cb44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 25 Jun 2010 15:59:05 +0200
Subject: [PATCH 018/172] Bug 569819 - Fix nanojit compilation failure on
 mingw-w64. r=edwsmith

---
 js/src/nanojit/Assembler.cpp | 2 +-
 js/src/nanojit/Native.h      | 2 +-
 js/src/nanojit/NativeX64.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/nanojit/Assembler.cpp b/js/src/nanojit/Assembler.cpp
index 52259976fbb0..af7b06761293 100755
--- a/js/src/nanojit/Assembler.cpp
+++ b/js/src/nanojit/Assembler.cpp
@@ -807,7 +807,7 @@ namespace nanojit
         _inExit = false;
 
         //verbose_only( verbose_outputf("         LIR_xt/xf swapCodeChunks, _nIns is now %08X(%08X), _nExitIns is now %08X(%08X)",_nIns, *_nIns,_nExitIns,*_nExitIns) );
-        verbose_only( verbose_outputf("%010lx:", (unsigned long)jmpTarget);)
+        verbose_only( verbose_outputf("%p:", jmpTarget);)
         verbose_only( verbose_outputf("----------------------------------- ## BEGIN exit block (LIR_xt|LIR_xf)") );
 
 #ifdef NANOJIT_IA32
diff --git a/js/src/nanojit/Native.h b/js/src/nanojit/Native.h
index 2b23c6645d24..ff9b7c80e4b0 100644
--- a/js/src/nanojit/Native.h
+++ b/js/src/nanojit/Native.h
@@ -152,7 +152,7 @@ namespace nanojit {
         #define asm_output(...) do { \
             if (_logc->lcbits & LC_Native) { \
                 outline[0]='\0'; \
-               VMPI_sprintf(outline, "%010lx   ", (unsigned long)_nIns); \
+               VMPI_sprintf(outline, "%p   ", _nIns); \
                 sprintf(&outline[13], ##__VA_ARGS__); \
                 output(); \
             } \
diff --git a/js/src/nanojit/NativeX64.h b/js/src/nanojit/NativeX64.h
index caca6f7907d1..420779da9ea4 100644
--- a/js/src/nanojit/NativeX64.h
+++ b/js/src/nanojit/NativeX64.h
@@ -328,7 +328,7 @@ namespace nanojit
 
     static const RegisterMask GpRegs = 0xffff;
     static const RegisterMask FpRegs = 0xffff0000;
-#ifdef _MSC_VER
+#ifdef _WIN64
     static const RegisterMask SavedRegs = 1<<RBX | 1<<RSI | 1<<RDI | 1<<R12 | 1<<R13 | 1<<R14 | 1<<R15;
     static const int NumSavedRegs = 7; // rbx, rsi, rdi, r12-15
     static const int NumArgRegs = 4;

From 91560b026eadaf556baccc76ec43473466e03a60 Mon Sep 17 00:00:00 2001
From: "Ms2ger@gmail.com" <Ms2ger@gmail.com>
Date: Fri, 25 Jun 2010 15:59:57 +0200
Subject: [PATCH 019/172] Bug 538362 - rename nsIDocument::GetPrimaryShell to
 nsIDocument::GetShell. r=smaug

---
 accessible/src/base/nsAccDocManager.cpp       |  2 +-
 accessible/src/base/nsAccDocManager.h         |  2 +-
 .../src/base/nsAccessibilityService.cpp       |  7 ++--
 accessible/src/base/nsAccessible.cpp          |  2 +-
 accessible/src/base/nsCaretAccessible.cpp     |  2 +-
 accessible/src/base/nsCoreUtils.cpp           |  4 +-
 accessible/src/base/nsCoreUtils.h             |  2 +-
 accessible/src/base/nsDocAccessible.cpp       |  2 +-
 chrome/src/nsChromeRegistry.cpp               |  2 +-
 content/base/public/nsIDocument.h             | 10 +++--
 content/base/src/nsContentSink.cpp            |  8 ++--
 content/base/src/nsContentUtils.cpp           |  4 +-
 content/base/src/nsCopySupport.cpp            |  2 +-
 content/base/src/nsDocument.cpp               | 40 +++++++++----------
 content/base/src/nsFrameLoader.cpp            |  4 +-
 content/base/src/nsGenericElement.cpp         |  8 ++--
 content/base/src/nsImageLoadingContent.cpp    |  2 +-
 content/base/src/nsObjectLoadingContent.cpp   |  4 +-
 .../canvas/src/nsCanvasRenderingContext2D.cpp |  2 +-
 content/events/src/nsEventListenerManager.cpp |  2 +-
 content/events/src/nsEventStateManager.cpp    |  6 +--
 .../html/content/src/nsGenericHTMLElement.cpp |  4 +-
 .../html/content/src/nsHTMLAnchorElement.cpp  |  2 +-
 .../html/content/src/nsHTMLButtonElement.cpp  |  2 +-
 .../html/content/src/nsHTMLInputElement.cpp   |  4 +-
 .../html/content/src/nsTextEditorState.cpp    |  2 +-
 content/html/document/src/nsHTMLDocument.cpp  |  4 +-
 content/html/document/src/nsImageDocument.cpp |  4 +-
 content/html/document/src/nsMediaDocument.cpp |  2 +-
 .../html/document/src/nsPluginDocument.cpp    |  4 +-
 .../mathml/content/src/nsMathMLElement.cpp    |  2 +-
 content/smil/nsSMILAnimationController.cpp    |  2 +-
 content/smil/nsSMILCSSProperty.cpp            |  2 +-
 content/smil/nsSMILCSSValueType.cpp           |  2 +-
 content/smil/nsSMILMappedAttribute.cpp        |  2 +-
 content/svg/content/src/nsSVGElement.cpp      |  4 +-
 content/svg/content/src/nsSVGSVGElement.cpp   |  2 +-
 content/svg/content/src/nsSVGUseElement.cpp   |  8 ++--
 content/xbl/src/nsBindingManager.cpp          |  2 +-
 content/xbl/src/nsXBLResourceLoader.cpp       |  2 +-
 content/xbl/src/nsXBLService.cpp              |  2 +-
 content/xml/document/src/nsXMLContentSink.cpp |  2 +-
 .../xml/document/src/nsXMLPrettyPrinter.cpp   |  2 +-
 content/xtf/src/nsXTFElementWrapper.cpp       |  2 +-
 content/xul/content/src/nsXULElement.cpp      |  6 +--
 .../xul/content/src/nsXULPopupListener.cpp    |  2 +-
 .../document/src/nsXULCommandDispatcher.cpp   |  3 +-
 content/xul/document/src/nsXULDocument.cpp    | 10 ++---
 dom/base/nsDOMClassInfo.cpp                   |  2 +-
 dom/base/nsDOMWindowUtils.cpp                 |  4 +-
 dom/base/nsFocusManager.cpp                   | 10 ++---
 dom/base/nsGlobalWindow.cpp                   |  6 +--
 dom/base/nsHistory.cpp                        |  3 +-
 dom/base/nsLocation.cpp                       |  3 +-
 .../browser/gtk/src/EmbedContextMenuInfo.cpp  |  4 +-
 .../components/find/src/nsWebBrowserFind.cpp  |  4 +-
 .../accessproxy/nsAccessProxy.cpp             |  2 +-
 extensions/widgetutils/src/nsWidgetUtils.cpp  |  2 +-
 layout/base/nsDocumentViewer.cpp              |  6 +--
 layout/base/nsPresShell.cpp                   |  8 ++--
 layout/inspector/src/inDOMUtils.cpp           |  2 +-
 layout/inspector/src/inLayoutUtils.cpp        |  2 +-
 layout/printing/nsPrintEngine.cpp             |  4 +-
 layout/style/nsComputedDOMStyle.cpp           |  6 +--
 layout/style/nsHTMLStyleSheet.cpp             |  6 +--
 layout/style/nsStyleAnimation.cpp             |  2 +-
 layout/svg/base/src/nsSVGEffects.cpp          |  2 +-
 layout/svg/base/src/nsSVGUtils.cpp            |  2 +-
 layout/xul/base/src/nsBoxObject.cpp           |  2 +-
 layout/xul/base/src/nsImageBoxFrame.cpp       |  2 +-
 layout/xul/base/src/nsMenuPopupFrame.cpp      |  2 +-
 layout/xul/base/src/nsXULPopupManager.cpp     |  8 ++--
 layout/xul/base/src/nsXULTooltipListener.cpp  |  4 +-
 modules/plugin/base/src/nsPluginHost.cpp      |  2 +-
 parser/html/nsHtml5TreeBuilderCppSupplement.h |  2 +-
 widget/src/xpwidgets/nsBaseDragService.cpp    |  6 +--
 76 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/accessible/src/base/nsAccDocManager.cpp b/accessible/src/base/nsAccDocManager.cpp
index cce78621e227..216d0d8890ca 100644
--- a/accessible/src/base/nsAccDocManager.cpp
+++ b/accessible/src/base/nsAccDocManager.cpp
@@ -439,7 +439,7 @@ nsAccDocManager::CreateDocOrRootAccessible(nsIDocument *aDocument)
     return nsnull;
 
   // Ignore documents without presshell.
-  nsIPresShell *presShell = aDocument->GetPrimaryShell();
+  nsIPresShell *presShell = aDocument->GetShell();
   if (!presShell)
     return nsnull;
 
diff --git a/accessible/src/base/nsAccDocManager.h b/accessible/src/base/nsAccDocManager.h
index a0d060ad251b..ce13b490fbbb 100644
--- a/accessible/src/base/nsAccDocManager.h
+++ b/accessible/src/base/nsAccDocManager.h
@@ -259,7 +259,7 @@ private:
   printf(", %sactive", aDocument->IsActive() ? "" : "not ");
 
 #define NS_LOG_ACCDOC_DOCPRESSHELL(aDocument)                                  \
-  nsIPresShell *ps = aDocument->GetPrimaryShell();                             \
+  nsIPresShell *ps = aDocument->GetShell();                                    \
   printf("presshell: %p", ps);                                                 \
   nsIScrollableFrame *sf = ps ?                                                \
     ps->GetRootScrollFrameAsScrollableExternal() : nsnull;                     \
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 29ef684f8388..cfb2afc9eadc 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -203,11 +203,12 @@ nsAccessibilityService::GetInfo(nsIFrame *aFrame, nsIWeakReference **aShell,
   if (!document)
     return NS_ERROR_FAILURE;
 
-  NS_ASSERTION(document->GetPrimaryShell(),"Error no shells!");
+  NS_ASSERTION(document->GetShell(),
+               "Error: aFrame's document doesn't have a PresShell!");
 
   // do_GetWR only works into a |nsCOMPtr| :-(
   nsCOMPtr<nsIWeakReference> weakShell =
-    do_GetWeakReference(document->GetPrimaryShell());
+    do_GetWeakReference(document->GetShell());
 
   weakShell.forget(aShell);
   NS_IF_ADDREF(*aContent = content);
@@ -1098,7 +1099,7 @@ nsAccessibilityService::GetContainerAccessible(nsINode *aNode,
   if (!document)
     return nsnull;
 
-  nsIPresShell *presShell = document->GetPrimaryShell();
+  nsIPresShell *presShell = document->GetShell();
   if (!presShell)
     return nsnull;
 
diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index c92a2c9688e4..a3a01f0bc3b1 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -3008,7 +3008,7 @@ PRBool nsAccessible::CheckVisibilityInParentChain(nsIDocument* aDocument, nsIVie
     if (parentDoc != nsnull) {
       nsIContent* content = parentDoc->FindContentForSubDocument(document);
       if (content != nsnull) {
-        nsIPresShell* shell = parentDoc->GetPrimaryShell();
+        nsIPresShell* shell = parentDoc->GetShell();
         if (!shell) {
           return PR_FALSE;
         }
diff --git a/accessible/src/base/nsCaretAccessible.cpp b/accessible/src/base/nsCaretAccessible.cpp
index ee066071dccd..98f39c3ff83c 100644
--- a/accessible/src/base/nsCaretAccessible.cpp
+++ b/accessible/src/base/nsCaretAccessible.cpp
@@ -361,7 +361,7 @@ nsCaretAccessible::GetSelectionControllerForNode(nsIContent *aContent)
   if (!document)
     return nsnull;
 
-  nsIPresShell *presShell = document->GetPrimaryShell();
+  nsIPresShell *presShell = document->GetShell();
   if (!presShell)
     return nsnull;
 
diff --git a/accessible/src/base/nsCoreUtils.cpp b/accessible/src/base/nsCoreUtils.cpp
index 75be318aae75..70cc2fcd07a6 100644
--- a/accessible/src/base/nsCoreUtils.cpp
+++ b/accessible/src/base/nsCoreUtils.cpp
@@ -107,7 +107,7 @@ nsCoreUtils::DispatchClickEvent(nsITreeBoxObject *aTreeBoxObj,
     return;
 
   nsIPresShell *presShell = nsnull;
-  presShell = document->GetPrimaryShell();
+  presShell = document->GetShell();
   if (!presShell)
     return;
 
@@ -219,7 +219,7 @@ nsCoreUtils::GetAccessKeyFor(nsIContent *aContent)
   if (!doc)
     return 0;
 
-  nsCOMPtr<nsIPresShell> presShell = doc->GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> presShell = doc->GetShell();
   if (!presShell)
     return 0;
 
diff --git a/accessible/src/base/nsCoreUtils.h b/accessible/src/base/nsCoreUtils.h
index e9165d831b70..22ed47970401 100644
--- a/accessible/src/base/nsCoreUtils.h
+++ b/accessible/src/base/nsCoreUtils.h
@@ -256,7 +256,7 @@ public:
   static nsIPresShell *GetPresShellFor(nsINode *aNode)
   {
     nsIDocument *document = aNode->GetOwnerDoc();
-    return document ? document->GetPrimaryShell() : nsnull;
+    return document ? document->GetShell() : nsnull;
   }
   static already_AddRefed<nsIWeakReference> GetWeakShellFor(nsINode *aNode)
   {
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index 94282e6e30a7..07f5db9df043 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -673,7 +673,7 @@ void nsDocAccessible::GetBoundsRect(nsRect& aBounds, nsIFrame** aRelativeFrame)
   nsIDocument *parentDoc = nsnull;
 
   while (document) {
-    nsIPresShell *presShell = document->GetPrimaryShell();
+    nsIPresShell *presShell = document->GetShell();
     if (!presShell) {
       return;
     }
diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp
index f6e94497f72d..a9e46f6631f7 100644
--- a/chrome/src/nsChromeRegistry.cpp
+++ b/chrome/src/nsChromeRegistry.cpp
@@ -951,7 +951,7 @@ nsresult nsChromeRegistry::RefreshWindow(nsIDOMWindowInternal* aWindow)
     return NS_OK;
 
   // Deal with the agent sheets first.  Have to do all the style sets by hand.
-  nsCOMPtr<nsIPresShell> shell = document->GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = document->GetShell();
   if (shell) {
     // Reload only the chrome URL agent style sheets.
     nsCOMArray<nsIStyleSheet> agentSheets;
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index 9525550c2865..a60f69fa6062 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -115,9 +115,11 @@ class Element;
 } // namespace dom
 } // namespace mozilla
 
+
+// fbcd570b-dbfa-479b-9bd0-02312129c044
 #define NS_IDOCUMENT_IID      \
-{ 0x3ee6a14b, 0x83b5, 0x4629, \
-  { 0x96, 0x9b, 0xe9, 0x84, 0x7c, 0x57, 0x24, 0x3c } }
+{ 0xfbcd570b, 0xdbfa, 0x479b, \
+  { 0x9b, 0xd0, 0x02, 0x31, 0x21, 0x29, 0xc0, 0x44 } }
 
 // Flag for AddStyleSheet().
 #define NS_STYLESHEET_FROM_CATALOG                (1 << 0)
@@ -437,7 +439,7 @@ public:
                                nsIPresShell** aInstancePtrResult) = 0;
   void DeleteShell() { mPresShell = nsnull; }
 
-  nsIPresShell* GetPrimaryShell() const
+  nsIPresShell* GetShell() const
   {
     return mShellIsHidden ? nsnull : mPresShell;
   }
@@ -1149,7 +1151,7 @@ public:
    */
   void SetDisplayDocument(nsIDocument* aDisplayDocument)
   {
-    NS_PRECONDITION(!GetPrimaryShell() &&
+    NS_PRECONDITION(!GetShell() &&
                     !nsCOMPtr<nsISupports>(GetContainer()) &&
                     !GetWindow() &&
                     !GetScriptGlobalObject(),
diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
index fcb985da86b1..6b3c38726ee3 100644
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -533,7 +533,7 @@ nsContentSink::ProcessHeaderData(nsIAtom* aHeader, const nsAString& aValue,
     // XXXbz don't we want to support this as an HTTP header too?
     nsAutoString value(aValue);
     if (value.LowerCaseEqualsLiteral("no")) {
-      nsIPresShell* shell = mDocument->GetPrimaryShell();
+      nsIPresShell* shell = mDocument->GetShell();
       if (shell) {
         shell->DisableThemeSupport();
       }
@@ -1267,7 +1267,7 @@ nsContentSink::StartLayout(PRBool aIgnorePendingSheets)
   mLastNotificationTime = PR_Now();
 
   mDocument->SetMayStartLayout(PR_TRUE);
-  nsCOMPtr<nsIPresShell> shell = mDocument->GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = mDocument->GetShell();
   // Make sure we don't call InitialReflow() for a shell that has
   // already called it. This can happen when the layout frame for
   // an iframe is constructed *between* the Embed() call for the
@@ -1463,7 +1463,7 @@ nsContentSink::DidProcessATokenImpl()
   }
 
   // Get the current user event time
-  nsIPresShell *shell = mDocument->GetPrimaryShell();
+  nsIPresShell *shell = mDocument->GetShell();
   if (!shell) {
     // If there's no pres shell in the document, return early since
     // we're not laying anything out here.
@@ -1631,7 +1631,7 @@ nsContentSink::WillParseImpl(void)
     return NS_OK;
   }
 
-  nsIPresShell *shell = mDocument->GetPrimaryShell();
+  nsIPresShell *shell = mDocument->GetShell();
   if (!shell) {
     return NS_OK;
   }
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 0ab80be58ccb..d71ea94d1c21 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -2300,7 +2300,7 @@ nsContentUtils::GetContextForContent(nsIContent* aContent)
 {
   nsIDocument* doc = aContent->GetCurrentDoc();
   if (doc) {
-    nsIPresShell *presShell = doc->GetPrimaryShell();
+    nsIPresShell *presShell = doc->GetShell();
     if (presShell) {
       return presShell->GetPresContext();
     }
@@ -6116,7 +6116,7 @@ nsContentUtils::LayerManagerForDocument(nsIDocument *aDoc)
     doc = displayDoc;
   }
 
-  nsIPresShell* shell = doc->GetPrimaryShell();
+  nsIPresShell* shell = doc->GetShell();
   nsCOMPtr<nsISupports> container = doc->GetContainer();
   nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem = do_QueryInterface(container);
   while (!shell && docShellTreeItem) {
diff --git a/content/base/src/nsCopySupport.cpp b/content/base/src/nsCopySupport.cpp
index 98a1439a6b6d..c74cfa9c1b97 100644
--- a/content/base/src/nsCopySupport.cpp
+++ b/content/base/src/nsCopySupport.cpp
@@ -598,7 +598,7 @@ nsCopySupport::GetSelectionForCopy(nsIDocument* aDocument, nsISelection** aSelec
 {
   *aSelection = nsnull;
 
-  nsIPresShell* presShell = aDocument->GetPrimaryShell();
+  nsIPresShell* presShell = aDocument->GetShell();
   if (!presShell)
     return nsnull;
 
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 946b5a2548ff..acc9ad06e27b 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1997,7 +1997,7 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
     sheet->SetOwningDocument(nsnull);
 
     if (sheet->IsApplicable()) {
-      nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+      nsCOMPtr<nsIPresShell> shell = GetShell();
       if (shell) {
         shell->StyleSet()->RemoveStyleSheet(nsStyleSet::eAgentSheet, sheet);
       }
@@ -2018,7 +2018,7 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
   nsStyleSet::sheetType attrSheetType = GetAttrSheetType();
   if (mAttrStyleSheet) {
     // Remove this sheet from all style sets
-    nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = GetShell();
     if (shell) {
       shell->StyleSet()->RemoveStyleSheet(attrSheetType, mAttrStyleSheet);
     }
@@ -2034,7 +2034,7 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
   
   if (mStyleAttrStyleSheet) {
     // Remove this sheet from all style sets
-    nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = GetShell();
     if (shell) {
       shell->StyleSet()->
         RemoveStyleSheet(nsStyleSet::eStyleAttrSheet, mStyleAttrStyleSheet);
@@ -2052,7 +2052,7 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
   mStyleAttrStyleSheet->SetOwningDocument(this);
 
   // Now set up our style sets
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
     FillStyleSet(shell->StyleSet());
   }
@@ -2568,7 +2568,7 @@ nsDocument::ElementFromPointHelper(float aX, float aY,
   if (aFlushLayout)
     FlushPendingNotifications(Flush_Layout);
 
-  nsIPresShell *ps = GetPrimaryShell();
+  nsIPresShell *ps = GetShell();
   NS_ENSURE_STATE(ps);
   nsIFrame *rootFrame = ps->GetRootFrame();
 
@@ -2638,7 +2638,7 @@ nsDocument::NodesFromRectHelper(float aX, float aY,
     FlushPendingNotifications(Flush_Layout);
   }
 
-  nsIPresShell *ps = GetPrimaryShell();
+  nsIPresShell *ps = GetShell();
   NS_ENSURE_STATE(ps);
   nsIFrame *rootFrame = ps->GetRootFrame();
 
@@ -3239,7 +3239,7 @@ nsDocument::GetIndexOfStyleSheet(nsIStyleSheet* aSheet) const
 void
 nsDocument::AddStyleSheetToStyleSets(nsIStyleSheet* aSheet)
 {
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
     shell->StyleSet()->AddDocStyleSheet(aSheet, this);
   }
@@ -3262,7 +3262,7 @@ nsDocument::AddStyleSheet(nsIStyleSheet* aSheet)
 void
 nsDocument::RemoveStyleSheetFromStyleSets(nsIStyleSheet* aSheet)
 {
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
     shell->StyleSet()->RemoveStyleSheet(nsStyleSet::eDocSheet, aSheet);
   }
@@ -3390,7 +3390,7 @@ nsDocument::AddCatalogStyleSheet(nsIStyleSheet* aSheet)
 
   if (aSheet->IsApplicable()) {
     // This is like |AddStyleSheetToStyleSets|, but for an agent sheet.
-    nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = GetShell();
     if (shell) {
       shell->StyleSet()->AppendStyleSheet(nsStyleSet::eAgentSheet, aSheet);
     }
@@ -3859,7 +3859,7 @@ nsDocument::DispatchContentLoadedEvents()
         if (innerEvent) {
           nsEventStatus status = nsEventStatus_eIgnore;
 
-          nsIPresShell *shell = parent->GetPrimaryShell();
+          nsIPresShell *shell = parent->GetShell();
           if (shell) {
             nsRefPtr<nsPresContext> context = shell->GetPresContext();
 
@@ -4947,7 +4947,7 @@ nsDocument::DoNotifyPossibleTitleChange()
   nsAutoString title;
   GetTitle(title);
 
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
     nsCOMPtr<nsISupports> container = shell->GetPresContext()->GetContainer();
     if (container) {
@@ -5221,7 +5221,7 @@ nsDocument::GetAnimationController()
   
   // If there's a presContext then check the animation mode and pause if
   // necessary.
-  nsIPresShell *shell = GetPrimaryShell();
+  nsIPresShell *shell = GetShell();
   if (mAnimationController && shell) {
     nsPresContext *context = shell->GetPresContext();
     if (context &&
@@ -5278,7 +5278,7 @@ nsDocument::SetDir(const nsAString& aDirection)
     if (aDirection == NS_ConvertASCIItoUTF16(elt->mName)) {
       if (GET_BIDI_OPTION_DIRECTION(options) != elt->mValue) {
         SET_BIDI_OPTION_DIRECTION(options, elt->mValue);
-        nsIPresShell *shell = GetPrimaryShell();
+        nsIPresShell *shell = GetShell();
         if (shell) {
           nsPresContext *context = shell->GetPresContext();
           NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
@@ -5959,7 +5959,7 @@ NS_IMETHODIMP
 nsDocument::DispatchEvent(nsIDOMEvent* aEvent, PRBool *_retval)
 {
   // Obtain a presentation context
-  nsIPresShell *shell = GetPrimaryShell();
+  nsIPresShell *shell = GetShell();
   nsRefPtr<nsPresContext> context;
   if (shell) {
      context = shell->GetPresContext();
@@ -6044,7 +6044,7 @@ nsDocument::CreateEvent(const nsAString& aEventType, nsIDOMEvent** aReturn)
 
   // Obtain a presentation shell
 
-  nsIPresShell *shell = GetPrimaryShell();
+  nsIPresShell *shell = GetShell();
 
   nsPresContext *presContext = nsnull;
 
@@ -6114,7 +6114,7 @@ nsDocument::FlushPendingNotifications(mozFlushType aType)
     mParentDocument->FlushPendingNotifications(parentType);
   }
 
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
     shell->FlushPendingNotifications(aType);
   }
@@ -6544,7 +6544,7 @@ nsDocument::CreateElem(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
 PRBool
 nsDocument::IsSafeToFlush() const
 {
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   if (!shell)
     return PR_TRUE;
 
@@ -7371,7 +7371,7 @@ FireOrClearDelayedEvents(nsTArray<nsCOMPtr<nsIDocument> >& aDocuments,
   for (PRUint32 i = 0; i < aDocuments.Length(); ++i) {
     if (!aDocuments[i]->EventHandlingSuppressed()) {
       fm->FireDelayedEvents(aDocuments[i]);
-      nsCOMPtr<nsIPresShell> shell = aDocuments[i]->GetPrimaryShell();
+      nsCOMPtr<nsIPresShell> shell = aDocuments[i]->GetShell();
       if (shell) {
         shell->FireOrClearDelayedEvents(aFireEvents);
       }
@@ -7421,7 +7421,7 @@ nsDocument::GetDocumentState()
     mGotDocumentState |= NS_DOCUMENT_STATE_RTL_LOCALE;
   }
   if (!(mGotDocumentState & NS_DOCUMENT_STATE_WINDOW_INACTIVE)) {
-    nsIPresShell* shell = GetPrimaryShell();
+    nsIPresShell* shell = GetShell();
     if (shell && shell->GetPresContext() &&
         shell->GetPresContext()->IsTopLevelWindowInactive()) {
       mDocumentState |= NS_DOCUMENT_STATE_WINDOW_INACTIVE;
@@ -7586,7 +7586,7 @@ nsDocument::ScrollToRef()
   // http://www.w3.org/TR/html4/appendix/notes.html#h-B.2.1
   NS_ConvertUTF8toUTF16 ref(unescapedRef);
 
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
     // Check an empty string which might be caused by the UTF-8 conversion
     if (!ref.IsEmpty()) {
diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp
index 22bf15b65998..9324c6c4a74e 100644
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -804,8 +804,8 @@ nsFrameLoader::SwapWithOtherLoader(nsFrameLoader* aOther,
   NS_ASSERTION(ourDoc == ourParentDocument, "Unexpected parent document");
   NS_ASSERTION(otherDoc == otherParentDocument, "Unexpected parent document");
 
-  nsIPresShell* ourShell = ourDoc->GetPrimaryShell();
-  nsIPresShell* otherShell = otherDoc->GetPrimaryShell();
+  nsIPresShell* ourShell = ourDoc->GetShell();
+  nsIPresShell* otherShell = otherDoc->GetShell();
   if (!ourShell || !otherShell) {
     return NS_ERROR_NOT_IMPLEMENTED;
   }
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 0345371f1c4d..bd606b117efb 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -847,7 +847,7 @@ nsIContent::GetDesiredIMEState()
   if (!doc) {
     return IME_STATUS_DISABLE;
   }
-  nsIPresShell* ps = doc->GetPrimaryShell();
+  nsIPresShell* ps = doc->GetShell();
   if (!ps) {
     return IME_STATUS_DISABLE;
   }
@@ -3301,7 +3301,7 @@ nsGenericElement::SetSMILOverrideStyleRule(nsICSSStyleRule* aStyleRule,
     // be in a document, if we're clearing animation effects on a target node
     // that's been detached since the previous animation sample.)
     if (doc) {
-      nsCOMPtr<nsIPresShell> shell = doc->GetPrimaryShell();
+      nsCOMPtr<nsIPresShell> shell = doc->GetShell();
       if (shell) {
         shell->RestyleForAnimation(this);
       }
@@ -3621,7 +3621,7 @@ nsINode::doRemoveChildAt(PRUint32 aIndex, PRBool aNotify,
   // A11y needs to be notified of content removals first, so accessibility
   // events can be fired before any changes occur
   if (aNotify && doc) {
-    nsIPresShell *presShell = doc->GetPrimaryShell();
+    nsIPresShell *presShell = doc->GetShell();
     if (presShell && presShell->IsAccessibilityActive()) {
       nsCOMPtr<nsIAccessibilityService> accService = 
         do_GetService("@mozilla.org/accessibilityService;1");
@@ -5378,7 +5378,7 @@ ParseSelectorList(nsINode* aNode,
   // It's not strictly necessary to have a prescontext here, but it's
   // a bit of an optimization for various stuff.
   *aPresContext = nsnull;
-  nsIPresShell* shell = doc->GetPrimaryShell();
+  nsIPresShell* shell = doc->GetShell();
   if (shell) {
     *aPresContext = shell->GetPresContext();
   }
diff --git a/content/base/src/nsImageLoadingContent.cpp b/content/base/src/nsImageLoadingContent.cpp
index 08967acffdd8..05c82cdbbc8e 100644
--- a/content/base/src/nsImageLoadingContent.cpp
+++ b/content/base/src/nsImageLoadingContent.cpp
@@ -291,7 +291,7 @@ nsImageLoadingContent::OnStopDecode(imgIRequest* aRequest,
 
   // We can only do this if we have a presshell
   nsIDocument* doc = GetOurDocument();
-  nsIPresShell* shell = doc ? doc->GetPrimaryShell() : nsnull;
+  nsIPresShell* shell = doc ? doc->GetShell() : nsnull;
   if (shell) {
 
     // We need to figure out whether to kick off decoding
diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp
index 8b8c4649a9a6..791b3ff33cda 100644
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -876,7 +876,7 @@ nsObjectLoadingContent::EnsureInstantiation(nsIPluginInstance** aInstance)
       return NS_OK;
     }
 
-    nsCOMPtr<nsIPresShell> shell = doc->GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = doc->GetShell();
     if (shell) {
       shell->RecreateFramesFor(thisContent);
     }
@@ -1656,7 +1656,7 @@ nsObjectLoadingContent::NotifyStateChanged(ObjectType aOldType,
   } else if (aOldType != mType) {
     // If our state changed, then we already recreated frames
     // Otherwise, need to do that here
-    nsCOMPtr<nsIPresShell> shell = doc->GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = doc->GetShell();
     if (shell) {
       shell->RecreateFramesFor(thisContent);
     }
diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index d7fb50b1e489..944e57167e1e 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -537,7 +537,7 @@ protected:
         do_QueryInterface(static_cast<nsIDOMHTMLCanvasElement*>(mCanvasElement));
       if (content) {
         nsIDocument* ownerDoc = content->GetOwnerDoc();
-        return ownerDoc ? ownerDoc->GetPrimaryShell() : nsnull;
+        return ownerDoc ? ownerDoc->GetShell() : nsnull;
       }
       if (mDocShell) {
         nsCOMPtr<nsIPresShell> shell;
diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp
index ce24e0ece562..c6363a388a95 100644
--- a/content/events/src/nsEventListenerManager.cpp
+++ b/content/events/src/nsEventListenerManager.cpp
@@ -1296,7 +1296,7 @@ nsEventListenerManager::DispatchEvent(nsIDOMEvent* aEvent, PRBool *_retval)
   }
 
   // Obtain a presentation shell
-  nsIPresShell *shell = document->GetPrimaryShell();
+  nsIPresShell *shell = document->GetShell();
   nsRefPtr<nsPresContext> context;
   if (shell) {
     context = shell->GetPresContext();
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 53cd7aa5adc7..c5078cc96b89 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -2203,7 +2203,7 @@ nsEventStateManager::DoDefaultDragStart(nsPresContext* aPresContext,
   if (aIsSelection && !dragImage) {
     nsIDocument* doc = aDragTarget->GetCurrentDoc();
     if (doc) {
-      nsIPresShell* presShell = doc->GetPrimaryShell();
+      nsIPresShell* presShell = doc->GetShell();
       if (presShell) {
         selection = presShell->GetCurrentSelection(
                       nsISelectionController::SELECTION_NORMAL);
@@ -2283,7 +2283,7 @@ nsEventStateManager::GetMarkupDocumentViewer(nsIMarkupDocumentViewer** aMv)
   nsIDocument *doc = GetDocumentFromWindow(contentWindow);
   if(!doc) return NS_ERROR_FAILURE;
 
-  nsIPresShell *presShell = doc->GetPrimaryShell();
+  nsIPresShell *presShell = doc->GetShell();
   if(!presShell) return NS_ERROR_FAILURE;
   nsPresContext *presContext = presShell->GetPresContext();
   if(!presContext) return NS_ERROR_FAILURE;
@@ -3570,7 +3570,7 @@ nsEventStateManager::NotifyMouseOver(nsGUIEvent* aEvent, nsIContent* aContent)
   if (parentDoc) {
     nsIContent *docContent = parentDoc->FindContentForSubDocument(mDocument);
     if (docContent) {
-      nsIPresShell *parentShell = parentDoc->GetPrimaryShell();
+      nsIPresShell *parentShell = parentDoc->GetShell();
       if (parentShell) {
         nsEventStateManager* parentESM =
           static_cast<nsEventStateManager*>
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index b381a4cbe3c7..01b13d991018 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -784,7 +784,7 @@ nsGenericHTMLElement::ScrollIntoView(PRBool aTop, PRUint8 optional_argc)
   }
 
   // Get the presentation shell
-  nsCOMPtr<nsIPresShell> presShell = document->GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> presShell = document->GetShell();
   if (!presShell) {
     return NS_OK;
   }
@@ -1444,7 +1444,7 @@ nsGenericHTMLElement::GetPresContext()
   nsIDocument* doc = GetDocument();
   if (doc) {
     // Get presentation shell 0
-    nsIPresShell *presShell = doc->GetPrimaryShell();
+    nsIPresShell *presShell = doc->GetShell();
     if (presShell) {
       return presShell->GetPresContext();
     }
diff --git a/content/html/content/src/nsHTMLAnchorElement.cpp b/content/html/content/src/nsHTMLAnchorElement.cpp
index 00b0b35a2d9e..e42b30c410c7 100644
--- a/content/html/content/src/nsHTMLAnchorElement.cpp
+++ b/content/html/content/src/nsHTMLAnchorElement.cpp
@@ -255,7 +255,7 @@ nsHTMLAnchorElement::IsHTMLFocusable(PRBool aWithMouse,
   // cannot focus links if there is no link handler
   nsIDocument* doc = GetCurrentDoc();
   if (doc) {
-    nsIPresShell* presShell = doc->GetPrimaryShell();
+    nsIPresShell* presShell = doc->GetShell();
     if (presShell) {
       nsPresContext* presContext = presShell->GetPresContext();
       if (presContext && !presContext->GetLinkHandler()) {
diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp
index 5462ea27238c..d50b4366d205 100644
--- a/content/html/content/src/nsHTMLButtonElement.cpp
+++ b/content/html/content/src/nsHTMLButtonElement.cpp
@@ -241,7 +241,7 @@ nsHTMLButtonElement::Click()
   nsCOMPtr<nsIDocument> doc = GetCurrentDoc();
 
   if (doc) {
-    nsIPresShell *shell = doc->GetPrimaryShell();
+    nsIPresShell *shell = doc->GetShell();
     if (shell) {
       nsRefPtr<nsPresContext> context = shell->GetPresContext();
       if (context) {
diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 351650eb87bf..d34d8a2e23f7 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -1710,7 +1710,7 @@ nsHTMLInputElement::Click()
       return rv;
     }
 
-    nsCOMPtr<nsIPresShell> shell = doc->GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = doc->GetShell();
     nsRefPtr<nsPresContext> context = nsnull;
     if (shell) {
       context = shell->GetPresContext();
@@ -1718,7 +1718,7 @@ nsHTMLInputElement::Click()
 
     if (!context) {
       doc->FlushPendingNotifications(Flush_Frames);
-      shell = doc->GetPrimaryShell();
+      shell = doc->GetShell();
       if (shell) {
         context = shell->GetPresContext();
       }
diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp
index 9fa3cfe72cfc..b1a81b0aed36 100644
--- a/content/html/content/src/nsTextEditorState.cpp
+++ b/content/html/content/src/nsTextEditorState.cpp
@@ -685,7 +685,7 @@ nsTextInputListener::NotifySelectionChanged(nsIDOMDocument* aDoc, nsISelection*
       nsCOMPtr<nsIDocument> doc = content->GetDocument();
       if (doc) 
       {
-        nsCOMPtr<nsIPresShell> presShell = doc->GetPrimaryShell();
+        nsCOMPtr<nsIPresShell> presShell = doc->GetShell();
         if (presShell) 
         {
           nsEventStatus status = nsEventStatus_eIgnore;
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 9b1c83bc615f..d2a363f4d845 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1247,7 +1247,7 @@ nsHTMLDocument::SetCompatibilityMode(nsCompatibility aMode)
 
   mCompatMode = aMode;
   CSSLoader()->SetCompatibilityMode(mCompatMode);
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   if (shell) {
     nsPresContext *pc = shell->GetPresContext();
     if (pc) {
@@ -2158,7 +2158,7 @@ nsHTMLDocument::Close()
     // it be for now, though.  In any case, there's no reason to do
     // this if we have no presshell, since in that case none of the
     // above about reusing frames applies.
-    if (GetPrimaryShell()) {
+    if (GetShell()) {
       FlushPendingNotifications(Flush_Layout);
     }
 
diff --git a/content/html/document/src/nsImageDocument.cpp b/content/html/document/src/nsImageDocument.cpp
index 5c13ed9fec13..58465b171504 100644
--- a/content/html/document/src/nsImageDocument.cpp
+++ b/content/html/document/src/nsImageDocument.cpp
@@ -511,7 +511,7 @@ nsImageDocument::ScrollImageTo(PRInt32 aX, PRInt32 aY, PRBool restoreImage)
     FlushPendingNotifications(Flush_Layout);
   }
 
-  nsIPresShell *shell = GetPrimaryShell();
+  nsIPresShell *shell = GetShell();
   if (!shell)
     return NS_OK;
 
@@ -687,7 +687,7 @@ nsImageDocument::CheckOverflowing(PRBool changeState)
    * presentatation through style resolution is potentially dangerous.
    */
   {
-    nsIPresShell *shell = GetPrimaryShell();
+    nsIPresShell *shell = GetShell();
     if (!shell) {
       return NS_OK;
     }
diff --git a/content/html/document/src/nsMediaDocument.cpp b/content/html/document/src/nsMediaDocument.cpp
index 0ac675b8295b..7c0ef188e2db 100644
--- a/content/html/document/src/nsMediaDocument.cpp
+++ b/content/html/document/src/nsMediaDocument.cpp
@@ -276,7 +276,7 @@ nsresult
 nsMediaDocument::StartLayout()
 {
   mMayStartLayout = PR_TRUE;
-  nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = GetShell();
   // Don't mess with the presshell if someone has already handled
   // its initial reflow.
   if (shell && !shell->DidInitialReflow()) {
diff --git a/content/html/document/src/nsPluginDocument.cpp b/content/html/document/src/nsPluginDocument.cpp
index cb0bf458f794..aea8e4dca7e0 100644
--- a/content/html/document/src/nsPluginDocument.cpp
+++ b/content/html/document/src/nsPluginDocument.cpp
@@ -129,7 +129,7 @@ nsPluginStreamListener::SetupPlugin()
   nsCOMPtr<nsIContent> embed = mPluginDoc->GetPluginContent();
 
   // Now we have a frame for our <embed>, start the load
-  nsCOMPtr<nsIPresShell> shell = mDocument->GetPrimaryShell();
+  nsCOMPtr<nsIPresShell> shell = mDocument->GetShell();
   if (!shell) {
     // Can't instantiate w/o a shell
     mPluginDoc->AllowNormalInstantiation();
@@ -269,7 +269,7 @@ nsPluginDocument::StartDocumentLoad(const char*         aCommand,
 nsresult
 nsPluginDocument::CreateSyntheticPluginDocument()
 {
-  NS_ASSERTION(!GetPrimaryShell() || !GetPrimaryShell()->DidInitialReflow(),
+  NS_ASSERTION(!GetShell() || !GetShell()->DidInitialReflow(),
                "Creating synthetic plugin document content too late");
 
   // make our generic document
diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp
index 5cdfaa663ada..42ac199ea779 100644
--- a/content/mathml/content/src/nsMathMLElement.cpp
+++ b/content/mathml/content/src/nsMathMLElement.cpp
@@ -92,7 +92,7 @@ nsMathMLElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
     // Rebuild style data for the presshell, because style system
     // optimizations may have taken place assuming MathML was disabled.
     // (See nsRuleNode::CheckSpecifiedProperties.)
-    nsCOMPtr<nsIPresShell> shell = aDocument->GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = aDocument->GetShell();
     if (shell) {
       shell->GetPresContext()->PostRebuildAllStyleDataEvent(nsChangeHint(0));
     }
diff --git a/content/smil/nsSMILAnimationController.cpp b/content/smil/nsSMILAnimationController.cpp
index 99a2195e26fc..21310ca2fdd4 100644
--- a/content/smil/nsSMILAnimationController.cpp
+++ b/content/smil/nsSMILAnimationController.cpp
@@ -58,7 +58,7 @@ using namespace mozilla::dom;
 static nsRefreshDriver*
 GetRefreshDriverForDoc(nsIDocument* aDoc)
 {
-  nsIPresShell* shell = aDoc->GetPrimaryShell();
+  nsIPresShell* shell = aDoc->GetShell();
   if (!shell) {
     return nsnull;
   }
diff --git a/content/smil/nsSMILCSSProperty.cpp b/content/smil/nsSMILCSSProperty.cpp
index b9cdf3dd103b..e70b3cb5cad8 100644
--- a/content/smil/nsSMILCSSProperty.cpp
+++ b/content/smil/nsSMILCSSProperty.cpp
@@ -67,7 +67,7 @@ GetCSSComputedValue(nsIContent* aElem,
     return PR_FALSE;
   }
 
-  nsIPresShell* shell = doc->GetPrimaryShell();
+  nsIPresShell* shell = doc->GetShell();
   if (!shell) {
     NS_WARNING("Unable to look up computed style -- no pres shell");
     return PR_FALSE;
diff --git a/content/smil/nsSMILCSSValueType.cpp b/content/smil/nsSMILCSSValueType.cpp
index ebbb3bbce861..8c2f093c431d 100644
--- a/content/smil/nsSMILCSSValueType.cpp
+++ b/content/smil/nsSMILCSSValueType.cpp
@@ -327,7 +327,7 @@ GetPresContextForElement(nsIContent* aElem)
     // See bug 534975.
     return nsnull;
   }
-  nsIPresShell* shell = doc->GetPrimaryShell();
+  nsIPresShell* shell = doc->GetShell();
   return shell ? shell->GetPresContext() : nsnull;
 }
 
diff --git a/content/smil/nsSMILMappedAttribute.cpp b/content/smil/nsSMILMappedAttribute.cpp
index bff6852faa33..0d99a144b19b 100644
--- a/content/smil/nsSMILMappedAttribute.cpp
+++ b/content/smil/nsSMILMappedAttribute.cpp
@@ -157,7 +157,7 @@ nsSMILMappedAttribute::FlushChangesToTargetAttr() const
 
   // Request animation restyle
   if (doc) {
-    nsIPresShell* shell = doc->GetPrimaryShell();
+    nsIPresShell* shell = doc->GetShell();
     if (shell) {
       shell->RestyleForAnimation(mElement);
     }
diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp
index 6fcd2d02affd..c2fbc2c419a2 100644
--- a/content/svg/content/src/nsSVGElement.cpp
+++ b/content/svg/content/src/nsSVGElement.cpp
@@ -758,7 +758,7 @@ nsSVGElement::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
   nsIDocument* doc = GetOwnerDoc();
   NS_ASSERTION(doc, "SVG element without doc");
   if (doc) {
-    nsIPresShell* shell = doc->GetPrimaryShell();
+    nsIPresShell* shell = doc->GetShell();
     nsPresContext* context = shell ? shell->GetPresContext() : nsnull;
     if (context && context->IsProcessingRestyles() &&
         !context->IsProcessingAnimationStyleChange()) {
@@ -766,7 +766,7 @@ nsSVGElement::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
       // want that to happen from SMIL-animated value of mapped attrs, so
       // ignore animated value for now, and request an animation restyle to
       // get our animated value noticed.
-      context->PresShell()->RestyleForAnimation(this);
+      shell->RestyleForAnimation(this);
     } else {
       // Ok, this is an animation restyle -- go ahead and update/walk the
       // animated content style rule.
diff --git a/content/svg/content/src/nsSVGSVGElement.cpp b/content/svg/content/src/nsSVGSVGElement.cpp
index 6a50baaaca07..830ee8193f99 100644
--- a/content/svg/content/src/nsSVGSVGElement.cpp
+++ b/content/svg/content/src/nsSVGSVGElement.cpp
@@ -873,7 +873,7 @@ nsSVGSVGElement::SetCurrentScaleTranslate(float s, float x, float y)
   // now dispatch the appropriate event if we are the root element
   nsIDocument* doc = GetCurrentDoc();
   if (doc) {
-    nsCOMPtr<nsIPresShell> presShell = doc->GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> presShell = doc->GetShell();
     if (presShell && IsRoot()) {
       PRBool scaling = (mPreviousScale != mCurrentScale);
       nsEventStatus status = nsEventStatus_eIgnore;
diff --git a/content/svg/content/src/nsSVGUseElement.cpp b/content/svg/content/src/nsSVGUseElement.cpp
index ed3bc186ecb6..1eae76b8788b 100644
--- a/content/svg/content/src/nsSVGUseElement.cpp
+++ b/content/svg/content/src/nsSVGUseElement.cpp
@@ -451,9 +451,11 @@ void
 nsSVGUseElement::TriggerReclone()
 {
   nsIDocument *doc = GetCurrentDoc();
-  if (!doc) return;
-  nsIPresShell *presShell = doc->GetPrimaryShell();
-  if (!presShell) return;
+  if (!doc)
+    return;
+  nsIPresShell *presShell = doc->GetShell();
+  if (!presShell)
+    return;
   presShell->PostRecreateFramesFor(this);
 }
 
diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp
index 5a06be1ecf65..6473dc0b9141 100644
--- a/content/xbl/src/nsBindingManager.cpp
+++ b/content/xbl/src/nsBindingManager.cpp
@@ -911,7 +911,7 @@ nsBindingManager::RemoveLayeredBinding(nsIContent* aContent, nsIURI* aURL)
   // been removed and style may have changed due to the removal of the
   // anonymous children.
   // XXXbz this should be using the current doc (if any), not the owner doc.
-  nsIPresShell *presShell = doc->GetPrimaryShell();
+  nsIPresShell *presShell = doc->GetShell();
   NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
 
   return presShell->RecreateFramesFor(aContent);;
diff --git a/content/xbl/src/nsXBLResourceLoader.cpp b/content/xbl/src/nsXBLResourceLoader.cpp
index 6eba9bc8bc32..1c04cc358fb4 100644
--- a/content/xbl/src/nsXBLResourceLoader.cpp
+++ b/content/xbl/src/nsXBLResourceLoader.cpp
@@ -263,7 +263,7 @@ nsXBLResourceLoader::NotifyBoundElements()
         // has a primary frame and whether it's in the undisplayed map
         // before sending a ContentInserted notification, or bad things
         // will happen.
-        nsIPresShell *shell = doc->GetPrimaryShell();
+        nsIPresShell *shell = doc->GetShell();
         if (shell) {
           nsIFrame* childFrame = content->GetPrimaryFrame();
           if (!childFrame) {
diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp
index 27cbb4f0ef99..8b51fc51716d 100644
--- a/content/xbl/src/nsXBLService.cpp
+++ b/content/xbl/src/nsXBLService.cpp
@@ -214,7 +214,7 @@ public:
     // has a primary frame and whether it's in the undisplayed map
     // before sending a ContentInserted notification, or bad things
     // will happen.
-    nsIPresShell *shell = doc->GetPrimaryShell();
+    nsIPresShell *shell = doc->GetShell();
     if (shell) {
       nsIFrame* childFrame = mBoundElement->GetPrimaryFrame();
       if (!childFrame) {
diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp
index baed6ed41188..2706ecd88a09 100644
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -1176,7 +1176,7 @@ nsXMLContentSink::HandleEndElement(const PRUnichar *aName,
     // For that matter, do we really want to try getting the prescontext?  Does
     // this event ever want one?
     nsRefPtr<nsPresContext> ctx;
-    nsCOMPtr<nsIPresShell> shell = mDocument->GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = mDocument->GetShell();
     if (shell) {
       ctx = shell->GetPresContext();
     }
diff --git a/content/xml/document/src/nsXMLPrettyPrinter.cpp b/content/xml/document/src/nsXMLPrettyPrinter.cpp
index 59ee59d9b8de..adc10b120d01 100644
--- a/content/xml/document/src/nsXMLPrettyPrinter.cpp
+++ b/content/xml/document/src/nsXMLPrettyPrinter.cpp
@@ -77,7 +77,7 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument,
     *aDidPrettyPrint = PR_FALSE;
     
     // Check for iframe with display:none. Such iframes don't have presshells
-    if (!aDocument->GetPrimaryShell()) {
+    if (!aDocument->GetShell()) {
         return NS_OK;
     }
 
diff --git a/content/xtf/src/nsXTFElementWrapper.cpp b/content/xtf/src/nsXTFElementWrapper.cpp
index b83090296f81..21a8cf4fdf16 100644
--- a/content/xtf/src/nsXTFElementWrapper.cpp
+++ b/content/xtf/src/nsXTFElementWrapper.cpp
@@ -961,7 +961,7 @@ nsXTFElementWrapper::RegUnregAccessKey(PRBool aDoReg)
     return;
 
   // Get presentation shell 0
-  nsIPresShell *presShell = doc->GetPrimaryShell();
+  nsIPresShell *presShell = doc->GetShell();
   if (!presShell)
     return;
 
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 5254148f848c..1d71c0ce069e 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -1029,7 +1029,7 @@ nsXULElement::UnregisterAccessKey(const nsAString& aOldValue)
     //
     nsIDocument* doc = GetCurrentDoc();
     if (doc && !aOldValue.IsEmpty()) {
-        nsIPresShell *shell = doc->GetPrimaryShell();
+        nsIPresShell *shell = doc->GetShell();
 
         if (shell) {
             nsIContent *content = this;
@@ -2100,7 +2100,7 @@ nsXULElement::ClickWithInputSource(PRUint16 aInputSource)
 
     nsCOMPtr<nsIDocument> doc = GetCurrentDoc(); // Strong just in case
     if (doc) {
-        nsCOMPtr<nsIPresShell> shell = doc->GetPrimaryShell();
+        nsCOMPtr<nsIPresShell> shell = doc->GetShell();
         if (shell) {
             // strong ref to PresContext so events don't destroy it
             nsRefPtr<nsPresContext> context = shell->GetPresContext();
@@ -2356,7 +2356,7 @@ nsXULElement::HideWindowChrome(PRBool aShouldHide)
     if (!doc->IsRootDisplayDocument())
       return NS_OK;
 
-    nsIPresShell *shell = doc->GetPrimaryShell();
+    nsIPresShell *shell = doc->GetShell();
 
     if (shell) {
         nsIFrame* frame = GetPrimaryFrame();
diff --git a/content/xul/content/src/nsXULPopupListener.cpp b/content/xul/content/src/nsXULPopupListener.cpp
index c2d171d6b544..083a3451dea8 100644
--- a/content/xul/content/src/nsXULPopupListener.cpp
+++ b/content/xul/content/src/nsXULPopupListener.cpp
@@ -269,7 +269,7 @@ nsXULPopupListener::FireFocusOnTargetContent(nsIDOMNode* aTargetNode)
     nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
 
     // Get nsIDOMElement for targetNode
-    nsIPresShell *shell = doc->GetPrimaryShell();
+    nsIPresShell *shell = doc->GetShell();
     if (!shell)
       return NS_ERROR_FAILURE;
 
diff --git a/content/xul/document/src/nsXULCommandDispatcher.cpp b/content/xul/document/src/nsXULCommandDispatcher.cpp
index 9b4b50dd7fa6..994e9f500114 100644
--- a/content/xul/document/src/nsXULCommandDispatcher.cpp
+++ b/content/xul/document/src/nsXULCommandDispatcher.cpp
@@ -436,9 +436,8 @@ nsXULCommandDispatcher::UpdateCommands(const nsAString& aEventName)
     }
 #endif
 
-    nsCOMPtr<nsIPresShell> shell = document->GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = document->GetShell();
     if (shell) {
-
       // Retrieve the context in which our DOM event will fire.
       nsRefPtr<nsPresContext> context = shell->GetPresContext();
 
diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp
index e090fe51bb16..c04f36486648 100644
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -962,9 +962,8 @@ nsXULDocument::ExecuteOnBroadcastHandlerFor(nsIContent* aBroadcaster,
         // |onbroadcast| event handler
         nsEvent event(PR_TRUE, NS_XUL_BROADCAST);
 
-        nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+        nsCOMPtr<nsIPresShell> shell = GetShell();
         if (shell) {
-
             nsRefPtr<nsPresContext> aPresContext = shell->GetPresContext();
 
             // Handle the DOM event
@@ -1474,7 +1473,7 @@ nsXULDocument::GetViewportSize(PRInt32* aWidth,
 
     FlushPendingNotifications(Flush_Layout);
 
-    nsIPresShell *shell = GetPrimaryShell();
+    nsIPresShell *shell = GetShell();
     NS_ENSURE_TRUE(shell, NS_ERROR_FAILURE);
 
     nsIFrame* frame = shell->GetRootFrame();
@@ -1988,9 +1987,8 @@ nsresult
 nsXULDocument::StartLayout(void)
 {
     mMayStartLayout = PR_TRUE;
-    nsCOMPtr<nsIPresShell> shell = GetPrimaryShell();
+    nsCOMPtr<nsIPresShell> shell = GetShell();
     if (shell) {
-
         // Resize-reflow this time
         nsPresContext *cx = shell->GetPresContext();
         NS_ASSERTION(cx != nsnull, "no pres context");
@@ -3896,7 +3894,7 @@ nsXULDocument::OverlayForwardReference::Resolve()
     nsresult rv;
     nsCOMPtr<nsIContent> target;
 
-    nsIPresShell *shell = mDocument->GetPrimaryShell();
+    nsIPresShell *shell = mDocument->GetShell();
     PRBool notify = shell && shell->DidInitialReflow();
 
     nsAutoString id;
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 1d96bdcb02a5..c49c67f24e34 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -7845,7 +7845,7 @@ GetBindingURL(Element *aElement, nsIDocument *aDocument,
   // If we have a frame the frame has already loaded the binding.  And
   // otherwise, don't do anything else here unless we're dealing with
   // XUL.
-  nsIPresShell *shell = aDocument->GetPrimaryShell();
+  nsIPresShell *shell = aDocument->GetShell();
   if (!shell || aElement->GetPrimaryFrame() || !aElement->IsXUL()) {
     *aResult = nsnull;
 
diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp
index d2429611aed0..ab902847e3c7 100644
--- a/dom/base/nsDOMWindowUtils.cpp
+++ b/dom/base/nsDOMWindowUtils.cpp
@@ -478,7 +478,7 @@ nsDOMWindowUtils::GetWidgetForElement(nsIDOMElement* aElement)
 
   nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
   nsIDocument* doc = content->GetCurrentDoc();
-  nsIPresShell* presShell = doc ? doc->GetPrimaryShell() : nsnull;
+  nsIPresShell* presShell = doc ? doc->GetShell() : nsnull;
 
   if (presShell) {
     nsIFrame* frame = content->GetPrimaryFrame();
@@ -784,7 +784,7 @@ nsDOMWindowUtils::GetScrollXY(PRBool aFlushLayout, PRInt32* aScrollX, PRInt32* a
   }
 
   nsPoint scrollPos(0,0);
-  nsIPresShell *presShell = doc->GetPrimaryShell();
+  nsIPresShell *presShell = doc->GetShell();
   if (presShell) {
     nsIScrollableFrame* sf = presShell->GetRootScrollFrameAsScrollable();
     if (sf) {
diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp
index bedf805511cf..c7af4b87d992 100644
--- a/dom/base/nsFocusManager.cpp
+++ b/dom/base/nsFocusManager.cpp
@@ -1335,7 +1335,7 @@ nsFocusManager::CheckIfFocusable(nsIContent* aContent, PRUint32 aFlags)
   if (doc)
     doc->FlushPendingNotifications(Flush_Frames);
 
-  nsIPresShell *shell = doc->GetPrimaryShell();
+  nsIPresShell *shell = doc->GetShell();
   if (!shell)
     return nsnull;
 
@@ -2179,7 +2179,7 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
   nsIContent* rootContent = doc->GetRootElement();
   NS_ENSURE_TRUE(rootContent, NS_OK);
 
-  nsIPresShell *presShell = doc->GetPrimaryShell();
+  nsIPresShell *presShell = doc->GetShell();
   NS_ENSURE_TRUE(presShell, NS_OK);
 
   if (aType == MOVEFOCUS_FIRST) {
@@ -2399,7 +2399,7 @@ nsFocusManager::DetermineElementToMoveFocus(nsPIDOMWindow* aWindow,
       doc = do_QueryInterface(piParentWindow->GetExtantDocument());
       NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
 
-      presShell = doc->GetPrimaryShell();
+      presShell = doc->GetShell();
 
       rootContent = doc->GetRootElement();
       startContent = do_QueryInterface(piWindow->GetFrameElementInternal());
@@ -2613,7 +2613,7 @@ nsFocusManager::GetNextTabbableContent(nsIPresShell* aPresShell,
                 }
               }
               Element* rootElement = subdoc->GetRootElement();
-              nsIPresShell* subShell = subdoc->GetPrimaryShell();
+              nsIPresShell* subShell = subdoc->GetShell();
               if (rootElement && subShell) {
                 rv = GetNextTabbableContent(subShell, rootElement,
                                             aOriginalStartContent, rootElement,
@@ -2977,7 +2977,7 @@ nsFocusManager::GetNextTabbableDocument(PRBool aForward)
         // that we always go forward and not back here.
         nsCOMPtr<nsIContent> nextFocus;
         Element* rootElement = doc->GetRootElement();
-        nsIPresShell* presShell = doc->GetPrimaryShell();
+        nsIPresShell* presShell = doc->GetShell();
         if (presShell) {
           nsresult rv = GetNextTabbableContent(presShell, rootElement,
                                                nsnull, rootElement,
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index f9b41b554cf5..63f3f8a789e7 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -5519,7 +5519,7 @@ PostMessageEvent::Run()
   // happen because then untrusted content can call postMessage on a chrome
   // window if it can get a reference to it.
 
-  nsIPresShell *shell = targetWindow->mDoc->GetPrimaryShell();
+  nsIPresShell *shell = targetWindow->mDoc->GetShell();
   nsRefPtr<nsPresContext> presContext;
   if (shell)
     presContext = shell->GetPresContext();
@@ -6703,7 +6703,7 @@ nsGlobalWindow::DispatchEvent(nsIDOMEvent* aEvent, PRBool* _retval)
   }
 
   // Obtain a presentation shell
-  nsIPresShell *shell = mDoc->GetPrimaryShell();
+  nsIPresShell *shell = mDoc->GetShell();
   nsRefPtr<nsPresContext> presContext;
   if (shell) {
     // Retrieve the context
@@ -7299,7 +7299,7 @@ nsGlobalWindow::DispatchSyncPopState()
   }
 
   // Obtain a presentation shell for use in creating a popstate event.
-  nsIPresShell *shell = mDoc->GetPrimaryShell();
+  nsIPresShell *shell = mDoc->GetShell();
   nsRefPtr<nsPresContext> presContext;
   if (shell) {
     presContext = shell->GetPresContext();
diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp
index 699ef686620a..984edfce1bf0 100644
--- a/dom/base/nsHistory.cpp
+++ b/dom/base/nsHistory.cpp
@@ -247,8 +247,7 @@ nsHistory::Go(PRInt32 aDelta)
 
       nsIPresShell *shell;
       nsPresContext *pcx;
-      if (doc && (shell = doc->GetPrimaryShell()) &&
-          (pcx = shell->GetPresContext())) {
+      if (doc && (shell = doc->GetShell()) && (pcx = shell->GetPresContext())) {
         pcx->RebuildAllStyleData(NS_STYLE_HINT_REFLOW);
       }
 
diff --git a/dom/base/nsLocation.cpp b/dom/base/nsLocation.cpp
index 2d45520be51d..fb2ecdb760ad 100644
--- a/dom/base/nsLocation.cpp
+++ b/dom/base/nsLocation.cpp
@@ -794,8 +794,7 @@ nsLocation::Reload(PRBool aForceget)
 
     nsIPresShell *shell;
     nsPresContext *pcx;
-    if (doc && (shell = doc->GetPrimaryShell()) &&
-        (pcx = shell->GetPresContext())) {
+    if (doc && (shell = doc->GetShell()) && (pcx = shell->GetPresContext())) {
       pcx->RebuildAllStyleData(NS_STYLE_HINT_REFLOW);
     }
 
diff --git a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
index 789e5d08acc3..37f2ab469f4c 100644
--- a/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+++ b/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
@@ -161,7 +161,7 @@ EmbedContextMenuInfo::GetFormControlType(nsIDOMEvent* aEvent)
     nsCOMPtr<nsIDocument> doc = do_QueryInterface(mCtxDocument);
     if (!doc)
       return NS_OK;
-    nsIPresShell *presShell = doc->GetPrimaryShell();
+    nsIPresShell *presShell = doc->GetShell();
     if (!presShell)
       return NS_OK;
     nsCOMPtr<nsIContent> tgContent = do_QueryInterface(mEventTarget);
@@ -586,7 +586,7 @@ EmbedContextMenuInfo::UpdateContextData(nsIDOMEvent *aDOMEvent)
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(mCtxDocument);
   if (!doc)
     return NS_OK;
-  nsIPresShell *presShell = doc->GetPrimaryShell();
+  nsIPresShell *presShell = doc->GetShell();
   if (!presShell)
     return NS_OK;
   nsCOMPtr<nsIContent> tgContent = do_QueryInterface(mEventTarget);
diff --git a/embedding/components/find/src/nsWebBrowserFind.cpp b/embedding/components/find/src/nsWebBrowserFind.cpp
index 5f99c92acdea..b43c36b17443 100644
--- a/embedding/components/find/src/nsWebBrowserFind.cpp
+++ b/embedding/components/find/src/nsWebBrowserFind.cpp
@@ -395,7 +395,7 @@ void nsWebBrowserFind::SetSelectionAndScroll(nsIDOMWindow* aWindow,
   if (!domDoc) return;
 
   nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
-  nsIPresShell* presShell = doc->GetPrimaryShell();
+  nsIPresShell* presShell = doc->GetShell();
   if (!presShell) return;
 
   nsCOMPtr<nsIDOMNode> node;
@@ -834,7 +834,7 @@ nsWebBrowserFind::GetFrameSelection(nsIDOMWindow* aWindow,
     if (!domDoc) return;
 
     nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
-    nsIPresShell* presShell = doc->GetPrimaryShell();
+    nsIPresShell* presShell = doc->GetShell();
     if (!presShell) return;
 
     // text input controls have their independent selection controllers
diff --git a/extensions/access-builtin/accessproxy/nsAccessProxy.cpp b/extensions/access-builtin/accessproxy/nsAccessProxy.cpp
index 0fe19ebe29ca..e58ccdac8a1d 100644
--- a/extensions/access-builtin/accessproxy/nsAccessProxy.cpp
+++ b/extensions/access-builtin/accessproxy/nsAccessProxy.cpp
@@ -141,7 +141,7 @@ NS_IMETHODIMP nsAccessProxy::HandleEvent(nsIDOMEvent* aEvent)
   if (domDoc) {
     doc = do_QueryInterface(domDoc);
     if (doc) {
-      presShell = doc->GetPrimaryShell();
+      presShell = doc->GetShell();
     }
   }
   //return  NS_OK;
diff --git a/extensions/widgetutils/src/nsWidgetUtils.cpp b/extensions/widgetutils/src/nsWidgetUtils.cpp
index c768ffafe7e6..07a12ec6f0f2 100644
--- a/extensions/widgetutils/src/nsWidgetUtils.cpp
+++ b/extensions/widgetutils/src/nsWidgetUtils.cpp
@@ -211,7 +211,7 @@ nsWidgetUtils::UpdateFromEvent(nsIDOMEvent *aDOMEvent)
   doc = do_QueryInterface(domDoc);
   if (!doc) return NS_OK;
   // the only case where there could be more shells in printpreview
-  nsIPresShell *shell = doc->GetPrimaryShell();
+  nsIPresShell *shell = doc->GetShell();
   NS_ENSURE_TRUE(shell, NS_ERROR_FAILURE);
   mViewManager = shell->GetViewManager();
   NS_ENSURE_TRUE(mViewManager, NS_ERROR_FAILURE);
diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index 671623d86b7b..d6a58e03d576 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -2439,7 +2439,7 @@ DocumentViewerImpl::CreateDeviceContext(nsIView* aContainerView)
   if (doc) {
     NS_ASSERTION(!aContainerView, "External resource document embedded somewhere?");
     // We want to use our display document's device context if possible
-    nsIPresShell* shell = doc->GetPrimaryShell();
+    nsIPresShell* shell = doc->GetShell();
     if (shell) {
       nsPresContext* ctx = shell->GetPresContext();
       if (ctx) {
@@ -2763,7 +2763,7 @@ static PRBool
 SetExtResourceTextZoom(nsIDocument* aDocument, void* aClosure)
 {
   // Would it be better to enumerate external resource viewers instead?
-  nsIPresShell* shell = aDocument->GetPrimaryShell();
+  nsIPresShell* shell = aDocument->GetShell();
   if (shell) {
     nsPresContext* ctxt = shell->GetPresContext();
     if (ctxt) {
@@ -2779,7 +2779,7 @@ static PRBool
 SetExtResourceFullZoom(nsIDocument* aDocument, void* aClosure)
 {
   // Would it be better to enumerate external resource viewers instead?
-  nsIPresShell* shell = aDocument->GetPrimaryShell();
+  nsIPresShell* shell = aDocument->GetShell();
   if (shell) {
     nsPresContext* ctxt = shell->GetPresContext();
     if (ctxt) {
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index d4602e8d3564..dc30f1103f90 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -1912,7 +1912,7 @@ PresShell::Destroy()
   // hierarchy is torn down to avoid finding deleted frames through
   // this presshell while the frames are being torn down
   if (mDocument) {
-    NS_ASSERTION(mDocument->GetPrimaryShell() == this, "Wrong shell?");
+    NS_ASSERTION(mDocument->GetShell() == this, "Wrong shell?");
     mDocument->DeleteShell();
   }
 
@@ -6137,7 +6137,7 @@ PresShell::HandleEvent(nsIView         *aView,
     }
 
     if (retargetEventDoc) {
-      nsIPresShell* presShell = retargetEventDoc->GetPrimaryShell();
+      nsIPresShell* presShell = retargetEventDoc->GetShell();
       if (!presShell)
         return NS_OK;
 
@@ -7134,7 +7134,7 @@ FreezeElement(nsIContent *aContent, void * /* unused */)
 static PRBool
 FreezeSubDocument(nsIDocument *aDocument, void *aData)
 {
-  nsIPresShell *shell = aDocument->GetPrimaryShell();
+  nsIPresShell *shell = aDocument->GetShell();
   if (shell)
     shell->Freeze();
 
@@ -7199,7 +7199,7 @@ ThawElement(nsIContent *aContent, void *aShell)
 static PRBool
 ThawSubDocument(nsIDocument *aDocument, void *aData)
 {
-  nsIPresShell *shell = aDocument->GetPrimaryShell();
+  nsIPresShell *shell = aDocument->GetShell();
   if (shell)
     shell->Thaw();
 
diff --git a/layout/inspector/src/inDOMUtils.cpp b/layout/inspector/src/inDOMUtils.cpp
index 6320fc72dbd6..038b8d65298e 100644
--- a/layout/inspector/src/inDOMUtils.cpp
+++ b/layout/inspector/src/inDOMUtils.cpp
@@ -280,7 +280,7 @@ inDOMUtils::GetRuleNodeForContent(nsIContent* aContent,
   nsIDocument* doc = aContent->GetDocument();
   NS_ENSURE_TRUE(doc, NS_ERROR_UNEXPECTED);
 
-  nsIPresShell *presShell = doc->GetPrimaryShell();
+  nsIPresShell *presShell = doc->GetShell();
   NS_ENSURE_TRUE(presShell, NS_ERROR_UNEXPECTED);
 
   nsPresContext *presContext = presShell->GetPresContext();
diff --git a/layout/inspector/src/inLayoutUtils.cpp b/layout/inspector/src/inLayoutUtils.cpp
index 0e6b0b929260..9c31fad73fed 100644
--- a/layout/inspector/src/inLayoutUtils.cpp
+++ b/layout/inspector/src/inLayoutUtils.cpp
@@ -104,7 +104,7 @@ inLayoutUtils::GetEventStateManagerFor(nsIDOMElement *aElement)
     return nsnull;
   }
 
-  nsIPresShell *shell = doc->GetPrimaryShell();
+  nsIPresShell *shell = doc->GetShell();
   if (!shell)
     return nsnull;
 
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index 8c1cbec16d39..feacc45ccf8f 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -2241,8 +2241,8 @@ static nsresult CloneRangeToSelection(nsIDOMRange* aRange,
 
 static nsresult CloneSelection(nsIDocument* aOrigDoc, nsIDocument* aDoc)
 {
-  nsIPresShell* origShell = aOrigDoc->GetPrimaryShell();
-  nsIPresShell* shell = aDoc->GetPrimaryShell();
+  nsIPresShell* origShell = aOrigDoc->GetShell();
+  nsIPresShell* shell = aDoc->GetShell();
   NS_ENSURE_STATE(origShell && shell);
 
   nsCOMPtr<nsISelection> origSelection =
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index 7345eb0d59c2..1912e055c10c 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -408,7 +408,7 @@ nsComputedDOMStyle::GetPresShellForContent(nsIContent* aContent)
   if (!currentDoc)
     return nsnull;
 
-  return currentDoc->GetPrimaryShell();
+  return currentDoc->GetShell();
 }
 
 NS_IMETHODIMP
@@ -455,7 +455,7 @@ nsComputedDOMStyle::GetPropertyCSSValue(const nsAString& aPropertyName,
   mFlushedPendingReflows = propEntry->mNeedsLayoutFlush;
 #endif
 
-  mPresShell = document->GetPrimaryShell();
+  mPresShell = document->GetShell();
   NS_ENSURE_TRUE(mPresShell && mPresShell->GetPresContext(),
                  NS_ERROR_NOT_AVAILABLE);
 
@@ -1179,7 +1179,7 @@ nsComputedDOMStyle::GetFontFamily(nsIDOMCSSValue** aValue)
 
   nsCOMPtr<nsIDocument> doc = do_QueryReferent(mDocumentWeak);
   NS_ASSERTION(doc, "document is required");
-  nsIPresShell* presShell = doc->GetPrimaryShell();
+  nsIPresShell* presShell = doc->GetShell();
   NS_ASSERTION(presShell, "pres shell is required");
   nsPresContext *presContext = presShell->GetPresContext();
   NS_ASSERTION(presContext, "pres context is required");
diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp
index c25c7d7665a9..699fe5ba33a9 100644
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -459,7 +459,7 @@ nsresult
 nsHTMLStyleSheet::ImplLinkColorSetter(nsRefPtr<HTMLColorRule>& aRule, nscolor aColor)
 {
   if (aRule && aRule->mColor == aColor) {
-      return NS_OK;
+    return NS_OK;
   }
 
   aRule = new HTMLColorRule();
@@ -469,10 +469,10 @@ nsHTMLStyleSheet::ImplLinkColorSetter(nsRefPtr<HTMLColorRule>& aRule, nscolor aC
   aRule->mColor = aColor;
   // Now make sure we restyle any links that might need it.  This
   // shouldn't happen often, so just rebuilding everything is ok.
-  if (mDocument && mDocument->GetPrimaryShell()) {
+  if (mDocument && mDocument->GetShell()) {
     Element* root = mDocument->GetRootElement();
     if (root) {
-      mDocument->GetPrimaryShell()->FrameConstructor()->
+      mDocument->GetShell()->FrameConstructor()->
         PostRestyleEvent(root, eRestyle_Subtree, NS_STYLE_HINT_NONE);
     }
   }
diff --git a/layout/style/nsStyleAnimation.cpp b/layout/style/nsStyleAnimation.cpp
index c2b88ffd46b6..6db227b8744b 100644
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@@ -981,7 +981,7 @@ already_AddRefed<nsStyleContext>
 LookupStyleContext(nsIContent* aElement)
 {
   nsIDocument* doc = aElement->GetCurrentDoc();
-  nsIPresShell* shell = doc->GetPrimaryShell();
+  nsIPresShell* shell = doc->GetShell();
   if (!shell) {
     return nsnull;
   }
diff --git a/layout/svg/base/src/nsSVGEffects.cpp b/layout/svg/base/src/nsSVGEffects.cpp
index d43d1ff878e5..da441e7c4716 100644
--- a/layout/svg/base/src/nsSVGEffects.cpp
+++ b/layout/svg/base/src/nsSVGEffects.cpp
@@ -115,7 +115,7 @@ nsSVGRenderingObserver::GetReferencedFrame()
 
   if (mElement.get()) {
     nsIDocument* doc = mElement.get()->GetCurrentDoc();
-    nsIPresShell* shell = doc ? doc->GetPrimaryShell() : nsnull;
+    nsIPresShell* shell = doc ? doc->GetShell() : nsnull;
     if (shell && !shell->FrameManager()->IsDestroyingFrames()) {
       nsIFrame* frame = mElement.get()->GetPrimaryFrame();
       if (frame) {
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index c15e47f87cfa..60e532a612ac 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -560,7 +560,7 @@ nsSVGUtils::GetCTM(nsSVGElement *aElement, PRBool aScreenCTM)
   // content that we've hit may itself be inside an SVG foreignObject higher up
   float x = 0.0f, y = 0.0f;
   if (currentDoc && element->NodeInfo()->Equals(nsGkAtoms::svg, kNameSpaceID_SVG)) {
-    nsIPresShell *presShell = currentDoc->GetPrimaryShell();
+    nsIPresShell *presShell = currentDoc->GetShell();
     if (presShell) {
       nsIFrame* frame = element->GetPrimaryFrame();
       nsIFrame* ancestorFrame = presShell->GetRootFrame();
diff --git a/layout/xul/base/src/nsBoxObject.cpp b/layout/xul/base/src/nsBoxObject.cpp
index 1896f6a8db9f..5f75b84b9b65 100644
--- a/layout/xul/base/src/nsBoxObject.cpp
+++ b/layout/xul/base/src/nsBoxObject.cpp
@@ -182,7 +182,7 @@ nsBoxObject::GetPresShell(PRBool aFlushLayout)
     doc->FlushPendingNotifications(Flush_Layout);
   }
 
-  return doc->GetPrimaryShell();
+  return doc->GetShell();
 }
 
 nsresult 
diff --git a/layout/xul/base/src/nsImageBoxFrame.cpp b/layout/xul/base/src/nsImageBoxFrame.cpp
index 4e924aa91a58..cc12f3801819 100644
--- a/layout/xul/base/src/nsImageBoxFrame.cpp
+++ b/layout/xul/base/src/nsImageBoxFrame.cpp
@@ -111,7 +111,7 @@ nsImageBoxFrameEvent::Run()
     return NS_OK;
   }
 
-  nsIPresShell *pres_shell = doc->GetPrimaryShell();
+  nsIPresShell *pres_shell = doc->GetShell();
   if (!pres_shell) {
     return NS_OK;
   }
diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp
index 01871b904488..7febdcd15cdb 100644
--- a/layout/xul/base/src/nsMenuPopupFrame.cpp
+++ b/layout/xul/base/src/nsMenuPopupFrame.cpp
@@ -970,7 +970,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, PRBool aIsMove)
     if (mAnchorContent) {
       nsCOMPtr<nsIDocument> document = mAnchorContent->GetDocument();
       if (document) {
-        nsIPresShell *shell = document->GetPrimaryShell();
+        nsIPresShell *shell = document->GetShell();
         if (!shell)
           return NS_ERROR_FAILURE;
 
diff --git a/layout/xul/base/src/nsXULPopupManager.cpp b/layout/xul/base/src/nsXULPopupManager.cpp
index 374279d57fc0..895288b69e57 100644
--- a/layout/xul/base/src/nsXULPopupManager.cpp
+++ b/layout/xul/base/src/nsXULPopupManager.cpp
@@ -282,7 +282,7 @@ nsXULPopupManager::GetFrameOfTypeForContent(nsIContent* aContent,
   if (aShouldFlush) {
     nsIDocument *document = aContent->GetCurrentDoc();
     if (document) {
-      nsCOMPtr<nsIPresShell> presShell = document->GetPrimaryShell();
+      nsCOMPtr<nsIPresShell> presShell = document->GetShell();
       if (presShell)
         presShell->FlushPendingNotifications(Flush_Frames);
     }
@@ -344,7 +344,7 @@ nsXULPopupManager::SetTriggerEvent(nsIDOMEvent* aEvent, nsIContent* aPopup)
       if (event) {
         nsIDocument* doc = aPopup->GetCurrentDoc();
         if (doc) {
-          nsIPresShell* presShell = doc->GetPrimaryShell();
+          nsIPresShell* presShell = doc->GetShell();
           if (presShell && presShell->GetPresContext()) {
             nsPresContext* rootDocPresContext =
               presShell->GetPresContext()->GetRootPresContext();
@@ -545,7 +545,7 @@ CheckCaretDrawingState() {
     if (!focusedDoc)
       return;
 
-    nsIPresShell* presShell = focusedDoc->GetPrimaryShell();
+    nsIPresShell* presShell = focusedDoc->GetShell();
     if (!presShell)
       return;
 
@@ -2024,7 +2024,7 @@ GetPresContextFor(nsIContent* aContent)
 {
   nsIDocument *document = aContent->GetCurrentDoc();
   if (document) {
-    nsIPresShell* presShell = document->GetPrimaryShell();
+    nsIPresShell* presShell = document->GetShell();
     if (presShell)
       return presShell->GetPresContext();
   }
diff --git a/layout/xul/base/src/nsXULTooltipListener.cpp b/layout/xul/base/src/nsXULTooltipListener.cpp
index 545db68ecafa..99eb0e28474b 100644
--- a/layout/xul/base/src/nsXULTooltipListener.cpp
+++ b/layout/xul/base/src/nsXULTooltipListener.cpp
@@ -629,7 +629,7 @@ nsXULTooltipListener::FindTooltip(nsIContent* aTarget, nsIContent** aTooltip)
   aTarget->GetAttr(kNameSpaceID_None, nsGkAtoms::tooltiptext, tooltipText);
   if (!tooltipText.IsEmpty()) {
     // specifying tooltiptext means we will always use the default tooltip
-    nsIRootBox* rootBox = nsIRootBox::GetRootBox(document->GetPrimaryShell());
+    nsIRootBox* rootBox = nsIRootBox::GetRootBox(document->GetShell());
     NS_ENSURE_STATE(rootBox);
     *aTooltip = rootBox->GetDefaultTooltip();
     if (*aTooltip) {
@@ -664,7 +664,7 @@ nsXULTooltipListener::FindTooltip(nsIContent* aTarget, nsIContent** aTooltip)
 #ifdef MOZ_XUL
   // titletips should just use the default tooltip
   if (mIsSourceTree && mNeedTitletip) {
-    nsIRootBox* rootBox = nsIRootBox::GetRootBox(document->GetPrimaryShell());
+    nsIRootBox* rootBox = nsIRootBox::GetRootBox(document->GetShell());
     NS_ENSURE_STATE(rootBox);
     NS_IF_ADDREF(*aTooltip = rootBox->GetDefaultTooltip());
   }
diff --git a/modules/plugin/base/src/nsPluginHost.cpp b/modules/plugin/base/src/nsPluginHost.cpp
index 3a7e3611f385..9e2dc639c564 100644
--- a/modules/plugin/base/src/nsPluginHost.cpp
+++ b/modules/plugin/base/src/nsPluginHost.cpp
@@ -278,7 +278,7 @@ NS_IMETHODIMP nsPluginDocReframeEvent::Run() {
   for (PRUint32 i = 0; i < c; i++) {
     nsCOMPtr<nsIDocument> doc (do_QueryElementAt(mDocs, i));
     if (doc) {
-      nsIPresShell *shell = doc->GetPrimaryShell();
+      nsIPresShell *shell = doc->GetShell();
 
       // if this document has a presentation shell, then it has frames and can be reframed
       if (shell) {
diff --git a/parser/html/nsHtml5TreeBuilderCppSupplement.h b/parser/html/nsHtml5TreeBuilderCppSupplement.h
index 25884e818887..791ee10d6d8b 100644
--- a/parser/html/nsHtml5TreeBuilderCppSupplement.h
+++ b/parser/html/nsHtml5TreeBuilderCppSupplement.h
@@ -504,7 +504,7 @@ nsHtml5TreeBuilder::elementPopped(PRInt32 aNamespace, nsIAtom* aName, nsIContent
       // For that matter, do we really want to try getting the prescontext?  Does
       // this event ever want one?
       nsRefPtr<nsPresContext> ctx;
-      nsCOMPtr<nsIPresShell> shell = parser->GetDocument()->GetPrimaryShell();
+      nsCOMPtr<nsIPresShell> shell = parser->GetDocument()->GetShell();
       if (shell) {
         ctx = shell->GetPresContext();
       }
diff --git a/widget/src/xpwidgets/nsBaseDragService.cpp b/widget/src/xpwidgets/nsBaseDragService.cpp
index 5292260f1afb..93db52ccde11 100644
--- a/widget/src/xpwidgets/nsBaseDragService.cpp
+++ b/widget/src/xpwidgets/nsBaseDragService.cpp
@@ -246,7 +246,7 @@ nsBaseDragService::InvokeDragSession(nsIDOMNode *aDOMNode,
   // are in the wrong coord system, so turn off mouse capture.
   nsCOMPtr<nsIDocument> doc = do_QueryInterface(mSourceDocument);
   if (doc) {
-    nsCOMPtr<nsIViewObserver> viewObserver = do_QueryInterface(doc->GetPrimaryShell());
+    nsCOMPtr<nsIViewObserver> viewObserver = do_QueryInterface(doc->GetShell());
     if (viewObserver) {
       viewObserver->ClearMouseCapture(nsnull);
     }
@@ -386,7 +386,7 @@ nsBaseDragService::FireDragEventAtSource(PRUint32 aMsg)
   if (mSourceNode && !mSuppressLevel) {
     nsCOMPtr<nsIDocument> doc = do_QueryInterface(mSourceDocument);
     if (doc) {
-      nsCOMPtr<nsIPresShell> presShell = doc->GetPrimaryShell();
+      nsCOMPtr<nsIPresShell> presShell = doc->GetShell();
       if (presShell) {
         nsEventStatus status = nsEventStatus_eIgnore;
         nsDragEvent event(PR_TRUE, aMsg, nsnull);
@@ -417,7 +417,7 @@ GetPresShellForContent(nsIDOMNode* aDOMNode)
   if (document) {
     document->FlushPendingNotifications(Flush_Display);
 
-    return document->GetPrimaryShell();
+    return document->GetShell();
   }
 
   return nsnull;

From d60f7f0292a2d7e8657558b084ee128908163b16 Mon Sep 17 00:00:00 2001
From: Josh Aas <joshmoz@gmail.com>
Date: Fri, 25 Jun 2010 10:47:35 -0400
Subject: [PATCH 020/172] Don't build demo Linux printing plugin by default.
 b=573945 r=jst

---
 modules/plugin/Makefile.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/plugin/Makefile.in b/modules/plugin/Makefile.in
index 93e32e16f894..6c84714c28a5 100644
--- a/modules/plugin/Makefile.in
+++ b/modules/plugin/Makefile.in
@@ -49,10 +49,6 @@ DIRS		= base/public
 ifdef MOZ_PLUGINS
 DIRS		+= base/src 
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-TOOL_DIRS += sdk/samples/unixprinting
-endif
-
 # These subdirs rely on GTK libraries and header files, it is not
 #  buildable on other non-GTK unix builds
 

From 0c8e810c3a25826b135d5f4eccd86c2d50d44e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 25 Jun 2010 16:52:08 +0200
Subject: [PATCH 021/172] Backed out changeset 2f3c4cbb8c4f

---
 js/src/nanojit/Assembler.cpp | 2 +-
 js/src/nanojit/Native.h      | 2 +-
 js/src/nanojit/NativeX64.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/nanojit/Assembler.cpp b/js/src/nanojit/Assembler.cpp
index af7b06761293..52259976fbb0 100755
--- a/js/src/nanojit/Assembler.cpp
+++ b/js/src/nanojit/Assembler.cpp
@@ -807,7 +807,7 @@ namespace nanojit
         _inExit = false;
 
         //verbose_only( verbose_outputf("         LIR_xt/xf swapCodeChunks, _nIns is now %08X(%08X), _nExitIns is now %08X(%08X)",_nIns, *_nIns,_nExitIns,*_nExitIns) );
-        verbose_only( verbose_outputf("%p:", jmpTarget);)
+        verbose_only( verbose_outputf("%010lx:", (unsigned long)jmpTarget);)
         verbose_only( verbose_outputf("----------------------------------- ## BEGIN exit block (LIR_xt|LIR_xf)") );
 
 #ifdef NANOJIT_IA32
diff --git a/js/src/nanojit/Native.h b/js/src/nanojit/Native.h
index ff9b7c80e4b0..2b23c6645d24 100644
--- a/js/src/nanojit/Native.h
+++ b/js/src/nanojit/Native.h
@@ -152,7 +152,7 @@ namespace nanojit {
         #define asm_output(...) do { \
             if (_logc->lcbits & LC_Native) { \
                 outline[0]='\0'; \
-               VMPI_sprintf(outline, "%p   ", _nIns); \
+               VMPI_sprintf(outline, "%010lx   ", (unsigned long)_nIns); \
                 sprintf(&outline[13], ##__VA_ARGS__); \
                 output(); \
             } \
diff --git a/js/src/nanojit/NativeX64.h b/js/src/nanojit/NativeX64.h
index 420779da9ea4..caca6f7907d1 100644
--- a/js/src/nanojit/NativeX64.h
+++ b/js/src/nanojit/NativeX64.h
@@ -328,7 +328,7 @@ namespace nanojit
 
     static const RegisterMask GpRegs = 0xffff;
     static const RegisterMask FpRegs = 0xffff0000;
-#ifdef _WIN64
+#ifdef _MSC_VER
     static const RegisterMask SavedRegs = 1<<RBX | 1<<RSI | 1<<RDI | 1<<R12 | 1<<R13 | 1<<R14 | 1<<R15;
     static const int NumSavedRegs = 7; // rbx, rsi, rdi, r12-15
     static const int NumArgRegs = 4;

From 379a1a3599faa62b361f1d93eb7cf720202cc29d Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Fri, 25 Jun 2010 15:59:05 +0200
Subject: [PATCH 022/172] Bug 569819 - Fix nanojit compilation failure on
 mingw-w64. r=edwsmith

---
 js/src/nanojit/Assembler.cpp | 2 +-
 js/src/nanojit/Native.h      | 2 +-
 js/src/nanojit/NativeX64.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/nanojit/Assembler.cpp b/js/src/nanojit/Assembler.cpp
index 52259976fbb0..af7b06761293 100755
--- a/js/src/nanojit/Assembler.cpp
+++ b/js/src/nanojit/Assembler.cpp
@@ -807,7 +807,7 @@ namespace nanojit
         _inExit = false;
 
         //verbose_only( verbose_outputf("         LIR_xt/xf swapCodeChunks, _nIns is now %08X(%08X), _nExitIns is now %08X(%08X)",_nIns, *_nIns,_nExitIns,*_nExitIns) );
-        verbose_only( verbose_outputf("%010lx:", (unsigned long)jmpTarget);)
+        verbose_only( verbose_outputf("%p:", jmpTarget);)
         verbose_only( verbose_outputf("----------------------------------- ## BEGIN exit block (LIR_xt|LIR_xf)") );
 
 #ifdef NANOJIT_IA32
diff --git a/js/src/nanojit/Native.h b/js/src/nanojit/Native.h
index 2b23c6645d24..ff9b7c80e4b0 100644
--- a/js/src/nanojit/Native.h
+++ b/js/src/nanojit/Native.h
@@ -152,7 +152,7 @@ namespace nanojit {
         #define asm_output(...) do { \
             if (_logc->lcbits & LC_Native) { \
                 outline[0]='\0'; \
-               VMPI_sprintf(outline, "%010lx   ", (unsigned long)_nIns); \
+               VMPI_sprintf(outline, "%p   ", _nIns); \
                 sprintf(&outline[13], ##__VA_ARGS__); \
                 output(); \
             } \
diff --git a/js/src/nanojit/NativeX64.h b/js/src/nanojit/NativeX64.h
index caca6f7907d1..420779da9ea4 100644
--- a/js/src/nanojit/NativeX64.h
+++ b/js/src/nanojit/NativeX64.h
@@ -328,7 +328,7 @@ namespace nanojit
 
     static const RegisterMask GpRegs = 0xffff;
     static const RegisterMask FpRegs = 0xffff0000;
-#ifdef _MSC_VER
+#ifdef _WIN64
     static const RegisterMask SavedRegs = 1<<RBX | 1<<RSI | 1<<RDI | 1<<R12 | 1<<R13 | 1<<R14 | 1<<R15;
     static const int NumSavedRegs = 7; // rbx, rsi, rdi, r12-15
     static const int NumArgRegs = 4;

From 32d2f15ab115d3485ccc0940462237eb51db90b7 Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Fri, 18 Jun 2010 15:29:21 -0500
Subject: [PATCH 023/172] Bug 560643 - Part 3, add support for jsval XPIDL
 type. r=jst, sr=jst.

---
 js/src/xpconnect/src/qsgen.py             | 112 ++++++++++------------
 js/src/xpconnect/src/xpcconvert.cpp       |  11 ++-
 js/src/xpconnect/src/xpcwrappednative.cpp |  23 ++++-
 xpcom/base/nsrootidl.idl                  |   2 +-
 xpcom/idl-parser/xpidl.py                 |   3 +-
 xpcom/reflect/xptcall/public/xptcall.h    |   7 +-
 xpcom/reflect/xptinfo/public/xptinfo.h    |   3 +-
 xpcom/typelib/xpidl/xpidl_typelib.c       |   4 +
 xpcom/typelib/xpidl/xpidl_util.c          |  12 ++-
 xpcom/typelib/xpt/public/xpt_struct.h     |   3 +-
 10 files changed, 107 insertions(+), 73 deletions(-)

diff --git a/js/src/xpconnect/src/qsgen.py b/js/src/xpconnect/src/qsgen.py
index 7d49e1506b4a..014a51db94a7 100644
--- a/js/src/xpconnect/src/qsgen.py
+++ b/js/src/xpconnect/src/qsgen.py
@@ -482,7 +482,10 @@ argumentUnboxingTemplates = {
     '[cstring]':
         "    xpc_qsACString ${name}(cx, ${argVal}, ${argPtr});\n"
         "    if (!${name}.IsValid())\n"
-        "        return JS_FALSE;\n"
+        "        return JS_FALSE;\n",
+
+    '[jsval]':
+        "    jsval ${name} = ${argVal};\n"
     }
 
 # From JSData2Native.
@@ -576,7 +579,7 @@ def writeArgumentUnboxing(f, i, name, type, haveCcx, optional, rvdeclared,
 def writeResultDecl(f, type, varname):
     if isVoidType(type):
         return  # nothing to declare
-    
+
     t = unaliasType(type)
     if t.kind == 'builtin':
         if not t.nativename.endswith('*'):
@@ -591,6 +594,8 @@ def writeResultDecl(f, type, varname):
         if name in ('[domstring]', '[astring]'):
             f.write("    nsString %s;\n" % varname)
             return
+        elif name == '[jsval]':
+            return  # nothing to declare; see special case in outParamForm
     elif t.kind in ('interface', 'forward'):
         f.write("    nsCOMPtr<%s> %s;\n" % (type.name, varname))
         return
@@ -603,7 +608,9 @@ def outParamForm(name, type):
     if type.kind == 'builtin':
         return '&' + name
     elif type.kind == 'native':
-        if type.modifier == 'ref':
+        if getBuiltinOrNativeTypeName(type) == '[jsval]':
+            return 'vp'
+        elif type.modifier == 'ref':
             return name
         else:
             return '&' + name
@@ -654,7 +661,12 @@ resultConvTemplates = {
         "    return xpc_qsStringToJsval(cx, result, ${jsvalPtr});\n",
 
     '[domstring]':
-        "    return xpc_qsStringToJsval(cx, result, ${jsvalPtr});\n"
+        "    return xpc_qsStringToJsval(cx, result, ${jsvalPtr});\n",
+
+    '[jsval]':
+        # Here there's nothing to convert, because the result has already been
+        # written directly to *rv. See the special case in outParamForm.
+        "    return JS_TRUE;\n"
     }
 
 def isVariantType(t):
@@ -987,76 +999,52 @@ def writeQuickStub(f, customMethodCalls, member, stubName, isSetter=False):
         f.write(callTemplate)
 
 # Only these types can be returned (note: no strings);
-# if the type isn't one of these, then traceTypeMap['_default'] is used
+# if the type isn't one of these, then defaultTraceType is used
 traceReturnTypeMap = {
-    'void':
-        ["jsval ", "JSVAL", "JSVAL_VOID"],
-    'boolean':
-        ["JSBool ", "BOOL", "JS_FALSE"],
-    'short':
-        ["int32 ", "INT32", "0"],
-    'unsigned short':
-        ["uint32 ", "UINT32", "0"],
-    'long':
-        ["int32 ", "INT32", "0"],
-    'unsigned long':
-        ["uint32 ", "UINT32", "0"],
-    'float':
-        ["jsdouble ", "DOUBLE", "0"],
-    'double':
-        ["jsdouble ", "DOUBLE", "0"],
-    'octet':
-        ["uint32 ", "UINT32", "0"]
+    'void':             ("jsval ", "JSVAL", "JSVAL_VOID"),
+    'boolean':          ("JSBool ", "BOOL", "JS_FALSE"),
+    'short':            ("int32 ", "INT32", "0"),
+    'unsigned short':   ("uint32 ", "UINT32", "0"),
+    'long':             ("int32 ", "INT32", "0"),
+    'unsigned long':    ("uint32 ", "UINT32", "0"),
+    'float':            ("jsdouble ", "DOUBLE", "0"),
+    'double':           ("jsdouble ", "DOUBLE", "0"),
+    'octet':            ("uint32 ", "UINT32", "0"),
+    'jsval':            ("jsval ", "JSVAL", "JSVAL_VOID")
     }
 
 # This list extends the above list, but includes types that
-# are valid for arguments only, namely strings.  It also
-# includes the default jsval type.
-traceTypeMap = {
-    '[astring]':
-        ["JSString *", "STRING", "nsnull"],
-    '[domstring]':
-        ["JSString *", "STRING", "nsnull"],
-    '[cstring]':
-        ["JSString *", "STRING", "nsnull"],
-    'string':
-        ["JSString *", "STRING", "nsnull"],
-    'wstring':
-        ["JSString *", "STRING", "nsnull"],
+# are valid for arguments only, namely strings.
+traceTypeMap = traceReturnTypeMap.copy()
+traceTypeMap.update({
+    '[astring]':        ("JSString *", "STRING", "nsnull"),
+    '[domstring]':      ("JSString *", "STRING", "nsnull"),
+    '[cstring]':        ("JSString *", "STRING", "nsnull"),
+    'string':           ("JSString *", "STRING", "nsnull"),
+    'wstring':          ("JSString *", "STRING", "nsnull"),
+    })
 
-    '_default':
-        ["jsval ", "JSVAL", "JSVAL_VOID"]
-    }
+defaultTraceType = ("jsval ", "JSVAL", "JSVAL_VOID")
 
 def getTraceType(type):
     type = getBuiltinOrNativeTypeName(type)
-    traceType = traceReturnTypeMap.get(type) or traceTypeMap.get(type) or traceTypeMap.get("_default")
-    assert traceType
-    return traceType[0]
+    return traceTypeMap.get(type, defaultTraceType)[0]
 
 def getTraceReturnType(type):
     type = getBuiltinOrNativeTypeName(type)
-    traceType = traceReturnTypeMap.get(type) or traceTypeMap.get("_default")
-    assert traceType
-    return traceType[0]
+    return traceReturnTypeMap.get(type, defaultTraceType)[0]
 
 def getTraceInfoType(type):
     type = getBuiltinOrNativeTypeName(type)
-    traceType = traceReturnTypeMap.get(type) or traceTypeMap.get(type) or traceTypeMap.get("_default")
-    assert traceType
-    return traceType[1]
+    return traceTypeMap.get(type, defaultTraceType)[1]
 
 def getTraceInfoReturnType(type):
     type = getBuiltinOrNativeTypeName(type)
-    traceType = traceReturnTypeMap.get(type) or traceTypeMap.get("_default")
-    assert traceType
-    return traceType[1]
+    return traceReturnTypeMap.get(type, defaultTraceType)[1]
 
 def getTraceInfoDefaultReturn(type):
     type = getBuiltinOrNativeTypeName(type)
-    traceType = traceTypeMap.get(type) or traceTypeMap.get("_default")
-    assert traceType
-    return traceType[2]
+    return traceTypeMap.get(type, defaultTraceType)[2]
 
 def getFailureString(retval, indent):
     assert indent > 0
@@ -1142,7 +1130,7 @@ def writeTraceableArgumentConversion(f, member, i, name, type, haveCcx,
             f.write("    xpc_qsSelfRef %sref;\n" % name)
             f.write("    rv = xpc_qsUnwrapArg<%s>("
                     "cx, %s, &%s, &%sref.ptr, &vp.array[%d]);\n"
-                    % (type.name, argVal, name, name, 1 + i))
+                    % (type.name, argVal, name, name, 2 + i))
             f.write("    if (NS_FAILED(rv)) {\n")
             if haveCcx:
                 f.write("        xpc_qsThrowBadArgWithCcx(ccx, rv, %d);\n" % i)
@@ -1188,6 +1176,8 @@ traceableResultConvTemplates = {
         "    if (!xpc_qsStringToJsval(cx, result, &rval)) {\n"
         "        JS_ReportOutOfMemory(cx);\n${errorStr}"
         "    return rval;\n",
+    '[jsval]':
+        "    return vp.array[0];\n"
     }
 
 def writeTraceableResultConv(f, type):
@@ -1264,17 +1254,17 @@ def writeTraceableQuickStub(f, customMethodCalls, member, stubName):
     else:
         f.write("    %s *self;\n" % customMethodCall['thisType'])
     f.write("    xpc_qsSelfRef selfref;\n")
-    f.write("    xpc_qsArgValArray<%d> vp(cx);\n" % (1 + len(member.params)))
+    f.write("    xpc_qsArgValArray<%d> vp(cx);\n" % (2 + len(member.params)))
     if haveCcx:
         f.write("    if (!xpc_qsUnwrapThisFromCcx(ccx, &self, &selfref.ptr, "
-                "&vp.array[0])) {\n")
+                "&vp.array[1])) {\n")
     elif (member.kind == 'method') and isInterfaceType(member.realtype):
         f.write("    XPCLazyCallContext lccx(JS_CALLER, cx, obj);\n")
         f.write("    if (!xpc_qsUnwrapThis(cx, obj, callee, &self, &selfref.ptr, "
-                "&vp.array[0], &lccx)) {\n")
+                "&vp.array[1], &lccx)) {\n")
     else:
         f.write("    if (!xpc_qsUnwrapThis(cx, obj, nsnull, &self, &selfref.ptr, "
-                "&vp.array[0], nsnull)) {\n")
+                "&vp.array[1], nsnull)) {\n")
     writeFailure(f, getTraceInfoDefaultReturn(member.realtype), 2)
 
     argNames = []
@@ -1314,7 +1304,9 @@ def writeTraceableQuickStub(f, customMethodCalls, member, stubName):
 
         # Call the method.
         comName = header.methodNativeName(member)
-        if not isVoidType(member.realtype):
+        if getBuiltinOrNativeTypeName(member.realtype) == '[jsval]':
+            argNames.append("&vp.array[0]")
+        elif not isVoidType(member.realtype):
             argNames.append(outParamForm(resultname, member.realtype))
         args = ', '.join(argNames)
 
diff --git a/js/src/xpconnect/src/xpcconvert.cpp b/js/src/xpconnect/src/xpcconvert.cpp
index eee4378062e3..8433b33889da 100644
--- a/js/src/xpconnect/src/xpcconvert.cpp
+++ b/js/src/xpconnect/src/xpcconvert.cpp
@@ -113,7 +113,7 @@ static uint8 xpc_reflectable_flags[XPC_FLAG_COUNT] = {
     XPC_MK_FLAG(  0  ,  1  ,   0 ,  0 ), /* T_UTF8STRING        */
     XPC_MK_FLAG(  0  ,  1  ,   0 ,  0 ), /* T_CSTRING           */
     XPC_MK_FLAG(  0  ,  1  ,   0 ,  0 ), /* T_ASTRING           */
-    XPC_MK_FLAG(  0  ,  0  ,   0 ,  0 ), /* 26 - reserved       */
+    XPC_MK_FLAG(  1  ,  0  ,   1 ,  0 ), /* T_JSVAL             */
     XPC_MK_FLAG(  0  ,  0  ,   0 ,  0 ), /* 27 - reserved       */
     XPC_MK_FLAG(  0  ,  0  ,   0 ,  0 ), /* 28 - reserved       */
     XPC_MK_FLAG(  0  ,  0  ,   0 ,  0 ), /* 29 - reserved       */
@@ -292,6 +292,11 @@ XPCConvert::NativeData2JS(XPCLazyCallContext& lccx, jsval* d, const void* s,
             *d = STRING_TO_JSVAL(str);
             break;
         }
+
+    case nsXPTType::T_JSVAL :
+        *d = *((jsval*)s);
+        break;
+
     default:
         if(!type.IsPointer())
         {
@@ -480,6 +485,7 @@ XPCConvert::NativeData2JS(XPCLazyCallContext& lccx, jsval* d, const void* s,
                 }
                 break;
             }
+
         default:
             NS_ERROR("bad type");
             return JS_FALSE;
@@ -617,6 +623,9 @@ XPCConvert::JSData2Native(XPCCallContext& ccx, void* d, jsval s,
             *((uint16*)d)  = (uint16) chars[0];
             break;
         }
+    case nsXPTType::T_JSVAL :
+        *((jsval*)d) = s;
+        break;
     default:
         if(!type.IsPointer())
         {
diff --git a/js/src/xpconnect/src/xpcwrappednative.cpp b/js/src/xpconnect/src/xpcwrappednative.cpp
index 40c5750de3bd..56e15e2cfab9 100644
--- a/js/src/xpconnect/src/xpcwrappednative.cpp
+++ b/js/src/xpconnect/src/xpcwrappednative.cpp
@@ -2380,8 +2380,11 @@ CallMethodHelper::~CallMethodHelper()
                 delete (nsCString*) p;
             else if(dp->IsValCString())
                 delete (nsCString*) p;
-        }
+            else if(dp->IsValJSRoot())
+                JS_RemoveRoot(mCallContext, (jsval*)dp->ptr);
+        }   
     }
+
 }
 
 JSBool
@@ -2565,7 +2568,7 @@ CallMethodHelper::GatherAndConvertResults()
 
         if(paramInfo.IsRetval())
         {
-            if(!mCallContext.GetReturnValueWasSet())
+            if(!mCallContext.GetReturnValueWasSet() && type.TagPart() != nsXPTType::T_JSVAL)
                 mCallContext.SetRetVal(v);
         }
         else if(i < mArgc)
@@ -2729,6 +2732,22 @@ CallMethodHelper::ConvertIndependentParams(JSBool* foundDependentParam)
             dp->SetPtrIsData();
             dp->ptr = &dp->val;
 
+            if (type_tag == nsXPTType::T_JSVAL)
+            {
+                if (paramInfo.IsRetval())
+                {
+                    dp->ptr = mCallContext.GetRetVal();
+                }
+                else
+                {
+                    jsval *rootp = (jsval *)&dp->val.p;
+                    dp->ptr = rootp;
+                    *rootp = JSVAL_VOID;
+                    if (!JS_AddRoot(mCallContext, rootp))
+                        return JS_FALSE;
+                }
+            }
+
             if(type.IsPointer() &&
                type_tag != nsXPTType::T_INTERFACE &&
                !paramInfo.IsShared())
diff --git a/xpcom/base/nsrootidl.idl b/xpcom/base/nsrootidl.idl
index 21cd9ab5a7c8..d72e9f42edc7 100644
--- a/xpcom/base/nsrootidl.idl
+++ b/xpcom/base/nsrootidl.idl
@@ -120,7 +120,7 @@ typedef unsigned long       size_t;
 [ref, astring] native AStringRef(ignored);
 [ptr, astring] native AStringPtr(ignored);
 
-native jsval(jsval);
+[jsval]       native jsval(jsval);
 
 %{C++
 /* 
diff --git a/xpcom/idl-parser/xpidl.py b/xpcom/idl-parser/xpidl.py
index 72e9806acba4..a6591338c0f0 100644
--- a/xpcom/idl-parser/xpidl.py
+++ b/xpcom/idl-parser/xpidl.py
@@ -405,7 +405,8 @@ class Native(object):
         'domstring': 'nsAString',
         'utf8string': 'nsACString',
         'cstring': 'nsACString',
-        'astring': 'nsAString'
+        'astring': 'nsAString',
+        'jsval': 'jsval'
         }
 
     def __init__(self, name, nativename, attlist, location):
diff --git a/xpcom/reflect/xptcall/public/xptcall.h b/xpcom/reflect/xptcall/public/xptcall.h
index 9ffcdd47f008..c8160e146162 100644
--- a/xpcom/reflect/xptcall/public/xptcall.h
+++ b/xpcom/reflect/xptcall/public/xptcall.h
@@ -95,7 +95,8 @@ struct nsXPTCVariant : public nsXPTCMiniVariant
         VAL_IS_ARRAY   = 0x8,  // val.p holds a pointer to an array needing cleanup
         VAL_IS_DOMSTR  = 0x10, // val.p holds a pointer to domstring needing cleanup
         VAL_IS_UTF8STR = 0x20, // val.p holds a pointer to utf8string needing cleanup
-        VAL_IS_CSTR    = 0x40  // val.p holds a pointer to cstring needing cleanup        
+        VAL_IS_CSTR    = 0x40, // val.p holds a pointer to cstring needing cleanup
+        VAL_IS_JSROOT  = 0x80  // val.p holds a pointer to a jsval that must be unrooted
     };
 
     void ClearFlags()         {flags = 0;}
@@ -105,7 +106,8 @@ struct nsXPTCVariant : public nsXPTCMiniVariant
     void SetValIsArray()      {flags |= VAL_IS_ARRAY;}
     void SetValIsDOMString()  {flags |= VAL_IS_DOMSTR;}
     void SetValIsUTF8String() {flags |= VAL_IS_UTF8STR;}
-    void SetValIsCString()    {flags |= VAL_IS_CSTR;}    
+    void SetValIsCString()    {flags |= VAL_IS_CSTR;}
+    void SetValIsJSRoot()     {flags |= VAL_IS_JSROOT;}
 
     PRBool IsPtrData()       const  {return 0 != (flags & PTR_IS_DATA);}
     PRBool IsValAllocated()  const  {return 0 != (flags & VAL_IS_ALLOCD);}
@@ -114,6 +116,7 @@ struct nsXPTCVariant : public nsXPTCMiniVariant
     PRBool IsValDOMString()  const  {return 0 != (flags & VAL_IS_DOMSTR);}
     PRBool IsValUTF8String() const  {return 0 != (flags & VAL_IS_UTF8STR);}
     PRBool IsValCString()    const  {return 0 != (flags & VAL_IS_CSTR);}    
+    PRBool IsValJSRoot()     const  {return 0 != (flags & VAL_IS_JSROOT);}
 
     void Init(const nsXPTCMiniVariant& mv, const nsXPTType& t, PRUint8 f)
     {
diff --git a/xpcom/reflect/xptinfo/public/xptinfo.h b/xpcom/reflect/xptinfo/public/xptinfo.h
index c5b57a191309..93f6cb93718b 100644
--- a/xpcom/reflect/xptinfo/public/xptinfo.h
+++ b/xpcom/reflect/xptinfo/public/xptinfo.h
@@ -141,7 +141,8 @@ public:
         T_PWSTRING_SIZE_IS  = TD_PWSTRING_SIZE_IS ,
         T_UTF8STRING        = TD_UTF8STRING       ,
         T_CSTRING           = TD_CSTRING          ,
-        T_ASTRING           = TD_ASTRING
+        T_ASTRING           = TD_ASTRING          ,
+        T_JSVAL             = TD_JSVAL
     };
 // NO DATA - this a flyweight wrapper
 };
diff --git a/xpcom/typelib/xpidl/xpidl_typelib.c b/xpcom/typelib/xpidl/xpidl_typelib.c
index 8e2d615b211f..f2a69be7775c 100644
--- a/xpcom/typelib/xpidl/xpidl_typelib.c
+++ b/xpcom/typelib/xpidl/xpidl_typelib.c
@@ -874,6 +874,10 @@ handle_iid_is:
                       td->prefix.flags = TD_CSTRING | XPT_TDP_POINTER;
                       if (IDL_tree_property_get(type, "ref"))
                           td->prefix.flags |= XPT_TDP_REFERENCE;
+                  } else if (IDL_tree_property_get(type, "jsval")) {
+                      td->prefix.flags = TD_JSVAL;
+                      if (IDL_tree_property_get(type, "ptr"))
+                          td->prefix.flags |= XPT_TDP_POINTER;
                   } else {
                       td->prefix.flags = TD_VOID | XPT_TDP_POINTER;
                   }
diff --git a/xpcom/typelib/xpidl/xpidl_util.c b/xpcom/typelib/xpidl/xpidl_util.c
index 2e1208a57e57..2c05cdc41f1d 100644
--- a/xpcom/typelib/xpidl/xpidl_util.c
+++ b/xpcom/typelib/xpidl/xpidl_util.c
@@ -373,7 +373,8 @@ verify_attribute_declaration(IDL_tree attr_tree)
             IDL_tree_property_get(attr_type, "domstring") == NULL &&
             IDL_tree_property_get(attr_type, "utf8string") == NULL &&
             IDL_tree_property_get(attr_type, "cstring") == NULL &&
-            IDL_tree_property_get(attr_type, "astring") == NULL)
+            IDL_tree_property_get(attr_type, "astring") == NULL &&
+            IDL_tree_property_get(attr_type, "jsval") == NULL)
         {
             IDL_tree_error(attr_tree,
                            "attributes in [scriptable] interfaces that are "
@@ -623,7 +624,8 @@ verify_method_declaration(IDL_tree method_tree)
             IDL_tree_property_get(param_type, "domstring") == NULL &&
             IDL_tree_property_get(param_type, "utf8string") == NULL &&
             IDL_tree_property_get(param_type, "cstring") == NULL &&
-            IDL_tree_property_get(param_type, "astring") == NULL)
+            IDL_tree_property_get(param_type, "astring") == NULL &&
+            IDL_tree_property_get(param_type, "jsval") == NULL)
         {
             IDL_tree_error(method_tree,
                            "methods in [scriptable] interfaces that are "
@@ -700,7 +702,8 @@ verify_method_declaration(IDL_tree method_tree)
                    !IDL_tree_property_get(real_type, "domstring")  &&
                    !IDL_tree_property_get(real_type, "utf8string") &&
                    !IDL_tree_property_get(real_type, "cstring")    &&
-                   !IDL_tree_property_get(real_type, "astring"))))
+                   !IDL_tree_property_get(real_type, "astring")    &&
+                   !IDL_tree_property_get(real_type, "jsval"))))
             {
                 IDL_tree_error(method_tree,
                                "[shared] parameter \"%s\" must be of type "
@@ -785,7 +788,8 @@ verify_method_declaration(IDL_tree method_tree)
         IDL_tree_property_get(op->op_type_spec, "domstring") == NULL &&
         IDL_tree_property_get(op->op_type_spec, "utf8string") == NULL &&
         IDL_tree_property_get(op->op_type_spec, "cstring") == NULL &&
-        IDL_tree_property_get(op->op_type_spec, "astring") == NULL)
+        IDL_tree_property_get(op->op_type_spec, "astring") == NULL &&
+        IDL_tree_property_get(op->op_type_spec, "jsval") == NULL)
     {
         IDL_tree_error(method_tree,
                        "methods in [scriptable] interfaces that are "
diff --git a/xpcom/typelib/xpt/public/xpt_struct.h b/xpcom/typelib/xpt/public/xpt_struct.h
index 009928fa0a4d..69b883b52feb 100644
--- a/xpcom/typelib/xpt/public/xpt_struct.h
+++ b/xpcom/typelib/xpt/public/xpt_struct.h
@@ -375,7 +375,8 @@ enum XPTTypeDescriptorTags {
     TD_PWSTRING_SIZE_IS  = 22,
     TD_UTF8STRING        = 23,
     TD_CSTRING           = 24,
-    TD_ASTRING           = 25
+    TD_ASTRING           = 25,
+    TD_JSVAL             = 26
 };
 
 struct XPTTypeDescriptor {

From 17048d28ab6be0ddeed3c86667c536cee6403bf4 Mon Sep 17 00:00:00 2001
From: Ben Newman <bnewman@mozilla.com>
Date: Fri, 25 Jun 2010 08:00:35 -0700
Subject: [PATCH 024/172] Build and IPDL groundwork for the multi-process
 Jetpack API (bug 556846). r=bsmedberg

---
 browser/installer/package-manifest.in     |  1 +
 ipc/ipdl/Makefile.in                      |  1 +
 js/jetpack/JetpackChild.cpp               | 83 +++++++++++++++++++++++
 js/jetpack/JetpackChild.h                 | 73 ++++++++++++++++++++
 js/jetpack/JetpackParent.cpp              | 70 +++++++++++++++++++
 js/jetpack/JetpackParent.h                | 68 +++++++++++++++++++
 js/jetpack/JetpackProcessChild.cpp        | 63 +++++++++++++++++
 js/jetpack/JetpackProcessChild.h          | 79 +++++++++++++++++++++
 js/jetpack/JetpackProcessParent.cpp       | 61 +++++++++++++++++
 js/jetpack/JetpackProcessParent.h         | 76 +++++++++++++++++++++
 js/jetpack/JetpackService.cpp             | 79 +++++++++++++++++++++
 js/jetpack/JetpackService.h               | 56 +++++++++++++++
 js/jetpack/Makefile.in                    | 76 +++++++++++++++++++++
 js/jetpack/PJetpack.ipdl                  | 48 +++++++++++++
 js/jetpack/ipdl.mk                        |  3 +
 js/jetpack/nsIJetpack.idl                 | 44 ++++++++++++
 js/jetpack/nsIJetpackService.idl          | 46 +++++++++++++
 toolkit/library/libxul-config.mk          |  4 ++
 toolkit/library/nsStaticXULComponents.cpp |  8 +++
 toolkit/toolkit-makefiles.sh              |  1 +
 toolkit/toolkit-tiers.mk                  |  2 +-
 toolkit/xre/nsAppRunner.cpp               |  1 +
 toolkit/xre/nsEmbedFunctions.cpp          |  6 ++
 xpcom/build/nsXULAppAPI.h                 |  2 +
 xpcom/system/nsIXULRuntime.idl            |  3 +-
 25 files changed, 952 insertions(+), 2 deletions(-)
 create mode 100644 js/jetpack/JetpackChild.cpp
 create mode 100644 js/jetpack/JetpackChild.h
 create mode 100644 js/jetpack/JetpackParent.cpp
 create mode 100644 js/jetpack/JetpackParent.h
 create mode 100644 js/jetpack/JetpackProcessChild.cpp
 create mode 100644 js/jetpack/JetpackProcessChild.h
 create mode 100644 js/jetpack/JetpackProcessParent.cpp
 create mode 100644 js/jetpack/JetpackProcessParent.h
 create mode 100644 js/jetpack/JetpackService.cpp
 create mode 100644 js/jetpack/JetpackService.h
 create mode 100644 js/jetpack/Makefile.in
 create mode 100644 js/jetpack/PJetpack.ipdl
 create mode 100644 js/jetpack/ipdl.mk
 create mode 100644 js/jetpack/nsIJetpack.idl
 create mode 100644 js/jetpack/nsIJetpackService.idl

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 393facdab411..f2e733bc00d1 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -180,6 +180,7 @@
 @BINPATH@/components/inspector.xpt
 @BINPATH@/components/intl.xpt
 @BINPATH@/components/jar.xpt
+@BINPATH@/components/jetpack.xpt
 @BINPATH@/components/jsdservice.xpt
 @BINPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING
diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in
index 8e95f03314c8..487894a62c14 100644
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -55,6 +55,7 @@ EXPORT_LIBRARY = 1
 ##
 IPDLDIRS =  \
   dom/plugins  \
+  js/jetpack \
   ipc/ipdl/test/cxx  \
   $(NULL)
 ##-----------------------------------------------------------------------------
diff --git a/js/jetpack/JetpackChild.cpp b/js/jetpack/JetpackChild.cpp
new file mode 100644
index 000000000000..8aef63188e34
--- /dev/null
+++ b/js/jetpack/JetpackChild.cpp
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 "mozilla/jetpack/JetpackChild.h"
+
+#include <stdio.h>
+
+namespace mozilla {
+namespace jetpack {
+
+JetpackChild::JetpackChild()
+{
+  NS_ASSERTION(!gInstance, "Something terribly wrong here!");
+  gInstance = this;
+}
+
+JetpackChild::~JetpackChild()
+{
+  NS_ASSERTION(gInstance == this, "Something terribly wrong here!");
+  gInstance = nsnull;
+}
+
+bool
+JetpackChild::Init(base::ProcessHandle aParentProcessHandle,
+                   MessageLoop* aIOLoop,
+                   IPC::Channel* aChannel)
+{
+  if (!Open(aChannel, aParentProcessHandle, aIOLoop))
+    return false;
+
+  return true;
+}
+
+void
+JetpackChild::CleanUp()
+{
+}
+
+bool
+JetpackChild::RecvLoadImplementation(const nsCString& script)
+{
+  printf("Received LoadImplementation message: '%s'\n", script.get());
+  return true;
+}
+
+JetpackChild* JetpackChild::gInstance;
+
+} // namespace jetpack
+} // namespace mozilla
diff --git a/js/jetpack/JetpackChild.h b/js/jetpack/JetpackChild.h
new file mode 100644
index 000000000000..b571abfbb805
--- /dev/null
+++ b/js/jetpack/JetpackChild.h
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 mozilla_jetpack_JetpackChild_h
+#define mozilla_jetpack_JetpackChild_h
+
+#include "mozilla/jetpack/PJetpackChild.h"
+
+namespace mozilla {
+namespace jetpack {
+
+class JetpackChild : public PJetpackChild
+{
+public:
+  JetpackChild();
+  ~JetpackChild();
+
+  static JetpackChild* current();
+
+  bool Init(base::ProcessHandle aParentProcessHandle,
+            MessageLoop* aIOLoop,
+            IPC::Channel* aChannel);
+
+  void CleanUp();
+
+protected:
+  NS_OVERRIDE virtual bool RecvLoadImplementation(const nsCString& script);
+
+private:
+  static JetpackChild* gInstance;
+
+  DISALLOW_EVIL_CONSTRUCTORS(JetpackChild);
+};
+
+} // namespace jetpack
+} // namespace mozilla
+
+
+#endif // mozilla_jetpack_JetpackChild_h
diff --git a/js/jetpack/JetpackParent.cpp b/js/jetpack/JetpackParent.cpp
new file mode 100644
index 000000000000..1bc1c7abc5bb
--- /dev/null
+++ b/js/jetpack/JetpackParent.cpp
@@ -0,0 +1,70 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 "mozilla/jetpack/JetpackParent.h"
+
+namespace mozilla {
+namespace jetpack {
+
+JetpackParent::JetpackParent()
+  : mSubprocess(new JetpackProcessParent())
+{
+  mSubprocess->Launch();
+  Open(mSubprocess->GetChannel(),
+       mSubprocess->GetChildProcessHandle());
+}
+
+JetpackParent::~JetpackParent()
+{
+  XRE_GetIOMessageLoop()
+    ->PostTask(FROM_HERE, new DeleteTask<JetpackProcessParent>(mSubprocess));
+}
+
+NS_IMPL_ISUPPORTS1(JetpackParent, nsIJetpack)
+
+NS_IMETHODIMP
+JetpackParent::LoadImplementation(const nsAString& aURI)
+{
+  // this is all wrong, load the URI and send the data, but for now...
+  if (!SendLoadImplementation(NS_ConvertUTF16toUTF8(aURI)))
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}
+
+} // namespace jetpack
+} // namespace mozilla
diff --git a/js/jetpack/JetpackParent.h b/js/jetpack/JetpackParent.h
new file mode 100644
index 000000000000..697a82021662
--- /dev/null
+++ b/js/jetpack/JetpackParent.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 mozilla_jetpack_JetpackParent_h
+#define mozilla_jetpack_JetpackParent_h
+
+#include "mozilla/jetpack/PJetpackParent.h"
+#include "mozilla/jetpack/JetpackProcessParent.h"
+#include "nsIJetpack.h"
+
+namespace mozilla {
+namespace jetpack {
+
+class JetpackParent
+  : public PJetpackParent
+  , public nsIJetpack
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIJETPACK
+
+  JetpackParent();
+  ~JetpackParent();
+
+private:
+  JetpackProcessParent* mSubprocess;
+
+  DISALLOW_EVIL_CONSTRUCTORS(JetpackParent);
+};
+
+} // namespace jetpack
+} // namespace mozilla
+
+#endif // mozilla_jetpack_JetpackParent_h
diff --git a/js/jetpack/JetpackProcessChild.cpp b/js/jetpack/JetpackProcessChild.cpp
new file mode 100644
index 000000000000..c2b399fbdeaa
--- /dev/null
+++ b/js/jetpack/JetpackProcessChild.cpp
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 "mozilla/ipc/IOThreadChild.h"
+
+#include "mozilla/jetpack/JetpackProcessChild.h"
+
+using mozilla::ipc::IOThreadChild;
+
+namespace mozilla {
+namespace jetpack {
+
+bool
+JetpackProcessChild::Init()
+{
+  mJetpack.Init(ParentHandle(),
+                IOThreadChild::message_loop(),
+                IOThreadChild::channel());
+  return true;
+}
+
+void
+JetpackProcessChild::CleanUp()
+{
+  mJetpack.CleanUp();
+}
+
+} // namespace jetpack
+} // namespace mozilla
diff --git a/js/jetpack/JetpackProcessChild.h b/js/jetpack/JetpackProcessChild.h
new file mode 100644
index 000000000000..3941663f01fa
--- /dev/null
+++ b/js/jetpack/JetpackProcessChild.h
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 mozilla_jetpack_JetpackProcessChild_h
+#define mozilla_jetpack_JetpackProcessChild_h
+
+#include "mozilla/ipc/ProcessChild.h"
+
+#include "mozilla/jetpack/JetpackChild.h"
+
+namespace mozilla {
+namespace jetpack {
+
+// The JetpackProcessChild class represents the thread where jetpack code is run;
+// the main() thread is the I/O thread of the jetpack process.
+
+class JetpackProcessChild : public mozilla::ipc::ProcessChild
+{
+  typedef mozilla::ipc::ProcessChild ProcessChild;
+
+public:
+  JetpackProcessChild(ProcessHandle aParentHandle)
+    : ProcessChild(aParentHandle)
+  { }
+
+  virtual ~JetpackProcessChild()
+  { }
+
+  NS_OVERRIDE virtual bool Init();
+  NS_OVERRIDE virtual void CleanUp();
+
+  static JetpackProcessChild* current() {
+    return static_cast<JetpackProcessChild*>(ProcessChild::current());
+  }
+
+private:
+  JetpackChild mJetpack;
+
+  DISALLOW_EVIL_CONSTRUCTORS(JetpackProcessChild);
+};
+
+}
+}
+
+#endif // mozilla_jetpack_JetpackProcessChild_h
diff --git a/js/jetpack/JetpackProcessParent.cpp b/js/jetpack/JetpackProcessParent.cpp
new file mode 100644
index 000000000000..def56c634943
--- /dev/null
+++ b/js/jetpack/JetpackProcessParent.cpp
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 "mozilla/jetpack/JetpackProcessParent.h"
+
+#include "mozilla/ipc/BrowserProcessSubThread.h"
+
+namespace mozilla {
+namespace jetpack {
+
+JetpackProcessParent::JetpackProcessParent()
+  : mozilla::ipc::GeckoChildProcessHost(GeckoProcessType_Jetpack)
+{
+}
+
+JetpackProcessParent::~JetpackProcessParent()
+{
+}
+
+void
+JetpackProcessParent::Launch()
+{
+  AsyncLaunch();
+}
+
+} // namespace jetpack
+} // namespace mozilla
diff --git a/js/jetpack/JetpackProcessParent.h b/js/jetpack/JetpackProcessParent.h
new file mode 100644
index 000000000000..da62c23fe556
--- /dev/null
+++ b/js/jetpack/JetpackProcessParent.h
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 mozilla_jetpack_JetpackProcessParent_h
+#define mozilla_jetpack_JetpackProcessParent_h
+
+#include "base/basictypes.h"
+
+#include "base/file_path.h"
+#include "base/scoped_ptr.h"
+#include "base/thread.h"
+#include "base/waitable_event.h"
+#include "chrome/common/child_process_host.h"
+
+#include "mozilla/ipc/GeckoChildProcessHost.h"
+
+namespace mozilla {
+namespace jetpack {
+
+class JetpackProcessParent : mozilla::ipc::GeckoChildProcessHost
+{
+public:
+  JetpackProcessParent();
+  ~JetpackProcessParent();
+
+  /**
+   * Aynchronously launch the jetpack process.
+   */
+  void Launch();
+
+  using mozilla::ipc::GeckoChildProcessHost::GetShutDownEvent;
+  using mozilla::ipc::GeckoChildProcessHost::GetChannel;
+  using mozilla::ipc::GeckoChildProcessHost::GetChildProcessHandle;
+
+private:
+    DISALLOW_EVIL_CONSTRUCTORS(JetpackProcessParent);
+};
+
+} // namespace jetpack
+} // namespace mozilla
+
+#endif // mozilla_jetpack_JetpackProcessParent_h
diff --git a/js/jetpack/JetpackService.cpp b/js/jetpack/JetpackService.cpp
new file mode 100644
index 000000000000..ee197575ebc7
--- /dev/null
+++ b/js/jetpack/JetpackService.cpp
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 "base/basictypes.h"
+#include "mozilla/jetpack/JetpackService.h"
+
+#include "mozilla/jetpack/JetpackParent.h"
+#include "nsIJetpack.h"
+
+#include "nsIGenericFactory.h"
+
+namespace mozilla {
+namespace jetpack {
+
+NS_IMPL_ISUPPORTS1(JetpackService,
+                   nsIJetpackService)
+
+NS_IMETHODIMP
+JetpackService::CreateJetpack(nsIJetpack** aResult)
+{
+  nsRefPtr<JetpackParent> j = new JetpackParent();
+  *aResult = j.forget().get();
+  return NS_OK;
+}
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(JetpackService)
+
+} // namespace jetpack
+} // namespace mozilla
+
+#define JETPACKSERVICE_CID \
+{ 0x4cf18fcd, 0x4247, 0x4388, \
+  { 0xb1, 0x88, 0xb0, 0x72, 0x2a, 0xc0, 0x52, 0x21 } }
+
+static const nsModuleComponentInfo kComponents[] = {
+  {
+    "mozilla::jetpack::JetpackService",
+    JETPACKSERVICE_CID,
+    "@mozilla.org/jetpack/service;1",
+    mozilla::jetpack::JetpackServiceConstructor
+  }
+};
+
+NS_IMPL_NSGETMODULE(jetpack, kComponents)
+
diff --git a/js/jetpack/JetpackService.h b/js/jetpack/JetpackService.h
new file mode 100644
index 000000000000..b30847a367ff
--- /dev/null
+++ b/js/jetpack/JetpackService.h
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 mozilla_jetpack_JetpackService_h
+#define mozilla_jetpack_JetpackService_h
+
+#include "nsIJetpackService.h"
+
+namespace mozilla {
+namespace jetpack {
+
+class JetpackService : public nsIJetpackService
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIJETPACKSERVICE
+};
+
+} // jetpack
+} // mozilla
+
+#endif // mozilla_jetpack_JetpackService_h
diff --git a/js/jetpack/Makefile.in b/js/jetpack/Makefile.in
new file mode 100644
index 000000000000..a95d3abe706a
--- /dev/null
+++ b/js/jetpack/Makefile.in
@@ -0,0 +1,76 @@
+# ***** 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 Firefox.
+#
+# The Initial Developer of the Original Code is
+# the Mozilla Foundation <http://www.mozilla.org>.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# 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 *****
+
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = jetpack
+LIBRARY_NAME = jetpack_s
+LIBXUL_LIBRARY = 1
+FORCE_STATIC_LIB = 1
+IS_COMPONENT = 1
+EXPORT_LIBRARY = 1
+MODULE_NAME = jetpack
+
+XPIDLSRCS = \
+  nsIJetpackService.idl \
+  nsIJetpack.idl \
+  $(NULL)
+
+EXPORTS_NAMESPACES = mozilla/jetpack
+EXPORTS_mozilla/jetpack = \
+  JetpackProcessChild.h \
+  JetpackProcessParent.h \
+  JetpackParent.h \
+  JetpackChild.h \
+  JetpackService.h \
+  $(NULL)
+
+CPPSRCS = \
+  JetpackParent.cpp \
+  JetpackChild.cpp \
+  JetpackProcessChild.cpp \
+  JetpackProcessParent.cpp \
+  JetpackService.cpp \
+  $(NULL)
+
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
+include $(topsrcdir)/config/rules.mk
diff --git a/js/jetpack/PJetpack.ipdl b/js/jetpack/PJetpack.ipdl
new file mode 100644
index 000000000000..438a57246b80
--- /dev/null
+++ b/js/jetpack/PJetpack.ipdl
@@ -0,0 +1,48 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 ***** */
+
+namespace mozilla {
+namespace jetpack {
+
+async protocol PJetpack
+{
+child:
+  async LoadImplementation(nsCString script);
+};
+
+}
+}
diff --git a/js/jetpack/ipdl.mk b/js/jetpack/ipdl.mk
new file mode 100644
index 000000000000..7e95c589836f
--- /dev/null
+++ b/js/jetpack/ipdl.mk
@@ -0,0 +1,3 @@
+IPDLSRCS = \
+  PJetpack.ipdl \
+  $(NULL)
diff --git a/js/jetpack/nsIJetpack.idl b/js/jetpack/nsIJetpack.idl
new file mode 100644
index 000000000000..68d06fcafdc4
--- /dev/null
+++ b/js/jetpack/nsIJetpack.idl
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 "nsISupports.idl"
+
+[scriptable, uuid(be12cc9f-75d4-4f2d-b062-f549ea13446a)]
+interface nsIJetpack : nsISupports
+{
+  void loadImplementation(in AString aURI);
+};
diff --git a/js/jetpack/nsIJetpackService.idl b/js/jetpack/nsIJetpackService.idl
new file mode 100644
index 000000000000..96cc25503c4e
--- /dev/null
+++ b/js/jetpack/nsIJetpackService.idl
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * 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 "nsISupports.idl"
+
+interface nsIJetpack;
+
+[scriptable, uuid(2e097e3e-225f-42a3-87a8-c5c22659fef0)]
+interface nsIJetpackService : nsISupports
+{
+  nsIJetpack createJetpack();
+};
diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index 2a7fd5f4a4a1..aca547cbebd5 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -153,6 +153,10 @@ COMPONENT_LIBS += \
 	appcomps \
 	$(NULL)
 
+ifdef MOZ_IPC
+COMPONENT_LIBS +=  jetpack_s
+endif
+
 ifdef BUILD_CTYPES
 COMPONENT_LIBS += \
 	jsctypes \
diff --git a/toolkit/library/nsStaticXULComponents.cpp b/toolkit/library/nsStaticXULComponents.cpp
index 0ed239ebfadd..cfcda634e7da 100644
--- a/toolkit/library/nsStaticXULComponents.cpp
+++ b/toolkit/library/nsStaticXULComponents.cpp
@@ -137,6 +137,13 @@
 #define LAYOUT_DEBUG_MODULE
 #endif
 
+#ifdef MOZ_IPC
+#define JETPACK_MODULES \
+    MODULE(jetpack)
+#else
+#define JETPACK_MODULES
+#endif
+
 #ifdef MOZ_PLUGINS
 #define PLUGINS_MODULES \
     MODULE(nsPluginModule)
@@ -243,6 +250,7 @@
     WIDGET_MODULES                           \
     MODULE(nsImageLib2Module)                \
     ICON_MODULE                              \
+    JETPACK_MODULES                          \
     PLUGINS_MODULES                          \
     MODULE(nsLayoutModule)                   \
     MODULE(docshell_provider)                \
diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index ad3010e8c675..47ef4e1913db 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -85,6 +85,7 @@ MAKEFILES_dom="
   dom/src/threads/Makefile
   dom/locales/Makefile
   dom/plugins/Makefile
+  js/jetpack/Makefile
 "
 
 MAKEFILES_editor="
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index 53f8f336f6b1..31faf05646ed 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -104,7 +104,7 @@ endif
 #
 
 ifdef MOZ_IPC
-tier_platform_dirs += ipc
+tier_platform_dirs += ipc js/jetpack
 endif
 
 tier_platform_dirs += \
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index ad79f4ae4373..e51ff5ed9e25 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -743,6 +743,7 @@ nsXULAppInfo::GetWidgetToolkit(nsACString& aResult)
 SYNC_ENUMS(DEFAULT, Default)
 SYNC_ENUMS(PLUGIN, Plugin)
 SYNC_ENUMS(CONTENT, Content)
+SYNC_ENUMS(JETPACK, Jetpack)
 SYNC_ENUMS(IPDLUNITTEST, IPDLUnitTest)
 
 // .. and ensure that that is all of them:
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 9ef55fda0c6f..025b2560a319 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -89,6 +89,7 @@
 #include "mozilla/ipc/ProcessChild.h"
 #include "ScopedXREEmbed.h"
 
+#include "mozilla/jetpack/JetpackProcessChild.h"
 #include "mozilla/plugins/PluginProcessChild.h"
 
 #ifdef MOZ_IPDL_TESTS
@@ -104,6 +105,7 @@ using mozilla::ipc::IOThreadChild;
 using mozilla::ipc::ProcessChild;
 using mozilla::ipc::ScopedXREEmbed;
 
+using mozilla::jetpack::JetpackProcessChild;
 using mozilla::plugins::PluginProcessChild;
 
 using mozilla::startup::sChildProcessType;
@@ -393,6 +395,10 @@ XRE_InitChildProcess(int aArgc,
       process = new PluginProcessChild(parentHandle);
       break;
 
+    case GeckoProcessType_Jetpack:
+      process = new JetpackProcessChild(parentHandle);
+      break;
+
     case GeckoProcessType_IPDLUnitTest:
 #ifdef MOZ_IPDL_TESTS
       process = new IPDLUnitTestProcessChild(parentHandle);
diff --git a/xpcom/build/nsXULAppAPI.h b/xpcom/build/nsXULAppAPI.h
index 2c70cc679d2c..5056c5eb83df 100644
--- a/xpcom/build/nsXULAppAPI.h
+++ b/xpcom/build/nsXULAppAPI.h
@@ -424,6 +424,7 @@ enum GeckoProcessType {
 
   GeckoProcessType_Plugin,
   GeckoProcessType_Content,
+  GeckoProcessType_Jetpack,
 
   GeckoProcessType_IPDLUnitTest,
 
@@ -435,6 +436,7 @@ static const char* const kGeckoProcessTypeString[] = {
   "default",
   "plugin",
   "tab",
+  "jetpack",
   "ipdlunittest"
 };
 
diff --git a/xpcom/system/nsIXULRuntime.idl b/xpcom/system/nsIXULRuntime.idl
index f26707f7d718..39f91d61d33c 100644
--- a/xpcom/system/nsIXULRuntime.idl
+++ b/xpcom/system/nsIXULRuntime.idl
@@ -93,7 +93,8 @@ interface nsIXULRuntime : nsISupports
   const unsigned long PROCESS_TYPE_DEFAULT = 0;
   const unsigned long PROCESS_TYPE_PLUGIN = 1;
   const unsigned long PROCESS_TYPE_CONTENT = 2;
-  const unsigned long PROCESS_TYPE_IPDLUNITTEST = 3;
+  const unsigned long PROCESS_TYPE_JETPACK = 3;
+  const unsigned long PROCESS_TYPE_IPDLUNITTEST = 4;
 
   /**
    * The type of the caller's process.  Returns one of the values above.

From efe16a69c17c3dfb533782f9fb7388bd772989bd Mon Sep 17 00:00:00 2001
From: Ben Newman <bnewman@mozilla.com>
Date: Fri, 25 Jun 2010 08:00:37 -0700
Subject: [PATCH 025/172] Implement the multi-process Jetpack API (bug 556846).
 r=bsmedberg,bent

---
 js/jetpack/Handle.h                   | 305 ++++++++++++++
 js/jetpack/JetpackActorCommon.cpp     | 560 ++++++++++++++++++++++++++
 js/jetpack/JetpackActorCommon.h       | 143 +++++++
 js/jetpack/JetpackChild.cpp           | 359 ++++++++++++++++-
 js/jetpack/JetpackChild.h             |  37 +-
 js/jetpack/JetpackParent.cpp          | 180 ++++++++-
 js/jetpack/JetpackParent.h            |  22 +-
 js/jetpack/JetpackService.cpp         |  17 +-
 js/jetpack/Makefile.in                |   7 +
 js/jetpack/PHandle.ipdl               |  56 +++
 js/jetpack/PJetpack.ipdl              |  56 ++-
 js/jetpack/ipdl.mk                    |   1 +
 js/jetpack/nsIJetpack.idl             |  18 +-
 js/jetpack/tests/Makefile.in          |  50 +++
 js/jetpack/tests/unit/handle_tests.js |  99 +++++
 js/jetpack/tests/unit/impl.js         |  43 ++
 js/jetpack/tests/unit/test_jetpack.js | 186 +++++++++
 17 files changed, 2113 insertions(+), 26 deletions(-)
 create mode 100644 js/jetpack/Handle.h
 create mode 100644 js/jetpack/JetpackActorCommon.cpp
 create mode 100644 js/jetpack/JetpackActorCommon.h
 create mode 100644 js/jetpack/PHandle.ipdl
 create mode 100644 js/jetpack/tests/Makefile.in
 create mode 100644 js/jetpack/tests/unit/handle_tests.js
 create mode 100644 js/jetpack/tests/unit/impl.js
 create mode 100644 js/jetpack/tests/unit/test_jetpack.js

diff --git a/js/jetpack/Handle.h b/js/jetpack/Handle.h
new file mode 100644
index 000000000000..bb06769cf738
--- /dev/null
+++ b/js/jetpack/Handle.h
@@ -0,0 +1,305 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sw=4 et tw=80:
+ *
+ * ***** 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
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Newman <mozilla@benjamn.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of 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 mozilla_jetpack_HandleParent_h
+#define mozilla_jetpack_HandleParent_h
+
+#include "mozilla/jetpack/PHandleParent.h"
+#include "mozilla/jetpack/PHandleChild.h"
+
+#include "jsapi.h"
+#include "jsobj.h"
+#include "jscntxt.h"
+
+namespace mozilla {
+namespace jetpack {
+
+/**
+ * BaseType should be one of PHandleParent or PHandleChild; see the
+ * HandleParent and HandleChild typedefs at the bottom of this file.
+ */
+template <class BaseType>
+class Handle
+  : public BaseType
+{
+  Handle(Handle* parent)
+    : mParent(parent)
+    , mObj(NULL)
+    , mRuntime(NULL)
+  {}
+
+  BaseType* AllocPHandle() {
+    return new Handle(this);
+  }
+
+  bool DeallocPHandle(BaseType* actor) {
+    delete actor;
+    return true;
+  }
+
+public:
+
+  Handle()
+    : mParent(NULL)
+    , mObj(NULL)
+    , mRuntime(NULL)
+  {}
+
+  ~Handle() { TearDown(); }
+
+  static Handle* FromJSObject(JSContext* cx, JSObject* obj) {
+    // TODO Convert non-Handles to Handles somehow?
+    return Unwrap(cx, obj);
+  }
+
+  static Handle* FromJSVal(JSContext* cx, jsval val) {
+    if (!JSVAL_IS_OBJECT(val))
+      return NULL;
+    return Unwrap(cx, JSVAL_TO_OBJECT(val));
+  }
+
+  JSObject* ToJSObject(JSContext* cx) const {
+    if (!mObj && !mRuntime) {
+      JSAutoRequest request(cx);
+
+      JSClass* clasp = const_cast<JSClass*>(&sHandle_JSClass);
+      JSObject* obj = JS_NewObject(cx, clasp, NULL, NULL);
+      if (!obj)
+        return NULL;
+      js::AutoObjectRooter root(cx, obj);
+
+      JSPropertySpec* ps = const_cast<JSPropertySpec*>(sHandle_Properties);
+      JSFunctionSpec* fs = const_cast<JSFunctionSpec*>(sHandle_Functions);
+      JSRuntime* rt;
+
+      const char* name = IsParent(this)
+        ? "mozilla::jetpack::Handle<PHandleParent>::mObj"
+        : "mozilla::jetpack::Handle<PHandleChild>::mObj";
+
+      if (JS_SetPrivate(cx, obj, (void*)this) &&
+          JS_DefineProperties(cx, obj, ps) &&
+          JS_DefineFunctions(cx, obj, fs) &&
+          JS_AddNamedRootRT(rt = JS_GetRuntime(cx), (void*)&mObj, name))
+      {
+        mObj = obj;
+        mRuntime = rt;
+      }
+    }
+    return mObj;
+  }
+
+protected:
+
+  void ActorDestroy(typename Handle::ActorDestroyReason why) {
+    TearDown();
+  }
+
+private:
+
+  static bool IsParent(const PHandleParent* handle) { return true; }
+  static bool IsParent(const PHandleChild* handle) { return false; }
+
+  void TearDown() {
+    if (mObj) {
+      mObj->setPrivate(NULL);
+      mObj = NULL;
+      // Nulling out mObj effectively unroots the object, but we still
+      // need to remove the root, else the JS engine will complain at
+      // shutdown.
+      NS_ASSERTION(mRuntime, "Should have a JSRuntime if we had an object");
+      JS_RemoveRootRT(mRuntime, (void*)&mObj);
+      // By not nulling out mRuntime, we prevent ToJSObject from
+      // reviving an invalidated/destroyed handle.
+    }
+  }
+
+  static const JSClass        sHandle_JSClass;
+  static const JSPropertySpec sHandle_Properties[];
+  static const JSFunctionSpec sHandle_Functions[];
+
+  Handle* const mParent;
+
+  // Used to cache the JSObject returned by ToJSObject, which is
+  // otherwise a const method.
+  mutable JSObject*  mObj;
+  mutable JSRuntime* mRuntime;
+
+  static Handle*
+  Unwrap(JSContext* cx, JSObject* obj) {
+    while (obj && obj->getClass() != &sHandle_JSClass)
+      obj = obj->getProto();
+
+    if (!obj)
+      return NULL;
+
+    Handle* self = static_cast<Handle*>(JS_GetPrivate(cx, obj));
+
+    NS_ASSERTION(!self || self->ToJSObject(cx) == obj,
+                 "Wrapper and wrapped object disagree?");
+
+    return self;
+  }
+
+  static JSBool
+  GetParent(JSContext* cx, JSObject* obj, jsval, jsval* vp) {
+    JS_SET_RVAL(cx, vp, JSVAL_NULL);
+
+    Handle* self = Unwrap(cx, obj);
+    if (!self)
+      return JS_TRUE;
+
+    Handle* parent = self->mParent;
+    if (!parent)
+      return JS_TRUE;
+
+    JSObject* pobj = parent->ToJSObject(cx);
+    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(pobj));
+
+    return JS_TRUE;
+  }
+
+  static JSBool
+  GetIsValid(JSContext* cx, JSObject* obj, jsval, jsval* vp) {
+    Handle* self = Unwrap(cx, obj);
+    JS_SET_RVAL(cx, vp, BOOLEAN_TO_JSVAL(!!self));
+    return JS_TRUE;
+  }
+
+  static JSBool
+  Invalidate(JSContext* cx, uintN argc, jsval* vp) {
+    if (argc > 0) {
+      JS_ReportError(cx, "invalidate takes zero arguments");
+      return JS_FALSE;
+    }
+
+    Handle* self = Unwrap(cx, JS_THIS_OBJECT(cx, vp));
+    if (self) {
+      JS_SET_RVAL(cx, vp, BOOLEAN_TO_JSVAL(JS_TRUE));
+      if (!Send__delete__(self)) {
+        JS_ReportError(cx, "Failed to send __delete__ while invalidating");
+        return JS_FALSE;
+      }
+    } else {
+      JS_SET_RVAL(cx, vp, BOOLEAN_TO_JSVAL(JS_FALSE));
+    }
+
+    return JS_TRUE;
+  }
+
+  static JSBool
+  CreateHandle(JSContext* cx, uintN argc, jsval* vp) {
+    if (argc > 0) {
+      JS_ReportError(cx, "createHandle takes zero arguments");
+      return JS_FALSE;
+    }
+
+    Handle* self = Unwrap(cx, JS_THIS_OBJECT(cx, vp));
+    if (!self) {
+      JS_ReportError(cx, "Tried to create child from invalid handle");
+      return JS_FALSE;
+    }
+
+    BaseType* child = self->SendPHandleConstructor();
+    if (!child) {
+      JS_ReportError(cx, "Failed to construct child");
+      return JS_FALSE;
+    }
+
+    JSObject* obj = static_cast<Handle*>(child)->ToJSObject(cx);
+    JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(obj));
+
+    return JS_TRUE;
+  }
+
+  static void
+  Finalize(JSContext* cx, JSObject* obj) {
+    Handle* self = Unwrap(cx, obj);
+    // Avoid warnings about unused return values:
+    self && Send__delete__(self);
+  }
+
+};
+
+template <class BaseType>
+const JSClass
+Handle<BaseType>::sHandle_JSClass = {
+  "IPDL Handle", JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub, JS_PropertyStub,
+  JS_PropertyStub, JS_PropertyStub,
+  JS_EnumerateStub, JS_ResolveStub,
+  JS_ConvertStub, Handle::Finalize,
+  JSCLASS_NO_OPTIONAL_MEMBERS
+};
+
+#define HANDLE_PROP_FLAGS (JSPROP_READONLY | JSPROP_PERMANENT)
+
+template <class BaseType>
+const JSPropertySpec
+Handle<BaseType>::sHandle_Properties[] = {
+  { "parent",  0, HANDLE_PROP_FLAGS, GetParent,  NULL },
+  { "isValid", 0, HANDLE_PROP_FLAGS, GetIsValid, NULL },
+  { 0, 0, 0, NULL, NULL }
+};
+
+#undef HANDLE_PROP_FLAGS
+
+#define HANDLE_FUN_FLAGS (JSFUN_FAST_NATIVE |   \
+                          JSPROP_READONLY |     \
+                          JSPROP_PERMANENT)
+
+template <class BaseType>
+const JSFunctionSpec
+Handle<BaseType>::sHandle_Functions[] = {
+  JS_FN("invalidate",   Invalidate,   0, HANDLE_FUN_FLAGS),
+  JS_FN("createHandle", CreateHandle, 0, HANDLE_FUN_FLAGS),
+  JS_FS_END
+};
+
+#undef HANDLE_FUN_FLAGS
+
+// The payoff for using templates is that these two implementations are
+// guaranteed to be perfectly symmetric:
+typedef Handle<PHandleParent> HandleParent;
+typedef Handle<PHandleChild> HandleChild;
+
+} // namespace jetpack
+} // namespace mozilla
+
+#endif
diff --git a/js/jetpack/JetpackActorCommon.cpp b/js/jetpack/JetpackActorCommon.cpp
new file mode 100644
index 000000000000..22a144fe4d0b
--- /dev/null
+++ b/js/jetpack/JetpackActorCommon.cpp
@@ -0,0 +1,560 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Newman <mozilla@benjamn.com> (original author)
+ *
+ * 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 "base/basictypes.h"
+#include "jscntxt.h"
+
+#include "mozilla/jetpack/JetpackActorCommon.h"
+#include "mozilla/jetpack/PJetpack.h"
+#include "mozilla/jetpack/PHandleParent.h"
+#include "mozilla/jetpack/PHandleChild.h"
+#include "mozilla/jetpack/Handle.h"
+
+#include "jsapi.h"
+#include "jstl.h"
+#include "jshashtable.h"
+
+using mozilla::jetpack::JetpackActorCommon;
+using mozilla::jetpack::PHandleParent;
+using mozilla::jetpack::HandleParent;
+using mozilla::jetpack::PHandleChild;
+using mozilla::jetpack::HandleChild;
+using mozilla::jetpack::KeyValue;
+using mozilla::jetpack::PrimVariant;
+using mozilla::jetpack::CompVariant;
+using mozilla::jetpack::Variant;
+
+class JetpackActorCommon::OpaqueSeenType
+{
+public:
+  typedef JSObject* KeyType;
+  typedef size_t IdType;
+  typedef js::HashMap<
+    KeyType, IdType,
+    js::DefaultHasher<KeyType>,
+    js::SystemAllocPolicy
+  > MapType;
+
+  OpaqueSeenType() {
+    NS_ASSERTION(map.init(1), "Failed to initialize map");
+  }
+
+  bool ok() { return map.initialized(); }
+
+  // Reserving 0 as an invalid ID means starting the valid IDs at 1.  We
+  // could have reserved a dummy first element of rmap, but that would
+  // have wasted space.
+  static const IdType kInvalidId = 0;
+
+  bool add(KeyType obj, IdType* id) {
+    MapType::AddPtr ap = map.lookupForAdd(obj);
+    if (!ap) {
+      if (!rmap.AppendElement(obj) ||
+          !map.add(ap, obj, *id = rmap.Length()))
+        *id = kInvalidId;
+      return true;
+    }
+    *id = ap->value;
+    return false;
+  }
+
+  KeyType reverseLookup(IdType id) {
+    return rmap.SafeElementAt(id - 1, NULL);
+  }
+
+private:
+  MapType map;
+  nsAutoTArray<KeyType, 4> rmap;
+
+};
+
+bool
+JetpackActorCommon::jsval_to_PrimVariant(JSContext* cx, JSType type, jsval from,
+                                         PrimVariant* to)
+{
+  // A false return from this function just means the value couldn't be
+  // converted to a PrimVariant (i.e., it wasn't a primitive value).
+
+  switch (type) {
+  case JSTYPE_VOID:
+    *to = void_t();
+    return true;
+
+  case JSTYPE_NULL:
+    *to = null_t();
+    return true;
+
+  case JSTYPE_FUNCTION:
+    return false;
+
+  case JSTYPE_OBJECT: {
+    HandleParent* hp = HandleParent::FromJSVal(cx, from);
+    HandleChild* hc = HandleChild::FromJSVal(cx, from);
+    NS_ASSERTION(!hc || !hp, "Can't be both a parent and a child");
+    if (hp) {
+      *to = hp;
+      return true;
+    }
+    if (hc) {
+      *to = hc;
+      return true;
+    }
+    return false;
+  }
+
+  case JSTYPE_STRING:
+    *to = nsDependentString((PRUnichar*)JS_GetStringChars(JSVAL_TO_STRING(from)),
+                            JS_GetStringLength(JSVAL_TO_STRING(from)));
+    return true;
+
+  case JSTYPE_NUMBER:
+    if (JSVAL_IS_INT(from))
+      *to = JSVAL_TO_INT(from);
+    else if (JSVAL_IS_DOUBLE(from))
+      *to = *JSVAL_TO_DOUBLE(from);
+    else
+      return false;
+    return true;
+
+  case JSTYPE_BOOLEAN:
+    *to = !!JSVAL_TO_BOOLEAN(from);
+    return true;
+
+  case JSTYPE_XML:
+    return false;
+
+  default:
+    return false;
+  }
+}
+
+bool
+JetpackActorCommon::jsval_to_CompVariant(JSContext* cx, JSType type, jsval from,
+                                         CompVariant* to, OpaqueSeenType* seen)
+{
+  if (type != JSTYPE_OBJECT)
+    return false;
+
+  js::LazilyConstructed<OpaqueSeenType> lost;
+  if (!seen) {
+    lost.construct();
+    seen = lost.addr();
+    if (!seen->ok())
+      return false;
+  }
+
+  OpaqueSeenType::KeyType obj = JSVAL_TO_OBJECT(from);
+  OpaqueSeenType::IdType id;
+  if (!seen->add(obj, &id)) {
+    if (OpaqueSeenType::kInvalidId == id)
+      return false;
+    *to = CompVariant(id);
+    return true;
+  }
+
+  if (JS_IsArrayObject(cx, obj)) {
+    nsTArray<Variant> elems;
+    jsuint len;
+    if (!JS_GetArrayLength(cx, obj, &len) ||
+        !elems.SetCapacity(len))
+      return false;
+    for (jsuint i = 0; i < len; ++i) {
+      jsval val;
+      Variant* vp = elems.AppendElement();
+      if (!JS_GetElement(cx, obj, i, &val) ||
+          !jsval_to_Variant(cx, val, vp, seen))
+        *vp = void_t();
+    }
+    *to = elems;
+    return true;
+  }
+
+  js::AutoIdArray ida(cx, JS_Enumerate(cx, obj));
+  if (!ida)
+    return false;
+
+  nsTArray<KeyValue> kvs;
+  for (size_t i = 0; i < ida.length(); ++i) {
+    jsval val; // reused for both key and value
+    if (!JS_IdToValue(cx, ida[i], &val))
+      return false;
+    JSString* idStr = JS_ValueToString(cx, val);
+    if (!idStr)
+      return false;
+    if (!JS_GetPropertyById(cx, obj, ida[i], &val))
+      return false;
+    KeyValue kv;
+    // Silently drop properties that can't be converted.
+    if (jsval_to_Variant(cx, val, &kv.value(), seen)) {
+      kv.key() = nsDependentString((PRUnichar*)JS_GetStringChars(idStr),
+                                   JS_GetStringLength(idStr));
+      // If AppendElement fails, we lose this property, no big deal.
+      kvs.AppendElement(kv);
+    }
+  }
+  *to = kvs;
+
+  return true;
+}
+
+bool
+JetpackActorCommon::jsval_to_Variant(JSContext* cx, jsval from, Variant* to,
+                                     OpaqueSeenType* seen)
+{
+  JSType type = JS_TypeOfValue(cx, from);
+  if (JSVAL_IS_NULL(from))
+    type = JSTYPE_NULL;
+
+  PrimVariant pv;
+  if (jsval_to_PrimVariant(cx, type, from, &pv)) {
+    *to = pv;
+    return true;
+  }
+
+  CompVariant cv;
+  if (jsval_to_CompVariant(cx, type, from, &cv, seen)) {
+    *to = cv;
+    return true;
+  }
+
+  return false;
+}
+
+bool
+JetpackActorCommon::jsval_from_PrimVariant(JSContext* cx,
+                                           const PrimVariant& from,
+                                           jsval* to)
+{
+  switch (from.type()) {
+  case PrimVariant::Tvoid_t:
+    *to = JSVAL_VOID;
+    return true;
+
+  case PrimVariant::Tnull_t:
+    *to = JSVAL_NULL;
+    return true;
+
+  case PrimVariant::Tbool:
+    *to = from.get_bool() ? JSVAL_TRUE : JSVAL_FALSE;
+    return true;
+
+  case PrimVariant::Tint:
+    *to = INT_TO_JSVAL(from.get_int());
+    return true;
+
+  case PrimVariant::Tdouble:
+    return !!JS_NewDoubleValue(cx, from.get_double(), to);
+
+  case PrimVariant::TnsString: {
+    const nsString& str = from.get_nsString();
+    // TODO Use some sort of sharedstring/stringbuffer abstraction to
+    // exploit sharing opportunities more generally.
+    if (!str.Length()) {
+      *to = JS_GetEmptyStringValue(cx);
+      return true;
+    }
+    JSString* s =
+      JS_NewUCStringCopyN(cx, str.get(), str.Length());
+    if (!s)
+      return false;
+    *to = STRING_TO_JSVAL(s);
+    return true;
+  }
+
+  case PrimVariant::TPHandleParent: {
+    JSObject* hobj =
+      static_cast<const HandleParent*>(from.get_PHandleParent())->ToJSObject(cx);
+    if (!hobj)
+      return false;
+    *to = OBJECT_TO_JSVAL(hobj);
+    return true;
+  }    
+
+  case PrimVariant::TPHandleChild: {
+    JSObject* hobj =
+      static_cast<const HandleChild*>(from.get_PHandleChild())->ToJSObject(cx);
+    if (!hobj)
+      return false;
+    *to = OBJECT_TO_JSVAL(hobj);
+    return true;
+  }
+
+  default:
+    return false;
+  }
+}
+
+bool
+JetpackActorCommon::jsval_from_CompVariant(JSContext* cx,
+                                           const CompVariant& from,
+                                           jsval* to,
+                                           OpaqueSeenType* seen)
+{
+  js::LazilyConstructed<OpaqueSeenType> lost;
+  if (!seen) {
+    lost.construct();
+    seen = lost.addr();
+    if (!seen->ok())
+      return false;
+  }
+
+  JSObject* obj = NULL;
+
+  switch (from.type()) {
+  case CompVariant::TArrayOfKeyValue: {
+    if (!(obj = JS_NewObject(cx, NULL, NULL, NULL)))
+      return false;
+    js::AutoObjectRooter root(cx, obj);
+
+    OpaqueSeenType::IdType ignored;
+    if (!seen->add(obj, &ignored))
+      return false;
+
+    const nsTArray<KeyValue>& kvs = from.get_ArrayOfKeyValue();
+    for (PRUint32 i = 0; i < kvs.Length(); ++i) {
+      const KeyValue& kv = kvs.ElementAt(i);
+      js::AutoValueRooter toSet(cx);
+      if (!jsval_from_Variant(cx, kv.value(), toSet.addr(), seen) ||
+          !JS_SetUCProperty(cx, obj,
+                            kv.key().get(),
+                            kv.key().Length(),
+                            toSet.addr()))
+        return false;
+    }
+
+    break;
+  }
+
+  case CompVariant::TArrayOfVariant: {
+    const nsTArray<Variant>& vs = from.get_ArrayOfVariant();
+    nsAutoTArray<jsval, 8> jsvals;
+    jsval* elems = jsvals.AppendElements(vs.Length());
+    if (!elems)
+      return false;
+    for (PRUint32 i = 0; i < vs.Length(); ++i)
+      elems[i] = JSVAL_VOID;
+    js::AutoArrayRooter root(cx, vs.Length(), elems);
+
+    OpaqueSeenType::IdType ignored;
+    if (!seen->add(obj, &ignored))
+      return false;
+
+    for (PRUint32 i = 0; i < vs.Length(); ++i)
+      if (!jsval_from_Variant(cx, vs.ElementAt(i), elems + i, seen))
+        return false;
+
+    if (!(obj = JS_NewArrayObject(cx, vs.Length(), elems)))
+      return false;
+
+    break;
+  }
+
+  case CompVariant::Tsize_t:
+    if (!(obj = seen->reverseLookup(from.get_size_t())))
+      return false;
+    break;
+
+  default:
+    return false;
+  }
+
+  *to = OBJECT_TO_JSVAL(obj);
+  return true;
+}
+
+bool
+JetpackActorCommon::jsval_from_Variant(JSContext* cx, const Variant& from,
+                                       jsval* to, OpaqueSeenType* seen)
+{
+  switch (from.type()) {
+  case Variant::TPrimVariant:
+    return jsval_from_PrimVariant(cx, from, to);
+  case Variant::TCompVariant:
+    return jsval_from_CompVariant(cx, from, to, seen);
+  default:
+    return false;
+  }
+}
+
+bool
+JetpackActorCommon::RecvMessage(JSContext* cx,
+                                const nsString& messageName,
+                                const nsTArray<Variant>& data,
+                                nsTArray<Variant>* results)
+{
+  if (results)
+    results->Clear();
+
+  RecList* list;
+  if (!mReceivers.Get(messageName, &list))
+    return true;
+  nsAutoTArray<jsval, 4> snapshot;
+  list->copyTo(snapshot);
+  if (!snapshot.Length())
+    return true;
+  
+  nsAutoTArray<jsval, 4> args;
+  PRUint32 argc = data.Length() + 1;
+  jsval* argv = args.AppendElements(argc);
+  if (!argv)
+    return false;
+  for (PRUint32 i = 0; i < argc; ++i)
+    argv[i] = JSVAL_VOID;
+  js::AutoArrayRooter argvRooter(cx, argc, argv);
+
+  JSString* msgNameStr =
+    JS_NewUCStringCopyN(cx,
+                        messageName.get(),
+                        messageName.Length());
+  if (!msgNameStr)
+    return false;
+  argv[0] = STRING_TO_JSVAL(msgNameStr);
+
+  for (PRUint32 i = 0; i < data.Length(); ++i)
+    if (!jsval_from_Variant(cx, data.ElementAt(i), argv + i + 1))
+      return false;
+
+  JSObject* implGlobal = JS_GetGlobalObject(cx);
+  js::AutoValueRooter rval(cx);
+
+  const uint32 savedOptions =
+    JS_SetOptions(cx, JS_GetOptions(cx) | JSOPTION_DONT_REPORT_UNCAUGHT);
+
+  for (PRUint32 i = 0; i < snapshot.Length(); ++i) {
+    Variant* vp = results ? results->AppendElement() : NULL;
+    rval.set(JSVAL_VOID);
+    if (!JS_CallFunctionValue(cx, implGlobal, snapshot[i], argc, argv,
+                              rval.addr())) {
+      // If a receiver throws, we drop the exception on the floor.
+      JS_ClearPendingException(cx);
+      if (vp)
+        *vp = void_t();
+    } else if (vp && !jsval_to_Variant(cx, rval.value(), vp))
+      *vp = void_t();
+  }
+
+  JS_SetOptions(cx, savedOptions);
+
+  return true;
+}
+
+JetpackActorCommon::RecList::~RecList()
+{
+  while (mHead) {
+    RecNode* old = mHead;
+    mHead = mHead->down;
+    delete old;
+  }
+}
+
+void
+JetpackActorCommon::RecList::add(jsval v)
+{
+  RecNode* node = mHead, *tail = NULL;
+  while (node) {
+    if (node->value() == v)
+      return;
+    node = (tail = node)->down;
+  }
+  node = new RecNode(mCx, v);
+  if (tail)
+    tail->down = node;
+  else
+    mHead = node;
+}
+
+void
+JetpackActorCommon::RecList::remove(jsval v)
+{
+  while (mHead && mHead->value() == v) {
+    RecNode* old = mHead;
+    mHead = mHead->down;
+    delete old;
+  }
+  if (!mHead)
+    return;
+  RecNode* prev = mHead, *node = prev->down;
+  while (node) {
+    if (node->value() == v) {
+      prev->down = node->down;
+      delete node;
+    }
+    node = (prev = node)->down;
+  }
+}
+
+void
+JetpackActorCommon::RecList::copyTo(nsTArray<jsval>& dst) const
+{
+  dst.Clear();
+  for (RecNode* node = mHead; node; node = node->down)
+    dst.AppendElement(node->value());
+}
+
+nsresult
+JetpackActorCommon::RegisterReceiver(JSContext* cx,
+                                     const nsString& messageName,
+                                     jsval receiver)
+{
+  if (!JSVAL_IS_OBJECT(receiver) ||
+      !JS_ObjectIsFunction(cx, JSVAL_TO_OBJECT(receiver)))
+    return NS_ERROR_INVALID_ARG;
+
+  RecList* list;
+  if (!mReceivers.Get(messageName, &list)) {
+    list = new RecList(cx);
+    if (!list || !mReceivers.Put(messageName, list)) {
+      delete list;
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+  }
+
+  list->add(receiver);
+
+  return NS_OK;
+}
+
+void
+JetpackActorCommon::UnregisterReceiver(const nsString& messageName,
+                                       jsval receiver)
+{
+  RecList* list;
+  if (!mReceivers.Get(messageName, &list))
+    return;
+  list->remove(receiver);
+}
diff --git a/js/jetpack/JetpackActorCommon.h b/js/jetpack/JetpackActorCommon.h
new file mode 100644
index 000000000000..4c0372cdd2a1
--- /dev/null
+++ b/js/jetpack/JetpackActorCommon.h
@@ -0,0 +1,143 @@
+/* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */
+/* ***** 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 Firefox.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation <http://www.mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Newman <mozilla@benjamn.com> (original author)
+ *
+ * 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 mozilla_jetpack_JetpackActorCommon_h
+#define mozilla_jetpack_JetpackActorCommon_h
+
+#include "nsClassHashtable.h"
+#include "nsHashKeys.h"
+#include "nsTArray.h"
+#include "nsString.h"
+#include "nsAutoJSValHolder.h"
+
+struct JSContext;
+
+namespace mozilla {
+namespace jetpack {
+
+struct KeyValue;
+class PrimVariant;
+class CompVariant;
+class Variant;
+
+class JetpackActorCommon
+{
+public:
+
+  bool
+  RecvMessage(JSContext* cx,
+              const nsString& messageName,
+              const nsTArray<Variant>& data,
+              nsTArray<Variant>* results);
+
+  nsresult
+  RegisterReceiver(JSContext* cx,
+                   const nsString& messageName,
+                   jsval receiver);
+
+  void
+  UnregisterReceiver(const nsString& messageName,
+                     jsval receiver);
+
+  void
+  UnregisterReceivers(const nsString& messageName) {
+    mReceivers.Remove(messageName);
+  }
+
+  void ClearReceivers() {
+    mReceivers.Clear();
+  }
+
+  class OpaqueSeenType;
+  static bool jsval_to_Variant(JSContext* cx, jsval from, Variant* to,
+                               OpaqueSeenType* seen = NULL);
+  static bool jsval_from_Variant(JSContext* cx, const Variant& from, jsval* to,
+                                 OpaqueSeenType* seen = NULL);
+
+protected:
+
+  JetpackActorCommon() {
+    mReceivers.Init();
+    NS_ASSERTION(mReceivers.IsInitialized(),
+                 "Failed to initialize message receiver hash set");
+  }
+
+private:
+
+  static bool jsval_to_PrimVariant(JSContext* cx, JSType type, jsval from,
+                                   PrimVariant* to);
+  static bool jsval_to_CompVariant(JSContext* cx, JSType type, jsval from,
+                                   CompVariant* to, OpaqueSeenType* seen);
+
+  static bool jsval_from_PrimVariant(JSContext* cx, const PrimVariant& from,
+                                     jsval* to);
+  static bool jsval_from_CompVariant(JSContext* cx, const CompVariant& from,
+                                     jsval* to, OpaqueSeenType* seen);
+
+  // Don't want to be memcpy'ing nsAutoJSValHolders around, so we need a
+  // linked list of receivers.
+  class RecList
+  {
+    JSContext* mCx;
+    class RecNode
+    {
+      nsAutoJSValHolder mHolder;
+    public:
+      RecNode* down;
+      RecNode(JSContext* cx, jsval v) : down(NULL) {
+        mHolder.Hold(cx);
+        mHolder = v;
+      }
+      jsval value() { return mHolder; }
+    }* mHead;
+  public:
+    RecList(JSContext* cx) : mCx(cx), mHead(NULL) {}
+   ~RecList();
+    void add(jsval v);
+    void remove(jsval v);
+    void copyTo(nsTArray<jsval>& dst) const;
+  };
+
+  nsClassHashtable<nsStringHashKey, RecList> mReceivers;
+
+};
+
+} // namespace jetpack
+} // namespace mozilla
+
+#endif
diff --git a/js/jetpack/JetpackChild.cpp b/js/jetpack/JetpackChild.cpp
index 8aef63188e34..a3b50e07202b 100644
--- a/js/jetpack/JetpackChild.cpp
+++ b/js/jetpack/JetpackChild.cpp
@@ -35,25 +35,63 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "mozilla/jetpack/JetpackChild.h"
+#include "base/basictypes.h"
+#include "jscntxt.h"
 
-#include <stdio.h>
+#include "mozilla/jetpack/JetpackChild.h"
+#include "mozilla/jetpack/Handle.h"
+
+#include "jsarray.h"
 
 namespace mozilla {
 namespace jetpack {
 
 JetpackChild::JetpackChild()
 {
-  NS_ASSERTION(!gInstance, "Something terribly wrong here!");
-  gInstance = this;
 }
 
 JetpackChild::~JetpackChild()
 {
-  NS_ASSERTION(gInstance == this, "Something terribly wrong here!");
-  gInstance = nsnull;
 }
 
+#define IMPL_PROP_FLAGS (JSPROP_SHARED | \
+                         JSPROP_ENUMERATE | \
+                         JSPROP_READONLY | \
+                         JSPROP_PERMANENT)
+const JSPropertySpec
+JetpackChild::sImplProperties[] = {
+  { "jetpack", 0, IMPL_PROP_FLAGS, UserJetpackGetter, NULL },
+  { 0, 0, 0, NULL, NULL }
+};
+
+#undef IMPL_PROP_FLAGS
+
+#define IMPL_METHOD_FLAGS (JSFUN_FAST_NATIVE |  \
+                           JSPROP_ENUMERATE | \
+                           JSPROP_READONLY | \
+                           JSPROP_PERMANENT)
+const JSFunctionSpec
+JetpackChild::sImplMethods[] = {
+  JS_FN("sendMessage", SendMessage, 3, IMPL_METHOD_FLAGS),
+  JS_FN("callMessage", CallMessage, 2, IMPL_METHOD_FLAGS),
+  JS_FN("registerReceiver", RegisterReceiver, 2, IMPL_METHOD_FLAGS),
+  JS_FN("unregisterReceiver", UnregisterReceiver, 2, IMPL_METHOD_FLAGS),
+  JS_FN("unregisterReceivers", UnregisterReceivers, 1, IMPL_METHOD_FLAGS),
+  JS_FN("wrap", Wrap, 1, IMPL_METHOD_FLAGS),
+  JS_FN("createHandle", CreateHandle, 0, IMPL_METHOD_FLAGS),
+  JS_FS_END
+};
+
+#undef IMPL_METHOD_FLAGS
+
+const JSClass
+JetpackChild::sGlobalClass = {
+  "JetpackChild::sGlobalClass", JSCLASS_GLOBAL_FLAGS,
+  JS_PropertyStub,  JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
+  JS_EnumerateStub, JS_ResolveStub,  JS_ConvertStub,  JS_FinalizeStub,
+  JSCLASS_NO_OPTIONAL_MEMBERS
+};
+  
 bool
 JetpackChild::Init(base::ProcessHandle aParentProcessHandle,
                    MessageLoop* aIOLoop,
@@ -62,22 +100,325 @@ JetpackChild::Init(base::ProcessHandle aParentProcessHandle,
   if (!Open(aChannel, aParentProcessHandle, aIOLoop))
     return false;
 
+  if (!(mRuntime = JS_NewRuntime(32L * 1024L * 1024L)) ||
+      !(mImplCx = JS_NewContext(mRuntime, 8192)) ||
+      !(mUserCx = JS_NewContext(mRuntime, 8192)))
+    return false;
+
+  {
+    JSAutoRequest request(mImplCx);
+    JS_SetContextPrivate(mImplCx, this);
+    JSObject* implGlobal =
+      JS_NewGlobalObject(mImplCx, const_cast<JSClass*>(&sGlobalClass));
+    if (!implGlobal ||
+        !JS_InitStandardClasses(mImplCx, implGlobal) ||
+        !JS_DefineProperties(mImplCx, implGlobal,
+                             const_cast<JSPropertySpec*>(sImplProperties)) ||
+        !JS_DefineFunctions(mImplCx, implGlobal,
+                            const_cast<JSFunctionSpec*>(sImplMethods)))
+      return false;
+  }
+
+  {
+    JSAutoRequest request(mUserCx);
+    JS_SetContextPrivate(mUserCx, this);
+    JSObject* userGlobal =
+      JS_NewGlobalObject(mUserCx, const_cast<JSClass*>(&sGlobalClass));
+    if (!userGlobal ||
+        !JS_InitStandardClasses(mUserCx, userGlobal))
+      return false;
+  }
+
   return true;
 }
 
 void
 JetpackChild::CleanUp()
 {
+  JS_DestroyContext(mUserCx);
+  JS_DestroyContext(mImplCx);
+  JS_DestroyRuntime(mRuntime);
+  JS_ShutDown();
 }
 
 bool
-JetpackChild::RecvLoadImplementation(const nsCString& script)
+JetpackChild::RecvSendMessage(const nsString& messageName,
+                              const nsTArray<Variant>& data)
 {
-  printf("Received LoadImplementation message: '%s'\n", script.get());
+  JSAutoRequest request(mImplCx);
+  return JetpackActorCommon::RecvMessage(mImplCx, messageName, data, NULL);
+}
+
+static bool
+Evaluate(JSContext* cx, const nsCString& code)
+{
+  JSAutoRequest request(cx);
+  js::AutoValueRooter ignored(cx);
+  JS_EvaluateScript(cx, JS_GetGlobalObject(cx), code.get(),
+                    code.Length(), "", 1, ignored.addr());
   return true;
 }
 
-JetpackChild* JetpackChild::gInstance;
+bool
+JetpackChild::RecvLoadImplementation(const nsCString& code)
+{
+  return Evaluate(mImplCx, code);
+}
+
+bool
+JetpackChild::RecvLoadUserScript(const nsCString& code)
+{
+  return Evaluate(mUserCx, code);
+}
+
+PHandleChild*
+JetpackChild::AllocPHandle()
+{
+  return new HandleChild();
+}
+
+bool
+JetpackChild::DeallocPHandle(PHandleChild* actor)
+{
+  delete actor;
+  return true;
+}
+
+JetpackChild*
+JetpackChild::GetThis(JSContext* cx)
+{
+  JetpackChild* self =
+    static_cast<JetpackChild*>(JS_GetContextPrivate(cx));
+  JS_ASSERT(cx == self->mImplCx ||
+            cx == self->mUserCx);
+  return self;
+}
+
+JSBool
+JetpackChild::UserJetpackGetter(JSContext* cx, JSObject* obj, jsval id,
+                                jsval* vp)
+{
+  JSObject* userGlobal = JS_GetGlobalObject(GetThis(cx)->mUserCx);
+  JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(userGlobal));
+  return JS_TRUE;
+}
+
+struct MessageResult {
+  nsString msgName;
+  nsTArray<Variant> data;
+};
+
+static JSBool
+MessageCommon(JSContext* cx, uintN argc, jsval* vp,
+              MessageResult* result)
+{
+  if (argc < 1) {
+    JS_ReportError(cx, "Message requires a name, at least");
+    return JS_FALSE;
+  }
+
+  jsval* argv = JS_ARGV(cx, vp);
+
+  JSString* msgNameStr = JS_ValueToString(cx, argv[0]);
+  if (!msgNameStr) {
+    JS_ReportError(cx, "Could not convert value to string");
+    return JS_FALSE;
+  }
+
+  result->msgName.Assign((PRUnichar*)JS_GetStringChars(msgNameStr),
+                         JS_GetStringLength(msgNameStr));
+
+  result->data.Clear();
+
+  if (!result->data.SetCapacity(argc)) {
+    JS_ReportOutOfMemory(cx);
+    return JS_FALSE;
+  }
+
+  for (uintN i = 1; i < argc; ++i) {
+    Variant* vp = result->data.AppendElement();
+    if (!JetpackActorCommon::jsval_to_Variant(cx, argv[i], vp)) {
+      JS_ReportError(cx, "Invalid message argument at position %d", i);
+      return JS_FALSE;
+    }
+  }
+
+  return JS_TRUE;
+}
+
+JSBool
+JetpackChild::SendMessage(JSContext* cx, uintN argc, jsval* vp)
+{
+  MessageResult smr;
+  if (!MessageCommon(cx, argc, vp, &smr))
+    return JS_FALSE;
+
+  if (!GetThis(cx)->SendSendMessage(smr.msgName, smr.data)) {
+    JS_ReportError(cx, "Failed to sendMessage");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+JSBool
+JetpackChild::CallMessage(JSContext* cx, uintN argc, jsval* vp)
+{
+  MessageResult smr;
+  if (!MessageCommon(cx, argc, vp, &smr))
+    return JS_FALSE;
+
+  nsTArray<Variant> results;
+  if (!GetThis(cx)->SendCallMessage(smr.msgName, smr.data, &results)) {
+    JS_ReportError(cx, "Failed to callMessage");
+    return JS_FALSE;
+  }
+
+  nsAutoTArray<jsval, 4> jsvals;
+  jsval* rvals = jsvals.AppendElements(results.Length());
+  if (!rvals) {
+    JS_ReportOutOfMemory(cx);
+    return JS_FALSE;
+  }
+  for (PRUint32 i = 0; i < results.Length(); ++i)
+    rvals[i] = JSVAL_VOID;
+  js::AutoArrayRooter root(cx, results.Length(), rvals);
+
+  for (PRUint32 i = 0; i < results.Length(); ++i)
+    if (!jsval_from_Variant(cx, results.ElementAt(i), rvals + i)) {
+      JS_ReportError(cx, "Invalid result from handler %d", i);
+      return JS_FALSE;
+    }
+
+  JSObject* arrObj = JS_NewArrayObject(cx, results.Length(), rvals);
+  if (!arrObj) {
+    JS_ReportOutOfMemory(cx);
+    return JS_FALSE;
+  }
+  JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(arrObj));
+
+  return JS_TRUE;
+}
+
+struct ReceiverResult
+{
+  nsString msgName;
+  jsval receiver;
+};
+
+static JSBool
+ReceiverCommon(JSContext* cx, uintN argc, jsval* vp,
+               const char* methodName, uintN arity,
+               ReceiverResult* result)
+{
+  if (argc != arity) {
+    JS_ReportError(cx, "%s requires exactly %d arguments", methodName, arity);
+    return JS_FALSE;
+  }
+
+  // Not currently possible, but think of the future.
+  if (arity < 1)
+    return JS_TRUE;
+
+  jsval* argv = JS_ARGV(cx, vp);
+
+  JSString* str = JS_ValueToString(cx, argv[0]);
+  if (!str) {
+    JS_ReportError(cx, "%s expects a stringifiable value as its first argument",
+                   methodName);
+    return JS_FALSE;
+  }
+
+  result->msgName.Assign((PRUnichar*)JS_GetStringChars(str),
+                         JS_GetStringLength(str));
+
+  if (arity < 2)
+    return JS_TRUE;
+
+  if (!JSVAL_IS_OBJECT(argv[1]) ||
+      !JS_ObjectIsFunction(cx, JSVAL_TO_OBJECT(argv[1])))
+  {
+    JS_ReportError(cx, "%s expects a function as its second argument",
+                   methodName);
+    return JS_FALSE;
+  }
+
+  // GC-safe because argv is rooted.
+  result->receiver = argv[1];
+
+  return JS_TRUE;
+}
+
+JSBool
+JetpackChild::RegisterReceiver(JSContext* cx, uintN argc, jsval* vp)
+{
+  ReceiverResult rr;
+  if (!ReceiverCommon(cx, argc, vp, "registerReceiver", 2, &rr))
+    return JS_FALSE;
+
+  JetpackActorCommon* actor = GetThis(cx);
+  nsresult rv = actor->RegisterReceiver(cx, rr.msgName, rr.receiver);
+  if (NS_FAILED(rv)) {
+    JS_ReportOutOfMemory(cx);
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+JSBool
+JetpackChild::UnregisterReceiver(JSContext* cx, uintN argc, jsval* vp)
+{
+  ReceiverResult rr;
+  if (!ReceiverCommon(cx, argc, vp, "unregisterReceiver", 2, &rr))
+    return JS_FALSE;
+
+  JetpackActorCommon* actor = GetThis(cx);
+  actor->UnregisterReceiver(rr.msgName, rr.receiver);
+  return JS_TRUE;
+}
+
+JSBool
+JetpackChild::UnregisterReceivers(JSContext* cx, uintN argc, jsval* vp)
+{
+  ReceiverResult rr;
+  if (!ReceiverCommon(cx, argc, vp, "unregisterReceivers", 1, &rr))
+    return JS_FALSE;
+
+  JetpackActorCommon* actor = GetThis(cx);
+  actor->UnregisterReceivers(rr.msgName);
+  return JS_TRUE;
+}
+
+JSBool
+JetpackChild::Wrap(JSContext* cx, uintN argc, jsval* vp)
+{
+  NS_NOTYETIMPLEMENTED("wrap not yet implemented (depends on bug 563010)");
+  return JS_FALSE;
+}
+
+JSBool
+JetpackChild::CreateHandle(JSContext* cx, uintN argc, jsval* vp)
+{
+  if (argc > 0) {
+    JS_ReportError(cx, "createHandle takes zero arguments");
+    return JS_FALSE;
+  }
+
+  HandleChild* handle;
+  JSObject* hobj;
+
+  PHandleChild* phc = GetThis(cx)->SendPHandleConstructor();
+  if (!(handle = static_cast<HandleChild*>(phc)) ||
+      !(hobj = handle->ToJSObject(cx))) {
+    JS_ReportError(cx, "Failed to construct Handle");
+    return JS_FALSE;
+  }
+
+  JS_SET_RVAL(cx, vp, OBJECT_TO_JSVAL(hobj));
+
+  return JS_TRUE;
+}
 
 } // namespace jetpack
 } // namespace mozilla
diff --git a/js/jetpack/JetpackChild.h b/js/jetpack/JetpackChild.h
index b571abfbb805..0d079f681d07 100644
--- a/js/jetpack/JetpackChild.h
+++ b/js/jetpack/JetpackChild.h
@@ -39,11 +39,18 @@
 #define mozilla_jetpack_JetpackChild_h
 
 #include "mozilla/jetpack/PJetpackChild.h"
+#include "mozilla/jetpack/JetpackActorCommon.h"
+
+#include "nsTArray.h"
 
 namespace mozilla {
 namespace jetpack {
 
-class JetpackChild : public PJetpackChild
+class PHandleChild;
+
+class JetpackChild
+  : public PJetpackChild
+  , private JetpackActorCommon
 {
 public:
   JetpackChild();
@@ -58,10 +65,34 @@ public:
   void CleanUp();
 
 protected:
-  NS_OVERRIDE virtual bool RecvLoadImplementation(const nsCString& script);
+  NS_OVERRIDE virtual bool RecvSendMessage(const nsString& messageName,
+                                           const nsTArray<Variant>& data);
+  NS_OVERRIDE virtual bool RecvLoadImplementation(const nsCString& code);
+  NS_OVERRIDE virtual bool RecvLoadUserScript(const nsCString& code);
+
+  NS_OVERRIDE virtual PHandleChild* AllocPHandle();
+  NS_OVERRIDE virtual bool DeallocPHandle(PHandleChild* actor);
 
 private:
-  static JetpackChild* gInstance;
+  JSRuntime* mRuntime;
+  JSContext *mImplCx, *mUserCx;
+
+  static JetpackChild* GetThis(JSContext* cx);
+
+  static const JSPropertySpec sImplProperties[];
+  static JSBool UserJetpackGetter(JSContext* cx, JSObject* obj, jsval idval,
+                                  jsval* vp);
+
+  static const JSFunctionSpec sImplMethods[];
+  static JSBool SendMessage(JSContext* cx, uintN argc, jsval *vp);
+  static JSBool CallMessage(JSContext* cx, uintN argc, jsval *vp);
+  static JSBool RegisterReceiver(JSContext* cx, uintN argc, jsval *vp);
+  static JSBool UnregisterReceiver(JSContext* cx, uintN argc, jsval *vp);
+  static JSBool UnregisterReceivers(JSContext* cx, uintN argc, jsval *vp);
+  static JSBool Wrap(JSContext* cx, uintN argc, jsval *vp);
+  static JSBool CreateHandle(JSContext* cx, uintN argc, jsval *vp);
+
+  static const JSClass sGlobalClass;
 
   DISALLOW_EVIL_CONSTRUCTORS(JetpackChild);
 };
diff --git a/js/jetpack/JetpackParent.cpp b/js/jetpack/JetpackParent.cpp
index 1bc1c7abc5bb..cda60500ee56 100644
--- a/js/jetpack/JetpackParent.cpp
+++ b/js/jetpack/JetpackParent.cpp
@@ -36,12 +36,19 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "mozilla/jetpack/JetpackParent.h"
+#include "mozilla/jetpack/Handle.h"
+
+#include "nsIURI.h"
+#include "nsNetUtil.h"
+#include "nsIVariant.h"
+#include "nsIXPConnect.h"
 
 namespace mozilla {
 namespace jetpack {
 
-JetpackParent::JetpackParent()
+JetpackParent::JetpackParent(JSContext* cx)
   : mSubprocess(new JetpackProcessParent())
+  , mContext(cx)
 {
   mSubprocess->Launch();
   Open(mSubprocess->GetChannel(),
@@ -56,15 +63,178 @@ JetpackParent::~JetpackParent()
 
 NS_IMPL_ISUPPORTS1(JetpackParent, nsIJetpack)
 
-NS_IMETHODIMP
-JetpackParent::LoadImplementation(const nsAString& aURI)
+static nsresult
+ReadFromURI(const nsAString& aURI,
+            nsCString* content)
 {
-  // this is all wrong, load the URI and send the data, but for now...
-  if (!SendLoadImplementation(NS_ConvertUTF16toUTF8(aURI)))
+  nsCOMPtr<nsIURI> uri;
+  nsresult rv = NS_NewURI(getter_AddRefs(uri),
+                          NS_ConvertUTF16toUTF8(aURI));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsIChannel> channel;
+  NS_NewChannel(getter_AddRefs(channel), uri);
+  NS_ENSURE_TRUE(channel, NS_ERROR_FAILURE);
+
+  nsCOMPtr<nsIInputStream> input;
+  rv = channel->Open(getter_AddRefs(input));
+  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ASSERTION(input, "Channel opened successfully but stream was null?");
+
+  char buffer[256];
+  PRUint32 avail = 0;
+  input->Available(&avail);
+  if (avail) {
+    PRUint32 read = 0;
+    while (NS_SUCCEEDED(input->Read(buffer, sizeof(buffer), &read)) && read) {
+      content->Append(buffer, read);
+      read = 0;
+    }
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+JetpackParent::SendMessage(const nsAString& aMessageName)
+{
+  nsresult rv;
+  nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAXPCNativeCallContext* ncc = NULL;
+  rv = xpc->GetCurrentNativeCallContext(&ncc);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  JSContext* cx;
+  rv = ncc->GetJSContext(&cx);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  PRUint32 argc;
+  rv = ncc->GetArgc(&argc);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  jsval* argv;
+  rv = ncc->GetArgvPtr(&argv);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsTArray<Variant> data;
+  NS_ENSURE_TRUE(data.SetCapacity(argc), NS_ERROR_OUT_OF_MEMORY);
+
+  JSAutoRequest request(cx);
+
+  for (PRUint32 i = 1; i < argc; ++i)
+    if (!jsval_to_Variant(cx, argv[i], data.AppendElement()))
+      return NS_ERROR_INVALID_ARG;
+
+  if (!SendSendMessage(nsString(aMessageName), data))
     return NS_ERROR_FAILURE;
 
   return NS_OK;
 }
 
+NS_IMETHODIMP
+JetpackParent::RegisterReceiver(const nsAString& aMessageName,
+                                jsval aReceiver)
+{
+  return JetpackActorCommon::RegisterReceiver(mContext,
+                                              nsString(aMessageName),
+                                              aReceiver);
+}
+
+NS_IMETHODIMP
+JetpackParent::UnregisterReceiver(const nsAString& aMessageName,
+                                  jsval aReceiver)
+{
+  JetpackActorCommon::UnregisterReceiver(nsString(aMessageName),
+                                         aReceiver);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+JetpackParent::UnregisterReceivers(const nsAString& aMessageName)
+{
+  JetpackActorCommon::UnregisterReceivers(nsString(aMessageName));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+JetpackParent::LoadImplementation(const nsAString& aURI)
+{
+  nsCString code;
+  nsresult rv = ReadFromURI(aURI, &code);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!code.IsEmpty() &&
+      !SendLoadImplementation(code))
+    rv = NS_ERROR_FAILURE;
+
+  return rv;
+}
+
+NS_IMETHODIMP
+JetpackParent::LoadUserScript(const nsAString& aURI)
+{
+  nsCString code;
+  nsresult rv = ReadFromURI(aURI, &code);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!code.IsEmpty() &&
+      !SendLoadUserScript(code))
+    rv = NS_ERROR_FAILURE;
+
+  return rv;
+}
+
+bool
+JetpackParent::RecvSendMessage(const nsString& messageName,
+                               const nsTArray<Variant>& data)
+{
+  JSAutoRequest request(mContext);
+  return JetpackActorCommon::RecvMessage(mContext, messageName, data, NULL);
+}
+
+bool
+JetpackParent::RecvCallMessage(const nsString& messageName,
+                               const nsTArray<Variant>& data,
+                               nsTArray<Variant>* results)
+{
+  JSAutoRequest request(mContext);
+  return JetpackActorCommon::RecvMessage(mContext, messageName, data, results);
+}
+
+NS_IMETHODIMP
+JetpackParent::CreateHandle(nsIVariant** aResult)
+{
+  HandleParent* handle =
+    static_cast<HandleParent*>(SendPHandleConstructor());
+  NS_ENSURE_TRUE(handle, NS_ERROR_OUT_OF_MEMORY);
+
+  nsresult rv;
+  nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  JSAutoRequest request(mContext);
+
+  JSObject* hobj = handle->ToJSObject(mContext);
+  if (!hobj)
+    return NS_ERROR_FAILURE;
+
+  return xpc->JSToVariant(mContext, OBJECT_TO_JSVAL(hobj), aResult);
+}
+
+PHandleParent*
+JetpackParent::AllocPHandle()
+{
+  return new HandleParent();
+}
+
+bool
+JetpackParent::DeallocPHandle(PHandleParent* actor)
+{
+  delete actor;
+  return true;
+}
+
 } // namespace jetpack
 } // namespace mozilla
diff --git a/js/jetpack/JetpackParent.h b/js/jetpack/JetpackParent.h
index 697a82021662..2420256207ce 100644
--- a/js/jetpack/JetpackParent.h
+++ b/js/jetpack/JetpackParent.h
@@ -20,6 +20,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
+ *   Ben Newman <mozilla@benjamn.com>
  *
  * 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
@@ -40,24 +41,43 @@
 
 #include "mozilla/jetpack/PJetpackParent.h"
 #include "mozilla/jetpack/JetpackProcessParent.h"
+#include "mozilla/jetpack/JetpackActorCommon.h"
 #include "nsIJetpack.h"
 
+#include "nsTArray.h"
+
+struct JSContext;
+
 namespace mozilla {
 namespace jetpack {
 
+class PHandleParent;
+
 class JetpackParent
   : public PJetpackParent
   , public nsIJetpack
+  , private JetpackActorCommon
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIJETPACK
 
-  JetpackParent();
+  JetpackParent(JSContext* cx);
   ~JetpackParent();
 
+protected:
+  NS_OVERRIDE virtual bool RecvSendMessage(const nsString& messageName,
+                                           const nsTArray<Variant>& data);
+  NS_OVERRIDE virtual bool RecvCallMessage(const nsString& messageName,
+                                           const nsTArray<Variant>& data,
+                                           nsTArray<Variant>* results);
+
+  NS_OVERRIDE virtual PHandleParent* AllocPHandle();
+  NS_OVERRIDE virtual bool DeallocPHandle(PHandleParent* actor);
+
 private:
   JetpackProcessParent* mSubprocess;
+  JSContext* mContext;
 
   DISALLOW_EVIL_CONSTRUCTORS(JetpackParent);
 };
diff --git a/js/jetpack/JetpackService.cpp b/js/jetpack/JetpackService.cpp
index ee197575ebc7..b3b5b100d485 100644
--- a/js/jetpack/JetpackService.cpp
+++ b/js/jetpack/JetpackService.cpp
@@ -43,6 +43,8 @@
 
 #include "nsIGenericFactory.h"
 
+#include "nsIXPConnect.h"
+
 namespace mozilla {
 namespace jetpack {
 
@@ -52,8 +54,21 @@ NS_IMPL_ISUPPORTS1(JetpackService,
 NS_IMETHODIMP
 JetpackService::CreateJetpack(nsIJetpack** aResult)
 {
-  nsRefPtr<JetpackParent> j = new JetpackParent();
+  nsresult rv;
+  nsCOMPtr<nsIXPConnect> xpc(do_GetService(nsIXPConnect::GetCID(), &rv));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsAXPCNativeCallContext* ncc = NULL;
+  rv = xpc->GetCurrentNativeCallContext(&ncc);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  JSContext* cx;
+  rv = ncc->GetJSContext(&cx);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsRefPtr<JetpackParent> j = new JetpackParent(cx);
   *aResult = j.forget().get();
+
   return NS_OK;
 }
 
diff --git a/js/jetpack/Makefile.in b/js/jetpack/Makefile.in
index a95d3abe706a..dc851ad86a68 100644
--- a/js/jetpack/Makefile.in
+++ b/js/jetpack/Makefile.in
@@ -61,6 +61,8 @@ EXPORTS_mozilla/jetpack = \
   JetpackParent.h \
   JetpackChild.h \
   JetpackService.h \
+  JetpackActorCommon.h \
+  Handle.h \
   $(NULL)
 
 CPPSRCS = \
@@ -69,8 +71,13 @@ CPPSRCS = \
   JetpackProcessChild.cpp \
   JetpackProcessParent.cpp \
   JetpackService.cpp \
+  JetpackActorCommon.cpp \
   $(NULL)
 
+ifdef ENABLE_TESTS
+TOOL_DIRS += tests
+endif
+
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
diff --git a/js/jetpack/PHandle.ipdl b/js/jetpack/PHandle.ipdl
new file mode 100644
index 000000000000..e042ab09f963
--- /dev/null
+++ b/js/jetpack/PHandle.ipdl
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sw=4 et tw=80:
+ *
+ * ***** 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
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Newman <mozilla@benjamn.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of 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 protocol PJetpack;
+
+namespace mozilla {
+namespace jetpack {
+
+async protocol PHandle
+{
+  manager PJetpack or PHandle;
+  manages PHandle;
+both:
+  PHandle();
+  __delete__();
+};
+
+} // namespace jetpack
+} // namespace mozilla
diff --git a/js/jetpack/PJetpack.ipdl b/js/jetpack/PJetpack.ipdl
index 438a57246b80..d7e41d298971 100644
--- a/js/jetpack/PJetpack.ipdl
+++ b/js/jetpack/PJetpack.ipdl
@@ -35,14 +35,58 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+include protocol PHandle;
+
+using mozilla::void_t;
+using mozilla::null_t;
+
 namespace mozilla {
 namespace jetpack {
 
-async protocol PJetpack
-{
-child:
-  async LoadImplementation(nsCString script);
+struct KeyValue {
+  nsString key;
+  Variant value;
 };
 
-}
-}
+union PrimVariant {
+  void_t;
+  null_t;
+  bool;
+  int;
+  double;
+  nsString;
+  PHandle;
+};
+
+union CompVariant {
+  KeyValue[];
+  Variant[];
+  size_t; // reference
+};
+  
+union Variant {
+  PrimVariant;
+  CompVariant;
+};
+
+sync protocol PJetpack
+{
+  manages PHandle;
+both:
+  async SendMessage(nsString messageName,
+                    Variant[] data);
+  async PHandle();
+
+child:
+  async LoadImplementation(nsCString code);
+  async LoadUserScript(nsCString code);
+
+parent:
+  sync CallMessage(nsString messageName,
+                   Variant[] data)
+    returns (Variant[] results);
+
+};
+
+} // namespace jetpack
+} // namespace mozilla
diff --git a/js/jetpack/ipdl.mk b/js/jetpack/ipdl.mk
index 7e95c589836f..301136865fe9 100644
--- a/js/jetpack/ipdl.mk
+++ b/js/jetpack/ipdl.mk
@@ -1,3 +1,4 @@
 IPDLSRCS = \
   PJetpack.ipdl \
+  PHandle.ipdl \
   $(NULL)
diff --git a/js/jetpack/nsIJetpack.idl b/js/jetpack/nsIJetpack.idl
index 68d06fcafdc4..f6daca401f76 100644
--- a/js/jetpack/nsIJetpack.idl
+++ b/js/jetpack/nsIJetpack.idl
@@ -37,8 +37,24 @@
 
 #include "nsISupports.idl"
 
-[scriptable, uuid(be12cc9f-75d4-4f2d-b062-f549ea13446a)]
+interface nsIVariant;
+
+[scriptable, uuid(563afdf8-5d2f-4bb2-9ac0-fb82461d2922)]
 interface nsIJetpack : nsISupports
 {
+  void sendMessage(in AString aMessageName
+                   /* [optional] in jsval v1,
+                      [optional] in jsval v2,
+                      ... */);
+
+  void registerReceiver(in AString aMessageName,
+                        in jsval aReceiver);
+  void unregisterReceiver(in AString aMessageName,
+                          in jsval aReceiver);
+  void unregisterReceivers(in AString aMessageName);
+
   void loadImplementation(in AString aURI);
+  void loadUserScript(in AString aURI);
+
+  nsIVariant createHandle();
 };
diff --git a/js/jetpack/tests/Makefile.in b/js/jetpack/tests/Makefile.in
new file mode 100644
index 000000000000..8962b0a53048
--- /dev/null
+++ b/js/jetpack/tests/Makefile.in
@@ -0,0 +1,50 @@
+# ***** 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
+# The Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Newman <mozilla@benjamn.com> (original author)
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = test_jetpack
+
+XPCSHELL_TESTS = unit
+
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
diff --git a/js/jetpack/tests/unit/handle_tests.js b/js/jetpack/tests/unit/handle_tests.js
new file mode 100644
index 000000000000..5a68d83fefbb
--- /dev/null
+++ b/js/jetpack/tests/unit/handle_tests.js
@@ -0,0 +1,99 @@
+function run_handle_tests() {
+  test_sanity();
+  test_safe_iteration();
+  test_local_invalidation();
+  test_long_parent_chain(100);
+  test_invalid_creation();
+}
+
+function test_sanity() {
+  var parent = createHandle(),
+      child = parent.createHandle(),
+      grandchild = child.createHandle();
+
+  do_check_neq(child, parent);
+  do_check_eq(child.parent, parent);
+  do_check_eq(parent.parent, null);
+  do_check_eq(grandchild.parent.parent, parent);
+
+  do_check_true(child.isValid);
+  do_check_true(parent.isValid);
+
+  parent.invalidate();
+}
+
+function test_safe_iteration() {
+  var handle = createHandle(),
+      keys = [];
+  handle.foo = 42;
+  handle.self = handle;
+  for (var k in handle)
+    keys[keys.length] = k;
+  do_check_eq(keys.sort().join("~"),
+              "foo~self");
+  handle.invalidate();
+}
+
+function test_local_invalidation() {
+  var parent = createHandle(),
+      child = parent.createHandle();
+
+  do_check_true(child.invalidate());
+  do_check_false(child.isValid);
+  do_check_true(parent.isValid);
+
+  child = parent.createHandle();
+  do_check_true(child.isValid);
+
+  do_check_true(parent.invalidate());
+  do_check_false(parent.invalidate());
+  do_check_false(child.isValid);
+  do_check_false(parent.isValid);
+
+  parent = createHandle();
+  child = parent.createHandle();
+  child = child.createHandle();
+
+  var uncle = parent.createHandle(),
+      sibling = child.parent.createHandle();
+
+  do_check_eq(child.parent.parent, parent);
+  do_check_true(child.parent.isValid);
+
+  do_check_true(child.parent.invalidate());
+  do_check_false(child.isValid);
+  do_check_true(parent.isValid);
+
+  do_check_false(sibling.isValid);
+  do_check_true(uncle.isValid);
+
+  parent.invalidate();
+}
+
+function test_long_parent_chain(len) {
+  const ancestor = createHandle();
+  for (var handle = ancestor, i = 0; i < len; ++i)
+    handle = handle.createHandle();
+  const child = handle;
+
+  while (handle != ancestor)
+    handle = handle.parent;
+
+  do_check_true(child.isValid);
+  do_check_true(ancestor.invalidate());
+  do_check_false(child.isValid);
+}
+
+function test_invalid_creation() {
+  var parent = createHandle(),
+      child = parent.createHandle();
+
+  parent.invalidate();
+
+  do_check_eq(child.parent, null);
+
+  var threw = false;
+  try { child.createHandle(); }
+  catch (x) { threw = true; }
+  do_check_true(threw);
+}
diff --git a/js/jetpack/tests/unit/impl.js b/js/jetpack/tests/unit/impl.js
new file mode 100644
index 000000000000..4f3db14474da
--- /dev/null
+++ b/js/jetpack/tests/unit/impl.js
@@ -0,0 +1,43 @@
+function echo() {
+  sendMessage.apply(this, arguments);
+}
+
+registerReceiver("echo", echo);
+
+registerReceiver("callback",
+                 function(msgName, data, handle) {
+                   sendMessage("sendback",
+                               callMessage("callback", data)[0],
+                               handle);
+                 });
+
+registerReceiver("gimmeHandle",
+                 function(msgName) {
+                   sendMessage("recvHandle", "ok", createHandle());
+                 });
+
+registerReceiver("kthx",
+                 function(msgName, data, child) {
+                   sendMessage("recvHandleAgain", data + data, child.parent);
+                 });
+
+registerReceiver("echo2", echo);
+
+registerReceiver("multireturn begin",
+                 function() {
+                   var results = callMessage("multireturn");
+                   sendMessage.apply(null, ["multireturn check"].concat(results));
+                 });
+
+registerReceiver("testarray",
+                 function(msgName, array) {
+                   sendMessage("testarray", array.reverse());
+                 });
+
+registerReceiver("test primitive types", echo);
+
+registerReceiver("drop methods", echo);
+
+registerReceiver("exception coping", echo);
+
+registerReceiver("duplicate receivers", echo);
diff --git a/js/jetpack/tests/unit/test_jetpack.js b/js/jetpack/tests/unit/test_jetpack.js
new file mode 100644
index 000000000000..0f9897ae9b9f
--- /dev/null
+++ b/js/jetpack/tests/unit/test_jetpack.js
@@ -0,0 +1,186 @@
+var jps = jps || Components.classes["@mozilla.org/jetpack/service;1"]
+  .getService(Components.interfaces.nsIJetpackService),
+  jetpack = jps.createJetpack();
+
+load("handle_tests.js");
+function createHandle() {
+  return jetpack.createHandle();
+}
+
+function run_test() {
+  run_handle_tests();
+
+  jetpack.loadImplementation("file://" + do_get_file("impl.js").path);
+
+  var circ1 = {},
+      circ2 = {},
+      circ3 = {},
+      ok = false;
+  ((circ1.next = circ2).next = circ3).next = circ1;
+  try {
+    jetpack.sendMessage("ignored", circ3, circ1);
+    ok = true;
+  } catch (x) {
+    do_check_false(x);
+  }
+  do_check_true(ok);
+
+  var echoHandle = jetpack.createHandle();
+  echoHandle.payload = { weight: 10 };
+  jetpack.registerReceiver("echo",
+                           function(msgName, data, handle) {
+                             do_check_eq(arguments.length, 3);
+                             do_check_eq(msgName, "echo");
+                             do_check_eq(data, "echo this");
+                             do_check_true(handle.isValid);
+                             do_check_eq(handle, echoHandle);
+                             do_check_eq(handle.payload.weight, 10);
+                             do_test_finished();
+                           });
+
+  jetpack.registerReceiver("callback",
+                           function(msgName, data) {
+                             do_check_eq(msgName, "callback");
+                             return "called back: " + data;
+                           });
+
+  var callbackHandle = echoHandle.createHandle();
+  jetpack.registerReceiver("sendback",
+                           function(msgName, data, handle) {
+                             do_check_eq(msgName, "sendback");
+                             do_check_eq(data, "called back: call me back");
+                             do_check_eq(handle, callbackHandle);
+                             do_test_finished();
+                           });
+
+  var obj;
+  jetpack.registerReceiver("recvHandle",
+                           function(msgName, data, handle) {
+                             handle.mark = obj = {};
+                             jetpack.sendMessage("kthx", data + data, handle.createHandle());
+                           });
+  jetpack.registerReceiver("recvHandleAgain",
+                           function(msgName, data, handle) {
+                             do_check_eq(data, "okokokok");
+                             do_check_eq(handle.mark, obj);
+                             do_test_finished();
+                           });
+  var obj1 = {
+    id: Math.random() + ""
+  }, obj2 = {
+    id: Math.random() + "",
+    obj: obj1
+  };
+  jetpack.registerReceiver("echo2",
+                           function(msgName, a, b) {
+                             do_check_neq(obj1, a);
+                             do_check_neq(obj2, b);
+                             do_check_eq(obj1.id, a.id);
+                             do_check_eq(obj2.id, b.id);
+                             do_check_eq(obj1.id, obj2.obj.id);
+                             do_test_finished();
+                           });
+
+  jetpack.registerReceiver("multireturn", function() { return obj1 });
+  jetpack.registerReceiver("multireturn", function() { return circ1 });
+  jetpack.registerReceiver("multireturn", function() { return obj2 });
+  jetpack.registerReceiver("multireturn check",
+                           function(msgName, rval1, rval2, rval3) {
+                             do_check_eq(rval1.id, obj1.id);
+                             do_check_eq(rval2.next.next.next, rval2);
+                             do_check_eq(rval3.id, obj2.id);
+                             do_check_eq(rval3.obj.id, obj1.id);
+                             do_test_finished();
+                           });
+
+  var testarray = [1, 1, 2, 3, 5, 8, 13];
+  jetpack.registerReceiver("testarray",
+                           function(msgName, reversed) {
+                             for (var i = 0; i < testarray.length; ++i)
+                               do_check_eq(testarray[i],
+                                           reversed[reversed.length - i - 1]);
+                             do_test_finished();
+                           });
+
+  var undefined;
+  jetpack.registerReceiver("test primitive types",
+                           function(msgName,
+                                    void_val, null_val,
+                                    bool_true, bool_false,
+                                    one, two, nine99,
+                                    one_quarter,
+                                    oyez_str)
+                           {
+                             do_check_true(void_val === undefined);
+                             do_check_true(null_val === null);
+                             do_check_true(bool_true === true);
+                             do_check_true(bool_false === false);
+                             do_check_eq(one, 1);
+                             do_check_eq(two, 2);
+                             do_check_eq(nine99, 999);
+                             do_check_eq(one_quarter, 0.25);
+                             do_check_eq(oyez_str, "oyez");
+
+                             do_test_finished();
+                           });
+
+  var drop = {
+    nested: {
+      method: function() { return this.value },
+      value: 42
+    }
+  };
+  jetpack.registerReceiver("drop methods",
+                           function(msgName, echoed) {
+                             do_check_true(!echoed.nested.method);
+                             do_check_eq(echoed.nested.value, 42);
+                             do_test_finished();
+                           });
+
+  var coped = "did not cope";
+  jetpack.registerReceiver("exception coping",
+                           function(msgName) { throw coped = "did cope" });
+  jetpack.registerReceiver("exception coping",
+                           function(msgName) {
+                             do_check_eq(coped, "did cope");
+                             do_test_finished();
+                           });
+
+  var calls = "";
+  function countCalls() { calls += "." }
+  jetpack.registerReceiver("duplicate receivers", countCalls);
+  jetpack.registerReceiver("duplicate receivers", countCalls);
+  jetpack.registerReceiver("duplicate receivers",
+                           function() { do_check_eq(calls, ".") });
+  jetpack.registerReceiver("duplicate receivers", countCalls);
+  jetpack.registerReceiver("duplicate receivers",
+                           function() {
+                             do_check_eq(calls, ".");
+                             jetpack.unregisterReceivers("duplicate receivers");
+                           });
+  jetpack.registerReceiver("duplicate receivers",
+                           function() { do_test_finished() });
+
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+  do_test_pending();
+
+  jetpack.sendMessage("echo", "echo this", echoHandle);
+  jetpack.sendMessage("callback", "call me back", callbackHandle);
+  jetpack.sendMessage("gimmeHandle");
+  jetpack.sendMessage("echo2", obj1, obj2);
+  jetpack.sendMessage("multireturn begin");
+  jetpack.sendMessage("testarray", testarray);
+  jetpack.sendMessage("test primitive types",
+                      undefined, null, true, false, 1, 2, 999, 1/4, "oyez");
+  jetpack.sendMessage("drop methods", drop);
+  jetpack.sendMessage("exception coping");
+  jetpack.sendMessage("duplicate receivers");
+}

From 39f4f0422500c1a883143118e476cb4b52fc1bf3 Mon Sep 17 00:00:00 2001
From: Edward Lee <edilee@mozilla.com>
Date: Fri, 24 Jul 2009 17:57:26 -0700
Subject: [PATCH 026/172] Bug 461483 - Ignore 'www.' when searching in the the
 awesome bar [r=mak] Strip out www. from found urls and the query after
 already stripping off http://, etc. Update tests now that www. can't be
 matched.

--HG--
extra : rebase_source : 352f2dfb302a56fc3e83dffcbb1bd2a53208510d
---
 .../components/places/src/SQLFunctions.cpp    |  3 ++
 .../places/src/nsPlacesAutoComplete.js        |  3 ++
 .../tests/autocomplete/test_swap_protocol.js  | 40 ++++++++++++-------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/toolkit/components/places/src/SQLFunctions.cpp b/toolkit/components/places/src/SQLFunctions.cpp
index e8ef47143253..857d11aef7c6 100644
--- a/toolkit/components/places/src/SQLFunctions.cpp
+++ b/toolkit/components/places/src/SQLFunctions.cpp
@@ -94,6 +94,9 @@ namespace places {
       _fixedSpec.Cut(0, 8);
     else if (StringBeginsWith(_fixedSpec, NS_LITERAL_STRING("ftp://")))
       _fixedSpec.Cut(0, 6);
+
+    if (StringBeginsWith(_fixedSpec, NS_LITERAL_STRING("www.")))
+      _fixedSpec.Cut(0, 4);
   }
 
   /* static */
diff --git a/toolkit/components/places/src/nsPlacesAutoComplete.js b/toolkit/components/places/src/nsPlacesAutoComplete.js
index d6cbcb83553d..25952094cfb0 100644
--- a/toolkit/components/places/src/nsPlacesAutoComplete.js
+++ b/toolkit/components/places/src/nsPlacesAutoComplete.js
@@ -581,6 +581,9 @@ nsPlacesAutoComplete.prototype = {
     else if (uri.indexOf("ftp://") == 0)
       uri = uri.slice(6);
 
+    if (uri.indexOf("www.") == 0)
+      uri = uri.slice(4);
+
     return this._textURIService.unEscapeURIForUI("UTF-8", uri);
   },
 
diff --git a/toolkit/components/places/tests/autocomplete/test_swap_protocol.js b/toolkit/components/places/tests/autocomplete/test_swap_protocol.js
index ccfd8f16c815..d9081bb0fbb5 100644
--- a/toolkit/components/places/tests/autocomplete/test_swap_protocol.js
+++ b/toolkit/components/places/tests/autocomplete/test_swap_protocol.js
@@ -38,6 +38,9 @@
  * Test bug 424717 to make sure searching with an existing location like
  * http://site/ also matches https://site/ or ftp://site/. Same thing for
  * ftp://site/ and https://site/.
+ *
+ * Test bug 461483 to make sure a search for "w" doesn't match the "www." from
+ * site subdomains.
  */
 
 // Define some shared uris and titles (each page needs its own uri)
@@ -48,6 +51,8 @@ let kURIs = [
   "ftp://site/",
   "https://www.site/",
   "https://site/",
+  "http://woohoo/",
+  "http://wwwwwwacko/",
 ];
 let kTitles = [
   "title",
@@ -60,26 +65,31 @@ addPageBook(2, 0);
 addPageBook(3, 0);
 addPageBook(4, 0);
 addPageBook(5, 0);
+addPageBook(6, 0);
+addPageBook(7, 0);
 
 let allSite = [0,1,2,3,4,5];
-let allWWW = [0,4];
 
 // Provide for each test: description; search terms; array of gPages indices of
 // pages that should match; optional function to be run before the test
 let gTests = [
-  ["0: http://www. matches all www.site",
-   kURIs[0], allWWW],
-  ["1: http:// matches all site",
-   kURIs[1], allSite],
-  ["2: ftp://ftp. matches itself",
-   kURIs[2], [2]],
-  ["3: ftp:// matches all site",
-   kURIs[3], allSite],
-  ["4: https://www. matches all www.site",
-   kURIs[4], allWWW],
-  ["5: https:// matches all site",
-   kURIs[5], allSite],
+  ["0: http://www.site matches all site", "http://www.site", allSite],
+  ["1: http://site matches all site", "http://site", allSite],
+  ["2: ftp://ftp.site matches itself", "ftp://ftp.site", [2]],
+  ["3: ftp://site matches all site", "ftp://site", allSite],
+  ["4: https://www.site matches all site", "https://www.site", allSite],
+  ["5: https://site matches all site", "https://site", allSite],
+  ["6: www.site matches all site", "www.site", allSite],
 
-  ["6: www.site matches all www.site",
-   "www.site", allWWW],
+  ["7: w matches none of www.", "w", [6,7]],
+  ["8: http://w matches none of www.", "w", [6,7]],
+  ["9: http://www.w matches none of www.", "w", [6,7]],
+
+  ["10: ww matches none of www.", "ww", [7]],
+  ["11: http://ww matches none of www.", "http://ww", [7]],
+  ["12: http://www.ww matches none of www.", "http://www.ww", [7]],
+
+  ["13: www matches none of www.", "www", [7]],
+  ["14: http://www matches none of www.", "http://www", [7]],
+  ["15: http://www.www matches none of www.", "http://www.www", [7]],
 ];

From 2bf11cef6f955a348fb03719d8df8f1b5a391658 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Fri, 25 Jun 2010 12:56:39 -0500
Subject: [PATCH 027/172] Bug 574635 - Undo changes to HideChromeWindow and
 SetWindowTranslucencyInner which messed up popup visiblility. Also, don't
 ignore invalidate requests on a widget in Resize calls when window bounds
 have not changed. r=tellrob.

---
 widget/src/windows/nsWindow.cpp | 47 ++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 129b39e26628..f57b09cea495 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1344,7 +1344,7 @@ NS_METHOD nsWindow::Resize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
   NS_ASSERTION((aHeight >=0 ), "Negative height passed to nsWindow::Resize");
 
   // Avoid unnecessary resizing calls
-  if (mBounds.width == aWidth && mBounds.height == aHeight)
+  if (mBounds.width == aWidth && mBounds.height == aHeight && !aRepaint)
     return NS_OK;
 
 #ifdef MOZ_XUL
@@ -1384,7 +1384,7 @@ NS_METHOD nsWindow::Resize(PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeig
 
   // Avoid unnecessary resizing calls
   if (mBounds.x == aX && mBounds.y == aY &&
-      mBounds.width == aWidth && mBounds.height == aHeight)
+      mBounds.width == aWidth && mBounds.height == aHeight && !aRepaint)
     return NS_OK;
 
 #ifdef MOZ_XUL
@@ -2382,8 +2382,7 @@ NS_IMETHODIMP nsWindow::HideWindowChrome(PRBool aShouldHide)
     DWORD_PTR tempStyle = ::GetWindowLongPtrW(hwnd, GWL_STYLE);
     DWORD_PTR tempExStyle = ::GetWindowLongPtrW(hwnd, GWL_EXSTYLE);
 
-    style = tempStyle & ~(WS_CAPTION | WS_THICKFRAME | WS_SYSMENU |
-                          WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
+    style = tempStyle & ~(WS_CAPTION | WS_THICKFRAME);
     exStyle = tempExStyle & ~(WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE |
                               WS_EX_CLIENTEDGE | WS_EX_STATICEDGE);
 
@@ -2391,17 +2390,10 @@ NS_IMETHODIMP nsWindow::HideWindowChrome(PRBool aShouldHide)
     mOldExStyle = tempExStyle;
   }
   else {
-    if (!mOldStyle)
+    if (!mOldStyle || !mOldExStyle) {
       mOldStyle = ::GetWindowLongPtrW(hwnd, GWL_STYLE);
-    if (!mOldExStyle)
       mOldExStyle = ::GetWindowLongPtrW(hwnd, GWL_EXSTYLE);
-
-    if (mIsVisible)
-      mOldStyle |= WS_VISIBLE;
-    if (mSizeMode == nsSizeMode_Maximized)
-      mOldStyle |= WS_MAXIMIZE;
-    else if (mSizeMode == nsSizeMode_Minimized)
-      mOldStyle |= WS_MINIMIZE;
+    }
 
     style = mOldStyle;
     exStyle = mOldExStyle;
@@ -7369,21 +7361,38 @@ void nsWindow::SetWindowTranslucencyInner(nsTransparencyMode aMode)
     return;
   }
 
+  LONG_PTR style = 0, exStyle = 0;
   switch(aMode) {
     case eTransparencyTransparent:
-    {
-      LONG_PTR exStyle = topWindow->WindowStyle();
       exStyle |= WS_EX_LAYERED;
-      ::SetWindowLongPtrW(hWnd, GWL_EXSTYLE, exStyle);
-    }
     case eTransparencyOpaque:
     case eTransparencyGlass:
       topWindow->mTransparencyMode = aMode;
       break;
   }
 
-  // Hide chrome supports caching old styles, so this can be flipped back and forth
-  topWindow->HideWindowChrome(aMode == eTransparencyTransparent);
+  // Hide chrome supports caching old styles, so this can be
+  // flipped back and forth
+  //topWindow->HideWindowChrome(aMode == eTransparencyTransparent);
+
+  style |= topWindow->WindowStyle();
+  exStyle |= topWindow->WindowExStyle();
+
+  if (aMode == eTransparencyTransparent) {
+    style &= ~(WS_CAPTION | WS_THICKFRAME | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
+    exStyle &= ~(WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE);
+  }
+
+  if (topWindow->mIsVisible)
+    style |= WS_VISIBLE;
+  if (topWindow->mSizeMode == nsSizeMode_Maximized)
+    style |= WS_MAXIMIZE;
+  else if (topWindow->mSizeMode == nsSizeMode_Minimized)
+    style |= WS_MINIMIZE;
+
+  VERIFY_WINDOW_STYLE(style);
+  ::SetWindowLongPtrW(hWnd, GWL_STYLE, style);
+  ::SetWindowLongPtrW(hWnd, GWL_EXSTYLE, exStyle);
 
 #if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
   if (mTransparencyMode == eTransparencyGlass)

From fa74df73e2d7681b79ed731a6327f987b8a1699f Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Fri, 25 Jun 2010 11:21:40 -0700
Subject: [PATCH 028/172] Bug 517119 - Preallocate image source data buffer
 based on Content-Length.r=jrmuizel,sr=vlad.

---
 modules/libpr0n/public/imgIContainer.idl | 14 +++++++++++++-
 modules/libpr0n/src/imgContainer.cpp     |  9 +++++++++
 modules/libpr0n/src/imgRequest.cpp       | 19 +++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/modules/libpr0n/public/imgIContainer.idl b/modules/libpr0n/public/imgIContainer.idl
index a9b3ca9d4ad6..4f86300f1507 100644
--- a/modules/libpr0n/public/imgIContainer.idl
+++ b/modules/libpr0n/public/imgIContainer.idl
@@ -71,7 +71,7 @@ native gfxGraphicsFilter(gfxPattern::GraphicsFilter);
  *
  * Internally, imgIContainer also manages animation of images.
  */
-[scriptable, uuid(74c63935-b54f-43a4-9449-2e9c815e3bef)]
+[scriptable, uuid(e80ec20d-8e9c-405f-a673-cea00aa95b4d)]
 interface imgIContainer : nsISupports
 {
   /**
@@ -359,4 +359,16 @@ interface imgIContainer : nsISupports
   /* Called for multipart images when there's a new source image to add. */
   [noscript] void newSourceData();
 
+  /**
+   * A hint of the number of bytes of source data that the image contains. If
+   * called early on, this can help reduce copying and reallocations by
+   * appropriately preallocating the source data buffer.
+   *
+   * We take this approach rather than having the source data management code do
+   * something more complicated (like chunklisting) because HTTP is by far the
+   * dominant source of images, and the Content-Length header is quite reliable.
+   * Thus, pre-allocation simplifies code and reduces the total number of
+   * allocations.
+   */
+  void setSourceSizeHint(in unsigned long sizeHint);
 };
diff --git a/modules/libpr0n/src/imgContainer.cpp b/modules/libpr0n/src/imgContainer.cpp
index e143ef4f3e24..215463bc9b7c 100644
--- a/modules/libpr0n/src/imgContainer.cpp
+++ b/modules/libpr0n/src/imgContainer.cpp
@@ -1396,6 +1396,15 @@ NS_IMETHODIMP imgContainer::NewSourceData()
   return NS_OK;
 }
 
+//******************************************************************************
+/* void setSourceSizeHint(in unsigned long sizeHint); */
+NS_IMETHODIMP imgContainer::SetSourceSizeHint(PRUint32 sizeHint)
+{
+  if (sizeHint && StoringSourceData())
+    mSourceData.SetCapacity(sizeHint);
+  return NS_OK;
+}
+
 //******************************************************************************
 /* void notify(in nsITimer timer); */
 NS_IMETHODIMP imgContainer::Notify(nsITimer *timer)
diff --git a/modules/libpr0n/src/imgRequest.cpp b/modules/libpr0n/src/imgRequest.cpp
index 3c6786294790..e6d51338c176 100644
--- a/modules/libpr0n/src/imgRequest.cpp
+++ b/modules/libpr0n/src/imgRequest.cpp
@@ -1173,6 +1173,25 @@ NS_IMETHODIMP imgRequest::OnDataAvailable(nsIRequest *aRequest, nsISupports *ctx
       return NS_BINDING_ABORTED;
     }
 
+    /* Use content-length as a size hint for http channels. */
+    if (httpChannel) {
+      nsCAutoString contentLength;
+      rv = httpChannel->GetResponseHeader(NS_LITERAL_CSTRING("content-length"),
+                                          contentLength);
+      if (NS_SUCCEEDED(rv)) {
+        PRInt32 len = contentLength.ToInteger(&rv);
+
+        // Pass anything usable on so that the imgContainer can preallocate its
+        // source buffer
+        if (len > 0) {
+          PRUint32 sizeHint = (PRUint32) len;
+          sizeHint = PR_MIN(sizeHint, 20000000); /* Bound by something reasonable */
+          mImage->SetSourceSizeHint(sizeHint);
+        }
+      }
+    }
+
+
     // If we were waiting on the image to do something, now's our chance.
     if (mDecodeRequested) {
       mImage->RequestDecode();

From fd4a775b6179b89d7c2607640a6cee4663d836af Mon Sep 17 00:00:00 2001
From: Ben Newman <bnewman@mozilla.com>
Date: Fri, 25 Jun 2010 11:42:34 -0700
Subject: [PATCH 029/172] Disable hanging jetpack XPCShell tests. r=sdwilsh

---
 js/jetpack/tests/unit/test_jetpack.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/jetpack/tests/unit/test_jetpack.js b/js/jetpack/tests/unit/test_jetpack.js
index 0f9897ae9b9f..37bd64c78dd9 100644
--- a/js/jetpack/tests/unit/test_jetpack.js
+++ b/js/jetpack/tests/unit/test_jetpack.js
@@ -1,6 +1,8 @@
+/*
 var jps = jps || Components.classes["@mozilla.org/jetpack/service;1"]
   .getService(Components.interfaces.nsIJetpackService),
-  jetpack = jps.createJetpack();
+  jetpack = null;
+*/
 
 load("handle_tests.js");
 function createHandle() {
@@ -8,6 +10,8 @@ function createHandle() {
 }
 
 function run_test() {
+  //jetpack = jps.createJetpack();
+  return;
   run_handle_tests();
 
   jetpack.loadImplementation("file://" + do_get_file("impl.js").path);

From 2e0fc75e0330304ec4d3d9e885d9a3dde31dc895 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 25 Jun 2010 15:11:42 -0400
Subject: [PATCH 030/172] Bug 574109 - failures in layout/reftests/editor/xul/
 on windows 7 64-bit; r=roc

---
 layout/reftests/editor/xul/reftest.list | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/layout/reftests/editor/xul/reftest.list b/layout/reftests/editor/xul/reftest.list
index 82798f85949b..baa51b4a536b 100644
--- a/layout/reftests/editor/xul/reftest.list
+++ b/layout/reftests/editor/xul/reftest.list
@@ -2,8 +2,8 @@
 != empty-2.xul empty-ref.xul
 # There is no way to simulate an autocomplete textbox in windows Vista/7 default theme using CSS.
 # Therefore, the equlity tests below should be marked as failing.
-fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]$/.test(http.oscpu)) == autocomplete-1.xul autocomplete-ref.xul
-fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]$/.test(http.oscpu)) == emptyautocomplete-1.xul emptyautocomplete-ref.xul
+fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]/.test(http.oscpu)) == autocomplete-1.xul autocomplete-ref.xul
+fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]/.test(http.oscpu)) == emptyautocomplete-1.xul emptyautocomplete-ref.xul
 != emptymultiline-1.xul emptymultiline-ref.xul
 == emptymultiline-2.xul emptymultiline-ref.xul
 == emptytextbox-1.xul emptytextbox-ref.xul
@@ -15,10 +15,10 @@ fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]$/.test(http.oscpu)) ==
 # Therefore, the equlity tests below should be marked as failing.
 != number-1.xul number-ref.xul
 != number-2.xul number-ref.xul
-fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]$/.test(http.oscpu)) == number-3.xul number-ref.xul
+fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]/.test(http.oscpu)) == number-3.xul number-ref.xul
 != number-4.xul number-ref.xul
-fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]$/.test(http.oscpu)) == number-5.xul number-ref.xul
-fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]$/.test(http.oscpu)) == numberwithvalue-1.xul numberwithvalue-ref.xul
+fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]/.test(http.oscpu)) == number-5.xul number-ref.xul
+fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]/.test(http.oscpu)) == numberwithvalue-1.xul numberwithvalue-ref.xul
 == passwd-1.xul passwd-ref.xul
 == passwd-2.xul passwd-ref.xul
 != passwd-3.xul passwd-ref.xul
@@ -26,4 +26,4 @@ fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]$/.test(http.oscpu)) ==
 == textbox-1.xul textbox-ref.xul
 != textbox-disabled.xul textbox-ref.xul
 # Read-only textboxes look like normal textboxes in windows Vista/7 default theme
-fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]$/.test(http.oscpu)) != textbox-readonly.xul textbox-ref.xul
+fails-if(windowsDefaultTheme&&/^Windows\x20NT\x206\.[01]/.test(http.oscpu)) != textbox-readonly.xul textbox-ref.xul

From ec7bd00b0a96c85ce76a3fc7cc9444014a48da09 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 25 Jun 2010 15:12:00 -0400
Subject: [PATCH 031/172] Bug 574071 - Intermittent failure in
 layout/base/crashtests/348729-1.html | assertion count 0 is less than
 expected 2 assertions; r=jesse

---
 layout/base/crashtests/348729-1-inner.html | 7 +++++--
 layout/base/crashtests/348729-1.html       | 3 ---
 layout/base/crashtests/crashtests.list     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/layout/base/crashtests/348729-1-inner.html b/layout/base/crashtests/348729-1-inner.html
index 4c6de42fd25f..38f8d615a0a6 100644
--- a/layout/base/crashtests/348729-1-inner.html
+++ b/layout/base/crashtests/348729-1-inner.html
@@ -7,14 +7,17 @@ x.innerHTML='\
 *::first-letter {float: right; }\
 ';
 document.documentElement.appendChild(x);
+
+setTimeout(removestyles,500);
 }
 setTimeout(addstyles1,200);
 
 function removestyles(i){
 document.getElementsByTagName('tfoot')[0].removeAttribute('style');
 document.getElementsByTagName('table')[0].removeAttribute('style');
+
+window.parent.document.documentElement.className = "";
 }
-setTimeout(removestyles,500);
 </script>
 <style>
 *::before { content:"before text";}
@@ -23,4 +26,4 @@ setTimeout(removestyles,500);
 <table style="display: block;">
 <tbody><tr><td></td></tr></tbody><tfoot style="position: absolute;"></tfoot>
 </table>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/layout/base/crashtests/348729-1.html b/layout/base/crashtests/348729-1.html
index 652b011df284..af577b3a0a68 100644
--- a/layout/base/crashtests/348729-1.html
+++ b/layout/base/crashtests/348729-1.html
@@ -1,8 +1,5 @@
 <html class="reftest-wait">
 <head>
-<script>
-setTimeout('document.documentElement.className = ""', 1000);
-</script>
 <body>
 <iframe src="348729-1-inner.html"></iframe>
 </body>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index dd52bfbcb36e..5ab1dfebdbf3 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -105,7 +105,7 @@ load 347898-1.html
 load 348126-1.html
 load 348688-1.html
 load 348708-1.xhtml
-asserts(2) load 348729-1.html
+asserts(2) load 348729-1.html # bug 548836
 load 349095-1.xhtml
 load 350128-1.xhtml
 load 350267-1.html

From 105a409ca011ae6a41707fc0c3c487f80aed33df Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Fri, 25 Jun 2010 15:20:18 -0400
Subject: [PATCH 032/172] Bug 570451 - Avoid adding unneeded lines to image;
 r=joe sr=vlad

---
 modules/libpr0n/decoders/png/nsPNGDecoder.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/libpr0n/decoders/png/nsPNGDecoder.cpp b/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
index febb5e83144d..9abb0589e6ac 100644
--- a/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
+++ b/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
@@ -776,6 +776,9 @@ row_callback(png_structp png_ptr, png_bytep new_row,
   if (decoder->mFrameIsHidden)
     return;
 
+  if (row_num >= decoder->mFrameRect.height)
+    return;
+
   if (new_row) {
     PRInt32 width = decoder->mFrameRect.width;
     PRUint32 iwidth = decoder->mFrameRect.width;

From 39c1c4dd8c18bc226b00a8af12c659bdf1387287 Mon Sep 17 00:00:00 2001
From: Jono S Xia <jono@mozilla.com>
Date: Fri, 25 Jun 2010 11:14:11 -0700
Subject: [PATCH 033/172] Update Feedback image urls, no bug. r=dtownsend

---
 .../defaults/preferences/preferences.js                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/defaults/preferences/preferences.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/defaults/preferences/preferences.js
index 241d0d81723d..1598e03399d3 100755
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/defaults/preferences/preferences.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/defaults/preferences/preferences.js
@@ -16,5 +16,5 @@ pref("extensions.testpilot.dataUploadURL", "https://testpilot.mozillalabs.com/su
 pref("extensions.testpilot.homepageURL", "https://testpilot.mozillalabs.com/");
 
 
-pref("extensions.input.happyURL", "http://input.mozilla.com/happy");
-pref("extensions.input.sadURL", "http://input.mozilla.com/sad");
+pref("extensions.input.happyURL", "https://input.mozilla.com/happy");
+pref("extensions.input.sadURL", "https://input.mozilla.com/sad");

From caff3589e208a9e86f35c84053841ffbbadb8779 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Fri, 25 Jun 2010 12:05:45 -0400
Subject: [PATCH 034/172] Bug 574230: PopupNotifications should indicate which
 anchor's notifications are being displayed, so that the consumer can
 show/hide the appropriate anchor element, r=dao

--HG--
extra : rebase_source : 8e856779d2355a5612d8bdf20c5fb75a3a88edb2
---
 browser/base/content/browser.css              | 10 ++++++++++
 browser/base/content/browser.xul              |  2 +-
 .../content/test/browser_popupNotification.js | 19 +++++++++++++++++++
 toolkit/content/PopupNotifications.jsm        |  9 ++++++---
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index af602d34dd18..36d849fd5c73 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -316,3 +316,13 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
   -moz-appearance: none;
   -moz-window-shadow: none;
 }
+
+/* notification anchors should only be visible when their associated
+   notifications are */
+.notification-anchor-icon {
+  display: none;
+}
+
+#notification-popup-box[anchorid="geo-notification-icon"] > #geo-notification-icon {
+  display: -moz-box;
+}
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 492ea8b65304..a7e9829246cd 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -614,7 +614,7 @@
                  onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
                  onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
           <box id="notification-popup-box" hidden="true" align="center">
-            <image id="geo-notification-icon"/>
+            <image id="geo-notification-icon" class="notification-anchor-icon"/>
           </box>
           <!-- Use onclick instead of normal popup= syntax since the popup
                code fires onmousedown, and hence eats our favicon drag events.
diff --git a/browser/base/content/test/browser_popupNotification.js b/browser/base/content/test/browser_popupNotification.js
index 7614ed409b13..e26dc5a0d017 100644
--- a/browser/base/content/test/browser_popupNotification.js
+++ b/browser/base/content/test/browser_popupNotification.js
@@ -303,6 +303,8 @@ var tests = [
     onShown: function (popup) {
       // This also checks that only one element is shown.
       checkPopup(popup, this.notifyObj2);
+      is(document.getElementById("geo-notification-icon").boxObject.width, 0,
+         "geo anchor shouldn't be visible");
       dismissNotification(popup);
     },
     onHidden: function (popup) {
@@ -325,6 +327,23 @@ var tests = [
       this.notification.remove();
     }
   },
+  // Test that anchor icon appears
+  { // Test #11
+    run: function () {
+      this.notifyObj = new basicNotification();
+      this.notifyObj.anchorID = "geo-notification-icon";
+      this.notification = showNotification(this.notifyObj);
+    },
+    onShown: function (popup) {
+      checkPopup(popup, this.notifyObj);
+      isnot(document.getElementById("geo-notification-icon").boxObject.width, 0,
+            "geo anchor should be visible");
+      dismissNotification(popup);
+    },
+    onHidden: function (popup) {
+      this.notification.remove();
+    }
+  },
 ];
 
 function showNotification(notifyObj) {
diff --git a/toolkit/content/PopupNotifications.jsm b/toolkit/content/PopupNotifications.jsm
index b51c37812da1..4bc15cdeb499 100644
--- a/toolkit/content/PopupNotifications.jsm
+++ b/toolkit/content/PopupNotifications.jsm
@@ -344,13 +344,16 @@ PopupNotifications.prototype = {
   _update: function PopupNotifications_update(anchor) {
     let anchorElement, notificationsToShow = [];
     if (this._currentNotifications.length > 0) {
-      if (this.iconBox)
-        this.iconBox.hidden = false;
-
       // Only show the notifications that have the passed-in anchor (or the
       // first notification's anchor, if none was passed in). Other
       // notifications will be shown once these are dismissed.
       anchorElement = anchor || this._currentNotifications[0].anchorElement;
+
+      if (this.iconBox) {
+        this.iconBox.hidden = false;
+        this.iconBox.setAttribute("anchorid", anchorElement.id);
+      }
+
       notificationsToShow = this._currentNotifications.filter(function (n) {
         return n.anchorElement == anchorElement;
       });

From 71bec71c28578a0aba0bc066d9a15df574873481 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Thu, 24 Jun 2010 20:16:35 -0400
Subject: [PATCH 035/172] Bug 574137: move HUDService styling to
 toolkit/themes, avoid setting incorrect class names on toolbar buttons, and
 remove toolbar style rules that conflict with the browser styling, r=dao

--HG--
rename : toolkit/components/console/content/headsUpDisplay.css => toolkit/themes/pinstripe/global/headsUpDisplay.css
rename : toolkit/components/console/content/headsUpDisplay.css => toolkit/themes/winstripe/global/headsUpDisplay.css
extra : rebase_source : f99848fa59b700ed1503fddd9a08a4f34c3c8cb4
---
 .../console/hudservice/HUDService.jsm         |   6 +-
 toolkit/components/console/jar.mn             |   1 -
 .../pinstripe/global}/headsUpDisplay.css      |  65 +++-----
 toolkit/themes/pinstripe/global/jar.mn        |   1 +
 .../winstripe/global/headsUpDisplay.css       | 157 ++++++++++++++++++
 toolkit/themes/winstripe/global/jar.mn        |   2 +
 6 files changed, 183 insertions(+), 49 deletions(-)
 rename toolkit/{components/console/content => themes/pinstripe/global}/headsUpDisplay.css (76%)
 create mode 100644 toolkit/themes/winstripe/global/headsUpDisplay.css

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index dc8a7900e1cd..14492f1d1a4a 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -72,7 +72,7 @@ let log = LogFactory("*** HUDService:");
 
 const ELEMENT_NS_URI = "http://www.w3.org/1999/xhtml";
 const ELEMENT_NS = "html:";
-const HUD_STYLESHEET_URI = "chrome://global/content/headsUpDisplay.css";
+const HUD_STYLESHEET_URI = "chrome://global/skin/headsUpDisplay.css";
 const HUD_STRINGS_URI = "chrome://global/locale/headsUpDisplay.properties";
 
 XPCOMUtils.defineLazyGetter(this, "stringBundle", function () {
@@ -1908,7 +1908,6 @@ HeadsUpDisplay.prototype = {
     this.filterPrefs = HUDService.getDefaultFilterPrefs(this.hudId);
 
     let consoleFilterToolbar = this.makeFilterToolbar();
-    consoleFilterToolbar.setAttribute("mode", "text");
     consoleFilterToolbar.setAttribute("id", "viewGroup");
     this.consoleFilterToolbar = consoleFilterToolbar;
     consoleWrap.appendChild(consoleFilterToolbar);
@@ -1955,6 +1954,7 @@ HeadsUpDisplay.prototype = {
 
     let toolbar = this.makeXULNode("toolbar");
     toolbar.setAttribute("class", "hud-console-filter-toolbar");
+    toolbar.setAttribute("mode", "text");
 
     toolbar.appendChild(this.consoleClearButton);
     let btn;
@@ -1983,7 +1983,7 @@ HeadsUpDisplay.prototype = {
     }
     btn.setAttribute("hudId", this.hudId);
     btn.setAttribute("buttonType", prefKey);
-    btn.setAttribute("class", "toolbarbutton-text toolbarbutton-1 bookmark-item hud-filter-btn");
+    btn.setAttribute("class", "hud-filter-btn");
     let key = "btn" + aName;
     btn.setAttribute("label", this.getStr(key));
     key = "tip" + aName;
diff --git a/toolkit/components/console/jar.mn b/toolkit/components/console/jar.mn
index 60dbc9b23524..4a5c2ee72c23 100644
--- a/toolkit/components/console/jar.mn
+++ b/toolkit/components/console/jar.mn
@@ -3,4 +3,3 @@ toolkit.jar:
 *+ content/global/console.xul                           (content/console.xul)
 +  content/global/console.css                           (content/console.css)
 +  content/global/consoleBindings.xml                   (content/consoleBindings.xml)
-*+  content/global/headsUpDisplay.css                    (content/headsUpDisplay.css)
diff --git a/toolkit/components/console/content/headsUpDisplay.css b/toolkit/themes/pinstripe/global/headsUpDisplay.css
similarity index 76%
rename from toolkit/components/console/content/headsUpDisplay.css
rename to toolkit/themes/pinstripe/global/headsUpDisplay.css
index 721e67eed329..b415dda96a5b 100644
--- a/toolkit/components/console/content/headsUpDisplay.css
+++ b/toolkit/themes/pinstripe/global/headsUpDisplay.css
@@ -44,8 +44,6 @@
     height: 100%;
 }
 
-.hud-filter-btn > .toolbarbutton-icon { display: none; }
-
 .hud-console-wrapper {
     width: 100%; 
     overflow: auto; 
@@ -149,53 +147,30 @@
     font-size: 1.2em;
 }
 
-%include ../../../themes/pinstripe/global/shared.inc
+/* these need to be revised ... */
+.hud-filter-btn {
+    font-weight: bold;
+    color: #222;
+    border: 0 !important;
+    -moz-border-radius: 100%;
+}
 
-toolbar[mode="text"] .toolbarbutton-text {
+.hud-filter-btn:hover {
+    background-color: rgba(0, 0, 0, .205) !important;
+    color: #FFF !important;
+    text-shadow: 0 1px rgba(0, 0, 0, .4) !important;
+}
+
+.hud-filter-btn:active:hover {
+    -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.4), 0 1px rgba(255, 255, 255, 0.4);
+    background-color: rgba(0, 0, 0, .5) !important;
+}
+
+.hud-filter-btn > .toolbarbutton-text {
     margin: 1px 2px !important;
 }
 
-toolbarbutton:hover:active,
-toolbarbutton[open="true"] {
-    padding-top: 2px;
-    padding-bottom: 2px;
-    -moz-padding-start: 2px;
-    -moz-padding-end: 1px;
-}
-
-toolbarbutton[disabled="true"],
-toolbarbutton[disabled="true"]:hover,
-toolbarbutton[disabled="true"]:hover:active,
-toolbarbutton[disabled="true"][open="true"] {
-    padding-top: 2px;
-    padding-bottom: 2px;
-    -moz-padding-start: 2px;
-    -moz-padding-end: 1px;
-}
-
-/* ..... checked state ..... */
-
-toolbarbutton[checked="true"] {
-    border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow !important;
-    padding-top: 2px !important;
-    padding-bottom: 2px !important;
-    -moz-padding-start: 2px !important;
-    -moz-padding-end: 1px !important;
-}
-
-/* ..... unchecked state ..... */
-
-toolbarbutton[checked="false"] {
-    padding-top: 2px !important;
-    padding-bottom: 2px !important;
-    -moz-padding-start: 2px !important;
-    -moz-padding-end: 1px !important;
-}
-
-toolbar {
+.hud-console-filter-toolbar {
     padding: 1px 0px;
     -moz-box-align: center;
 }
-
-
-
diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn
index da19a40dc171..834256bd08a0 100644
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -21,6 +21,7 @@ toolkit.jar:
 * skin/classic/global/findBar.css
 * skin/classic/global/global.css
   skin/classic/global/groupbox.css
+* skin/classic/global/headsUpDisplay.css
   skin/classic/global/linkTree.css
   skin/classic/global/listbox.css
   skin/classic/global/menu.css
diff --git a/toolkit/themes/winstripe/global/headsUpDisplay.css b/toolkit/themes/winstripe/global/headsUpDisplay.css
new file mode 100644
index 000000000000..f8a463da2da3
--- /dev/null
+++ b/toolkit/themes/winstripe/global/headsUpDisplay.css
@@ -0,0 +1,157 @@
+/* ***** 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 DevTools code
+ *
+ * The Initial Developer of the Original Code is
+ *   Mozilla Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   David Dahl <ddahl@mozilla.com>
+
+ * 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 ***** */
+
+.hud-box {
+    border-bottom: 1px solid #aaa;
+}
+
+.hud-outer-wrapper {
+    width: 100%; 
+    height: 100%;
+}
+
+.hud-console-wrapper {
+    width: 100%; 
+    overflow: auto; 
+}
+
+.hud-main-label {
+    font-size: 1em;
+    padding-top: 0.33em;
+    font-weight: bold;
+}
+
+.hud-output-node div {
+    -moz-user-select: text;
+}
+
+.hud-output-node .hud-network {
+    color: blue;
+}
+
+.hud-output-node .hud-error {
+    color: red;
+}
+
+.hud-output-node .hud-log {
+    color: black;
+}
+
+.hud-output-node .hud-warn {
+    color: orange;
+}
+
+.hud-output-node .hud-info {
+    color: green;
+}
+
+.hud-output-node .hud-exception {
+    color: red; font-weight: bold;
+}
+
+.hud-hidden {
+    display: none;
+}
+
+.hud-msg-node {    
+    width: 100%;
+    margin-top: 0.3em; 
+    margin-bottom: 0.3em; 
+    padding-left: 0.3em;
+    border-bottom: 1px solid #eee;   
+}
+
+.hud-output-node {
+    border-bottom: 1px solid #ddd; 
+    border-top: 1px solid #ddd; 
+    overflow-x: auto; overflow: auto;
+    font: 1em monospace; background-color: white;
+    width: 100%;
+}
+
+/* JSTerm Styles */
+
+.jsterm-wrapper-node {
+    font-family: monospace; 
+    font-size: 1em;
+    background-color: #000; 
+    border: 1px solid #333; 
+    padding: 0.1em;
+    width: 100%;
+    height: 400px;
+}
+
+.jsterm-output-node {
+    width: 100%; 
+    height: 400px; 
+    color: white; 
+    background-color: black; 
+    overflow: auto; 
+    overflow-x: auto; 
+    position: absolute; 
+    -moz-box-direction: reverse;
+}
+
+.jsterm-output-node div {
+    -moz-user-select: text;
+}
+
+.jsterm-scroll-to-node {
+    height: 1px; width: 1px; position: relative; top: 92%; display: block;
+}
+
+.jsterm-input-node {
+    width: 98%;
+    font-family: monospace;
+    font-size: 1.2em; 
+    line-height: 1.6em;
+    background-color: black;
+    color: white;
+}
+
+.jsterm-output-line {
+    font-size: 1.2em;
+}
+
+.hud-filter-btn {
+    margin: 2px !important;
+}
+
+.hud-console-filter-toolbar {
+    padding: 1px 0px;
+    -moz-box-align: center;
+}
diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn
index 9e6566348ccf..c8aabd49bead 100644
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -25,6 +25,7 @@ toolkit.jar:
 *       skin/classic/global/global.css
         skin/classic/global/globalBindings.xml
         skin/classic/global/groupbox.css
+*       skin/classic/global/headsUpDisplay.css
         skin/classic/global/linkTree.css
         skin/classic/global/listbox.css
 *       skin/classic/global/menu.css
@@ -190,6 +191,7 @@ toolkit.jar:
 *       skin/classic/aero/global/global.css
         skin/classic/aero/global/globalBindings.xml
         skin/classic/aero/global/groupbox.css
+*       skin/classic/aero/global/headsUpDisplay.css
         skin/classic/aero/global/linkTree.css
         skin/classic/aero/global/listbox.css
 *       skin/classic/aero/global/menu.css                                (menu-aero.css)

From 013e10d651e3872e3e58a4a8cc8d342f997dc7aa Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 25 Jun 2010 12:38:57 -0700
Subject: [PATCH 036/172] Bug 574750: Use size_t for counter, in loops over
 contents of an nsCSSValue::Array. r=bz

---
 layout/base/nsPresContext.cpp     | 4 ++--
 layout/style/nsCSSDeclaration.cpp | 6 +++---
 layout/style/nsCSSRules.cpp       | 2 +-
 layout/style/nsStyleAnimation.cpp | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index c2a46c6c2794..7843361805f7 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -1755,9 +1755,9 @@ InsertFontFaceRule(nsCSSFontFaceRule *aRule, gfxUserFontSet* aFontSet,
   unit = val.GetUnit();
   if (unit == eCSSUnit_Array) {
     nsCSSValue::Array *srcArr = val.GetArrayValue();
-    size_t i, numSrc = srcArr->Count();
+    size_t numSrc = srcArr->Count();
     
-    for (i = 0; i < numSrc; i++) {
+    for (size_t i = 0; i < numSrc; i++) {
       val = srcArr->Item(i);
       unit = val.GetUnit();
       gfxFontFaceSrc *face = srcArray.AppendElements(1);
diff --git a/layout/style/nsCSSDeclaration.cpp b/layout/style/nsCSSDeclaration.cpp
index 42eb46631ee2..7037b70b61b6 100644
--- a/layout/style/nsCSSDeclaration.cpp
+++ b/layout/style/nsCSSDeclaration.cpp
@@ -277,7 +277,7 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
 
     nsCSSValue::Array *array = aValue.GetArrayValue();
     PRBool mark = PR_FALSE;
-    for (PRUint16 i = 0, i_end = array->Count(); i < i_end; ++i) {
+    for (size_t i = 0, i_end = array->Count(); i < i_end; ++i) {
       if (aProperty == eCSSProperty_border_image && i >= 5) {
         if (array->Item(i).GetUnit() == eCSSUnit_Null) {
           continue;
@@ -327,7 +327,7 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
     aResult.AppendLiteral("(");
 
     /* Now, step through the function contents, writing each of them as we go. */
-    for (PRUint16 index = 1; index < array->Count(); ++index) {
+    for (size_t index = 1; index < array->Count(); ++index) {
       AppendCSSValueToString(aProperty, array->Item(index), aResult);
 
       /* If we're not at the final element, append a comma. */
@@ -367,7 +367,7 @@ nsCSSDeclaration::AppendCSSValueToString(nsCSSProperty aProperty,
         }
       }
 
-      for (PRUint32 i = 0, i_end = array->Count(); i < i_end; ++i) {
+      for (size_t i = 0, i_end = array->Count(); i < i_end; ++i) {
         if (i != 0) {
           aResult.AppendLiteral(", ");
         }
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 14554f1239ee..39896288345f 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -1480,7 +1480,7 @@ AppendSerializedFontSrc(const nsCSSValue& src, nsAString & aResult NS_OUTPARAM)
                   "improper value unit for src:");
 
   const nsCSSValue::Array& sources = *src.GetArrayValue();
-  PRUint32 i = 0;
+  size_t i = 0;
 
   while (i < sources.Count()) {
     nsAutoString formats;
diff --git a/layout/style/nsStyleAnimation.cpp b/layout/style/nsStyleAnimation.cpp
index 6db227b8744b..4915d953067b 100644
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@@ -358,7 +358,7 @@ nsStyleAnimation::ComputeDistance(nsCSSProperty aProperty,
       while (shadow1) {
         nsCSSValue::Array *array1 = shadow1->mValue.GetArrayValue();
         nsCSSValue::Array *array2 = shadow2->mValue.GetArrayValue();
-        for (PRUint32 i = 0; i < 4; ++i) {
+        for (size_t i = 0; i < 4; ++i) {
           NS_ABORT_IF_FALSE(array1->Item(i).GetUnit() == eCSSUnit_Pixel,
                             "unexpected unit");
           NS_ABORT_IF_FALSE(array2->Item(i).GetUnit() == eCSSUnit_Pixel,
@@ -495,7 +495,7 @@ AddShadowItems(double aCoeff1, const nsCSSValue &aValue1,
     return PR_FALSE;
   }
 
-  for (PRUint32 i = 0; i < 4; ++i) {
+  for (size_t i = 0; i < 4; ++i) {
     NS_ABORT_IF_FALSE(array1->Item(i).GetUnit() == eCSSUnit_Pixel,
                       "unexpected unit");
     NS_ABORT_IF_FALSE(array2->Item(i).GetUnit() == eCSSUnit_Pixel,

From e358a123e2af62421aa793a347b371c688c44b38 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Fri, 25 Jun 2010 16:06:36 -0400
Subject: [PATCH 037/172] Bug 574702: avoid initializing WindowDraggingUtils
 multiple times due to binding re-attachment (causes dragging jumpiness
 issues), r=enndeakin

---
 toolkit/content/widgets/general.xml | 22 ++++++++++++++--------
 toolkit/content/widgets/toolbar.xml | 19 +++++++++++--------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/toolkit/content/widgets/general.xml b/toolkit/content/widgets/general.xml
index 4590cf797586..a9eed642f02c 100644
--- a/toolkit/content/widgets/general.xml
+++ b/toolkit/content/widgets/general.xml
@@ -161,10 +161,13 @@
            extends="chrome://global/content/bindings/general.xml#statusbar">
     <implementation>
       <constructor>
-        try {
-          Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm");
-          new WindowDraggingElement(this, window);
-        } catch (e) {}
+        if (!this._draggableStarted) {
+          this._draggableStarted = true;
+          try {
+            Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm");
+            new WindowDraggingElement(this, window);
+          } catch (e) {}
+        }
       </constructor>
     </implementation>
   </binding>
@@ -262,10 +265,13 @@
   <binding id="windowdragbox">
     <implementation>
       <constructor>
-        try {
-          Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm");
-          new WindowDraggingElement(this, window);
-        } catch (e) {}
+        if (!this._draggableStarted) {
+          this._draggableStarted = true;
+          try {
+            Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm");
+            new WindowDraggingElement(this, window);
+          } catch (e) {}
+        }
       </constructor>
     </implementation>
   </binding>
diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index 37ad1e99338e..943426f92f4d 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -441,14 +441,17 @@
            extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <implementation>
       <constructor><![CDATA[
-        try {
-          Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm");
-          let draggableThis = new WindowDraggingElement(this, window);
-          draggableThis.mouseDownCheck = function(e) {
-            // Don't move while customizing or while in full screen mode.
-            return !this.parentNode.customizing && !window.fullScreen;
-          }
-        } catch (e) {}
+        if (!this._draggableStarted) {
+          this._draggableStarted = true;
+          try {
+            Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm");
+            let draggableThis = new WindowDraggingElement(this, window);
+            draggableThis.mouseDownCheck = function(e) {
+              // Don't move while customizing or while in full screen mode.
+              return !this.parentNode.customizing && !window.fullScreen;
+            }
+          } catch (e) {}
+        }
       ]]></constructor>
     </implementation>
   </binding>

From 4c0c23a8e3aa32a64699283e581d9e6662e28b8d Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Fri, 25 Jun 2010 13:12:03 -0700
Subject: [PATCH 038/172] Bug 574120 - Add IPC support to android embedding
 code, r=blassey

---
 embedding/android/App.java.in   | 3 +++
 embedding/android/GeckoApp.java | 2 ++
 embedding/android/Makefile.in   | 8 +++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/embedding/android/App.java.in b/embedding/android/App.java.in
index fca38fef2ced..955799d82380 100644
--- a/embedding/android/App.java.in
+++ b/embedding/android/App.java.in
@@ -44,5 +44,8 @@ public class App extends GeckoApp {
     public String getAppName() {
 	return "@MOZ_APP_NAME@";
     }
+    public String getContentProcessName() {
+        return "@MOZ_CHILD_PROCESS_NAME@";
+    }
 };
 
diff --git a/embedding/android/GeckoApp.java b/embedding/android/GeckoApp.java
index f5b5d786780b..9c0d47755bb6 100644
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -270,6 +270,7 @@ abstract public class GeckoApp
     }
 
     abstract public String getAppName();
+    abstract public String getContentProcessName();
 
     protected void unpackComponents()
     {
@@ -323,6 +324,7 @@ abstract public class GeckoApp
         } while (status != StreamTokenizer.TT_EOF);
 
         unpackFile(zip, buf, null, "application.ini");
+        unpackFile(zip, buf, null, getContentProcessName());
     }
 
     private void unpackFile(ZipFile zip, byte[] buf, ZipEntry fileEntry, String name)
diff --git a/embedding/android/Makefile.in b/embedding/android/Makefile.in
index c16272e4e561..51e1c0c6d28b 100644
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -41,6 +41,7 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/ipc/app/defs.mk
 
 JAVAFILES = \
   GeckoApp.java \
@@ -51,7 +52,8 @@ JAVAFILES = \
 
 DEFINES += \
   -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
-  -DMOZ_APP_NAME=$(MOZ_APP_NAME)
+  -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
+  -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 GARBAGE += \
   AndroidManifest.xml  \
@@ -99,6 +101,10 @@ DIST_LINK_FILES = \
   blocklist.xml \
   $(NULL)
 
+ifdef MOZ_IPC
+DIST_LINK_FILES += $(MOZ_CHILD_PROCESS_NAME)
+endif
+
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
 
 include $(topsrcdir)/config/rules.mk

From b8cc222d90c432f145cf19fe30872b6741f5409a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Fri, 25 Jun 2010 22:41:04 +0200
Subject: [PATCH 039/172] Bug 574434 - Move Firefox button to the left of the
 tabstrip when not using aero glass. r=gavin

---
 browser/themes/winstripe/browser/browser.css | 26 ++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index ccffe7d8fc9f..334e92ca6644 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -124,12 +124,15 @@ statusbarpanel#statusbar-display {
                                          rgba(255,255,255,0) 50%);
   background-clip: padding-box;
   border: 1px solid rgba(0,0,0,.5);
-  -moz-border-radius: 4px;
+  border-top-style: none;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-bottomright: 4px;
   -moz-box-shadow: 0 0 5px rgba(255,255,255,.5) inset;
   color: white;
   text-shadow: 0 0 2px #333;
   font-weight: bold;
-  padding: .2em 2em;
+  padding: .1em 1.5em;
+  margin: 0;
 }
 
 #appmenu-button:hover:not(:active):not([open]) {
@@ -160,6 +163,25 @@ statusbarpanel#statusbar-display {
   -moz-padding-end: 16px;
 }
 
+/* XXX: stop-gap until the button can be drawn in the title bar */
+%ifdef WINSTRIPE_AERO
+@media not all and (-moz-windows-compositor) {
+%endif
+  #main-window[tabsontop="true"] > #appmenu-button-container > #appmenu-button {
+    position: relative !important;
+    margin-bottom: -1.6em !important;
+  }
+  #navigator-toolbox[tabsontop="true"] > #toolbar-menubar[autohide="true"] {
+    position: relative !important;
+    background-color: -moz-dialog !important;
+  }
+  #navigator-toolbox[tabsontop="true"] > #toolbar-menubar[autohide="true"] ~ #TabsToolbar {
+    -moz-padding-start: 10em !important;
+  }
+%ifdef WINSTRIPE_AERO
+}
+%endif
+
 /* ::::: bookmark buttons ::::: */
 
 toolbarbutton.bookmark-item {

From 08f99b052909a65f8a314429c7017571fc9dbff2 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Fri, 25 Jun 2010 14:06:14 -0700
Subject: [PATCH 040/172] Bug 573430 - nsIFaviconService.getFaviconData should
 not fail when passed the default favicon. r=mak

---
 .../places/src/nsFaviconService.cpp           | 61 ++++++++++++++++++-
 .../components/places/src/nsFaviconService.h  |  8 +++
 .../places/tests/unit/test_favicons.js        | 22 +++++++
 3 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/places/src/nsFaviconService.cpp b/toolkit/components/places/src/nsFaviconService.cpp
index db709ef10752..6bbd08f2be22 100644
--- a/toolkit/components/places/src/nsFaviconService.cpp
+++ b/toolkit/components/places/src/nsFaviconService.cpp
@@ -83,6 +83,10 @@
  */
 #define MAX_FAVICON_EXPIRATION ((PRTime)7 * 24 * 60 * 60 * PR_USEC_PER_SEC)
 
+// The MIME type of the default favicon and favicons created by
+// OptimizeFaviconImage.
+#define DEFAULT_MIME_TYPE "image/png"
+
 using namespace mozilla::places;
 
 /**
@@ -717,8 +721,33 @@ nsFaviconService::GetFaviconData(nsIURI* aFaviconURI, nsACString& aMimeType,
   NS_ENSURE_ARG_POINTER(aDataLen);
   NS_ENSURE_ARG_POINTER(aData);
 
+  nsCOMPtr<nsIURI> defaultFaviconURI;
+  nsresult rv = GetDefaultFavicon(getter_AddRefs(defaultFaviconURI));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  PRBool isDefaultFavicon = PR_FALSE;
+  rv = defaultFaviconURI->Equals(aFaviconURI, &isDefaultFavicon);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // If we're getting the default favicon, we need to handle it separately since
+  // it's not in the database.
+  if (isDefaultFavicon) {
+    nsCAutoString defaultData;
+    rv = GetDefaultFaviconData(defaultData);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    PRUint8* bytes = reinterpret_cast<PRUint8*>(ToNewCString(defaultData));
+    NS_ENSURE_STATE(bytes);
+
+    *aData = bytes;
+    *aDataLen = defaultData.Length();
+    aMimeType.AssignLiteral(DEFAULT_MIME_TYPE);
+
+    return NS_OK;
+  }
+
   DECLARE_AND_ASSIGN_SCOPED_LAZY_STMT(stmt, mDBGetData);
-  nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
+  rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("icon_url"), aFaviconURI);
   NS_ENSURE_SUCCESS(rv, rv);
 
   PRBool hasResult = PR_FALSE;
@@ -732,6 +761,33 @@ nsFaviconService::GetFaviconData(nsIURI* aFaviconURI, nsACString& aMimeType,
 }
 
 
+nsresult
+nsFaviconService::GetDefaultFaviconData(nsCString& byteStr)
+{
+  if (mDefaultFaviconData.IsEmpty()) {
+    nsCOMPtr<nsIURI> defaultFaviconURI;
+    nsresult rv = GetDefaultFavicon(getter_AddRefs(defaultFaviconURI));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<nsIInputStream> istream;
+    rv = NS_OpenURI(getter_AddRefs(istream), defaultFaviconURI);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = NS_ConsumeStream(istream, PR_UINT32_MAX, mDefaultFaviconData);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = istream->Close();
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if (mDefaultFaviconData.IsEmpty())
+      return NS_ERROR_UNEXPECTED;
+  }
+
+  byteStr.Assign(mDefaultFaviconData);
+  return NS_OK;
+}
+
+
 NS_IMETHODIMP
 nsFaviconService::GetFaviconDataAsDataURL(nsIURI* aFaviconURI,
                                           nsAString& aDataURL)
@@ -963,7 +1019,6 @@ nsFaviconService::OptimizeFaviconImage(const PRUint8* aData, PRUint32 aDataLen,
                                        nsACString& aNewMimeType)
 {
   nsresult rv;
-  
 
   nsCOMPtr<imgITools> imgtool = do_CreateInstance("@mozilla.org/image/tools;1");
 
@@ -978,7 +1033,7 @@ nsFaviconService::OptimizeFaviconImage(const PRUint8* aData, PRUint32 aDataLen,
   rv = imgtool->DecodeImageData(stream, aMimeType, getter_AddRefs(container));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  aNewMimeType.AssignLiteral("image/png");
+  aNewMimeType.AssignLiteral(DEFAULT_MIME_TYPE);
 
   // scale and recompress
   nsCOMPtr<nsIInputStream> iconStream;
diff --git a/toolkit/components/places/src/nsFaviconService.h b/toolkit/components/places/src/nsFaviconService.h
index c87b986afc3a..da9a88738b32 100644
--- a/toolkit/components/places/src/nsFaviconService.h
+++ b/toolkit/components/places/src/nsFaviconService.h
@@ -222,6 +222,14 @@ private:
   friend class FaviconLoadListener;
 
   bool mShuttingDown;
+
+  // Caches the content of the default favicon if it's not already cached and
+  // copies it into byteStr.
+  nsresult GetDefaultFaviconData(nsCString& byteStr);
+
+  // A string of bytes caching the default favicon's content.  Empty if not yet
+  // cached.  Rather than accessing this directly, use GetDefaultFaviconData.
+  nsCString mDefaultFaviconData;
 };
 
 #define FAVICON_ANNOTATION_NAME "favicon"
diff --git a/toolkit/components/places/tests/unit/test_favicons.js b/toolkit/components/places/tests/unit/test_favicons.js
index fad67720ec23..c0dd2cf27294 100644
--- a/toolkit/components/places/tests/unit/test_favicons.js
+++ b/toolkit/components/places/tests/unit/test_favicons.js
@@ -392,6 +392,28 @@ iconsvc.removeFailedFavicon(faviconURI);
 do_check_false(iconsvc.isFailedFavicon(faviconURI));
 
 
+/* ========== 13 ========== */
+testnum++;
+testdesc = "test getFaviconData on the default favicon ";
+
+outMimeType = {};
+outData = iconsvc.getFaviconData(iconsvc.defaultFavicon, outMimeType);
+do_check_eq(outMimeType.value, "image/png");
+
+// Read in the icon and compare it to what the API returned above.
+var istream = NetUtil.newChannel(iconsvc.defaultFavicon).open();
+var bistream = Cc["@mozilla.org/binaryinputstream;1"].
+               createInstance(Ci.nsIBinaryInputStream);
+bistream.setInputStream(istream);
+expectedData = [];
+var avail;
+while (avail = bistream.available()) {
+  expectedData = expectedData.concat(bistream.readByteArray(avail));
+}
+bistream.close();
+checkArrays(outData, expectedData);
+
+
 /* ========== end ========== */
 
 } catch (e) {

From cc75858eb7c3d014aefd9fa397b6368f9279f6fd Mon Sep 17 00:00:00 2001
From: Jesse Ruderman <jruderman@gmail.com>
Date: Fri, 25 Jun 2010 14:47:19 -0700
Subject: [PATCH 041/172] Bug 570287 - New stack fixer that uses breakpad
 symbol files. r=ted

---
 build/Makefile.in                  |   3 +
 build/automation.py.in             |  35 ++++---
 build/mobile/remoteautomation.py   |   2 +-
 testing/mochitest/Makefile.in      |   3 +-
 tools/rb/fix_stack_using_bpsyms.py | 160 +++++++++++++++++++++++++++++
 5 files changed, 188 insertions(+), 15 deletions(-)
 create mode 100755 tools/rb/fix_stack_using_bpsyms.py

diff --git a/build/Makefile.in b/build/Makefile.in
index 4e1c4fda02af..d2db7cec9f9c 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -111,6 +111,9 @@ libs:: bloaturls.txt
 libs:: bloatcycle.html
 	$(INSTALL) $< $(DIST)/bin/res
 
+libs:: $(topsrcdir)/tools/rb/fix_stack_using_bpsyms.py
+	$(INSTALL) $< $(DIST)/bin
+
 ifeq ($(OS_ARCH),Darwin)
 libs:: $(topsrcdir)/tools/rb/fix-macosx-stack.pl
 	$(INSTALL) $< $(DIST)/bin
diff --git a/build/automation.py.in b/build/automation.py.in
index fa601460bf8f..067bb982b57a 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -649,35 +649,44 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
     self.log.info("Can't trigger Breakpad, just killing process")
     proc.kill()
 
-  def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime, debuggerInfo):
+  def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime, debuggerInfo, symbolsPath):
     """ Look for timeout or crashes and return the status after the process terminates """
     stackFixerProcess = None
-    stackFixerModule = None
+    stackFixerFunction = None
     didTimeout = False
     if proc.stdout is None:
       self.log.info("TEST-INFO: Not logging stdout or stderr due to debugger connection")
     else:
       logsource = proc.stdout
-      if self.IS_DEBUG_BUILD and self.IS_LINUX:
-        # Run logsource through fix-linux-stack.pl
+
+      if self.IS_DEBUG_BUILD and (self.IS_MAC or self.IS_LINUX) and symbolsPath and os.path.exists(symbolsPath):
+        # Run each line through a function in fix_stack_using_bpsyms.py (uses breakpad symbol files)
+        # This method is preferred for Tinderbox builds, since native symbols may have been stripped.
+        sys.path.insert(0, utilityPath)
+        import fix_stack_using_bpsyms as stackFixerModule
+        stackFixerFunction = lambda line: stackFixerModule.fixSymbols(line, symbolsPath)
+        del sys.path[0]
+      elif self.IS_DEBUG_BUILD and self.IS_MAC and False:
+        # Run each line through a function in fix_macosx_stack.py (uses atos)
+        sys.path.insert(0, utilityPath)
+        import fix_macosx_stack as stackFixerModule
+        stackFixerFunction = lambda line: stackFixerModule.fixSymbols(line)
+        del sys.path[0]
+      elif self.IS_DEBUG_BUILD and self.IS_LINUX:
+        # Run logsource through fix-linux-stack.pl (uses addr2line)
+        # This method is preferred for developer machines, so we don't have to run "make buildsymbols".
         stackFixerProcess = self.Process([self.PERL, os.path.join(utilityPath, "fix-linux-stack.pl")],
                                          stdin=logsource,
                                          stdout=subprocess.PIPE)
         logsource = stackFixerProcess.stdout
 
-      if self.IS_DEBUG_BUILD and self.IS_MAC and False:
-        # Import fix_macosx_stack.py from utilityPath
-        sys.path.insert(0, utilityPath)
-        import fix_macosx_stack as stackFixerModule
-        del sys.path[0]
-
       (line, didTimeout) = self.readWithTimeout(logsource, timeout)
       hitMaxTime = False
       while line != "" and not didTimeout:
         if "TEST-START" in line and "|" in line:
           self.lastTestSeen = line.split("|")[1].strip()
-        if stackFixerModule:
-          line = stackFixerModule.fixSymbols(line)
+        if stackFixerFunction:
+          line = stackFixerFunction(line)
         self.log.info(line.rstrip())
         (line, didTimeout) = self.readWithTimeout(logsource, timeout)
         if not hitMaxTime and maxTime and datetime.now() - startTime > timedelta(seconds = maxTime):
@@ -814,7 +823,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
                  stderr = subprocess.STDOUT)
     self.log.info("INFO | automation.py | Application pid: %d", proc.pid)
 
-    status = self.waitForFinish(proc, utilityPath, timeout, maxTime, startTime, debuggerInfo)
+    status = self.waitForFinish(proc, utilityPath, timeout, maxTime, startTime, debuggerInfo, symbolsPath)
     self.log.info("INFO | automation.py | Application ran for: %s", str(datetime.now() - startTime))
 
     # Do a final check for zombie child processes.
diff --git a/build/mobile/remoteautomation.py b/build/mobile/remoteautomation.py
index bbb1612c2192..f5503ebb9ffe 100644
--- a/build/mobile/remoteautomation.py
+++ b/build/mobile/remoteautomation.py
@@ -66,7 +66,7 @@ class RemoteAutomation(Automation):
     def setProduct(self, product):
         self._product = product
 
-    def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime, debuggerInfo):
+    def waitForFinish(self, proc, utilityPath, timeout, maxTime, startTime, debuggerInfo, symbolsDir):
         # maxTime is used to override the default timeout, we should honor that
         status = proc.wait(timeout = maxTime)
 
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index e2017013ecc5..a7cc259639ae 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -125,13 +125,14 @@ GARBAGE += runtests.py
 libs:: $(_SERV_FILES)
 	$(INSTALL) $^ $(_DEST_DIR)
 
-# Binaries that don't get packaged with the build,
+# Binaries and scripts that don't get packaged with the build,
 # but that we need for the test harness
 TEST_HARNESS_BINS := \
   xpcshell$(BIN_SUFFIX) \
   ssltunnel$(BIN_SUFFIX) \
   certutil$(BIN_SUFFIX) \
   pk12util$(BIN_SUFFIX) \
+  fix_stack_using_bpsyms.py \
   $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/tools/rb/fix_stack_using_bpsyms.py b/tools/rb/fix_stack_using_bpsyms.py
new file mode 100755
index 000000000000..dd2dc6d61751
--- /dev/null
+++ b/tools/rb/fix_stack_using_bpsyms.py
@@ -0,0 +1,160 @@
+#!/usr/bin/env python
+
+# ***** 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 fix_stack_using_bpsyms.py.
+#
+# The Initial Developer of the Original Code is the Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Jesse Ruderman <jruderman@gmail.com>
+#   L. David Baron <dbaron@dbaron.org>
+#   Ted Mielczarek <ted.mielczarek@gmail.com>
+#
+# 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 *****
+
+from __future__ import with_statement
+
+import sys
+import os
+import re
+import bisect
+
+def prettyFileName(name):
+  if name.startswith("../") or name.startswith("..\\"):
+    # dom_quickstubs.cpp and many .h files show up with relative paths that are useless
+    # and/or don't correspond to the layout of the source tree.
+    return os.path.basename(name) + ":"
+  elif name.startswith("hg:"):
+    (junk, repo, path, rev) = name.split(":")
+    # We could construct an hgweb URL with /file/ or /annotate/, like this:
+    # return "http://%s/annotate/%s/%s#l" % (repo, rev, path)
+    return path  + ":"
+  return name  + ":"
+
+class readSymbolFile:
+  def __init__(self, fn):
+    addrs = [] # list of addresses, which will be sorted once we're done initializing
+    funcs = {} # hash: address --> (function name + possible file/line)
+    files = {} # hash: filenum (string) --> prettified filename ready to have a line number appended
+    with open(fn) as f:
+      for line in f:
+        line = line.rstrip()
+        # http://code.google.com/p/google-breakpad/wiki/SymbolFiles
+        if line.startswith("FUNC "):
+          # FUNC <address> <size> <stack_param_size> <name>
+          (junk, rva, size, ss, name) = line.split(None, 4)
+          rva = int(rva,16)
+          funcs[rva] = name
+          addrs.append(rva)
+          lastFuncName = name
+        elif line.startswith("PUBLIC "):
+          # PUBLIC <address> <stack_param_size> <name>
+          (junk, rva, ss, name) = line.split(None, 3)
+          rva = int(rva,16)
+          funcs[rva] = name
+          addrs.append(rva)
+        elif line.startswith("FILE "):
+          # FILE <number> <name>
+          (junk, filenum, name) = line.split(None, 2)
+          files[filenum] = prettyFileName(name)
+        elif line[0] in "0123456789abcdef":
+          # This is one of the "line records" corresponding to the last FUNC record
+          # <address> <size> <line> <filenum>
+          (rva, size, line, filenum) = line.split(None)
+          rva = int(rva,16)
+          file = files[filenum]
+          name = lastFuncName + " [" + file + line + "]"
+          funcs[rva] = name
+          addrs.append(rva)
+        # skip everything else
+    #print "Loaded %d functions from symbol file %s" % (len(funcs), os.path.basename(fn))
+    self.addrs = sorted(addrs)
+    self.funcs = funcs
+  def addrToSymbol(self, address):
+    i = bisect.bisect(self.addrs, address) - 1
+    if i > 0:
+      #offset = address - self.addrs[i]
+      return self.funcs[self.addrs[i]]
+    else:
+      return ""
+
+
+def guessSymbolFile(fn, symbolsDir):
+  """Guess a symbol file based on an object file's basename, ignoring the path and UUID."""
+  fn = os.path.basename(fn)
+  d1 = os.path.join(symbolsDir, fn)
+  if not os.path.exists(d1):
+    return None
+  uuids = os.listdir(d1)
+  if len(uuids) == 0:
+    raise Exception("Missing symbol file for " + fn)
+  if len(uuids) > 1:
+    raise Exception("Ambiguous symbol file for " + fn)
+  return os.path.join(d1, uuids[0], fn + ".sym")
+
+parsedSymbolFiles = {}
+def addressToSymbol(file, address, symbolsDir):
+  p = None
+  if not file in parsedSymbolFiles:
+    symfile = guessSymbolFile(file, symbolsDir)
+    if symfile:
+      p = readSymbolFile(symfile)
+    else:
+      p = None
+    parsedSymbolFiles[file] = p
+  else:
+    p = parsedSymbolFiles[file]
+  if p:
+    return p.addrToSymbol(address)
+  else:
+    return ""
+
+line_re = re.compile("^(.*) ?\[([^ ]*) \+(0x[0-9A-F]{1,8})\](.*)$")
+balance_tree_re = re.compile("^([ \|0-9-]*)")
+
+def fixSymbols(line, symbolsDir):
+  result = line_re.match(line)
+  if result is not None:
+    # before allows preservation of balance trees
+    # after allows preservation of counts
+    (before, file, address, after) = result.groups()
+    address = int(address, 16)
+    # throw away the bad symbol, but keep balance tree structure
+    before = balance_tree_re.match(before).groups()[0]
+    symbol = addressToSymbol(file, address, symbolsDir)
+    if not symbol:
+      symbol = "%s + 0x%x" % (os.path.basename(file), address)
+    return before + symbol + after + "\n"
+  else:
+      return line
+
+if __name__ == "__main__":
+  symbolsDir = sys.argv[1]
+  for line in iter(sys.stdin.readline, ''):
+    print fixSymbols(line, symbolsDir),

From ee0aeb4d63ca91022a1499902bdde85e4b7c952b Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 042/172] Bug 574756. Make sure nsIFrame::List outputs the
 stylecontext of the frame. r=dbaron

---
 layout/generic/nsFrame.cpp            | 1 +
 layout/generic/nsImageFrame.cpp       | 4 ++--
 layout/generic/nsPlaceholderFrame.cpp | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 386294f3b8c3..9c0f3a64a405 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -4178,6 +4178,7 @@ nsFrame::List(FILE* out, PRInt32 aIndent) const
     fprintf(out, " [overflow=%d,%d,%d,%d]", overflowArea.x, overflowArea.y,
             overflowArea.width, overflowArea.height);
   }
+  fprintf(out, " [sc=%p]", static_cast<void*>(mStyleContext));
   fputs("\n", out);
   return NS_OK;
 }
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 07e6c7581e88..22bec7d17e05 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -1589,12 +1589,12 @@ nsImageFrame::List(FILE* out, PRInt32 aIndent) const
   if (HasView()) {
     fprintf(out, " [view=%p]", (void*)GetView());
   }
-  fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, 
-mRect.height);
+  fprintf(out, " {%d,%d,%d,%d}", mRect.x, mRect.y, mRect.width, mRect.height);
   if (0 != mState) {
     fprintf(out, " [state=%016llx]", mState);
   }
   fprintf(out, " [content=%p]", (void*)mContent);
+  fprintf(out, " [sc=%p]", static_cast<void*>(mStyleContext));
 
   // output the img src url
   nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mContent);
diff --git a/layout/generic/nsPlaceholderFrame.cpp b/layout/generic/nsPlaceholderFrame.cpp
index cfd5009cd0ff..2e4851d70678 100644
--- a/layout/generic/nsPlaceholderFrame.cpp
+++ b/layout/generic/nsPlaceholderFrame.cpp
@@ -277,6 +277,9 @@ nsPlaceholderFrame::List(FILE* out, PRInt32 aIndent) const
   if (nsnull != mContent) {
     fprintf(out, " [content=%p]", static_cast<void*>(mContent));
   }
+  if (nsnull != mStyleContext) {
+    fprintf(out, " [sc=%p]", static_cast<void*>(mStyleContext));
+  }
   if (mOutOfFlowFrame) {
     fprintf(out, " outOfFlowFrame=");
     nsFrame::ListTag(out, mOutOfFlowFrame);

From 3bb697ac020ffd9574bf5d17e67a9ee31f43aa79 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 043/172] Bug 567702. Factor out duplicated DOMWindowToWidget.
 r=roc

---
 widget/src/Makefile.in                    |  2 +-
 widget/src/gtk2/Makefile.in               |  1 +
 widget/src/gtk2/nsPrintDialogGTK.cpp      | 47 +++----------
 widget/src/shared/Makefile.in             | 64 +++++++++++++++++
 widget/src/shared/WidgetUtils.cpp         | 84 +++++++++++++++++++++++
 widget/src/shared/WidgetUtils.h           | 66 ++++++++++++++++++
 widget/src/xpwidgets/Makefile.in          |  3 +
 widget/src/xpwidgets/nsBaseFilePicker.cpp | 40 ++---------
 widget/src/xpwidgets/nsBaseFilePicker.h   |  1 -
 9 files changed, 232 insertions(+), 76 deletions(-)
 create mode 100644 widget/src/shared/Makefile.in
 create mode 100644 widget/src/shared/WidgetUtils.cpp
 create mode 100644 widget/src/shared/WidgetUtils.h

diff --git a/widget/src/Makefile.in b/widget/src/Makefile.in
index 2dd9023b3952..f0dbde3728f8 100644
--- a/widget/src/Makefile.in
+++ b/widget/src/Makefile.in
@@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE  = widget
 
-DIRS		= xpwidgets
+DIRS		= shared xpwidgets
 
 ifneq (,$(filter beos os2 cocoa qt android,$(MOZ_WIDGET_TOOLKIT)))
 DIRS		+= $(MOZ_WIDGET_TOOLKIT)
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
index 7868061ad00d..061514817901 100644
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -162,5 +162,6 @@ endif
 DEFINES		+=
 INCLUDES	+= \
 		-I$(srcdir)/../xpwidgets \
+		-I$(srcdir)/../shared \
 		-I$(topsrcdir)/other-licenses/atk-1.0 \
 		$(NULL)
diff --git a/widget/src/gtk2/nsPrintDialogGTK.cpp b/widget/src/gtk2/nsPrintDialogGTK.cpp
index f88bc8f8aa08..1843cc1625fa 100644
--- a/widget/src/gtk2/nsPrintDialogGTK.cpp
+++ b/widget/src/gtk2/nsPrintDialogGTK.cpp
@@ -57,47 +57,14 @@
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShell.h"
+#include "WidgetUtils.h"
+
+using namespace mozilla::widget;
 
 static const char header_footer_tags[][4] =  {"", "&T", "&U", "&D", "&P", "&PT"};
 
 #define CUSTOM_VALUE_INDEX NS_ARRAY_LENGTH(header_footer_tags)
 
-// XXXdholbert Duplicated from widget/src/xpwidgets/nsBaseFilePicker.cpp
-// Needs to be unified in some generic utility class.
-static nsIWidget *
-DOMWindowToWidget(nsIDOMWindow *dw)
-{
-  nsCOMPtr<nsIWidget> widget;
-
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(dw);
-  if (window) {
-    nsCOMPtr<nsIBaseWindow> baseWin(do_QueryInterface(window->GetDocShell()));
-
-    while (!widget && baseWin) {
-      baseWin->GetParentWidget(getter_AddRefs(widget));
-      if (!widget) {
-        nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(baseWin));
-        if (!docShellAsItem)
-          return nsnull;
-
-        nsCOMPtr<nsIDocShellTreeItem> parent;
-        docShellAsItem->GetSameTypeParent(getter_AddRefs(parent));
-
-        window = do_GetInterface(parent);
-        if (!window)
-          return nsnull;
-
-        baseWin = do_QueryInterface(window->GetDocShell());
-      }
-    }
-  }
-
-  // This will return a pointer that we're about to release, but
-  // that's ok since the docshell (nsIBaseWindow) holds the widget
-  // alive.
-  return widget.get();
-}
-
 // XXXdholbert Duplicated from widget/src/gtk2/nsFilePicker.cpp
 // Needs to be unified in some generic utility class.
 static GtkWindow *
@@ -230,7 +197,9 @@ class nsPrintDialogWidgetGTK {
 
 nsPrintDialogWidgetGTK::nsPrintDialogWidgetGTK(nsIDOMWindow *aParent, nsIPrintSettings *aSettings)
 {
-  GtkWindow* gtkParent = get_gtk_window_for_nsiwidget(DOMWindowToWidget(aParent));
+  nsCOMPtr<nsIWidget> widget = WidgetUtils::DOMWindowToWidget(aParent);
+  NS_ASSERTION(widget, "Need a widget for dialog to be modal.");
+  GtkWindow* gtkParent = get_gtk_window_for_nsiwidget(widget);
   NS_ASSERTION(gtkParent, "Need a GTK window for dialog to be modal.");
 
   nsCOMPtr<nsIStringBundleService> bundleSvc = do_GetService(NS_STRINGBUNDLE_CONTRACTID);
@@ -635,7 +604,9 @@ nsPrintDialogServiceGTK::ShowPageSetup(nsIDOMWindow *aParent,
   NS_PRECONDITION(aNSSettings, "aSettings must not be null");
   NS_ENSURE_TRUE(aNSSettings, NS_ERROR_FAILURE);
 
-  GtkWindow* gtkParent = get_gtk_window_for_nsiwidget(DOMWindowToWidget(aParent));
+  nsCOMPtr<nsIWidget> widget = WidgetUtils::DOMWindowToWidget(aParent);
+  NS_ASSERTION(widget, "Need a widget for dialog to be modal.");
+  GtkWindow* gtkParent = get_gtk_window_for_nsiwidget(widget);
   NS_ASSERTION(gtkParent, "Need a GTK window for dialog to be modal.");
 
   nsCOMPtr<nsPrintSettingsGTK> aNSSettingsGTK(do_QueryInterface(aNSSettings));
diff --git a/widget/src/shared/Makefile.in b/widget/src/shared/Makefile.in
new file mode 100644
index 000000000000..9a741e24883f
--- /dev/null
+++ b/widget/src/shared/Makefile.in
@@ -0,0 +1,64 @@
+#
+# ***** 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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= widget
+LIBRARY_NAME	= widget_shared
+LIBXUL_LIBRARY  = 1
+
+
+DEFINES += \
+  -D_IMPL_NS_WIDGET \
+  $(NULL)
+
+CPPSRCS		= \
+		WidgetUtils.cpp \
+		$(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS	+= $(TK_CFLAGS)
diff --git a/widget/src/shared/WidgetUtils.cpp b/widget/src/shared/WidgetUtils.cpp
new file mode 100644
index 000000000000..6614fc268e49
--- /dev/null
+++ b/widget/src/shared/WidgetUtils.cpp
@@ -0,0 +1,84 @@
+/* -*- 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 the Mozilla browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *   Mike Pinkerton   <pinkerton@netscape.com>
+ *
+ * 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 "WidgetUtils.h"
+
+#include "nsIBaseWindow.h"
+#include "nsIDocShellTreeItem.h"
+#include "nsIDocShell.h"
+#include "nsIInterfaceRequestorUtils.h"
+
+namespace mozilla {
+namespace widget {
+
+//static
+already_AddRefed<nsIWidget>
+WidgetUtils::DOMWindowToWidget(nsIDOMWindow *aDOMWindow)
+{
+  nsCOMPtr<nsIWidget> widget;
+
+  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(aDOMWindow);
+  if (window) {
+    nsCOMPtr<nsIBaseWindow> baseWin(do_QueryInterface(window->GetDocShell()));
+
+    while (!widget && baseWin) {
+      baseWin->GetParentWidget(getter_AddRefs(widget));
+      if (!widget) {
+        nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(baseWin));
+        if (!docShellAsItem)
+          return nsnull;
+
+        nsCOMPtr<nsIDocShellTreeItem> parent;
+        docShellAsItem->GetSameTypeParent(getter_AddRefs(parent));
+
+        window = do_GetInterface(parent);
+        if (!window)
+          return nsnull;
+
+        baseWin = do_QueryInterface(window->GetDocShell());
+      }
+    }
+  }
+
+  return widget.forget();
+}
+
+} // namespace widget
+} // namespace mozilla
diff --git a/widget/src/shared/WidgetUtils.h b/widget/src/shared/WidgetUtils.h
new file mode 100644
index 000000000000..8ab96732d439
--- /dev/null
+++ b/widget/src/shared/WidgetUtils.h
@@ -0,0 +1,66 @@
+/* -*- 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 the Mozilla browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stuart Parmenter <pavlov@netscape.com>
+ *   Mike Pinkerton   <pinkerton@netscape.com>
+ *
+ * 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 __mozilla_widget_WidgetUtils_h__
+#define __mozilla_widget_WidgetUtils_h__
+
+#include "nsCOMPtr.h"
+#include "nsIWidget.h"
+#include "nsPIDOMWindow.h"
+#include "nsIDOMWindow.h"
+
+namespace mozilla {
+namespace widget {
+
+class WidgetUtils
+{
+public:
+
+  /**
+   * Starting at the docshell item for the passed in DOM window this looks up
+   * the docshell tree until it finds a docshell item that has a widget.
+   */
+  static already_AddRefed<nsIWidget> DOMWindowToWidget(nsIDOMWindow *aDOMWindow);
+};
+
+} // namespace widget
+} // namespace mozilla
+
+#endif
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index 5ec94401056f..78dcab727e6c 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -82,8 +82,11 @@ ifneq (,$(filter qt gtk2 windows cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsNativeTheme.cpp
 endif
 
+SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX)
+
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
+		-I$(srcdir)/../shared \
 		-I$(srcdir) \
 		$(NULL)
 
diff --git a/widget/src/xpwidgets/nsBaseFilePicker.cpp b/widget/src/xpwidgets/nsBaseFilePicker.cpp
index 1b0d34331610..7617645d488a 100644
--- a/widget/src/xpwidgets/nsBaseFilePicker.cpp
+++ b/widget/src/xpwidgets/nsBaseFilePicker.cpp
@@ -55,9 +55,12 @@
 #include "nsILocalFile.h"
 #include "nsEnumeratorUtils.h"
 #include "mozilla/Services.h"
+#include "WidgetUtils.h"
 
 #include "nsBaseFilePicker.h"
 
+using namespace mozilla::widget;
+
 #define FILEPICKER_TITLES "chrome://global/locale/filepicker.properties"
 #define FILEPICKER_FILTERS "chrome://global/content/filepicker.properties"
 
@@ -71,41 +74,6 @@ nsBaseFilePicker::~nsBaseFilePicker()
 
 }
 
-// XXXdholbert -- this function is duplicated in nsPrintDialogGTK.cpp
-// and needs to be unified in some generic utility class.
-nsIWidget *nsBaseFilePicker::DOMWindowToWidget(nsIDOMWindow *dw)
-{
-  nsCOMPtr<nsIWidget> widget;
-
-  nsCOMPtr<nsPIDOMWindow> window = do_QueryInterface(dw);
-  if (window) {
-    nsCOMPtr<nsIBaseWindow> baseWin(do_QueryInterface(window->GetDocShell()));
-
-    while (!widget && baseWin) {
-      baseWin->GetParentWidget(getter_AddRefs(widget));
-      if (!widget) {
-        nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(baseWin));
-        if (!docShellAsItem)
-          return nsnull;
-
-        nsCOMPtr<nsIDocShellTreeItem> parent;
-        docShellAsItem->GetSameTypeParent(getter_AddRefs(parent));
-
-        window = do_GetInterface(parent);
-        if (!window)
-          return nsnull;
-
-        baseWin = do_QueryInterface(window->GetDocShell());
-      }
-    }
-  }
-
-  // This will return a pointer that we're about to release, but
-  // that's ok since the docshell (nsIBaseWindow) holds the widget
-  // alive.
-  return widget.get();
-}
-
 //-------------------------------------------------------------------------
 NS_IMETHODIMP nsBaseFilePicker::Init(nsIDOMWindow *aParent,
                                      const nsAString& aTitle,
@@ -113,7 +81,7 @@ NS_IMETHODIMP nsBaseFilePicker::Init(nsIDOMWindow *aParent,
 {
   NS_PRECONDITION(aParent, "Null parent passed to filepicker, no file "
                   "picker for you!");
-  nsIWidget *widget = DOMWindowToWidget(aParent);
+  nsCOMPtr<nsIWidget> widget = WidgetUtils::DOMWindowToWidget(aParent);
   NS_ENSURE_TRUE(widget, NS_ERROR_FAILURE);
 
   InitNative(widget, aTitle, aMode);
diff --git a/widget/src/xpwidgets/nsBaseFilePicker.h b/widget/src/xpwidgets/nsBaseFilePicker.h
index 145f95f89934..01a3bb3cbb40 100644
--- a/widget/src/xpwidgets/nsBaseFilePicker.h
+++ b/widget/src/xpwidgets/nsBaseFilePicker.h
@@ -75,7 +75,6 @@ protected:
   virtual void InitNative(nsIWidget *aParent, const nsAString& aTitle,
                           PRInt16 aMode) = 0;
 
-  nsIWidget *DOMWindowToWidget(nsIDOMWindow *dw);
 #ifdef BASEFILEPICKER_HAS_DISPLAYDIRECTORY 
   nsCOMPtr<nsILocalFile> mDisplayDirectory;
 #endif

From f814ac045212c78f103cd247009b9331d3b58cda Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 044/172] Bug 567702. Walking the sametype parent chain of our
 docshell is not guaranteed to lead to a widget, so walk the parent chain
 instead. This fixes printing on Linux and opening a file dialog everywhere
 with bug 130078. r=roc

---
 widget/src/shared/WidgetUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/widget/src/shared/WidgetUtils.cpp b/widget/src/shared/WidgetUtils.cpp
index 6614fc268e49..fc5a78fb9a61 100644
--- a/widget/src/shared/WidgetUtils.cpp
+++ b/widget/src/shared/WidgetUtils.cpp
@@ -66,7 +66,7 @@ WidgetUtils::DOMWindowToWidget(nsIDOMWindow *aDOMWindow)
           return nsnull;
 
         nsCOMPtr<nsIDocShellTreeItem> parent;
-        docShellAsItem->GetSameTypeParent(getter_AddRefs(parent));
+        docShellAsItem->GetParent(getter_AddRefs(parent));
 
         window = do_GetInterface(parent);
         if (!window)

From 503cb9fdd06e3a6dcd0eddd738005740f2a05b4c Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 045/172] Bug 572294. Make sure the refpoint is relative to the
 widget we use on the drop event. r=roc

---
 content/events/src/nsEventStateManager.cpp | 12 ++++--------
 widget/public/nsGUIEvent.h                 |  3 ++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index c5078cc96b89..2bda542431fb 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -1879,14 +1879,6 @@ nsEventStateManager::FillInEventFromGestureDown(nsMouseEvent* aEvent)
 // If we're in the TRACKING state of the d&d gesture tracker, check the current position
 // of the mouse in relation to the old one. If we've moved a sufficient amount from
 // the mouse down, then fire off a drag gesture event.
-//
-// Note that when the mouse enters a new child window with its own view, the event's
-// coordinates will be in relation to the origin of the inner child window, which could
-// either be very different from that of the mouse coords of the mouse down and trigger
-// a drag too early, or very similar which might not trigger a drag.
-//
-// Do we need to do anything about this? Let's wait and see.
-//
 void
 nsEventStateManager::GenerateDragGesture(nsPresContext* aPresContext,
                                          nsMouseEvent *aEvent)
@@ -3107,6 +3099,10 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext,
 
         nsMouseEvent* mouseEvent = static_cast<nsMouseEvent*>(aEvent);
         event.refPoint = mouseEvent->refPoint;
+        if (mouseEvent->widget) {
+          event.refPoint += mouseEvent->widget->WidgetToScreenOffset();
+        }
+        event.refPoint -= widget->WidgetToScreenOffset();
         event.isShift = mouseEvent->isShift;
         event.isControl = mouseEvent->isControl;
         event.isAlt = mouseEvent->isAlt;
diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index f8856931d437..ff3a16c9c101 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -514,7 +514,8 @@ public:
   PRUint8     eventStructType;
   // See GUI MESSAGES,
   PRUint32    message;
-  // In widget relative coordinates, not modified by layout code.
+  // Relative to the widget of the event, or if there is no widget then it is
+  // in screen coordinates. Not modified by layout code.
   nsIntPoint  refPoint;
   // Elapsed time, in milliseconds, from a platform-specific zero time
   // to the time the message was created

From 1bd7303575e698f97b52249bfee98e2becd4f19a Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 046/172] Bug 572622. Make all content command events sent to
 the focused element. r=masayuki

---
 widget/public/nsGUIEvent.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index ff3a16c9c101..0736b7236c52 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -1434,12 +1434,7 @@ enum nsDragDropEventStatus {
        (((evnt)->message == NS_SELECTION_SET))
 
 #define NS_IS_CONTENT_COMMAND_EVENT(evnt) \
-       (((evnt)->message == NS_CONTENT_COMMAND_CUT) || \
-        ((evnt)->message == NS_CONTENT_COMMAND_COPY) || \
-        ((evnt)->message == NS_CONTENT_COMMAND_PASTE) || \
-        ((evnt)->message == NS_CONTENT_COMMAND_DELETE) || \
-        ((evnt)->message == NS_CONTENT_COMMAND_UNDO) || \
-        ((evnt)->message == NS_CONTENT_COMMAND_REDO))
+       ((evnt)->eventStructType == NS_CONTENT_COMMAND_EVENT)
 
 #define NS_IS_PLUGIN_EVENT(evnt) \
        (((evnt)->message == NS_PLUGIN_EVENT))

From 14a8952bb9a30f38f97b66cd9f6b97578fc92454 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 047/172] Bug 563878. Part 8. Remove workaround from
 ViewToWidgetOffset because it is not needed anymore. r=roc

---
 view/public/nsIView.h | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/view/public/nsIView.h b/view/public/nsIView.h
index 081238a7ee79..4c07bf6880ac 100644
--- a/view/public/nsIView.h
+++ b/view/public/nsIView.h
@@ -362,20 +362,7 @@ public:
   // This is an app unit offset to add when converting view coordinates to
   // widget coordinates.  It is the offset in view coordinates from widget
   // top-left to view top-left.
-  nsPoint ViewToWidgetOffset() const {
-    nsIView* parent = reinterpret_cast<nsIView*>(mParent);
-    if (parent && parent->GetViewManager() != GetViewManager()) {
-      // The document root view's mViewToWidgetOffset is always (0,0).
-      // If it has a parent view, the parent view must be the inner view
-      // for an nsSubdocumentFrame; its top-left position in appunits
-      // is always positioned at that inner view's top-left, and its
-      // widget top-left is always positioned at that inner view's widget's
-      // top-left, so its ViewToWidgetOffset is actually the same as
-      // its parent's.
-      return parent->ViewToWidgetOffset();
-    }
-    return mViewToWidgetOffset;
-  }
+  nsPoint ViewToWidgetOffset() const { return mViewToWidgetOffset; }
 
 protected:
   friend class nsWeakView;

From 66ff344afd8a805c4a5f8242f8f22922fb77c2b2 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 048/172] Bug 563878. Part 9. Remove nsIView::GetScreenPosition
 because it is unused. r=mats

---
 view/public/nsIView.h |  7 -------
 view/src/nsView.cpp   | 19 -------------------
 2 files changed, 26 deletions(-)

diff --git a/view/public/nsIView.h b/view/public/nsIView.h
index 4c07bf6880ac..2292fa1f80d1 100644
--- a/view/public/nsIView.h
+++ b/view/public/nsIView.h
@@ -187,13 +187,6 @@ public:
    */
   nsPoint GetOffsetTo(const nsIView* aOther) const;
 
-  /**
-   * Get the screen position of the view.
-   * @return the pixel position of the top-left of the view in screen
-   * coordinates.
-   */
-  nsIntPoint GetScreenPosition() const;
-  
   /**
    * Called to query the visibility state of a view.
    * @result current visibility state
diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp
index 2f142223c8cf..d6d5a8a05116 100644
--- a/view/src/nsView.cpp
+++ b/view/src/nsView.cpp
@@ -932,25 +932,6 @@ nsPoint nsIView::GetOffsetTo(const nsIView* aOther) const
   return offset;
 }
 
-nsIntPoint nsIView::GetScreenPosition() const
-{
-  nsIntPoint screenPoint(0,0);  
-  nsPoint toWidgetOffset(0,0);
-  nsIWidget* widget = GetNearestWidget(&toWidgetOffset);
-  if (widget) {
-    nsCOMPtr<nsIDeviceContext> dx;
-    mViewManager->GetDeviceContext(*getter_AddRefs(dx));
-    PRInt32 p2a = dx->AppUnitsPerDevPixel();
-    nsIntPoint ourPoint(NSAppUnitsToIntPixels(toWidgetOffset.x, p2a),
-                        NSAppUnitsToIntPixels(toWidgetOffset.y, p2a));
-    // WidgetToScreenOffset is at the origin of the client area of
-    // the widget.
-    screenPoint = ourPoint + widget->WidgetToScreenOffset();
-  }
-  
-  return screenPoint;
-}
-
 nsIWidget* nsIView::GetNearestWidget(nsPoint* aOffset) const
 {
   // aOffset is based on the view's position, which ignores any chrome on

From b5fc18f20bcd629bfa730283a9eea524695eab4c Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 049/172] Bug 571640. Part 1. Enhance synthesizeDrop to take a
 source element to start the drag on. r=enndeakin

---
 browser/base/content/test/browser_drag.js     |  2 +-
 .../components/search/test/browser_426329.js  |  6 ++---
 .../mochitest/tests/SimpleTest/EventUtils.js  | 23 +++++++++++--------
 .../SimpleTest/tests/test_synthesizeDrop.xul  |  4 ++--
 .../content/tests/chrome/findbar_window.xul   |  2 +-
 .../tests/chrome/window_browser_drop.xul      |  2 +-
 .../test/browser/browser_dragdrop.js          | 15 ++++++++----
 7 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/browser/base/content/test/browser_drag.js b/browser/base/content/test/browser_drag.js
index 2f52c3581d48..9e44b45bf1ce 100644
--- a/browser/base/content/test/browser_drag.js
+++ b/browser/base/content/test/browser_drag.js
@@ -37,5 +37,5 @@ function test()
     finish();
   }, true);
 
-  EventUtils.synthesizeDrop(tab, [[{type: "text/uri-list", data: "http://mochi.test:8888/"}]], "copy", window);
+  EventUtils.synthesizeDrop(tab, tab, [[{type: "text/uri-list", data: "http://mochi.test:8888/"}]], "copy", window);
 }
diff --git a/browser/components/search/test/browser_426329.js b/browser/components/search/test/browser_426329.js
index 40b79a7d07eb..09dae5f81464 100644
--- a/browser/components/search/test/browser_426329.js
+++ b/browser/components/search/test/browser_426329.js
@@ -137,7 +137,7 @@ function test() {
     searchBar.addEventListener("popupshowing", stopPopup, true);
     // drop on the search button so that we don't need to worry about the
     // default handlers for textboxes.
-    EventUtils.synthesizeDrop(searchBar.searchButton, [[ {type: "text/plain", data: "Some Text" } ]], "copy", window);
+    EventUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/plain", data: "Some Text" } ]], "copy", window);
     doOnloadOnce(function(event) {
       is(searchBar.value, "Some Text", "drop text/plain on searchbar");
       testDropInternalText();
@@ -146,7 +146,7 @@ function test() {
 
   function testDropInternalText() {
     init();
-    EventUtils.synthesizeDrop(searchBar.searchButton, [[ {type: "text/x-moz-text-internal", data: "More Text" } ]], "copy", window);
+    EventUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/x-moz-text-internal", data: "More Text" } ]], "copy", window);
     doOnloadOnce(function(event) {
       is(searchBar.value, "More Text", "drop text/x-moz-text-internal on searchbar");
       testDropLink();
@@ -155,7 +155,7 @@ function test() {
 
   function testDropLink() {
     init();
-    EventUtils.synthesizeDrop(searchBar.searchButton, [[ {type: "text/uri-list", data: "http://www.mozilla.org" } ]], "copy", window);
+    EventUtils.synthesizeDrop(searchBar.searchButton, searchBar.searchButton, [[ {type: "text/uri-list", data: "http://www.mozilla.org" } ]], "copy", window);
     is(searchBar.value, "More Text", "drop text/uri-list on searchbar");
     SimpleTest.executeSoon(testRightClick);
   }
diff --git a/testing/mochitest/tests/SimpleTest/EventUtils.js b/testing/mochitest/tests/SimpleTest/EventUtils.js
index dccc224d3e93..62f9c7a22ac4 100644
--- a/testing/mochitest/tests/SimpleTest/EventUtils.js
+++ b/testing/mochitest/tests/SimpleTest/EventUtils.js
@@ -489,7 +489,10 @@ function synthesizeDragStart(element, expectedDragData, aWindow, x, y)
 
 /**
  * Emulate a drop by emulating a dragstart and firing events dragenter, dragover, and drop.
- *  element - the element to fire the dragover, dragleave and drop events
+ *  srcElement - the element to use to start the drag, usually the same as destElement
+ *               but if destElement isn't suitable to start a drag on pass a suitable
+ *               element for srcElement
+ *  destElement - the element to fire the dragover, dragleave and drop events
  *  dragData - the data to supply for the data transfer
  *                     This data is in the format:
  *                       [ [ {type: value, data: value}, ...], ... ]
@@ -498,7 +501,7 @@ function synthesizeDragStart(element, expectedDragData, aWindow, x, y)
  *
  * Returns the drop effect that was desired.
  */
-function synthesizeDrop(element, dragData, dropEffect, aWindow)
+function synthesizeDrop(srcElement, destElement, dragData, dropEffect, aWindow)
 {
   if (!aWindow)
     aWindow = window;
@@ -519,28 +522,28 @@ function synthesizeDrop(element, dragData, dropEffect, aWindow)
 
   // need to use real mouse action
   aWindow.addEventListener("dragstart", trapDrag, true);
-  synthesizeMouse(element, 2, 2, { type: "mousedown" }, aWindow);
-  synthesizeMouse(element, 11, 11, { type: "mousemove" }, aWindow);
-  synthesizeMouse(element, 20, 20, { type: "mousemove" }, aWindow);
+  synthesizeMouse(srcElement, 2, 2, { type: "mousedown" }, aWindow);
+  synthesizeMouse(srcElement, 11, 11, { type: "mousemove" }, aWindow);
+  synthesizeMouse(srcElement, 20, 20, { type: "mousemove" }, aWindow);
   aWindow.removeEventListener("dragstart", trapDrag, true);
 
   event = aWindow.document.createEvent("DragEvents");
   event.initDragEvent("dragenter", true, true, aWindow, 0, 0, 0, 0, 0, false, false, false, false, 0, null, dataTransfer);
-  element.dispatchEvent(event);
+  destElement.dispatchEvent(event);
 
   var event = aWindow.document.createEvent("DragEvents");
   event.initDragEvent("dragover", true, true, aWindow, 0, 0, 0, 0, 0, false, false, false, false, 0, null, dataTransfer);
-  if (element.dispatchEvent(event)) {
-    synthesizeMouse(element, 20, 20, { type: "mouseup" }, aWindow);
+  if (destElement.dispatchEvent(event)) {
+    synthesizeMouse(destElement, 20, 20, { type: "mouseup" }, aWindow);
     return "none";
   }
 
   if (dataTransfer.dropEffect != "none") {
     event = aWindow.document.createEvent("DragEvents");
     event.initDragEvent("drop", true, true, aWindow, 0, 0, 0, 0, 0, false, false, false, false, 0, null, dataTransfer);
-    element.dispatchEvent(event);
+    destElement.dispatchEvent(event);
   }
-  synthesizeMouse(element, 20, 20, { type: "mouseup" }, aWindow);
+  synthesizeMouse(destElement, 20, 20, { type: "mouseup" }, aWindow);
 
   return dataTransfer.dropEffect;
 }
diff --git a/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul b/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul
index 627fb965bb08..a9fe37853b6a 100644
--- a/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul
+++ b/testing/mochitest/tests/SimpleTest/tests/test_synthesizeDrop.xul
@@ -97,14 +97,14 @@ function test() {
 
   var result;
   // Now we can run our tests
-  result = synthesizeDrop($("drag1"), drag1, null, window);
+  result = synthesizeDrop($("drag1"), $("drag1"), drag1, null, window);
   ok(gEnter, "Fired dragenter");
   ok(gOver,  "Fired dragover");
   is(result, "copy", "copy is dropEffect");
   is(gData, drag1[0][0].data, "Received valid drop data");
 
   gSetDropEffect = false;
-  result = synthesizeDrop($("drag1"), drag1, "link", window);
+  result = synthesizeDrop($("drag1"), $("drag1"), drag1, "link", window);
   is(result, "link", "link is dropEffect");
 
   SimpleTest.finish();
diff --git a/toolkit/content/tests/chrome/findbar_window.xul b/toolkit/content/tests/chrome/findbar_window.xul
index ababc95021f8..8559a4d53efe 100644
--- a/toolkit/content/tests/chrome/findbar_window.xul
+++ b/toolkit/content/tests/chrome/findbar_window.xul
@@ -157,7 +157,7 @@
 
     function testDrop()
     {
-      synthesizeDrop(gFindBar._findField, [[ {type: "text/plain", data: "Rabbits" } ]], "copy", window);
+      synthesizeDrop(gFindBar._findField, gFindBar._findField, [[ {type: "text/plain", data: "Rabbits" } ]], "copy", window);
       window.opener.wrappedJSObject.SimpleTest.is(gFindBar._findField.inputField.value, "Rabbits", "drop on findbar");
     }
 
diff --git a/toolkit/content/tests/chrome/window_browser_drop.xul b/toolkit/content/tests/chrome/window_browser_drop.xul
index de7007000bc4..7d2bb536819f 100644
--- a/toolkit/content/tests/chrome/window_browser_drop.xul
+++ b/toolkit/content/tests/chrome/window_browser_drop.xul
@@ -22,7 +22,7 @@ function runTest()
   {
     link = "";
     name = "";
-    synthesizeDrop(element, data, "", element.ownerDocument.defaultView);
+    synthesizeDrop(element, element, data, "", element.ownerDocument.defaultView);
 
     is(link, expectedLink, testid + " link");
     is(name, expectedName, testid + " name");
diff --git a/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js b/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
index 8ed01ef672d6..197b35abea59 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_dragdrop.js
@@ -111,7 +111,8 @@ add_test(function() {
     test_confirmation(aWindow, [url]);
   }, run_next_test);
 
-  var effect = EventUtils.synthesizeDrop(gManagerWindow.document.getElementById("view-container"),
+  var viewContainer = gManagerWindow.document.getElementById("view-container");
+  var effect = EventUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "text/x-moz-url", data: url}]],
                "copy", gManagerWindow);
   is(effect, "copy", "Drag should be accepted");
@@ -125,7 +126,8 @@ add_test(function() {
     test_confirmation(aWindow, [fileurl.spec]);
   }, run_next_test);
 
-  var effect = EventUtils.synthesizeDrop(gManagerWindow.document.getElementById("view-container"),
+  var viewContainer = gManagerWindow.document.getElementById("view-container");
+  var effect = EventUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "application/x-moz-file", data: fileurl.file}]],
                "copy", gManagerWindow);
   is(effect, "copy", "Drag should be accepted");
@@ -140,7 +142,8 @@ add_test(function() {
     test_confirmation(aWindow, [url1, url2]);
   }, run_next_test);
 
-  var effect = EventUtils.synthesizeDrop(gManagerWindow.document.getElementById("view-container"),
+  var viewContainer = gManagerWindow.document.getElementById("view-container");
+  var effect = EventUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "text/x-moz-url", data: url1}],
                 [{type: "text/x-moz-url", data: url2}]],
                "copy", gManagerWindow);
@@ -156,7 +159,8 @@ add_test(function() {
     test_confirmation(aWindow, [fileurl1.spec, fileurl2.spec]);
   }, run_next_test);
 
-  var effect = EventUtils.synthesizeDrop(gManagerWindow.document.getElementById("view-container"),
+  var viewContainer = gManagerWindow.document.getElementById("view-container");
+  var effect = EventUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "application/x-moz-file", data: fileurl1.file}],
                 [{type: "application/x-moz-file", data: fileurl2.file}]],
                "copy", gManagerWindow);
@@ -172,7 +176,8 @@ add_test(function() {
     test_confirmation(aWindow, [url, fileurl.spec]);
   }, run_next_test);
 
-  var effect = EventUtils.synthesizeDrop(gManagerWindow.document.getElementById("view-container"),
+  var viewContainer = gManagerWindow.document.getElementById("view-container");
+  var effect = EventUtils.synthesizeDrop(viewContainer, viewContainer,
                [[{type: "text/x-moz-url", data: url}],
                 [{type: "application/x-moz-file", data: fileurl.file}]],
                "copy", gManagerWindow);

From 23c417301c021ea9e18a8151442c4a13d5683110 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 050/172] Bug 571640. Part 2. In test_findbar.xul use an image
 source node so we can start a drag. r=enndeakin

---
 toolkit/content/tests/chrome/findbar_window.xul | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/toolkit/content/tests/chrome/findbar_window.xul b/toolkit/content/tests/chrome/findbar_window.xul
index 8559a4d53efe..1c07158fe4f2 100644
--- a/toolkit/content/tests/chrome/findbar_window.xul
+++ b/toolkit/content/tests/chrome/findbar_window.xul
@@ -100,7 +100,7 @@
         gFindBar = document.getElementById("FindToolbar");
         gBrowser = document.getElementById("content");
         gBrowser.addEventListener("pageshow", onPageShow, false);
-        gBrowser.loadURI("data:text/html,<h2 id='h2'>" + SEARCH_TEXT + "</h2><h2><a href='" + SAMPLE_URL + "'>Link Test</a></h2><input id='text' type='text' value='" + SAMPLE_TEXT + "'></input><input id='button' type='button'></input>");
+        gBrowser.loadURI("data:text/html,<h2 id='h2'>" + SEARCH_TEXT + "</h2><h2><a href='" + SAMPLE_URL + "'>Link Test</a></h2><input id='text' type='text' value='" + SAMPLE_TEXT + "'></input><input id='button' type='button'></input><img id='img' width='50' height='50'/>");
       }
       setTimeout(_delayedOnLoad, 1000);
     }
@@ -157,8 +157,12 @@
 
     function testDrop()
     {
-      synthesizeDrop(gFindBar._findField, gFindBar._findField, [[ {type: "text/plain", data: "Rabbits" } ]], "copy", window);
+      gFindBar.open();
+      // use an dummy image to start the drag so it doesn't get interrupted by a selection
+      var img = gBrowser.contentDocument.getElementById("img");
+      synthesizeDrop(img, gFindBar._findField, [[ {type: "text/plain", data: "Rabbits" } ]], "copy", window);
       window.opener.wrappedJSObject.SimpleTest.is(gFindBar._findField.inputField.value, "Rabbits", "drop on findbar");
+      gFindBar.close();
     }
 
     function testQuickFindClose() {

From 30028d7f0ee8040266569f16bd0a24c300352a3b Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Fri, 25 Jun 2010 16:51:17 -0500
Subject: [PATCH 051/172] Bug 571640. Part 3. In window_browser_drop.xul make
 the html element draggable so drag and drop works. r=enndeakin

---
 toolkit/content/tests/chrome/window_browser_drop.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/content/tests/chrome/window_browser_drop.xul b/toolkit/content/tests/chrome/window_browser_drop.xul
index 7d2bb536819f..a1f0972cbb6e 100644
--- a/toolkit/content/tests/chrome/window_browser_drop.xul
+++ b/toolkit/content/tests/chrome/window_browser_drop.xul
@@ -81,6 +81,6 @@ function loaded()
 
 <browser id="chromechild" src="about:blank"/>
 <browser id="contentchild" type="content" width="100" height="100"
-         src="data:text/html,&lt;body draggable='true' style='width: 100px; height: 100px;' ondrop='if (window.stopMode) event.stopPropagation(); if (window.cancelMode) event.preventDefault();'&gt;&lt;/body&gt;"/>
+         src="data:text/html,&lt;html draggable='true'&gt;&lt;body draggable='true' style='width: 100px; height: 100px;' ondrop='if (window.stopMode) event.stopPropagation(); if (window.cancelMode) event.preventDefault();'&gt;&lt;/body&gt;&lt;/html&gt;"/>
 
 </window>

From d423986af99190d168e0dc0bbc4235666d4378b4 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Fri, 25 Jun 2010 17:50:36 -0500
Subject: [PATCH 052/172] Bug 574599 - Parent windows should have the clip
 children style to avoid parent level paints when children invalidate.
 r=robarnold.

---
 widget/src/windows/nsWindow.cpp         | 4 ++--
 xpfe/appshell/src/nsAppShellService.cpp | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index f57b09cea495..c6e1e0dd82ae 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -2382,7 +2382,7 @@ NS_IMETHODIMP nsWindow::HideWindowChrome(PRBool aShouldHide)
     DWORD_PTR tempStyle = ::GetWindowLongPtrW(hwnd, GWL_STYLE);
     DWORD_PTR tempExStyle = ::GetWindowLongPtrW(hwnd, GWL_EXSTYLE);
 
-    style = tempStyle & ~(WS_CAPTION | WS_THICKFRAME);
+    style = tempStyle & ~(WS_CAPTION | WS_THICKFRAME);
     exStyle = tempExStyle & ~(WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE |
                               WS_EX_CLIENTEDGE | WS_EX_STATICEDGE);
 
@@ -2390,7 +2390,7 @@ NS_IMETHODIMP nsWindow::HideWindowChrome(PRBool aShouldHide)
     mOldExStyle = tempExStyle;
   }
   else {
-    if (!mOldStyle || !mOldExStyle) {
+    if (!mOldStyle || !mOldExStyle) {
       mOldStyle = ::GetWindowLongPtrW(hwnd, GWL_STYLE);
       mOldExStyle = ::GetWindowLongPtrW(hwnd, GWL_EXSTYLE);
     }
diff --git a/xpfe/appshell/src/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp
index 1d6d132297d9..dc4cbd4375e2 100644
--- a/xpfe/appshell/src/nsAppShellService.cpp
+++ b/xpfe/appshell/src/nsAppShellService.cpp
@@ -335,6 +335,12 @@ nsAppShellService::JustCreateTopWindow(nsIXULWindow *aParent,
     widgetInitData.mWindowType = eWindowType_sheet;
 #endif
 
+#if defined(XP_WIN)
+  if (widgetInitData.mWindowType == eWindowType_toplevel ||
+      widgetInitData.mWindowType == eWindowType_dialog)
+    widgetInitData.clipChildren = PR_TRUE;
+#endif
+
   widgetInitData.mContentType = eContentTypeUI;                
 
   // note default chrome overrides other OS chrome settings, but

From b2dc7394dcf3c8c81d37720ec33090a3b7be91be Mon Sep 17 00:00:00 2001
From: Reed Loden <reed@reedloden.com>
Date: Fri, 25 Jun 2010 18:45:11 -0500
Subject: [PATCH 053/172] Add missing semicolon. No bug.

---
 layout/tools/reftest/reftest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index 4bc1694aa377..9d195dcd143f 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -360,7 +360,7 @@ function BuildConditionSandbox(aURL) {
       },
       _prefs:      prefs,
       getBoolPref: function(p) { return this._prefs.getBoolPref(p); },
-      getIntPref:  function(p) { return this._prefs.getIntPref(p) }
+      getIntPref:  function(p) { return this._prefs.getIntPref(p); }
     }
 
     return sandbox;

From 5f25830c9fd0072804945a711ebd9d61203a18d5 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Fri, 25 Jun 2010 17:52:37 -0700
Subject: [PATCH 054/172] b=573181; clean up render path on Android and prepare
 for GL layers rendering; r=mwu

---
 embedding/android/GeckoSurfaceView.java    | 378 -----------------
 gfx/layers/opengl/LayerManagerOGL.cpp      |  16 +-
 gfx/layers/opengl/LayerManagerOGL.h        |   9 +-
 gfx/thebes/src/GLContextProviderEGL.cpp    |  51 ++-
 widget/src/android/AndroidBridge.cpp       |  54 ++-
 widget/src/android/AndroidBridge.h         |  11 +
 widget/src/android/AndroidJavaWrappers.cpp |   8 +
 widget/src/android/AndroidJavaWrappers.h   |  10 +-
 widget/src/android/nsWindow.cpp            | 449 +++++----------------
 9 files changed, 243 insertions(+), 743 deletions(-)

diff --git a/embedding/android/GeckoSurfaceView.java b/embedding/android/GeckoSurfaceView.java
index 8028b6463abc..ae0f53ea9a52 100644
--- a/embedding/android/GeckoSurfaceView.java
+++ b/embedding/android/GeckoSurfaceView.java
@@ -45,15 +45,6 @@ import java.util.concurrent.atomic.*;
 import java.util.zip.*;
 import java.nio.*;
 
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGL11;
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.egl.EGLContext;
-import javax.microedition.khronos.egl.EGLDisplay;
-import javax.microedition.khronos.egl.EGLSurface;
-import javax.microedition.khronos.opengles.GL;
-import javax.microedition.khronos.opengles.GL10;
-
 import android.os.*;
 import android.app.*;
 import android.text.*;
@@ -85,9 +76,6 @@ class GeckoSurfaceView
         setFocusable(true);
         setFocusableInTouchMode(true);
 
-        if (!GeckoApp.useSoftwareDrawing)
-            startEgl();
-
         mWidth = 0;
         mHeight = 0;
         mBufferWidth = 0;
@@ -98,284 +86,6 @@ class GeckoSurfaceView
 
     protected void finalize() throws Throwable {
         super.finalize();
-        if (!GeckoApp.useSoftwareDrawing)
-            finishEgl();
-    }
-
-    private static final int EGL_OPENGL_ES2_BIT = 4;
-    private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-
-    private void printConfig(EGL10 egl, EGLDisplay display,
-                             EGLConfig config) {
-        int[] attributes = {
-            EGL10.EGL_BUFFER_SIZE,
-            EGL10.EGL_ALPHA_SIZE,
-            EGL10.EGL_BLUE_SIZE,
-            EGL10.EGL_GREEN_SIZE,
-            EGL10.EGL_RED_SIZE,
-            EGL10.EGL_DEPTH_SIZE,
-            EGL10.EGL_STENCIL_SIZE,
-            EGL10.EGL_CONFIG_CAVEAT,
-            EGL10.EGL_CONFIG_ID,
-            EGL10.EGL_LEVEL,
-            EGL10.EGL_MAX_PBUFFER_HEIGHT,
-            EGL10.EGL_MAX_PBUFFER_PIXELS,
-            EGL10.EGL_MAX_PBUFFER_WIDTH,
-            EGL10.EGL_NATIVE_RENDERABLE,
-            EGL10.EGL_NATIVE_VISUAL_ID,
-            EGL10.EGL_NATIVE_VISUAL_TYPE,
-            0x3030, // EGL10.EGL_PRESERVED_RESOURCES,
-            EGL10.EGL_SAMPLES,
-            EGL10.EGL_SAMPLE_BUFFERS,
-            EGL10.EGL_SURFACE_TYPE,
-            EGL10.EGL_TRANSPARENT_TYPE,
-            EGL10.EGL_TRANSPARENT_RED_VALUE,
-            EGL10.EGL_TRANSPARENT_GREEN_VALUE,
-            EGL10.EGL_TRANSPARENT_BLUE_VALUE,
-            0x3039, // EGL10.EGL_BIND_TO_TEXTURE_RGB,
-            0x303A, // EGL10.EGL_BIND_TO_TEXTURE_RGBA,
-            0x303B, // EGL10.EGL_MIN_SWAP_INTERVAL,
-            0x303C, // EGL10.EGL_MAX_SWAP_INTERVAL,
-            EGL10.EGL_LUMINANCE_SIZE,
-            EGL10.EGL_ALPHA_MASK_SIZE,
-            EGL10.EGL_COLOR_BUFFER_TYPE,
-            EGL10.EGL_RENDERABLE_TYPE,
-            0x3042 // EGL10.EGL_CONFORMANT
-        };
-        String[] names = {
-            "EGL_BUFFER_SIZE",
-            "EGL_ALPHA_SIZE",
-            "EGL_BLUE_SIZE",
-            "EGL_GREEN_SIZE",
-            "EGL_RED_SIZE",
-            "EGL_DEPTH_SIZE",
-            "EGL_STENCIL_SIZE",
-            "EGL_CONFIG_CAVEAT",
-            "EGL_CONFIG_ID",
-            "EGL_LEVEL",
-            "EGL_MAX_PBUFFER_HEIGHT",
-            "EGL_MAX_PBUFFER_PIXELS",
-            "EGL_MAX_PBUFFER_WIDTH",
-            "EGL_NATIVE_RENDERABLE",
-            "EGL_NATIVE_VISUAL_ID",
-            "EGL_NATIVE_VISUAL_TYPE",
-            "EGL_PRESERVED_RESOURCES",
-            "EGL_SAMPLES",
-            "EGL_SAMPLE_BUFFERS",
-            "EGL_SURFACE_TYPE",
-            "EGL_TRANSPARENT_TYPE",
-            "EGL_TRANSPARENT_RED_VALUE",
-            "EGL_TRANSPARENT_GREEN_VALUE",
-            "EGL_TRANSPARENT_BLUE_VALUE",
-            "EGL_BIND_TO_TEXTURE_RGB",
-            "EGL_BIND_TO_TEXTURE_RGBA",
-            "EGL_MIN_SWAP_INTERVAL",
-            "EGL_MAX_SWAP_INTERVAL",
-            "EGL_LUMINANCE_SIZE",
-            "EGL_ALPHA_MASK_SIZE",
-            "EGL_COLOR_BUFFER_TYPE",
-            "EGL_RENDERABLE_TYPE",
-            "EGL_CONFORMANT"
-        };
-        int[] value = new int[1];
-        for (int i = 0; i < attributes.length; i++) {
-            int attribute = attributes[i];
-            String name = names[i];
-            if ( egl.eglGetConfigAttrib(display, config, attribute, value)) {
-                Log.w("GeckoAppJava", String.format("  %s: %d\n", name, value[0]));
-            } else {
-                Log.w("GeckoAppJava", String.format("  %s: failed\n", name));
-                // while (egl.eglGetError() != EGL10.EGL_SUCCESS);
-            }
-        }
-    }
-
-    public void startEgl() {
-        if (mEgl != null)
-            return;
-
-        mEgl = (EGL10) EGLContext.getEGL();
-        mEglDisplay = mEgl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-
-        // initialize egl
-        int[] version = new int[2];
-        mEgl.eglInitialize(mEglDisplay, version);
-
-        // flip this to true to dump all the EGL configs
-        if (false) {
-            int[] cs = { EGL10.EGL_NONE };
-            int[] ptrnum = new int[1];
-
-            mEgl.eglChooseConfig(mEglDisplay, cs, null, 0, ptrnum);
-
-            int num = ptrnum[0];
-            EGLConfig[] confs = new EGLConfig[num];
-
-            mEgl.eglChooseConfig(mEglDisplay, cs, confs, num, ptrnum);
-
-            for (int i = 0; i < num; ++i) {
-                Log.w("GeckoAppJava", "===  EGL config " + i + " ===");
-                printConfig(mEgl, mEglDisplay, confs[i]);
-            }
-        }
-    }
-
-    public void finishEgl() {
-        if (mEglDisplay != null) {
-            mEgl.eglMakeCurrent(mEglDisplay, EGL10.EGL_NO_SURFACE,
-                                EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
-        }
-
-        if (mEglContext != null) {
-            mEgl.eglDestroyContext(mEglDisplay, mEglContext);
-            mEglContext = null;
-        }
-
-        if (mEglSurface != null) {
-            mEgl.eglDestroySurface(mEglDisplay, mEglSurface);
-            mEglSurface = null;
-        }
-
-        if (mEglDisplay != null) {
-            mEgl.eglTerminate(mEglDisplay);
-            mEglDisplay = null;
-        }
-
-        mEglConfig = null;
-        mEgl = null;
-
-        mSurfaceChanged = false;
-    }
-
-    public void chooseEglConfig() {
-        int redBits, greenBits, blueBits, alphaBits;
-
-        // There are some shenanigans here.
-        // We're required to choose an exact EGL config to match
-        // the surface format, or we get an error.  However,
-        // on Droid at least, the format is -1, which is PixelFormat.OPAQUE.
-        // That's not a valid format to be reported; that should just be a
-        // valid value for *setFormat*.  We have a catch-all case that
-        // assumes 565 for those cases, but it's pretty ugly.
-
-        Log.i("GeckoAppJava", "GeckoView PixelFormat format is " + mFormat);
-        if (mFormat == PixelFormat.RGB_565) {
-            redBits = 5;
-            greenBits = 6;
-            blueBits = 5;
-            alphaBits = 0;
-        } else if (mFormat == PixelFormat.RGB_888 ||
-                   mFormat == PixelFormat.RGBX_8888)
-        {
-            redBits = 8;
-            greenBits = 8;
-            blueBits = 8;
-            alphaBits = 0;
-        } else if (mFormat == PixelFormat.RGBA_8888) {
-            redBits = 8;
-            greenBits = 8;
-            blueBits = 8;
-            alphaBits = 8;
-        } else {
-            Log.w("GeckoAppJava", "Unknown PixelFormat for surface (format is " + mFormat + "), assuming 5650!");
-            redBits = 5;
-            greenBits = 6;
-            blueBits = 5;
-            alphaBits = 0;
-        }
-
-        // PowerVR SGX (Droid) seems to really want depth == 24 for
-        // performance, even 0 is slower.  However, other platforms,
-        // like Tegra, don't -have- a 24 bit depth config (have 16).
-        // So that's not good.  We'll try with 24 first, and if
-        // nothing, then we'll go to 0.  I'm not sure what the nexus
-        // one chip wants.
-
-        int[] confSpec = new int[] {
-            // DEPTH_SIZE must be the first pair
-            EGL10.EGL_DEPTH_SIZE, 24,
-            EGL10.EGL_RED_SIZE, redBits,
-            EGL10.EGL_GREEN_SIZE, greenBits,
-            EGL10.EGL_BLUE_SIZE, blueBits,
-            EGL10.EGL_ALPHA_SIZE, alphaBits,
-            EGL10.EGL_STENCIL_SIZE, 0,
-            EGL10.EGL_CONFIG_CAVEAT, EGL10.EGL_NONE,
-            EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-            EGL10.EGL_NONE };
-
-        // so tortured to pass an int as an out param...
-        int[] ptrNumConfigs = new int[1];
-        mEgl.eglChooseConfig(mEglDisplay, confSpec, null, 0, ptrNumConfigs);
-
-        int numConfigs = ptrNumConfigs[0];
-
-        if (numConfigs == 0) {
-            // twiddle the DEPTH_SIZE value
-            confSpec[1] = 0;
-            Log.i("GeckoAppJava", "Couldn't find any valid EGL configs with 24 bit depth, trying 0.");
-
-            mEgl.eglChooseConfig(mEglDisplay, confSpec, null, 0, ptrNumConfigs);
-            numConfigs = ptrNumConfigs[0];
-        }
-
-        if (numConfigs <= 0) {
-            // couldn't find a config?
-            Log.w("GeckoAppJava", "Couldn't find any valid EGL configs, blindly trying them all!");
-
-            int[] fallbackConfSpec = new int[] {
-                EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-                EGL10.EGL_NONE };
-            confSpec = fallbackConfSpec;
-
-            mEgl.eglChooseConfig(mEglDisplay, confSpec, null, 0, ptrNumConfigs);
-            numConfigs = ptrNumConfigs[0];
-
-            if (numConfigs == 0) {
-                Log.e("GeckoAppJava", "There aren't any EGL configs available on this system.");
-                finishEgl();
-                mSurfaceValid = false;
-                return;
-            }
-        }
-
-        EGLConfig[] configs = new EGLConfig[numConfigs];
-        mEgl.eglChooseConfig(mEglDisplay, confSpec, configs, numConfigs, ptrNumConfigs);
-
-        // Find the first config that has the exact RGB sizes that we
-        // need for our window surface.
-        int[] ptrVal = new int[1];
-        for (int i = 0; i < configs.length; ++i) {
-            int confRed = -1, confGreen = -1, confBlue = -1, confAlpha = -1;
-
-            if (mEgl.eglGetConfigAttrib(mEglDisplay, configs[i], EGL10.EGL_RED_SIZE, ptrVal))
-                confRed = ptrVal[0];
-            if (mEgl.eglGetConfigAttrib(mEglDisplay, configs[i], EGL10.EGL_GREEN_SIZE, ptrVal))
-                confGreen = ptrVal[0];
-            if (mEgl.eglGetConfigAttrib(mEglDisplay, configs[i], EGL10.EGL_BLUE_SIZE, ptrVal))
-                confBlue = ptrVal[0];
-            if (mEgl.eglGetConfigAttrib(mEglDisplay, configs[i], EGL10.EGL_ALPHA_SIZE, ptrVal))
-                confAlpha = ptrVal[0];
-
-            if (confRed == redBits &&
-                confGreen == greenBits &&
-                confBlue == blueBits &&
-                confAlpha == alphaBits)
-            {
-                mEglConfig = configs[i];
-                break;
-            }
-        }
-
-        if (mEglConfig == null) {
-            Log.w("GeckoAppJava", "Couldn't find EGL config matching colors; using first, hope it works!");
-            mEglConfig = configs[0];
-        }
-
-        Log.i("GeckoAppJava", "====== Chosen config: ======");
-        printConfig(mEgl, mEglDisplay, mEglConfig);
-
-        mEglContext = null;
-        mEglSurface = null;
     }
 
     /*
@@ -397,10 +107,6 @@ class GeckoSurfaceView
 
             Log.i("GeckoAppJava", "surfaceChanged: fmt: " + format + " dim: " + width + " " + height);
 
-            if (!GeckoApp.useSoftwareDrawing) {
-                chooseEglConfig();
-            }
-
             // XXX This code doesn't seem to actually get hit
             if (!GeckoAppShell.sGeckoRunning) {
                 GeckoAppShell.setInitialSize(width, height);
@@ -478,72 +184,6 @@ class GeckoSurfaceView
             return DRAW_SOFTWARE;
         }
 
-        /*
-         * GL rendering
-         */
-
-        if (mEgl == null || mEglDisplay == null || mEglConfig == null) {
-            Log.e("GeckoAppJava", "beginDrawing called, but EGL was never initialized!");
-
-            mSurfaceLock.unlock();
-            return DRAW_ERROR;
-        }
-
-        /*
-         * If the surface doesn't exist, or if its dimensions or something else changed,
-         * recreate it.
-         */
-        if (mEglSurface == null ||
-            mWidth != mBufferWidth ||
-            mHeight != mBufferHeight ||
-            mSurfaceChanged)
-        {
-            if (mEglContext != null) {
-                mEgl.eglDestroyContext(mEglDisplay, mEglContext);
-                mEglContext = null;
-            }
-
-            if (mEglSurface != null)
-                mEgl.eglDestroySurface(mEglDisplay, mEglSurface);
-
-            mEglSurface = mEgl.eglCreateWindowSurface(mEglDisplay, mEglConfig, getHolder(), null);
-            if (mEglSurface == EGL10.EGL_NO_SURFACE)
-            {
-                Log.e("GeckoAppJava", "eglCreateWindowSurface failed!");
-                mSurfaceValid = false;
-                return DRAW_ERROR;
-            }
-
-            mBufferWidth = mWidth;
-            mBufferHeight = mHeight;
-
-            mSurfaceChanged = false;
-        }
-
-        if (mEglContext == null) {
-            int[] attrib_list = { EGL_CONTEXT_CLIENT_VERSION, 2,
-                                  EGL10.EGL_NONE };
-            mEglContext = mEgl.eglCreateContext(mEglDisplay, mEglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
-            if (mEglContext == EGL10.EGL_NO_CONTEXT)
-            {
-                Log.e("GeckoAppJava", "eglCreateContext failed! " + mEgl.eglGetError());
-                mSurfaceValid = false;
-                return DRAW_ERROR;
-            }
-
-            Log.i("GeckoAppJava", "EglContext created");
-        }
-
-        // Hmm, should we issue this makecurrent for each frame?
-        // We'll likely have to, as other bits might switch the context (e.g.
-        // WebGL, video, etc.).
-
-        if (!mEgl.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
-            int err = mEgl.eglGetError();
-            Log.e("GeckoAppJava", "eglMakeCurrent failed! " + err);
-            return DRAW_ERROR;
-        }
-
         return DRAW_GLES_2;
     }
 
@@ -608,17 +248,6 @@ class GeckoSurfaceView
                     getHolder().unlockCanvasAndPost(mSoftwareCanvas);
                     mSoftwareCanvas = null;
                 }
-            } else {
-                // If the surface was changed while we were drawing;
-                // don't even bother trying to swap, it won't work,
-                // and may cause further problems.  Note that
-                // eglSwapBuffers might also throw an
-                // IllegalArgumentException; we catch that as well.
-                if (!mSurfaceChanged) {
-                    mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);
-                    if (mEgl.eglGetError() == EGL11.EGL_CONTEXT_LOST)
-                        mSurfaceChanged = true;
-                }
             }
         } catch (java.lang.IllegalArgumentException ex) {
             mSurfaceChanged = true;
@@ -719,13 +348,6 @@ class GeckoSurfaceView
     ByteBuffer mSoftwareBuffer;
     Bitmap mSoftwareBitmap;
     Canvas mSoftwareCanvas;
-
-    // GL rendering
-    EGL10 mEgl;
-    EGLDisplay mEglDisplay;
-    EGLSurface mEglSurface;
-    EGLConfig mEglConfig;
-    EGLContext mEglContext;
 }
 
 class GeckoInputConnection
diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index fa23c3b4a6e1..1076340b28d3 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -81,7 +81,7 @@ DumpLayerAndChildren(LayerOGL *l, int advance = 0)
 /**
  * LayerManagerOGL
  */
-LayerManagerOGL::LayerManagerOGL(nsIWidget *aWidget) 
+LayerManagerOGL::LayerManagerOGL(nsIWidget *aWidget)
   : mWidget(aWidget)
   , mBackBufferFBO(0)
   , mBackBufferTexture(0)
@@ -102,13 +102,17 @@ LayerManagerOGL::~LayerManagerOGL()
 }
 
 PRBool
-LayerManagerOGL::Initialize()
+LayerManagerOGL::Initialize(GLContext *aExistingContext)
 {
-  mGLContext = sGLContextProvider.CreateForWindow(mWidget);
+  if (aExistingContext) {
+    mGLContext = aExistingContext;
+  } else {
+    mGLContext = sGLContextProvider.CreateForWindow(mWidget);
 
-  if (!mGLContext) {
-    NS_WARNING("Failed to create LayerManagerOGL context");
-    return PR_FALSE;
+    if (!mGLContext) {
+      NS_WARNING("Failed to create LayerManagerOGL context");
+      return PR_FALSE;
+    }
   }
 
   MakeCurrent();
diff --git a/gfx/layers/opengl/LayerManagerOGL.h b/gfx/layers/opengl/LayerManagerOGL.h
index 5e8af42e12ab..1a2f91757452 100644
--- a/gfx/layers/opengl/LayerManagerOGL.h
+++ b/gfx/layers/opengl/LayerManagerOGL.h
@@ -75,6 +75,8 @@ class LayerOGL;
  * the main thread.
  */
 class THEBES_API LayerManagerOGL : public LayerManager {
+  typedef mozilla::gl::GLContext GLContext;
+
 public:
   LayerManagerOGL(nsIWidget *aWidget);
   virtual ~LayerManagerOGL();
@@ -85,9 +87,12 @@ public:
    * to draw to the window. If this method fails the device cannot be used.
    * This function is not threadsafe.
    *
+   * \param aExistingContext an existing GL context to use, instead of creating
+   * our own for the widget.
+   *
    * \return True is initialization was succesful, false when it was not.
    */
-  PRBool Initialize();
+  PRBool Initialize(GLContext *aExistingContext = nsnull);
 
   /**
    * Sets the clipping region for this layer manager. This is important on 
@@ -167,8 +172,6 @@ public:
     return static_cast<ColorTextureLayerProgram*>(mPrograms[RGBALayerProgramType]);
   }
 
-  typedef mozilla::gl::GLContext GLContext;
-
   GLContext *gl() const { return mGLContext; }
 
   /*
diff --git a/gfx/thebes/src/GLContextProviderEGL.cpp b/gfx/thebes/src/GLContextProviderEGL.cpp
index 5f49c3f8a039..d59c4d5cb121 100644
--- a/gfx/thebes/src/GLContextProviderEGL.cpp
+++ b/gfx/thebes/src/GLContextProviderEGL.cpp
@@ -65,7 +65,11 @@ typedef Window   EGLNativeWindowType;
 
 #elif defined(ANDROID)
 
-#define GET_NATIVE_WINDOW(aWidget)  (nsnull)
+#include <android/log.h>
+#define ALOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gecko" , ## args)
+
+/* from widget */
+#include "AndroidBridge.h"
 
 typedef void *EGLNativeDisplayType;
 typedef void *EGLNativePixmapType;
@@ -148,6 +152,11 @@ public:
     pfnWaitNative fWaitNative;
     typedef EGLCastToRelevantPtr (*pfnGetProcAddress)(const char *procname);
     pfnGetProcAddress fGetProcAddress;
+    typedef EGLBoolean (*pfnSwapBuffers)(EGLDisplay dpy, EGLSurface surface);
+    pfnSwapBuffers fSwapBuffers;
+    typedef EGLBoolean (*pfnCopyBuffers)(EGLDisplay dpy, EGLSurface surface,
+                                         EGLNativePixmapType target);
+    pfnCopyBuffers fCopyBuffers;
     typedef const GLubyte* (*pfnQueryString)(EGLDisplay, EGLint name);
     pfnQueryString fQueryString;
     typedef EGLBoolean (*pfnBindTexImage)(EGLDisplay, EGLSurface surface, EGLint buffer);
@@ -197,6 +206,8 @@ public:
             SYMBOL(GetConfigAttrib),
             SYMBOL(WaitNative),
             SYMBOL(GetProcAddress),
+            SYMBOL(SwapBuffers),
+            SYMBOL(CopyBuffers),
             SYMBOL(QueryString),
             SYMBOL(BindTexImage),
             SYMBOL(ReleaseTexImage),
@@ -316,9 +327,9 @@ public:
 #else
                 succeeded = PR_FALSE;
 #endif
-            }
-            else
+            } else {
                 succeeded = sEGLLibrary.fMakeCurrent(mDisplay, mSurface, mSurface, mContext);
+            }
             NS_ASSERTION(succeeded, "Failed to make GL context current!");
         }
 
@@ -345,6 +356,11 @@ public:
         }
     }
 
+    PRBool SwapBuffers()
+    {
+        return sEGLLibrary.fSwapBuffers(mDisplay, mSurface);
+    }
+
 private:
     EGLDisplay mDisplay;
     EGLConfig  mConfig;
@@ -401,13 +417,17 @@ GLContextProvider::CreateForWindow(nsIWidget *aWidget)
         return nsnull;
     }
 
-    if (!sEGLLibrary.fBindAPI(LOCAL_EGL_OPENGL_ES_API)) {
-        return nsnull;
-    }
-
     EGLint attribs[] = {
         LOCAL_EGL_SURFACE_TYPE,    LOCAL_EGL_WINDOW_BIT,
         LOCAL_EGL_RENDERABLE_TYPE, LOCAL_EGL_OPENGL_ES2_BIT,
+
+#ifdef MOZ_GFX_OPTIMIZE_MOBILE
+        LOCAL_EGL_RED_SIZE,        5,
+        LOCAL_EGL_GREEN_SIZE,      6,
+        LOCAL_EGL_BLUE_SIZE,       5,
+        LOCAL_EGL_ALPHA_SIZE,      0,
+#endif
+
         LOCAL_EGL_NONE
     };
 
@@ -418,11 +438,28 @@ GLContextProvider::CreateForWindow(nsIWidget *aWidget)
         return nsnull;
     }
 
+#ifdef ANDROID
+    // On Android, we have to ask Java to make the eglCreateWindowSurface
+    // call for us.  See GLHelpers.java for a description of why.
+    //
+    // We also only have one true "window", so we just use it directly and ignore
+    // what was passed in.
+    surface = mozilla::AndroidBridge::Bridge()->
+        CallEglCreateWindowSurface(display, config,
+                                   mozilla::AndroidBridge::Bridge()->SurfaceView());
+#else
     surface = sEGLLibrary.fCreateWindowSurface(display, config, GET_NATIVE_WINDOW(aWidget), 0);
+#endif
+
     if (!surface) {
         return nsnull;
     }
 
+    if (!sEGLLibrary.fBindAPI(LOCAL_EGL_OPENGL_ES_API)) {
+        sEGLLibrary.fDestroySurface(display, surface);
+        return nsnull;
+    }
+
     EGLint cxattribs[] = {
         LOCAL_EGL_CONTEXT_CLIENT_VERSION, 2,
         LOCAL_EGL_NONE
diff --git a/widget/src/android/AndroidBridge.cpp b/widget/src/android/AndroidBridge.cpp
index 6906faed0b78..6f4702faf7fa 100644
--- a/widget/src/android/AndroidBridge.cpp
+++ b/widget/src/android/AndroidBridge.cpp
@@ -101,6 +101,15 @@ AndroidBridge::Init(JNIEnv *jEnv,
     jOpenUriExternal = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "openUriExternal", "(Ljava/lang/String;Ljava/lang/String;)Z");
     jGetMimeTypeFromExtension = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getMimeTypeFromExtension", "(Ljava/lang/String;)Ljava/lang/String;");
     jMoveTaskToBack = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "moveTaskToBack", "()V");
+
+
+    jEGLContextClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("javax/microedition/khronos/egl/EGLContext"));
+    jEGL10Class = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("javax/microedition/khronos/egl/EGL10"));
+    jEGLSurfaceImplClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("com/google/android/gles_jni/EGLSurfaceImpl"));
+    jEGLContextImplClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("com/google/android/gles_jni/EGLContextImpl"));
+    jEGLConfigImplClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("com/google/android/gles_jni/EGLConfigImpl"));
+    jEGLDisplayImplClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("com/google/android/gles_jni/EGLDisplayImpl"));
+
     InitAndroidJavaWrappers(jEnv);
 
     // jEnv should NOT be cached here by anything -- the jEnv here
@@ -273,6 +282,50 @@ AndroidBridge::SetSurfaceView(jobject obj)
     mSurfaceView.Init(obj);
 }
 
+void *
+AndroidBridge::CallEglCreateWindowSurface(void *dpy, void *config, AndroidGeckoSurfaceView &sview)
+{
+    AutoLocalJNIFrame jniFrame;
+
+    /*
+     * This is basically:
+     *
+     *    s = EGLContext.getEGL().eglCreateWindowSurface(new EGLDisplayImpl(dpy),
+     *                                                   new EGLConfigImpl(config),
+     *                                                   view.getHolder(), null);
+     *    return s.mEGLSurface;
+     *
+     * We can't do it from java, because the EGLConfigImpl constructor is private.
+     */
+
+    jobject surfaceHolder = sview.GetSurfaceHolder();
+    if (!surfaceHolder)
+        return nsnull;
+
+    // grab some fields and methods we'll need
+    jmethodID constructConfig = mJNIEnv->GetMethodID(jEGLConfigImplClass, "<init>", "(I)V");
+    jmethodID constructDisplay = mJNIEnv->GetMethodID(jEGLDisplayImplClass, "<init>", "(I)V");
+
+    jmethodID getEgl = mJNIEnv->GetStaticMethodID(jEGLContextClass, "getEGL", "()Ljavax/microedition/khronos/egl/EGL;");
+    jmethodID createWindowSurface = mJNIEnv->GetMethodID(jEGL10Class, "eglCreateWindowSurface", "(Ljavax/microedition/khronos/egl/EGLDisplay;Ljavax/microedition/khronos/egl/EGLConfig;Ljava/lang/Object;[I)Ljavax/microedition/khronos/egl/EGLSurface;");
+
+    jobject egl = mJNIEnv->CallStaticObjectMethod(jEGLContextClass, getEgl);
+
+    jobject jdpy = mJNIEnv->NewObject(jEGLDisplayImplClass, constructDisplay, (int) dpy);
+    jobject jconf = mJNIEnv->NewObject(jEGLConfigImplClass, constructConfig, (int) config);
+
+    // make the call
+    jobject surf = mJNIEnv->CallObjectMethod(egl, createWindowSurface, jdpy, jconf, surfaceHolder, NULL);
+    if (!surf)
+        return nsnull;
+
+    jfieldID sfield = mJNIEnv->GetFieldID(jEGLSurfaceImplClass, "mEGLSurface", "I");
+
+    jint realSurface = mJNIEnv->GetIntField(surf, sfield);
+
+    return (void*) realSurface;
+}
+
 // Available for places elsewhere in the code to link to.
 PRBool
 mozilla_AndroidBridge_SetMainThread(void *thr)
@@ -296,4 +349,3 @@ extern "C" JNIEnv * GetJNIForThread()
 {
   return mozilla::AndroidBridge::JNIForThread();
 }
-
diff --git a/widget/src/android/AndroidBridge.h b/widget/src/android/AndroidBridge.h
index b390621effd8..3d006ce53790 100644
--- a/widget/src/android/AndroidBridge.h
+++ b/widget/src/android/AndroidBridge.h
@@ -129,6 +129,9 @@ public:
         int mEntries;
     };
 
+    /* See GLHelpers.java as to why this is needed */
+    void *CallEglCreateWindowSurface(void *dpy, void *config, AndroidGeckoSurfaceView& surfaceView);
+
 protected:
     static AndroidBridge *sBridge;
 
@@ -162,6 +165,14 @@ protected:
     jmethodID jOpenUriExternal;
     jmethodID jGetMimeTypeFromExtension;
     jmethodID jMoveTaskToBack;
+
+    // stuff we need for CallEglCreateWindowSurface
+    jclass jEGLSurfaceImplClass;
+    jclass jEGLContextImplClass;
+    jclass jEGLConfigImplClass;
+    jclass jEGLDisplayImplClass;
+    jclass jEGLContextClass;
+    jclass jEGL10Class;
 };
 
 }
diff --git a/widget/src/android/AndroidJavaWrappers.cpp b/widget/src/android/AndroidJavaWrappers.cpp
index 1a44ea605688..596a85f9c7ae 100644
--- a/widget/src/android/AndroidJavaWrappers.cpp
+++ b/widget/src/android/AndroidJavaWrappers.cpp
@@ -84,6 +84,7 @@ jclass AndroidGeckoSurfaceView::jGeckoSurfaceViewClass = 0;
 jmethodID AndroidGeckoSurfaceView::jBeginDrawingMethod = 0;
 jmethodID AndroidGeckoSurfaceView::jEndDrawingMethod = 0;
 jmethodID AndroidGeckoSurfaceView::jGetSoftwareDrawBufferMethod = 0;
+jmethodID AndroidGeckoSurfaceView::jGetHolderMethod = 0;
 
 #define JNI()  (AndroidBridge::JNI())
 
@@ -146,6 +147,7 @@ AndroidGeckoSurfaceView::InitGeckoSurfaceViewClass(JNIEnv *jEnv)
     jBeginDrawingMethod = getMethod("beginDrawing", "()I");
     jGetSoftwareDrawBufferMethod = getMethod("getSoftwareDrawBuffer", "()Ljava/nio/ByteBuffer;");
     jEndDrawingMethod = getMethod("endDrawing", "()V");
+    jGetHolderMethod = getMethod("getHolder", "()Landroid/view/SurfaceHolder;");
 }
 
 void
@@ -378,6 +380,12 @@ AndroidGeckoSurfaceView::GetSoftwareDrawBuffer(int *cap)
     return (unsigned char*) bp;
 }
 
+jobject
+AndroidGeckoSurfaceView::GetSurfaceHolder()
+{
+    return JNI()->CallObjectMethod(wrapped_obj, jGetHolderMethod);
+}
+
 void
 AndroidPoint::Init(JNIEnv *jenv, jobject jobj)
 {
diff --git a/widget/src/android/AndroidJavaWrappers.h b/widget/src/android/AndroidJavaWrappers.h
index a30aef9ac4b6..5d4b05c2ac5f 100644
--- a/widget/src/android/AndroidJavaWrappers.h
+++ b/widget/src/android/AndroidJavaWrappers.h
@@ -46,8 +46,10 @@
 #include "nsRect.h"
 #include "nsString.h"
 
+//#define FORCE_ALOG 1
+
 #ifndef ALOG
-#ifdef DEBUG
+#if defined(DEBUG) || defined(FORCE_ALOG)
 #define ALOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gecko" , ## args)
 #else
 #define ALOG(args...)
@@ -168,11 +170,17 @@ public:
     int BeginDrawing();
     unsigned char *GetSoftwareDrawBuffer(int *cap);
     void EndDrawing();
+
+    // must have a JNI local frame when calling this,
+    // and you'd better know what you're doing
+    jobject GetSurfaceHolder();
+
 protected:
     static jclass jGeckoSurfaceViewClass;
     static jmethodID jBeginDrawingMethod;
     static jmethodID jEndDrawingMethod;
     static jmethodID jGetSoftwareDrawBufferMethod;
+    static jmethodID jGetHolderMethod;
 };
 
 class AndroidKeyEvent
diff --git a/widget/src/android/nsWindow.cpp b/widget/src/android/nsWindow.cpp
index bb505a2a224d..c2973ab460b4 100644
--- a/widget/src/android/nsWindow.cpp
+++ b/widget/src/android/nsWindow.cpp
@@ -51,25 +51,16 @@
 #include "gfxImageSurface.h"
 #include "gfxContext.h"
 
+#include "Layers.h"
+#include "BasicLayers.h"
+#include "LayerManagerOGL.h"
+#include "GLContext.h"
+#include "GLContextProvider.h"
+
 #include "nsTArray.h"
 
 #include "AndroidBridge.h"
 
-/* OpenGL */
-#define USE_GLES2
-
-#ifdef USE_GLES2
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#else
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-#endif
-
-#ifndef GL_BGRA_EXT
-#define GL_BGRA_EXT 0x80E1
-#endif
-
 using namespace mozilla;
 
 NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
@@ -90,6 +81,9 @@ static nsTArray<nsWindow*> gTopLevelWindows;
 static nsWindow* gFocusedWindow = nsnull;
 static PRUint32 gIMEState;
 
+static nsRefPtr<gl::GLContext> sGLContext;
+static PRBool sFailedToCreateGLContext = PR_FALSE;
+
 static nsWindow*
 TopWindow()
 {
@@ -119,7 +113,7 @@ nsWindow::DumpWindows()
 void
 nsWindow::DumpWindows(const nsTArray<nsWindow*>& wins, int indent)
 {
-    for (int i = 0; i < wins.Length(); ++i) {
+    for (PRUint32 i = 0; i < wins.Length(); ++i) {
         nsWindow *w = wins[i];
         LogWindow(w, i, indent);
         DumpWindows(w->mChildren, indent+1);
@@ -671,38 +665,92 @@ nsWindow::DrawTo(gfxASurface *targetSurface)
     if (!mIsVisible)
         return PR_FALSE;
 
-    nsRefPtr<gfxContext> ctx = new gfxContext(targetSurface);
-
+    nsEventStatus status;
     nsIntRect boundsRect(0, 0, mBounds.width, mBounds.height);
 
-    nsPaintEvent event(PR_TRUE, NS_PAINT, this);
-    event.region = boundsRect;
-    {
-        AutoLayerManagerSetup setupLayerManager(this, ctx);
-        nsEventStatus status = DispatchEvent(&event);
+    // Figure out if any of our children cover this widget completely
+    PRInt32 coveringChildIndex = -1;
+    for (PRUint32 i = 0; i < mChildren.Length(); ++i) {
+        if (mChildren[i]->mBounds.IsEmpty())
+            continue;
+
+        if (mChildren[i]->mBounds.Contains(boundsRect)) {
+            coveringChildIndex = PRInt32(i);
+        }
     }
 
-    // XXX uhh.. we can't just ignore this because we no longer have
-    // what we needed before, but let's keep drawing the children anyway?
+    // If we have no covering child, then we need to render this.
+    if (coveringChildIndex == -1) {
+        ALOG("nsWindow[%p]::DrawTo no covering child, drawing this", (void*) this);
+
+        switch (GetLayerManager()->GetBackendType()) {
+            case LayerManager::LAYERS_BASIC: {
+                nsRefPtr<gfxContext> ctx = new gfxContext(targetSurface);
+
+                nsPaintEvent event(PR_TRUE, NS_PAINT, this);
+                event.region = boundsRect;
+                {
+                    AutoLayerManagerSetup setupLayerManager(this, ctx);
+                    status = DispatchEvent(&event);
+                }
+
+                // XXX uhh.. we can't just ignore this because we no longer have
+                // what we needed before, but let's keep drawing the children anyway?
 #if 0
-    if (status == nsEventStatus_eIgnore)
-        return PR_FALSE;
+                if (status == nsEventStatus_eIgnore)
+                    return PR_FALSE;
 #endif
 
-    // XXX if we got an ignore for the parent, do we still want to draw the children?
-    // We don't really have a good way not to...
+                // XXX if we got an ignore for the parent, do we still want to draw the children?
+                // We don't really have a good way not to...
 
-    gfxPoint offset = targetSurface->GetDeviceOffset();
+            }
+                break;
 
-    for (PRUint32 i = 0; i < mChildren.Length(); ++i) {
-        targetSurface->SetDeviceOffset(offset + gfxPoint(mChildren[i]->mBounds.x,
-                                                         mChildren[i]->mBounds.y));
-        if (!mChildren[i]->DrawTo(targetSurface)) {
+            case LayerManager::LAYERS_OPENGL: {
+                static_cast<mozilla::layers::LayerManagerOGL*>(GetLayerManager())->
+                    SetClippingRegion(nsIntRegion(boundsRect));
+
+                nsPaintEvent event(PR_TRUE, NS_PAINT, this);
+                event.region = boundsRect;
+                status = DispatchEvent(&event);
+            }
+                break;
+
+            default:
+                NS_ERROR("Invalid layer manager");
+        }
+
+        // We had no covering child, so make sure we draw all the children,
+        // starting from index 0.
+        coveringChildIndex = 0;
+    }
+
+    gfxPoint offset;
+
+    if (targetSurface)
+        offset = targetSurface->GetDeviceOffset();
+
+    for (PRUint32 i = coveringChildIndex; i < mChildren.Length(); ++i) {
+        if (mChildren[i]->mBounds.IsEmpty() ||
+            !mChildren[i]->mBounds.Intersects(boundsRect))
+        {
+            continue;
+        }
+
+        if (targetSurface)
+            targetSurface->SetDeviceOffset(offset + gfxPoint(mChildren[i]->mBounds.x,
+                                                             mChildren[i]->mBounds.y));
+
+        PRBool ok = mChildren[i]->DrawTo(targetSurface);
+
+        if (!ok) {
             ALOG("nsWindow[%p]::DrawTo child %d[%p] returned FALSE!", (void*) this, i, (void*)mChildren[i]);
         }
     }
 
-    targetSurface->SetDeviceOffset(offset);
+    if (targetSurface)
+        targetSurface->SetDeviceOffset(offset);
 
     return PR_TRUE;
 }
@@ -753,7 +801,11 @@ nsWindow::OnDraw(AndroidGeckoEvent *ae)
         return;
     }
 
-    nsRefPtr<gfxImageSurface> targetSurface;
+    if (GetLayerManager()->GetBackendType() == LayerManager::LAYERS_BASIC) {
+        drawType = AndroidGeckoSurfaceView::DRAW_SOFTWARE;
+    } else {
+        drawType = AndroidGeckoSurfaceView::DRAW_GLES_2;
+    }
 
     if (drawType == AndroidGeckoSurfaceView::DRAW_SOFTWARE) {
         int bufCap;
@@ -763,7 +815,8 @@ nsWindow::OnDraw(AndroidGeckoEvent *ae)
             sview.EndDrawing();
             return;
         }
-        targetSurface =
+
+        nsRefPtr<gfxImageSurface> targetSurface =
             new gfxImageSurface(buf,
                                 gfxIntSize(mBounds.width, mBounds.height),
                                 mBounds.width * 4,
@@ -777,319 +830,17 @@ nsWindow::OnDraw(AndroidGeckoEvent *ae)
         while (ibuf < ibufMax) {
             *ibuf++ = (*ibuf & 0xff00ff00) | ((*ibuf & 0x00ff0000) >> 16) | ((*ibuf & 0x000000ff) << 16);
         }
+    } else if (drawType == AndroidGeckoSurfaceView::DRAW_GLES_2) {
+        NS_ASSERTION(sGLContext, "Drawing with GLES without a GL context?");
 
-        sview.EndDrawing();
-        return;
+        sGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
+
+        DrawTo(nsnull);
+
+        if (sGLContext)
+            sGLContext->SwapBuffers();
     }
 
-    targetSurface =
-        new gfxImageSurface(gfxIntSize(mBounds.width, mBounds.height), gfxASurface::ImageFormatARGB32);
-
-    if (!DrawTo(targetSurface)) {
-        sview.EndDrawing();
-        return;
-    }
-
-#ifdef USE_GLES2
-    if (drawType != AndroidGeckoSurfaceView::DRAW_GLES_2) {
-        ALOG("#### GL drawing path, but beingDrawing wanted something else!");
-        sview.EndDrawing();
-        return;
-    }
-
-    static bool hasBGRA = false;
-
-    if (firstDraw) {
-        const char *ext = (const char *) glGetString(GL_EXTENSIONS);
-        ALOG("GL extensions: %s", ext);
-        if (strstr(ext, "GL_EXT_bgra") ||
-            strstr(ext, "GL_IMG_texture_format_BGRA8888") ||
-            strstr(ext, "GL_EXT_texture_format_BGRA8888"))
-            hasBGRA = true;
-
-        firstDraw = false;
-    }
-
-    static GLuint textureId = GLuint(-1);
-    static GLuint programId = GLuint(-1);
-    static GLint positionLoc, texCoordLoc, textureLoc;
-    if (textureId == GLuint(-1) || !glIsTexture(textureId)) {
-        glGenTextures(1, &textureId);
-
-        glBindTexture(GL_TEXTURE_2D, textureId);
-
-        /* Set required NPOT texture params, for baseline ES2 NPOT support */
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-        const char *vsString =
-            "attribute vec3 aPosition; \n"
-            "attribute vec2 aTexCoord; \n"
-            "varying vec2 vTexCoord; \n"
-            "void main() { \n"
-            "  gl_Position = vec4(aPosition, 1.0); \n"
-            "  vTexCoord = aTexCoord; \n"
-            "}";
-
-        /* Note that while the swizzle is, afaik, "free", the texture upload
-         * can potentially be faster if the native hardware format is BGRA.  So
-         * we use BGRA if it's available.
-         */
-
-        const char *fsStringNoBGRA =
-            "precision mediump float; \n"
-            "varying vec2 vTexCoord; \n"
-            "uniform sampler2D sTexture; \n"
-            "void main() { \n"
-            "  gl_FragColor = vec4(texture2D(sTexture, vTexCoord).bgr, 1.0); \n"
-            "}";
-
-        const char *fsStringBGRA =
-            "precision mediump float; \n"
-            "varying vec2 vTexCoord; \n"
-            "uniform sampler2D sTexture; \n"
-            "void main() { \n"
-            "  gl_FragColor = vec4(texture2D(sTexture, vTexCoord).rgb, 1.0); \n"
-            "}";
-
-        GLint status;
-
-        GLuint vsh = glCreateShader(GL_VERTEX_SHADER);
-        glShaderSource(vsh, 1, &vsString, NULL);
-        glCompileShader(vsh);
-        glGetShaderiv(vsh, GL_COMPILE_STATUS, &status);
-        if (!status) {
-            ALOG("Failed to compile vertex shader");
-            return;
-        }
-
-        GLuint fsh = glCreateShader(GL_FRAGMENT_SHADER);
-        glShaderSource(fsh, 1, hasBGRA ? &fsStringBGRA : &fsStringNoBGRA, NULL);
-        glCompileShader(fsh);
-        glGetShaderiv(fsh, GL_COMPILE_STATUS, &status);
-        if (!status) {
-            ALOG("Failed to compile fragment shader");
-            return;
-        }
-
-        programId = glCreateProgram();
-        glAttachShader(programId, vsh);
-        glAttachShader(programId, fsh);
-
-        glLinkProgram(programId);
-        glGetProgramiv(programId, GL_LINK_STATUS, &status);
-        if (!status) {
-            ALOG("Failed to link program");
-            return;
-        }
-
-        positionLoc = glGetAttribLocation(programId, "aPosition");
-        texCoordLoc = glGetAttribLocation(programId, "aTexCoord");
-        textureLoc = glGetUniformLocation(programId, "sTexture");
-    }
-
-    int texDimWidth = targetSurface->Width();
-    int texDimHeight = targetSurface->Height();
-
-    glClearColor(1.0f, 0.3f, 0.3f, 1.0f);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    glFrontFace(GL_CCW);
-
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_DEPTH_TEST);
-
-    glBindTexture(GL_TEXTURE_2D, textureId);
-
-    glTexImage2D(GL_TEXTURE_2D,
-                 0,
-                 hasBGRA ? GL_BGRA_EXT : GL_RGBA,
-                 texDimWidth,
-                 texDimHeight,
-                 0,
-                 hasBGRA ? GL_BGRA_EXT : GL_RGBA,
-                 GL_UNSIGNED_BYTE,
-                 targetSurface->Data());
-
-    GLfloat texCoords[] = { 0.0f, 1.0f,
-                            0.0f, 0.0f,
-                            1.0f, 1.0f,
-                            1.0f, 0.0f };
-
-    GLfloat vCoords[] = { -1.0f, -1.0f, 0.0f,
-                          -1.0f,  1.0f, 0.0f,
-                           1.0f, -1.0f, 0.0f,
-                           1.0f,  1.0f, 0.0f };
-
-    glUseProgram(programId);
-
-    glVertexAttribPointer(positionLoc, 3, GL_FLOAT, GL_FALSE, 0, vCoords);
-    glVertexAttribPointer(texCoordLoc, 2, GL_FLOAT, GL_FALSE, 0, texCoords);
-
-    glEnableVertexAttribArray(positionLoc);
-    glEnableVertexAttribArray(texCoordLoc);
-
-    glUniform1i(textureLoc, 0);
-
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-
-    int err = glGetError();
-    if (err)
-        ALOG("GL error: %d", err);
-#else
-
-    /* GLES 1.0[1?] code.
-     *
-     * Two things:
-     *   NPOT textures are not supported by default, unlike with GLES 2
-     *   BGRA texture support is generally available, and might have
-     *   one of three different extension names.
-     */
-
-    static bool hasBGRA = false;
-    static bool hasNPOT = false;
-    static bool hasDrawTex = false;
-
-    if (firstDraw) {
-        const char *ext = (const char *) glGetString(GL_EXTENSIONS);
-        ALOG("GL extensions: %s", ext);
-        if (strstr(ext, "GL_EXT_bgra") ||
-            strstr(ext, "GL_IMG_texture_format_BGRA8888") ||
-            strstr(ext, "GL_EXT_texture_format_BGRA8888"))
-            hasBGRA = true;
-
-        if (strstr(ext, "GL_ARB_texture_non_power_of_two"))
-            hasNPOT = true;
-
-        if (strstr(ext, "GL_OES_draw_texture"))
-            hasDrawTex = true;
-
-        if (!hasBGRA)
-            ALOG("No BGRA extension found -- colors will be weird! XXX FIXME");
-
-        firstDraw = false;
-    }
-
-    glClearColor(1.0f, 0.3f, 0.3f, 1.0f);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    // This is all the way a hack and will need to be changed with
-    // real code to handle lost/reset context issues (e.g. when
-    // rotating.
-    static int lastTexDimWidth = -1;
-    static int lastTexDimHeight = -1;
-    static GLuint textureId = GLuint(-1);
-    if (textureId == GLuint(-1) || !glIsTexture(textureId)) {
-        glGenTextures(1, &textureId);
-
-        // Reset these to ensure that the non-NPOT path
-        // calls TexImage2D first.
-        lastTexDimWidth = -1;
-        lastTexDimHeight = -1;
-    }
-
-    glBindTexture(GL_TEXTURE_2D, textureId);
-
-    int texDimWidth = targetSurface->Width();
-    int texDimHeight = targetSurface->Height();
-
-    // Not sure if it would be faster to just call TexImage2D
-    // if we have NPOT textures -- I'd hope that the driver
-    // can turn that SubImage2D to an equivalent operation,
-    // given that the dimensions are going to cover the full
-    // size of the texture.
-
-
-    // There seems to be a Tegra bug here, where we can't
-    // do TexSubImage2D with GL_BGRA_EXT.  We have NPOT there,
-    // but it means that we have to have a separate codepath
-    // for when we have NPOT to avoid the update with SubImage2D.
-
-    if (hasNPOT) {
-        glTexImage2D(GL_TEXTURE_2D,
-                     0,
-                     hasBGRA ? GL_BGRA_EXT : GL_RGBA,
-                     texDimWidth,
-                     texDimHeight,
-                     0,
-                     hasBGRA ? GL_BGRA_EXT : GL_RGBA,
-                     GL_UNSIGNED_BYTE,
-                     targetSurface->Data());
-    } else {
-        texDimWidth = next_power_of_two(targetSurface->Width());
-        texDimHeight = next_power_of_two(targetSurface->Height());
-
-        if (lastTexDimWidth != texDimWidth ||
-            lastTexDimHeight != texDimHeight)
-        {
-            // Set the texture size, but don't load
-            // data.
-            glTexImage2D(GL_TEXTURE_2D,
-                         0,
-                         hasBGRA ? GL_BGRA_EXT : GL_RGBA,
-                         texDimWidth,
-                         texDimHeight,
-                         0,
-                         hasBGRA ? GL_BGRA_EXT : GL_RGBA,
-                         GL_UNSIGNED_BYTE,
-                         NULL);
-
-            lastTexDimWidth = texDimWidth;
-            lastTexDimHeight = texDimHeight;
-        }
-
-        // then actually load the data in the sub-rectangle
-        glTexSubImage2D(GL_TEXTURE_2D,
-                        0,
-                        0, 0,
-                        targetSurface->Width(),
-                        targetSurface->Height(),
-                        hasBGRA ? GL_BGRA_EXT : GL_RGBA,
-                        GL_UNSIGNED_BYTE,
-                        targetSurface->Data());
-    }
-
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-    glEnable(GL_TEXTURE_2D);
-
-    glFrontFace(GL_CCW);
-
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_ALPHA_TEST);
-    glDisable(GL_DEPTH_TEST);
-
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity();
-
-    GLfloat texCoordW = GLfloat(targetSurface->Width()) / GLfloat(texDimWidth);
-    GLfloat texCoordH = GLfloat(targetSurface->Height()) / GLfloat(texDimHeight);
-
-    GLfloat texCoords[] = { 0.0f, texCoordH,
-                            0.0f, 0.0f,
-                            texCoordW, texCoordH,
-                            texCoordW, 0.0f };
-
-    GLfloat vCoords[] = { -1.0f, -1.0f, 0.0f,
-                          -1.0f,  1.0f, 0.0f,
-                           1.0f, -1.0f, 0.0f,
-                           1.0f,  1.0f, 0.0f };
-
-    glEnableClientState(GL_VERTEX_ARRAY);
-    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-
-    glVertexPointer(3, GL_FLOAT, 0, vCoords);
-    glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
-
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-#endif
-
     sview.EndDrawing();
 }
 
@@ -1149,6 +900,10 @@ void *
 nsWindow::GetNativeData(PRUint32 aDataType)
 {
     switch (aDataType) {
+        // used by GLContextProviderEGL, NULL is EGL_DEFAULT_DISPLAY
+        case NS_NATIVE_DISPLAY:
+            return NULL;
+
         case NS_NATIVE_WIDGET:
             return (void *) this;
     }

From fb891ba68a0ea55c2db11993c90c3847ee659355 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 25 Jun 2010 20:22:09 -0400
Subject: [PATCH 055/172] Bug 574869 - Mac build without libxul fails for me
 because the IOKit framework is missing; r=ted

---
 layout/build/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index d3358be33e91..aa5b20eef186 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -278,7 +278,7 @@ ifeq ($(OS_ARCH),Linux)
 EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
 endif
 ifeq ($(OS_ARCH),Darwin)
-OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
+OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -framework IOKit
 endif
 endif
 

From 833d0ccde9433a1247df0de2fbc206210c1378f8 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Sat, 26 Jun 2010 00:02:18 -0400
Subject: [PATCH 056/172] bug 555117 - non-xulrunner QT builds package as gzip
 not bzip2 r=ted

---
 toolkit/mozapps/installer/packager.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index a60814571ca5..ba7691eb353f 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -52,7 +52,7 @@ else
 ifeq (,$(filter-out SunOS, $(OS_ARCH)))
    MOZ_PKG_FORMAT  = BZ2
 else
-   ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+   ifeq (,$(filter-out gtk2 qt, $(MOZ_WIDGET_TOOLKIT)))
       MOZ_PKG_FORMAT  = BZ2
    else
       MOZ_PKG_FORMAT  = TGZ

From 11ac17b411440583bb9f35ec72904e8f204fe325 Mon Sep 17 00:00:00 2001
From: Bas Schouten <bschouten@mozilla.com>
Date: Sat, 26 Jun 2010 06:32:13 +0200
Subject: [PATCH 057/172] Bug 574599: Make sure WS_CLIPCHILDREN is set if the
 windowstyle is reset. r=robarnold

---
 widget/src/windows/nsWindow.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index c6e1e0dd82ae..9eee15fd5a9e 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -817,7 +817,8 @@ DWORD nsWindow::WindowStyle()
       break;
 
     case eWindowType_dialog:
-      style = WS_OVERLAPPED | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_3DLOOK | DS_MODALFRAME;
+      style = WS_OVERLAPPED | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_3DLOOK |
+              DS_MODALFRAME | WS_CLIPCHILDREN;
       if (mBorderStyle != eBorderStyle_default)
         style |= WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
       break;
@@ -836,7 +837,7 @@ DWORD nsWindow::WindowStyle()
     case eWindowType_toplevel:
     case eWindowType_invisible:
       style = WS_OVERLAPPED | WS_BORDER | WS_DLGFRAME | WS_SYSMENU |
-              WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
+              WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CLIPCHILDREN;
       break;
   }
 

From 05038c032dc13a768504a1e91691bbf6b8e4f66c Mon Sep 17 00:00:00 2001
From: Jesse Ruderman <jruderman@gmail.com>
Date: Fri, 25 Jun 2010 22:40:13 -0700
Subject: [PATCH 058/172] Fix bug 574912 - leftover self.ctypes after fix for
 bug 543825

---
 build/automation.py.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/automation.py.in b/build/automation.py.in
index 067bb982b57a..32d4f39bef9d 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -583,7 +583,7 @@ user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless t
       if not pHandle:
         return False
       pExitCode = ctypes.wintypes.DWORD()
-      ctypes.windll.kernel32.GetExitCodeProcess(pHandle, self.ctypes.byref(pExitCode))
+      ctypes.windll.kernel32.GetExitCodeProcess(pHandle, ctypes.byref(pExitCode))
       ctypes.windll.kernel32.CloseHandle(pHandle)
       if (pExitCode.value == STILL_ACTIVE):
         return True

From 08a9b89248c8526dc001c29c5ae2e6b539331fe5 Mon Sep 17 00:00:00 2001
From: Benjamin Stover <webapps@stechz.com>
Date: Fri, 25 Jun 2010 22:50:29 -0700
Subject: [PATCH 059/172] Bug 556400 - Implement asyncable VisitURI. r=sdwilsh
 sr=bz

---
 docshell/base/IHistory.h                      |  39 +-
 docshell/base/nsDocShell.cpp                  | 217 ++++--
 docshell/base/nsDocShell.h                    |  78 +-
 toolkit/components/places/src/Helpers.cpp     |  29 +-
 toolkit/components/places/src/Helpers.h       |  38 +
 toolkit/components/places/src/History.cpp     | 679 +++++++++++++++++-
 toolkit/components/places/src/History.h       |  41 ++
 .../components/places/src/nsNavHistory.cpp    | 107 ++-
 toolkit/components/places/src/nsNavHistory.h  |  45 +-
 .../places/tests/browser/Makefile.in          |   5 +
 .../places/tests/browser/browser_visituri.js  | 112 +++
 .../places/tests/browser/visituri/begin.html  |  10 +
 .../places/tests/browser/visituri/final.html  |  10 +
 .../tests/browser/visituri/redirect_once.sjs  |   9 +
 .../tests/browser/visituri/redirect_twice.sjs |   9 +
 .../places/tests/cpp/places_test_harness.h    | 122 ++++
 .../places/tests/cpp/test_IHistory.cpp        | 193 +++++
 xpcom/build/Makefile.in                       |   1 +
 xpcom/build/ServiceList.h                     |  11 +
 xpcom/build/Services.cpp                      |   2 +
 xpcom/build/Services.h                        |   3 +
 21 files changed, 1620 insertions(+), 140 deletions(-)
 create mode 100644 toolkit/components/places/tests/browser/browser_visituri.js
 create mode 100644 toolkit/components/places/tests/browser/visituri/begin.html
 create mode 100644 toolkit/components/places/tests/browser/visituri/final.html
 create mode 100644 toolkit/components/places/tests/browser/visituri/redirect_once.sjs
 create mode 100644 toolkit/components/places/tests/browser/visituri/redirect_twice.sjs

diff --git a/docshell/base/IHistory.h b/docshell/base/IHistory.h
index ec95ac21a813..a5f9d9b39beb 100644
--- a/docshell/base/IHistory.h
+++ b/docshell/base/IHistory.h
@@ -51,7 +51,7 @@ namespace mozilla {
     }
 
 #define IHISTORY_IID \
-  {0xaf27265d, 0x5672, 0x4d23, {0xa0, 0x75, 0x34, 0x8e, 0xb9, 0x73, 0x5a, 0x9a}}
+  {0x6f736049, 0x6370, 0x4376, {0xb7, 0x17, 0xfa, 0xfc, 0x0b, 0x4f, 0xd0, 0xf1}}
 
 class IHistory : public nsISupports
 {
@@ -96,6 +96,38 @@ public:
      */
     NS_IMETHOD UnregisterVisitedCallback(nsIURI *aURI, dom::Link *aLink) = 0;
 
+    enum VisitFlags {
+        /**
+         * Indicates whether the URI was loaded in a top-level window.
+         */
+        TOP_LEVEL = 1 << 0,
+        /**
+         * Indicates whether the URI was loaded as part of a permanent redirect.
+         */
+        REDIRECT_PERMANENT = 1 << 1,
+        /**
+         * Indicates whether the URI was loaded as part of a temporary redirect.
+         */
+        REDIRECT_TEMPORARY = 1 << 2
+    };
+
+    /**
+     * Adds a history visit for the URI.
+     *
+     * @pre aURI must not be null.
+     *
+     * @param aURI
+     *        The URI of the page being visited.
+     * @param aLastVisitedURI
+     *        The URI of the last visit in the chain.
+     * @param aFlags
+     *        The VisitFlags describing this visit.
+     */
+    NS_IMETHOD VisitURI(
+        nsIURI *aURI,
+        nsIURI *aLastVisitedURI,
+        PRUint32 aFlags
+    ) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
@@ -104,7 +136,10 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
     NS_IMETHOD RegisterVisitedCallback(nsIURI *aURI, \
                                        mozilla::dom::Link *aContent); \
     NS_IMETHOD UnregisterVisitedCallback(nsIURI *aURI, \
-                                         mozilla::dom::Link *aContent);
+                                         mozilla::dom::Link *aContent); \
+    NS_IMETHOD VisitURI(nsIURI *aURI, \
+                        nsIURI *aLastVisitedURI, \
+                        PRUint32 aFlags);
 
 } // namespace mozilla
 
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 7391ee959082..cc9c2251d0de 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -112,6 +112,8 @@
 #include "nsIOfflineCacheUpdate.h"
 #include "nsCPrefetchService.h"
 #include "nsJSON.h"
+#include "IHistory.h"
+#include "mozilla/Services.h"
 
 // we want to explore making the document own the load group
 // so we can associate the document URI with the load group.
@@ -5662,32 +5664,53 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
     if (!(aStateFlags & STATE_IS_DOCUMENT))
         return; // not a toplevel document
 
-    nsCOMPtr<nsIGlobalHistory3> history3(do_QueryInterface(mGlobalHistory));
-    nsresult result = NS_ERROR_NOT_IMPLEMENTED;
-    if (history3) {
-        // notify global history of this redirect
-        result = history3->AddDocumentRedirect(aOldChannel, aNewChannel,
-                                               aRedirectFlags, !IsFrame());
+    nsCOMPtr<nsIURI> oldURI, newURI;
+    aOldChannel->GetURI(getter_AddRefs(oldURI));
+    aNewChannel->GetURI(getter_AddRefs(newURI));
+    if (!oldURI || !newURI) {
+        return;
     }
 
-    if (result == NS_ERROR_NOT_IMPLEMENTED) {
-        // when there is no GlobalHistory3, or it doesn't implement
-        // AddToplevelRedirect, we fall back to GlobalHistory2.  Just notify
-        // that the redirecting page was a rePdirect so it will be link colored
-        // but not visible.
-        nsCOMPtr<nsIURI> oldURI;
-        aOldChannel->GetURI(getter_AddRefs(oldURI));
-        if (! oldURI)
-            return; // nothing to tell anybody about
-        AddToGlobalHistory(oldURI, PR_TRUE, aOldChannel);
+    // Below a URI visit is saved (see AddURIVisit method doc).
+    // The visit chain looks something like:
+    //   ...
+    //   Site N - 1
+    //                =>  Site N
+    //   (redirect to =>) Site N + 1 (we are here!)
+
+    // Get N - 1 and transition type
+    nsCOMPtr<nsIURI> previousURI;
+    PRUint32 previousFlags = 0;
+    ExtractLastVisit(aOldChannel, getter_AddRefs(previousURI), &previousFlags);
+
+    if (aRedirectFlags & nsIChannelEventSink::REDIRECT_INTERNAL ||
+        ChannelIsPost(aOldChannel)) {
+        // 1. Internal redirects are ignored because they are specific to the
+        //    channel implementation.
+        // 2. POSTs are not saved by global history.
+        //
+        // Regardless, we need to propagate the previous visit to the new
+        // channel.
+        SaveLastVisit(aNewChannel, previousURI, previousFlags);
+    }
+    else {
+        nsCOMPtr<nsIURI> referrer;
+        // Treat referrer as null if there is an error getting it.
+        (void)NS_GetReferrerFromChannel(aOldChannel,
+                                        getter_AddRefs(referrer));
+
+        // Add visit N -1 => N
+        AddURIVisit(oldURI, referrer, previousURI, previousFlags);
+
+        // Since N + 1 could be the final destination, we will not save N => N + 1
+        // here.  OnNewURI will do that, so we will cache it.
+        SaveLastVisit(aNewChannel, oldURI, aRedirectFlags);
     }
 
     // check if the new load should go through the application cache.
     nsCOMPtr<nsIApplicationCacheChannel> appCacheChannel =
         do_QueryInterface(aNewChannel);
     if (appCacheChannel) {
-        nsCOMPtr<nsIURI> newURI;
-        aNewChannel->GetURI(getter_AddRefs(newURI));
         appCacheChannel->SetChooseApplicationCache(ShouldCheckAppCache(newURI));
     }
 
@@ -8927,7 +8950,7 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel, nsISupports* aOwner,
     nsCOMPtr<nsIInputStream> inputStream;
     if (aChannel) {
         nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aChannel));
-        
+
         // Check if the HTTPChannel is hiding under a multiPartChannel
         if (!httpChannel)  {
             GetHttpChannel(aChannel, getter_AddRefs(httpChannel));
@@ -9017,8 +9040,8 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel, nsISupports* aOwner,
         
         nsCOMPtr<nsICachingChannel> cacheChannel(do_QueryInterface(aChannel));
         nsCOMPtr<nsISupports>  cacheKey;
-        // Get the Cache Key  and store it in SH.         
-        if (cacheChannel) 
+        // Get the Cache Key and store it in SH.
+        if (cacheChannel)
             cacheChannel->GetCacheKey(getter_AddRefs(cacheKey));
         // If we already have a loading history entry, store the new cache key
         // in it.  Otherwise, since we're doing a reload and won't be updating
@@ -9040,10 +9063,22 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel, nsISupports* aOwner,
                                        getter_AddRefs(mLSHE));
         }
 
-        // Update Global history
         if (aAddToGlobalHistory) {
-            // Get the referrer uri from the channel
-            AddToGlobalHistory(aURI, PR_FALSE, aChannel);
+            // If this is a POST request, we do not want to include this in global
+            // history.
+            if (!ChannelIsPost(aChannel)) {
+                nsCOMPtr<nsIURI> previousURI;
+                PRUint32 previousFlags = 0;
+                ExtractLastVisit(aChannel, getter_AddRefs(previousURI),
+                                 &previousFlags);
+
+                nsCOMPtr<nsIURI> referrer;
+                // Treat referrer as null if there is an error getting it.
+                (void)NS_GetReferrerFromChannel(aChannel,
+                                                getter_AddRefs(referrer));
+
+                AddURIVisit(aURI, referrer, previousURI, previousFlags);
+            }
         }
     }
 
@@ -9362,7 +9397,7 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
         SetCurrentURI(newURI, nsnull, PR_TRUE);
         document->SetDocumentURI(newURI);
 
-        AddToGlobalHistory(newURI, PR_FALSE, oldURI);
+        AddURIVisit(newURI, oldURI, oldURI, 0);
     }
     else {
         FireOnLocationChange(this, nsnull, mCurrentURI);
@@ -10063,53 +10098,109 @@ NS_IMETHODIMP nsDocShell::MakeEditable(PRBool inWaitForUriLoad)
   return mEditorData->MakeEditable(inWaitForUriLoad);
 }
 
-nsresult
-nsDocShell::AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect,
-                               nsIChannel * aChannel)
+bool
+nsDocShell::ChannelIsPost(nsIChannel* aChannel)
 {
-    // If this is a POST request, we do not want to include this in global
-    // history, so return early.
-    nsCOMPtr<nsIHttpChannel> hchan(do_QueryInterface(aChannel));
-    if (hchan) {
-        nsCAutoString type;
-        nsresult rv = hchan->GetRequestMethod(type);
-        if (NS_SUCCEEDED(rv) && type.EqualsLiteral("POST"))
-            return NS_OK;
+    nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aChannel));
+    if (!httpChannel) {
+        return false;
     }
 
-    nsCOMPtr<nsIURI> referrer;
-    if (aChannel)
-        NS_GetReferrerFromChannel(aChannel, getter_AddRefs(referrer));
-
-    return AddToGlobalHistory(aURI, aRedirect, referrer);
+    nsCAutoString method;
+    httpChannel->GetRequestMethod(method);
+    return method.Equals("POST");
 }
 
-nsresult
-nsDocShell::AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect,
-                               nsIURI * aReferrer)
+void
+nsDocShell::ExtractLastVisit(nsIChannel* aChannel,
+                             nsIURI** aURI,
+                             PRUint32* aChannelRedirectFlags)
 {
-    if (mItemType != typeContent || !mGlobalHistory)
-        return NS_OK;
-
-    PRBool visited;
-    nsresult rv = mGlobalHistory->IsVisited(aURI, &visited);
-    if (NS_FAILED(rv))
-        return rv;
-
-    rv = mGlobalHistory->AddURI(aURI, aRedirect, !IsFrame(), aReferrer);
-    if (NS_FAILED(rv))
-        return rv;
-
-    if (!visited) {
-        nsCOMPtr<nsIObserverService> obsService =
-            mozilla::services::GetObserverService();
-        if (obsService) {
-            obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nsnull);
-        }
+    nsCOMPtr<nsIPropertyBag2> props(do_QueryInterface(aChannel));
+    if (!props) {
+        return;
     }
 
-    return NS_OK;
+    nsresult rv = props->GetPropertyAsInterface(
+        NS_LITERAL_STRING("docshell.previousURI"),
+        NS_GET_IID(nsIURI),
+        reinterpret_cast<void**>(aURI)
+    );
 
+    if (NS_FAILED(rv)) {
+        // There is no last visit for this channel, so this must be the first
+        // link.  Link the visit to the referrer of this request, if any.
+        // Treat referrer as null if there is an error getting it.
+        (void)NS_GetReferrerFromChannel(aChannel, aURI);
+    }
+    else {
+      rv = props->GetPropertyAsUint32(
+          NS_LITERAL_STRING("docshell.previousFlags"),
+          aChannelRedirectFlags
+      );
+
+      NS_WARN_IF_FALSE(
+          NS_FAILED(rv),
+          "Could not fetch previous flags, URI will be treated like referrer"
+      );
+    }
+}
+
+void
+nsDocShell::SaveLastVisit(nsIChannel* aChannel,
+                          nsIURI* aURI,
+                          PRUint32 aChannelRedirectFlags)
+{
+    nsCOMPtr<nsIWritablePropertyBag2> props(do_QueryInterface(aChannel));
+    if (!props || !aURI) {
+        return;
+    }
+
+    props->SetPropertyAsInterface(NS_LITERAL_STRING("docshell.previousURI"),
+                                  aURI);
+    props->SetPropertyAsUint32(NS_LITERAL_STRING("docshell.previousFlags"),
+                               aChannelRedirectFlags);
+}
+
+void
+nsDocShell::AddURIVisit(nsIURI* aURI,
+                        nsIURI* aReferrerURI,
+                        nsIURI* aPreviousURI,
+                        PRUint32 aChannelRedirectFlags)
+{
+    NS_ASSERTION(aURI, "Visited URI is null!");
+
+    // Only content-type docshells save URI visits.
+    if (mItemType != typeContent) {
+        return;
+    }
+
+    nsCOMPtr<IHistory> history = services::GetHistoryService();
+
+    if (history) {
+        PRUint32 visitURIFlags = 0;
+
+        if (!IsFrame()) {
+            visitURIFlags |= IHistory::TOP_LEVEL;
+        }
+
+        if (aChannelRedirectFlags & nsIChannelEventSink::REDIRECT_TEMPORARY) {
+            visitURIFlags |= IHistory::REDIRECT_TEMPORARY;
+        }
+        else if (aChannelRedirectFlags &
+                 nsIChannelEventSink::REDIRECT_PERMANENT) {
+            visitURIFlags |= IHistory::REDIRECT_PERMANENT;
+        }
+
+        (void)history->VisitURI(aURI, aPreviousURI, visitURIFlags);
+    }
+    else if (mGlobalHistory) {
+        // Falls back to sync global history interface.
+        (void)mGlobalHistory->AddURI(aURI,
+                                     !!aChannelRedirectFlags,
+                                     !IsFrame(),
+                                     aReferrerURI);
+    }
 }
 
 //*****************************************************************************
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 5a666ae47999..b2f3a1bdbbfe 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -433,12 +433,77 @@ protected:
                                        PRUint32 aRedirectFlags,
                                        PRUint32 aStateFlags);
 
-    // Global History
+    /**
+     * Helper function that determines if channel is an HTTP POST.
+     *
+     * @param aChannel
+     *        The channel to test
+     *
+     * @return True iff channel is an HTTP post.
+     */
+    bool ChannelIsPost(nsIChannel* aChannel);
 
-    nsresult AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect,
-                                nsIChannel * aChannel);
-    nsresult AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect,
-                                nsIURI * aReferrer);
+    /**
+     * Helper function that finds the last URI and its transition flags for a
+     * channel.
+     *
+     * This method first checks the channel's property bag to see if previous
+     * info has been saved.  If not, it gives back the referrer of the channel.
+     *
+     * @param aChannel
+     *        The channel we are transitioning to
+     * @param aURI
+     *        Output parameter with the previous URI, not addref'd
+     * @param aChannelRedirectFlags
+     *        If a redirect, output parameter with the previous redirect flags
+     *        from nsIChannelEventSink
+     */
+    void ExtractLastVisit(nsIChannel* aChannel,
+                          nsIURI** aURI,
+                          PRUint32* aChannelRedirectFlags);
+
+    /**
+     * Helper function that caches a URI and a transition for saving later.
+     *
+     * @param aChannel
+     *        Channel that will have these properties saved
+     * @param aURI
+     *        The URI to save for later
+     * @param aChannelRedirectFlags
+     *        The nsIChannelEventSink redirect flags to save for later
+     */
+    void SaveLastVisit(nsIChannel* aChannel,
+                       nsIURI* aURI,
+                       PRUint32 aChannelRedirectFlags);
+
+    /**
+     * Helper function for adding a URI visit using IHistory.  If IHistory is
+     * not available, the method tries nsIGlobalHistory2.
+     *
+     * The IHistory API maintains chains of visits, tracking both HTTP referrers
+     * and redirects for a user session. VisitURI requires the current URI and
+     * the previous URI in the chain.
+     *
+     * Visits can be saved either during a redirect or when the request has
+     * reached its final destination.  The previous URI in the visit may be
+     * from another redirect or it may be the referrer.
+     *
+     * @pre aURI is not null.
+     *
+     * @param aURI
+     *        The URI that was just visited
+     * @param aReferrerURI
+     *        The referrer URI of this request
+     * @param aPreviousURI
+     *        The previous URI of this visit (may be the same as aReferrerURI)
+     * @param aChannelRedirectFlags
+     *        For redirects, the redirect flags from nsIChannelEventSink
+     *        (0 otherwise)
+     */
+    void AddURIVisit(nsIURI* aURI,
+                     nsIURI* aReferrerURI,
+                     nsIURI* aPreviousURI,
+                     PRUint32 aChannelRedirectFlags);
 
     // Helper Routines
     nsresult   ConfirmRepost(PRBool * aRepost);
@@ -700,6 +765,9 @@ protected:
 
     PRInt32                    mMarginWidth;
     PRInt32                    mMarginHeight;
+
+    // This can either be a content docshell or a chrome docshell.  After
+    // Create() is called, the type is not expected to change.
     PRInt32                    mItemType;
 
     // Index into the SHTransaction list, indicating the previous and current
diff --git a/toolkit/components/places/src/Helpers.cpp b/toolkit/components/places/src/Helpers.cpp
index d1add306ea6c..d8d139c2f03d 100644
--- a/toolkit/components/places/src/Helpers.cpp
+++ b/toolkit/components/places/src/Helpers.cpp
@@ -60,7 +60,7 @@ AsyncStatementCallback::HandleError(mozIStorageError *aError)
 
   nsCAutoString warnMsg;
   warnMsg.Append("An error occurred while executing an async statement: ");
-  warnMsg.Append(result);
+  warnMsg.AppendInt(result);
   warnMsg.Append(" ");
   warnMsg.Append(message);
   NS_WARNING(warnMsg.get());
@@ -180,6 +180,33 @@ URIBinder::Bind(mozIStorageBindingParams* aParams,
 
 #undef URI_TO_URLCSTRING
 
+nsresult
+GetReversedHostname(nsIURI* aURI, nsString& aRevHost)
+{
+  nsCAutoString forward8;
+  nsresult rv = aURI->GetHost(forward8);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // can't do reversing in UTF8, better use 16-bit chars
+  GetReversedHostname(NS_ConvertUTF8toUTF16(forward8), aRevHost);
+  return NS_OK;
+}
+
+void
+GetReversedHostname(const nsString& aForward, nsString& aRevHost)
+{
+  ReverseString(aForward, aRevHost);
+  aRevHost.Append(PRUnichar('.'));
+}
+
+void
+ReverseString(const nsString& aInput, nsString& aReversed)
+{
+  aReversed.Truncate(0);
+  for (PRInt32 i = aInput.Length() - 1; i >= 0; i--) {
+    aReversed.Append(aInput[i]);
+  }
+}
 
 } // namespace places
 } // namespace mozilla
diff --git a/toolkit/components/places/src/Helpers.h b/toolkit/components/places/src/Helpers.h
index 2d4343fc15e2..cf8b4f34a97f 100644
--- a/toolkit/components/places/src/Helpers.h
+++ b/toolkit/components/places/src/Helpers.h
@@ -136,6 +136,44 @@ public:
                        const nsACString& aURLString);
 };
 
+/**
+ * This extracts the hostname from the URI and reverses it in the
+ * form that we use (always ending with a "."). So
+ * "http://microsoft.com/" becomes "moc.tfosorcim."
+ * 
+ * The idea behind this is that we can create an index over the items in
+ * the reversed host name column, and then query for as much or as little
+ * of the host name as we feel like.
+ * 
+ * For example, the query "host >= 'gro.allizom.' AND host < 'gro.allizom/'
+ * Matches all host names ending in '.mozilla.org', including
+ * 'developer.mozilla.org' and just 'mozilla.org' (since we define all
+ * reversed host names to end in a period, even 'mozilla.org' matches).
+ * The important thing is that this operation uses the index. Any substring
+ * calls in a select statement (even if it's for the beginning of a string)
+ * will bypass any indices and will be slow).
+ *
+ * @param aURI
+ *        URI that contains spec to reverse
+ * @param aRevHost
+ *        Out parameter
+ */
+nsresult GetReversedHostname(nsIURI* aURI, nsString& aRevHost);
+
+/**
+ * Similar method to GetReversedHostName but for strings
+ */
+void GetReversedHostname(const nsString& aForward, nsString& aRevHost);
+
+/**
+ * Reverses a string.
+ *
+ * @param aInput
+ *        The string to be reversed
+ * @param aReversed
+ *        Ouput parameter will contain the reversed string
+ */
+void ReverseString(const nsString& aInput, nsString& aReversed);
 
 } // namespace places
 } // namespace mozilla
diff --git a/toolkit/components/places/src/History.cpp b/toolkit/components/places/src/History.cpp
index 6d264e9a5a0b..d156ce15294c 100644
--- a/toolkit/components/places/src/History.cpp
+++ b/toolkit/components/places/src/History.cpp
@@ -39,6 +39,7 @@
 
 #include "History.h"
 #include "nsNavHistory.h"
+#include "nsNavBookmarks.h"
 #include "Helpers.h"
 
 #include "mozilla/storage.h"
@@ -58,6 +59,87 @@ namespace places {
 #define URI_VISITED "visited"
 #define URI_NOT_VISITED "not visited"
 #define URI_VISITED_RESOLUTION_TOPIC "visited-status-resolution"
+// Observer event fired after a visit has been registered in the DB.
+#define URI_VISIT_SAVED "uri-visit-saved"
+
+////////////////////////////////////////////////////////////////////////////////
+//// Step
+
+class Step : public AsyncStatementCallback
+{
+public:
+  /**
+   * Executes statement asynchronously using this as a callback.
+   * 
+   * @param aStmt
+   *        Statement to execute asynchronously
+   */
+  NS_IMETHOD ExecuteAsync(mozIStorageStatement* aStmt);
+
+  /**
+   * Called once after query is completed.  If your query has more than one
+   * result set to process, you will want to override HandleResult to process
+   * each one.
+   *
+   * @param aResultSet
+   *        Results from ExecuteAsync
+   *        Unlike HandleResult, this *can be NULL* if there were no results.
+   */
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet);
+
+  /**
+   * By default, stores the last result set received in mResultSet.
+   * For queries with only one result set, you don't need to override.
+   *
+   * @param aResultSet
+   *        Results from ExecuteAsync
+   */
+  NS_IMETHOD HandleResult(mozIStorageResultSet* aResultSet);
+
+  /**
+   * By default, this calls Callback with any saved results from HandleResult.
+   * For queries with only one result set, you don't need to override.
+   *
+   * @param aReason
+   *        SQL status code
+   */
+  NS_IMETHOD HandleCompletion(PRUint16 aReason);
+
+private:
+  // Used by HandleResult to cache results until HandleCompletion is called.
+  nsCOMPtr<mozIStorageResultSet> mResultSet;
+};
+
+NS_IMETHODIMP
+Step::ExecuteAsync(mozIStorageStatement* aStmt)
+{
+  nsCOMPtr<mozIStoragePendingStatement> handle;
+  nsresult rv = aStmt->ExecuteAsync(this, getter_AddRefs(handle));
+  NS_ENSURE_SUCCESS(rv, rv);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Step::Callback(mozIStorageResultSet* aResultSet)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Step::HandleResult(mozIStorageResultSet* aResultSet)
+{
+  mResultSet = aResultSet;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+Step::HandleCompletion(PRUint16 aReason)
+{
+  nsCOMPtr<mozIStorageResultSet> resultSet = mResultSet;
+  mResultSet = NULL;
+  Callback(resultSet);
+  return NS_OK;
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Anonymous Helpers
@@ -71,7 +153,7 @@ public:
 
   static nsresult Start(nsIURI* aURI)
   {
-    NS_ASSERTION(aURI, "Don't pass a null URI!");
+    NS_PRECONDITION(aURI, "Null URI");
 
     nsNavHistory* navHist = nsNavHistory::GetHistoryService();
     NS_ENSURE_TRUE(navHist, NS_ERROR_FAILURE);
@@ -144,6 +226,476 @@ NS_IMPL_ISUPPORTS1(
   mozIStorageStatementCallback
 )
 
+/**
+ * Fail-safe mechanism for ensuring that your task completes, no matter what.
+ * Pass this around as an nsAutoPtr in your steps to guarantee that when all
+ * your steps are finished, your task is finished.
+ */
+class FailSafeFinishTask
+{
+public:
+  ~FailSafeFinishTask() {
+    History::GetService()->CurrentTaskFinished();
+  }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+//// Steps for VisitURI
+
+struct VisitURIData : public FailSafeFinishTask
+{
+  PRInt64 placeId;
+  PRInt32 hidden;
+  PRInt32 typed;
+  nsCOMPtr<nsIURI> uri;
+
+  // Url of last added visit in chain.
+  nsCString lastSpec;
+  PRInt64 lastVisitId;
+  PRInt32 transitionType;
+  PRInt64 sessionId;
+  PRTime dateTime;
+};
+
+/**
+ * Step 6: Update frecency of URI and notify observers.
+ */
+class UpdateFrecencyAndNotifyStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  UpdateFrecencyAndNotifyStep(nsAutoPtr<VisitURIData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    // Result set contains new visit created in earlier step
+    NS_ENSURE_STATE(aResultSet);
+
+    nsCOMPtr<mozIStorageRow> row;
+    nsresult rv = aResultSet->GetNextRow(getter_AddRefs(row));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    PRInt64 visitId;
+    rv = row->GetInt64(0, &visitId);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // TODO need to figure out story for not synchronous frecency updating
+    // (bug 556631)
+
+    // Swallow errors here, since if we've gotten this far, it's more
+    // important to notify the observers below.
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+    NS_WARN_IF_FALSE(history, "Could not get history service");
+    nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
+    NS_WARN_IF_FALSE(bookmarks, "Could not get bookmarks service");
+    if (history && bookmarks) {
+      // Update frecency *after* the visit info is in the db
+      nsresult rv = history->UpdateFrecency(
+        mData->placeId,
+        bookmarks->IsRealBookmark(mData->placeId)
+      );
+      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Could not update frecency");
+
+      // Notify nsNavHistory observers of visit, but only for certain types of
+      // visits to maintain consistency with nsNavHistory::GetQueryResults.
+      if (!mData->hidden &&
+          mData->transitionType != nsINavHistoryService::TRANSITION_EMBED &&
+          mData->transitionType != nsINavHistoryService::TRANSITION_FRAMED_LINK) {
+        history->FireOnVisit(mData->uri, visitId, mData->dateTime,
+                             mData->sessionId, mData->lastVisitId,
+                             mData->transitionType);
+      }
+    }
+
+    nsCOMPtr<nsIObserverService> obsService =
+      mozilla::services::GetObserverService();
+    if (obsService) {
+      nsresult rv = obsService->NotifyObservers(mData->uri, URI_VISIT_SAVED, nsnull);
+      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Could not notify observers");
+    }
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<VisitURIData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  UpdateFrecencyAndNotifyStep
+, mozIStorageStatementCallback
+)
+
+/**
+ * Step 5: Get newly created visit ID from moz_history_visits table.
+ */
+class GetVisitIDStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  GetVisitIDStep(nsAutoPtr<VisitURIData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    // Find visit ID, needed for notifying observers in next step.
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+    NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
+    nsCOMPtr<mozIStorageStatement> stmt =
+      history->GetStatementById(DB_RECENT_VISIT_OF_URL);
+    NS_ENSURE_STATE(stmt);
+
+    nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<Step> step = new UpdateFrecencyAndNotifyStep(mData);
+    rv = step->ExecuteAsync(stmt);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<VisitURIData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  GetVisitIDStep
+, mozIStorageStatementCallback
+)
+
+/**
+ * Step 4: Add visit to moz_history_visits table.
+ */
+class AddVisitStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  AddVisitStep(nsAutoPtr<VisitURIData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    nsresult rv;
+
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+    NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
+
+    // TODO need to figure out story for new session IDs that isn't synchronous
+    // (bug 561450)
+
+    if (aResultSet) {
+      // Result set contains last visit information for this session
+      nsCOMPtr<mozIStorageRow> row;
+      rv = aResultSet->GetNextRow(getter_AddRefs(row));
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      PRInt64 possibleSessionId;
+      PRTime lastVisitOfSession;
+
+      rv = row->GetInt64(0, &mData->lastVisitId);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = row->GetInt64(1, &possibleSessionId);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = row->GetInt64(2, &lastVisitOfSession);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      if (mData->dateTime - lastVisitOfSession <= RECENT_EVENT_THRESHOLD) {
+        mData->sessionId = possibleSessionId;
+      }
+      else {
+        // Session is too old. Start a new one.
+        mData->sessionId = history->GetNewSessionID();
+        mData->lastVisitId = 0;
+      }
+    }
+    else {
+      // No previous saved visit entry could be found, so start a new session.
+      mData->sessionId = history->GetNewSessionID();
+      mData->lastVisitId = 0;
+    }
+
+    nsCOMPtr<mozIStorageStatement> stmt =
+      history->GetStatementById(DB_INSERT_VISIT);
+    NS_ENSURE_STATE(stmt);
+
+    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("from_visit"),
+                               mData->lastVisitId);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("page_id"),
+                               mData->placeId);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("visit_date"),
+                               mData->dateTime);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("visit_type"),
+                               mData->transitionType);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("session"),
+                               mData->sessionId);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<Step> step = new GetVisitIDStep(mData);
+    rv = step->ExecuteAsync(stmt);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<VisitURIData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  AddVisitStep
+, mozIStorageStatementCallback
+)
+
+/**
+ * Step 3: Callback for inserting or updating a moz_places entry.
+ *         This step checks database for the last visit in session.
+ */
+class CheckLastVisitStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  CheckLastVisitStep(nsAutoPtr<VisitURIData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    nsresult rv;
+
+    if (aResultSet) {
+      // Last step inserted a new URL. This query contains the id.
+      nsCOMPtr<mozIStorageRow> row;
+      rv = aResultSet->GetNextRow(getter_AddRefs(row));
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      rv = row->GetInt64(0, &mData->placeId);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    if (!mData->lastSpec.IsEmpty()) {
+      // Find last visit ID and session ID using lastSpec so we can add them
+      // to a browsing session if the visit was recent.
+      nsNavHistory* history = nsNavHistory::GetHistoryService();
+      NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
+      nsCOMPtr<mozIStorageStatement> stmt =
+        history->GetStatementById(DB_RECENT_VISIT_OF_URL);
+      NS_ENSURE_STATE(stmt);
+
+      rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->lastSpec);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      nsCOMPtr<Step> step = new AddVisitStep(mData);
+      rv = step->ExecuteAsync(stmt);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+    else {
+      // Empty lastSpec.
+      // Not part of a session.  Just run next step's callback with no results.
+      nsCOMPtr<Step> step = new AddVisitStep(mData);
+      rv = step->Callback(NULL);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<VisitURIData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  CheckLastVisitStep
+, mozIStorageStatementCallback
+)
+
+/**
+ * Step 2a: Called only when a new entry is put into moz_places.
+ *          Finds the ID of a recently inserted place.
+ */
+class FindNewIdStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  FindNewIdStep(nsAutoPtr<VisitURIData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+    NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
+    nsCOMPtr<mozIStorageStatement> stmt =
+      history->GetStatementById(DB_GET_PAGE_VISIT_STATS);
+    NS_ENSURE_STATE(stmt);
+
+    nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<Step> step = new CheckLastVisitStep(mData);
+    rv = step->ExecuteAsync(stmt);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<VisitURIData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  FindNewIdStep
+, mozIStorageStatementCallback
+)
+
+/**
+ * Step 2: Callback for checking for an existing URI in moz_places.
+ *         This step inserts or updates the URI accordingly.
+ */
+class CheckExistingStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  CheckExistingStep(nsAutoPtr<VisitURIData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    nsresult rv;
+    nsCOMPtr<mozIStorageStatement> stmt;
+
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+    NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
+
+    if (aResultSet) {
+      nsCOMPtr<mozIStorageRow> row;
+      rv = aResultSet->GetNextRow(getter_AddRefs(row));
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      rv = row->GetInt64(0, &mData->placeId);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      if (!mData->typed) {
+        // If this transition wasn't typed, others might have been. If database
+        // has location as typed, reflect that in our data structure.
+        rv = row->GetInt32(2, &mData->typed);
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+      if (mData->hidden) {
+        // If this transition was hidden, it is possible that others were not.
+        // Any one visible transition makes this location visible. If database
+        // has location as visible, reflect that in our data structure.
+        rv = row->GetInt32(3, &mData->hidden);
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+
+      // Note: trigger will update visit_count.
+      stmt = history->GetStatementById(DB_UPDATE_PAGE_VISIT_STATS);
+      NS_ENSURE_STATE(stmt);
+
+      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("typed"), mData->typed);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("hidden"), mData->hidden);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("page_id"), mData->placeId);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      nsCOMPtr<Step> step = new CheckLastVisitStep(mData);
+      rv = step->ExecuteAsync(stmt);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+    else {
+      // No entry exists, so create one.
+      stmt = history->GetStatementById(DB_ADD_NEW_PAGE);
+      NS_ENSURE_STATE(stmt);
+
+      nsAutoString revHost;
+      rv = GetReversedHostname(mData->uri, revHost);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = stmt->BindStringByName(NS_LITERAL_CSTRING("rev_host"), revHost);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("typed"), mData->typed);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("hidden"), mData->hidden);
+      NS_ENSURE_SUCCESS(rv, rv);
+      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("frecency"), -1);
+      NS_ENSURE_SUCCESS(rv, rv);
+
+      nsCOMPtr<Step> step = new FindNewIdStep(mData);
+      rv = step->ExecuteAsync(stmt);
+      NS_ENSURE_SUCCESS(rv, rv);
+    }
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<VisitURIData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  CheckExistingStep
+, mozIStorageStatementCallback
+)
+
+/**
+ * Step 1: See if there is an existing URI.
+ */
+class StartVisitURIStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  StartVisitURIStep(nsAutoPtr<VisitURIData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+
+    // Find existing entry in moz_places table, if any.
+    nsCOMPtr<mozIStorageStatement> stmt =
+      history->GetStatementById(DB_GET_PAGE_VISIT_STATS);
+    NS_ENSURE_STATE(stmt);
+
+    nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<Step> step = new CheckExistingStep(mData);
+    rv = step->ExecuteAsync(stmt);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<VisitURIData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  StartVisitURIStep
+, Step
+)
+
 } // anonymous namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -160,6 +712,7 @@ History::History()
 History::~History()
 {
   gService = NULL;
+
 #ifdef DEBUG
   if (mObservers.IsInitialized()) {
     NS_ASSERTION(mObservers.Count() == 0,
@@ -168,6 +721,28 @@ History::~History()
 #endif
 }
 
+void
+History::AppendTask(Step* aTask)
+{
+  NS_PRECONDITION(aTask, "Got NULL task.");
+
+  NS_ADDREF(aTask);
+  mPendingVisits.Push(aTask);
+
+  if (mPendingVisits.GetSize() == 1) {
+    // There are no other pending tasks.
+    StartNextTask();
+  }
+}
+
+void
+History::CurrentTaskFinished()
+{
+  nsCOMPtr<Step> deadTaskWalking =
+    dont_AddRef(static_cast<Step*>(mPendingVisits.PopFront()));
+  StartNextTask();
+}
+
 void
 History::NotifyVisited(nsIURI* aURI)
 {
@@ -228,9 +803,107 @@ History::GetSingleton()
   return gService;
 }
 
+void
+History::StartNextTask()
+{
+  nsCOMPtr<Step> nextTask =
+    static_cast<Step*>(mPendingVisits.PeekFront());
+  if (!nextTask) {
+    // No more pending visits left to process.
+    return;
+  }
+  nsresult rv = nextTask->Callback(NULL);
+  NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Beginning a task failed.");
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //// IHistory
 
+NS_IMETHODIMP
+History::VisitURI(nsIURI* aURI,
+                  nsIURI* aLastVisitedURI,
+                  PRUint32 aFlags)
+{
+  NS_PRECONDITION(aURI, "URI should not be NULL.");
+
+  nsNavHistory* history = nsNavHistory::GetHistoryService();
+  NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
+
+  // Silently return if URI is something we shouldn't add to DB.
+  PRBool canAdd;
+  nsresult rv = history->CanAddURI(aURI, &canAdd);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!canAdd) {
+    return NS_OK;
+  }
+
+  // Populate data structure that will be used in our async SQL steps.
+  nsAutoPtr<VisitURIData> data(new VisitURIData());
+
+  nsCAutoString spec;
+  rv = aURI->GetSpec(spec);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (aLastVisitedURI) {
+    rv = aLastVisitedURI->GetSpec(data->lastSpec);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  if (spec.Equals(data->lastSpec)) {
+    // Do not save refresh-page visits.
+    return NS_OK;
+  }
+
+  // Assigns a type to the edge in the visit linked list. Each type will be
+  // considered differently when weighting the frecency of a location.
+  PRUint32 recentFlags = history->GetRecentFlags(aURI);
+  bool redirected = false;
+  if (aFlags & IHistory::REDIRECT_TEMPORARY) {
+    data->transitionType = nsINavHistoryService::TRANSITION_REDIRECT_TEMPORARY;
+    redirected = true;
+  }
+  else if (aFlags & IHistory::REDIRECT_PERMANENT) {
+    data->transitionType = nsINavHistoryService::TRANSITION_REDIRECT_PERMANENT;
+    redirected = true;
+  }
+  else if (recentFlags & nsNavHistory::RECENT_TYPED) {
+    data->transitionType = nsINavHistoryService::TRANSITION_TYPED;
+  }
+  else if (recentFlags & nsNavHistory::RECENT_BOOKMARKED) {
+    data->transitionType = nsINavHistoryService::TRANSITION_BOOKMARK;
+  }
+  else if (aFlags & IHistory::TOP_LEVEL) {
+    // User was redirected or link was clicked in the main window.
+    data->transitionType = nsINavHistoryService::TRANSITION_LINK;
+  }
+  else if (recentFlags & nsNavHistory::RECENT_ACTIVATED) {
+    // User activated a link in a frame.
+    data->transitionType = nsINavHistoryService::TRANSITION_FRAMED_LINK;
+  }
+  else {
+    // A frame redirected to a new site without user interaction.
+    data->transitionType = nsINavHistoryService::TRANSITION_EMBED;
+  }
+
+  data->typed = (data->transitionType == nsINavHistoryService::TRANSITION_TYPED) ? 1 : 0;
+  data->hidden = 
+    (data->transitionType == nsINavHistoryService::TRANSITION_FRAMED_LINK ||
+     data->transitionType == nsINavHistoryService::TRANSITION_EMBED ||
+     redirected) ? 1 : 0;
+  data->dateTime = PR_Now();
+  data->uri = aURI;
+
+  nsCOMPtr<Step> task(new StartVisitURIStep(data));
+  AppendTask(task);
+
+  nsCOMPtr<nsIObserverService> obsService =
+    mozilla::services::GetObserverService();
+  if (obsService) {
+    obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nsnull);
+  }
+
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 History::RegisterVisitedCallback(nsIURI* aURI,
                                  Link* aLink)
@@ -312,8 +985,8 @@ History::UnregisterVisitedCallback(nsIURI* aURI,
 //// nsISupports
 
 NS_IMPL_ISUPPORTS1(
-  History,
-  IHistory
+  History
+, IHistory
 )
 
 } // namespace places
diff --git a/toolkit/components/places/src/History.h b/toolkit/components/places/src/History.h
index 079d969d7f57..4432befba26d 100644
--- a/toolkit/components/places/src/History.h
+++ b/toolkit/components/places/src/History.h
@@ -46,6 +46,7 @@
 #include "nsString.h"
 #include "nsURIHashKey.h"
 #include "nsTArray.h"
+#include "nsDeque.h"
 
 namespace mozilla {
 namespace places {
@@ -69,6 +70,26 @@ public:
    */
   void NotifyVisited(nsIURI *aURI);
 
+  /**
+   * Append a task to the queue for SQL queries that need to happen
+   * atomically.
+   *
+   * @pre aTask is not null
+   *
+   * @param aTask
+   *        Task that needs to be completed atomically
+   */
+  void AppendTask(class Step* aTask);
+
+  /**
+   * Call when all steps of the current running task are finished.  Each task
+   * should be responsible for calling this when it is finished (even if there
+   * are errors).
+   *
+   * Do not call this twice for the same visit.
+   */
+  void CurrentTaskFinished();
+
   /**
    * Obtains a pointer to this service.
    */
@@ -83,6 +104,26 @@ public:
 private:
   ~History();
 
+  /**
+   * Since visits rapidly fire at once, it's very likely to have race
+   * conditions for SQL queries.  We often need to see if a row exists
+   * or peek at values, and by the time we have retrieved them they could
+   * be different.
+   *
+   * We guarantee an ordering of our SQL statements so that a set of
+   * callbacks for one visit are guaranteed to be atomic.  Each visit consists
+   * of a data structure that sits in this queue.
+   *
+   * The front of the queue always has the current visit we are processing.
+   */
+  nsDeque mPendingVisits;
+
+  /**
+   * Begins next task at the front of the queue.  The task remains in the queue
+   * until it is done and calls CurrentTaskFinished.
+   */
+  void StartNextTask();
+
   static History *gService;
 
   typedef nsTArray<mozilla::dom::Link *> ObserverArray;
diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index e3d4b9f0dd55..ae1b696ae614 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -88,11 +88,6 @@
 
 using namespace mozilla::places;
 
-// Microsecond timeout for "recent" events such as typed and bookmark following.
-// If you typed it more than this time ago, it's not recent.
-// This is 15 minutes           m    s/m  us/s
-#define RECENT_EVENT_THRESHOLD PRTime((PRInt64)15 * 60 * PR_USEC_PER_SEC)
-
 // The maximum number of things that we will store in the recent events list
 // before calling ExpireNonrecentEvents. This number should be big enough so it
 // is very difficult to get that many unconsumed events (for example, typed but
@@ -237,21 +232,12 @@ NS_IMPL_CI_INTERFACE_GETTER5(
 
 namespace {
 
-static nsresult GetReversedHostname(nsIURI* aURI, nsAString& host);
-static void GetReversedHostname(const nsString& aForward, nsAString& aReversed);
 static PRInt64 GetSimpleBookmarksQueryFolder(
     const nsCOMArray<nsNavHistoryQuery>& aQueries,
     nsNavHistoryQueryOptions* aOptions);
 static void ParseSearchTermsFromQueries(const nsCOMArray<nsNavHistoryQuery>& aQueries,
                                         nsTArray<nsTArray<nsString>*>* aTerms);
 
-inline void ReverseString(const nsString& aInput, nsAString& aReversed)
-{
-  aReversed.Truncate(0);
-  for (PRInt32 i = aInput.Length() - 1; i >= 0; i --)
-    aReversed.Append(aInput[i]);
-}
-
 } // anonymous namespace
 
 namespace mozilla {
@@ -909,6 +895,27 @@ nsNavHistory::UpdateSchemaVersion()
 }
 
 
+PRUint32
+nsNavHistory::GetRecentFlags(nsIURI *aURI)
+{
+  PRUint32 result = 0;
+  nsCAutoString spec;
+  nsresult rv = aURI->GetSpec(spec);
+  NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Unable to get aURI's spec");
+
+  if (NS_SUCCEEDED(rv)) {
+    if (CheckIsRecentEvent(&mRecentTyped, spec))
+      result |= RECENT_TYPED;
+    if (CheckIsRecentEvent(&mRecentLink, spec))
+      result |= RECENT_ACTIVATED;
+    if (CheckIsRecentEvent(&mRecentBookmark, spec))
+      result |= RECENT_BOOKMARKED;
+  }
+
+  return result;
+}
+
+
 /**
  * Called after InitDB, this creates our own functions
  */
@@ -1865,6 +1872,9 @@ nsNavHistory::GetUrlIdFor(nsIURI* aURI, PRInt64* aEntryID,
 //    THIS SHOULD BE THE ONLY PLACE NEW moz_places ROWS ARE
 //    CREATED. This allows us to maintain better consistency.
 //
+//    XXX this functionality is being moved to History.cpp, so
+//    in fact there *are* two places where new pages are added.
+//
 //    If non-null, the new page ID will be placed into aPageID.
 
 nsresult
@@ -2162,6 +2172,22 @@ nsNavHistory::GetNewSessionID()
 }
 
 
+void
+nsNavHistory::FireOnVisit(nsIURI* aURI,
+                          PRInt64 aVisitID,
+                          PRTime aTime,
+                          PRInt64 aSessionID,
+                          PRInt64 referringVisitID,
+                          PRInt32 aTransitionType)
+{
+  PRUint32 added = 0;
+  NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
+                   nsINavHistoryObserver,
+                   OnVisit(aURI, aVisitID, aTime, aSessionID,
+                           referringVisitID, aTransitionType, &added));
+}
+
+
 PRInt32
 nsNavHistory::GetDaysOfHistory() {
   PRInt32 daysOfHistory = 0;
@@ -2866,12 +2892,9 @@ nsNavHistory::AddVisit(nsIURI* aURI, PRTime aTime, nsIURI* aReferringURI,
   // Notify observers: The hidden detection code must match that in
   // GetQueryResults to maintain consistency.
   // FIXME bug 325241: make a way to observe hidden URLs
-  PRUint32 added = 0;
   if (!hidden) {
-    NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
-                     nsINavHistoryObserver,
-                     OnVisit(aURI, *aVisitID, aTime, aSessionID,
-                             referringVisitID, aTransitionType, &added));
+     FireOnVisit(aURI, *aVisitID, aTime, aSessionID, referringVisitID,
+                 aTransitionType);
   }
 
   // Normally docshell sends the link visited observer notification for us (this
@@ -7547,52 +7570,6 @@ nsNavHistory::RemoveDuplicateURIs()
 
 namespace {
 
-// GetReversedHostname
-//
-//    This extracts the hostname from the URI and reverses it in the
-//    form that we use (always ending with a "."). So
-//    "http://microsoft.com/" becomes "moc.tfosorcim."
-//
-//    The idea behind this is that we can create an index over the items in
-//    the reversed host name column, and then query for as much or as little
-//    of the host name as we feel like.
-//
-//    For example, the query "host >= 'gro.allizom.' AND host < 'gro.allizom/'
-//    Matches all host names ending in '.mozilla.org', including
-//    'developer.mozilla.org' and just 'mozilla.org' (since we define all
-//    reversed host names to end in a period, even 'mozilla.org' matches).
-//    The important thing is that this operation uses the index. Any substring
-//    calls in a select statement (even if it's for the beginning of a string)
-//    will bypass any indices and will be slow).
-
-nsresult
-GetReversedHostname(nsIURI* aURI, nsAString& aRevHost)
-{
-  nsCString forward8;
-  nsresult rv = aURI->GetHost(forward8);
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  // can't do reversing in UTF8, better use 16-bit chars
-  NS_ConvertUTF8toUTF16 forward(forward8);
-  GetReversedHostname(forward, aRevHost);
-  return NS_OK;
-}
-
-
-// GetReversedHostname
-//
-//    Same as previous but for strings
-
-void
-GetReversedHostname(const nsString& aForward, nsAString& aRevHost)
-{
-  ReverseString(aForward, aRevHost);
-  aRevHost.Append(PRUnichar('.'));
-}
-
-
 // GetSimpleBookmarksQueryFolder
 //
 //    Determines if this set of queries is a simple bookmarks query for a
diff --git a/toolkit/components/places/src/nsNavHistory.h b/toolkit/components/places/src/nsNavHistory.h
index fdc110281701..5b126c6d6881 100644
--- a/toolkit/components/places/src/nsNavHistory.h
+++ b/toolkit/components/places/src/nsNavHistory.h
@@ -88,6 +88,10 @@
 #define URI_LENGTH_MAX 65536
 #define TITLE_LENGTH_MAX 4096
 
+// Microsecond timeout for "recent" events such as typed and bookmark following.
+// If you typed it more than this time ago, it's not recent.
+#define RECENT_EVENT_THRESHOLD PRTime((PRInt64)15 * 60 * PR_USEC_PER_SEC)
+
 #ifdef MOZ_XUL
 // Fired after autocomplete feedback has been updated.
 #define TOPIC_AUTOCOMPLETE_FEEDBACK_UPDATED "places-autocomplete-feedback-updated"
@@ -112,6 +116,11 @@ namespace places {
     DB_GET_PAGE_INFO_BY_URL = 0
   , DB_GET_TAGS = 1
   , DB_IS_PAGE_VISITED = 2
+  , DB_INSERT_VISIT = 3
+  , DB_RECENT_VISIT_OF_URL = 4
+  , DB_GET_PAGE_VISIT_STATS = 5
+  , DB_UPDATE_PAGE_VISIT_STATS = 6
+  , DB_ADD_NEW_PAGE = 7
   };
 
 } // namespace places
@@ -394,6 +403,19 @@ public:
    */
   bool canNotify() { return mCanNotify; }
 
+  enum RecentEventFlags {
+    RECENT_TYPED      = 1 << 0,    // User typed in URL recently
+    RECENT_ACTIVATED  = 1 << 1,    // User tapped URL link recently
+    RECENT_BOOKMARKED = 1 << 2     // User bookmarked URL recently
+  };
+
+  /**
+   * Returns any recent activity done with a URL.
+   * @return Any recent events associated with this URI.  Each bit is set
+   *         according to RecentEventFlags enum values.
+   */
+  PRUint32 GetRecentFlags(nsIURI *aURI);
+
   mozIStorageStatement* GetStatementById(
     enum mozilla::places::HistoryStatementId aStatementId
   )
@@ -406,10 +428,32 @@ public:
         return mDBGetTags;
       case DB_IS_PAGE_VISITED:
         return mDBIsPageVisited;
+      case DB_INSERT_VISIT:
+        return mDBInsertVisit;
+      case DB_RECENT_VISIT_OF_URL:
+        return mDBRecentVisitOfURL;
+      case DB_GET_PAGE_VISIT_STATS:
+        return mDBGetPageVisitStats;
+      case DB_UPDATE_PAGE_VISIT_STATS:
+        return mDBUpdatePageVisitStats;
+      case DB_ADD_NEW_PAGE:
+        return mDBAddNewPage;
     }
     return nsnull;
   }
 
+  PRInt64 GetNewSessionID();
+
+  /**
+   * Fires onVisit event to nsINavHistoryService observers
+   */
+  void FireOnVisit(nsIURI* aURI,
+                   PRInt64 aVisitID,
+                   PRTime aTime,
+                   PRInt64 aSessionID,
+                   PRInt64 referringVisitID,
+                   PRInt32 aTransitionType);
+
 private:
   ~nsNavHistory();
 
@@ -687,7 +731,6 @@ protected:
 
   // Sessions tracking.
   PRInt64 mLastSessionID;
-  PRInt64 GetNewSessionID();
 
 #ifdef MOZ_XUL
   // AutoComplete stuff
diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in
index b54fb248cfda..a155bd2b12d2 100644
--- a/toolkit/components/places/tests/browser/Makefile.in
+++ b/toolkit/components/places/tests/browser/Makefile.in
@@ -47,6 +47,7 @@ include $(topsrcdir)/config/rules.mk
 
 _BROWSER_FILES = \
 	browser_bug399606.js \
+	browser_visituri.js \
 	$(NULL)
 
 # These are files that need to be loaded via the HTTP proxy server
@@ -58,6 +59,10 @@ _HTTP_FILES = \
 	bug_399606/399606-window.location.href.html \
 	bug_399606/399606-window.location.html \
 	bug_399606/399606-history.go-0.html \
+	visituri/begin.html \
+	visituri/redirect_twice.sjs \
+	visituri/redirect_once.sjs \
+	visituri/final.html \
 	$(NULL)
 
 libs:: $(_BROWSER_FILES)
diff --git a/toolkit/components/places/tests/browser/browser_visituri.js b/toolkit/components/places/tests/browser/browser_visituri.js
new file mode 100644
index 000000000000..d9dee29d5fad
--- /dev/null
+++ b/toolkit/components/places/tests/browser/browser_visituri.js
@@ -0,0 +1,112 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+/**
+ * One-time observer callback.
+ */
+function waitForObserve(name, callback)
+{
+  var observerService = Cc["@mozilla.org/observer-service;1"]
+                        .getService(Ci.nsIObserverService);
+  var observer = {
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
+    observe: function(subject, topic, data) {
+      observerService.removeObserver(observer, name);
+      observer = null;
+      callback(subject, topic, data);
+    }
+  };
+
+  observerService.addObserver(observer, name, false);
+}
+
+/**
+ * One-time DOMContentLoaded callback.
+ */
+function waitForLoad(callback)
+{
+  gBrowser.addEventListener("DOMContentLoaded", function() {
+    gBrowser.removeEventListener("DOMContentLoaded", arguments.callee, true);
+    callback();
+  }, true);
+}
+
+var conn = PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
+
+/**
+ * Gets a single column value from either the places or historyvisits table.
+ */
+function getColumn(table, column, fromColumnName, fromColumnValue)
+{
+  var stmt = conn.createStatement(
+    "SELECT " + column + " FROM " + table + "_temp WHERE " + fromColumnName + "=:val " +
+    "UNION ALL " +
+    "SELECT " + column + " FROM " + table + " WHERE " + fromColumnName + "=:val " +
+    "LIMIT 1");
+  try {
+    stmt.params.val = fromColumnValue;
+    stmt.executeStep();
+    return stmt.row[column];
+  }
+  finally {
+    stmt.reset();
+  }
+}
+
+function test()
+{
+  // Make sure places visit chains are saved correctly with a redirect
+  // transitions.
+
+  waitForExplicitFinish();
+
+  // Part 1: observe history events that fire when a visit occurs.
+  // Make sure visits appear in order, and that the visit chain is correct.
+  var expectedUrls = [
+    "http://example.com/tests/toolkit/components/places/tests/browser/begin.html",
+    "http://example.com/tests/toolkit/components/places/tests/browser/redirect_twice.sjs",
+    "http://example.com/tests/toolkit/components/places/tests/browser/redirect_once.sjs",
+    "http://example.com/tests/toolkit/components/places/tests/browser/final.html"
+  ];
+  var currentIndex = 0;
+
+  waitForObserve("uri-visit-saved", function(subject, topic, data) {
+    var uri = subject.QueryInterface(Ci.nsIURI);
+    var expected = expectedUrls[currentIndex];
+    is(uri.spec, expected, "Saved URL visit " + uri.spec);
+
+    var placeId = getColumn("moz_places", "id", "url", uri.spec);
+    var fromVisitId = getColumn("moz_historyvisits", "from_visit", "place_id", placeId);
+
+    if (currentIndex == 0) {
+      is(fromVisitId, 0, "First visit has no from visit");
+    }
+    else {
+      var lastVisitId = getColumn("moz_historyvisits", "place_id", "id", fromVisitId);
+      var fromVisitUrl = getColumn("moz_places", "url", "id", lastVisitId);
+      is(fromVisitUrl, expectedUrls[currentIndex - 1],
+         "From visit was " + expectedUrls[currentIndex - 1]);
+    }
+
+    currentIndex++;
+    if (currentIndex < expectedUrls.length) {
+      waitForObserve("uri-visit-saved", arguments.callee);
+    }
+    else {
+      finish();
+    }
+  });
+
+  // Load begin page, click link on page to record visits.
+  content.location.href = "http://example.com/tests/toolkit/components/places/tests/browser/begin.html";
+  waitForLoad(function() {
+    EventUtils.sendMouseEvent({type: 'click'}, 'clickme', content.window);
+    waitForLoad(function() {
+      content.location.href = "about:blank";
+    });
+  });
+}
diff --git a/toolkit/components/places/tests/browser/visituri/begin.html b/toolkit/components/places/tests/browser/visituri/begin.html
new file mode 100644
index 000000000000..da4c16dd250f
--- /dev/null
+++ b/toolkit/components/places/tests/browser/visituri/begin.html
@@ -0,0 +1,10 @@
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+
+<html>
+  <body>
+    <a id="clickme" href="redirect_twice.sjs">Redirect twice</a>
+  </body>
+</html>
diff --git a/toolkit/components/places/tests/browser/visituri/final.html b/toolkit/components/places/tests/browser/visituri/final.html
new file mode 100644
index 000000000000..ccd58191811d
--- /dev/null
+++ b/toolkit/components/places/tests/browser/visituri/final.html
@@ -0,0 +1,10 @@
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+
+<html>
+  <body>
+    OK we're done!
+  </body>
+</html>
diff --git a/toolkit/components/places/tests/browser/visituri/redirect_once.sjs b/toolkit/components/places/tests/browser/visituri/redirect_once.sjs
new file mode 100644
index 000000000000..5a44f4bc0f6e
--- /dev/null
+++ b/toolkit/components/places/tests/browser/visituri/redirect_once.sjs
@@ -0,0 +1,9 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+function handleRequest(request, response) {
+  response.setStatusLine("1.1", 302, "Found");
+  response.setHeader("Location", "final.html", false);
+}
diff --git a/toolkit/components/places/tests/browser/visituri/redirect_twice.sjs b/toolkit/components/places/tests/browser/visituri/redirect_twice.sjs
new file mode 100644
index 000000000000..099d20022ecd
--- /dev/null
+++ b/toolkit/components/places/tests/browser/visituri/redirect_twice.sjs
@@ -0,0 +1,9 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+function handleRequest(request, response) {
+  response.setStatusLine("1.1", 302, "Found");
+  response.setHeader("Location", "redirect_once.sjs", false);
+}
diff --git a/toolkit/components/places/tests/cpp/places_test_harness.h b/toolkit/components/places/tests/cpp/places_test_harness.h
index cb61aff8ceac..389cda76105b 100644
--- a/toolkit/components/places/tests/cpp/places_test_harness.h
+++ b/toolkit/components/places/tests/cpp/places_test_harness.h
@@ -47,6 +47,9 @@
 #include "nsINavHistoryService.h"
 #include "nsIObserverService.h"
 #include "mozilla/IHistory.h"
+#include "mozIStorageConnection.h"
+#include "mozIStorageStatement.h"
+#include "nsPIPlacesDatabase.h"
 
 using namespace mozilla;
 
@@ -117,6 +120,21 @@ addURI(nsIURI* aURI)
   do_check_success(rv);
 }
 
+struct PlaceRecord
+{
+  PRInt64 id;
+  PRInt32 hidden;
+  PRInt32 typed;
+  PRInt32 visitCount;
+};
+
+struct VisitRecord
+{
+  PRInt64 id;
+  PRInt64 lastVisitId;
+  PRInt32 transitionType;
+};
+
 already_AddRefed<IHistory>
 do_get_IHistory()
 {
@@ -124,3 +142,107 @@ do_get_IHistory()
   do_check_true(history);
   return history.forget();
 }
+
+already_AddRefed<nsINavHistoryService>
+do_get_NavHistory()
+{
+  nsCOMPtr<nsINavHistoryService> serv =
+    do_GetService(NS_NAVHISTORYSERVICE_CONTRACTID);
+  do_check_true(serv);
+  return serv.forget();
+}
+
+already_AddRefed<mozIStorageConnection>
+do_get_db()
+{
+  nsCOMPtr<nsINavHistoryService> history = do_get_NavHistory();
+  nsCOMPtr<nsPIPlacesDatabase> database = do_QueryInterface(history);
+  do_check_true(database);
+
+  mozIStorageConnection* dbConn;
+  nsresult rv = database->GetDBConnection(&dbConn);
+  do_check_success(rv);
+  return dbConn;
+}
+
+/**
+ * Get the place record from the database.
+ *
+ * @param aURI The unique URI of the place we are looking up
+ * @param result Out parameter where the result is stored
+ */
+void
+do_get_place(nsIURI* aURI, PlaceRecord& result)
+{
+  nsCOMPtr<mozIStorageConnection> dbConn = do_get_db();
+  nsCOMPtr<mozIStorageStatement> stmt;
+
+  nsCString spec;
+  nsresult rv = aURI->GetSpec(spec);
+  do_check_success(rv);
+
+  rv = dbConn->CreateStatement(NS_LITERAL_CSTRING(
+    "SELECT id, hidden, typed, visit_count FROM moz_places_temp "
+    "WHERE url=?1 "
+    "UNION ALL "
+    "SELECT id, hidden, typed, visit_count FROM moz_places "
+    "WHERE url=?1 "
+    "LIMIT 1"
+  ), getter_AddRefs(stmt));
+  do_check_success(rv);
+
+  rv = stmt->BindUTF8StringParameter(0, spec);
+  do_check_success(rv);
+
+  PRBool hasResults;
+  rv = stmt->ExecuteStep(&hasResults);
+  do_check_true(hasResults);
+  do_check_success(rv);
+
+  rv = stmt->GetInt64(0, &result.id);
+  do_check_success(rv);
+  rv = stmt->GetInt32(1, &result.hidden);
+  do_check_success(rv);
+  rv = stmt->GetInt32(2, &result.typed);
+  do_check_success(rv);
+  rv = stmt->GetInt32(3, &result.visitCount);
+  do_check_success(rv);
+}
+
+/**
+ * Gets the most recent visit to a place.
+ *
+ * @param placeID ID from the moz_places table
+ * @param result Out parameter where visit is stored
+ */
+void
+do_get_lastVisit(PRInt64 placeId, VisitRecord& result)
+{
+  nsCOMPtr<mozIStorageConnection> dbConn = do_get_db();
+  nsCOMPtr<mozIStorageStatement> stmt;
+
+  nsresult rv = dbConn->CreateStatement(NS_LITERAL_CSTRING(
+    "SELECT id, from_visit, visit_type FROM moz_historyvisits_temp "
+    "WHERE place_id=?1 "
+    "UNION ALL "
+    "SELECT id, from_visit, visit_type FROM moz_historyvisits "
+    "WHERE place_id=?1 "
+    "LIMIT 1"
+  ), getter_AddRefs(stmt));
+  do_check_success(rv);
+
+  rv = stmt->BindInt64Parameter(0, placeId);
+  do_check_success(rv);
+
+  PRBool hasResults;
+  rv = stmt->ExecuteStep(&hasResults);
+  do_check_true(hasResults);
+  do_check_success(rv);
+
+  rv = stmt->GetInt64(0, &result.id);
+  do_check_success(rv);
+  rv = stmt->GetInt64(1, &result.lastVisitId);
+  do_check_success(rv);
+  rv = stmt->GetInt32(2, &result.transitionType);
+  do_check_success(rv);
+}
diff --git a/toolkit/components/places/tests/cpp/test_IHistory.cpp b/toolkit/components/places/tests/cpp/test_IHistory.cpp
index 3f1c6fd2e0f0..a8b506b14f1d 100644
--- a/toolkit/components/places/tests/cpp/test_IHistory.cpp
+++ b/toolkit/components/places/tests/cpp/test_IHistory.cpp
@@ -38,6 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "places_test_harness.h"
+#include "nsIBrowserHistory.h"
 
 #include "mock_Link.h"
 using namespace mozilla::dom;
@@ -76,6 +77,53 @@ new_test_uri()
   return testURI.forget();
 }
 
+class VisitURIObserver : public nsIObserver
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  VisitURIObserver(int aExpectedVisits = 1) :
+    mVisits(0),
+    mExpectedVisits(aExpectedVisits)
+  {
+    nsCOMPtr<nsIObserverService> observerService =
+      do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
+    do_check_true(observerService);
+    (void)observerService->AddObserver(this,
+                                       "uri-visit-saved",
+                                       PR_FALSE);
+  }
+
+  void WaitForNotification()
+  {
+    while (mVisits < mExpectedVisits) {
+      (void)NS_ProcessNextEvent();
+    }
+  }
+
+  NS_IMETHOD Observe(nsISupports* aSubject,
+                     const char* aTopic,
+                     const PRUnichar* aData)
+  {
+    mVisits++;
+
+    if (mVisits == mExpectedVisits) {
+      nsCOMPtr<nsIObserverService> observerService =
+        do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
+      (void)observerService->RemoveObserver(this, "uri-visit-saved");
+    }
+
+    return NS_OK;
+  }
+private:
+  int mVisits;
+  int mExpectedVisits;
+};
+NS_IMPL_ISUPPORTS1(
+  VisitURIObserver,
+  nsIObserver
+)
+
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Functions
 
@@ -363,6 +411,145 @@ test_observer_topic_dispatched()
   run_next_test();
 }
 
+void
+test_visituri_inserts()
+{
+  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<nsIURI> lastURI(new_test_uri());
+  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+
+  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
+
+  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  finisher->WaitForNotification();
+
+  PlaceRecord place;
+  do_get_place(visitedURI, place);
+
+  do_check_true(place.id > 0);
+  do_check_false(place.hidden);
+  do_check_false(place.typed);
+  do_check_true(place.visitCount == 1);
+
+  run_next_test();
+}
+
+void
+test_visituri_updates()
+{
+  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<nsIURI> lastURI(new_test_uri());
+  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+  nsCOMPtr<VisitURIObserver> finisher;
+
+  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
+  finisher = new VisitURIObserver();
+  finisher->WaitForNotification();
+
+  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
+  finisher = new VisitURIObserver();
+  finisher->WaitForNotification();
+
+  PlaceRecord place;
+  do_get_place(visitedURI, place);
+
+  do_check_true(place.visitCount == 2);
+
+  run_next_test();
+}
+
+void
+test_visituri_preserves_shown_and_typed()
+{
+  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<nsIURI> lastURI(new_test_uri());
+  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+
+  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
+  // this simulates the uri visit happening in a frame.  Normally frame
+  // transitions would be hidden unless it was previously loaded top-level
+  history->VisitURI(visitedURI, lastURI, 0);
+
+  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver(2);
+  finisher->WaitForNotification();
+
+  PlaceRecord place;
+  do_get_place(visitedURI, place);
+  do_check_false(place.hidden);
+
+  run_next_test();
+}
+
+void
+test_visituri_creates_visit()
+{
+  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<nsIURI> lastURI(new_test_uri());
+  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+
+  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
+  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  finisher->WaitForNotification();
+
+  PlaceRecord place;
+  VisitRecord visit;
+  do_get_place(visitedURI, place);
+  do_get_lastVisit(place.id, visit);
+
+  do_check_true(visit.id > 0);
+  do_check_true(visit.lastVisitId == 0);
+  do_check_true(visit.transitionType == nsINavHistoryService::TRANSITION_LINK);
+
+  run_next_test();
+}
+
+void
+test_visituri_transition_typed()
+{
+  nsCOMPtr<nsINavHistoryService> navHistory = do_get_NavHistory();
+  nsCOMPtr<nsIBrowserHistory> browserHistory = do_QueryInterface(navHistory);
+  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<nsIURI> lastURI(new_test_uri());
+  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+
+  browserHistory->MarkPageAsTyped(visitedURI);
+  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
+  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  finisher->WaitForNotification();
+
+  PlaceRecord place;
+  VisitRecord visit;
+  do_get_place(visitedURI, place);
+  do_get_lastVisit(place.id, visit);
+
+  do_check_true(visit.transitionType == nsINavHistoryService::TRANSITION_TYPED);
+
+  run_next_test();
+}
+
+void
+test_visituri_transition_embed()
+{
+  nsCOMPtr<nsINavHistoryService> navHistory = do_get_NavHistory();
+  nsCOMPtr<nsIBrowserHistory> browserHistory = do_QueryInterface(navHistory);
+  nsCOMPtr<IHistory> history(do_get_IHistory());
+  nsCOMPtr<nsIURI> lastURI(new_test_uri());
+  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
+
+  history->VisitURI(visitedURI, lastURI, 0);
+  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
+  finisher->WaitForNotification();
+
+  PlaceRecord place;
+  VisitRecord visit;
+  do_get_place(visitedURI, place);
+  do_get_lastVisit(place.id, visit);
+
+  do_check_true(visit.transitionType == nsINavHistoryService::TRANSITION_EMBED);
+
+  run_next_test();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Harness
 
@@ -378,6 +565,12 @@ Test gTests[] = {
   TEST(test_new_visit_notifies_waiting_Link),
   TEST(test_RegisterVisitedCallback_returns_before_notifying),
   TEST(test_observer_topic_dispatched),
+  TEST(test_visituri_inserts),
+  TEST(test_visituri_updates),
+  TEST(test_visituri_preserves_shown_and_typed),
+  TEST(test_visituri_creates_visit),
+  TEST(test_visituri_transition_typed),
+  TEST(test_visituri_transition_embed),
 };
 
 const char* file = __FILE__;
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index 8682e86b942e..ddd0d3c22adb 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -113,6 +113,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../threads/_xpidlgen \
 		-I$(srcdir)/../proxy/src \
 		-I$(srcdir)/../reflect/xptinfo/src \
+		-I$(srcdir)/../../docshell/base \
 		$(NULL)
 
 EXPORTS_NAMESPACES = mozilla
diff --git a/xpcom/build/ServiceList.h b/xpcom/build/ServiceList.h
index 9f6fc7906713..231470698ba0 100644
--- a/xpcom/build/ServiceList.h
+++ b/xpcom/build/ServiceList.h
@@ -5,3 +5,14 @@ MOZ_SERVICE(XULOverlayProviderService, nsIXULOverlayProvider, "@mozilla.org/chro
 MOZ_SERVICE(IOService, nsIIOService, "@mozilla.org/network/io-service;1")
 MOZ_SERVICE(ObserverService, nsIObserverService, "@mozilla.org/observer-service;1")
 MOZ_SERVICE(StringBundleService, nsIStringBundleService, "@mozilla.org/intl/stringbundle;1")
+
+#ifdef MOZ_USE_NAMESPACE
+namespace mozilla
+{
+#endif
+
+MOZ_SERVICE(HistoryService, IHistory, "@mozilla.org/browser/history;1")
+
+#ifdef MOZ_USE_NAMESPACE
+}
+#endif
diff --git a/xpcom/build/Services.cpp b/xpcom/build/Services.cpp
index 2dd1b0f87e4e..8f7477a1c61b 100644
--- a/xpcom/build/Services.cpp
+++ b/xpcom/build/Services.cpp
@@ -48,7 +48,9 @@
 #include "nsIStringBundle.h"
 #include "nsIToolkitChromeRegistry.h"
 #include "nsIXULOverlayProvider.h"
+#include "IHistory.h"
 
+using namespace mozilla;
 using namespace mozilla::services;
 
 /*
diff --git a/xpcom/build/Services.h b/xpcom/build/Services.h
index e4d1f70b1f22..43e0c97fdd15 100644
--- a/xpcom/build/Services.h
+++ b/xpcom/build/Services.h
@@ -42,9 +42,12 @@
 #include "nscore.h"
 #include "nsCOMPtr.h"
 
+#define MOZ_USE_NAMESPACE
 #define MOZ_SERVICE(NAME, TYPE, SERVICE_CID) class TYPE;
+
 #include "ServiceList.h"
 #undef MOZ_SERVICE
+#undef MOZ_USE_NAMESPACE
 
 namespace mozilla {
 namespace services {

From 0203e71bdfc2fc899dd3f1c342d9242b4769c143 Mon Sep 17 00:00:00 2001
From: Benjamin Stover <webapps@stechz.com>
Date: Fri, 25 Jun 2010 22:53:41 -0700
Subject: [PATCH 060/172] Bug 566738 - Add SetURITitle to IHistory. r=sdwilsh
 sr=bz

---
 docshell/base/IHistory.h                      |  16 +-
 docshell/base/nsDocShell.cpp                  |  11 +-
 toolkit/components/places/src/History.cpp     | 179 +++++++++++++++++-
 toolkit/components/places/src/History.h       |   2 +-
 .../components/places/src/nsNavHistory.cpp    |  20 +-
 toolkit/components/places/src/nsNavHistory.h  |  13 +-
 .../places/tests/browser/Makefile.in          |   3 +
 .../places/tests/browser/browser_settitle.js  | 122 ++++++++++++
 .../places/tests/browser/settitle/title1.html |  12 ++
 .../places/tests/browser/settitle/title2.html |  14 ++
 10 files changed, 378 insertions(+), 14 deletions(-)
 create mode 100644 toolkit/components/places/tests/browser/browser_settitle.js
 create mode 100644 toolkit/components/places/tests/browser/settitle/title1.html
 create mode 100644 toolkit/components/places/tests/browser/settitle/title2.html

diff --git a/docshell/base/IHistory.h b/docshell/base/IHistory.h
index a5f9d9b39beb..6d65e9bb4ba4 100644
--- a/docshell/base/IHistory.h
+++ b/docshell/base/IHistory.h
@@ -43,6 +43,7 @@
 #include "nsISupports.h"
 
 class nsIURI;
+class nsString;
 
 namespace mozilla {
 
@@ -128,6 +129,18 @@ public:
         nsIURI *aLastVisitedURI,
         PRUint32 aFlags
     ) = 0;
+
+    /**
+     * Set the title of the URI.
+     *
+     * @pre aURI must not be null.
+     *
+     * @param aURI
+     *        The URI to set the title for.
+     * @param aTitle
+     *        The title string.
+     */
+    NS_IMETHOD SetURITitle(nsIURI* aURI, const nsString& aTitle) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
@@ -139,7 +152,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
                                          mozilla::dom::Link *aContent); \
     NS_IMETHOD VisitURI(nsIURI *aURI, \
                         nsIURI *aLastVisitedURI, \
-                        PRUint32 aFlags);
+                        PRUint32 aFlags); \
+    NS_IMETHOD SetURITitle(nsIURI* aURI, const nsString& aTitle);
 
 } // namespace mozilla
 
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index cc9c2251d0de..9e3c282fe3fe 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -4694,11 +4694,16 @@ nsDocShell::SetTitle(const PRUnichar * aTitle)
             treeOwnerAsWin->SetTitle(aTitle);
     }
 
-    if (mGlobalHistory && mCurrentURI && mLoadType != LOAD_ERROR_PAGE) {
-        mGlobalHistory->SetPageTitle(mCurrentURI, nsString(mTitle));
+    if (mCurrentURI && mLoadType != LOAD_ERROR_PAGE) {
+        nsCOMPtr<IHistory> history = services::GetHistoryService();
+        if (history) {
+            history->SetURITitle(mCurrentURI, nsString(mTitle));
+        }
+        else if (mGlobalHistory) {
+            mGlobalHistory->SetPageTitle(mCurrentURI, nsString(mTitle));
+        }
     }
 
-
     // Update SessionHistory with the document's title.
     if (mOSHE && mLoadType != LOAD_BYPASS_HISTORY &&
         mLoadType != LOAD_ERROR_PAGE) {
diff --git a/toolkit/components/places/src/History.cpp b/toolkit/components/places/src/History.cpp
index d156ce15294c..0d7f00adc2d3 100644
--- a/toolkit/components/places/src/History.cpp
+++ b/toolkit/components/places/src/History.cpp
@@ -305,7 +305,7 @@ public:
       if (!mData->hidden &&
           mData->transitionType != nsINavHistoryService::TRANSITION_EMBED &&
           mData->transitionType != nsINavHistoryService::TRANSITION_FRAMED_LINK) {
-        history->FireOnVisit(mData->uri, visitId, mData->dateTime,
+        history->NotifyOnVisit(mData->uri, visitId, mData->dateTime,
                              mData->sessionId, mData->lastVisitId,
                              mData->transitionType);
       }
@@ -696,6 +696,153 @@ NS_IMPL_ISUPPORTS1(
 , Step
 )
 
+////////////////////////////////////////////////////////////////////////////////
+//// Steps for SetURITitle
+
+struct SetTitleData : public FailSafeFinishTask
+{
+  nsCOMPtr<nsIURI> uri;
+  nsString title;
+};
+
+/**
+ * Step 3: Notify that title has been updated.
+ */
+class TitleNotifyStep: public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  TitleNotifyStep(nsAutoPtr<SetTitleData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+    history->NotifyTitleChange(mData->uri, mData->title);
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<SetTitleData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  TitleNotifyStep
+, mozIStorageStatementCallback
+)
+
+/**
+ * Step 2: Set title.
+ */
+class SetTitleStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  SetTitleStep(nsAutoPtr<SetTitleData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    if (!aResultSet)
+      // URI record was not found.
+      return NS_OK;
+
+    nsCOMPtr<mozIStorageRow> row;
+    nsresult rv = aResultSet->GetNextRow(getter_AddRefs(row));
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsAutoString title;
+    rv = row->GetString(2, title);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    // It is actually common to set the title to be the same thing it used to
+    // be. For example, going to any web page will always cause a title to be set,
+    // even though it will often be unchanged since the last visit. In these
+    // cases, we can avoid DB writing and observer overhead.
+    if (mData->title.Equals(title) || (mData->title.IsVoid() && title.IsVoid()))
+      return NS_OK;
+
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+
+    nsCOMPtr<mozIStorageStatement> stmt =
+      history->GetStatementById(DB_SET_PLACE_TITLE);
+    NS_ENSURE_STATE(stmt);
+
+    if (mData->title.IsVoid()) {
+      rv = stmt->BindNullByName(NS_LITERAL_CSTRING("page_title"));
+    }
+    else {
+      rv = stmt->BindStringByName(
+        NS_LITERAL_CSTRING("page_title"),
+        StringHead(mData->title, TITLE_LENGTH_MAX)
+      );
+    }
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<Step> step = new TitleNotifyStep(mData);
+    rv = step->ExecuteAsync(stmt);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<SetTitleData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  SetTitleStep
+, mozIStorageStatementCallback
+)
+
+/**
+ * Step 1: See if there is an existing URI.
+ */
+class StartSetURITitleStep : public Step
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  StartSetURITitleStep(nsAutoPtr<SetTitleData> aData)
+  : mData(aData)
+  {
+  }
+
+  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
+  {
+    nsNavHistory* history = nsNavHistory::GetHistoryService();
+
+    // Find existing entry in moz_places table, if any.
+    nsCOMPtr<mozIStorageStatement> stmt =
+      history->GetStatementById(DB_GET_URL_PAGE_INFO);
+    NS_ENSURE_STATE(stmt);
+
+    nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    nsCOMPtr<Step> step = new SetTitleStep(mData);
+    rv = step->ExecuteAsync(stmt);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    return NS_OK;
+  }
+
+protected:
+  nsAutoPtr<SetTitleData> mData;
+};
+NS_IMPL_ISUPPORTS1(
+  StartSetURITitleStep
+, Step
+)
+
 } // anonymous namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -981,6 +1128,36 @@ History::UnregisterVisitedCallback(nsIURI* aURI,
   return NS_OK;
 }
 
+NS_IMETHODIMP
+History::SetURITitle(nsIURI* aURI, const nsString& aTitle)
+{
+  NS_PRECONDITION(aURI, "Must pass a non-null URI!");
+
+  nsNavHistory* history = nsNavHistory::GetHistoryService();
+  PRBool canAdd;
+  nsresult rv = history->CanAddURI(aURI, &canAdd);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!canAdd) {
+    return NS_OK;
+  }
+
+  nsAutoPtr<SetTitleData> data(new SetTitleData());
+  data->uri = aURI;
+
+  if (aTitle.IsEmpty()) {
+    data->title.SetIsVoid(PR_TRUE);
+  }
+  else {
+    data->title.Assign(aTitle);
+  }
+
+  nsCOMPtr<Step> task(new StartSetURITitleStep(data));
+  AppendTask(task);
+
+  return NS_OK;
+}
+ 
+ 
 ////////////////////////////////////////////////////////////////////////////////
 //// nsISupports
 
diff --git a/toolkit/components/places/src/History.h b/toolkit/components/places/src/History.h
index 4432befba26d..f927e4dc2a18 100644
--- a/toolkit/components/places/src/History.h
+++ b/toolkit/components/places/src/History.h
@@ -52,7 +52,7 @@ namespace mozilla {
 namespace places {
 
 #define NS_HISTORYSERVICE_CID \
-  {0x9fc91e65, 0x1475, 0x4353, {0x9b, 0x9a, 0x93, 0xd7, 0x6f, 0x5b, 0xd9, 0xb7}}
+  {0x0937a705, 0x91a6, 0x417a, {0x82, 0x92, 0xb2, 0x2e, 0xb1, 0x0d, 0xa8, 0x6c}}
 
 class History : public IHistory
 {
diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index ae1b696ae614..b68cbf5ff86e 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -2173,12 +2173,12 @@ nsNavHistory::GetNewSessionID()
 
 
 void
-nsNavHistory::FireOnVisit(nsIURI* aURI,
-                          PRInt64 aVisitID,
-                          PRTime aTime,
-                          PRInt64 aSessionID,
-                          PRInt64 referringVisitID,
-                          PRInt32 aTransitionType)
+nsNavHistory::NotifyOnVisit(nsIURI* aURI,
+                            PRInt64 aVisitID,
+                            PRTime aTime,
+                            PRInt64 aSessionID,
+                            PRInt64 referringVisitID,
+                            PRInt32 aTransitionType)
 {
   PRUint32 added = 0;
   NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
@@ -2187,6 +2187,13 @@ nsNavHistory::FireOnVisit(nsIURI* aURI,
                            referringVisitID, aTransitionType, &added));
 }
 
+void
+nsNavHistory::NotifyTitleChange(nsIURI* aURI, const nsString& aTitle)
+{
+  NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
+                   nsINavHistoryObserver, OnTitleChanged(aURI, aTitle));
+}
+
 
 PRInt32
 nsNavHistory::GetDaysOfHistory() {
@@ -7358,7 +7365,6 @@ nsNavHistory::SetPageTitleInternal(nsIURI* aURI, const nsAString& aTitle)
   rv = mDBSetPlaceTitle->Execute();
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // observers (have to check first if it's bookmarked)
   NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
                    nsINavHistoryObserver, OnTitleChanged(aURI, aTitle));
 
diff --git a/toolkit/components/places/src/nsNavHistory.h b/toolkit/components/places/src/nsNavHistory.h
index 5b126c6d6881..f95daf86a557 100644
--- a/toolkit/components/places/src/nsNavHistory.h
+++ b/toolkit/components/places/src/nsNavHistory.h
@@ -121,6 +121,8 @@ namespace places {
   , DB_GET_PAGE_VISIT_STATS = 5
   , DB_UPDATE_PAGE_VISIT_STATS = 6
   , DB_ADD_NEW_PAGE = 7
+  , DB_GET_URL_PAGE_INFO = 8
+  , DB_SET_PLACE_TITLE = 9
   };
 
 } // namespace places
@@ -438,6 +440,10 @@ public:
         return mDBUpdatePageVisitStats;
       case DB_ADD_NEW_PAGE:
         return mDBAddNewPage;
+      case DB_GET_URL_PAGE_INFO:
+        return mDBGetURLPageInfo;
+      case DB_SET_PLACE_TITLE:
+        return mDBSetPlaceTitle;
     }
     return nsnull;
   }
@@ -447,13 +453,18 @@ public:
   /**
    * Fires onVisit event to nsINavHistoryService observers
    */
-  void FireOnVisit(nsIURI* aURI,
+  void NotifyOnVisit(nsIURI* aURI,
                    PRInt64 aVisitID,
                    PRTime aTime,
                    PRInt64 aSessionID,
                    PRInt64 referringVisitID,
                    PRInt32 aTransitionType);
 
+  /**
+   * Fires onTitleChanged event to nsINavHistoryService observers
+   */
+  void NotifyTitleChange(nsIURI* aURI, const nsString& title);
+
 private:
   ~nsNavHistory();
 
diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in
index a155bd2b12d2..e102872b80ed 100644
--- a/toolkit/components/places/tests/browser/Makefile.in
+++ b/toolkit/components/places/tests/browser/Makefile.in
@@ -48,6 +48,7 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_FILES = \
 	browser_bug399606.js \
 	browser_visituri.js \
+	browser_settitle.js \
 	$(NULL)
 
 # These are files that need to be loaded via the HTTP proxy server
@@ -63,6 +64,8 @@ _HTTP_FILES = \
 	visituri/redirect_twice.sjs \
 	visituri/redirect_once.sjs \
 	visituri/final.html \
+	settitle/title1.html \
+	settitle/title2.html \
 	$(NULL)
 
 libs:: $(_BROWSER_FILES)
diff --git a/toolkit/components/places/tests/browser/browser_settitle.js b/toolkit/components/places/tests/browser/browser_settitle.js
new file mode 100644
index 000000000000..bf7da355cccc
--- /dev/null
+++ b/toolkit/components/places/tests/browser/browser_settitle.js
@@ -0,0 +1,122 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+gBrowser.selectedTab = gBrowser.addTab();
+
+function finishAndCleanUp()
+{
+  gBrowser.removeCurrentTab();
+  waitForClearHistory(finish());
+}
+
+/**
+ * One-time DOMContentLoaded callback.
+ */
+function load(href, callback)
+{
+  content.location.href = href;
+  gBrowser.addEventListener("load", function() {
+    if (content.location.href == href) {
+      gBrowser.removeEventListener("load", arguments.callee, true);
+      if (callback)
+        callback();
+    }
+  }, true);
+}
+
+var conn = PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase).DBConnection;
+
+/**
+ * Gets a single column value from either the places or historyvisits table.
+ */
+function getColumn(table, column, fromColumnName, fromColumnValue)
+{
+  var stmt = conn.createStatement(
+    "SELECT " + column + " FROM " + table + "_temp WHERE " + fromColumnName + "=:val " +
+    "UNION ALL " +
+    "SELECT " + column + " FROM " + table + " WHERE " + fromColumnName + "=:val " +
+    "LIMIT 1");
+  try {
+    stmt.params.val = fromColumnValue;
+    stmt.executeStep();
+    return stmt.row[column];
+  }
+  finally {
+    stmt.finalize();
+  }
+}
+
+/**
+ * Clears history invoking callback when done.
+ */
+function waitForClearHistory(aCallback) {
+  const TOPIC_EXPIRATION_FINISHED = "places-expiration-finished";
+  let observer = {
+    observe: function(aSubject, aTopic, aData) {
+      Services.obs.removeObserver(this, TOPIC_EXPIRATION_FINISHED);
+      aCallback();
+    }
+  };
+  Services.obs.addObserver(observer, TOPIC_EXPIRATION_FINISHED, false);
+
+  let hs = Cc["@mozilla.org/browser/nav-history-service;1"].
+           getService(Ci.nsINavHistoryService);
+  hs.QueryInterface(Ci.nsIBrowserHistory).removeAllPages();
+}
+
+function test()
+{
+  // Make sure titles are correctly saved for a URI with the proper
+  // notifications.
+
+  waitForExplicitFinish();
+
+  // Create and add history observer.
+  var historyObserver = {
+    data: [],
+    onBeginUpdateBatch: function() {},
+    onEndUpdateBatch: function() {},
+    onVisit: function(aURI, aVisitID, aTime, aSessionID, aReferringID,
+                      aTransitionType) {
+    },
+    onTitleChanged: function(aURI, aPageTitle) {
+      this.data.push({ uri: aURI, title: aPageTitle });
+
+      // We only expect one title change.
+      //
+      // Although we are loading two different pages, the first page does not
+      // have a title.  Since the title starts out as empty and then is set
+      // to empty, there is no title change notification.
+
+      PlacesUtils.history.removeObserver(this);
+      confirmResults(this.data);
+    },
+    onBeforeDeleteURI: function() {},
+    onDeleteURI: function() {},
+    onClearHistory: function() {},
+    onPageChanged: function() {},
+    onDeleteVisits: function() {},
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
+  };
+  PlacesUtils.history.addObserver(historyObserver, false);
+
+  load("http://example.com/tests/toolkit/components/places/tests/browser/title1.html", function() {
+    load("http://example.com/tests/toolkit/components/places/tests/browser/title2.html");
+  });
+
+  function confirmResults(data) {
+    is(data[0].uri.spec, "http://example.com/tests/toolkit/components/places/tests/browser/title2.html");
+    is(data[0].title, "Some title");
+
+    data.forEach(function(item) {
+      var title = getColumn("moz_places", "title", "url", data[0].uri.spec);
+      is(title, item.title);
+    });
+
+    finishAndCleanUp();
+  }
+}
diff --git a/toolkit/components/places/tests/browser/settitle/title1.html b/toolkit/components/places/tests/browser/settitle/title1.html
new file mode 100644
index 000000000000..3c98d693eca1
--- /dev/null
+++ b/toolkit/components/places/tests/browser/settitle/title1.html
@@ -0,0 +1,12 @@
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+
+<html>
+  <head>
+  </head>
+  <body>
+    title1.html
+  </body>
+</html>
diff --git a/toolkit/components/places/tests/browser/settitle/title2.html b/toolkit/components/places/tests/browser/settitle/title2.html
new file mode 100644
index 000000000000..28a6b69b59c6
--- /dev/null
+++ b/toolkit/components/places/tests/browser/settitle/title2.html
@@ -0,0 +1,14 @@
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+-->
+
+<html>
+  <head>
+    <title>Some title</title>
+  </head>
+  <body>
+    title2.html
+  </body>
+</html>
+

From d5e677df44d151f560767f5502734ddba55db522 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Fri, 25 Jun 2010 23:37:51 -0700
Subject: [PATCH 061/172] Fix for build bustage when landing bug 556400

---
 toolkit/components/places/src/nsNavHistory.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index b68cbf5ff86e..310e1053412b 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -2900,8 +2900,8 @@ nsNavHistory::AddVisit(nsIURI* aURI, PRTime aTime, nsIURI* aReferringURI,
   // GetQueryResults to maintain consistency.
   // FIXME bug 325241: make a way to observe hidden URLs
   if (!hidden) {
-     FireOnVisit(aURI, *aVisitID, aTime, aSessionID, referringVisitID,
-                 aTransitionType);
+    NotifyOnVisit(aURI, *aVisitID, aTime, aSessionID, referringVisitID,
+                  aTransitionType);
   }
 
   // Normally docshell sends the link visited observer notification for us (this

From 6e581faf930fd45a5edccefbae9ade3e8c15fcdf Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Sat, 26 Jun 2010 00:30:57 -0700
Subject: [PATCH 062/172] Backing out 4061ea0018b6

---
 toolkit/components/places/src/nsNavHistory.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index 310e1053412b..b68cbf5ff86e 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -2900,8 +2900,8 @@ nsNavHistory::AddVisit(nsIURI* aURI, PRTime aTime, nsIURI* aReferringURI,
   // GetQueryResults to maintain consistency.
   // FIXME bug 325241: make a way to observe hidden URLs
   if (!hidden) {
-    NotifyOnVisit(aURI, *aVisitID, aTime, aSessionID, referringVisitID,
-                  aTransitionType);
+     FireOnVisit(aURI, *aVisitID, aTime, aSessionID, referringVisitID,
+                 aTransitionType);
   }
 
   // Normally docshell sends the link visited observer notification for us (this

From bfa6e8dbc7b3f204d3a74295c0eafe2bff80e24c Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Sat, 26 Jun 2010 00:31:31 -0700
Subject: [PATCH 063/172] Backing out 1a916e3c1ad1

---
 docshell/base/IHistory.h                      |  16 +-
 docshell/base/nsDocShell.cpp                  |  11 +-
 toolkit/components/places/src/History.cpp     | 179 +-----------------
 toolkit/components/places/src/History.h       |   2 +-
 .../components/places/src/nsNavHistory.cpp    |  20 +-
 toolkit/components/places/src/nsNavHistory.h  |  13 +-
 .../places/tests/browser/Makefile.in          |   3 -
 7 files changed, 14 insertions(+), 230 deletions(-)

diff --git a/docshell/base/IHistory.h b/docshell/base/IHistory.h
index 6d65e9bb4ba4..a5f9d9b39beb 100644
--- a/docshell/base/IHistory.h
+++ b/docshell/base/IHistory.h
@@ -43,7 +43,6 @@
 #include "nsISupports.h"
 
 class nsIURI;
-class nsString;
 
 namespace mozilla {
 
@@ -129,18 +128,6 @@ public:
         nsIURI *aLastVisitedURI,
         PRUint32 aFlags
     ) = 0;
-
-    /**
-     * Set the title of the URI.
-     *
-     * @pre aURI must not be null.
-     *
-     * @param aURI
-     *        The URI to set the title for.
-     * @param aTitle
-     *        The title string.
-     */
-    NS_IMETHOD SetURITitle(nsIURI* aURI, const nsString& aTitle) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
@@ -152,8 +139,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
                                          mozilla::dom::Link *aContent); \
     NS_IMETHOD VisitURI(nsIURI *aURI, \
                         nsIURI *aLastVisitedURI, \
-                        PRUint32 aFlags); \
-    NS_IMETHOD SetURITitle(nsIURI* aURI, const nsString& aTitle);
+                        PRUint32 aFlags);
 
 } // namespace mozilla
 
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 9e3c282fe3fe..cc9c2251d0de 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -4694,16 +4694,11 @@ nsDocShell::SetTitle(const PRUnichar * aTitle)
             treeOwnerAsWin->SetTitle(aTitle);
     }
 
-    if (mCurrentURI && mLoadType != LOAD_ERROR_PAGE) {
-        nsCOMPtr<IHistory> history = services::GetHistoryService();
-        if (history) {
-            history->SetURITitle(mCurrentURI, nsString(mTitle));
-        }
-        else if (mGlobalHistory) {
-            mGlobalHistory->SetPageTitle(mCurrentURI, nsString(mTitle));
-        }
+    if (mGlobalHistory && mCurrentURI && mLoadType != LOAD_ERROR_PAGE) {
+        mGlobalHistory->SetPageTitle(mCurrentURI, nsString(mTitle));
     }
 
+
     // Update SessionHistory with the document's title.
     if (mOSHE && mLoadType != LOAD_BYPASS_HISTORY &&
         mLoadType != LOAD_ERROR_PAGE) {
diff --git a/toolkit/components/places/src/History.cpp b/toolkit/components/places/src/History.cpp
index 0d7f00adc2d3..d156ce15294c 100644
--- a/toolkit/components/places/src/History.cpp
+++ b/toolkit/components/places/src/History.cpp
@@ -305,7 +305,7 @@ public:
       if (!mData->hidden &&
           mData->transitionType != nsINavHistoryService::TRANSITION_EMBED &&
           mData->transitionType != nsINavHistoryService::TRANSITION_FRAMED_LINK) {
-        history->NotifyOnVisit(mData->uri, visitId, mData->dateTime,
+        history->FireOnVisit(mData->uri, visitId, mData->dateTime,
                              mData->sessionId, mData->lastVisitId,
                              mData->transitionType);
       }
@@ -696,153 +696,6 @@ NS_IMPL_ISUPPORTS1(
 , Step
 )
 
-////////////////////////////////////////////////////////////////////////////////
-//// Steps for SetURITitle
-
-struct SetTitleData : public FailSafeFinishTask
-{
-  nsCOMPtr<nsIURI> uri;
-  nsString title;
-};
-
-/**
- * Step 3: Notify that title has been updated.
- */
-class TitleNotifyStep: public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  TitleNotifyStep(nsAutoPtr<SetTitleData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-    history->NotifyTitleChange(mData->uri, mData->title);
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<SetTitleData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  TitleNotifyStep
-, mozIStorageStatementCallback
-)
-
-/**
- * Step 2: Set title.
- */
-class SetTitleStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  SetTitleStep(nsAutoPtr<SetTitleData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    if (!aResultSet)
-      // URI record was not found.
-      return NS_OK;
-
-    nsCOMPtr<mozIStorageRow> row;
-    nsresult rv = aResultSet->GetNextRow(getter_AddRefs(row));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsAutoString title;
-    rv = row->GetString(2, title);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // It is actually common to set the title to be the same thing it used to
-    // be. For example, going to any web page will always cause a title to be set,
-    // even though it will often be unchanged since the last visit. In these
-    // cases, we can avoid DB writing and observer overhead.
-    if (mData->title.Equals(title) || (mData->title.IsVoid() && title.IsVoid()))
-      return NS_OK;
-
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-
-    nsCOMPtr<mozIStorageStatement> stmt =
-      history->GetStatementById(DB_SET_PLACE_TITLE);
-    NS_ENSURE_STATE(stmt);
-
-    if (mData->title.IsVoid()) {
-      rv = stmt->BindNullByName(NS_LITERAL_CSTRING("page_title"));
-    }
-    else {
-      rv = stmt->BindStringByName(
-        NS_LITERAL_CSTRING("page_title"),
-        StringHead(mData->title, TITLE_LENGTH_MAX)
-      );
-    }
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<Step> step = new TitleNotifyStep(mData);
-    rv = step->ExecuteAsync(stmt);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<SetTitleData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  SetTitleStep
-, mozIStorageStatementCallback
-)
-
-/**
- * Step 1: See if there is an existing URI.
- */
-class StartSetURITitleStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  StartSetURITitleStep(nsAutoPtr<SetTitleData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-
-    // Find existing entry in moz_places table, if any.
-    nsCOMPtr<mozIStorageStatement> stmt =
-      history->GetStatementById(DB_GET_URL_PAGE_INFO);
-    NS_ENSURE_STATE(stmt);
-
-    nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<Step> step = new SetTitleStep(mData);
-    rv = step->ExecuteAsync(stmt);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<SetTitleData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  StartSetURITitleStep
-, Step
-)
-
 } // anonymous namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1128,36 +981,6 @@ History::UnregisterVisitedCallback(nsIURI* aURI,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-History::SetURITitle(nsIURI* aURI, const nsString& aTitle)
-{
-  NS_PRECONDITION(aURI, "Must pass a non-null URI!");
-
-  nsNavHistory* history = nsNavHistory::GetHistoryService();
-  PRBool canAdd;
-  nsresult rv = history->CanAddURI(aURI, &canAdd);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!canAdd) {
-    return NS_OK;
-  }
-
-  nsAutoPtr<SetTitleData> data(new SetTitleData());
-  data->uri = aURI;
-
-  if (aTitle.IsEmpty()) {
-    data->title.SetIsVoid(PR_TRUE);
-  }
-  else {
-    data->title.Assign(aTitle);
-  }
-
-  nsCOMPtr<Step> task(new StartSetURITitleStep(data));
-  AppendTask(task);
-
-  return NS_OK;
-}
- 
- 
 ////////////////////////////////////////////////////////////////////////////////
 //// nsISupports
 
diff --git a/toolkit/components/places/src/History.h b/toolkit/components/places/src/History.h
index f927e4dc2a18..4432befba26d 100644
--- a/toolkit/components/places/src/History.h
+++ b/toolkit/components/places/src/History.h
@@ -52,7 +52,7 @@ namespace mozilla {
 namespace places {
 
 #define NS_HISTORYSERVICE_CID \
-  {0x0937a705, 0x91a6, 0x417a, {0x82, 0x92, 0xb2, 0x2e, 0xb1, 0x0d, 0xa8, 0x6c}}
+  {0x9fc91e65, 0x1475, 0x4353, {0x9b, 0x9a, 0x93, 0xd7, 0x6f, 0x5b, 0xd9, 0xb7}}
 
 class History : public IHistory
 {
diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index b68cbf5ff86e..ae1b696ae614 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -2173,12 +2173,12 @@ nsNavHistory::GetNewSessionID()
 
 
 void
-nsNavHistory::NotifyOnVisit(nsIURI* aURI,
-                            PRInt64 aVisitID,
-                            PRTime aTime,
-                            PRInt64 aSessionID,
-                            PRInt64 referringVisitID,
-                            PRInt32 aTransitionType)
+nsNavHistory::FireOnVisit(nsIURI* aURI,
+                          PRInt64 aVisitID,
+                          PRTime aTime,
+                          PRInt64 aSessionID,
+                          PRInt64 referringVisitID,
+                          PRInt32 aTransitionType)
 {
   PRUint32 added = 0;
   NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
@@ -2187,13 +2187,6 @@ nsNavHistory::NotifyOnVisit(nsIURI* aURI,
                            referringVisitID, aTransitionType, &added));
 }
 
-void
-nsNavHistory::NotifyTitleChange(nsIURI* aURI, const nsString& aTitle)
-{
-  NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
-                   nsINavHistoryObserver, OnTitleChanged(aURI, aTitle));
-}
-
 
 PRInt32
 nsNavHistory::GetDaysOfHistory() {
@@ -7365,6 +7358,7 @@ nsNavHistory::SetPageTitleInternal(nsIURI* aURI, const nsAString& aTitle)
   rv = mDBSetPlaceTitle->Execute();
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // observers (have to check first if it's bookmarked)
   NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
                    nsINavHistoryObserver, OnTitleChanged(aURI, aTitle));
 
diff --git a/toolkit/components/places/src/nsNavHistory.h b/toolkit/components/places/src/nsNavHistory.h
index f95daf86a557..5b126c6d6881 100644
--- a/toolkit/components/places/src/nsNavHistory.h
+++ b/toolkit/components/places/src/nsNavHistory.h
@@ -121,8 +121,6 @@ namespace places {
   , DB_GET_PAGE_VISIT_STATS = 5
   , DB_UPDATE_PAGE_VISIT_STATS = 6
   , DB_ADD_NEW_PAGE = 7
-  , DB_GET_URL_PAGE_INFO = 8
-  , DB_SET_PLACE_TITLE = 9
   };
 
 } // namespace places
@@ -440,10 +438,6 @@ public:
         return mDBUpdatePageVisitStats;
       case DB_ADD_NEW_PAGE:
         return mDBAddNewPage;
-      case DB_GET_URL_PAGE_INFO:
-        return mDBGetURLPageInfo;
-      case DB_SET_PLACE_TITLE:
-        return mDBSetPlaceTitle;
     }
     return nsnull;
   }
@@ -453,18 +447,13 @@ public:
   /**
    * Fires onVisit event to nsINavHistoryService observers
    */
-  void NotifyOnVisit(nsIURI* aURI,
+  void FireOnVisit(nsIURI* aURI,
                    PRInt64 aVisitID,
                    PRTime aTime,
                    PRInt64 aSessionID,
                    PRInt64 referringVisitID,
                    PRInt32 aTransitionType);
 
-  /**
-   * Fires onTitleChanged event to nsINavHistoryService observers
-   */
-  void NotifyTitleChange(nsIURI* aURI, const nsString& title);
-
 private:
   ~nsNavHistory();
 
diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in
index e102872b80ed..a155bd2b12d2 100644
--- a/toolkit/components/places/tests/browser/Makefile.in
+++ b/toolkit/components/places/tests/browser/Makefile.in
@@ -48,7 +48,6 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_FILES = \
 	browser_bug399606.js \
 	browser_visituri.js \
-	browser_settitle.js \
 	$(NULL)
 
 # These are files that need to be loaded via the HTTP proxy server
@@ -64,8 +63,6 @@ _HTTP_FILES = \
 	visituri/redirect_twice.sjs \
 	visituri/redirect_once.sjs \
 	visituri/final.html \
-	settitle/title1.html \
-	settitle/title2.html \
 	$(NULL)
 
 libs:: $(_BROWSER_FILES)

From c158bede5e65b6f36103db7c886896d10a526f5a Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Sat, 26 Jun 2010 00:32:19 -0700
Subject: [PATCH 064/172] Backing out af6c00ca82d1

---
 docshell/base/IHistory.h                      |  39 +-
 docshell/base/nsDocShell.cpp                  | 213 ++----
 docshell/base/nsDocShell.h                    |  78 +-
 toolkit/components/places/src/Helpers.cpp     |  29 +-
 toolkit/components/places/src/Helpers.h       |  38 -
 toolkit/components/places/src/History.cpp     | 679 +-----------------
 toolkit/components/places/src/History.h       |  41 --
 .../components/places/src/nsNavHistory.cpp    | 107 +--
 toolkit/components/places/src/nsNavHistory.h  |  45 +-
 .../places/tests/browser/Makefile.in          |   5 -
 .../places/tests/cpp/places_test_harness.h    | 122 ----
 .../places/tests/cpp/test_IHistory.cpp        | 193 -----
 xpcom/build/Makefile.in                       |   1 -
 xpcom/build/ServiceList.h                     |  11 -
 xpcom/build/Services.cpp                      |   2 -
 xpcom/build/Services.h                        |   3 -
 16 files changed, 138 insertions(+), 1468 deletions(-)

diff --git a/docshell/base/IHistory.h b/docshell/base/IHistory.h
index a5f9d9b39beb..ec95ac21a813 100644
--- a/docshell/base/IHistory.h
+++ b/docshell/base/IHistory.h
@@ -51,7 +51,7 @@ namespace mozilla {
     }
 
 #define IHISTORY_IID \
-  {0x6f736049, 0x6370, 0x4376, {0xb7, 0x17, 0xfa, 0xfc, 0x0b, 0x4f, 0xd0, 0xf1}}
+  {0xaf27265d, 0x5672, 0x4d23, {0xa0, 0x75, 0x34, 0x8e, 0xb9, 0x73, 0x5a, 0x9a}}
 
 class IHistory : public nsISupports
 {
@@ -96,38 +96,6 @@ public:
      */
     NS_IMETHOD UnregisterVisitedCallback(nsIURI *aURI, dom::Link *aLink) = 0;
 
-    enum VisitFlags {
-        /**
-         * Indicates whether the URI was loaded in a top-level window.
-         */
-        TOP_LEVEL = 1 << 0,
-        /**
-         * Indicates whether the URI was loaded as part of a permanent redirect.
-         */
-        REDIRECT_PERMANENT = 1 << 1,
-        /**
-         * Indicates whether the URI was loaded as part of a temporary redirect.
-         */
-        REDIRECT_TEMPORARY = 1 << 2
-    };
-
-    /**
-     * Adds a history visit for the URI.
-     *
-     * @pre aURI must not be null.
-     *
-     * @param aURI
-     *        The URI of the page being visited.
-     * @param aLastVisitedURI
-     *        The URI of the last visit in the chain.
-     * @param aFlags
-     *        The VisitFlags describing this visit.
-     */
-    NS_IMETHOD VisitURI(
-        nsIURI *aURI,
-        nsIURI *aLastVisitedURI,
-        PRUint32 aFlags
-    ) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
@@ -136,10 +104,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(IHistory, IHISTORY_IID)
     NS_IMETHOD RegisterVisitedCallback(nsIURI *aURI, \
                                        mozilla::dom::Link *aContent); \
     NS_IMETHOD UnregisterVisitedCallback(nsIURI *aURI, \
-                                         mozilla::dom::Link *aContent); \
-    NS_IMETHOD VisitURI(nsIURI *aURI, \
-                        nsIURI *aLastVisitedURI, \
-                        PRUint32 aFlags);
+                                         mozilla::dom::Link *aContent);
 
 } // namespace mozilla
 
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index cc9c2251d0de..7391ee959082 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -112,8 +112,6 @@
 #include "nsIOfflineCacheUpdate.h"
 #include "nsCPrefetchService.h"
 #include "nsJSON.h"
-#include "IHistory.h"
-#include "mozilla/Services.h"
 
 // we want to explore making the document own the load group
 // so we can associate the document URI with the load group.
@@ -5664,53 +5662,32 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel,
     if (!(aStateFlags & STATE_IS_DOCUMENT))
         return; // not a toplevel document
 
-    nsCOMPtr<nsIURI> oldURI, newURI;
-    aOldChannel->GetURI(getter_AddRefs(oldURI));
-    aNewChannel->GetURI(getter_AddRefs(newURI));
-    if (!oldURI || !newURI) {
-        return;
+    nsCOMPtr<nsIGlobalHistory3> history3(do_QueryInterface(mGlobalHistory));
+    nsresult result = NS_ERROR_NOT_IMPLEMENTED;
+    if (history3) {
+        // notify global history of this redirect
+        result = history3->AddDocumentRedirect(aOldChannel, aNewChannel,
+                                               aRedirectFlags, !IsFrame());
     }
 
-    // Below a URI visit is saved (see AddURIVisit method doc).
-    // The visit chain looks something like:
-    //   ...
-    //   Site N - 1
-    //                =>  Site N
-    //   (redirect to =>) Site N + 1 (we are here!)
-
-    // Get N - 1 and transition type
-    nsCOMPtr<nsIURI> previousURI;
-    PRUint32 previousFlags = 0;
-    ExtractLastVisit(aOldChannel, getter_AddRefs(previousURI), &previousFlags);
-
-    if (aRedirectFlags & nsIChannelEventSink::REDIRECT_INTERNAL ||
-        ChannelIsPost(aOldChannel)) {
-        // 1. Internal redirects are ignored because they are specific to the
-        //    channel implementation.
-        // 2. POSTs are not saved by global history.
-        //
-        // Regardless, we need to propagate the previous visit to the new
-        // channel.
-        SaveLastVisit(aNewChannel, previousURI, previousFlags);
-    }
-    else {
-        nsCOMPtr<nsIURI> referrer;
-        // Treat referrer as null if there is an error getting it.
-        (void)NS_GetReferrerFromChannel(aOldChannel,
-                                        getter_AddRefs(referrer));
-
-        // Add visit N -1 => N
-        AddURIVisit(oldURI, referrer, previousURI, previousFlags);
-
-        // Since N + 1 could be the final destination, we will not save N => N + 1
-        // here.  OnNewURI will do that, so we will cache it.
-        SaveLastVisit(aNewChannel, oldURI, aRedirectFlags);
+    if (result == NS_ERROR_NOT_IMPLEMENTED) {
+        // when there is no GlobalHistory3, or it doesn't implement
+        // AddToplevelRedirect, we fall back to GlobalHistory2.  Just notify
+        // that the redirecting page was a rePdirect so it will be link colored
+        // but not visible.
+        nsCOMPtr<nsIURI> oldURI;
+        aOldChannel->GetURI(getter_AddRefs(oldURI));
+        if (! oldURI)
+            return; // nothing to tell anybody about
+        AddToGlobalHistory(oldURI, PR_TRUE, aOldChannel);
     }
 
     // check if the new load should go through the application cache.
     nsCOMPtr<nsIApplicationCacheChannel> appCacheChannel =
         do_QueryInterface(aNewChannel);
     if (appCacheChannel) {
+        nsCOMPtr<nsIURI> newURI;
+        aNewChannel->GetURI(getter_AddRefs(newURI));
         appCacheChannel->SetChooseApplicationCache(ShouldCheckAppCache(newURI));
     }
 
@@ -8950,7 +8927,7 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel, nsISupports* aOwner,
     nsCOMPtr<nsIInputStream> inputStream;
     if (aChannel) {
         nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aChannel));
-
+        
         // Check if the HTTPChannel is hiding under a multiPartChannel
         if (!httpChannel)  {
             GetHttpChannel(aChannel, getter_AddRefs(httpChannel));
@@ -9040,8 +9017,8 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel, nsISupports* aOwner,
         
         nsCOMPtr<nsICachingChannel> cacheChannel(do_QueryInterface(aChannel));
         nsCOMPtr<nsISupports>  cacheKey;
-        // Get the Cache Key and store it in SH.
-        if (cacheChannel)
+        // Get the Cache Key  and store it in SH.         
+        if (cacheChannel) 
             cacheChannel->GetCacheKey(getter_AddRefs(cacheKey));
         // If we already have a loading history entry, store the new cache key
         // in it.  Otherwise, since we're doing a reload and won't be updating
@@ -9063,22 +9040,10 @@ nsDocShell::OnNewURI(nsIURI * aURI, nsIChannel * aChannel, nsISupports* aOwner,
                                        getter_AddRefs(mLSHE));
         }
 
+        // Update Global history
         if (aAddToGlobalHistory) {
-            // If this is a POST request, we do not want to include this in global
-            // history.
-            if (!ChannelIsPost(aChannel)) {
-                nsCOMPtr<nsIURI> previousURI;
-                PRUint32 previousFlags = 0;
-                ExtractLastVisit(aChannel, getter_AddRefs(previousURI),
-                                 &previousFlags);
-
-                nsCOMPtr<nsIURI> referrer;
-                // Treat referrer as null if there is an error getting it.
-                (void)NS_GetReferrerFromChannel(aChannel,
-                                                getter_AddRefs(referrer));
-
-                AddURIVisit(aURI, referrer, previousURI, previousFlags);
-            }
+            // Get the referrer uri from the channel
+            AddToGlobalHistory(aURI, PR_FALSE, aChannel);
         }
     }
 
@@ -9397,7 +9362,7 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
         SetCurrentURI(newURI, nsnull, PR_TRUE);
         document->SetDocumentURI(newURI);
 
-        AddURIVisit(newURI, oldURI, oldURI, 0);
+        AddToGlobalHistory(newURI, PR_FALSE, oldURI);
     }
     else {
         FireOnLocationChange(this, nsnull, mCurrentURI);
@@ -10098,109 +10063,53 @@ NS_IMETHODIMP nsDocShell::MakeEditable(PRBool inWaitForUriLoad)
   return mEditorData->MakeEditable(inWaitForUriLoad);
 }
 
-bool
-nsDocShell::ChannelIsPost(nsIChannel* aChannel)
+nsresult
+nsDocShell::AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect,
+                               nsIChannel * aChannel)
 {
-    nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(aChannel));
-    if (!httpChannel) {
-        return false;
+    // If this is a POST request, we do not want to include this in global
+    // history, so return early.
+    nsCOMPtr<nsIHttpChannel> hchan(do_QueryInterface(aChannel));
+    if (hchan) {
+        nsCAutoString type;
+        nsresult rv = hchan->GetRequestMethod(type);
+        if (NS_SUCCEEDED(rv) && type.EqualsLiteral("POST"))
+            return NS_OK;
     }
 
-    nsCAutoString method;
-    httpChannel->GetRequestMethod(method);
-    return method.Equals("POST");
+    nsCOMPtr<nsIURI> referrer;
+    if (aChannel)
+        NS_GetReferrerFromChannel(aChannel, getter_AddRefs(referrer));
+
+    return AddToGlobalHistory(aURI, aRedirect, referrer);
 }
 
-void
-nsDocShell::ExtractLastVisit(nsIChannel* aChannel,
-                             nsIURI** aURI,
-                             PRUint32* aChannelRedirectFlags)
+nsresult
+nsDocShell::AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect,
+                               nsIURI * aReferrer)
 {
-    nsCOMPtr<nsIPropertyBag2> props(do_QueryInterface(aChannel));
-    if (!props) {
-        return;
-    }
+    if (mItemType != typeContent || !mGlobalHistory)
+        return NS_OK;
 
-    nsresult rv = props->GetPropertyAsInterface(
-        NS_LITERAL_STRING("docshell.previousURI"),
-        NS_GET_IID(nsIURI),
-        reinterpret_cast<void**>(aURI)
-    );
+    PRBool visited;
+    nsresult rv = mGlobalHistory->IsVisited(aURI, &visited);
+    if (NS_FAILED(rv))
+        return rv;
 
-    if (NS_FAILED(rv)) {
-        // There is no last visit for this channel, so this must be the first
-        // link.  Link the visit to the referrer of this request, if any.
-        // Treat referrer as null if there is an error getting it.
-        (void)NS_GetReferrerFromChannel(aChannel, aURI);
-    }
-    else {
-      rv = props->GetPropertyAsUint32(
-          NS_LITERAL_STRING("docshell.previousFlags"),
-          aChannelRedirectFlags
-      );
+    rv = mGlobalHistory->AddURI(aURI, aRedirect, !IsFrame(), aReferrer);
+    if (NS_FAILED(rv))
+        return rv;
 
-      NS_WARN_IF_FALSE(
-          NS_FAILED(rv),
-          "Could not fetch previous flags, URI will be treated like referrer"
-      );
-    }
-}
-
-void
-nsDocShell::SaveLastVisit(nsIChannel* aChannel,
-                          nsIURI* aURI,
-                          PRUint32 aChannelRedirectFlags)
-{
-    nsCOMPtr<nsIWritablePropertyBag2> props(do_QueryInterface(aChannel));
-    if (!props || !aURI) {
-        return;
-    }
-
-    props->SetPropertyAsInterface(NS_LITERAL_STRING("docshell.previousURI"),
-                                  aURI);
-    props->SetPropertyAsUint32(NS_LITERAL_STRING("docshell.previousFlags"),
-                               aChannelRedirectFlags);
-}
-
-void
-nsDocShell::AddURIVisit(nsIURI* aURI,
-                        nsIURI* aReferrerURI,
-                        nsIURI* aPreviousURI,
-                        PRUint32 aChannelRedirectFlags)
-{
-    NS_ASSERTION(aURI, "Visited URI is null!");
-
-    // Only content-type docshells save URI visits.
-    if (mItemType != typeContent) {
-        return;
-    }
-
-    nsCOMPtr<IHistory> history = services::GetHistoryService();
-
-    if (history) {
-        PRUint32 visitURIFlags = 0;
-
-        if (!IsFrame()) {
-            visitURIFlags |= IHistory::TOP_LEVEL;
+    if (!visited) {
+        nsCOMPtr<nsIObserverService> obsService =
+            mozilla::services::GetObserverService();
+        if (obsService) {
+            obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nsnull);
         }
-
-        if (aChannelRedirectFlags & nsIChannelEventSink::REDIRECT_TEMPORARY) {
-            visitURIFlags |= IHistory::REDIRECT_TEMPORARY;
-        }
-        else if (aChannelRedirectFlags &
-                 nsIChannelEventSink::REDIRECT_PERMANENT) {
-            visitURIFlags |= IHistory::REDIRECT_PERMANENT;
-        }
-
-        (void)history->VisitURI(aURI, aPreviousURI, visitURIFlags);
-    }
-    else if (mGlobalHistory) {
-        // Falls back to sync global history interface.
-        (void)mGlobalHistory->AddURI(aURI,
-                                     !!aChannelRedirectFlags,
-                                     !IsFrame(),
-                                     aReferrerURI);
     }
+
+    return NS_OK;
+
 }
 
 //*****************************************************************************
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index b2f3a1bdbbfe..5a666ae47999 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -433,77 +433,12 @@ protected:
                                        PRUint32 aRedirectFlags,
                                        PRUint32 aStateFlags);
 
-    /**
-     * Helper function that determines if channel is an HTTP POST.
-     *
-     * @param aChannel
-     *        The channel to test
-     *
-     * @return True iff channel is an HTTP post.
-     */
-    bool ChannelIsPost(nsIChannel* aChannel);
+    // Global History
 
-    /**
-     * Helper function that finds the last URI and its transition flags for a
-     * channel.
-     *
-     * This method first checks the channel's property bag to see if previous
-     * info has been saved.  If not, it gives back the referrer of the channel.
-     *
-     * @param aChannel
-     *        The channel we are transitioning to
-     * @param aURI
-     *        Output parameter with the previous URI, not addref'd
-     * @param aChannelRedirectFlags
-     *        If a redirect, output parameter with the previous redirect flags
-     *        from nsIChannelEventSink
-     */
-    void ExtractLastVisit(nsIChannel* aChannel,
-                          nsIURI** aURI,
-                          PRUint32* aChannelRedirectFlags);
-
-    /**
-     * Helper function that caches a URI and a transition for saving later.
-     *
-     * @param aChannel
-     *        Channel that will have these properties saved
-     * @param aURI
-     *        The URI to save for later
-     * @param aChannelRedirectFlags
-     *        The nsIChannelEventSink redirect flags to save for later
-     */
-    void SaveLastVisit(nsIChannel* aChannel,
-                       nsIURI* aURI,
-                       PRUint32 aChannelRedirectFlags);
-
-    /**
-     * Helper function for adding a URI visit using IHistory.  If IHistory is
-     * not available, the method tries nsIGlobalHistory2.
-     *
-     * The IHistory API maintains chains of visits, tracking both HTTP referrers
-     * and redirects for a user session. VisitURI requires the current URI and
-     * the previous URI in the chain.
-     *
-     * Visits can be saved either during a redirect or when the request has
-     * reached its final destination.  The previous URI in the visit may be
-     * from another redirect or it may be the referrer.
-     *
-     * @pre aURI is not null.
-     *
-     * @param aURI
-     *        The URI that was just visited
-     * @param aReferrerURI
-     *        The referrer URI of this request
-     * @param aPreviousURI
-     *        The previous URI of this visit (may be the same as aReferrerURI)
-     * @param aChannelRedirectFlags
-     *        For redirects, the redirect flags from nsIChannelEventSink
-     *        (0 otherwise)
-     */
-    void AddURIVisit(nsIURI* aURI,
-                     nsIURI* aReferrerURI,
-                     nsIURI* aPreviousURI,
-                     PRUint32 aChannelRedirectFlags);
+    nsresult AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect,
+                                nsIChannel * aChannel);
+    nsresult AddToGlobalHistory(nsIURI * aURI, PRBool aRedirect,
+                                nsIURI * aReferrer);
 
     // Helper Routines
     nsresult   ConfirmRepost(PRBool * aRepost);
@@ -765,9 +700,6 @@ protected:
 
     PRInt32                    mMarginWidth;
     PRInt32                    mMarginHeight;
-
-    // This can either be a content docshell or a chrome docshell.  After
-    // Create() is called, the type is not expected to change.
     PRInt32                    mItemType;
 
     // Index into the SHTransaction list, indicating the previous and current
diff --git a/toolkit/components/places/src/Helpers.cpp b/toolkit/components/places/src/Helpers.cpp
index d8d139c2f03d..d1add306ea6c 100644
--- a/toolkit/components/places/src/Helpers.cpp
+++ b/toolkit/components/places/src/Helpers.cpp
@@ -60,7 +60,7 @@ AsyncStatementCallback::HandleError(mozIStorageError *aError)
 
   nsCAutoString warnMsg;
   warnMsg.Append("An error occurred while executing an async statement: ");
-  warnMsg.AppendInt(result);
+  warnMsg.Append(result);
   warnMsg.Append(" ");
   warnMsg.Append(message);
   NS_WARNING(warnMsg.get());
@@ -180,33 +180,6 @@ URIBinder::Bind(mozIStorageBindingParams* aParams,
 
 #undef URI_TO_URLCSTRING
 
-nsresult
-GetReversedHostname(nsIURI* aURI, nsString& aRevHost)
-{
-  nsCAutoString forward8;
-  nsresult rv = aURI->GetHost(forward8);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // can't do reversing in UTF8, better use 16-bit chars
-  GetReversedHostname(NS_ConvertUTF8toUTF16(forward8), aRevHost);
-  return NS_OK;
-}
-
-void
-GetReversedHostname(const nsString& aForward, nsString& aRevHost)
-{
-  ReverseString(aForward, aRevHost);
-  aRevHost.Append(PRUnichar('.'));
-}
-
-void
-ReverseString(const nsString& aInput, nsString& aReversed)
-{
-  aReversed.Truncate(0);
-  for (PRInt32 i = aInput.Length() - 1; i >= 0; i--) {
-    aReversed.Append(aInput[i]);
-  }
-}
 
 } // namespace places
 } // namespace mozilla
diff --git a/toolkit/components/places/src/Helpers.h b/toolkit/components/places/src/Helpers.h
index cf8b4f34a97f..2d4343fc15e2 100644
--- a/toolkit/components/places/src/Helpers.h
+++ b/toolkit/components/places/src/Helpers.h
@@ -136,44 +136,6 @@ public:
                        const nsACString& aURLString);
 };
 
-/**
- * This extracts the hostname from the URI and reverses it in the
- * form that we use (always ending with a "."). So
- * "http://microsoft.com/" becomes "moc.tfosorcim."
- * 
- * The idea behind this is that we can create an index over the items in
- * the reversed host name column, and then query for as much or as little
- * of the host name as we feel like.
- * 
- * For example, the query "host >= 'gro.allizom.' AND host < 'gro.allizom/'
- * Matches all host names ending in '.mozilla.org', including
- * 'developer.mozilla.org' and just 'mozilla.org' (since we define all
- * reversed host names to end in a period, even 'mozilla.org' matches).
- * The important thing is that this operation uses the index. Any substring
- * calls in a select statement (even if it's for the beginning of a string)
- * will bypass any indices and will be slow).
- *
- * @param aURI
- *        URI that contains spec to reverse
- * @param aRevHost
- *        Out parameter
- */
-nsresult GetReversedHostname(nsIURI* aURI, nsString& aRevHost);
-
-/**
- * Similar method to GetReversedHostName but for strings
- */
-void GetReversedHostname(const nsString& aForward, nsString& aRevHost);
-
-/**
- * Reverses a string.
- *
- * @param aInput
- *        The string to be reversed
- * @param aReversed
- *        Ouput parameter will contain the reversed string
- */
-void ReverseString(const nsString& aInput, nsString& aReversed);
 
 } // namespace places
 } // namespace mozilla
diff --git a/toolkit/components/places/src/History.cpp b/toolkit/components/places/src/History.cpp
index d156ce15294c..6d264e9a5a0b 100644
--- a/toolkit/components/places/src/History.cpp
+++ b/toolkit/components/places/src/History.cpp
@@ -39,7 +39,6 @@
 
 #include "History.h"
 #include "nsNavHistory.h"
-#include "nsNavBookmarks.h"
 #include "Helpers.h"
 
 #include "mozilla/storage.h"
@@ -59,87 +58,6 @@ namespace places {
 #define URI_VISITED "visited"
 #define URI_NOT_VISITED "not visited"
 #define URI_VISITED_RESOLUTION_TOPIC "visited-status-resolution"
-// Observer event fired after a visit has been registered in the DB.
-#define URI_VISIT_SAVED "uri-visit-saved"
-
-////////////////////////////////////////////////////////////////////////////////
-//// Step
-
-class Step : public AsyncStatementCallback
-{
-public:
-  /**
-   * Executes statement asynchronously using this as a callback.
-   * 
-   * @param aStmt
-   *        Statement to execute asynchronously
-   */
-  NS_IMETHOD ExecuteAsync(mozIStorageStatement* aStmt);
-
-  /**
-   * Called once after query is completed.  If your query has more than one
-   * result set to process, you will want to override HandleResult to process
-   * each one.
-   *
-   * @param aResultSet
-   *        Results from ExecuteAsync
-   *        Unlike HandleResult, this *can be NULL* if there were no results.
-   */
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet);
-
-  /**
-   * By default, stores the last result set received in mResultSet.
-   * For queries with only one result set, you don't need to override.
-   *
-   * @param aResultSet
-   *        Results from ExecuteAsync
-   */
-  NS_IMETHOD HandleResult(mozIStorageResultSet* aResultSet);
-
-  /**
-   * By default, this calls Callback with any saved results from HandleResult.
-   * For queries with only one result set, you don't need to override.
-   *
-   * @param aReason
-   *        SQL status code
-   */
-  NS_IMETHOD HandleCompletion(PRUint16 aReason);
-
-private:
-  // Used by HandleResult to cache results until HandleCompletion is called.
-  nsCOMPtr<mozIStorageResultSet> mResultSet;
-};
-
-NS_IMETHODIMP
-Step::ExecuteAsync(mozIStorageStatement* aStmt)
-{
-  nsCOMPtr<mozIStoragePendingStatement> handle;
-  nsresult rv = aStmt->ExecuteAsync(this, getter_AddRefs(handle));
-  NS_ENSURE_SUCCESS(rv, rv);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Step::Callback(mozIStorageResultSet* aResultSet)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Step::HandleResult(mozIStorageResultSet* aResultSet)
-{
-  mResultSet = aResultSet;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-Step::HandleCompletion(PRUint16 aReason)
-{
-  nsCOMPtr<mozIStorageResultSet> resultSet = mResultSet;
-  mResultSet = NULL;
-  Callback(resultSet);
-  return NS_OK;
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Anonymous Helpers
@@ -153,7 +71,7 @@ public:
 
   static nsresult Start(nsIURI* aURI)
   {
-    NS_PRECONDITION(aURI, "Null URI");
+    NS_ASSERTION(aURI, "Don't pass a null URI!");
 
     nsNavHistory* navHist = nsNavHistory::GetHistoryService();
     NS_ENSURE_TRUE(navHist, NS_ERROR_FAILURE);
@@ -226,476 +144,6 @@ NS_IMPL_ISUPPORTS1(
   mozIStorageStatementCallback
 )
 
-/**
- * Fail-safe mechanism for ensuring that your task completes, no matter what.
- * Pass this around as an nsAutoPtr in your steps to guarantee that when all
- * your steps are finished, your task is finished.
- */
-class FailSafeFinishTask
-{
-public:
-  ~FailSafeFinishTask() {
-    History::GetService()->CurrentTaskFinished();
-  }
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//// Steps for VisitURI
-
-struct VisitURIData : public FailSafeFinishTask
-{
-  PRInt64 placeId;
-  PRInt32 hidden;
-  PRInt32 typed;
-  nsCOMPtr<nsIURI> uri;
-
-  // Url of last added visit in chain.
-  nsCString lastSpec;
-  PRInt64 lastVisitId;
-  PRInt32 transitionType;
-  PRInt64 sessionId;
-  PRTime dateTime;
-};
-
-/**
- * Step 6: Update frecency of URI and notify observers.
- */
-class UpdateFrecencyAndNotifyStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  UpdateFrecencyAndNotifyStep(nsAutoPtr<VisitURIData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    // Result set contains new visit created in earlier step
-    NS_ENSURE_STATE(aResultSet);
-
-    nsCOMPtr<mozIStorageRow> row;
-    nsresult rv = aResultSet->GetNextRow(getter_AddRefs(row));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    PRInt64 visitId;
-    rv = row->GetInt64(0, &visitId);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    // TODO need to figure out story for not synchronous frecency updating
-    // (bug 556631)
-
-    // Swallow errors here, since if we've gotten this far, it's more
-    // important to notify the observers below.
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-    NS_WARN_IF_FALSE(history, "Could not get history service");
-    nsNavBookmarks* bookmarks = nsNavBookmarks::GetBookmarksService();
-    NS_WARN_IF_FALSE(bookmarks, "Could not get bookmarks service");
-    if (history && bookmarks) {
-      // Update frecency *after* the visit info is in the db
-      nsresult rv = history->UpdateFrecency(
-        mData->placeId,
-        bookmarks->IsRealBookmark(mData->placeId)
-      );
-      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Could not update frecency");
-
-      // Notify nsNavHistory observers of visit, but only for certain types of
-      // visits to maintain consistency with nsNavHistory::GetQueryResults.
-      if (!mData->hidden &&
-          mData->transitionType != nsINavHistoryService::TRANSITION_EMBED &&
-          mData->transitionType != nsINavHistoryService::TRANSITION_FRAMED_LINK) {
-        history->FireOnVisit(mData->uri, visitId, mData->dateTime,
-                             mData->sessionId, mData->lastVisitId,
-                             mData->transitionType);
-      }
-    }
-
-    nsCOMPtr<nsIObserverService> obsService =
-      mozilla::services::GetObserverService();
-    if (obsService) {
-      nsresult rv = obsService->NotifyObservers(mData->uri, URI_VISIT_SAVED, nsnull);
-      NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Could not notify observers");
-    }
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<VisitURIData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  UpdateFrecencyAndNotifyStep
-, mozIStorageStatementCallback
-)
-
-/**
- * Step 5: Get newly created visit ID from moz_history_visits table.
- */
-class GetVisitIDStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  GetVisitIDStep(nsAutoPtr<VisitURIData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    // Find visit ID, needed for notifying observers in next step.
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-    NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
-    nsCOMPtr<mozIStorageStatement> stmt =
-      history->GetStatementById(DB_RECENT_VISIT_OF_URL);
-    NS_ENSURE_STATE(stmt);
-
-    nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<Step> step = new UpdateFrecencyAndNotifyStep(mData);
-    rv = step->ExecuteAsync(stmt);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<VisitURIData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  GetVisitIDStep
-, mozIStorageStatementCallback
-)
-
-/**
- * Step 4: Add visit to moz_history_visits table.
- */
-class AddVisitStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  AddVisitStep(nsAutoPtr<VisitURIData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    nsresult rv;
-
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-    NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
-
-    // TODO need to figure out story for new session IDs that isn't synchronous
-    // (bug 561450)
-
-    if (aResultSet) {
-      // Result set contains last visit information for this session
-      nsCOMPtr<mozIStorageRow> row;
-      rv = aResultSet->GetNextRow(getter_AddRefs(row));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      PRInt64 possibleSessionId;
-      PRTime lastVisitOfSession;
-
-      rv = row->GetInt64(0, &mData->lastVisitId);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = row->GetInt64(1, &possibleSessionId);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = row->GetInt64(2, &lastVisitOfSession);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      if (mData->dateTime - lastVisitOfSession <= RECENT_EVENT_THRESHOLD) {
-        mData->sessionId = possibleSessionId;
-      }
-      else {
-        // Session is too old. Start a new one.
-        mData->sessionId = history->GetNewSessionID();
-        mData->lastVisitId = 0;
-      }
-    }
-    else {
-      // No previous saved visit entry could be found, so start a new session.
-      mData->sessionId = history->GetNewSessionID();
-      mData->lastVisitId = 0;
-    }
-
-    nsCOMPtr<mozIStorageStatement> stmt =
-      history->GetStatementById(DB_INSERT_VISIT);
-    NS_ENSURE_STATE(stmt);
-
-    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("from_visit"),
-                               mData->lastVisitId);
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("page_id"),
-                               mData->placeId);
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("visit_date"),
-                               mData->dateTime);
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("visit_type"),
-                               mData->transitionType);
-    NS_ENSURE_SUCCESS(rv, rv);
-    rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("session"),
-                               mData->sessionId);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<Step> step = new GetVisitIDStep(mData);
-    rv = step->ExecuteAsync(stmt);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<VisitURIData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  AddVisitStep
-, mozIStorageStatementCallback
-)
-
-/**
- * Step 3: Callback for inserting or updating a moz_places entry.
- *         This step checks database for the last visit in session.
- */
-class CheckLastVisitStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  CheckLastVisitStep(nsAutoPtr<VisitURIData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    nsresult rv;
-
-    if (aResultSet) {
-      // Last step inserted a new URL. This query contains the id.
-      nsCOMPtr<mozIStorageRow> row;
-      rv = aResultSet->GetNextRow(getter_AddRefs(row));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      rv = row->GetInt64(0, &mData->placeId);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-    if (!mData->lastSpec.IsEmpty()) {
-      // Find last visit ID and session ID using lastSpec so we can add them
-      // to a browsing session if the visit was recent.
-      nsNavHistory* history = nsNavHistory::GetHistoryService();
-      NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
-      nsCOMPtr<mozIStorageStatement> stmt =
-        history->GetStatementById(DB_RECENT_VISIT_OF_URL);
-      NS_ENSURE_STATE(stmt);
-
-      rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->lastSpec);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      nsCOMPtr<Step> step = new AddVisitStep(mData);
-      rv = step->ExecuteAsync(stmt);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-    else {
-      // Empty lastSpec.
-      // Not part of a session.  Just run next step's callback with no results.
-      nsCOMPtr<Step> step = new AddVisitStep(mData);
-      rv = step->Callback(NULL);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<VisitURIData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  CheckLastVisitStep
-, mozIStorageStatementCallback
-)
-
-/**
- * Step 2a: Called only when a new entry is put into moz_places.
- *          Finds the ID of a recently inserted place.
- */
-class FindNewIdStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  FindNewIdStep(nsAutoPtr<VisitURIData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-    NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
-    nsCOMPtr<mozIStorageStatement> stmt =
-      history->GetStatementById(DB_GET_PAGE_VISIT_STATS);
-    NS_ENSURE_STATE(stmt);
-
-    nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<Step> step = new CheckLastVisitStep(mData);
-    rv = step->ExecuteAsync(stmt);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<VisitURIData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  FindNewIdStep
-, mozIStorageStatementCallback
-)
-
-/**
- * Step 2: Callback for checking for an existing URI in moz_places.
- *         This step inserts or updates the URI accordingly.
- */
-class CheckExistingStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  CheckExistingStep(nsAutoPtr<VisitURIData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    nsresult rv;
-    nsCOMPtr<mozIStorageStatement> stmt;
-
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-    NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
-
-    if (aResultSet) {
-      nsCOMPtr<mozIStorageRow> row;
-      rv = aResultSet->GetNextRow(getter_AddRefs(row));
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      rv = row->GetInt64(0, &mData->placeId);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      if (!mData->typed) {
-        // If this transition wasn't typed, others might have been. If database
-        // has location as typed, reflect that in our data structure.
-        rv = row->GetInt32(2, &mData->typed);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-      if (mData->hidden) {
-        // If this transition was hidden, it is possible that others were not.
-        // Any one visible transition makes this location visible. If database
-        // has location as visible, reflect that in our data structure.
-        rv = row->GetInt32(3, &mData->hidden);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-      // Note: trigger will update visit_count.
-      stmt = history->GetStatementById(DB_UPDATE_PAGE_VISIT_STATS);
-      NS_ENSURE_STATE(stmt);
-
-      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("typed"), mData->typed);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("hidden"), mData->hidden);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = stmt->BindInt64ByName(NS_LITERAL_CSTRING("page_id"), mData->placeId);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      nsCOMPtr<Step> step = new CheckLastVisitStep(mData);
-      rv = step->ExecuteAsync(stmt);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-    else {
-      // No entry exists, so create one.
-      stmt = history->GetStatementById(DB_ADD_NEW_PAGE);
-      NS_ENSURE_STATE(stmt);
-
-      nsAutoString revHost;
-      rv = GetReversedHostname(mData->uri, revHost);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = stmt->BindStringByName(NS_LITERAL_CSTRING("rev_host"), revHost);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("typed"), mData->typed);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("hidden"), mData->hidden);
-      NS_ENSURE_SUCCESS(rv, rv);
-      rv = stmt->BindInt32ByName(NS_LITERAL_CSTRING("frecency"), -1);
-      NS_ENSURE_SUCCESS(rv, rv);
-
-      nsCOMPtr<Step> step = new FindNewIdStep(mData);
-      rv = step->ExecuteAsync(stmt);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<VisitURIData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  CheckExistingStep
-, mozIStorageStatementCallback
-)
-
-/**
- * Step 1: See if there is an existing URI.
- */
-class StartVisitURIStep : public Step
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  StartVisitURIStep(nsAutoPtr<VisitURIData> aData)
-  : mData(aData)
-  {
-  }
-
-  NS_IMETHOD Callback(mozIStorageResultSet* aResultSet)
-  {
-    nsNavHistory* history = nsNavHistory::GetHistoryService();
-
-    // Find existing entry in moz_places table, if any.
-    nsCOMPtr<mozIStorageStatement> stmt =
-      history->GetStatementById(DB_GET_PAGE_VISIT_STATS);
-    NS_ENSURE_STATE(stmt);
-
-    nsresult rv = URIBinder::Bind(stmt, NS_LITERAL_CSTRING("page_url"), mData->uri);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<Step> step = new CheckExistingStep(mData);
-    rv = step->ExecuteAsync(stmt);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return NS_OK;
-  }
-
-protected:
-  nsAutoPtr<VisitURIData> mData;
-};
-NS_IMPL_ISUPPORTS1(
-  StartVisitURIStep
-, Step
-)
-
 } // anonymous namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -712,7 +160,6 @@ History::History()
 History::~History()
 {
   gService = NULL;
-
 #ifdef DEBUG
   if (mObservers.IsInitialized()) {
     NS_ASSERTION(mObservers.Count() == 0,
@@ -721,28 +168,6 @@ History::~History()
 #endif
 }
 
-void
-History::AppendTask(Step* aTask)
-{
-  NS_PRECONDITION(aTask, "Got NULL task.");
-
-  NS_ADDREF(aTask);
-  mPendingVisits.Push(aTask);
-
-  if (mPendingVisits.GetSize() == 1) {
-    // There are no other pending tasks.
-    StartNextTask();
-  }
-}
-
-void
-History::CurrentTaskFinished()
-{
-  nsCOMPtr<Step> deadTaskWalking =
-    dont_AddRef(static_cast<Step*>(mPendingVisits.PopFront()));
-  StartNextTask();
-}
-
 void
 History::NotifyVisited(nsIURI* aURI)
 {
@@ -803,107 +228,9 @@ History::GetSingleton()
   return gService;
 }
 
-void
-History::StartNextTask()
-{
-  nsCOMPtr<Step> nextTask =
-    static_cast<Step*>(mPendingVisits.PeekFront());
-  if (!nextTask) {
-    // No more pending visits left to process.
-    return;
-  }
-  nsresult rv = nextTask->Callback(NULL);
-  NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Beginning a task failed.");
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //// IHistory
 
-NS_IMETHODIMP
-History::VisitURI(nsIURI* aURI,
-                  nsIURI* aLastVisitedURI,
-                  PRUint32 aFlags)
-{
-  NS_PRECONDITION(aURI, "URI should not be NULL.");
-
-  nsNavHistory* history = nsNavHistory::GetHistoryService();
-  NS_ENSURE_TRUE(history, NS_ERROR_OUT_OF_MEMORY);
-
-  // Silently return if URI is something we shouldn't add to DB.
-  PRBool canAdd;
-  nsresult rv = history->CanAddURI(aURI, &canAdd);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (!canAdd) {
-    return NS_OK;
-  }
-
-  // Populate data structure that will be used in our async SQL steps.
-  nsAutoPtr<VisitURIData> data(new VisitURIData());
-
-  nsCAutoString spec;
-  rv = aURI->GetSpec(spec);
-  NS_ENSURE_SUCCESS(rv, rv);
-  if (aLastVisitedURI) {
-    rv = aLastVisitedURI->GetSpec(data->lastSpec);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  if (spec.Equals(data->lastSpec)) {
-    // Do not save refresh-page visits.
-    return NS_OK;
-  }
-
-  // Assigns a type to the edge in the visit linked list. Each type will be
-  // considered differently when weighting the frecency of a location.
-  PRUint32 recentFlags = history->GetRecentFlags(aURI);
-  bool redirected = false;
-  if (aFlags & IHistory::REDIRECT_TEMPORARY) {
-    data->transitionType = nsINavHistoryService::TRANSITION_REDIRECT_TEMPORARY;
-    redirected = true;
-  }
-  else if (aFlags & IHistory::REDIRECT_PERMANENT) {
-    data->transitionType = nsINavHistoryService::TRANSITION_REDIRECT_PERMANENT;
-    redirected = true;
-  }
-  else if (recentFlags & nsNavHistory::RECENT_TYPED) {
-    data->transitionType = nsINavHistoryService::TRANSITION_TYPED;
-  }
-  else if (recentFlags & nsNavHistory::RECENT_BOOKMARKED) {
-    data->transitionType = nsINavHistoryService::TRANSITION_BOOKMARK;
-  }
-  else if (aFlags & IHistory::TOP_LEVEL) {
-    // User was redirected or link was clicked in the main window.
-    data->transitionType = nsINavHistoryService::TRANSITION_LINK;
-  }
-  else if (recentFlags & nsNavHistory::RECENT_ACTIVATED) {
-    // User activated a link in a frame.
-    data->transitionType = nsINavHistoryService::TRANSITION_FRAMED_LINK;
-  }
-  else {
-    // A frame redirected to a new site without user interaction.
-    data->transitionType = nsINavHistoryService::TRANSITION_EMBED;
-  }
-
-  data->typed = (data->transitionType == nsINavHistoryService::TRANSITION_TYPED) ? 1 : 0;
-  data->hidden = 
-    (data->transitionType == nsINavHistoryService::TRANSITION_FRAMED_LINK ||
-     data->transitionType == nsINavHistoryService::TRANSITION_EMBED ||
-     redirected) ? 1 : 0;
-  data->dateTime = PR_Now();
-  data->uri = aURI;
-
-  nsCOMPtr<Step> task(new StartVisitURIStep(data));
-  AppendTask(task);
-
-  nsCOMPtr<nsIObserverService> obsService =
-    mozilla::services::GetObserverService();
-  if (obsService) {
-    obsService->NotifyObservers(aURI, NS_LINK_VISITED_EVENT_TOPIC, nsnull);
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 History::RegisterVisitedCallback(nsIURI* aURI,
                                  Link* aLink)
@@ -985,8 +312,8 @@ History::UnregisterVisitedCallback(nsIURI* aURI,
 //// nsISupports
 
 NS_IMPL_ISUPPORTS1(
-  History
-, IHistory
+  History,
+  IHistory
 )
 
 } // namespace places
diff --git a/toolkit/components/places/src/History.h b/toolkit/components/places/src/History.h
index 4432befba26d..079d969d7f57 100644
--- a/toolkit/components/places/src/History.h
+++ b/toolkit/components/places/src/History.h
@@ -46,7 +46,6 @@
 #include "nsString.h"
 #include "nsURIHashKey.h"
 #include "nsTArray.h"
-#include "nsDeque.h"
 
 namespace mozilla {
 namespace places {
@@ -70,26 +69,6 @@ public:
    */
   void NotifyVisited(nsIURI *aURI);
 
-  /**
-   * Append a task to the queue for SQL queries that need to happen
-   * atomically.
-   *
-   * @pre aTask is not null
-   *
-   * @param aTask
-   *        Task that needs to be completed atomically
-   */
-  void AppendTask(class Step* aTask);
-
-  /**
-   * Call when all steps of the current running task are finished.  Each task
-   * should be responsible for calling this when it is finished (even if there
-   * are errors).
-   *
-   * Do not call this twice for the same visit.
-   */
-  void CurrentTaskFinished();
-
   /**
    * Obtains a pointer to this service.
    */
@@ -104,26 +83,6 @@ public:
 private:
   ~History();
 
-  /**
-   * Since visits rapidly fire at once, it's very likely to have race
-   * conditions for SQL queries.  We often need to see if a row exists
-   * or peek at values, and by the time we have retrieved them they could
-   * be different.
-   *
-   * We guarantee an ordering of our SQL statements so that a set of
-   * callbacks for one visit are guaranteed to be atomic.  Each visit consists
-   * of a data structure that sits in this queue.
-   *
-   * The front of the queue always has the current visit we are processing.
-   */
-  nsDeque mPendingVisits;
-
-  /**
-   * Begins next task at the front of the queue.  The task remains in the queue
-   * until it is done and calls CurrentTaskFinished.
-   */
-  void StartNextTask();
-
   static History *gService;
 
   typedef nsTArray<mozilla::dom::Link *> ObserverArray;
diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index ae1b696ae614..e3d4b9f0dd55 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -88,6 +88,11 @@
 
 using namespace mozilla::places;
 
+// Microsecond timeout for "recent" events such as typed and bookmark following.
+// If you typed it more than this time ago, it's not recent.
+// This is 15 minutes           m    s/m  us/s
+#define RECENT_EVENT_THRESHOLD PRTime((PRInt64)15 * 60 * PR_USEC_PER_SEC)
+
 // The maximum number of things that we will store in the recent events list
 // before calling ExpireNonrecentEvents. This number should be big enough so it
 // is very difficult to get that many unconsumed events (for example, typed but
@@ -232,12 +237,21 @@ NS_IMPL_CI_INTERFACE_GETTER5(
 
 namespace {
 
+static nsresult GetReversedHostname(nsIURI* aURI, nsAString& host);
+static void GetReversedHostname(const nsString& aForward, nsAString& aReversed);
 static PRInt64 GetSimpleBookmarksQueryFolder(
     const nsCOMArray<nsNavHistoryQuery>& aQueries,
     nsNavHistoryQueryOptions* aOptions);
 static void ParseSearchTermsFromQueries(const nsCOMArray<nsNavHistoryQuery>& aQueries,
                                         nsTArray<nsTArray<nsString>*>* aTerms);
 
+inline void ReverseString(const nsString& aInput, nsAString& aReversed)
+{
+  aReversed.Truncate(0);
+  for (PRInt32 i = aInput.Length() - 1; i >= 0; i --)
+    aReversed.Append(aInput[i]);
+}
+
 } // anonymous namespace
 
 namespace mozilla {
@@ -895,27 +909,6 @@ nsNavHistory::UpdateSchemaVersion()
 }
 
 
-PRUint32
-nsNavHistory::GetRecentFlags(nsIURI *aURI)
-{
-  PRUint32 result = 0;
-  nsCAutoString spec;
-  nsresult rv = aURI->GetSpec(spec);
-  NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "Unable to get aURI's spec");
-
-  if (NS_SUCCEEDED(rv)) {
-    if (CheckIsRecentEvent(&mRecentTyped, spec))
-      result |= RECENT_TYPED;
-    if (CheckIsRecentEvent(&mRecentLink, spec))
-      result |= RECENT_ACTIVATED;
-    if (CheckIsRecentEvent(&mRecentBookmark, spec))
-      result |= RECENT_BOOKMARKED;
-  }
-
-  return result;
-}
-
-
 /**
  * Called after InitDB, this creates our own functions
  */
@@ -1872,9 +1865,6 @@ nsNavHistory::GetUrlIdFor(nsIURI* aURI, PRInt64* aEntryID,
 //    THIS SHOULD BE THE ONLY PLACE NEW moz_places ROWS ARE
 //    CREATED. This allows us to maintain better consistency.
 //
-//    XXX this functionality is being moved to History.cpp, so
-//    in fact there *are* two places where new pages are added.
-//
 //    If non-null, the new page ID will be placed into aPageID.
 
 nsresult
@@ -2172,22 +2162,6 @@ nsNavHistory::GetNewSessionID()
 }
 
 
-void
-nsNavHistory::FireOnVisit(nsIURI* aURI,
-                          PRInt64 aVisitID,
-                          PRTime aTime,
-                          PRInt64 aSessionID,
-                          PRInt64 referringVisitID,
-                          PRInt32 aTransitionType)
-{
-  PRUint32 added = 0;
-  NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
-                   nsINavHistoryObserver,
-                   OnVisit(aURI, aVisitID, aTime, aSessionID,
-                           referringVisitID, aTransitionType, &added));
-}
-
-
 PRInt32
 nsNavHistory::GetDaysOfHistory() {
   PRInt32 daysOfHistory = 0;
@@ -2892,9 +2866,12 @@ nsNavHistory::AddVisit(nsIURI* aURI, PRTime aTime, nsIURI* aReferringURI,
   // Notify observers: The hidden detection code must match that in
   // GetQueryResults to maintain consistency.
   // FIXME bug 325241: make a way to observe hidden URLs
+  PRUint32 added = 0;
   if (!hidden) {
-     FireOnVisit(aURI, *aVisitID, aTime, aSessionID, referringVisitID,
-                 aTransitionType);
+    NOTIFY_OBSERVERS(mCanNotify, mCacheObservers, mObservers,
+                     nsINavHistoryObserver,
+                     OnVisit(aURI, *aVisitID, aTime, aSessionID,
+                             referringVisitID, aTransitionType, &added));
   }
 
   // Normally docshell sends the link visited observer notification for us (this
@@ -7570,6 +7547,52 @@ nsNavHistory::RemoveDuplicateURIs()
 
 namespace {
 
+// GetReversedHostname
+//
+//    This extracts the hostname from the URI and reverses it in the
+//    form that we use (always ending with a "."). So
+//    "http://microsoft.com/" becomes "moc.tfosorcim."
+//
+//    The idea behind this is that we can create an index over the items in
+//    the reversed host name column, and then query for as much or as little
+//    of the host name as we feel like.
+//
+//    For example, the query "host >= 'gro.allizom.' AND host < 'gro.allizom/'
+//    Matches all host names ending in '.mozilla.org', including
+//    'developer.mozilla.org' and just 'mozilla.org' (since we define all
+//    reversed host names to end in a period, even 'mozilla.org' matches).
+//    The important thing is that this operation uses the index. Any substring
+//    calls in a select statement (even if it's for the beginning of a string)
+//    will bypass any indices and will be slow).
+
+nsresult
+GetReversedHostname(nsIURI* aURI, nsAString& aRevHost)
+{
+  nsCString forward8;
+  nsresult rv = aURI->GetHost(forward8);
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  // can't do reversing in UTF8, better use 16-bit chars
+  NS_ConvertUTF8toUTF16 forward(forward8);
+  GetReversedHostname(forward, aRevHost);
+  return NS_OK;
+}
+
+
+// GetReversedHostname
+//
+//    Same as previous but for strings
+
+void
+GetReversedHostname(const nsString& aForward, nsAString& aRevHost)
+{
+  ReverseString(aForward, aRevHost);
+  aRevHost.Append(PRUnichar('.'));
+}
+
+
 // GetSimpleBookmarksQueryFolder
 //
 //    Determines if this set of queries is a simple bookmarks query for a
diff --git a/toolkit/components/places/src/nsNavHistory.h b/toolkit/components/places/src/nsNavHistory.h
index 5b126c6d6881..fdc110281701 100644
--- a/toolkit/components/places/src/nsNavHistory.h
+++ b/toolkit/components/places/src/nsNavHistory.h
@@ -88,10 +88,6 @@
 #define URI_LENGTH_MAX 65536
 #define TITLE_LENGTH_MAX 4096
 
-// Microsecond timeout for "recent" events such as typed and bookmark following.
-// If you typed it more than this time ago, it's not recent.
-#define RECENT_EVENT_THRESHOLD PRTime((PRInt64)15 * 60 * PR_USEC_PER_SEC)
-
 #ifdef MOZ_XUL
 // Fired after autocomplete feedback has been updated.
 #define TOPIC_AUTOCOMPLETE_FEEDBACK_UPDATED "places-autocomplete-feedback-updated"
@@ -116,11 +112,6 @@ namespace places {
     DB_GET_PAGE_INFO_BY_URL = 0
   , DB_GET_TAGS = 1
   , DB_IS_PAGE_VISITED = 2
-  , DB_INSERT_VISIT = 3
-  , DB_RECENT_VISIT_OF_URL = 4
-  , DB_GET_PAGE_VISIT_STATS = 5
-  , DB_UPDATE_PAGE_VISIT_STATS = 6
-  , DB_ADD_NEW_PAGE = 7
   };
 
 } // namespace places
@@ -403,19 +394,6 @@ public:
    */
   bool canNotify() { return mCanNotify; }
 
-  enum RecentEventFlags {
-    RECENT_TYPED      = 1 << 0,    // User typed in URL recently
-    RECENT_ACTIVATED  = 1 << 1,    // User tapped URL link recently
-    RECENT_BOOKMARKED = 1 << 2     // User bookmarked URL recently
-  };
-
-  /**
-   * Returns any recent activity done with a URL.
-   * @return Any recent events associated with this URI.  Each bit is set
-   *         according to RecentEventFlags enum values.
-   */
-  PRUint32 GetRecentFlags(nsIURI *aURI);
-
   mozIStorageStatement* GetStatementById(
     enum mozilla::places::HistoryStatementId aStatementId
   )
@@ -428,32 +406,10 @@ public:
         return mDBGetTags;
       case DB_IS_PAGE_VISITED:
         return mDBIsPageVisited;
-      case DB_INSERT_VISIT:
-        return mDBInsertVisit;
-      case DB_RECENT_VISIT_OF_URL:
-        return mDBRecentVisitOfURL;
-      case DB_GET_PAGE_VISIT_STATS:
-        return mDBGetPageVisitStats;
-      case DB_UPDATE_PAGE_VISIT_STATS:
-        return mDBUpdatePageVisitStats;
-      case DB_ADD_NEW_PAGE:
-        return mDBAddNewPage;
     }
     return nsnull;
   }
 
-  PRInt64 GetNewSessionID();
-
-  /**
-   * Fires onVisit event to nsINavHistoryService observers
-   */
-  void FireOnVisit(nsIURI* aURI,
-                   PRInt64 aVisitID,
-                   PRTime aTime,
-                   PRInt64 aSessionID,
-                   PRInt64 referringVisitID,
-                   PRInt32 aTransitionType);
-
 private:
   ~nsNavHistory();
 
@@ -731,6 +687,7 @@ protected:
 
   // Sessions tracking.
   PRInt64 mLastSessionID;
+  PRInt64 GetNewSessionID();
 
 #ifdef MOZ_XUL
   // AutoComplete stuff
diff --git a/toolkit/components/places/tests/browser/Makefile.in b/toolkit/components/places/tests/browser/Makefile.in
index a155bd2b12d2..b54fb248cfda 100644
--- a/toolkit/components/places/tests/browser/Makefile.in
+++ b/toolkit/components/places/tests/browser/Makefile.in
@@ -47,7 +47,6 @@ include $(topsrcdir)/config/rules.mk
 
 _BROWSER_FILES = \
 	browser_bug399606.js \
-	browser_visituri.js \
 	$(NULL)
 
 # These are files that need to be loaded via the HTTP proxy server
@@ -59,10 +58,6 @@ _HTTP_FILES = \
 	bug_399606/399606-window.location.href.html \
 	bug_399606/399606-window.location.html \
 	bug_399606/399606-history.go-0.html \
-	visituri/begin.html \
-	visituri/redirect_twice.sjs \
-	visituri/redirect_once.sjs \
-	visituri/final.html \
 	$(NULL)
 
 libs:: $(_BROWSER_FILES)
diff --git a/toolkit/components/places/tests/cpp/places_test_harness.h b/toolkit/components/places/tests/cpp/places_test_harness.h
index 389cda76105b..cb61aff8ceac 100644
--- a/toolkit/components/places/tests/cpp/places_test_harness.h
+++ b/toolkit/components/places/tests/cpp/places_test_harness.h
@@ -47,9 +47,6 @@
 #include "nsINavHistoryService.h"
 #include "nsIObserverService.h"
 #include "mozilla/IHistory.h"
-#include "mozIStorageConnection.h"
-#include "mozIStorageStatement.h"
-#include "nsPIPlacesDatabase.h"
 
 using namespace mozilla;
 
@@ -120,21 +117,6 @@ addURI(nsIURI* aURI)
   do_check_success(rv);
 }
 
-struct PlaceRecord
-{
-  PRInt64 id;
-  PRInt32 hidden;
-  PRInt32 typed;
-  PRInt32 visitCount;
-};
-
-struct VisitRecord
-{
-  PRInt64 id;
-  PRInt64 lastVisitId;
-  PRInt32 transitionType;
-};
-
 already_AddRefed<IHistory>
 do_get_IHistory()
 {
@@ -142,107 +124,3 @@ do_get_IHistory()
   do_check_true(history);
   return history.forget();
 }
-
-already_AddRefed<nsINavHistoryService>
-do_get_NavHistory()
-{
-  nsCOMPtr<nsINavHistoryService> serv =
-    do_GetService(NS_NAVHISTORYSERVICE_CONTRACTID);
-  do_check_true(serv);
-  return serv.forget();
-}
-
-already_AddRefed<mozIStorageConnection>
-do_get_db()
-{
-  nsCOMPtr<nsINavHistoryService> history = do_get_NavHistory();
-  nsCOMPtr<nsPIPlacesDatabase> database = do_QueryInterface(history);
-  do_check_true(database);
-
-  mozIStorageConnection* dbConn;
-  nsresult rv = database->GetDBConnection(&dbConn);
-  do_check_success(rv);
-  return dbConn;
-}
-
-/**
- * Get the place record from the database.
- *
- * @param aURI The unique URI of the place we are looking up
- * @param result Out parameter where the result is stored
- */
-void
-do_get_place(nsIURI* aURI, PlaceRecord& result)
-{
-  nsCOMPtr<mozIStorageConnection> dbConn = do_get_db();
-  nsCOMPtr<mozIStorageStatement> stmt;
-
-  nsCString spec;
-  nsresult rv = aURI->GetSpec(spec);
-  do_check_success(rv);
-
-  rv = dbConn->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT id, hidden, typed, visit_count FROM moz_places_temp "
-    "WHERE url=?1 "
-    "UNION ALL "
-    "SELECT id, hidden, typed, visit_count FROM moz_places "
-    "WHERE url=?1 "
-    "LIMIT 1"
-  ), getter_AddRefs(stmt));
-  do_check_success(rv);
-
-  rv = stmt->BindUTF8StringParameter(0, spec);
-  do_check_success(rv);
-
-  PRBool hasResults;
-  rv = stmt->ExecuteStep(&hasResults);
-  do_check_true(hasResults);
-  do_check_success(rv);
-
-  rv = stmt->GetInt64(0, &result.id);
-  do_check_success(rv);
-  rv = stmt->GetInt32(1, &result.hidden);
-  do_check_success(rv);
-  rv = stmt->GetInt32(2, &result.typed);
-  do_check_success(rv);
-  rv = stmt->GetInt32(3, &result.visitCount);
-  do_check_success(rv);
-}
-
-/**
- * Gets the most recent visit to a place.
- *
- * @param placeID ID from the moz_places table
- * @param result Out parameter where visit is stored
- */
-void
-do_get_lastVisit(PRInt64 placeId, VisitRecord& result)
-{
-  nsCOMPtr<mozIStorageConnection> dbConn = do_get_db();
-  nsCOMPtr<mozIStorageStatement> stmt;
-
-  nsresult rv = dbConn->CreateStatement(NS_LITERAL_CSTRING(
-    "SELECT id, from_visit, visit_type FROM moz_historyvisits_temp "
-    "WHERE place_id=?1 "
-    "UNION ALL "
-    "SELECT id, from_visit, visit_type FROM moz_historyvisits "
-    "WHERE place_id=?1 "
-    "LIMIT 1"
-  ), getter_AddRefs(stmt));
-  do_check_success(rv);
-
-  rv = stmt->BindInt64Parameter(0, placeId);
-  do_check_success(rv);
-
-  PRBool hasResults;
-  rv = stmt->ExecuteStep(&hasResults);
-  do_check_true(hasResults);
-  do_check_success(rv);
-
-  rv = stmt->GetInt64(0, &result.id);
-  do_check_success(rv);
-  rv = stmt->GetInt64(1, &result.lastVisitId);
-  do_check_success(rv);
-  rv = stmt->GetInt32(2, &result.transitionType);
-  do_check_success(rv);
-}
diff --git a/toolkit/components/places/tests/cpp/test_IHistory.cpp b/toolkit/components/places/tests/cpp/test_IHistory.cpp
index a8b506b14f1d..3f1c6fd2e0f0 100644
--- a/toolkit/components/places/tests/cpp/test_IHistory.cpp
+++ b/toolkit/components/places/tests/cpp/test_IHistory.cpp
@@ -38,7 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "places_test_harness.h"
-#include "nsIBrowserHistory.h"
 
 #include "mock_Link.h"
 using namespace mozilla::dom;
@@ -77,53 +76,6 @@ new_test_uri()
   return testURI.forget();
 }
 
-class VisitURIObserver : public nsIObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-
-  VisitURIObserver(int aExpectedVisits = 1) :
-    mVisits(0),
-    mExpectedVisits(aExpectedVisits)
-  {
-    nsCOMPtr<nsIObserverService> observerService =
-      do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
-    do_check_true(observerService);
-    (void)observerService->AddObserver(this,
-                                       "uri-visit-saved",
-                                       PR_FALSE);
-  }
-
-  void WaitForNotification()
-  {
-    while (mVisits < mExpectedVisits) {
-      (void)NS_ProcessNextEvent();
-    }
-  }
-
-  NS_IMETHOD Observe(nsISupports* aSubject,
-                     const char* aTopic,
-                     const PRUnichar* aData)
-  {
-    mVisits++;
-
-    if (mVisits == mExpectedVisits) {
-      nsCOMPtr<nsIObserverService> observerService =
-        do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
-      (void)observerService->RemoveObserver(this, "uri-visit-saved");
-    }
-
-    return NS_OK;
-  }
-private:
-  int mVisits;
-  int mExpectedVisits;
-};
-NS_IMPL_ISUPPORTS1(
-  VisitURIObserver,
-  nsIObserver
-)
-
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Functions
 
@@ -411,145 +363,6 @@ test_observer_topic_dispatched()
   run_next_test();
 }
 
-void
-test_visituri_inserts()
-{
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-
-  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
-
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
-  finisher->WaitForNotification();
-
-  PlaceRecord place;
-  do_get_place(visitedURI, place);
-
-  do_check_true(place.id > 0);
-  do_check_false(place.hidden);
-  do_check_false(place.typed);
-  do_check_true(place.visitCount == 1);
-
-  run_next_test();
-}
-
-void
-test_visituri_updates()
-{
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-  nsCOMPtr<VisitURIObserver> finisher;
-
-  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
-  finisher = new VisitURIObserver();
-  finisher->WaitForNotification();
-
-  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
-  finisher = new VisitURIObserver();
-  finisher->WaitForNotification();
-
-  PlaceRecord place;
-  do_get_place(visitedURI, place);
-
-  do_check_true(place.visitCount == 2);
-
-  run_next_test();
-}
-
-void
-test_visituri_preserves_shown_and_typed()
-{
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-
-  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
-  // this simulates the uri visit happening in a frame.  Normally frame
-  // transitions would be hidden unless it was previously loaded top-level
-  history->VisitURI(visitedURI, lastURI, 0);
-
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver(2);
-  finisher->WaitForNotification();
-
-  PlaceRecord place;
-  do_get_place(visitedURI, place);
-  do_check_false(place.hidden);
-
-  run_next_test();
-}
-
-void
-test_visituri_creates_visit()
-{
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-
-  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
-  finisher->WaitForNotification();
-
-  PlaceRecord place;
-  VisitRecord visit;
-  do_get_place(visitedURI, place);
-  do_get_lastVisit(place.id, visit);
-
-  do_check_true(visit.id > 0);
-  do_check_true(visit.lastVisitId == 0);
-  do_check_true(visit.transitionType == nsINavHistoryService::TRANSITION_LINK);
-
-  run_next_test();
-}
-
-void
-test_visituri_transition_typed()
-{
-  nsCOMPtr<nsINavHistoryService> navHistory = do_get_NavHistory();
-  nsCOMPtr<nsIBrowserHistory> browserHistory = do_QueryInterface(navHistory);
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-
-  browserHistory->MarkPageAsTyped(visitedURI);
-  history->VisitURI(visitedURI, lastURI, mozilla::IHistory::TOP_LEVEL);
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
-  finisher->WaitForNotification();
-
-  PlaceRecord place;
-  VisitRecord visit;
-  do_get_place(visitedURI, place);
-  do_get_lastVisit(place.id, visit);
-
-  do_check_true(visit.transitionType == nsINavHistoryService::TRANSITION_TYPED);
-
-  run_next_test();
-}
-
-void
-test_visituri_transition_embed()
-{
-  nsCOMPtr<nsINavHistoryService> navHistory = do_get_NavHistory();
-  nsCOMPtr<nsIBrowserHistory> browserHistory = do_QueryInterface(navHistory);
-  nsCOMPtr<IHistory> history(do_get_IHistory());
-  nsCOMPtr<nsIURI> lastURI(new_test_uri());
-  nsCOMPtr<nsIURI> visitedURI(new_test_uri());
-
-  history->VisitURI(visitedURI, lastURI, 0);
-  nsCOMPtr<VisitURIObserver> finisher = new VisitURIObserver();
-  finisher->WaitForNotification();
-
-  PlaceRecord place;
-  VisitRecord visit;
-  do_get_place(visitedURI, place);
-  do_get_lastVisit(place.id, visit);
-
-  do_check_true(visit.transitionType == nsINavHistoryService::TRANSITION_EMBED);
-
-  run_next_test();
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //// Test Harness
 
@@ -565,12 +378,6 @@ Test gTests[] = {
   TEST(test_new_visit_notifies_waiting_Link),
   TEST(test_RegisterVisitedCallback_returns_before_notifying),
   TEST(test_observer_topic_dispatched),
-  TEST(test_visituri_inserts),
-  TEST(test_visituri_updates),
-  TEST(test_visituri_preserves_shown_and_typed),
-  TEST(test_visituri_creates_visit),
-  TEST(test_visituri_transition_typed),
-  TEST(test_visituri_transition_embed),
 };
 
 const char* file = __FILE__;
diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
index ddd0d3c22adb..8682e86b942e 100644
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -113,7 +113,6 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../threads/_xpidlgen \
 		-I$(srcdir)/../proxy/src \
 		-I$(srcdir)/../reflect/xptinfo/src \
-		-I$(srcdir)/../../docshell/base \
 		$(NULL)
 
 EXPORTS_NAMESPACES = mozilla
diff --git a/xpcom/build/ServiceList.h b/xpcom/build/ServiceList.h
index 231470698ba0..9f6fc7906713 100644
--- a/xpcom/build/ServiceList.h
+++ b/xpcom/build/ServiceList.h
@@ -5,14 +5,3 @@ MOZ_SERVICE(XULOverlayProviderService, nsIXULOverlayProvider, "@mozilla.org/chro
 MOZ_SERVICE(IOService, nsIIOService, "@mozilla.org/network/io-service;1")
 MOZ_SERVICE(ObserverService, nsIObserverService, "@mozilla.org/observer-service;1")
 MOZ_SERVICE(StringBundleService, nsIStringBundleService, "@mozilla.org/intl/stringbundle;1")
-
-#ifdef MOZ_USE_NAMESPACE
-namespace mozilla
-{
-#endif
-
-MOZ_SERVICE(HistoryService, IHistory, "@mozilla.org/browser/history;1")
-
-#ifdef MOZ_USE_NAMESPACE
-}
-#endif
diff --git a/xpcom/build/Services.cpp b/xpcom/build/Services.cpp
index 8f7477a1c61b..2dd1b0f87e4e 100644
--- a/xpcom/build/Services.cpp
+++ b/xpcom/build/Services.cpp
@@ -48,9 +48,7 @@
 #include "nsIStringBundle.h"
 #include "nsIToolkitChromeRegistry.h"
 #include "nsIXULOverlayProvider.h"
-#include "IHistory.h"
 
-using namespace mozilla;
 using namespace mozilla::services;
 
 /*
diff --git a/xpcom/build/Services.h b/xpcom/build/Services.h
index 43e0c97fdd15..e4d1f70b1f22 100644
--- a/xpcom/build/Services.h
+++ b/xpcom/build/Services.h
@@ -42,12 +42,9 @@
 #include "nscore.h"
 #include "nsCOMPtr.h"
 
-#define MOZ_USE_NAMESPACE
 #define MOZ_SERVICE(NAME, TYPE, SERVICE_CID) class TYPE;
-
 #include "ServiceList.h"
 #undef MOZ_SERVICE
-#undef MOZ_USE_NAMESPACE
 
 namespace mozilla {
 namespace services {

From 321694e97f7f0e34082f08564fa8f5ffb01c7df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sat, 26 Jun 2010 16:49:15 +0200
Subject: [PATCH 065/172] Bug 574861 - Windows should never be movable in
 fullscreen mode. r=enn

---
 toolkit/content/WindowDraggingUtils.jsm | 4 +++-
 toolkit/content/widgets/toolbar.xml     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolkit/content/WindowDraggingUtils.jsm b/toolkit/content/WindowDraggingUtils.jsm
index 7c800e5b53b8..bf5fd8a57df5 100644
--- a/toolkit/content/WindowDraggingUtils.jsm
+++ b/toolkit/content/WindowDraggingUtils.jsm
@@ -50,7 +50,9 @@ WindowDraggingElement.prototype = {
   handleEvent: function(aEvent) {
     switch (aEvent.type) {
       case "mousedown":
-        if (aEvent.button != 0 || !this.mouseDownCheck.call(this._elem, aEvent) ||
+        if (aEvent.button != 0 ||
+            this._window.fullScreen ||
+            !this.mouseDownCheck.call(this._elem, aEvent) ||
             aEvent.getPreventDefault())
           return;
 
diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index 943426f92f4d..c84c02c37466 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -447,8 +447,8 @@
             Components.utils.import("resource://gre/modules/WindowDraggingUtils.jsm");
             let draggableThis = new WindowDraggingElement(this, window);
             draggableThis.mouseDownCheck = function(e) {
-              // Don't move while customizing or while in full screen mode.
-              return !this.parentNode.customizing && !window.fullScreen;
+              // Don't move while customizing.
+              return !this.parentNode.customizing;
             }
           } catch (e) {}
         }

From d60c1164a92c1f173bbbf924f729714906311b8f Mon Sep 17 00:00:00 2001
From: Geoff Lankow <geoff@darktrojan.net>
Date: Thu, 24 Jun 2010 13:12:07 +1200
Subject: [PATCH 066/172] Bug 300992 - implement readystatechange event.
 r=smaug, sr=jst

---
 content/base/src/nsContentUtils.cpp   |  1 +
 content/base/src/nsDocument.cpp       |  8 ++++-
 content/base/src/nsGkAtomList.h       |  1 +
 content/base/test/Makefile.in         |  1 +
 content/base/test/test_bug300992.html | 46 +++++++++++++++++++++++++++
 content/events/src/nsDOMEvent.cpp     |  7 ++--
 content/events/src/nsDOMEvent.h       |  1 +
 dom/base/nsDOMClassInfo.cpp           |  6 +++-
 dom/base/nsDOMClassInfo.h             |  1 +
 widget/public/nsGUIEvent.h            |  1 +
 widget/src/xpwidgets/nsBaseWidget.cpp |  1 +
 11 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 content/base/test/test_bug300992.html

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index d71ea94d1c21..9ee9cde4348e 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -495,6 +495,7 @@ nsContentUtils::InitializeEventTable() {
     { nsGkAtoms::onunload,                      NS_PAGE_UNLOAD,
                                                 (EventNameType_HTMLXUL | EventNameType_SVGSVG), NS_EVENT },
     { nsGkAtoms::onhashchange,                  NS_HASHCHANGE, EventNameType_HTMLXUL, NS_EVENT },
+    { nsGkAtoms::onreadystatechange,            NS_READYSTATECHANGE, EventNameType_HTMLXUL },
     { nsGkAtoms::onbeforeunload,                NS_BEFORE_PAGE_UNLOAD, EventNameType_HTMLXUL, NS_EVENT },
     { nsGkAtoms::onabort,                       NS_IMAGE_ABORT,
                                                 (EventNameType_HTMLXUL | EventNameType_SVGSVG), NS_EVENT },
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index acc9ad06e27b..664eca314cd6 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -70,6 +70,7 @@
 #include "nsCOMArray.h"
 
 #include "nsGUIEvent.h"
+#include "nsPLDOMEvent.h"
 
 #include "nsIDOMStyleSheet.h"
 #include "nsDOMAttribute.h"
@@ -7318,7 +7319,12 @@ void
 nsDocument::SetReadyStateInternal(ReadyState rs)
 {
   mReadyState = rs;
-  // TODO fire "readystatechange"
+
+  nsRefPtr<nsPLDOMEvent> plevent =
+    new nsPLDOMEvent(this, NS_LITERAL_STRING("readystatechange"), PR_FALSE, PR_FALSE); 
+  if (plevent) {
+    plevent->RunDOMEventWhenSafe();
+  }
 }
 
 nsIDocument::ReadyState
diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index b13f0c74feea..c15bfcd386b0 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -679,6 +679,7 @@ GK_ATOM(onpopuphidden, "onpopuphidden")
 GK_ATOM(onpopuphiding, "onpopuphiding")
 GK_ATOM(onpopupshowing, "onpopupshowing")
 GK_ATOM(onpopupshown, "onpopupshown")
+GK_ATOM(onreadystatechange, "onreadystatechange")
 GK_ATOM(onRequest, "onRequest")
 GK_ATOM(onreset, "onreset")
 GK_ATOM(onresize, "onresize")
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
index 97802778545a..9695c144c86b 100644
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -394,6 +394,7 @@ _TEST_FILES2 = \
 		test_html_colors_quirks.html \
 		test_html_colors_standards.html \
 		test_bug571390.xul \
+		test_bug300992.html \
 		test_websocket_hello.html \
 		file_websocket_hello_wsh.py \
 		test_ws_basic_tests.html \
diff --git a/content/base/test/test_bug300992.html b/content/base/test/test_bug300992.html
new file mode 100644
index 000000000000..97d727c52ed0
--- /dev/null
+++ b/content/base/test/test_bug300992.html
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=300992
+-->
+<head>
+  <title>Test for Bug 300992</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=300992">Mozilla Bug 300992</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 300992 **/
+SimpleTest.waitForExplicitFinish();
+
+var i = 0;
+var states = ['loading',
+  'interactive1', 'interactive2',
+  'complete1', 'complete2'];
+
+is(document.readyState, states[i++], 'initial readyState');
+document.onreadystatechange = function (event) {
+  is(document.readyState + '1', states[i++], 'readystatechange event "on" handler');
+};
+document.addEventListener('readystatechange', function(event) {
+  is(document.readyState + '2', states[i++], 'readystatechange event document listener');
+}, false);
+window.addEventListener('readystatechange', function(event) {
+  ok(false, 'window listener', 'readystatechange event should not bubble to window');
+}, false);
+setTimeout(function() {
+  is(i, states.length, 'readystatechange event count');
+  SimpleTest.finish();
+}, 1000);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index f5f9992444b3..4b90cc7db9e5 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -59,8 +59,9 @@
 static const char* const sEventNames[] = {
   "mousedown", "mouseup", "click", "dblclick", "mouseover",
   "mouseout", "mousemove", "contextmenu", "keydown", "keyup", "keypress",
-  "focus", "blur", "load", "popstate", "beforeunload", "unload", "hashchange",
-  "abort", "error", "submit", "reset", "change", "select", "input", "text",
+  "focus", "blur", "load", "popstate", "beforeunload", "unload",
+  "hashchange", "readystatechange", "abort", "error",
+  "submit", "reset", "change", "select", "input", "text",
   "compositionstart", "compositionend", "popupshowing", "popupshown",
   "popuphiding", "popuphidden", "close", "command", "broadcast", "commandupdate",
   "dragenter", "dragover", "dragexit", "dragdrop", "draggesture",
@@ -1100,6 +1101,8 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
     return sEventNames[eDOMEvents_unload];
   case NS_HASHCHANGE:
     return sEventNames[eDOMEvents_hashchange];
+  case NS_READYSTATECHANGE:
+    return sEventNames[eDOMEvents_readystatechange];
   case NS_IMAGE_ABORT:
     return sEventNames[eDOMEvents_abort];
   case NS_LOAD_ERROR:
diff --git a/content/events/src/nsDOMEvent.h b/content/events/src/nsDOMEvent.h
index 4f1a03b48abe..61bddf38dbca 100644
--- a/content/events/src/nsDOMEvent.h
+++ b/content/events/src/nsDOMEvent.h
@@ -79,6 +79,7 @@ public:
     eDOMEvents_beforeunload,
     eDOMEvents_unload,
     eDOMEvents_hashchange,
+    eDOMEvents_readystatechange,
     eDOMEvents_abort,
     eDOMEvents_error,
     eDOMEvents_submit,
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index c49c67f24e34..87786a0e05c7 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -1532,6 +1532,7 @@ jsval nsDOMClassInfo::sOnpopstate_id      = JSVAL_VOID;
 jsval nsDOMClassInfo::sOnbeforeunload_id  = JSVAL_VOID;
 jsval nsDOMClassInfo::sOnunload_id        = JSVAL_VOID;
 jsval nsDOMClassInfo::sOnhashchange_id    = JSVAL_VOID;
+jsval nsDOMClassInfo::sOnreadystatechange_id = JSVAL_VOID;
 jsval nsDOMClassInfo::sOnpageshow_id      = JSVAL_VOID;
 jsval nsDOMClassInfo::sOnpagehide_id      = JSVAL_VOID;
 jsval nsDOMClassInfo::sOnabort_id         = JSVAL_VOID;
@@ -1733,6 +1734,7 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
   SET_JSVAL_TO_STRING(sOnbeforeunload_id,  cx, "onbeforeunload");
   SET_JSVAL_TO_STRING(sOnunload_id,        cx, "onunload");
   SET_JSVAL_TO_STRING(sOnhashchange_id,    cx, "onhashchange");
+  SET_JSVAL_TO_STRING(sOnreadystatechange_id, cx, "onreadystatechange");
   SET_JSVAL_TO_STRING(sOnpageshow_id,      cx, "onpageshow");
   SET_JSVAL_TO_STRING(sOnpagehide_id,      cx, "onpagehide");
   SET_JSVAL_TO_STRING(sOnabort_id,         cx, "onabort");
@@ -4709,6 +4711,7 @@ nsDOMClassInfo::ShutDown()
   sOnbeforeunload_id  = JSVAL_VOID;
   sOnunload_id        = JSVAL_VOID;
   sOnhashchange_id    = JSVAL_VOID;
+  sOnreadystatechange_id = JSVAL_VOID;
   sOnpageshow_id      = JSVAL_VOID;
   sOnpagehide_id      = JSVAL_VOID;
   sOnabort_id         = JSVAL_VOID;
@@ -7646,7 +7649,8 @@ nsEventReceiverSH::ReallyIsEventName(jsval id, jschar aFirstChar)
             id == sOnmouseup_id      ||
             id == sOnmousedown_id);
   case 'r' :
-    return (id == sOnreset_id        ||
+    return (id == sOnreadystatechange_id ||
+            id == sOnreset_id            ||
             id == sOnresize_id);
   case 's' :
     return (id == sOnscroll_id       ||
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index 9ae2f9e12c40..8f0a97fe8e33 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -321,6 +321,7 @@ protected:
   static jsval sOnbeforeunload_id;
   static jsval sOnunload_id;
   static jsval sOnhashchange_id;
+  static jsval sOnreadystatechange_id;
   static jsval sOnpageshow_id;
   static jsval sOnpagehide_id;
   static jsval sOnabort_id;
diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index 0736b7236c52..2fa998a30751 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -246,6 +246,7 @@ class nsHashKey;
 #define NS_POPSTATE                     (NS_STREAM_EVENT_START + 5)
 #define NS_BEFORE_PAGE_UNLOAD           (NS_STREAM_EVENT_START + 6)
 #define NS_PAGE_RESTORE                 (NS_STREAM_EVENT_START + 7)
+#define NS_READYSTATECHANGE             (NS_STREAM_EVENT_START + 8)
  
 #define NS_FORM_EVENT_START             1200
 #define NS_FORM_SUBMIT                  (NS_FORM_EVENT_START)
diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp
index ac583ebfe2fc..c82077462b27 100644
--- a/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -1201,6 +1201,7 @@ case _value: eventName.AssignWithConversion(_name) ; break
     _ASSIGN_eventName(NS_POPSTATE,"NS_POPSTATE");
     _ASSIGN_eventName(NS_PAGE_UNLOAD,"NS_PAGE_UNLOAD");
     _ASSIGN_eventName(NS_HASHCHANGE,"NS_HASHCHANGE");
+    _ASSIGN_eventName(NS_READYSTATECHANGE,"NS_READYSTATECHANGE");
     _ASSIGN_eventName(NS_PAINT,"NS_PAINT");
     _ASSIGN_eventName(NS_XUL_BROADCAST, "NS_XUL_BROADCAST");
     _ASSIGN_eventName(NS_XUL_COMMAND_UPDATE, "NS_XUL_COMMAND_UPDATE");

From 1e5ec4980c917324ec81c8302fef1fd46a04bc18 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 26 Jun 2010 18:22:20 +0200
Subject: [PATCH 067/172] Bug 574708 - bookmarks button looks ugly if not in
 icon mode. r=dao

---
 browser/themes/gnomestripe/browser/browser.css | 2 +-
 browser/themes/pinstripe/browser/browser.css   | 2 +-
 browser/themes/winstripe/browser/browser.css   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index c7fa7c4e0d0e..ad4a20b9513c 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -580,7 +580,7 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
   list-style-image: url("chrome://browser/skin/Toolbar-small.png");
 }
 
-toolbar[mode="icons"] #bookmarks-menu-button.toolbarbutton-1 {
+#bookmarks-menu-button.toolbarbutton-1 {
   -moz-box-orient: horizontal;
 }
 
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 492892cccd4f..a9222104c83e 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -578,7 +578,7 @@ toolbar[iconsize="small"][mode="icons"] #forward-button:-moz-locale-dir(rtl) {
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-toolbar[mode="icons"] #bookmarks-menu-button.toolbarbutton-1 {
+#bookmarks-menu-button.toolbarbutton-1 {
   -moz-box-orient: horizontal;
 }
 
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 334e92ca6644..52a6da8dfe43 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -605,7 +605,7 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
   list-style-image: url("chrome://browser/skin/Toolbar.png");
 }
 
-toolbar[mode="icons"] #bookmarks-menu-button.toolbarbutton-1 {
+#bookmarks-menu-button.toolbarbutton-1 {
   -moz-box-orient: horizontal;
 }
 

From 355d5ef8a038d7404cdacd5a7268c95f5a9304e9 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Sat, 26 Jun 2010 18:24:03 +0200
Subject: [PATCH 068/172] Bug 574708 - Deformed back button when bookmarks
 button is on navigation bar. r=dao

---
 browser/themes/pinstripe/browser/browser.css | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index a9222104c83e..0cba7b9c83b0 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -328,14 +328,8 @@ toolbar[mode="icons"] toolbarbutton[type="menu-button"] > .toolbarbutton-menubut
 #restore-button > .toolbarbutton-icon,
 toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   padding: 0;
-  max-height: 20px;
-}
-
-/* Only set the max-width in icon-only mode because it affects the label, too */
-toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-icon,
-toolbar[mode="icons"] #restore-button > .toolbarbutton-icon,
-toolbar[mode="icons"] toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
-  max-width: 20px;
+  height: 20px;
+  width: 20px;
 }
 
 .toolbarbutton-1[disabled="true"] > .toolbarbutton-icon,

From 4279d6537177a2da77ef172d2bdd61acc2352013 Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@sun.com>
Date: Sun, 27 Jun 2010 00:53:42 +0800
Subject: [PATCH 069/172] Bug 568027 Fix test_plugins.js |2 == 8| with build in
 homedir r=dtownsend

---
 toolkit/components/ctypes/tests/jsctypes-test.cpp | 4 ++--
 toolkit/components/ctypes/tests/jsctypes-test.h   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/ctypes/tests/jsctypes-test.cpp b/toolkit/components/ctypes/tests/jsctypes-test.cpp
index 57ee7d0b6a78..07d85fe0ff08 100644
--- a/toolkit/components/ctypes/tests/jsctypes-test.cpp
+++ b/toolkit/components/ctypes/tests/jsctypes-test.cpp
@@ -314,14 +314,14 @@ test_fnptr()
 }
 
 PRInt32
-test_closure_cdecl(PRInt8 i, PRInt32 (*f)(PRInt8))
+test_closure_cdecl(PRInt8 i, test_func_ptr f)
 {
   return f(i);
 }
 
 #if defined(_WIN32) && !defined(_WIN64)
 PRInt32
-test_closure_cdecl(PRInt8 i, PRInt32 (NS_STDCALL *f)(PRInt8))
+test_closure_cdecl(PRInt8 i, test_func_ptr_stdcall f)
 {
   return f(i);
 }
diff --git a/toolkit/components/ctypes/tests/jsctypes-test.h b/toolkit/components/ctypes/tests/jsctypes-test.h
index f4631954a5f7..c5c315e19218 100644
--- a/toolkit/components/ctypes/tests/jsctypes-test.h
+++ b/toolkit/components/ctypes/tests/jsctypes-test.h
@@ -188,8 +188,10 @@ NS_EXTERN_C
 
   NS_EXPORT void * test_fnptr();
 
-  NS_EXPORT PRInt32 test_closure_cdecl(PRInt8, PRInt32 (*)(PRInt8));
+  typedef PRInt32 (* test_func_ptr)(PRInt8);
+  NS_EXPORT PRInt32 test_closure_cdecl(PRInt8, test_func_ptr);
 #if defined(_WIN32) && !defined(_WIN64)
+  typedef PRInt32 (NS_STDCALL * test_func_ptr_stdcall)(PRInt8);
   NS_EXPORT PRInt32 test_closure_stdcall(PRInt8, PRInt32 (NS_STDCALL *)(PRInt8));
 #endif /* defined(_WIN32) && !defined(_WIN64) */
 

From db55ed13433c0909aaa3f653733628e85715bb3a Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@sun.com>
Date: Sun, 27 Jun 2010 00:54:05 +0800
Subject: [PATCH 070/172] Bug 573004 jsctypes-test: test_closure_cdecl is
 mangled with Sun Studio r=dwitte

---
 .../mozapps/extensions/test/xpcshell/test_plugins.js  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js b/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
index 585a9c2c943b..c99c55bedd50 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
@@ -62,11 +62,14 @@ function run_test_1() {
       // Work around the fact that on Linux source builds, if we're using
       // symlinks (i.e. objdir), then Linux will see these as a different scope
       // to non-symlinks.
+      // See Bug 562886 and Bug 568027.
       let pluginLoc = get_unix_test_plugin();
-      let pluginScope = AddonManager.SCOPE_APPLICATION;
-      if (pluginLoc && pluginLoc.isSymlink())
-        pluginScope = AddonManager.SCOPE_SYSTEM;
-      do_check_eq(p.scope, pluginScope);
+      if (pluginLoc && pluginLoc.isSymlink()) {
+        do_check_neq(p.scope, AddonManager.SCOPE_APPLICATION);
+        do_check_neq(p.scope, AddonManager.SCOPE_PROFILE);
+      } else {
+        do_check_eq(p.scope, AddonManager.SCOPE_APPLICATION);
+      }
       do_check_true("isCompatibleWith" in p);
       do_check_true("findUpdates" in p);
 

From 8b0322b1e86997bb95fc51d86b82162381d396b4 Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@sun.com>
Date: Sun, 27 Jun 2010 00:55:05 +0800
Subject: [PATCH 071/172] Bug 571211 Sun Studio doesn't support 64bit enum for
 32bit mode r=dbaron

---
 layout/generic/nsIFrame.h | 182 +++++++++++++++++++-------------------
 1 file changed, 90 insertions(+), 92 deletions(-)

diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index bf4c4de363b4..64465c41b9d4 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -146,21 +146,20 @@ typedef PRUint64 nsFrameState;
 
 #define NS_FRAME_STATE_BIT(n_) (nsFrameState(1) << (n_))
 
-enum {
-  NS_FRAME_IN_REFLOW =                          NS_FRAME_STATE_BIT(0),
+#define NS_FRAME_IN_REFLOW                          NS_FRAME_STATE_BIT(0)
 
-  // This is only set during painting
-  NS_FRAME_FORCE_DISPLAY_LIST_DESCEND_INTO =    NS_FRAME_STATE_BIT(0),
+// This is only set during painting
+#define NS_FRAME_FORCE_DISPLAY_LIST_DESCEND_INTO    NS_FRAME_STATE_BIT(0)
 
-  // This bit is set when a frame is created. After it has been reflowed
-  // once (during the DidReflow with a finished state) the bit is
-  // cleared.
-  NS_FRAME_FIRST_REFLOW =                       NS_FRAME_STATE_BIT(1),
+// This bit is set when a frame is created. After it has been reflowed
+// once (during the DidReflow with a finished state) the bit is
+// cleared.
+#define NS_FRAME_FIRST_REFLOW                       NS_FRAME_STATE_BIT(1)
 
-  // For a continuation frame, if this bit is set, then this a "fluid" 
-  // continuation, i.e., across a line boundary. Otherwise it's a "hard"
-  // continuation, e.g. a bidi continuation.
-  NS_FRAME_IS_FLUID_CONTINUATION =              NS_FRAME_STATE_BIT(2),
+// For a continuation frame, if this bit is set, then this a "fluid" 
+// continuation, i.e., across a line boundary. Otherwise it's a "hard"
+// continuation, e.g. a bidi continuation.
+#define NS_FRAME_IS_FLUID_CONTINUATION              NS_FRAME_STATE_BIT(2)
 
 /*
  * This bit is obsolete, replaced by HasOverflowRect().
@@ -168,108 +167,107 @@ enum {
  * that this bit is now free to allocate for other purposes.
  * // This bit is set when the frame's overflow rect is
  * // different from its border rect (i.e. GetOverflowRect() != GetRect())
- * NS_FRAME_OUTSIDE_CHILDREN =                   NS_FRAME_STATE_BIT(3),
+ * NS_FRAME_OUTSIDE_CHILDREN                        NS_FRAME_STATE_BIT(3)
  */
 
-  // If this bit is set, then a reference to the frame is being held
-  // elsewhere.  The frame may want to send a notification when it is
-  // destroyed to allow these references to be cleared.
-  NS_FRAME_EXTERNAL_REFERENCE =                 NS_FRAME_STATE_BIT(4),
+// If this bit is set, then a reference to the frame is being held
+// elsewhere.  The frame may want to send a notification when it is
+// destroyed to allow these references to be cleared.
+#define NS_FRAME_EXTERNAL_REFERENCE                 NS_FRAME_STATE_BIT(4)
 
-  // If this bit is set, this frame or one of its descendants has a
-  // percentage height that depends on an ancestor of this frame.
-  // (Or it did at one point in the past, since we don't necessarily clear
-  // the bit when it's no longer needed; it's an optimization.)
-  NS_FRAME_CONTAINS_RELATIVE_HEIGHT =           NS_FRAME_STATE_BIT(5),
+// If this bit is set, this frame or one of its descendants has a
+// percentage height that depends on an ancestor of this frame.
+// (Or it did at one point in the past, since we don't necessarily clear
+// the bit when it's no longer needed; it's an optimization.)
+#define  NS_FRAME_CONTAINS_RELATIVE_HEIGHT          NS_FRAME_STATE_BIT(5)
 
-  // If this bit is set, then the frame corresponds to generated content
-  NS_FRAME_GENERATED_CONTENT =                  NS_FRAME_STATE_BIT(6),
+// If this bit is set, then the frame corresponds to generated content
+#define NS_FRAME_GENERATED_CONTENT                  NS_FRAME_STATE_BIT(6)
 
-  // If this bit is set the frame is a continuation that is holding overflow,
-  // i.e. it is a next-in-flow created to hold overflow after the box's
-  // height has ended. This means the frame should be a) at the top of the
-  // page and b) invisible: no borders, zero height, ignored in margin
-  // collapsing, etc. See nsContainerFrame.h
-  NS_FRAME_IS_OVERFLOW_CONTAINER =              NS_FRAME_STATE_BIT(7),
+// If this bit is set the frame is a continuation that is holding overflow,
+// i.e. it is a next-in-flow created to hold overflow after the box's
+// height has ended. This means the frame should be a) at the top of the
+// page and b) invisible: no borders, zero height, ignored in margin
+// collapsing, etc. See nsContainerFrame.h
+#define NS_FRAME_IS_OVERFLOW_CONTAINER              NS_FRAME_STATE_BIT(7)
 
-  // If this bit is set, then the frame has been moved out of the flow,
-  // e.g., it is absolutely positioned or floated
-  NS_FRAME_OUT_OF_FLOW =                        NS_FRAME_STATE_BIT(8),
+// If this bit is set, then the frame has been moved out of the flow,
+// e.g., it is absolutely positioned or floated
+#define NS_FRAME_OUT_OF_FLOW                        NS_FRAME_STATE_BIT(8)
 
-  // If this bit is set, then the frame reflects content that may be selected
-  NS_FRAME_SELECTED_CONTENT =                   NS_FRAME_STATE_BIT(9),
+// If this bit is set, then the frame reflects content that may be selected
+#define NS_FRAME_SELECTED_CONTENT                   NS_FRAME_STATE_BIT(9)
 
-  // If this bit is set, then the frame is dirty and needs to be reflowed.
-  // This bit is set when the frame is first created.
-  // This bit is cleared by DidReflow after the required call to Reflow has
-  // finished.
-  // Do not set this bit yourself if you plan to pass the frame to
-  // nsIPresShell::FrameNeedsReflow.  Pass the right arguments instead.
-  NS_FRAME_IS_DIRTY =                           NS_FRAME_STATE_BIT(10),
+// If this bit is set, then the frame is dirty and needs to be reflowed.
+// This bit is set when the frame is first created.
+// This bit is cleared by DidReflow after the required call to Reflow has
+// finished.
+// Do not set this bit yourself if you plan to pass the frame to
+// nsIPresShell::FrameNeedsReflow.  Pass the right arguments instead.
+#define NS_FRAME_IS_DIRTY                           NS_FRAME_STATE_BIT(10)
 
-  // If this bit is set then the frame is too deep in the frame tree, and
-  // we'll stop updating it and its children, to prevent stack overflow
-  // and the like.
-  NS_FRAME_TOO_DEEP_IN_FRAME_TREE =             NS_FRAME_STATE_BIT(11),
+// If this bit is set then the frame is too deep in the frame tree, and
+// we'll stop updating it and its children, to prevent stack overflow
+// and the like.
+#define NS_FRAME_TOO_DEEP_IN_FRAME_TREE             NS_FRAME_STATE_BIT(11)
 
-  // If this bit is set, either:
-  //  1. the frame has children that have either NS_FRAME_IS_DIRTY or
-  //     NS_FRAME_HAS_DIRTY_CHILDREN, or
-  //  2. the frame has had descendants removed.
-  // It means that Reflow needs to be called, but that Reflow will not
-  // do as much work as it would if NS_FRAME_IS_DIRTY were set.
-  // This bit is cleared by DidReflow after the required call to Reflow has
-  // finished.
-  // Do not set this bit yourself if you plan to pass the frame to
-  // nsIPresShell::FrameNeedsReflow.  Pass the right arguments instead.
-  NS_FRAME_HAS_DIRTY_CHILDREN =                 NS_FRAME_STATE_BIT(12),
+// If this bit is set, either:
+//  1. the frame has children that have either NS_FRAME_IS_DIRTY or
+//     NS_FRAME_HAS_DIRTY_CHILDREN, or
+//  2. the frame has had descendants removed.
+// It means that Reflow needs to be called, but that Reflow will not
+// do as much work as it would if NS_FRAME_IS_DIRTY were set.
+// This bit is cleared by DidReflow after the required call to Reflow has
+// finished.
+// Do not set this bit yourself if you plan to pass the frame to
+// nsIPresShell::FrameNeedsReflow.  Pass the right arguments instead.
+#define NS_FRAME_HAS_DIRTY_CHILDREN                 NS_FRAME_STATE_BIT(12)
 
-  // If this bit is set, the frame has an associated view
-  NS_FRAME_HAS_VIEW =                           NS_FRAME_STATE_BIT(13),
+// If this bit is set, the frame has an associated view
+#define NS_FRAME_HAS_VIEW                           NS_FRAME_STATE_BIT(13)
 
-  // If this bit is set, the frame was created from anonymous content.
-  NS_FRAME_INDEPENDENT_SELECTION =              NS_FRAME_STATE_BIT(14),
+// If this bit is set, the frame was created from anonymous content.
+#define NS_FRAME_INDEPENDENT_SELECTION              NS_FRAME_STATE_BIT(14)
 
-  // If this bit is set, the frame is "special" (lame term, I know),
-  // which means that it is part of the mangled frame hierarchy that
-  // results when an inline has been split because of a nested block.
-  // See the comments in nsCSSFrameConstructor::ConstructInline for
-  // more details.
-  NS_FRAME_IS_SPECIAL =                         NS_FRAME_STATE_BIT(15),
+// If this bit is set, the frame is "special" (lame term, I know),
+// which means that it is part of the mangled frame hierarchy that
+// results when an inline has been split because of a nested block.
+// See the comments in nsCSSFrameConstructor::ConstructInline for
+// more details.
+#define NS_FRAME_IS_SPECIAL                         NS_FRAME_STATE_BIT(15)
 
-  // If this bit is set, the frame may have a transform that it applies
-  // to its coordinate system (e.g. CSS transform, SVG foreignObject).
-  // This is used primarily in GetTransformMatrix to optimize for the
-  // common case.
-  // ALSO, if this bit is set, the frame's first-continuation may
-  // have an associated nsSVGRenderingObserverList.
-  NS_FRAME_MAY_BE_TRANSFORMED_OR_HAVE_RENDERING_OBSERVERS =
-                                                NS_FRAME_STATE_BIT(16),
+// If this bit is set, the frame may have a transform that it applies
+// to its coordinate system (e.g. CSS transform, SVG foreignObject).
+// This is used primarily in GetTransformMatrix to optimize for the
+// common case.
+// ALSO, if this bit is set, the frame's first-continuation may
+// have an associated nsSVGRenderingObserverList.
+#define  NS_FRAME_MAY_BE_TRANSFORMED_OR_HAVE_RENDERING_OBSERVERS \
+                                                    NS_FRAME_STATE_BIT(16)
 
 #ifdef IBMBIDI
-  // If this bit is set, the frame itself is a bidi continuation,
-  // or is incomplete (its next sibling is a bidi continuation)
-  NS_FRAME_IS_BIDI =                            NS_FRAME_STATE_BIT(17),
+// If this bit is set, the frame itself is a bidi continuation,
+// or is incomplete (its next sibling is a bidi continuation)
+#define NS_FRAME_IS_BIDI                            NS_FRAME_STATE_BIT(17)
 #endif
 
-  // If this bit is set the frame has descendant with a view
-  NS_FRAME_HAS_CHILD_WITH_VIEW =                NS_FRAME_STATE_BIT(18),
+// If this bit is set the frame has descendant with a view
+#define NS_FRAME_HAS_CHILD_WITH_VIEW                NS_FRAME_STATE_BIT(18)
 
-  // If this bit is set, then reflow may be dispatched from the current
-  // frame instead of the root frame.
-  NS_FRAME_REFLOW_ROOT =                        NS_FRAME_STATE_BIT(19),
+// If this bit is set, then reflow may be dispatched from the current
+// frame instead of the root frame.
+#define NS_FRAME_REFLOW_ROOT                        NS_FRAME_STATE_BIT(19)
 
-  // Bits 20-31 of the frame state are reserved for implementations.
-  NS_FRAME_IMPL_RESERVED =                      nsFrameState(0xFFF00000),
+// Bits 20-31 of the frame state are reserved for implementations.
+#define NS_FRAME_IMPL_RESERVED                      nsFrameState(0xFFF00000)
 
-  // The lower 20 bits and upper 32 bits of the frame state are reserved
-  // by this API.
-  NS_FRAME_RESERVED =                           ~NS_FRAME_IMPL_RESERVED,
+// The lower 20 bits and upper 32 bits of the frame state are reserved
+// by this API.
+#define NS_FRAME_RESERVED                           ~NS_FRAME_IMPL_RESERVED
 
-  // Box layout bits
-  NS_STATE_IS_HORIZONTAL =                      NS_FRAME_STATE_BIT(22),
-  NS_STATE_IS_DIRECTION_NORMAL =                NS_FRAME_STATE_BIT(31)
-};
+// Box layout bits
+#define NS_STATE_IS_HORIZONTAL                      NS_FRAME_STATE_BIT(22)
+#define NS_STATE_IS_DIRECTION_NORMAL                NS_FRAME_STATE_BIT(31)
 
 // Helper macros
 #define NS_SUBTREE_DIRTY(_frame)  \

From b8f8b9b8aaf930a09d7f316c47514e634a33fc98 Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@sun.com>
Date: Sun, 27 Jun 2010 00:56:07 +0800
Subject: [PATCH 072/172] Bug 574639 Several fixes for configure.in and
 rules.mk for Solaris r=bsmedberg

---
 config/rules.mk        |  1 -
 configure.in           | 68 +++++++++++++++++++++++++-----------------
 js/src/config/rules.mk |  1 -
 js/src/configure.in    | 60 ++++++++++++++++++++-----------------
 4 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/config/rules.mk b/config/rules.mk
index 553d7349dbfb..2264e255101b 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -355,7 +355,6 @@ endif # ENABLE_CXX_EXCEPTIONS
 endif # WINNT
 
 ifeq ($(SOLARIS_SUNPRO_CXX),1)
-CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
 ifeq (86,$(findstring 86,$(OS_TEST)))
 OS_LDFLAGS += -M $(topsrcdir)/config/solaris_ia32.map
 endif # x86
diff --git a/configure.in b/configure.in
index d437a161e9a2..a4e8f35c11d5 100644
--- a/configure.in
+++ b/configure.in
@@ -1604,15 +1604,6 @@ if test "$GNU_CC"; then
     _DEFINES_CFLAGS='-include $(DEPTH)/mozilla-config.h -DMOZILLA_CLIENT'
     _USE_CPP_INCLUDE_FLAG=1
 elif test "$SOLARIS_SUNPRO_CC"; then
-    MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-    MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-
-    DSO_LDOPTS='-shared'
-    if test "$GNU_LD"; then
-        # Don't allow undefined symbols in libraries
-        DSO_LDOPTS="$DSO_LDOPTS -z defs"
-    fi
-
     DSO_CFLAGS=''
     if test "$CPU_ARCH" = "sparc"; then
         # for Sun Studio on Solaris/SPARC
@@ -2722,19 +2713,19 @@ alpha*-*-osf*)
     AC_DEFINE(SOLARIS)
     TARGET_NSPR_MDCPUCFG='\"md/_solaris.cfg\"'
     SYSTEM_MAKEDEPEND=
+    MOZ_FIX_LINK_PATHS=
     # $ORIGIN/.. is for shared libraries under components/ to locate shared
     # libraries one level up (e.g. libnspr4.so)
-    LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..'"
     if test "$SOLARIS_SUNPRO_CC"; then
-       LIBS="-lCrun -lCstd $LIBS"
+       LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..' -z lazyload -z combreloc -z muldefs"
+       LIBS="-lCrun -lCstd -lc $LIBS"
        NS_USE_NATIVE=1
-       MOZ_FIX_LINK_PATHS=
        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
-       CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all"
-       CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic -norunpath"
+       CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all -D__FUNCTION__=__func__"
+       CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions -norunpath -D__FUNCTION__=__func__"
        _MOZ_EXCEPTIONS_FLAGS_ON='-features=except'
        _MOZ_EXCEPTIONS_FLAGS_OFF='-features=no%except'
-       LDFLAGS="-xildoff -z lazyload -z combreloc $LDFLAGS"
+       LDFLAGS="-xildoff $LDFLAGS"
        if test -z "$CROSS_COMPILE" && test -f /usr/lib/ld/map.noexstk; then
            _SAVE_LDFLAGS=$LDFLAGS
            LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" 
@@ -2746,10 +2737,10 @@ alpha*-*-osf*)
        WARNINGS_AS_ERRORS='-Werror'
        MOZ_OPTIMIZE_FLAGS="-xO4"
        MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -$(DSO_LDOPTS) -h $@ -o $@'
        MKSHLIB_FORCE_ALL='-z allextract'
        MKSHLIB_UNFORCE_ALL='-z defaultextract'
-       DSO_LDOPTS='-G -z muldefs'
+       DSO_LDOPTS='-G'
        AR_LIST="$AR t"
        AR_EXTRACT="$AR x"
        AR_DELETE="$AR d"
@@ -2769,25 +2760,38 @@ alpha*-*-osf*)
            #error "Denied"
            #endif],
            _BAD_COMPILER=,_BAD_COMPILER=1)
-        if test -n "$_BAD_COMPILER"; then
-            _res="no"
-            AC_MSG_ERROR([Sun C++ 5.9 (Sun Studio 12) or higher is required to build. Your compiler version is $CXX_VERSION .])
-        else
-            _res="yes"
-        fi
-        AC_MSG_RESULT([$_res])
-        AC_LANG_RESTORE
+       if test -n "$_BAD_COMPILER"; then
+           _res="no"
+           AC_MSG_ERROR([Sun C++ 5.9 (Sun Studio 12) or higher is required to build. Your compiler version is $CXX_VERSION .])
+       else
+           _res="yes"
+       fi
+       AC_TRY_COMPILE([],
+           [#if (__SUNPRO_CC >= 0x5100)
+           #error "Sun C++ 5.10 or above"
+           #endif],
+           _ABOVE_SS12U1=,_ABOVE_SS12U1=1)
+       if test "$_ABOVE_SS12U1"; then
+           # disable xannotate
+           CXXFLAGS="$CXXFLAGS -xannotate=no"
+       fi
+       AC_MSG_RESULT([$_res])
+       AC_LANG_RESTORE
     else
+       LDFLAGS="$LDFLAGS -Wl,-z,ignore -Wl,-R,'\$\$ORIGIN:\$\$ORIGIN/..' -Wl,-z,lazyload -Wl,-z,combreloc -Wl,-z,muldefs"
+       LIBS="-lc $LIBS"
+       MKSHLIB_FORCE_ALL='-Wl,-z -Wl,allextract'
+       MKSHLIB_UNFORCE_ALL='-Wl,-z -Wl,defaultextract'
        ASFLAGS="$ASFLAGS -fPIC"
-       DSO_LDOPTS='-G'
+       DSO_LDOPTS='-shared'
        _WARNINGS_CFLAGS=''
        _WARNINGS_CXXFLAGS=''
        if test "$OS_RELEASE" = "5.3"; then
-	  AC_DEFINE(MUST_UNDEF_HAVE_BOOLEAN_AFTER_INCLUDES)
+           AC_DEFINE(MUST_UNDEF_HAVE_BOOLEAN_AFTER_INCLUDES)
        fi
     fi
     if test "$OS_RELEASE" = "5.5.1"; then
-       AC_DEFINE(NEED_USLEEP_PROTOTYPE)
+        AC_DEFINE(NEED_USLEEP_PROTOTYPE)
     fi
     ;;
 
@@ -5937,6 +5941,14 @@ if test -n "$MOZ_WEBM"; then
           VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
           VPX_X86_ASM=1
         ;;
+        SunOS:i?86)
+          VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
+          VPX_X86_ASM=1
+        ;;
+        SunOS:x86_64)
+          VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
+          VPX_X86_ASM=1
+        ;;
         Darwin:i?86)
           VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
           VPX_X86_ASM=1
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index 553d7349dbfb..2264e255101b 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -355,7 +355,6 @@ endif # ENABLE_CXX_EXCEPTIONS
 endif # WINNT
 
 ifeq ($(SOLARIS_SUNPRO_CXX),1)
-CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
 ifeq (86,$(findstring 86,$(OS_TEST)))
 OS_LDFLAGS += -M $(topsrcdir)/config/solaris_ia32.map
 endif # x86
diff --git a/js/src/configure.in b/js/src/configure.in
index d11660e23d0b..adcd470dff60 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1341,15 +1341,6 @@ if test "$GNU_CC"; then
     _DEFINES_CFLAGS='-include $(DEPTH)/js-confdefs.h -DMOZILLA_CLIENT'
     _USE_CPP_INCLUDE_FLAG=1
 elif test "$SOLARIS_SUNPRO_CC"; then
-    MKSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-    MKCSHLIB='$(LD) $(DSO_LDOPTS) -h $@ -o $@'
-
-    DSO_LDOPTS='-shared'
-    if test "$GNU_LD"; then
-        # Don't allow undefined symbols in libraries
-        DSO_LDOPTS="$DSO_LDOPTS -z defs"
-    fi
-
     DSO_CFLAGS=''
     if test "$CPU_ARCH" = "sparc"; then
         # for Sun Studio on Solaris/SPARC
@@ -2413,19 +2404,19 @@ alpha*-*-osf*)
        NO_NSPR_CONFIG_SYSTEM_VERSION=["`pkgparam SUNWpr SUNW_PRODVERS | sed -e 's/^[1-9][0-9]*\.[0-9][0-9]*$/&.0/'`"]
     fi
     SYSTEM_MAKEDEPEND=
+    MOZ_FIX_LINK_PATHS=
     # $ORIGIN/.. is for shared libraries under components/ to locate shared
     # libraries one level up (e.g. libnspr4.so)
-    LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..'"
     if test "$SOLARIS_SUNPRO_CC"; then
-       LIBS="-lCrun -lCstd $LIBS"
+       LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..' -z lazyload -z combreloc -z muldefs"
+       LIBS="-lCrun -lCstd -lc $LIBS"
        NS_USE_NATIVE=1
-       MOZ_FIX_LINK_PATHS=
        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
-       CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all"
-       CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic -norunpath"
+       CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all -D__FUNCTION__=__func__"
+       CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions -norunpath -D__FUNCTION__=__func__"
        _MOZ_EXCEPTIONS_FLAGS_ON='-features=except'
        _MOZ_EXCEPTIONS_FLAGS_OFF='-features=no%except'
-       LDFLAGS="-xildoff -z lazyload -z combreloc $LDFLAGS"
+       LDFLAGS="-xildoff $LDFLAGS"
        if test -z "$CROSS_COMPILE" && test -f /usr/lib/ld/map.noexstk; then
            _SAVE_LDFLAGS=$LDFLAGS
            LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" 
@@ -2437,10 +2428,10 @@ alpha*-*-osf*)
        WARNINGS_AS_ERRORS='-Werror'
        MOZ_OPTIMIZE_FLAGS="-xO4"
        MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -z muldefs -h $@ -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -$(DSO_LDOPTS) -h $@ -o $@'
        MKSHLIB_FORCE_ALL='-z allextract'
        MKSHLIB_UNFORCE_ALL='-z defaultextract'
-       DSO_LDOPTS='-G -z muldefs'
+       DSO_LDOPTS='-G'
        AR_LIST="$AR t"
        AR_EXTRACT="$AR x"
        AR_DELETE="$AR d"
@@ -2460,25 +2451,38 @@ alpha*-*-osf*)
            #error "Denied"
            #endif],
            _BAD_COMPILER=,_BAD_COMPILER=1)
-        if test -n "$_BAD_COMPILER"; then
-            _res="no"
-            AC_MSG_ERROR([Sun C++ 5.9 (Sun Studio 12) or higher is required to build. Your compiler version is $CXX_VERSION .])
-        else
-            _res="yes"
-        fi
-        AC_MSG_RESULT([$_res])
-        AC_LANG_RESTORE
+       if test -n "$_BAD_COMPILER"; then
+           _res="no"
+           AC_MSG_ERROR([Sun C++ 5.9 (Sun Studio 12) or higher is required to build. Your compiler version is $CXX_VERSION .])
+       else
+           _res="yes"
+       fi
+       AC_TRY_COMPILE([],
+           [#if (__SUNPRO_CC >= 0x5100)
+           #error "Sun C++ 5.10 or above"
+           #endif],
+           _ABOVE_SS12U1=,_ABOVE_SS12U1=1)
+       if test "$_ABOVE_SS12U1"; then
+           # disable xannotate
+           CXXFLAGS="$CXXFLAGS -xannotate=no"
+       fi
+       AC_MSG_RESULT([$_res])
+       AC_LANG_RESTORE
     else
+       LDFLAGS="$LDFLAGS -Wl,-z,ignore -Wl,-R,'\$\$ORIGIN:\$\$ORIGIN/..' -Wl,-z,lazyload -Wl,-z,combreloc -Wl,-z,muldefs"
+       LIBS="-lc $LIBS"
+       MKSHLIB_FORCE_ALL='-Wl,-z -Wl,allextract'
+       MKSHLIB_UNFORCE_ALL='-Wl,-z -Wl,defaultextract'
        ASFLAGS="$ASFLAGS -fPIC"
-       DSO_LDOPTS='-G'
+       DSO_LDOPTS='-shared'
        _WARNINGS_CFLAGS=''
        _WARNINGS_CXXFLAGS=''
        if test "$OS_RELEASE" = "5.3"; then
-	  AC_DEFINE(MUST_UNDEF_HAVE_BOOLEAN_AFTER_INCLUDES)
+           AC_DEFINE(MUST_UNDEF_HAVE_BOOLEAN_AFTER_INCLUDES)
        fi
     fi
     if test "$OS_RELEASE" = "5.5.1"; then
-       AC_DEFINE(NEED_USLEEP_PROTOTYPE)
+        AC_DEFINE(NEED_USLEEP_PROTOTYPE)
     fi
     ;;
 

From 8a30bd194aa33e474ef52691d2f8f9a970270fb0 Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@sun.com>
Date: Sun, 27 Jun 2010 00:56:47 +0800
Subject: [PATCH 073/172] Bug 574650 Fix xpcom/reflect/xptcall for gcc on
 Solaris r=jst

---
 xpcom/reflect/xptcall/src/md/unix/Makefile.in |  9 ++-
 .../src/md/unix/xptcinvoke_x86_solaris.cpp    | 69 ------------------
 .../src/md/unix/xptcstubs_x86_64_solaris.cpp  | 73 -------------------
 .../src/md/unix/xptcstubs_x86_solaris.cpp     | 32 --------
 4 files changed, 5 insertions(+), 178 deletions(-)

diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index dfaea3b00926..6ee8bad8e0c7 100644
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -147,19 +147,20 @@ endif
 #
 ifeq ($(OS_ARCH),SunOS)
 ifeq (x86_64,$(OS_TEST))
-CPPSRCS		:= xptcstubs_x86_64_solaris.cpp
 ifndef GNU_CC
-CPPSRCS		+= xptcinvoke_x86_64_solaris.cpp
+CPPSRCS		:= xptcstubs_x86_64_solaris.cpp xptcinvoke_x86_64_solaris.cpp
 ASFILES		:= xptcstubs_asm_x86_64_solaris_SUNW.s
 else
-CPPSRCS		+= xptcinvoke_x86_64_unix.cpp
+CPPSRCS		:= xptcstubs_x86_64_linux.cpp xptcinvoke_x86_64_unix.cpp
 endif
 else
 ifeq (86,$(findstring 86,$(OS_TEST)))
-CPPSRCS		:= xptcinvoke_x86_solaris.cpp xptcstubs_x86_solaris.cpp
 # 28817: if Solaris Intel OS, and native compiler, always build optimised.
 ifndef GNU_CC
+CPPSRCS		:= xptcinvoke_x86_solaris.cpp xptcstubs_x86_solaris.cpp
 ASFILES		:= xptcinvoke_asm_x86_solaris_SUNW.s xptcstubs_asm_x86_solaris_SUNW.s
+else
+CPPSRCS		:= xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp
 endif
 endif
 endif
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp
index 0dbab796d889..c4074782ccb4 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp
@@ -45,9 +45,6 @@ extern "C" {
 
 // Remember that these 'words' are 32bit DWORDS
 
-#if !defined(__SUNPRO_CC)               /* Sun Workshop Compiler. */
-static
-#endif
 PRUint32
 invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
 {
@@ -72,9 +69,6 @@ invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
     return result;
 }
 
-#if !defined(__SUNPRO_CC)               /* Sun Workshop Compiler. */
-static
-#endif
 void
 invoke_copy_to_stack(PRUint32 paramCount, nsXPTCVariant* s, PRUint32* d)
 {
@@ -104,66 +98,3 @@ invoke_copy_to_stack(PRUint32 paramCount, nsXPTCVariant* s, PRUint32* d)
 }
 
 }
-
-#if !defined(__SUNPRO_CC)               /* Sun Workshop Compiler. */
-EXPORT_XPCOM_API(nsresult)
-NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-                 PRUint32 paramCount, nsXPTCVariant* params)
-{
-#ifdef __GNUC__            /* Gnu compiler. */
-  PRUint32 result;
-  PRUint32 n = invoke_count_words (paramCount, params) * 4;
-  void (*fn_copy) (unsigned int, nsXPTCVariant *, PRUint32 *) = invoke_copy_to_stack;
-  int temp1, temp2, temp3;
- 
- __asm__ __volatile__(
-    "subl  %8, %%esp\n\t" /* make room for params */
-    "pushl %%esp\n\t"
-    "pushl %7\n\t"
-    "pushl %6\n\t"
-    "call  *%0\n\t"       /* copy params */
-    "addl  $0xc, %%esp\n\t"
-    "movl  %4, %%ecx\n\t"
-#ifdef CFRONT_STYLE_THIS_ADJUST
-    "movl  (%%ecx), %%edx\n\t"
-    "movl  %5, %%eax\n\t"   /* function index */
-    "shl   $3, %%eax\n\t"   /* *= 8 */
-    "addl  $8, %%eax\n\t"   /* += 8 skip first entry */
-    "addl  %%eax, %%edx\n\t"
-    "movswl (%%edx), %%eax\n\t" /* 'this' offset */
-    "addl  %%eax, %%ecx\n\t"
-    "pushl %%ecx\n\t"
-    "addl  $4, %%edx\n\t"   /* += 4, method pointer */
-#else /* THUNK_BASED_THIS_ADJUST */
-    "pushl %%ecx\n\t"
-    "movl  (%%ecx), %%edx\n\t"
-    "movl  %5, %%eax\n\t"   /* function index */
-#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-    "leal  (%%edx,%%eax,4), %%edx\n\t"
-#else /* not G++ V3 ABI  */
-    "leal  8(%%edx,%%eax,4), %%edx\n\t"
-#endif /* G++ V3 ABI */
-#endif
-    "call  *(%%edx)\n\t"    /* safe to not cleanup esp */
-    "addl  $4, %%esp\n\t"
-    "addl  %8, %%esp"
-    : "=a" (result),        /* %0 */
-      "=c" (temp1),         /* %1 */
-      "=d" (temp2),         /* %2 */
-      "=g" (temp3)          /* %3 */
-    : "g" (that),           /* %4 */
-      "g" (methodIndex),    /* %5 */
-      "1" (paramCount),     /* %6 */
-      "2" (params),         /* %7 */
-      "g" (n),              /* %8 */
-      "0" (fn_copy)         /* %3 */
-    : "memory"
-    );
-    
-  return result;
-#else
-#error "can't find a compiler to use"
-#endif /* __GNUC__ */
-
-}
-#endif
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
index bf129c647b7d..3ca8bd51754b 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
@@ -158,80 +158,7 @@ PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex,
     return result;
 }
 
-#ifdef __SUNPRO_CC
 #define STUB_ENTRY(n)
-#else
-#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
-// Linux/x86-64 uses gcc >= 3.1
-#define STUB_ENTRY(n) \
-asm(".section	\".text\"\n\t" \
-    ".align	2\n\t" \
-    ".if	" #n " < 10\n\t" \
-    ".globl	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-    ".hidden	_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-    ".type	_ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \
-    "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \
-    ".elseif	" #n " < 100\n\t" \
-    ".globl	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-    ".hidden	_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-    ".type	_ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \
-    "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \
-    ".elseif    " #n " < 1000\n\t" \
-    ".globl     _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-    ".hidden    _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-    ".type      _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \
-    "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \
-    ".else\n\t" \
-    ".err	\"stub number " #n " >= 1000 not yet supported\"\n\t" \
-    ".endif\n\t" \
-    "movl	$" #n ", %eax\n\t" \
-    "jmp	SharedStub\n\t" \
-    ".if	" #n " < 10\n\t" \
-    ".size	_ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \
-    ".elseif	" #n " < 100\n\t" \
-    ".size	_ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \
-    ".else\n\t" \
-    ".size	_ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \
-    ".endif");
-
-// static nsresult SharedStub(PRUint32 methodIndex)
-asm(".section   \".text\"\n\t"
-    ".align     2\n\t"
-    ".type      SharedStub,@function\n\t"
-    "SharedStub:\n\t"
-    // make room for gpregs (48), fpregs (64)
-    "pushq      %rbp\n\t"
-    "movq       %rsp,%rbp\n\t"
-    "subq       $112,%rsp\n\t"
-    // save GP registers
-    "movq       %rdi,-112(%rbp)\n\t"
-    "movq       %rsi,-104(%rbp)\n\t"
-    "movq       %rdx, -96(%rbp)\n\t"
-    "movq       %rcx, -88(%rbp)\n\t"
-    "movq       %r8 , -80(%rbp)\n\t"
-    "movq       %r9 , -72(%rbp)\n\t"
-    "leaq       -112(%rbp),%rcx\n\t"
-    // save FP registers
-    "movsd      %xmm0,-64(%rbp)\n\t"
-    "movsd      %xmm1,-56(%rbp)\n\t"
-    "movsd      %xmm2,-48(%rbp)\n\t"
-    "movsd      %xmm3,-40(%rbp)\n\t"
-    "movsd      %xmm4,-32(%rbp)\n\t"
-    "movsd      %xmm5,-24(%rbp)\n\t"
-    "movsd      %xmm6,-16(%rbp)\n\t"
-    "movsd      %xmm7, -8(%rbp)\n\t"
-    "leaq       -64(%rbp),%r8\n\t"
-    // rdi has the 'self' pointer already
-    "movl       %eax,%esi\n\t"
-    "leaq       16(%rbp),%rdx\n\t"
-    "call       PrepareAndDispatch@plt\n\t"
-    "leave\n\t"
-    "ret\n\t"
-    ".size      SharedStub,.-SharedStub");
-#else
-#error "Unsupported compiler. Use gcc >= 3.1 for Linux/x86-64."
-#endif /* GNUC */
-#endif /* Sun Studio */
 
 #define SENTINEL_ENTRY(n) \
 nsresult nsXPTCStubBase::Sentinel##n() \
diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
index e43c9b2fb0e4..42b2ca2ab7c8 100644
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
@@ -42,9 +42,6 @@
 #include "xptiprivate.h"
 #include "xptc_platforms_unixish_x86.h"
 
-#if !defined(__SUNPRO_CC)               /* Sun Workshop Compiler. */
-static
-#endif
 nsresult
 PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
 {
@@ -101,37 +98,8 @@ PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
     return result;
 }
 
-#ifdef __GNUC__         /* Gnu Compiler. */
-#define STUB_ENTRY(n) \
-nsresult nsXPTCStubBase::Stub##n() \
-{ \
-  register nsresult (*method) (nsXPTCStubBase *, uint32, PRUint32 *) = PrepareAndDispatch; \
-  int temp0, temp1; \
-  register nsresult result; \
-  __asm__ __volatile__( \
-    "leal   0x0c(%%ebp), %%ecx\n\t"    /* args */ \
-    "pushl  %%ecx\n\t" \
-    "pushl  $"#n"\n\t"                 /* method index */ \
-    "movl   0x08(%%ebp), %%ecx\n\t"    /* this */ \
-    "pushl  %%ecx\n\t" \
-    "call   *%%edx\n\t"                /* PrepareAndDispatch */ \
-    "addl   $12, %%esp" \
-    : "=a" (result),    /* %0 */ \
-      "=&c" (temp0),    /* %1 */ \
-      "=d" (temp1)      /* %2 */ \
-    : "2" (method)      /* %2 */ \
-    : "memory" ); \
-    return result; \
-}
-
-#elif defined(__SUNPRO_CC)           /* Sun Workshop Compiler. */
-
 #define STUB_ENTRY(n)
 
-#else
-#error "can't find a compiler to use"
-#endif /* __GNUC__ */
-
 #define SENTINEL_ENTRY(n) \
 nsresult nsXPTCStubBase::Sentinel##n() \
 { \

From ae8390a3fd105574acdd59ac40e02f2d5aed0d77 Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@sun.com>
Date: Sun, 27 Jun 2010 01:09:34 +0800
Subject: [PATCH 074/172] Bug 574639 fix a typo in last commit

---
 configure.in        | 2 +-
 js/src/configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index a4e8f35c11d5..ac4f8cfbec53 100644
--- a/configure.in
+++ b/configure.in
@@ -2737,7 +2737,7 @@ alpha*-*-osf*)
        WARNINGS_AS_ERRORS='-Werror'
        MOZ_OPTIMIZE_FLAGS="-xO4"
        MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -$(DSO_LDOPTS) -h $@ -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
        MKSHLIB_FORCE_ALL='-z allextract'
        MKSHLIB_UNFORCE_ALL='-z defaultextract'
        DSO_LDOPTS='-G'
diff --git a/js/src/configure.in b/js/src/configure.in
index adcd470dff60..fb4181094cae 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2428,7 +2428,7 @@ alpha*-*-osf*)
        WARNINGS_AS_ERRORS='-Werror'
        MOZ_OPTIMIZE_FLAGS="-xO4"
        MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
-       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -$(DSO_LDOPTS) -h $@ -o $@'
+       MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -h $@ -o $@'
        MKSHLIB_FORCE_ALL='-z allextract'
        MKSHLIB_UNFORCE_ALL='-z defaultextract'
        DSO_LDOPTS='-G'

From 1c9fd8e93987ee264ffa24e7b83a75fbed5d32b6 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Sat, 26 Jun 2010 11:58:06 -0700
Subject: [PATCH 075/172] Adjust comment as followup to bug 574059.

---
 layout/style/nsCSSValue.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/style/nsCSSValue.h b/layout/style/nsCSSValue.h
index 1754c8b8f8cd..8a1f1211e09d 100644
--- a/layout/style/nsCSSValue.h
+++ b/layout/style/nsCSSValue.h
@@ -556,8 +556,8 @@ struct nsCSSValue::Array {
     return PR_TRUE;
   }
 
-  // XXXdholbert This uses a size_t ref count to save space. Should we use
-  // a variant of NS_INLINE_DECL_REFCOUNTING that takes a type as an argument?
+  // XXXdholbert This uses a size_t ref count. Should we use a variant
+  // of NS_INLINE_DECL_REFCOUNTING that takes a type as an argument?
   void AddRef() {
     if (mRefCnt == size_t(-1)) { // really want SIZE_MAX
       NS_WARNING("refcount overflow, leaking nsCSSValue::Array");

From 1dc52aecc34b509c905ab4fb293d016222df17ac Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Sat, 26 Jun 2010 11:58:06 -0700
Subject: [PATCH 076/172] Switch test_transitions_per_property to testing
 interpolation 1/4 of the way through instead of 1/2, so it will catch getting
 the halves backwards.

---
 .../test/test_transitions_per_property.html   | 128 +++++++++---------
 1 file changed, 67 insertions(+), 61 deletions(-)

diff --git a/layout/style/test/test_transitions_per_property.html b/layout/style/test/test_transitions_per_property.html
index 7d0df01bd8e7..ce946f1d2912 100644
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@@ -24,8 +24,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=435441
   fixed-width container so that percentages for margin-top and
   margin-bottom are all relative to the same size container (rather than
   one that depends on whether we're tall enough to need a scrollbar)
+
+  Use a 20px font size and line-height so that percentage line-height
+  and vertical-align doesn't accumulate rounding error.
   -->
-<div style="height: 50px; width: 300px">
+<div style="height: 50px; width: 300px; font-size: 20px; line-height: 20px">
 
 <div id="display">
 
@@ -190,8 +193,8 @@ for (prop in gCSSProperties) {
       }
     }
 
-    div.style.removeProperty(prop);
     div.style.removeProperty("-moz-transition");
+    div.style.removeProperty(prop);
     if ("prerequisites" in info) {
       var prereqs = info.prerequisites;
       for (var prereq in prereqs) {
@@ -201,11 +204,12 @@ for (prop in gCSSProperties) {
   }
 }
 
-// Do 4-second linear transitions with -2 second transition delay and
+// Do 4-second linear transitions with -1 second transition delay and
 // linear timing function so that we can expect the transition to be
-// right in the middle just after changing the property.
+// one quarter of the way through the value space right after changing
+// the property.
 div.style.setProperty("-moz-transition-duration", "4s", "");
-div.style.setProperty("-moz-transition-delay", "-2s", "");
+div.style.setProperty("-moz-transition-delay", "-1s", "");
 div.style.setProperty("-moz-transition-timing-function", "linear", "");
 for (prop in supported_properties) {
   var tinfo = supported_properties[prop];
@@ -216,7 +220,11 @@ for (prop in supported_properties) {
   if ("prerequisites" in info) {
     var prereqs = info.prerequisites;
     for (var prereq in prereqs) {
-      div.style.setProperty(prereq, prereqs[prereq], "");
+      // We don't want the 19px font-size prereq of line-height, since we
+      // want to leave it 20px.
+      if (prop != "line-height" || prereq != "font-size") {
+        div.style.setProperty(prereq, prereqs[prereq], "");
+      }
     }
   }
 
@@ -225,11 +233,9 @@ for (prop in supported_properties) {
   }
 
   // Make sure to unset the property and stop transitions on it.
-  div.style.setProperty("-moz-transition-property", prop, "");
-  div.style.setProperty("-moz-transition-delay", "-6s", "");
+  div.style.setProperty("-moz-transition-property", "none", "");
   div.style.removeProperty(prop);
   cs.getPropertyValue(prop);
-  div.style.setProperty("-moz-transition-delay", "-2s", "");
 
   if ("prerequisites" in info) {
     var prereqs = info.prerequisites;
@@ -247,7 +253,7 @@ function test_length_transition(prop) {
      "length-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "12px", "");
-  is(cs.getPropertyValue(prop), "8px",
+  is(cs.getPropertyValue(prop), "6px",
      "length-valued property " + prop + ": interpolation of lengths");
 }
 
@@ -259,7 +265,7 @@ function test_float_zeroToOne_transition(prop) {
      "float-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "0.8", "");
-  is(cs.getPropertyValue(prop), "0.55",
+  is(cs.getPropertyValue(prop), "0.425",
      "float-valued property " + prop + ": interpolation of floats");
 }
 
@@ -271,7 +277,7 @@ function test_float_aboveOne_transition(prop) {
      "float-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "2.1", "");
-  is(cs.getPropertyValue(prop), "1.55",
+  is(cs.getPropertyValue(prop), "1.275",
      "float-valued property " + prop + ": interpolation of floats");
 }
 
@@ -288,9 +294,9 @@ function test_percent_transition(prop) {
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "25%", "");
   var res = cs.getPropertyValue(prop);
-  is(any_unit_to_num(res) * 2, a + b,
+  is(any_unit_to_num(res) * 4, 3 * b + a,
      "percent-valued property " + prop + ": interpolation of percents: " +
-     res + " should be halfway between " + av + " and " + bv);
+     res + " should be a quarter of the way between " + bv + " and " + av);
   ok(has_num(res),
      "percent-valued property " + prop + ": percent computes to number");
 }
@@ -301,8 +307,8 @@ function test_color_transition(prop) {
   is(cs.getPropertyValue(prop), "rgb(255, 28, 0)",
      "color-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
-  div.style.setProperty(prop, "rgb(77, 84, 128)", "");
-  is(cs.getPropertyValue(prop), "rgb(166, 56, 64)",
+  div.style.setProperty(prop, "rgb(75, 84, 128)", "");
+  is(cs.getPropertyValue(prop), "rgb(210, 42, 32)",
      "color-valued property " + prop + ": interpolation of colors");
 
   div.style.setProperty("-moz-transition-property", "none", "");
@@ -313,7 +319,7 @@ function test_color_transition(prop) {
      "color-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "currentColor", "");
-  is(cs.getPropertyValue(prop), "rgb(64, 32, 64)",
+  is(cs.getPropertyValue(prop), "rgb(96, 48, 32)",
      "color-valued property " + prop + ": interpolation of currentColor");
   (prop == "color" ? div.parentNode : div).style.removeProperty("color");
 }
@@ -326,7 +332,7 @@ function test_border_color_transition(prop) {
      "color-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.removeProperty(prop);
-  is(cs.getPropertyValue(prop), "rgb(64, 32, 64)",
+  is(cs.getPropertyValue(prop), "rgb(96, 48, 32)",
      "color-valued property " + prop + ": interpolation of initial value");
   div.style.removeProperty("color");
 }
@@ -340,16 +346,16 @@ function test_shadow_transition(prop) {
      "shadow-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "4px 8px 3px red", "");
-  is(cs.getPropertyValue(prop), "rgba(255, 0, 0, 0.5) 2px 4px 1.5px" + spreadStr,
+  is(cs.getPropertyValue(prop), "rgba(255, 0, 0, 0.25) 1px 2px 0.75px" + spreadStr,
      "shadow-valued property " + prop + ": interpolation of shadows");
 
   div.style.setProperty("-moz-transition-property", "none", "");
-  div.style.setProperty(prop, "green 4px 4px, 2px 2px blue", "");
-  is(cs.getPropertyValue(prop), "rgb(0, 128, 0) 4px 4px 0px" + spreadStr + ", rgb(0, 0, 255) 2px 2px 0px" + spreadStr,
+  div.style.setProperty(prop, "#038000 4px 4px, 2px 2px blue", "");
+  is(cs.getPropertyValue(prop), "rgb(3, 128, 0) 4px 4px 0px" + spreadStr + ", rgb(0, 0, 255) 2px 2px 0px" + spreadStr,
      "shadow-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "8px 8px 8px red", "");
-  is(cs.getPropertyValue(prop), "rgb(128, 64, 0) 6px 6px 4px" + spreadStr + ", rgba(0, 0, 255, 0.5) 1px 1px 0px" + spreadStr,
+  is(cs.getPropertyValue(prop), "rgb(66, 96, 0) 5px 5px 2px" + spreadStr + ", rgba(0, 0, 255, 0.75) 1.5px 1.5px 0px" + spreadStr,
      "shadow-valued property " + prop + ": interpolation of shadows");
 
   if (prop == "-moz-box-shadow") {
@@ -357,7 +363,7 @@ function test_shadow_transition(prop) {
     is(cs.getPropertyValue(prop), "rgb(255, 0, 0) 8px 8px 8px 0px inset",
        "shadow-valued property " + prop + ": non-interpolable cases");
     div.style.setProperty(prop, "8px 8px 8px 8px red inset", "");
-    is(cs.getPropertyValue(prop), "rgb(255, 0, 0) 8px 8px 8px 4px inset",
+    is(cs.getPropertyValue(prop), "rgb(255, 0, 0) 8px 8px 8px 2px inset",
        "shadow-valued property " + prop + ": interpolation of spread");
     // Leave in same state whether in the |if| or not.
     div.style.setProperty(prop, "8px 8px 8px red", "");
@@ -369,7 +375,7 @@ function test_shadow_transition(prop) {
   div.style.setProperty(prop, "2px 2px 2px", "");
   is(cs.getPropertyValue(prop), defaultColor + "2px 2px 2px" + spreadStr,
      "shadow-valued property " + prop + ": non-interpolable cases");
-  div.style.setProperty(prop, "4px 8px 6px", "");
+  div.style.setProperty(prop, "6px 14px 10px", "");
   is(cs.getPropertyValue(prop), defaultColor + "3px 5px 4px" + spreadStr,
      "shadow-valued property " + prop + ": interpolation without color");
 }
@@ -381,7 +387,7 @@ function test_dasharray_transition(prop) {
      "dasharray-valued property " + prop +
      ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
-  div.style.setProperty(prop, "9px", "");
+  div.style.setProperty(prop, "15px", "");
   is(cs.getPropertyValue(prop), "6",
      "dasharray-valued property " + prop + ": interpolation of dasharray");
   div.style.setProperty(prop, "none", "");
@@ -391,24 +397,24 @@ function test_dasharray_transition(prop) {
   is(cs.getPropertyValue(prop), "6, 8px, 4, 4",
      "dasharray-valued property " + prop +
      ": computed value before transition");
-  div.style.setProperty(prop, "10, 10,10,10px", "");
+  div.style.setProperty(prop, "14, 12,16,16px", "");
   is(cs.getPropertyValue(prop), "8, 9, 7, 7",
      "dasharray-valued property " + prop + ": interpolation of dasharray");
   div.style.setProperty(prop, "none", "");
   is(cs.getPropertyValue(prop), "none",
      "dasharray-valued property " + prop + ": non-interpolability of none");
-  div.style.setProperty(prop, "4,8,2", "");
-  is(cs.getPropertyValue(prop), "4, 8, 2",
+  div.style.setProperty(prop, "8,16,4", "");
+  is(cs.getPropertyValue(prop), "8, 16, 4",
      "dasharray-valued property " + prop +
      ": computed value before transition");
-  div.style.setProperty(prop, "2,4,6,8", "");
-  is(cs.getPropertyValue(prop), "3, 6, 4, 6, 5, 3, 5, 8, 2, 4, 7, 5",
+  div.style.setProperty(prop, "4,8,12,16", "");
+  is(cs.getPropertyValue(prop), "7, 14, 6, 10, 13, 5, 9, 16, 4, 8, 15, 7",
      "dasharray-valued property " + prop + ": interpolation of dasharray");
-  div.style.setProperty(prop, "2,50%,6,8", "");
-  is(cs.getPropertyValue(prop), "2, 50%, 6, 8",
+  div.style.setProperty(prop, "2,50%,6,10", "");
+  is(cs.getPropertyValue(prop), "2, 50%, 6, 10",
      "dasharray-valued property " + prop + ": non-interpolability of mixed units");
-  div.style.setProperty(prop, "4,20%,2,2", "");
-  is(cs.getPropertyValue(prop), "3, 35%, 4, 5",
+  div.style.setProperty(prop, "6,30%,2,2", "");
+  is(cs.getPropertyValue(prop), "3, 45%, 5, 8",
      "dasharray-valued property " + prop + ": interpolation of dasharray");
 }
 
@@ -427,26 +433,26 @@ function test_radius_transition(prop) {
      "radius-valued property " + prop +
      ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
-  div.style.setProperty(prop, "9px", "");
+  div.style.setProperty(prop, "15px", "");
   is(cs.getPropertyValue(prop), "6px",
      "radius-valued property " + prop + ": interpolation of radius");
   div.style.setProperty(prop, "5%", "");
   is(cs.getPropertyValue(prop), "10px",
      "radius-valued property " + prop + ": non-interpolability of unit change");
   div.style.setProperty(prop, "25%", "");
-  is(cs.getPropertyValue(prop), "30px",
+  is(cs.getPropertyValue(prop), "20px",
      "radius-valued property " + prop + ": interpolation of radius");
   div.style.setProperty(prop, "3px 8px", "");
   is(cs.getPropertyValue(prop), "3px 8px",
      "radius-valued property " + prop + ": non-interpolability of unit change");
-  div.style.setProperty(prop, "9px 10px", "");
+  div.style.setProperty(prop, "15px 12px", "");
   is(cs.getPropertyValue(prop), "6px 9px",
      "radius-valued property " + prop + ": interpolation of radius");
   div.style.setProperty(prop, "5% 15%", "");
   is(cs.getPropertyValue(prop), "10px 30px",
      "radius-valued property " + prop + ": non-interpolability of unit change");
   div.style.setProperty(prop, "25%", "");
-  is(cs.getPropertyValue(prop), "30px 40px",
+  is(cs.getPropertyValue(prop), "20px 35px",
      "radius-valued property " + prop + ": interpolation of radius");
 
   div.style.removeProperty("width");
@@ -461,7 +467,7 @@ function test_zindex_transition(prop) {
   is(cs.getPropertyValue(prop), "4",
      "integer-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
-  div.style.setProperty(prop, "-5", "");
+  div.style.setProperty(prop, "-14", "");
   is(cs.getPropertyValue(prop), "-1",
      "integer-valued property " + prop + ": interpolation of lengths");
   div.style.setProperty(prop, "auto", "");
@@ -471,7 +477,7 @@ function test_zindex_transition(prop) {
   is(cs.getPropertyValue(prop), "-4",
      "integer-valued property " + prop + ": computed value before transition");
   div.style.setProperty(prop, "8", "");
-  is(cs.getPropertyValue(prop), "2",
+  is(cs.getPropertyValue(prop), "-1",
      "integer-valued property " + prop + ": interpolation of lengths");
 }
 
@@ -484,7 +490,7 @@ function test_font_stretch(prop) {
      "font-stretch property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "ultra-expanded", "");
-  is(cs.getPropertyValue(prop), "expanded",
+  is(cs.getPropertyValue(prop), "semi-expanded",
      "font-stretch property " + prop + ": interpolation of font-stretches");
   div.style.setProperty(prop, "wider", "");
   is(cs.getPropertyValue(prop), "wider",
@@ -493,7 +499,7 @@ function test_font_stretch(prop) {
   is(cs.getPropertyValue(prop), "expanded",
      "font-stretch property " + prop + ": computed value before transition");
   div.style.setProperty(prop, "extra-condensed", "");
-  is(cs.getPropertyValue(prop), "semi-condensed",
+  is(cs.getPropertyValue(prop), "normal",
      "font-stretch property " + prop + ": interpolation of font-stretches");
 }
 
@@ -506,16 +512,16 @@ function test_font_weight(prop) {
      "font-weight property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "900", "");
-  is(cs.getPropertyValue(prop), "600",
+  is(cs.getPropertyValue(prop), "500",
      "font-weight property " + prop + ": interpolation of font-weights");
   div.style.setProperty(prop, "lighter", "");
   is(cs.getPropertyValue(prop), "lighter",
      "font-weight property " + prop + ": can't interpolate bolder/lighter");
-  div.style.setProperty(prop, "700", "");
-  is(cs.getPropertyValue(prop), "700",
+  div.style.setProperty(prop, "900", "");
+  is(cs.getPropertyValue(prop), "900",
      "font-weight property " + prop + ": computed value before transition");
   div.style.setProperty(prop, "100", "");
-  is(cs.getPropertyValue(prop), "400",
+  is(cs.getPropertyValue(prop), "700",
      "font-weight property " + prop + ": interpolation of font-weights");
 }
 
@@ -525,7 +531,7 @@ function test_pos_integer_or_auto_transition(prop) {
   is(cs.getPropertyValue(prop), "4",
      "integer-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
-  div.style.setProperty(prop, "7", "");
+  div.style.setProperty(prop, "11", "");
   is(cs.getPropertyValue(prop), "5",
      "integer-valued property " + prop + ": interpolation of lengths");
   div.style.setProperty(prop, "auto", "");
@@ -535,18 +541,18 @@ function test_pos_integer_or_auto_transition(prop) {
   is(cs.getPropertyValue(prop), "8",
      "integer-valued property " + prop + ": computed value before transition");
   div.style.setProperty(prop, "4", "");
-  is(cs.getPropertyValue(prop), "6",
+  is(cs.getPropertyValue(prop), "7",
      "integer-valued property " + prop + ": interpolation of lengths");
 }
 
 function test_length_pair_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
-  div.style.setProperty(prop, "4px 8px", "");
-  is(cs.getPropertyValue(prop), "4px 8px",
+  div.style.setProperty(prop, "4px 6px", "");
+  is(cs.getPropertyValue(prop), "4px 6px",
      "length-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "12px 10px", "");
-  is(cs.getPropertyValue(prop), "8px 9px",
+  is(cs.getPropertyValue(prop), "6px 7px",
      "length-valued property " + prop + ": interpolation of lengths");
 }
 
@@ -557,18 +563,18 @@ function test_length_percent_pair_transition(prop) {
      "length-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "12px 70%", "");
-  is(cs.getPropertyValue(prop), "8px 60%",
+  is(cs.getPropertyValue(prop), "6px 55%",
      "length-valued property " + prop + ": interpolation of lengths");
 }
 
 function test_rect_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
-  div.style.setProperty(prop, "rect(4px, 16px, 12px, 8px)", "");
-  is(cs.getPropertyValue(prop), "rect(4px, 16px, 12px, 8px)",
+  div.style.setProperty(prop, "rect(4px, 16px, 12px, 6px)", "");
+  is(cs.getPropertyValue(prop), "rect(4px, 16px, 12px, 6px)",
      "rect-valued property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
-  div.style.setProperty(prop, "rect(0px, 6px, 4px, 2px)", "");
-  is(cs.getPropertyValue(prop), "rect(2px, 11px, 8px, 5px)",
+  div.style.setProperty(prop, "rect(0px, 4px, 4px, 2px)", "");
+  is(cs.getPropertyValue(prop), "rect(3px, 13px, 10px, 5px)",
      "rect-valued property " + prop + ": interpolation of rects");
   if (prop == "clip") {
     div.style.setProperty(prop, "rect(0px, 6px, 4px, auto)", "");
@@ -599,7 +605,7 @@ function test_background_size_transition(prop) {
      "property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "100% 100%", "");
-  is(cs.getPropertyValue(prop), "75% 90%",
+  is(cs.getPropertyValue(prop), "62.5% 85%",
      "property " + prop + ": interpolation of percents");
   div.style.setProperty(prop, "contain", "");
   is(cs.getPropertyValue(prop), "contain",
@@ -614,7 +620,7 @@ function test_background_position_transition(prop) {
      "property " + prop + ": computed value before transition");
   div.style.setProperty("-moz-transition-property", prop, "");
   div.style.setProperty(prop, "bottom right", "");
-  is(cs.getPropertyValue(prop), "75% 90%",
+  is(cs.getPropertyValue(prop), "62.5% 85%",
      "property " + prop + ": interpolation of percents");
   test_background_position_size_common(prop);
 }
@@ -624,19 +630,19 @@ function test_background_position_size_common(prop) {
   is(cs.getPropertyValue(prop), "10px 40px",
      "property " + prop + ": computed value before transition");
   div.style.setProperty(prop, "50px 0", "");
-  is(cs.getPropertyValue(prop), "30px 20px",
+  is(cs.getPropertyValue(prop), "20px 30px",
      "property " + prop + ": interpolation of lengths");
   div.style.setProperty(prop, "10px 40px, 50px 50px, 30px 20px", "");
   is(cs.getPropertyValue(prop), "10px 40px, 50px 50px, 30px 20px",
      "property " + prop + ": computed value before transition");
   div.style.setProperty(prop, "50px 20px, 70px 50px, 30px 40px", "");
-  is(cs.getPropertyValue(prop), "30px 30px, 60px 50px, 30px 30px",
+  is(cs.getPropertyValue(prop), "20px 35px, 55px 50px, 30px 25px",
      "property " + prop + ": interpolation of lists of lengths");
   div.style.setProperty(prop, "10px 40%, 50% 50px, 30% 20%", "");
   is(cs.getPropertyValue(prop), "10px 40%, 50% 50px, 30% 20%",
      "property " + prop + ": computed value before transition");
   div.style.setProperty(prop, "50px 20%, 70% 50px, 30% 40%", "");
-  is(cs.getPropertyValue(prop), "30px 30%, 60% 50px, 30% 30%",
+  is(cs.getPropertyValue(prop), "20px 35%, 55% 50px, 30% 25%",
      "property " + prop + ": interpolation of lists of lengths and percents");
 }
 

From bbedff2e04249f7ea8144165acc81d1474cce71d Mon Sep 17 00:00:00 2001
From: Dan Witte <dwitte@mozilla.com>
Date: Sat, 26 Jun 2010 14:18:45 -0700
Subject: [PATCH 077/172] Followup to bug 573004 to address review comment.

---
 toolkit/components/ctypes/tests/jsctypes-test.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolkit/components/ctypes/tests/jsctypes-test.h b/toolkit/components/ctypes/tests/jsctypes-test.h
index c5c315e19218..8083db05963b 100644
--- a/toolkit/components/ctypes/tests/jsctypes-test.h
+++ b/toolkit/components/ctypes/tests/jsctypes-test.h
@@ -192,7 +192,7 @@ NS_EXTERN_C
   NS_EXPORT PRInt32 test_closure_cdecl(PRInt8, test_func_ptr);
 #if defined(_WIN32) && !defined(_WIN64)
   typedef PRInt32 (NS_STDCALL * test_func_ptr_stdcall)(PRInt8);
-  NS_EXPORT PRInt32 test_closure_stdcall(PRInt8, PRInt32 (NS_STDCALL *)(PRInt8));
+  NS_EXPORT PRInt32 test_closure_stdcall(PRInt8, test_func_ptr_stdcall);
 #endif /* defined(_WIN32) && !defined(_WIN64) */
 
   NS_EXPORT PRInt32 test_callme(PRInt8);

From d8b54a3161e0034804a140ec677d4ba44f1aa4fb Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 26 Jun 2010 14:25:22 -0700
Subject: [PATCH 078/172] Bug 557566, part 2: Add FAIL_ON_WARNINGS to Makefiles
 in some build-warning-free directories. r=ted

---
 content/canvas/src/Makefile.in                  | 1 +
 content/media/wave/Makefile.in                  | 1 +
 docshell/shistory/src/Makefile.in               | 1 +
 dom/src/geolocation/Makefile.in                 | 1 +
 editor/txmgr/src/Makefile.in                    | 1 +
 toolkit/components/places/tests/cpp/Makefile.in | 1 +
 uriloader/base/Makefile.in                      | 1 +
 7 files changed, 7 insertions(+)

diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index fa2e4a3bd4fe..4a4e99fa89d9 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconcvs_s
 LIBXUL_LIBRARY  = 1
+FAIL_ON_WARNINGS = 1
 
 EXPORTS = \
 	CustomQS_Canvas2D.h \
diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in
index 618b4b30bd58..0a4b9e6e1431 100644
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconwave_s
 LIBXUL_LIBRARY 	= 1
+FAIL_ON_WARNINGS = 1
 
 
 EXPORTS		+= \
diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in
index 3659b02bbf2c..80f2a5b31f28 100644
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -47,6 +47,7 @@ MODULE		= shistory
 LIBRARY_NAME	= shistory_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
+FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS		= nsSHEntry.cpp        \
diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in
index 1bb37af6ebb3..b38a9f504d00 100644
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE         = dom
 LIBRARY_NAME   = jsdomgeolocation_s
 LIBXUL_LIBRARY = 1
+FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in
index f08c0a26c6dc..aca1046fb7e4 100644
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsTransactionManagerModule
 LIBXUL_LIBRARY	= 1
+FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS		= \
diff --git a/toolkit/components/places/tests/cpp/Makefile.in b/toolkit/components/places/tests/cpp/Makefile.in
index c05c0f8b2b61..0bdf4a5ae728 100644
--- a/toolkit/components/places/tests/cpp/Makefile.in
+++ b/toolkit/components/places/tests/cpp/Makefile.in
@@ -45,6 +45,7 @@ relativesrcdir = toolkit/components/places/tests/cpp
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_places
+FAIL_ON_WARNINGS = 1
 
 CPP_UNIT_TESTS = \
   test_IHistory.cpp \
diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in
index a04211ccfede..81125c9cd86d 100644
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -46,6 +46,7 @@ MODULE		= uriloader
 LIBRARY_NAME	= uriloaderbase_s
 GRE_MODULE	= 1
 LIBXUL_LIBRARY  = 1
+FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS = 							\

From 031edde9a15eb5c7103202b7ec6ab2c4001102f7 Mon Sep 17 00:00:00 2001
From: Justin Dolske <dolske@mozilla.com>
Date: Sat, 26 Jun 2010 14:45:56 -0700
Subject: [PATCH 079/172] Bug 574905 - Increase hang detector timeout.
 r,sr=shaver

---
 modules/libpref/src/init/all.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index c72b2e9a972a..5647c87ae343 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1256,10 +1256,8 @@ pref("dom.max_script_run_time", 10);
 
 // How long a plugin is allowed to process a synchronous IPC message
 // before we consider it "hung".
-//
-// NB: chosen to match dom.max_script_run_time by default
 #ifndef DEBUG
-pref("dom.ipc.plugins.timeoutSecs", 10);
+pref("dom.ipc.plugins.timeoutSecs", 45);
 #else
 // No timeout in DEBUG builds
 pref("dom.ipc.plugins.timeoutSecs", 0);

From 7fb119b737e71f08c2e75cf3dcb0b32a596bea8b Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 26 Jun 2010 14:58:01 -0700
Subject: [PATCH 080/172] Bug 573895: Disable MSVC warning that's spammed when
 we pass empty string to the macros NS_[DECLARE|IMPL]_NEW_HTML_ELEMENT. r=jst

---
 content/html/content/src/nsGenericHTMLElement.h | 9 +++++++++
 content/html/content/src/nsHTMLElement.cpp      | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h
index 708ebe4aa116..b8c57cf0db20 100644
--- a/content/html/content/src/nsGenericHTMLElement.h
+++ b/content/html/content/src/nsGenericHTMLElement.h
@@ -1316,7 +1316,16 @@ NS_NewHTML##_elementName##Element(nsINodeInfo *aNodeInfo,         \
   return NS_NewHTMLSharedElement(aNodeInfo, aFromParser);         \
 }
 
+// Disable MSVC warning that spams when we pass empty string as only macro arg.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4003)
+#endif
 NS_DECLARE_NS_NEW_HTML_ELEMENT() // HTMLElement
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Shared)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(SharedList)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(SharedObject)
diff --git a/content/html/content/src/nsHTMLElement.cpp b/content/html/content/src/nsHTMLElement.cpp
index 57af269f2252..c612e28c2db3 100644
--- a/content/html/content/src/nsHTMLElement.cpp
+++ b/content/html/content/src/nsHTMLElement.cpp
@@ -61,7 +61,15 @@ public:
   nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
 };
 
+// Disable MSVC warning that spams when we pass empty string as only macro arg.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4003)
+#endif
 NS_IMPL_NS_NEW_HTML_ELEMENT() // HTMLElement
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 nsHTMLElement::nsHTMLElement(nsINodeInfo* aNodeInfo)
   : nsGenericHTMLElement(aNodeInfo)

From 60bb80c99cbfa80543b9c3a94b3de282d6f99ed9 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 26 Jun 2010 15:15:35 -0700
Subject: [PATCH 081/172] Bug 557566 followup: disable FAIL_ON_WARNINGS on
 Android. r=mwu

---
 config/config.mk        | 7 +++++++
 js/src/config/config.mk | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/config/config.mk b/config/config.mk
index a8ab7bd0d9b7..d8c0bf639922 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -503,6 +503,13 @@ FAIL_ON_WARNINGS_DEBUG=
 FAIL_ON_WARNINGS=
 endif # WINNT && (MOS_PROFILE_GENERATE ^ MOZ_PROFILE_USE)
 
+# Also clear FAIL_ON_WARNINGS[_DEBUG] for Android builds, since
+# they have some platform-specific warnings we haven't fixed yet.
+ifeq ($(OS_TARGET),Android)
+FAIL_ON_WARNINGS_DEBUG=
+FAIL_ON_WARNINGS=
+endif # Android
+
 # Now, check for debug version of flag; it turns on normal flag in debug builds.
 ifdef FAIL_ON_WARNINGS_DEBUG
 ifdef MOZ_DEBUG
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index a8ab7bd0d9b7..d8c0bf639922 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -503,6 +503,13 @@ FAIL_ON_WARNINGS_DEBUG=
 FAIL_ON_WARNINGS=
 endif # WINNT && (MOS_PROFILE_GENERATE ^ MOZ_PROFILE_USE)
 
+# Also clear FAIL_ON_WARNINGS[_DEBUG] for Android builds, since
+# they have some platform-specific warnings we haven't fixed yet.
+ifeq ($(OS_TARGET),Android)
+FAIL_ON_WARNINGS_DEBUG=
+FAIL_ON_WARNINGS=
+endif # Android
+
 # Now, check for debug version of flag; it turns on normal flag in debug builds.
 ifdef FAIL_ON_WARNINGS_DEBUG
 ifdef MOZ_DEBUG

From 77860c361f9c72833b692048a840c724a9ffc092 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Sat, 26 Jun 2010 16:03:25 -0700
Subject: [PATCH 082/172] Bug 567175: Bootstrapped add-ons with invalid target
 applications should not be started up. r=robstrong

---
 toolkit/mozapps/extensions/XPIProvider.jsm    |   2 +
 .../addons/test_bootstrap1_3/bootstrap.js     |  19 ++++
 .../test/addons/test_bootstrap1_3/install.rdf |  24 ++++
 .../test/xpcshell/test_bootstrap.js           | 107 ++++++++++++++++++
 4 files changed, 152 insertions(+)
 create mode 100644 toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js
 create mode 100644 toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf

diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm
index a17fb07f6004..ef3fdb0e5954 100644
--- a/toolkit/mozapps/extensions/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
@@ -1479,6 +1479,8 @@ var XPIProvider = {
         XPIProvider.callBootstrapMethod(newAddon.id, newAddon.version, dir,
                                         "install",
                                         BOOTSTRAP_REASONS.ADDON_INSTALL);
+        if (!newAddon.active)
+          XPIProvider.unloadBootstrapScope(newAddon.id);
       }
 
       return false;
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js
new file mode 100644
index 000000000000..0a44aa0b978d
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/bootstrap.js
@@ -0,0 +1,19 @@
+Components.utils.import("resource://gre/modules/Services.jsm");
+
+function install(data, reason) {
+  Services.prefs.setIntPref("bootstraptest.installed_version", 3);
+}
+
+function startup(data, reason) {
+  Services.prefs.setIntPref("bootstraptest.active_version", 3);
+  Services.prefs.setIntPref("bootstraptest.startup_reason", reason);
+}
+
+function shutdown(data, reason) {
+  Services.prefs.setIntPref("bootstraptest.active_version", 0);
+  Services.prefs.setIntPref("bootstraptest.shutdown_reason", reason);
+}
+
+function uninstall(data, reason) {
+  Services.prefs.setIntPref("bootstraptest.installed_version", 0);
+}
diff --git a/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf
new file mode 100644
index 000000000000..e9385cbb3766
--- /dev/null
+++ b/toolkit/mozapps/extensions/test/addons/test_bootstrap1_3/install.rdf
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>bootstrap1@tests.mozilla.org</em:id>
+    <em:version>3.0</em:version>
+    <em:bootstrap>true</em:bootstrap>
+
+    <!-- Front End MetaData -->
+    <em:name>Test Bootstrap 1</em:name>
+    <em:description>Test Description</em:description>
+
+    <em:targetApplication>
+      <Description>
+        <em:id>undefined</em:id>
+        <em:minVersion>1</em:minVersion>
+        <em:maxVersion>1</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+  </Description>
+</RDF>
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js b/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
index 4d16e9f07659..1ab04358718c 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_bootstrap.js
@@ -521,6 +521,113 @@ function run_test_12() {
     do_check_eq(getStartupReason(), APP_STARTUP);
     do_check_in_crash_annotation("bootstrap1@tests.mozilla.org", "1.0");
 
+    b1.uninstall();
+    restartManager(0);
+
+    run_test_13();
+  });
+}
+
+
+// Tests that installing a bootstrapped extension with an invalid application
+// entry doesn't call it's startup method
+function run_test_13() {
+  prepare_test({ }, [
+    "onNewInstall"
+  ]);
+
+  AddonManager.getInstallForFile(do_get_addon("test_bootstrap1_3"), function(install) {
+    ensure_test_completed();
+
+    do_check_neq(install, null);
+    do_check_eq(install.type, "extension");
+    do_check_eq(install.version, "3.0");
+    do_check_eq(install.name, "Test Bootstrap 1");
+    do_check_eq(install.state, AddonManager.STATE_DOWNLOADED);
+    do_check_not_in_crash_annotation("bootstrap1@tests.mozilla.org", "3.0");
+
+    prepare_test({
+      "bootstrap1@tests.mozilla.org": [
+        ["onInstalling", false],
+        "onInstalled"
+      ]
+    }, [
+      "onInstallStarted",
+      "onInstallEnded",
+    ], check_test_13);
+    install.install();
+  });
+}
+
+function check_test_13() {
+  AddonManager.getAllInstalls(function(installs) {
+    // There should be no active installs now since the install completed and
+    // doesn't require a restart.
+    do_check_eq(installs.length, 0);
+
+    AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+      do_check_neq(b1, null);
+      do_check_eq(b1.version, "3.0");
+      do_check_true(b1.appDisabled);
+      do_check_false(b1.userDisabled);
+      do_check_false(b1.isActive);
+      do_check_eq(getInstalledVersion(), 3);  // We call install even for disabled add-ons
+      do_check_eq(getActiveVersion(), 0);     // Should not have called startup though
+      do_check_not_in_crash_annotation("bootstrap1@tests.mozilla.org", "3.0");
+
+      restartManager();
+
+      AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+        do_check_neq(b1, null);
+        do_check_eq(b1.version, "3.0");
+        do_check_true(b1.appDisabled);
+        do_check_false(b1.userDisabled);
+        do_check_false(b1.isActive);
+        do_check_eq(getInstalledVersion(), 3);  // We call install even for disabled add-ons
+        do_check_eq(getActiveVersion(), 0);     // Should not have called startup though
+        do_check_not_in_crash_annotation("bootstrap1@tests.mozilla.org", "3.0");
+
+        b1.uninstall();
+        restartManager(0);
+
+        run_test_14();
+      });
+    });
+  });
+}
+
+// Tests that a bootstrapped extension with an invalid target application entry
+// does not get loaded when detected during startup
+function run_test_14() {
+  shutdownManager();
+
+  let dir = profileDir.clone();
+  dir.append("bootstrap1@tests.mozilla.org");
+  dir.create(AM_Ci.nsIFile.DIRECTORY_TYPE, 0755);
+  let zip = AM_Cc["@mozilla.org/libjar/zip-reader;1"].
+            createInstance(AM_Ci.nsIZipReader);
+  zip.open(do_get_addon("test_bootstrap1_3"));
+  dir.append("install.rdf");
+  zip.extract("install.rdf", dir);
+  dir = dir.parent;
+  dir.append("bootstrap.js");
+  zip.extract("bootstrap.js", dir);
+  zip.close();
+
+  startupManager(0, false);
+
+  AddonManager.getAddonByID("bootstrap1@tests.mozilla.org", function(b1) {
+    do_check_neq(b1, null);
+    do_check_eq(b1.version, "3.0");
+    do_check_true(b1.appDisabled);
+    do_check_false(b1.userDisabled);
+    do_check_false(b1.isActive);
+    do_check_eq(getInstalledVersion(), 3);   // We call install even for disabled add-ons
+    do_check_eq(getActiveVersion(), 0);      // Should not have called startup though
+    do_check_not_in_crash_annotation("bootstrap1@tests.mozilla.org", "3.0");
+
+    b1.uninstall();
+
     do_test_finished();
   });
 }

From 30ecf6ec8042d922582af26a9a41c49e0701f40f Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Sat, 26 Jun 2010 16:03:53 -0700
Subject: [PATCH 083/172] Bug 569959: Fix intermittent failure in
 test_install.js by increasing allowed time since install. r=robstrong

---
 toolkit/mozapps/extensions/test/xpcshell/test_install.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_install.js b/toolkit/mozapps/extensions/test/xpcshell/test_install.js
index 3116e1c72284..614f82447544 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_install.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_install.js
@@ -4,6 +4,10 @@
 
 // This verifies that add-ons can be installed from XPI files
 
+// The maximum allowable time since install. If an add-on claims to have been
+// installed longer ago than this the the test will fail.
+const MAX_INSTALL_TIME = 10000;
+
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 
@@ -118,7 +122,7 @@ function check_test_1() {
 
           // Should have been installed sometime in the last two second.
           let difference = Date.now() - a1.installDate.getTime();
-          if (difference > 2000)
+          if (difference > MAX_INSTALL_TIME)
             do_throw("Add-on was installed " + difference + "ms ago");
           if (difference < 0)
             do_throw("Add-on was installed " + difference + "ms in the future");
@@ -223,7 +227,7 @@ function check_test_3() {
 
         // Should have been installed sometime in the last two second.
         let difference = Date.now() - a2.installDate.getTime();
-        if (difference > 2000)
+        if (difference > MAX_INSTALL_TIME)
           do_throw("Add-on was installed " + difference + "ms ago");
         if (difference < 0)
           do_throw("Add-on was installed " + difference + "ms in the future");

From 13abfaff21d4f70852cc7a371dd1f3c4efa689b4 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 26 Jun 2010 16:46:56 -0700
Subject: [PATCH 084/172] Bug 557566 followup: Disable FAIL_ON_WARNINGS in
 canvas & wave directories, pending a fix to Bug 573895 that makes GCC 4.4
 happy.

---
 content/canvas/src/Makefile.in | 3 ++-
 content/media/wave/Makefile.in | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index 4a4e99fa89d9..d507c6e048e8 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -45,7 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconcvs_s
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
+#XXXdholbert commenting out next line while investigating Bug 573895 on GCC 4.4
+# FAIL_ON_WARNINGS = 1
 
 EXPORTS = \
 	CustomQS_Canvas2D.h \
diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in
index 0a4b9e6e1431..a74f01ee19fb 100644
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -44,7 +44,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconwave_s
 LIBXUL_LIBRARY 	= 1
-FAIL_ON_WARNINGS = 1
+#XXXdholbert commenting out next line while investigating Bug 573895 on GCC 4.4
+# FAIL_ON_WARNINGS = 1
 
 
 EXPORTS		+= \

From 4e0f4c110ef0bfdff6b3b768d39186d7e44586d5 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 26 Jun 2010 17:50:36 -0700
Subject: [PATCH 085/172] Bug 575014: cast pointer-subtraction in nsTArray to
 produce index_type instead of (64-bit) size_t, to fix build warning on Win64.
 (bustage fix) rs=timeless pending-r=bsmedberg

---
 xpcom/glue/nsTArray.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xpcom/glue/nsTArray.h b/xpcom/glue/nsTArray.h
index a9ff6b48fc6c..ecc143f668e2 100644
--- a/xpcom/glue/nsTArray.h
+++ b/xpcom/glue/nsTArray.h
@@ -444,7 +444,7 @@ class nsTArray : public nsTArray_base {
       const elem_type* end = Elements() - 1, *iter = end + start + 1;
       for (; iter != end; --iter) {
         if (comp.Equals(*iter, item))
-          return iter - Elements();
+          return index_type(iter - Elements());
       }
       return NoIndex;
     }

From 972904bffe57ede41a3c21c097fe3471201000dc Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 26 Jun 2010 19:43:13 -0700
Subject: [PATCH 086/172] whitespace-only fix to trigger another Win64 build

---
 layout/base/nsRefreshDriver.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/base/nsRefreshDriver.h b/layout/base/nsRefreshDriver.h
index e13dc30637f7..50320b839c1a 100644
--- a/layout/base/nsRefreshDriver.h
+++ b/layout/base/nsRefreshDriver.h
@@ -63,7 +63,7 @@ public:
   // nsISupports will already have methods with the correct signature.
   //
   // The refresh driver does NOT hold references to refresh observers
-  // except while it is notifying them.  
+  // except while it is notifying them.
   NS_IMETHOD_(nsrefcnt) AddRef(void) = 0;
   NS_IMETHOD_(nsrefcnt) Release(void) = 0;
 

From e4dee1d734bc7e6fbea6a96aebc21288afac91e5 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 26 Jun 2010 19:59:26 -0700
Subject: [PATCH 087/172] Backed out changeset a65d962718b0 (bug 557566)

---
 content/canvas/src/Makefile.in | 3 +--
 content/media/wave/Makefile.in | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index d507c6e048e8..4a4e99fa89d9 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -45,8 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconcvs_s
 LIBXUL_LIBRARY  = 1
-#XXXdholbert commenting out next line while investigating Bug 573895 on GCC 4.4
-# FAIL_ON_WARNINGS = 1
+FAIL_ON_WARNINGS = 1
 
 EXPORTS = \
 	CustomQS_Canvas2D.h \
diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in
index a74f01ee19fb..0a4b9e6e1431 100644
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -44,8 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconwave_s
 LIBXUL_LIBRARY 	= 1
-#XXXdholbert commenting out next line while investigating Bug 573895 on GCC 4.4
-# FAIL_ON_WARNINGS = 1
+FAIL_ON_WARNINGS = 1
 
 
 EXPORTS		+= \

From df6047a742ad8d29b9f22ba40078f5968d7e31b9 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Sat, 26 Jun 2010 20:00:11 -0700
Subject: [PATCH 088/172] Backed out changeset 5da9fc2be835 (Bug 557566)

---
 content/canvas/src/Makefile.in                  | 1 -
 content/media/wave/Makefile.in                  | 1 -
 docshell/shistory/src/Makefile.in               | 1 -
 dom/src/geolocation/Makefile.in                 | 1 -
 editor/txmgr/src/Makefile.in                    | 1 -
 toolkit/components/places/tests/cpp/Makefile.in | 1 -
 uriloader/base/Makefile.in                      | 1 -
 7 files changed, 7 deletions(-)

diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index 4a4e99fa89d9..fa2e4a3bd4fe 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconcvs_s
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
 
 EXPORTS = \
 	CustomQS_Canvas2D.h \
diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in
index 0a4b9e6e1431..618b4b30bd58 100644
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 LIBRARY_NAME	= gkconwave_s
 LIBXUL_LIBRARY 	= 1
-FAIL_ON_WARNINGS = 1
 
 
 EXPORTS		+= \
diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in
index 80f2a5b31f28..3659b02bbf2c 100644
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -47,7 +47,6 @@ MODULE		= shistory
 LIBRARY_NAME	= shistory_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS		= nsSHEntry.cpp        \
diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in
index b38a9f504d00..1bb37af6ebb3 100644
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE         = dom
 LIBRARY_NAME   = jsdomgeolocation_s
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in
index aca1046fb7e4..f08c0a26c6dc 100644
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -48,7 +48,6 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsTransactionManagerModule
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS		= \
diff --git a/toolkit/components/places/tests/cpp/Makefile.in b/toolkit/components/places/tests/cpp/Makefile.in
index 0bdf4a5ae728..c05c0f8b2b61 100644
--- a/toolkit/components/places/tests/cpp/Makefile.in
+++ b/toolkit/components/places/tests/cpp/Makefile.in
@@ -45,7 +45,6 @@ relativesrcdir = toolkit/components/places/tests/cpp
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_places
-FAIL_ON_WARNINGS = 1
 
 CPP_UNIT_TESTS = \
   test_IHistory.cpp \
diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in
index 81125c9cd86d..a04211ccfede 100644
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -46,7 +46,6 @@ MODULE		= uriloader
 LIBRARY_NAME	= uriloaderbase_s
 GRE_MODULE	= 1
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
 
 
 CPPSRCS = 							\

From e7991868dc2f7c812645a66b10903d58f51a4254 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 27 Jun 2010 20:03:16 +1200
Subject: [PATCH 089/172] b=571448 In the XCopyArea region code, don't modify
 src_x/y when they are later used in the unbounded fixup code r=jrmuizel

---
 gfx/cairo/README                         |  2 ++
 gfx/cairo/cairo/src/cairo-xlib-surface.c |  8 ++---
 gfx/cairo/fix-xcopyarea-with-clips.patch | 38 ++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 gfx/cairo/fix-xcopyarea-with-clips.patch

diff --git a/gfx/cairo/README b/gfx/cairo/README
index f8c60aac9e49..234182cb1e0d 100644
--- a/gfx/cairo/README
+++ b/gfx/cairo/README
@@ -120,6 +120,8 @@ fix-ps-output.patch: PS: Add missing 'q' when resetting clip path (42b5cac766862
 
 ensure-text-flushed.patch: PDF-operators: ensure text operations flushed before emitting clip (42b5cac7668625c9761113ff72b47af5cfd10377)
 
+fix-xcopyarea-with-clips.patch: 5d07307b691afccccbb15f773d5231669ba44f5a
+
 ==== pixman patches ====
 
 pixman-android-cpu-detect.patch: Add CPU detection support for Android, where we can't reliably access /proc/self/auxv.
diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface.c b/gfx/cairo/cairo/src/cairo-xlib-surface.c
index b58210909df1..885a05772c0a 100644
--- a/gfx/cairo/cairo/src/cairo-xlib-surface.c
+++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c
@@ -2283,10 +2283,10 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 		       width, height,
 		       dst_x, dst_y);
 	} else {
-	    int n, num_rects;
+	    int n, num_rects, x, y;
 
-	    src_x += src_attr.x_offset + itx - dst_x;
-	    src_y += src_attr.y_offset + ity - dst_y;
+	    x = src_x + src_attr.x_offset + itx - dst_x;
+	    y = src_y + src_attr.y_offset + ity - dst_y;
 
 	    num_rects = cairo_region_num_rectangles (clip_region);
 	    for (n = 0; n < num_rects; n++) {
@@ -2294,7 +2294,7 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
 
 		cairo_region_get_rectangle (clip_region, n, &rect);
 		XCopyArea (dst->dpy, src->drawable, dst->drawable, gc,
-			   rect.x + src_x, rect.y + src_y,
+			   rect.x + x, rect.y + y,
 			   rect.width, rect.height,
 			   rect.x, rect.y);
 	    }
diff --git a/gfx/cairo/fix-xcopyarea-with-clips.patch b/gfx/cairo/fix-xcopyarea-with-clips.patch
new file mode 100644
index 000000000000..6bf3320b628e
--- /dev/null
+++ b/gfx/cairo/fix-xcopyarea-with-clips.patch
@@ -0,0 +1,38 @@
+From: Benjamin Otte <otte@redhat.com>
+Date: Thu, 29 Apr 2010 16:20:59 +0000
+Subject: xlib: Don't modify variables that are needed later
+
+In the XCopyArea region code, don't modify src_x/y when they are later
+used in the unbounded fixup code.
+
+Exposed by composite-integer-translate-source test.
+---
+diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
+index bedc3fd..30c08d3 100644
+--- a/gfx/cairo/cairo/src/cairo-xlib-surface.c
++++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c
+@@ -2322,10 +2322,10 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
+ 		       width, height,
+ 		       dst_x, dst_y);
+ 	} else {
+-	    int n, num_rects;
++	    int n, num_rects, x, y;
+ 
+-	    src_x += src_attr.x_offset + itx - dst_x;
+-	    src_y += src_attr.y_offset + ity - dst_y;
++	    x = src_x + src_attr.x_offset + itx - dst_x;
++	    y = src_y + src_attr.y_offset + ity - dst_y;
+ 
+ 	    num_rects = cairo_region_num_rectangles (clip_region);
+ 	    for (n = 0; n < num_rects; n++) {
+@@ -2333,7 +2333,7 @@ _cairo_xlib_surface_composite (cairo_operator_t		op,
+ 
+ 		cairo_region_get_rectangle (clip_region, n, &rect);
+ 		XCopyArea (dst->dpy, src->drawable, dst->drawable, gc,
+-			   rect.x + src_x, rect.y + src_y,
++			   rect.x + x, rect.y + y,
+ 			   rect.width, rect.height,
+ 			   rect.x, rect.y);
+ 	    }
+--
+cgit v0.8.3-6-g21f6

From a593aed844e0b9105f153efaf791f45317af4dab Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Sun, 27 Jun 2010 20:03:48 +1200
Subject: [PATCH 090/172] b=574156 limit Pixmap dimensions to the *signed*
 16-bit range r=jrmuizel

---
 gfx/thebes/src/gfxXlibSurface.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/src/gfxXlibSurface.cpp b/gfx/thebes/src/gfxXlibSurface.cpp
index 04e17038bf8f..fa0d45718e7d 100644
--- a/gfx/thebes/src/gfxXlibSurface.cpp
+++ b/gfx/thebes/src/gfxXlibSurface.cpp
@@ -51,7 +51,10 @@ typedef struct {
 
 static void pixmap_free_func (void *);
 
-#define XLIB_IMAGE_SIDE_SIZE_LIMIT 0xffff
+// Although the dimension parameters in the xCreatePixmapReq wire protocol are
+// 16-bit unsigned integers, the server's CreatePixmap returns BadAlloc if
+// either dimension cannot be represented by a 16-bit *signed* integer.
+#define XLIB_IMAGE_SIDE_SIZE_LIMIT 0x7fff
 
 gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, Visual *visual)
     : mPixmapTaken(PR_FALSE), mDisplay(dpy), mDrawable(drawable)

From cc62298b1d5ba460aac7b2ab4d986c4a9a289367 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Sun, 27 Jun 2010 20:04:33 +1200
Subject: [PATCH 091/172] b=574158 free Pixmaps from the destructor to handle
 error cairo surfaces r=jrmuizel

---
 gfx/thebes/public/gfxXlibSurface.h |  7 ++++--
 gfx/thebes/src/gfxXlibSurface.cpp  | 40 +++---------------------------
 2 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/gfx/thebes/public/gfxXlibSurface.h b/gfx/thebes/public/gfxXlibSurface.h
index a60569a64f2c..a51c9e306a95 100644
--- a/gfx/thebes/public/gfxXlibSurface.h
+++ b/gfx/thebes/public/gfxXlibSurface.h
@@ -80,10 +80,13 @@ public:
 
     // take ownership of a passed-in Pixmap, calling XFreePixmap on it
     // when the gfxXlibSurface is destroyed.
-    void TakePixmap();
+    void TakePixmap() {
+        NS_ASSERTION(!mPixmapTaken, "I already own the Pixmap!");
+        mPixmapTaken = PR_TRUE;
+    }
 
 protected:
-    // if TakePixmap() was already called on this
+    // if TakePixmap() has been called on this
     PRBool mPixmapTaken;
     
     Display *mDisplay;
diff --git a/gfx/thebes/src/gfxXlibSurface.cpp b/gfx/thebes/src/gfxXlibSurface.cpp
index fa0d45718e7d..c19bbc9b8dba 100644
--- a/gfx/thebes/src/gfxXlibSurface.cpp
+++ b/gfx/thebes/src/gfxXlibSurface.cpp
@@ -42,15 +42,6 @@
 #include "cairo-xlib.h"
 #include "cairo-xlib-xrender.h"
 
-static cairo_user_data_key_t pixmap_free_key;
-
-typedef struct {
-    Display* dpy;
-    Pixmap pixmap;
-} pixmap_free_struct;
-
-static void pixmap_free_func (void *);
-
 // Although the dimension parameters in the xCreatePixmapReq wire protocol are
 // 16-bit unsigned integers, the server's CreatePixmap returns BadAlloc if
 // either dimension cannot be represented by a 16-bit *signed* integer.
@@ -133,6 +124,9 @@ gfxXlibSurface::gfxXlibSurface(cairo_surface_t *csurf)
 
 gfxXlibSurface::~gfxXlibSurface()
 {
+    if (mPixmapTaken) {
+        XFreePixmap (mDisplay, mDrawable);
+    }
 }
 
 void
@@ -197,31 +191,3 @@ gfxXlibSurface::FindRenderFormat(Display *dpy, gfxImageFormat format)
 
     return (XRenderPictFormat*)NULL;
 }
-
-void
-gfxXlibSurface::TakePixmap()
-{
-    if (mPixmapTaken)
-        return;
-
-    pixmap_free_struct *pfs = new pixmap_free_struct;
-    pfs->dpy = mDisplay;
-    pfs->pixmap = mDrawable;
-
-    cairo_surface_set_user_data (CairoSurface(),
-                                 &pixmap_free_key,
-                                 pfs,
-                                 pixmap_free_func);
-
-    mPixmapTaken = PR_TRUE;
-}
-
-void
-pixmap_free_func (void *data)
-{
-    pixmap_free_struct *pfs = (pixmap_free_struct*) data;
-
-    XFreePixmap (pfs->dpy, pfs->pixmap);
-
-    delete pfs;
-}

From f3043612b616dd72f53b2cb43e087d567c30e2c2 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Sun, 27 Jun 2010 20:05:00 +1200
Subject: [PATCH 092/172] b=573319 no longer use GdkPixmaps in
 offscreen-surfaces as they were unusable without a GdkColormap r=jrmuizel

---
 gfx/thebes/src/gfxPlatformGtk.cpp | 34 +++++--------------------------
 gfx/thebes/src/gfxXlibSurface.cpp |  3 +++
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/gfx/thebes/src/gfxPlatformGtk.cpp b/gfx/thebes/src/gfxPlatformGtk.cpp
index 834da3232f9f..ca7d28aed5dd 100644
--- a/gfx/thebes/src/gfxPlatformGtk.cpp
+++ b/gfx/thebes/src/gfxPlatformGtk.cpp
@@ -164,12 +164,6 @@ gfxPlatformGtk::CreateOffscreenSurface(const gfxIntSize& size,
                                        gfxASurface::gfxImageFormat imageFormat)
 {
     nsRefPtr<gfxASurface> newSurface = nsnull;
-    PRBool sizeOk = PR_TRUE;
-
-    if (size.width >= GDK_PIXMAP_SIZE_MAX ||
-        size.height >= GDK_PIXMAP_SIZE_MAX)
-        sizeOk = PR_FALSE;
-
 #ifdef MOZ_X11
     // XXX we really need a different interface here, something that passes
     // in more context, including the display and/or target surface type that
@@ -178,7 +172,6 @@ gfxPlatformGtk::CreateOffscreenSurface(const gfxIntSize& size,
     if (!display)
         return nsnull;
 
-    GdkPixmap* pixmap = nsnull;
     // try to optimize it for 16bpp default screen
     if (gfxASurface::ImageFormatRGB24 == imageFormat
         && 16 == gdk_visual_get_system()->depth)
@@ -187,37 +180,20 @@ gfxPlatformGtk::CreateOffscreenSurface(const gfxIntSize& size,
     XRenderPictFormat* xrenderFormat =
         gfxXlibSurface::FindRenderFormat(display, imageFormat);
 
-    if (xrenderFormat && sizeOk) {
-        pixmap = gdk_pixmap_new(nsnull, size.width, size.height,
-                                xrenderFormat->depth);
-
-        if (pixmap) {
-            gdk_drawable_set_colormap(GDK_DRAWABLE(pixmap), nsnull);
-            newSurface = new gfxXlibSurface(display,
-                                            GDK_PIXMAP_XID(GDK_DRAWABLE(pixmap)),
-                                            xrenderFormat,
-                                            size);
-        }
-
-        if (newSurface && newSurface->CairoStatus() == 0) {
-            // set up the surface to auto-unref the gdk pixmap when
-            // the surface is released
-            SetGdkDrawable(newSurface, GDK_DRAWABLE(pixmap));
-        } else {
+    if (xrenderFormat) {
+        newSurface = new gfxXlibSurface(display, xrenderFormat, size);
+        if (newSurface && newSurface->CairoStatus() != 0) {
             // something went wrong with the surface creation.
             // Ignore and let's fall back to image surfaces.
             newSurface = nsnull;
         }
-
-        // always unref; SetGdkDrawable takes its own ref
-        if (pixmap)
-            g_object_unref(pixmap);
     }
 #endif
 
 #ifdef MOZ_DFB
-    if (sizeOk)
+    if (size.width < GDK_PIXMAP_SIZE_MAX && size.height < GDK_PIXMAP_SIZE_MAX) {
         newSurface = new gfxDirectFBSurface(size, imageFormat);
+    }
 #endif
 
 
diff --git a/gfx/thebes/src/gfxXlibSurface.cpp b/gfx/thebes/src/gfxXlibSurface.cpp
index c19bbc9b8dba..1eaae38d1b12 100644
--- a/gfx/thebes/src/gfxXlibSurface.cpp
+++ b/gfx/thebes/src/gfxXlibSurface.cpp
@@ -99,6 +99,9 @@ gfxXlibSurface::gfxXlibSurface(Display *dpy, Drawable drawable, XRenderPictForma
 gfxXlibSurface::gfxXlibSurface(Display *dpy, XRenderPictFormat *format, const gfxIntSize& size)
     : mPixmapTaken(PR_FALSE), mDisplay(dpy), mSize(size)
 {
+    if (!CheckSurfaceSize(size, XLIB_IMAGE_SIDE_SIZE_LIMIT))
+        return;
+
     mDrawable = (Drawable)XCreatePixmap(dpy,
                                         RootWindow(dpy, DefaultScreen(dpy)),
                                         mSize.width, mSize.height,

From be2d8d71ce05c29a02b9fb96121eceb3b8e05d4a Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Sun, 27 Jun 2010 01:27:18 +0200
Subject: [PATCH 093/172] Bug 569821 - js compilation failure on mingw-w64
 r=dvander

--HG--
extra : rebase_source : 849d0c26e909917d6bdf7643928978cf59ed61b5
---
 js/src/jsdhash.cpp       | 2 +-
 js/src/jsfun.h           | 2 +-
 js/src/jsnativestack.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/jsdhash.cpp b/js/src/jsdhash.cpp
index c8b9db09dc0d..d19dea064702 100644
--- a/js/src/jsdhash.cpp
+++ b/js/src/jsdhash.cpp
@@ -135,7 +135,7 @@ JS_DHashStringKey(JSDHashTable *table, const void *key)
 JS_PUBLIC_API(JSDHashNumber)
 JS_DHashVoidPtrKeyStub(JSDHashTable *table, const void *key)
 {
-    return (JSDHashNumber)(unsigned long)key >> 2;
+    return (JSDHashNumber)(uintptr_t)key >> 2;
 }
 
 JS_PUBLIC_API(JSBool)
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index d2d4e83f7370..f84a70621493 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -291,7 +291,7 @@ GetArgsPrivateNative(JSObject *argsobj)
 {
     JS_ASSERT(argsobj->isArguments());
     uintptr_t p = (uintptr_t) argsobj->getPrivate();
-    return (ArgsPrivateNative *) (p & 2 ? p & ~2 : NULL);
+    return p & 2 ? (ArgsPrivateNative *)(p & ~2) : NULL;
 }
 
 } /* namespace js */
diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp
index 820095a7fcd9..81fbc80168d7 100644
--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
@@ -134,7 +134,7 @@ GetNativeStackBaseImpl()
     }
     return static_cast<void*>(pTib->StackBase);
 
-# elif defined(_M_X64) && defined(_MSC_VER)
+# elif defined(_M_X64)
     PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
     return reinterpret_cast<void*>(pTib->StackBase);
 

From d976802e3d08f7c11280cb5b784b52ff6dce52d9 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Sun, 27 Jun 2010 01:28:10 +0200
Subject: [PATCH 094/172] Bug 573341 - Wrong AVMPLUS_ALIGN16 declaration on
 mingw r=dvander

--HG--
extra : rebase_source : 1ae22e8abd799137e661f34b0c8346006a511617
---
 js/src/nanojit/Assembler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/nanojit/Assembler.h b/js/src/nanojit/Assembler.h
index b2029db61379..20d14e94705c 100644
--- a/js/src/nanojit/Assembler.h
+++ b/js/src/nanojit/Assembler.h
@@ -174,7 +174,7 @@ namespace nanojit
     }
 
     #ifndef AVMPLUS_ALIGN16
-        #ifdef AVMPLUS_WIN32
+        #ifdef _MSC_VER
             #define AVMPLUS_ALIGN16(type) __declspec(align(16)) type
         #else
             #define AVMPLUS_ALIGN16(type) type __attribute__ ((aligned (16)))

From 24a16fd07605fb6accf3d111c3f92dd704d1f605 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Sun, 27 Jun 2010 01:30:05 +0200
Subject: [PATCH 095/172] Bug 508905  - /Zc:wchar_t- is no longer required
 (wince part) r=doug.turner

--HG--
extra : rebase_source : 13d6dadb676ca5e29b7e7bcfff5bbb1c964f78e4
---
 build/wince/shunt/environment.cpp       | 20 ++++++++++----------
 build/wince/shunt/include/environment.h | 10 +++++-----
 build/wince/shunt/include/mozce_shunt.h | 20 ++++++++++----------
 build/wince/shunt/shunt.cpp             | 16 ++++++++--------
 xpcom/glue/nsGREGlue.cpp                |  4 ++--
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/build/wince/shunt/environment.cpp b/build/wince/shunt/environment.cpp
index 6eaa8fcdd5f4..31f0e3d3cdd5 100644
--- a/build/wince/shunt/environment.cpp
+++ b/build/wince/shunt/environment.cpp
@@ -159,8 +159,8 @@ getenv(const char* name)
 }
 
 char
-GetEnvironmentVariableW(const unsigned short* lpName,
-                        unsigned short* lpBuffer,
+GetEnvironmentVariableW(const WCHAR* lpName,
+                        WCHAR* lpBuffer,
                         unsigned long nSize)
 {
   char key[256];
@@ -180,8 +180,8 @@ GetEnvironmentVariableW(const unsigned short* lpName,
 }
 
 char
-SetEnvironmentVariableW(const unsigned short* name,
-                        const unsigned short* value)
+SetEnvironmentVariableW(const WCHAR* name,
+                        const WCHAR* value)
 {
   char key[256];
   char val[256];
@@ -204,8 +204,8 @@ SetEnvironmentVariableW(const unsigned short* name,
 }
 
 
-unsigned int ExpandEnvironmentStringsW(const unsigned short* lpSrc,
-                                       unsigned short* lpDst,
+unsigned int ExpandEnvironmentStringsW(const WCHAR* lpSrc,
+                                       WCHAR* lpDst,
                                        unsigned int nSize)
 {
   if ( NULL == lpDst )
@@ -215,8 +215,8 @@ unsigned int ExpandEnvironmentStringsW(const unsigned short* lpSrc,
   unsigned int index = 0;
   unsigned int origLen = wcslen(lpSrc);
 
-  const unsigned short *pIn = lpSrc;
-  unsigned short *pOut = lpDst;
+  const WCHAR *pIn = lpSrc;
+  WCHAR *pOut = lpDst;
 
   while ( index < origLen ) {
 
@@ -228,7 +228,7 @@ unsigned int ExpandEnvironmentStringsW(const unsigned short* lpSrc,
 
     // Have a starting '%' - look for matching '%'
     int envlen = 0;
-    const unsigned short *pTmp = pIn + 1;
+    const WCHAR *pTmp = pIn + 1;
     while ( *pTmp != L'%' && *pTmp != L' ' ) {
       envlen++, pTmp++;
       if ( origLen < index + envlen ) {    // Ran past end of original
@@ -274,7 +274,7 @@ unsigned int ExpandEnvironmentStringsW(const unsigned short* lpSrc,
   return size;
 }
 
-unsigned short *
+WCHAR *
 mozce_GetEnvironmentCL()
 {
   env_entry *entry = env_head;
diff --git a/build/wince/shunt/include/environment.h b/build/wince/shunt/include/environment.h
index 825c03ffc18e..f22aff3f3086 100644
--- a/build/wince/shunt/include/environment.h
+++ b/build/wince/shunt/include/environment.h
@@ -47,14 +47,14 @@ extern "C" {
 /* Environment stuff */
 char* getenv(const char* inName);
 int putenv(const char *a);
-char SetEnvironmentVariableW(const unsigned short * name, const unsigned short * value );
-char GetEnvironmentVariableW(const unsigned short * lpName, unsigned short* lpBuffer, unsigned long nSize);
+char SetEnvironmentVariableW(const wchar_t * name, const wchar_t * value );
+char GetEnvironmentVariableW(const wchar_t * lpName, wchar_t* lpBuffer, unsigned long nSize);
 
-unsigned int ExpandEnvironmentStringsW(const unsigned short* lpSrc,
-				       unsigned short* lpDst,
+unsigned int ExpandEnvironmentStringsW(const wchar_t* lpSrc,
+				       wchar_t* lpDst,
 				       unsigned int nSize);
 
-unsigned short* mozce_GetEnvironmentCL();
+wchar_t* mozce_GetEnvironmentCL();
 
 #ifdef __cplusplus
 };
diff --git a/build/wince/shunt/include/mozce_shunt.h b/build/wince/shunt/include/mozce_shunt.h
index 84d5ea482965..155adb1b9789 100644
--- a/build/wince/shunt/include/mozce_shunt.h
+++ b/build/wince/shunt/include/mozce_shunt.h
@@ -38,8 +38,6 @@
 #ifndef MOZCE_SHUNT_H
 #define MOZCE_SHUNT_H
 
-#include "environment.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -53,6 +51,8 @@ typedef unsigned short wchar_t;
 }   //extern "C" 
 #endif
 
+#include "environment.h"
+
 #ifdef MOZ_MEMORY
 
 #ifdef __cplusplus
@@ -182,18 +182,18 @@ void abort(void);
 /* Environment stuff */
 char* getenv(const char* inName);
 int putenv(const char *a);
-char SetEnvironmentVariableW(const unsigned short * name, const unsigned short * value );
-char GetEnvironmentVariableW(const unsigned short * lpName, unsigned short* lpBuffer, unsigned long nSize);
+char SetEnvironmentVariableW(const wchar_t * name, const wchar_t * value );
+char GetEnvironmentVariableW(const wchar_t * lpName, wchar_t* lpBuffer, unsigned long nSize);
   
-unsigned int ExpandEnvironmentStringsW(const unsigned short* lpSrc,
-				       unsigned short* lpDst,
+unsigned int ExpandEnvironmentStringsW(const wchar_t* lpSrc,
+				       wchar_t* lpDst,
 				       unsigned int nSize);
 
 /* File system stuff */
-unsigned short * _wgetcwd(unsigned short* dir, unsigned long size);
-unsigned short *_wfullpath( unsigned short *absPath, const unsigned short *relPath, unsigned long maxLength );
+wchar_t * _wgetcwd(wchar_t* dir, unsigned long size);
+wchar_t *_wfullpath(wchar_t *absPath, const wchar_t *relPath, unsigned long maxLength );
 int _unlink(const char *filename );
-int _wchdir(const unsigned short* path);
+int _wchdir(const wchar_t* path);
   
 /* The time stuff should be defined here, but it can't be because it
    is already defined in time.h.
@@ -228,7 +228,7 @@ struct tm* localtime_r(const time_t* inTimeT, struct tm* outRetval);
 */
 
 
-unsigned short* mozce_GetEnvironmentCL();
+wchar_t* mozce_GetEnvironmentCL();
 
   /* square root of 1/2, missing from math.h */ 
 #define M_SQRT1_2  0.707106781186547524401
diff --git a/build/wince/shunt/shunt.cpp b/build/wince/shunt/shunt.cpp
index b3dd0c0e3e72..99d9d92eb133 100644
--- a/build/wince/shunt/shunt.cpp
+++ b/build/wince/shunt/shunt.cpp
@@ -113,15 +113,15 @@ int errno = 0;
 //  File System Stuff
 ////////////////////////////////////////////////////////
 
-unsigned short * _wgetcwd(unsigned short * dir, unsigned long size)
+wchar_t * _wgetcwd(wchar_t * dir, unsigned long size)
 {
-  unsigned short tmp[MAX_PATH] = {0};
+  wchar_t tmp[MAX_PATH] = {0};
   GetEnvironmentVariableW(L"CWD", tmp, size);
   if (tmp && tmp[0]) {
     if (wcslen(tmp) > size)
       return 0;
     if (!dir) {
-      dir = (unsigned short*)malloc(sizeof(unsigned short) * (wcslen(tmp) + 2));
+      dir = (wchar_t*)malloc(sizeof(wchar_t) * (wcslen(tmp) + 2));
       if (!dir)
         return 0;
     }
@@ -129,7 +129,7 @@ unsigned short * _wgetcwd(unsigned short * dir, unsigned long size)
   } else {
     unsigned long i;
     if (!dir) {
-      dir = (unsigned short*)malloc(sizeof(unsigned short) * (MAX_PATH + 1));
+      dir = (wchar_t*)malloc(sizeof(wchar_t) * (MAX_PATH + 1));
       if (!dir)
         return 0;
     }
@@ -147,12 +147,12 @@ unsigned short * _wgetcwd(unsigned short * dir, unsigned long size)
   return dir;
 }
 
-unsigned short *_wfullpath( unsigned short *absPath, const unsigned short *relPath, unsigned long maxLength )
+wchar_t *_wfullpath( wchar_t *absPath, const wchar_t *relPath, unsigned long maxLength )
 {
   if(absPath == NULL){
-    absPath = (unsigned short *)malloc(maxLength*sizeof(unsigned short));
+    absPath = (wchar_t *)malloc(maxLength*sizeof(wchar_t));
   }
-  unsigned short cwd[MAX_PATH];
+  wchar_t cwd[MAX_PATH];
   if (NULL == _wgetcwd( cwd, MAX_PATH))
     return NULL;
 
@@ -181,7 +181,7 @@ int _wchdir(const WCHAR* path) {
 
 int _unlink(const char *filename)
 {
-  unsigned short wname[MAX_PATH];
+  wchar_t wname[MAX_PATH];
   
   MultiByteToWideChar(CP_ACP,
                       0,
diff --git a/xpcom/glue/nsGREGlue.cpp b/xpcom/glue/nsGREGlue.cpp
index ec677aaa451f..814d7ed87e92 100644
--- a/xpcom/glue/nsGREGlue.cpp
+++ b/xpcom/glue/nsGREGlue.cpp
@@ -197,8 +197,8 @@ GRE_GetGREPathWithProperties(const GREVersionRange *versions,
 #elif WINCE
     if (p[0] != '\\') 
     {
-      unsigned short dir[MAX_PATH];
-      unsigned short path[MAX_PATH];
+      WCHAR dir[MAX_PATH];
+      WCHAR path[MAX_PATH];
       MultiByteToWideChar(CP_ACP, 0, p, -1, path, MAX_PATH);
       _wfullpath(dir,path,MAX_PATH);
       WideCharToMultiByte(CP_ACP, 0, dir, -1, aBuffer, MAX_PATH, NULL, NULL);

From 83597e8444289d15872ec7324199a466f677b017 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Sun, 27 Jun 2010 01:31:01 +0200
Subject: [PATCH 096/172] Bug 508905  - /Zc:wchar_t- is no longer required
 (cairo-dwrite part) r=jmuizelaar

--HG--
extra : rebase_source : 2a283b99932cb9891e63f56670e8ce8762514385
---
 gfx/cairo/cairo/src/cairo-dwrite-font.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
index 127ea85c3d03..fe9dd7e6eb81 100644
--- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
+++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp
@@ -266,23 +266,23 @@ static cairo_status_t
 _cairo_dwrite_font_face_create_for_toy (cairo_toy_font_face_t   *toy_face,
 					cairo_font_face_t      **font_face)
 {
-    uint16_t *face_name;
+    WCHAR *face_name;
     int face_name_len;
-    cairo_status_t status;
 
     if (!DWriteFactory::Instance()) {
 	return (cairo_status_t)CAIRO_INT_STATUS_UNSUPPORTED;
     }
 
-    status = _cairo_utf8_to_utf16 (toy_face->family, -1,
-				   &face_name, &face_name_len);
+    face_name_len = MultiByteToWideChar(CP_UTF8, 0, toy_face->family, -1, NULL, 0);
+    face_name = new WCHAR[face_name_len];
+    MultiByteToWideChar(CP_UTF8, 0, toy_face->family, -1, face_name, face_name_len);
 
     IDWriteFontFamily *family = DWriteFactory::FindSystemFontFamily(face_name);
+    delete face_name;
     if (!family) {
 	*font_face = (cairo_font_face_t*)&_cairo_font_face_nil;
 	return CAIRO_STATUS_FONT_TYPE_MISMATCH;
     }
-    free (face_name);
 
     DWRITE_FONT_WEIGHT weight;
     switch (toy_face->weight) {

From eb279b4d0593bf16d3cc3f5867f177b3a500b56b Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Sun, 27 Jun 2010 01:33:17 +0200
Subject: [PATCH 097/172] Bug 570365 - Remove -MANIFESTUAC:NO linker flag from
 configure r=ted.mielczarek

--HG--
extra : rebase_source : 75eb9e70e04abac7e61e835f62f0aef82c085cec
---
 configure.in        | 2 --
 js/src/configure.in | 2 --
 2 files changed, 4 deletions(-)

diff --git a/configure.in b/configure.in
index ac4f8cfbec53..cc30a2bc09c1 100644
--- a/configure.in
+++ b/configure.in
@@ -666,14 +666,12 @@ case "$target" in
         elif test "$_CC_MAJOR_VERSION" = "15"; then
             _CC_SUITE=9
             CXXFLAGS="$CXXFLAGS -Zc:wchar_t-"
-            LDFLAGS="$LDFLAGS -MANIFESTUAC:NO"
             _USE_DYNAMICBASE=1
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         elif test "$_CC_MAJOR_VERSION" = "16"; then
             _CC_SUITE=10
             CXXFLAGS="$CXXFLAGS -Zc:wchar_t-"
-            LDFLAGS="$LDFLAGS -MANIFESTUAC:NO"
             _USE_DYNAMICBASE=1
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
diff --git a/js/src/configure.in b/js/src/configure.in
index fb4181094cae..739c07927d52 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -568,14 +568,12 @@ case "$target" in
         elif test "$_CC_MAJOR_VERSION" = "15"; then
             _CC_SUITE=9
             CXXFLAGS="$CXXFLAGS -Zc:wchar_t-"
-            LDFLAGS="$LDFLAGS -MANIFESTUAC:NO"
             _USE_DYNAMICBASE=1
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
         elif test "$_CC_MAJOR_VERSION" = "16"; then
             _CC_SUITE=10
             CXXFLAGS="$CXXFLAGS -Zc:wchar_t-"
-            LDFLAGS="$LDFLAGS -MANIFESTUAC:NO"
             _USE_DYNAMICBASE=1
             AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
             AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)

From 8225317cb74b305a90c1c37d3db6466384fdf540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sun, 27 Jun 2010 16:00:14 +0200
Subject: [PATCH 098/172] Bug 571871 - Hovering "Print" menuitem shows black on
 blue instead of white on blue. r=gavin

---
 browser/themes/winstripe/browser/browser.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 52a6da8dfe43..b9ef434fd977 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -163,6 +163,12 @@ statusbarpanel#statusbar-display {
   -moz-padding-end: 16px;
 }
 
+.split-menuitem-item[_moz-menuactive="true"],
+.split-menuitem-menu[_moz-menuactive="true"] {
+  background-color: -moz-menuhover;
+  color: -moz-menuhovertext;
+}
+
 /* XXX: stop-gap until the button can be drawn in the title bar */
 %ifdef WINSTRIPE_AERO
 @media not all and (-moz-windows-compositor) {

From 9a0c6c33bd281a64536c292a317b234ef6f1d44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Sun, 27 Jun 2010 16:00:50 +0200
Subject: [PATCH 099/172] Bug 571750 - Remove keyboard shortcuts from the
 Firefox button menu. r=gavin

---
 browser/base/content/browser.xul | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index a7e9829246cd..aac4ba9d7a88 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -391,12 +391,10 @@
       <menupopup>
         <menuitem id="appmenu_newNavigator"
                   label="&newNavigatorCmd.label;"
-                  key="key_newNavigator"
                   command="cmd_newNavigator"/>
         <menuseparator/>
         <menuitem id="appmenu_savePage"
                   label="&savePageCmd.label;"
-                  key="key_savePage"
                   command="Browser:SavePage"/>
         <menuitem id="appmenu_sendLink"
                   label="&sendPageCmd.label;"
@@ -406,7 +404,6 @@
                     class="split-menuitem-item"
                     flex="1"
                     label="&appMenuPrintCmd.label;"
-                    key="printKb"
                     command="cmd_print"/>
           <menu class="split-menuitem-menu">
             <menupopup>
@@ -421,7 +418,6 @@
         </hbox>
         <menuitem id="appmenu_find"
                   label="&findOnCmd.label;"
-                  key="key_find"
                   command="cmd_find"/>
         <menuseparator/>
         <menu id="appmenu_history"
@@ -493,9 +489,6 @@
                   label="&quitApplicationCmdWin.label;"
 #else
                   label="&quitApplicationCmd.label;"
-#ifdef XP_UNIX
-                  key="key_quitApplication"
-#endif
 #endif
                   command="cmd_quitApplication"/>
       </menupopup>

From 4a3cfaa4e870e353fbce080e863298f1fa5ff409 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Sat, 26 Jun 2010 23:39:56 +0300
Subject: [PATCH 100/172] Bug 574089 - Optimize ::GetInnerHTML, r=jst

--HG--
extra : rebase_source : 3ed1549eaa96d3ff3fe6bf2bb2562dd9e68fcc17
---
 content/base/public/nsIDocument.h             |  31 ++++-
 content/base/public/nsIDocumentEncoder.idl    |  13 +-
 content/base/src/nsDocument.cpp               |  18 +--
 content/base/src/nsDocumentEncoder.cpp        | 114 ++++++++++++++----
 content/base/src/nsXHTMLContentSerializer.cpp |   2 +
 content/base/src/nsXMLContentSerializer.cpp   |   9 ++
 .../html/content/src/nsGenericHTMLElement.cpp |  34 +++---
 content/html/document/src/nsHTMLDocument.cpp  |  10 +-
 xpcom/string/public/nsStringBuffer.h          |   6 +-
 xpcom/string/src/nsSubstring.cpp              |  14 ++-
 10 files changed, 191 insertions(+), 60 deletions(-)

diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index a60f69fa6062..157e9892f969 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -63,6 +63,7 @@
 #include "nsSMILAnimationController.h"
 #endif // MOZ_SMIL
 #include "nsIScriptGlobalObject.h"
+#include "nsIDocumentEncoder.h"
 
 class nsIContent;
 class nsPresContext;
@@ -116,10 +117,9 @@ class Element;
 } // namespace mozilla
 
 
-// fbcd570b-dbfa-479b-9bd0-02312129c044
 #define NS_IDOCUMENT_IID      \
-{ 0xfbcd570b, 0xdbfa, 0x479b, \
-  { 0x9b, 0xd0, 0x02, 0x31, 0x21, 0x29, 0xc0, 0x44 } }
+{ 0x1d8bd3d4, 0x6f6d, 0x49fe, \
+  { 0xaf, 0xda, 0xc9, 0x4a, 0xef, 0x8f, 0xcf, 0x1f } }
 
 // Flag for AddStyleSheet().
 #define NS_STYLESHEET_FROM_CATALOG                (1 << 0)
@@ -1115,6 +1115,16 @@ public:
     // Do nothing.
   }
 
+  already_AddRefed<nsIDocumentEncoder> GetCachedEncoder()
+  {
+    return mCachedEncoder.forget();
+  }
+
+  void SetCachedEncoder(nsIDocumentEncoder* aEncoder)
+  {
+    mCachedEncoder = aEncoder;
+  }
+
   // In case of failure, the document really can't initialize the frame loader.
   virtual nsresult InitializeFrameLoader(nsFrameLoader* aLoader) = 0;
   // In case of failure, the caller must handle the error, for example by
@@ -1422,6 +1432,17 @@ protected:
     return GetRootElement();
   }
 
+  void SetContentTypeInternal(const nsACString& aType)
+  {
+    mCachedEncoder = nsnull;
+    mContentType = aType;
+  }
+
+  nsCString GetContentTypeInternal() const
+  {
+    return mContentType;
+  }
+
   nsCOMPtr<nsIURI> mDocumentURI;
   nsCOMPtr<nsIURI> mDocumentBaseURI;
 
@@ -1530,7 +1551,9 @@ protected:
   PRUint32 mBidiOptions;
 
   nsCString mContentLanguage;
+private:
   nsCString mContentType;
+protected:
 
   // The document's security info
   nsCOMPtr<nsISupports> mSecurityInfo;
@@ -1560,6 +1583,8 @@ protected:
   // Weak reference to mScriptGlobalObject QI:d to nsPIDOMWindow,
   // updated on every set of mSecriptGlobalObject.
   nsPIDOMWindow *mWindow;
+
+  nsCOMPtr<nsIDocumentEncoder> mCachedEncoder;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocument, NS_IDOCUMENT_IID)
diff --git a/content/base/public/nsIDocumentEncoder.idl b/content/base/public/nsIDocumentEncoder.idl
index d83a2eabec8a..13cadc20e924 100644
--- a/content/base/public/nsIDocumentEncoder.idl
+++ b/content/base/public/nsIDocumentEncoder.idl
@@ -44,6 +44,13 @@ interface nsISelection;
 interface nsIDOMNode;
 interface nsIOutputStream;
 
+%{ C++
+class nsINode;
+class nsIDocument;
+%}
+[ptr] native nsINodePtr(nsINode);
+[ptr] native nsIDocumentPtr(nsIDocument);
+
 [scriptable, uuid(c0da5b87-0ba7-4d7c-8cb3-fcb02af4253d)]
 interface nsIDocumentEncoderNodeFixup : nsISupports
 {
@@ -61,7 +68,7 @@ interface nsIDocumentEncoderNodeFixup : nsISupports
   nsIDOMNode fixupNode(in nsIDOMNode aNode, out boolean aSerializeCloneKids);
 };
 
-[scriptable, uuid(794a81f6-bde6-4f76-9f5e-0ea0911a2d9f)]
+[scriptable, uuid(7222bdf1-c2b9-41f1-a40a-a3d65283a95b)]
 interface nsIDocumentEncoder : nsISupports
 {
   // Output methods flag bits. There are a frightening number of these,
@@ -238,6 +245,9 @@ interface nsIDocumentEncoder : nsISupports
   void init(in nsIDOMDocument aDocument,
             in AString aMimeType,
             in unsigned long aFlags);
+  [noscript] void nativeInit(in nsIDocumentPtr aDocument,
+                             in AString aMimeType,
+                             in unsigned long aFlags);
 
   /**
    *  If the selection is set to a non-null value, then the
@@ -270,6 +280,7 @@ interface nsIDocumentEncoder : nsISupports
    *  @param aContainer The node which child nodes will be encoded.
    */
   void setContainerNode(in nsIDOMNode aContainer);
+  [noscript] void setNativeContainerNode(in nsINodePtr aContainer);
 
   /**
    *  Documents typically have an intrinsic character set,
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 664eca314cd6..08ff0e469b6b 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1393,7 +1393,7 @@ nsDOMImplementation::Init(nsIURI* aDocumentURI, nsIURI* aBaseURI,
 nsDocument::nsDocument(const char* aContentType)
   : nsIDocument()
 {
-  mContentType = aContentType;
+  SetContentTypeInternal(nsDependentCString(aContentType));
   
 #ifdef PR_LOGGING
   if (!gDocumentLeakPRLog)
@@ -1688,6 +1688,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFirstBaseNodeWithHref)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDOMImplementation)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOriginalDocument)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCachedEncoder)
 
   // Traverse all our nsCOMArrays.
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mStyleSheets)
@@ -1731,6 +1732,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFirstBaseNodeWithHref)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDOMImplementation)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOriginalDocument)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mCachedEncoder)
 
   NS_IMPL_CYCLE_COLLECTION_UNLINK_USERDATA
 
@@ -1947,7 +1949,7 @@ nsDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
   mLastModified.Truncate();
   // XXXbz I guess we're assuming that the caller will either pass in
   // a channel with a useful type or call SetContentType?
-  mContentType.Truncate();
+  SetContentTypeInternal(EmptyCString());
   mContentLanguage.Truncate();
   mBaseTarget.Truncate();
   mReferrer.Truncate();
@@ -2155,7 +2157,7 @@ nsDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel,
     contentType.EndReading(end);
     semicolon = start;
     FindCharInReadable(';', semicolon, end);
-    mContentType = Substring(start, semicolon);
+    SetContentTypeInternal(Substring(start, semicolon));
   }
 
   RetrieveRelevantHeaders(aChannel);
@@ -2436,7 +2438,7 @@ nsDocument::SetApplicationCache(nsIApplicationCache *aApplicationCache)
 NS_IMETHODIMP
 nsDocument::GetContentType(nsAString& aContentType)
 {
-  CopyUTF8toUTF16(mContentType, aContentType);
+  CopyUTF8toUTF16(GetContentTypeInternal(), aContentType);
 
   return NS_OK;
 }
@@ -2444,11 +2446,11 @@ nsDocument::GetContentType(nsAString& aContentType)
 void
 nsDocument::SetContentType(const nsAString& aContentType)
 {
-  NS_ASSERTION(mContentType.IsEmpty() ||
-               mContentType.Equals(NS_ConvertUTF16toUTF8(aContentType)),
+  NS_ASSERTION(GetContentTypeInternal().IsEmpty() ||
+               GetContentTypeInternal().Equals(NS_ConvertUTF16toUTF8(aContentType)),
                "Do you really want to change the content-type?");
 
-  CopyUTF16toUTF8(aContentType, mContentType);
+  SetContentTypeInternal(NS_ConvertUTF16toUTF8(aContentType));
 }
 
 /* Return true if the document is in the focused top-level window, and is an
@@ -7305,7 +7307,7 @@ nsDocument::CloneDocHelper(nsDocument* clone) const
   clone->mCompatMode = mCompatMode;
   clone->mBidiOptions = mBidiOptions;
   clone->mContentLanguage = mContentLanguage;
-  clone->mContentType = mContentType;
+  clone->SetContentTypeInternal(GetContentTypeInternal());
   clone->mSecurityInfo = mSecurityInfo;
 
   // State from nsDocument
diff --git a/content/base/src/nsDocumentEncoder.cpp b/content/base/src/nsDocumentEncoder.cpp
index f7be93c89d6d..e966415bad9c 100644
--- a/content/base/src/nsDocumentEncoder.cpp
+++ b/content/base/src/nsDocumentEncoder.cpp
@@ -81,6 +81,7 @@
 #include "nsReadableUtils.h"
 #include "nsTArray.h"
 #include "nsIFrame.h"
+#include "nsStringBuffer.h"
 
 nsresult NS_NewDomSelection(nsISelection **aDomSelection);
 
@@ -95,8 +96,8 @@ public:
   nsDocumentEncoder();
   virtual ~nsDocumentEncoder();
 
-  NS_DECL_ISUPPORTS
-
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_CLASS(nsDocumentEncoder)
   NS_DECL_NSIDOCUMENTENCODER
 
 protected:
@@ -175,17 +176,36 @@ protected:
   PRPackedBool      mHaltRangeHint;  
   PRPackedBool      mIsCopying;  // Set to PR_TRUE only while copying
   PRPackedBool      mNodeIsContainer;
+  nsStringBuffer*   mCachedBuffer;
 };
 
-NS_IMPL_ADDREF(nsDocumentEncoder)
-NS_IMPL_RELEASE(nsDocumentEncoder)
+NS_IMPL_CYCLE_COLLECTION_CLASS(nsDocumentEncoder)
 
-NS_INTERFACE_MAP_BEGIN(nsDocumentEncoder)
+NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDocumentEncoder)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDocumentEncoder)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocumentEncoder)
    NS_INTERFACE_MAP_ENTRY(nsIDocumentEncoder)
    NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
-nsDocumentEncoder::nsDocumentEncoder()
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocumentEncoder)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDocument)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mSelection)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mRange)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mNode)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mCommonParent)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsDocumentEncoder)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDocument)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mSelection)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mRange)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mNode)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCommonParent)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+nsDocumentEncoder::nsDocumentEncoder() : mCachedBuffer(nsnull)
 {
   Initialize();
   mMimeType.AssignLiteral("text/plain");
@@ -202,10 +222,14 @@ void nsDocumentEncoder::Initialize()
   mEndRootIndex = 0;
   mHaltRangeHint = PR_FALSE;
   mNodeIsContainer = PR_FALSE;
+  mSerializer = nsnull;
 }
 
 nsDocumentEncoder::~nsDocumentEncoder()
 {
+  if (mCachedBuffer) {
+    mCachedBuffer->Release();
+  }
 }
 
 NS_IMETHODIMP
@@ -216,10 +240,23 @@ nsDocumentEncoder::Init(nsIDOMDocument* aDocument,
   if (!aDocument)
     return NS_ERROR_INVALID_ARG;
 
+  nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDocument);
+  NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
+
+  return NativeInit(doc, aMimeType, aFlags);
+}
+
+NS_IMETHODIMP
+nsDocumentEncoder::NativeInit(nsIDocument* aDocument,
+                              const nsAString& aMimeType,
+                              PRUint32 aFlags)
+{
+  if (!aDocument)
+    return NS_ERROR_INVALID_ARG;
+
   Initialize();
 
-  mDocument = do_QueryInterface(aDocument);
-  NS_ENSURE_TRUE(mDocument, NS_ERROR_FAILURE);
+  mDocument = aDocument;
 
   mMimeType = aMimeType;
 
@@ -266,6 +303,14 @@ nsDocumentEncoder::SetContainerNode(nsIDOMNode *aContainer)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDocumentEncoder::SetNativeContainerNode(nsINode* aContainer)
+{
+  mNodeIsContainer = PR_TRUE;
+  mNode = aContainer;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsDocumentEncoder::SetCharset(const nsACString& aCharset)
 {
@@ -928,11 +973,26 @@ nsDocumentEncoder::EncodeToString(nsAString& aOutputString)
 
   aOutputString.Truncate();
 
-  nsCAutoString progId(NS_CONTENTSERIALIZER_CONTRACTID_PREFIX);
-  AppendUTF16toUTF8(mMimeType, progId);
+  nsString output;
+  static const size_t bufferSize = 2048;
+  if (!mCachedBuffer) {
+    mCachedBuffer = nsStringBuffer::Alloc(bufferSize);
+  }
+  NS_ASSERTION(!mCachedBuffer->IsReadonly(),
+               "DocumentEncoder shouldn't keep reference to non-readonly buffer!");
+  static_cast<PRUnichar*>(mCachedBuffer->Data())[0] = PRUnichar(0);
+  mCachedBuffer->ToString(0, output, PR_TRUE);
+  // output owns the buffer now!
+  mCachedBuffer = nsnull;
+  
 
-  mSerializer = do_CreateInstance(progId.get());
-  NS_ENSURE_TRUE(mSerializer, NS_ERROR_NOT_IMPLEMENTED);
+  if (!mSerializer) {
+    nsCAutoString progId(NS_CONTENTSERIALIZER_CONTRACTID_PREFIX);
+    AppendUTF16toUTF8(mMimeType, progId);
+
+    mSerializer = do_CreateInstance(progId.get());
+    NS_ENSURE_TRUE(mSerializer, NS_ERROR_NOT_IMPLEMENTED);
+  }
 
   nsresult rv = NS_OK;
 
@@ -966,47 +1026,59 @@ nsDocumentEncoder::EncodeToString(nsAString& aOutputString)
       if (node != prevNode) {
         if (prevNode) {
           nsCOMPtr<nsINode> p = do_QueryInterface(prevNode);
-          rv = SerializeNodeEnd(p, aOutputString);
+          rv = SerializeNodeEnd(p, output);
           NS_ENSURE_SUCCESS(rv, rv);
           prevNode = nsnull;
         }
         nsCOMPtr<nsIContent> content = do_QueryInterface(node);
         if (content && content->Tag() == nsGkAtoms::tr) {
           nsCOMPtr<nsINode> n = do_QueryInterface(node);
-          rv = SerializeNodeStart(n, 0, -1, aOutputString);
+          rv = SerializeNodeStart(n, 0, -1, output);
           NS_ENSURE_SUCCESS(rv, rv);
           prevNode = node;
         }
       }
 
       nsCOMPtr<nsIRange> r = do_QueryInterface(range);
-      rv = SerializeRangeToString(r, aOutputString);
+      rv = SerializeRangeToString(r, output);
       NS_ENSURE_SUCCESS(rv, rv);
     }
     if (prevNode) {
       nsCOMPtr<nsINode> p = do_QueryInterface(prevNode);
-      rv = SerializeNodeEnd(p, aOutputString);
+      rv = SerializeNodeEnd(p, output);
       NS_ENSURE_SUCCESS(rv, rv);
     }
 
     mSelection = nsnull;
   } else if (mRange) {
-      rv = SerializeRangeToString(mRange, aOutputString);
+      rv = SerializeRangeToString(mRange, output);
 
       mRange = nsnull;
   } else if (mNode) {
-    rv = SerializeToStringRecursive(mNode, aOutputString, mNodeIsContainer);
+    rv = SerializeToStringRecursive(mNode, output, mNodeIsContainer);
     mNode = nsnull;
   } else {
-    rv = mSerializer->AppendDocumentStart(mDocument, aOutputString);
+    rv = mSerializer->AppendDocumentStart(mDocument, output);
 
     if (NS_SUCCEEDED(rv)) {
-      rv = SerializeToStringRecursive(mDocument, aOutputString, PR_FALSE);
+      rv = SerializeToStringRecursive(mDocument, output, PR_FALSE);
     }
   }
 
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = mSerializer->Flush(aOutputString);
+  rv = mSerializer->Flush(output);
+ 
+  if (NS_SUCCEEDED(rv)) {
+    aOutputString.Append(output.get(), output.Length());
+  }
+  mCachedBuffer = nsStringBuffer::FromString(output);
+  // Try to cache the buffer.
+  if (mCachedBuffer && mCachedBuffer->StorageSize() == bufferSize &&
+      !mCachedBuffer->IsReadonly()) {
+    mCachedBuffer->AddRef();
+  } else {
+    mCachedBuffer = nsnull;
+  }
 
   return rv;
 }
diff --git a/content/base/src/nsXHTMLContentSerializer.cpp b/content/base/src/nsXHTMLContentSerializer.cpp
index 21d603fa33de..12bf1cc69b20 100644
--- a/content/base/src/nsXHTMLContentSerializer.cpp
+++ b/content/base/src/nsXHTMLContentSerializer.cpp
@@ -101,6 +101,8 @@ nsXHTMLContentSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn,
                               const char* aCharSet, PRBool aIsCopying,
                               PRBool aRewriteEncodingDeclaration)
 {
+  mInBody = 0;
+
   // The previous version of the HTML serializer did implicit wrapping
   // when there is no flags, so we keep wrapping in order to keep
   // compatibility with the existing calling code
diff --git a/content/base/src/nsXMLContentSerializer.cpp b/content/base/src/nsXMLContentSerializer.cpp
index f02958538995..aa65d0582501 100644
--- a/content/base/src/nsXMLContentSerializer.cpp
+++ b/content/base/src/nsXMLContentSerializer.cpp
@@ -111,6 +111,15 @@ nsXMLContentSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn,
                              const char* aCharSet, PRBool aIsCopying,
                              PRBool aRewriteEncodingDeclaration)
 {
+  mPrefixIndex = 0;
+  mColPos = 0;
+  mIndentOverflow = 0;
+  mIsIndentationAddedOnCurrentLine = PR_FALSE;
+  mInAttribute = PR_FALSE;
+  mAddNewlineForRootNode = PR_FALSE;
+  mAddSpace = PR_FALSE;
+  mMayIgnoreLineBreakSequence = PR_FALSE;
+
   mCharset = aCharSet;
   mFlags = aFlags;
 
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 01b13d991018..ca565fc6dadb 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -655,13 +655,11 @@ nsGenericHTMLElement::GetInnerHTML(nsAString& aInnerHTML)
 {
   aInnerHTML.Truncate();
 
-  nsCOMPtr<nsIDocument> doc = GetOwnerDoc();
+  nsIDocument* doc = GetOwnerDoc();
   if (!doc) {
     return NS_OK; // We rely on the document for doing HTML conversion
   }
 
-  nsCOMPtr<nsIDOMNode> thisNode(do_QueryInterface(static_cast<nsIContent *>
-                                                             (this)));
   nsresult rv = NS_OK;
 
   nsAutoString contentType;
@@ -670,13 +668,15 @@ nsGenericHTMLElement::GetInnerHTML(nsAString& aInnerHTML)
   } else {
     doc->GetContentType(contentType);
   }
-  
-  nsCOMPtr<nsIDocumentEncoder> docEncoder;
-  docEncoder =
-    do_CreateInstance(PromiseFlatCString(
+
+  nsCOMPtr<nsIDocumentEncoder> docEncoder = doc->GetCachedEncoder();
+  if (!docEncoder) {
+    docEncoder =
+      do_CreateInstance(PromiseFlatCString(
         nsDependentCString(NS_DOC_ENCODER_CONTRACTID_BASE) +
         NS_ConvertUTF16toUTF8(contentType)
       ).get());
+  }
   if (!(docEncoder || doc->IsHTML())) {
     // This could be some type for which we create a synthetic document.  Try
     // again as XML
@@ -686,17 +686,19 @@ nsGenericHTMLElement::GetInnerHTML(nsAString& aInnerHTML)
 
   NS_ENSURE_TRUE(docEncoder, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsIDOMDocument> domDoc = do_QueryInterface(doc);
-  rv = docEncoder->Init(domDoc, contentType,
-                        nsIDocumentEncoder::OutputEncodeBasicEntities |
-                        // Output DOM-standard newlines
-                        nsIDocumentEncoder::OutputLFLineBreak |
-                        // Don't do linebreaking that's not present in the source
-                        nsIDocumentEncoder::OutputRaw);
+  rv = docEncoder->NativeInit(doc, contentType,
+                              nsIDocumentEncoder::OutputEncodeBasicEntities |
+                              // Output DOM-standard newlines
+                              nsIDocumentEncoder::OutputLFLineBreak |
+                              // Don't do linebreaking that's not present in
+                              // the source
+                              nsIDocumentEncoder::OutputRaw);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  docEncoder->SetContainerNode(thisNode);
-  return docEncoder->EncodeToString(aInnerHTML);
+  docEncoder->SetNativeContainerNode(this);
+  rv = docEncoder->EncodeToString(aInnerHTML);
+  doc->SetCachedEncoder(docEncoder);
+  return rv;
 }
 
 nsresult
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index d2a363f4d845..2026ce4c5663 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -342,7 +342,7 @@ nsHTMLDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup,
   // Make the content type default to "text/html", we are a HTML
   // document, after all. Once we start getting data, this may be
   // changed.
-  mContentType = "text/html";
+  SetContentTypeInternal(nsDependentCString("text/html"));
 }
 
 nsStyleSet::sheetType
@@ -2035,7 +2035,7 @@ nsHTMLDocument::OpenCommon(const nsACString& aContentType, PRBool aReplace)
   }
 
   // This will be propagated to the parser when someone actually calls write()
-  mContentType = aContentType;
+  SetContentTypeInternal(aContentType);
 
   mWriteState = eDocumentOpened;
 
@@ -2134,7 +2134,7 @@ nsHTMLDocument::Close()
 
     ++mWriteLevel;
     rv = mParser->Parse(EmptyString(), mParser->GetRootContextKey(),
-                        mContentType, PR_TRUE);
+                        GetContentTypeInternal(), PR_TRUE);
     --mWriteLevel;
 
     // XXX Make sure that all the document.written content is
@@ -2234,11 +2234,11 @@ nsHTMLDocument::WriteCommon(const nsAString& aText,
   // why pay that price when we don't need to?
   if (aNewlineTerminate) {
     rv = mParser->Parse(aText + new_line,
-                        key, mContentType,
+                        key, GetContentTypeInternal(),
                         (mWriteState == eNotWriting || (mWriteLevel > 1)));
   } else {
     rv = mParser->Parse(aText,
-                        key, mContentType,
+                        key, GetContentTypeInternal(),
                         (mWriteState == eNotWriting || (mWriteLevel > 1)));
   }
 
diff --git a/xpcom/string/public/nsStringBuffer.h b/xpcom/string/public/nsStringBuffer.h
index 6ea57561c88b..c88a018cec76 100644
--- a/xpcom/string/public/nsStringBuffer.h
+++ b/xpcom/string/public/nsStringBuffer.h
@@ -165,8 +165,10 @@ class nsStringBuffer
        *       however, string length is always measured in storage units
        *       (2-byte units for wide strings).
        */
-      NS_COM void ToString(PRUint32 len, nsAString &str);
-      NS_COM void ToString(PRUint32 len, nsACString &str);
+      NS_COM void ToString(PRUint32 len, nsAString &str,
+                           PRBool aMoveOwnership = PR_FALSE);
+      NS_COM void ToString(PRUint32 len, nsACString &str,
+                           PRBool aMoveOwnership = PR_FALSE);
   };
 
 #endif /* !defined(nsStringBuffer_h__ */
diff --git a/xpcom/string/src/nsSubstring.cpp b/xpcom/string/src/nsSubstring.cpp
index f4537c7526cd..3b6d09203e30 100644
--- a/xpcom/string/src/nsSubstring.cpp
+++ b/xpcom/string/src/nsSubstring.cpp
@@ -264,7 +264,8 @@ nsStringBuffer::FromString(const nsACString& str)
   }
 
 void
-nsStringBuffer::ToString(PRUint32 len, nsAString &str)
+nsStringBuffer::ToString(PRUint32 len, nsAString &str,
+                         PRBool aMoveOwnership)
   {
     PRUnichar* data = static_cast<PRUnichar*>(Data());
 
@@ -275,12 +276,15 @@ nsStringBuffer::ToString(PRUint32 len, nsAString &str)
     PRUint32 flags = accessor->flags();
     flags = (flags & 0xFFFF0000) | nsSubstring::F_SHARED | nsSubstring::F_TERMINATED;
 
-    AddRef();
+    if (!aMoveOwnership) {
+      AddRef();
+    }
     accessor->set(data, len, flags);
   }
 
 void
-nsStringBuffer::ToString(PRUint32 len, nsACString &str)
+nsStringBuffer::ToString(PRUint32 len, nsACString &str,
+                         PRBool aMoveOwnership)
   {
     char* data = static_cast<char*>(Data());
 
@@ -291,7 +295,9 @@ nsStringBuffer::ToString(PRUint32 len, nsACString &str)
     PRUint32 flags = accessor->flags();
     flags = (flags & 0xFFFF0000) | nsCSubstring::F_SHARED | nsCSubstring::F_TERMINATED;
 
-    AddRef();
+    if (!aMoveOwnership) {
+      AddRef();
+    }
     accessor->set(data, len, flags);
   }
 

From d01a4ae47f84a7baee6a869de0902ec2831df396 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Sun, 27 Jun 2010 00:59:32 +0300
Subject: [PATCH 101/172] Bug 574089 - Optimize ::GetInnerHTML

--HG--
extra : rebase_source : 02293c479066a5edaa6343778421da55b84a69f7
---
 content/base/src/nsDocumentEncoder.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/content/base/src/nsDocumentEncoder.cpp b/content/base/src/nsDocumentEncoder.cpp
index e966415bad9c..34c5e3c22d28 100644
--- a/content/base/src/nsDocumentEncoder.cpp
+++ b/content/base/src/nsDocumentEncoder.cpp
@@ -101,7 +101,7 @@ public:
   NS_DECL_NSIDOCUMENTENCODER
 
 protected:
-  void Initialize();
+  void Initialize(PRBool aClearCachedSerializer = PR_TRUE);
   nsresult SerializeNodeStart(nsINode* aNode, PRInt32 aStartOffset,
                               PRInt32 aEndOffset, nsAString& aStr,
                               nsINode* aOriginalNode = nsnull);
@@ -212,7 +212,7 @@ nsDocumentEncoder::nsDocumentEncoder() : mCachedBuffer(nsnull)
 
 }
 
-void nsDocumentEncoder::Initialize()
+void nsDocumentEncoder::Initialize(PRBool aClearCachedSerializer)
 {
   mFlags = 0;
   mWrapColumn = 72;
@@ -222,7 +222,9 @@ void nsDocumentEncoder::Initialize()
   mEndRootIndex = 0;
   mHaltRangeHint = PR_FALSE;
   mNodeIsContainer = PR_FALSE;
-  mSerializer = nsnull;
+  if (aClearCachedSerializer) {
+    mSerializer = nsnull;
+  }
 }
 
 nsDocumentEncoder::~nsDocumentEncoder()
@@ -254,7 +256,7 @@ nsDocumentEncoder::NativeInit(nsIDocument* aDocument,
   if (!aDocument)
     return NS_ERROR_INVALID_ARG;
 
-  Initialize();
+  Initialize(!mMimeType.Equals(aMimeType));
 
   mDocument = aDocument;
 

From 1734c5aafce035f67da85fcf2e8f87f3f4db3835 Mon Sep 17 00:00:00 2001
From: "timeless@mozdev.org" <timeless@mozdev.org>
Date: Sun, 27 Jun 2010 18:48:21 +0200
Subject: [PATCH 102/172] Bug 499134 - Crash with DOM Inspector [@
 inDOMView::AttributeChanged(nsIDocument*, nsIContent*, int, nsIAtom*, int,
 unsigned int) ]. r=neil

---
 layout/inspector/src/inDOMView.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layout/inspector/src/inDOMView.cpp b/layout/inspector/src/inDOMView.cpp
index 408906b79a3f..cad885c68a7b 100644
--- a/layout/inspector/src/inDOMView.cpp
+++ b/layout/inspector/src/inDOMView.cpp
@@ -758,7 +758,8 @@ inDOMView::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent,
     inDOMViewNode* insertNode = nsnull;
     RowToNode(attrRow, &insertNode);
     if (insertNode) {
-      if (insertNode->level <= contentNode->level) {
+      if (contentNode &&
+          insertNode->level <= contentNode->level) {
         RowToNode(attrRow-1, &insertNode);
         InsertLinkAfter(newNode, insertNode);
       } else

From a90797a837c94b77a22bbabddcf45b0e0a0b3212 Mon Sep 17 00:00:00 2001
From: "timeless@mozdev.org" <timeless@mozdev.org>
Date: Sun, 27 Jun 2010 18:49:24 +0200
Subject: [PATCH 103/172] Bug 564713 warning: comparison between signed and
 unsigned integer expressions in mozTXTToHTMLConv r=biesi

---
 netwerk/streamconv/converters/mozTXTToHTMLConv.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
index 39a7c322a4b4..9585e78edc16 100644
--- a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
+++ b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
@@ -187,8 +187,8 @@ void
 mozTXTToHTMLConv::CompleteAbbreviatedURL(const PRUnichar * aInString, PRInt32 aInLength, 
                                          const PRUint32 pos, nsString& aOutString)
 {
-  NS_ASSERTION(pos < aInLength, "bad args to CompleteAbbreviatedURL, see bug #190851");
-  if (pos >= aInLength)
+  NS_ASSERTION(PRInt32(pos) < aInLength, "bad args to CompleteAbbreviatedURL, see bug #190851");
+  if (PRInt32(pos) >= aInLength)
     return;
 
   if (aInString[pos] == '@')
@@ -259,7 +259,7 @@ mozTXTToHTMLConv::FindURLStart(const PRUnichar * aInString, PRInt32 aInLength,
          aInString[PRUint32(i)] == '.'
          ); i--)
       ;
-    if (++i >= 0 && i < pos && nsCRT::IsAsciiAlpha(aInString[PRUint32(i)]))
+    if (++i >= 0 && PRUint32(i) < pos && nsCRT::IsAsciiAlpha(aInString[PRUint32(i)]))
     {
       start = PRUint32(i);
       return PR_TRUE;
@@ -287,7 +287,7 @@ mozTXTToHTMLConv::FindURLStart(const PRUnichar * aInString, PRInt32 aInLength,
       ;
     if
       (
-        ++i >= 0 && i < pos
+        ++i >= 0 && PRUint32(i) < pos
           &&
           (
             nsCRT::IsAsciiAlpha(aInString[PRUint32(i)]) ||
@@ -1253,7 +1253,7 @@ mozTXTToHTMLConv::ScanHTML(nsString& aInString, PRUint32 whattodo, nsString &aOu
   /* Skip all tags ("<[...]>") and content in an a tag ("<a[...]</a>")
      or in a tag ("<!--[...]-->").
      Unescape the rest (text between tags) and pass it to ScanTXT. */
-  for (PRInt32 i = 0; PRUint32(i) < lengthOfInString;)
+  for (PRInt32 i = 0; i < lengthOfInString;)
   {
     if (aInString[i] == '<')  // html tag
     {

From 77067dbb34ba473eb7e8e0b5c98e89639a6c4ffe Mon Sep 17 00:00:00 2001
From: "timeless@mozdev.org" <timeless@mozdev.org>
Date: Sun, 27 Jun 2010 18:49:46 +0200
Subject: [PATCH 104/172] Bug 564712 warning: comparison between signed and
 unsigned integer expressions in nsDirIndexParser::ParseFormat r=biesi

---
 netwerk/streamconv/converters/nsDirIndexParser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/streamconv/converters/nsDirIndexParser.cpp b/netwerk/streamconv/converters/nsDirIndexParser.cpp
index 52d0a6ec5197..2c09924cf383 100644
--- a/netwerk/streamconv/converters/nsDirIndexParser.cpp
+++ b/netwerk/streamconv/converters/nsDirIndexParser.cpp
@@ -184,7 +184,7 @@ nsDirIndexParser::ParseFormat(const char* aFormatStr) {
   // Lets find out how many elements we have.
   // easier to do this then realloc
   const char* pos = aFormatStr;
-  int num = 0;
+  unsigned int num = 0;
   do {
     while (*pos && nsCRT::IsAsciiSpace(PRUnichar(*pos)))
       ++pos;

From 14eed6ac2e50624bc7f9082348da2c2500c19dd8 Mon Sep 17 00:00:00 2001
From: Saint Wesonga <wesongathedeveloper@yahoo.com>
Date: Sun, 27 Jun 2010 19:33:38 +0200
Subject: [PATCH 105/172] Bug 456502 - nsFind::Find() calls StripChars() on a
 non-ASCII char. r=bsmedberg

---
 embedding/components/find/src/nsFind.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/embedding/components/find/src/nsFind.cpp b/embedding/components/find/src/nsFind.cpp
index 6bbf4e68b0d6..884cf97ae2be 100644
--- a/embedding/components/find/src/nsFind.cpp
+++ b/embedding/components/find/src/nsFind.cpp
@@ -74,6 +74,10 @@ static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
 
 #define CH_SHY ((PRUnichar) 0xAD)
 
+// nsFind::Find casts CH_SHY to char before calling StripChars
+// This works correctly if and only if CH_SHY <= 255
+PR_STATIC_ASSERT(CH_SHY <= 255);
+
 // -----------------------------------------------------------------------
 // nsFindContentIterator is a special iterator that also goes through
 // any existing <textarea>'s or text <input>'s editor to lookup the

From aea91496d5f26e322d2b32f827d22e73bd2065bc Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Sun, 27 Jun 2010 22:53:47 +0200
Subject: [PATCH 106/172] Bug 571352 - <select multiple> does not reset the
 anchor <option> properly when the anchor is removed.  r=bzbarsky

---
 layout/forms/nsListControlFrame.cpp   | 36 +++++++----
 layout/forms/test/Makefile.in         |  1 +
 layout/forms/test/test_bug571352.html | 87 +++++++++++++++++++++++++++
 3 files changed, 113 insertions(+), 11 deletions(-)
 create mode 100644 layout/forms/test/test_bug571352.html

diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 18c4c8ade43f..378b8e637a0c 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -1510,28 +1510,42 @@ nsListControlFrame::AddOption(PRInt32 aIndex)
   return NS_OK;
 }
 
+static PRInt32
+DecrementAndClamp(PRInt32 aSelectionIndex, PRInt32 aLength)
+{
+  return aLength == 0 ? kNothingSelected : NS_MAX(0, aSelectionIndex - 1);
+}
+
 NS_IMETHODIMP
 nsListControlFrame::RemoveOption(PRInt32 aIndex)
 {
+  NS_PRECONDITION(aIndex >= 0, "negative <option> index");
+
   // Need to reset if we're a dropdown
   if (IsInDropDownMode()) {
     mNeedToReset = PR_TRUE;
     mPostChildrenLoadedReset = mIsAllContentHere;
   }
 
-  if (mStartSelectionIndex >= aIndex) {
-    --mStartSelectionIndex;
-    if (mStartSelectionIndex < 0) {
-      mStartSelectionIndex = kNothingSelected;
-    }    
-  }
+  if (mStartSelectionIndex != kNothingSelected) {
+    NS_ASSERTION(mEndSelectionIndex != kNothingSelected, "");
+    PRInt32 numOptions = GetNumberOfOptions();
+    // NOTE: numOptions is the new number of options whereas aIndex is the
+    // unadjusted index of the removed option (hence the <= below).
+    NS_ASSERTION(aIndex <= numOptions, "out-of-bounds <option> index");
 
-  if (mEndSelectionIndex >= aIndex) {
-    --mEndSelectionIndex;
-    if (mEndSelectionIndex < 0) {
-      mEndSelectionIndex = kNothingSelected;
-    }    
+    PRInt32 forward = mEndSelectionIndex - mStartSelectionIndex;
+    PRInt32* low  = forward >= 0 ? &mStartSelectionIndex : &mEndSelectionIndex;
+    PRInt32* high = forward >= 0 ? &mEndSelectionIndex : &mStartSelectionIndex;
+    if (aIndex < *low)
+      *low = ::DecrementAndClamp(*low, numOptions);
+    if (aIndex <= *high)
+      *high = ::DecrementAndClamp(*high, numOptions);
+    if (forward == 0)
+      *low = *high;
   }
+  else
+    NS_ASSERTION(mEndSelectionIndex == kNothingSelected, "");
 
   InvalidateFocus();
   return NS_OK;
diff --git a/layout/forms/test/Makefile.in b/layout/forms/test/Makefile.in
index 0e2548b76bc6..c39d79f33a88 100644
--- a/layout/forms/test/Makefile.in
+++ b/layout/forms/test/Makefile.in
@@ -71,6 +71,7 @@ _TEST_FILES =	test_bug231389.html \
 		test_bug564115.html \
 		bug564115_window.html \
 		test_bug377624.html \
+		test_bug571352.html \
 		test_bug572406.html \
 		$(NULL)
 
diff --git a/layout/forms/test/test_bug571352.html b/layout/forms/test/test_bug571352.html
new file mode 100644
index 000000000000..66d004b91f44
--- /dev/null
+++ b/layout/forms/test/test_bug571352.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=571352
+-->
+<head>
+  <title>Test for Bug 571352</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=571352">Mozilla Bug 571352</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 571352 **/
+
+SimpleTest.waitForExplicitFinish();
+SimpleTest.waitForFocus(function test() {
+  function createList() {
+    $('display').innerHTML = '<select multiple><option>0<option>1<option>2<option>3<option>4<option>5</select>';
+    $('display').firstChild.focus();
+  }
+  function option(index) {
+    return $('display').firstChild.childNodes[index];
+  }
+  function remove(index) {
+   var sel = $('display').firstChild;
+   sel.removeChild(sel.childNodes[index]);
+  }
+  function up() {   synthesizeKey("VK_UP", {});  }
+  function shiftUp() {   synthesizeKey("VK_UP", {shiftKey:true});  }
+  function down() {   synthesizeKey("VK_DOWN", {});  }
+  function shiftDown() {   synthesizeKey("VK_DOWN", {shiftKey:true});  }
+  function mouseEvent(index,event) {
+    synthesizeMouse(option(index), 5, 5, event);
+  }
+
+  const click = {};
+  const shiftClick = {shiftKey:true};
+  const CtrlClick = {CtrlKey:true};
+  createList();
+  mouseEvent(0,click)
+  is(document.activeElement,$('display').firstChild,"<select> is focused");
+  mouseEvent(2,shiftClick)
+  remove(0);
+  ok(option(0).selected && option(1).selected,"first two options are selected");
+  mouseEvent(2,shiftClick)
+  ok(option(0).selected && option(1).selected && option(2).selected,"first three options are selected");
+  shiftUp();
+  ok(option(0).selected && option(1).selected,"first two options are selected");
+  remove(1);
+  ok(option(0).selected,"first option is selected");
+  shiftDown();
+  ok(option(0).selected && option(1).selected,"first two options are selected");
+  down();
+  ok(option(2).selected,"third option is selected");
+  shiftDown();
+  ok(option(2).selected && option(3).selected,"third & fourth option are selected");
+  remove(2);
+  shiftUp();
+  ok(option(1).selected && option(2).selected,"2nd & third option are selected");
+  remove(0);
+  mouseEvent(0,shiftClick)
+  ok(option(0).selected && option(1).selected,"all remaining 2 options are selected");
+  shiftDown();
+  remove(1);
+  ok(!option(0).selected,"first option is unselected");
+  remove(0);  // select is now empty
+  ok($('display').firstChild.firstChild==null,"all options were removed");
+
+  SimpleTest.finish();
+});
+
+
+
+
+</script>
+</pre>
+</body>
+</html>

From ca51ca58490eb668eb091513f401f758dbad3024 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Sun, 27 Jun 2010 22:53:59 +0200
Subject: [PATCH 107/172] Bug 536720 - Don't say the frame is in the
 nsGkAtoms::popupList if that list is empty.  r=fantasai

---
 layout/base/crashtests/536720.xul      | 23 +++++++++++++++++++++++
 layout/base/crashtests/540760.xul      | 18 ++++++++++++++++++
 layout/base/crashtests/572003.xul      |  3 +++
 layout/base/crashtests/crashtests.list |  3 +++
 layout/base/nsLayoutUtils.cpp          |  4 +---
 5 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 layout/base/crashtests/536720.xul
 create mode 100644 layout/base/crashtests/540760.xul
 create mode 100644 layout/base/crashtests/572003.xul

diff --git a/layout/base/crashtests/536720.xul b/layout/base/crashtests/536720.xul
new file mode 100644
index 000000000000..2b8c0b614377
--- /dev/null
+++ b/layout/base/crashtests/536720.xul
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<script type="text/javascript">
+<![CDATA[
+
+function boom()
+{
+  var menupopup = document.getElementById("menupopup");
+  menupopup.parentNode.removeChild(menupopup);
+}
+window.addEventListener("load", boom, false);
+
+]]>
+</script>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"><menulist><menupopup id="menupopup"/>
+T
+</menulist></window>
+
+</window>
diff --git a/layout/base/crashtests/540760.xul b/layout/base/crashtests/540760.xul
new file mode 100644
index 000000000000..b0e857ec9fc6
--- /dev/null
+++ b/layout/base/crashtests/540760.xul
@@ -0,0 +1,18 @@
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<script>
+
+function boom()
+{
+  var a = document.getElementById("a");
+  while (a.firstChild)
+    a.removeChild(a.firstChild);
+}
+
+window.addEventListener("load", boom, false);
+
+</script>
+
+<menulist id="a" sizetopopup="pref"><menupopup/><menupopup/></menulist>
+
+</window>
diff --git a/layout/base/crashtests/572003.xul b/layout/base/crashtests/572003.xul
new file mode 100644
index 000000000000..10488fc6462c
--- /dev/null
+++ b/layout/base/crashtests/572003.xul
@@ -0,0 +1,3 @@
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" onload="var p=document.getElementById('p'); for(var i=0;i!=3;++i)p.parentNode.appendChild(p);">
+<menuitem style="counter-reset: chicken;">P<popup id="p" style="counter-reset: chicken;"/></menuitem>
+</window>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 5ab1dfebdbf3..9b6996f61353 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -284,16 +284,19 @@ load 534367-1.xhtml
 load 535721-1.xhtml
 load 535911-1.xhtml
 load 536623-1.xhtml
+load 536720.xul
 load 537059-1.xhtml
 load 537141-1.xhtml
 load 537562-1.xhtml
 load 538082-1.xul
 load 538207-1.xhtml
 load 538210-1.html
+load 540760.xul
 load 541869-1.xhtml
 load 541869-2.html
 load 560441-1.xhtml
 load 560447-1.html
 load 564063-1.html
 load 567292-1.xhtml
+load 572003.xul
 load 572582-1.xhtml
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 5ec5d5520676..c092795532fb 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -248,9 +248,7 @@ nsLayoutUtils::GetChildListNameFor(nsIFrame* aChildFrame)
                              : nsnull;
       NS_ASSERTION(!firstPopup || !firstPopup->GetNextSibling(),
                    "We assume popupList only has one child, but it has more.");
-      listName = (!firstPopup || firstPopup == aChildFrame)
-                 ? nsGkAtoms::popupList
-                 : nsnull;
+      listName = firstPopup == aChildFrame ? nsGkAtoms::popupList : nsnull;
     } else if (nsGkAtoms::tableColGroupFrame == childType) {
       listName = nsGkAtoms::colGroupList;
     } else if (nsGkAtoms::tableCaptionFrame == aChildFrame->GetType()) {

From c1f471cef2ffa792069163bfdb6bf560c1808455 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Sun, 27 Jun 2010 15:58:56 -0500
Subject: [PATCH 108/172] Bug 572296. Fix logic error when adjusting the
 position to show the context menu at for a context menu key press.
 r=enndeakin

---
 layout/base/nsPresShell.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index dc30f1103f90..484625a85a1b 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -6998,11 +6998,12 @@ PresShell::GetCurrentItemAndPositionForElement(nsIDOMElement *aCurrentEl,
     // don't check menulists as the selected item will be inside a popup.
     nsCOMPtr<nsIDOMXULMenuListElement> menulist = do_QueryInterface(aCurrentEl);
     if (!menulist) {
-      checkLineHeight = PR_FALSE;
       nsCOMPtr<nsIDOMXULSelectControlElement> select =
         do_QueryInterface(aCurrentEl);
-      if (select)
+      if (select) {
+        checkLineHeight = PR_FALSE;
         select->GetSelectedItem(getter_AddRefs(item));
+      }
     }
   }
 

From 4c7d0cd8354ec2649c1565ca7f0e3c85a91ebc4b Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Sun, 27 Jun 2010 16:00:13 -0500
Subject: [PATCH 109/172] Bug 534768. Add crashtest.

---
 layout/base/crashtests/534768-1.html   | 23 +++++++++++++++++++++++
 layout/base/crashtests/534768-2.html   | 22 ++++++++++++++++++++++
 layout/base/crashtests/crashtests.list |  2 ++
 3 files changed, 47 insertions(+)
 create mode 100644 layout/base/crashtests/534768-1.html
 create mode 100644 layout/base/crashtests/534768-2.html

diff --git a/layout/base/crashtests/534768-1.html b/layout/base/crashtests/534768-1.html
new file mode 100644
index 000000000000..17c9ac68fe00
--- /dev/null
+++ b/layout/base/crashtests/534768-1.html
@@ -0,0 +1,23 @@
+<html style="direction: rtl;">
+<head>
+<style>
+
+body:after { content: '0'; }
+body:first-letter { float: right; }
+
+</style>
+<script>
+
+function boom()
+{
+  document.documentElement.style.direction = "";
+  document.documentElement.offsetHeight;  
+  document.documentElement.style.textIndent = "3px";
+}
+
+</script>
+</head>
+
+<body onload="boom();"> &#x202E;</body>
+
+</html>
diff --git a/layout/base/crashtests/534768-2.html b/layout/base/crashtests/534768-2.html
new file mode 100644
index 000000000000..67ecb4b6bd94
--- /dev/null
+++ b/layout/base/crashtests/534768-2.html
@@ -0,0 +1,22 @@
+<html style="direction: rtl;">
+<head>
+<style>
+
+body:first-letter { float: right; }
+
+</style>
+<script>
+
+function boom()
+{
+  document.documentElement.style.direction = "";
+  document.documentElement.offsetHeight;  
+  document.documentElement.style.textIndent = "3px";
+}
+
+</script>
+</head>
+
+<body onload="boom();"> &#x202E;</body>
+
+</html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 9b6996f61353..893f45a2a889 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -281,6 +281,8 @@ load 522374-1.html
 load 522374-2.html
 load 526378-1.xul
 load 534367-1.xhtml
+load 534768-1.html
+load 534768-2.html
 load 535721-1.xhtml
 load 535911-1.xhtml
 load 536623-1.xhtml

From 644bb060fe4ca5e30f82fb3fbb2d0340d4721b58 Mon Sep 17 00:00:00 2001
From: Timothy Nikkel <tnikkel@gmail.com>
Date: Sun, 27 Jun 2010 16:00:16 -0500
Subject: [PATCH 110/172] Bug 496011. Add crashtest.

---
 layout/base/crashtests/496011-1.xhtml  | 20 ++++++++++++++++++++
 layout/base/crashtests/crashtests.list |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 layout/base/crashtests/496011-1.xhtml

diff --git a/layout/base/crashtests/496011-1.xhtml b/layout/base/crashtests/496011-1.xhtml
new file mode 100644
index 000000000000..1fabb4dbeb73
--- /dev/null
+++ b/layout/base/crashtests/496011-1.xhtml
@@ -0,0 +1,20 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script type="text/javascript">
+<![CDATA[
+
+function boom()
+{
+  document.body.setAttribute("contenteditable", "true");
+  document.execCommand("selectAll", false, null);
+  document.execCommand("inserthtml", false, "<span><div><\/div><\/span>");
+  document.execCommand("undo", false, null);
+}
+
+]]>
+</script>
+</head>
+
+<body onload="boom();"><textarea><span/></textarea></body>
+
+</html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 893f45a2a889..ea4e2fa2c0b2 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -269,6 +269,7 @@ load 492014.xhtml
 load 492112-1.xhtml
 load 492163-1.xhtml
 load 495350-1.html
+load 496011-1.xhtml
 load 497519-1.xhtml
 load 497519-2.xhtml
 load 499741-1.xhtml

From e5a4443d4cd982a1a18f56f1525ca11bb6897757 Mon Sep 17 00:00:00 2001
From: "wfernandom2004@gmail.com" <wfernandom2004@gmail.com>
Date: Mon, 28 Jun 2010 00:09:29 +0300
Subject: [PATCH 111/172] Bug 572975, bug 573227, websocket fixes, r=smaug

--HG--
extra : rebase_source : d9b5160666ce18344abb47634fa94405c9c2d070
---
 content/base/src/nsWebSocket.cpp              | 198 +++++++++--
 content/base/src/nsWebSocket.h                |  27 ++
 content/base/test/file_websocket_wsh.py       |  79 +++--
 content/base/test/test_websocket.html         | 312 +++++++++++++-----
 .../pywebsocket/mod_pywebsocket/msgutil.py    |  24 +-
 5 files changed, 488 insertions(+), 152 deletions(-)

diff --git a/content/base/src/nsWebSocket.cpp b/content/base/src/nsWebSocket.cpp
index e1783106e799..6d2459c29f8b 100644
--- a/content/base/src/nsWebSocket.cpp
+++ b/content/base/src/nsWebSocket.cpp
@@ -102,7 +102,7 @@ static nsIThread *gWebSocketThread = nsnull;
 
 #define TIMEOUT_TRY_CONNECT_AGAIN         1000
 #define TIMEOUT_WAIT_FOR_SERVER_RESPONSE  20000
-#define TIMEOUT_WAIT_FOR_CLOSING          5000
+#define TIMEOUT_WAIT_FOR_CLOSING          20000
 
 #define ENSURE_TRUE_AND_FAIL_IF_FAILED(x, ret)                            \
   PR_BEGIN_MACRO                                                          \
@@ -240,7 +240,10 @@ public:
   nsresult Init(nsWebSocket *aOwner);
   nsresult Disconnect();
 
-  // these are called always on the main thread (they dispatch themselves)
+  // These are called always on the main thread (they dispatch themselves).
+  // ATTENTION, this method when called can release both the WebSocket object
+  // (i.e. mOwner) and its connection (i.e. *this*) if there are no strong event
+  // listeners.
   DECL_RUNNABLE_ON_MAIN_THREAD_METHOD(Close)
   DECL_RUNNABLE_ON_MAIN_THREAD_METHOD(FailConnection)
 
@@ -253,6 +256,17 @@ public:
   static nsTArray<nsRefPtr<nsWebSocketEstablishedConnection> >* sWSsConnecting;
 
 private:
+  enum WSFrameType {
+    eConnectFrame,
+    eUTF8MessageFrame,
+    eCloseFrame
+  };
+
+  struct nsWSFrame {
+    WSFrameType mType;
+    nsAutoPtr<nsCString> mData;
+  };
+
   // We can only establish one connection at a time per IP address.
   // TryConnect ensures this by checking sWSsConnecting.
   // If there is a IP address entry there it tries again after
@@ -291,7 +305,8 @@ private:
   nsresult Reset();
   void RemoveFromLoadGroup();
   nsresult ProcessHeaders();
-  nsresult PostData(nsCString *aBuffer, PRBool aIsMessage);
+  nsresult PostData(nsCString  *aBuffer,
+                    WSFrameType aWSFrameType);
   nsresult PrintErrorOnConsole(const char       *aBundleURI,
                                const PRUnichar  *aError,
                                const PRUnichar **aFormatStrings,
@@ -324,7 +339,7 @@ private:
   nsCOMPtr<nsIAsyncInputStream>   mSocketInput;
   nsCOMPtr<nsIAsyncOutputStream>  mSocketOutput;
   nsCOMPtr<nsIProxyInfo>          mProxyInfo;
-  nsDeque mOutgoingMessages; // has nsCString* which need to be sent
+  nsDeque mOutgoingMessages; // has nsWSFrame* which need to be sent
   PRUint32 mBytesAlreadySentOfFirstOutString;
   PRUint32 mOutgoingBufferedAmount; // not really necessary, but it is
                                     // here for fast access.
@@ -652,14 +667,17 @@ nsWebSocketEstablishedConnection::nsWebSocketEstablishedConnection() :
 
 nsWebSocketEstablishedConnection::~nsWebSocketEstablishedConnection()
 {
+  NS_ASSERTION(!mOwner, "Disconnect wasn't called!");
 }
 
 nsresult
 nsWebSocketEstablishedConnection::PostData(nsCString *aBuffer,
-                                           PRBool aIsMessage)
+                                           WSFrameType aWSFrameType)
 {
   NS_ASSERTION(NS_IsMainThread(), "Not running on main thread");
 
+  nsAutoPtr<nsCString> data(aBuffer);
+
   if (mStatus == CONN_CLOSED) {
     NS_ASSERTION(mOwner, "Posting data after disconnecting the websocket!");
     // the tcp connection has been closed, but the main thread hasn't received
@@ -669,14 +687,21 @@ nsWebSocketEstablishedConnection::PostData(nsCString *aBuffer,
 
   MutexAutoLock lockOut(mLockOutgoingMessages);
 
+  nsAutoPtr<nsWSFrame> frame(new nsWSFrame());
+  NS_ENSURE_TRUE(frame.get(), NS_ERROR_OUT_OF_MEMORY);
+  frame->mType = aWSFrameType;
+  frame->mData = data.forget();
+
   nsresult rv;
   PRInt32 sizeBefore = mOutgoingMessages.GetSize();
-  mOutgoingMessages.Push(aBuffer);
+  mOutgoingMessages.Push(frame.forget());
   NS_ENSURE_TRUE(mOutgoingMessages.GetSize() == sizeBefore + 1,
                  NS_ERROR_OUT_OF_MEMORY);
-  if (aIsMessage) {
+  if (aWSFrameType == eUTF8MessageFrame) {
     // without the START_BYTE_OF_MESSAGE and END_BYTE_OF_MESSAGE bytes
     mOutgoingBufferedAmount += aBuffer->Length() - 2;
+  } else if (aWSFrameType == eCloseFrame) {
+    mPostedCloseFrame = PR_TRUE;
   }
 
   if (sizeBefore == 0) {
@@ -752,7 +777,7 @@ nsWebSocketEstablishedConnection::PostMessage(const nsString& aMessage)
   ENSURE_TRUE_AND_FAIL_IF_FAILED(buf->Length() == static_cast<PRUint32>(outLen),
                                  NS_ERROR_UNEXPECTED);
 
-  rv = PostData(buf.forget(), PR_TRUE);
+  rv = PostData(buf.forget(), eUTF8MessageFrame);
   ENSURE_SUCCESS_AND_FAIL_IF_FAILED(rv, rv);
 
   return NS_OK;
@@ -873,7 +898,7 @@ IMPL_RUNNABLE_ON_MAIN_THREAD_METHOD_BEGIN(DoInitialRequest)
 
   mStatus = CONN_SENDING_INITIAL_REQUEST;
 
-  rv = PostData(buf.forget(), PR_FALSE);
+  rv = PostData(buf.forget(), eConnectFrame);
   CHECK_SUCCESS_AND_FAIL_IF_FAILED(rv);
 }
 IMPL_RUNNABLE_ON_MAIN_THREAD_METHOD_END
@@ -1455,11 +1480,11 @@ nsWebSocketEstablishedConnection::Reset()
   mSocketOutput = nsnull;
 
   while (mOutgoingMessages.GetSize() != 0) {
-    delete static_cast<nsCString*>(mOutgoingMessages.PopFront());
+    delete static_cast<nsWSFrame*>(mOutgoingMessages.PopFront());
   }
 
   while (mReceivedMessages.GetSize() != 0) {
-    delete static_cast<nsString*>(mReceivedMessages.PopFront());
+    delete static_cast<nsCString*>(mReceivedMessages.PopFront());
   }
 
   mBytesAlreadySentOfFirstOutString = 0;
@@ -1685,7 +1710,7 @@ nsWebSocketEstablishedConnection::DoConnect()
 
   mStatus = CONN_CONNECTING_TO_HTTP_PROXY;
 
-  rv = PostData(buf.forget(), PR_FALSE);
+  rv = PostData(buf.forget(), eConnectFrame);
   ENSURE_SUCCESS_AND_FAIL_IF_FAILED(rv, rv);
 
   return NS_OK;
@@ -1945,6 +1970,10 @@ IMPL_RUNNABLE_ON_MAIN_THREAD_METHOD_BEGIN(Close)
 {
   nsresult rv;
 
+  // Disconnect() can release this object, so we keep a
+  // reference until the end of the method
+  nsRefPtr<nsWebSocketEstablishedConnection> kungfuDeathGrip = this;
+
   if (mOwner->mReadyState == nsIWebSocket::CONNECTING) {
     // we must not convey any failure information to scripts, so we just
     // disconnect and maintain the owner WebSocket object in the CONNECTING
@@ -1987,13 +2016,11 @@ IMPL_RUNNABLE_ON_MAIN_THREAD_METHOD_BEGIN(Close)
     closeFrame->SetCharAt(START_BYTE_OF_CLOSE_FRAME, 0);
     closeFrame->SetCharAt(END_BYTE_OF_CLOSE_FRAME, 1);
 
-    rv = PostData(closeFrame.forget(), PR_FALSE);
+    rv = PostData(closeFrame.forget(), eCloseFrame);
     if (NS_FAILED(rv)) {
       NS_WARNING("Failed to post the close frame");
       return;
     }
-
-    mPostedCloseFrame = PR_TRUE;
   } else {
     // Probably failed to send the close frame. Just disconnect.
     Disconnect();
@@ -2004,6 +2031,10 @@ IMPL_RUNNABLE_ON_MAIN_THREAD_METHOD_END
 void
 nsWebSocketEstablishedConnection::ForceClose()
 {
+  // Disconnect() can release this object, so we keep a
+  // reference until the end of the method
+  nsRefPtr<nsWebSocketEstablishedConnection> kungfuDeathGrip = this;
+
   if (mOwner->mReadyState == nsIWebSocket::CONNECTING) {
     // we must not convey any failure information to scripts, so we just
     // disconnect and maintain the owner WebSocket object in the CONNECTING
@@ -2061,6 +2092,12 @@ nsWebSocketEstablishedConnection::Disconnect()
       return NS_OK;
     }
 
+    // If mOwner is deleted when calling mOwner->DontKeepAliveAnyMore()
+    // then this method can be called again, and we will get a deadlock.
+    nsRefPtr<nsWebSocket> kungfuDeathGrip = mOwner;
+
+    mOwner->DontKeepAliveAnyMore();
+
     RemoveWSConnecting();
 
     mStatus = CONN_CLOSED;
@@ -2111,11 +2148,11 @@ nsWebSocketEstablishedConnection::Disconnect()
     mProxyInfo = nsnull;
 
     while (mOutgoingMessages.GetSize() != 0) {
-      delete static_cast<nsCString*>(mOutgoingMessages.PopFront());
+      delete static_cast<nsWSFrame*>(mOutgoingMessages.PopFront());
     }
 
     while (mReceivedMessages.GetSize() != 0) {
-      delete static_cast<nsString*>(mReceivedMessages.PopFront());
+      delete static_cast<nsCString*>(mReceivedMessages.PopFront());
     }
 
     // Remove ourselves from the document's load group. nsIRequest expects
@@ -2606,13 +2643,13 @@ nsWebSocketEstablishedConnection::OnInputStreamReady(nsIAsyncInputStream *aStrea
         // closed. In this case we have to reset the WebSocket, not Close it.
         if (mStatus != CONN_RETRYING_TO_AUTHENTICATE) {
           mStatus = CONN_CLOSED;
+          mFailureStatus = NS_BASE_STREAM_CLOSED;
           if (mStatus < CONN_CONNECTED_AND_READY) {
             FailConnection();
           } else {
             Close();
           }
         }
-        mFailureStatus = NS_BASE_STREAM_CLOSED;
         return NS_BASE_STREAM_CLOSED;
       }
 
@@ -2659,13 +2696,14 @@ nsWebSocketEstablishedConnection::OnOutputStreamReady(nsIAsyncOutputStream *aStr
 
         // send what we can of the 1st string
 
-        nsCString *strToSend =
-          static_cast<nsCString*>(mOutgoingMessages.PeekFront());
+        nsWSFrame *frameToSend =
+          static_cast<nsWSFrame*>(mOutgoingMessages.PeekFront());
+        nsCString *strToSend = frameToSend->mData;
         PRUint32 sizeToSend =
           strToSend->Length() - mBytesAlreadySentOfFirstOutString;
         PRBool currentStrHasStartFrameByte =
           (mBytesAlreadySentOfFirstOutString == 0);
-        PRBool strIsMessage = (mStatus >= CONN_CONNECTED_AND_READY);
+        PRBool strIsMessage = (frameToSend->mType == eUTF8MessageFrame);
 
         if (sizeToSend != 0) {
           PRUint32 written;
@@ -2691,12 +2729,12 @@ nsWebSocketEstablishedConnection::OnOutputStreamReady(nsIAsyncOutputStream *aStr
 
           if (written == 0) {
             mStatus = CONN_CLOSED;
+            mFailureStatus = NS_BASE_STREAM_CLOSED;
             if (mStatus < CONN_CONNECTED_AND_READY) {
               FailConnection();
             } else {
               Close();
             }
-            mFailureStatus = NS_BASE_STREAM_CLOSED;
             return NS_BASE_STREAM_CLOSED;
           }
 
@@ -2731,7 +2769,7 @@ nsWebSocketEstablishedConnection::OnOutputStreamReady(nsIAsyncOutputStream *aStr
 
         // ok, send the next string
         mOutgoingMessages.PopFront();
-        delete strToSend;
+        delete frameToSend;
         mBytesAlreadySentOfFirstOutString = 0;
       }
 
@@ -2803,13 +2841,19 @@ nsWebSocketEstablishedConnection::GetInterface(const nsIID &aIID,
 // nsWebSocket
 ////////////////////////////////////////////////////////////////////////////////
 
-nsWebSocket::nsWebSocket() : mReadyState(nsIWebSocket::CONNECTING),
+nsWebSocket::nsWebSocket() : mHasStrongEventListeners(PR_FALSE),
+                             mCheckThereAreStrongEventListeners(PR_TRUE),
+                             mReadyState(nsIWebSocket::CONNECTING),
                              mOutgoingBufferedAmount(0)
 {
 }
 
 nsWebSocket::~nsWebSocket()
 {
+  if (mConnection) {
+    mConnection->Disconnect();
+    mConnection = nsnull;
+  }
   if (mListenerManager) {
     mListenerManager->Disconnect();
     mListenerManager = nsnull;
@@ -2832,16 +2876,16 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsWebSocket,
                                                 nsDOMEventTargetWrapperCache)
+  if (tmp->mConnection) {
+    tmp->mConnection->Disconnect();
+    tmp->mConnection = nsnull;
+  }
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnOpenListener)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnMessageListener)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnCloseListener)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnErrorListener)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mPrincipal)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mURI)
-  if (tmp->mConnection) {
-    tmp->mConnection->Disconnect();
-    tmp->mConnection = nsnull;
-  }
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 DOMCI_DATA(WebSocket, nsWebSocket)
@@ -2955,7 +2999,9 @@ public:
 
   NS_IMETHOD Run()
   {
-    return mWebSocket->CreateAndDispatchCloseEvent(mWasClean);
+    nsresult rv = mWebSocket->CreateAndDispatchCloseEvent(mWasClean);
+    mWebSocket->UpdateMustKeepAlive();
+    return rv;
   }
 
 private:
@@ -3073,6 +3119,7 @@ nsWebSocket::SetReadyState(PRUint16 aNewReadyState)
     if (NS_FAILED(rv)) {
       NS_WARNING("Failed to dispatch the open event");
     }
+    UpdateMustKeepAlive();
     return;
   }
 
@@ -3099,6 +3146,7 @@ nsWebSocket::SetReadyState(PRUint16 aNewReadyState)
     rv = NS_DispatchToMainThread(event, NS_DISPATCH_NORMAL);
     if (NS_FAILED(rv)) {
       NS_WARNING("Failed to dispatch the close event");
+      UpdateMustKeepAlive();
     }
   }
 }
@@ -3210,6 +3258,94 @@ nsWebSocket::SetProtocol(const nsString& aProtocol)
   return NS_OK;
 }
 
+//-----------------------------------------------------------------------------
+// Methods that keep alive the WebSocket object when there are
+// onopen/onmessage event listeners.
+//-----------------------------------------------------------------------------
+
+void
+nsWebSocket::UpdateMustKeepAlive()
+{
+  if (!mCheckThereAreStrongEventListeners) {
+    return;
+  }
+
+  if (mHasStrongEventListeners) {
+    if (!mListenerManager ||
+        ((mReadyState != nsIWebSocket::CONNECTING ||
+          !mListenerManager->HasListenersFor(NS_LITERAL_STRING("open"))) &&
+         (mReadyState == nsIWebSocket::CLOSED ||
+          !mListenerManager->HasListenersFor(NS_LITERAL_STRING("message"))))) {
+      mHasStrongEventListeners = PR_FALSE;
+      static_cast<nsPIDOMEventTarget*>(this)->Release();
+    }
+  } else {
+    if ((mReadyState == nsIWebSocket::CONNECTING && mListenerManager &&
+         mListenerManager->HasListenersFor(NS_LITERAL_STRING("open"))) ||
+        (mReadyState != nsIWebSocket::CLOSED && mListenerManager &&
+         mListenerManager->HasListenersFor(NS_LITERAL_STRING("message")))) {
+      mHasStrongEventListeners = PR_TRUE;
+      static_cast<nsPIDOMEventTarget*>(this)->AddRef();
+    }
+  }
+}
+
+void
+nsWebSocket::DontKeepAliveAnyMore()
+{
+  if (mHasStrongEventListeners) {
+    mCheckThereAreStrongEventListeners = PR_FALSE;
+    mHasStrongEventListeners = PR_FALSE;
+    static_cast<nsPIDOMEventTarget*>(this)->Release();
+  }
+}
+
+NS_IMETHODIMP
+nsWebSocket::AddEventListener(const nsAString& aType,
+                              nsIDOMEventListener* aListener,
+                              PRBool aUseCapture)
+{
+  nsresult rv = nsDOMEventTargetHelper::AddEventListener(aType,
+                                                         aListener,
+                                                         aUseCapture);
+  if (NS_SUCCEEDED(rv)) {
+    UpdateMustKeepAlive();
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsWebSocket::RemoveEventListener(const nsAString& aType,
+                                 nsIDOMEventListener* aListener,
+                                 PRBool aUseCapture)
+{
+  nsresult rv = nsDOMEventTargetHelper::RemoveEventListener(aType,
+                                                            aListener,
+                                                            aUseCapture);
+  if (NS_SUCCEEDED(rv)) {
+    UpdateMustKeepAlive();
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsWebSocket::AddEventListener(const nsAString& aType,
+                              nsIDOMEventListener *aListener,
+                              PRBool aUseCapture,
+                              PRBool aWantsUntrusted,
+                              PRUint8 optional_argc)
+{
+  nsresult rv = nsDOMEventTargetHelper::AddEventListener(aType,
+                                                         aListener,
+                                                         aUseCapture,
+                                                         aWantsUntrusted,
+                                                         optional_argc);
+  if (NS_SUCCEEDED(rv)) {
+    UpdateMustKeepAlive();
+  }
+  return rv;
+}
+
 //-----------------------------------------------------------------------------
 // nsWebSocket::nsIWebSocket methods:
 //-----------------------------------------------------------------------------
@@ -3303,6 +3439,10 @@ nsWebSocket::Close()
   }
 
   if (mReadyState == nsIWebSocket::CONNECTING) {
+    // FailConnection() can release the object if there are no strong event
+    // listeners, so we keep a reference before calling it
+    nsRefPtr<nsWebSocket> kungfuDeathGrip = this;
+
     mConnection->FailConnection();
 
     // We need to set the readyState here because mConnection would set it
diff --git a/content/base/src/nsWebSocket.h b/content/base/src/nsWebSocket.h
index 8daf40bc4b49..26d647e2824b 100644
--- a/content/base/src/nsWebSocket.h
+++ b/content/base/src/nsWebSocket.h
@@ -86,6 +86,21 @@ public:
   NS_IMETHOD Initialize(nsISupports* aOwner, JSContext* aContext,
                         JSObject* aObject, PRUint32 aArgc, jsval* aArgv);
 
+  // nsIDOMEventTarget
+  NS_IMETHOD AddEventListener(const nsAString& aType,
+                              nsIDOMEventListener* aListener,
+                              PRBool aUseCapture);
+  NS_IMETHOD RemoveEventListener(const nsAString& aType,
+                                 nsIDOMEventListener* aListener,
+                                 PRBool aUseCapture);
+
+  // nsIDOMNSEventTarget
+  NS_IMETHOD AddEventListener(const nsAString& aType,
+                              nsIDOMEventListener *aListener,
+                              PRBool aUseCapture,
+                              PRBool aWantsUntrusted,
+                              PRUint8 optional_argc);
+
   static void ReleaseGlobals();
 
 protected:
@@ -100,6 +115,14 @@ protected:
   // called from mConnection accordingly to the situation
   void SetReadyState(PRUint16 aNewReadyState);
 
+  // if there are onopen or onmessage event listeners ("strong event listeners")
+  // then this method keeps the object alive when js doesn't have strong
+  // references to it.
+  void UpdateMustKeepAlive();
+  // Releases, if necessary, the strong event listeners. ATTENTION, when calling
+  // this method the object can be released (and possibly collected).
+  void DontKeepAliveAnyMore();
+
   nsRefPtr<nsDOMEventListenerWrapper> mOnOpenListener;
   nsRefPtr<nsDOMEventListenerWrapper> mOnErrorListener;
   nsRefPtr<nsDOMEventListenerWrapper> mOnMessageListener;
@@ -109,6 +132,10 @@ protected:
   nsString mOriginalURL;
   PRPackedBool mSecure; // if true it is using SSL and the wss scheme,
                         // otherwise it is using the ws scheme with no SSL
+
+  PRPackedBool mHasStrongEventListeners;
+  PRPackedBool mCheckThereAreStrongEventListeners;
+
   nsCString mAsciiHost;  // hostname
   PRUint32  mPort;
   nsCString mResource; // [filepath[?query]]
diff --git a/content/base/test/file_websocket_wsh.py b/content/base/test/file_websocket_wsh.py
index f4890d94ea28..1431d792b974 100644
--- a/content/base/test/file_websocket_wsh.py
+++ b/content/base/test/file_websocket_wsh.py
@@ -6,25 +6,56 @@ import sys
 # see the list of tests in test_websocket.html
 
 def web_socket_do_extra_handshake(request):
-  if request.ws_protocol == "test 6":
-    sys.exit(0)
-  elif request.ws_protocol == "test 19":
-    time.sleep(180)
-    pass
-  elif request.ws_protocol == "test 8":
+  if request.ws_protocol == "test 2.1":
     time.sleep(5)
     pass
   elif request.ws_protocol == "test 9":
     time.sleep(5)
     pass
-  elif request.ws_protocol == "test 10.1":
+  elif request.ws_protocol == "test 10":
     time.sleep(5)
     pass
+  elif request.ws_protocol == "test 19":
+    raise ValueError('Aborting (test 19)')
+  elif request.ws_protocol == "test 20" or request.ws_protocol == "test 17":
+    time.sleep(10)
+    pass
+  elif request.ws_protocol == "test 22":
+    time.sleep(60)
+    pass
   else:
     pass
 
 def web_socket_transfer_data(request):
-  if request.ws_protocol == "test 9":
+  if request.ws_protocol == "test 2.1" or request.ws_protocol == "test 2.2":
+    msgutil.close_connection(request)
+  elif request.ws_protocol == "test 6":
+    resp = "wrong message"
+    if msgutil.receive_message(request) == "1":
+      resp = "2"
+    msgutil.send_message(request, resp.decode('utf-8'))
+    resp = "wrong message"
+    if msgutil.receive_message(request) == "3":
+      resp = "4"
+    msgutil.send_message(request, resp.decode('utf-8'))
+    resp = "wrong message"
+    if msgutil.receive_message(request) == "5":
+      resp = "あいうえお"
+    msgutil.send_message(request, resp.decode('utf-8'))
+  elif request.ws_protocol == "test 7":
+    try:
+      while not request.client_terminated:
+        msgutil.receive_message(request)
+    except msgutil.ConnectionTerminatedException, e:
+      pass
+    msgutil.send_message(request, "server data")
+    msgutil.send_message(request, "server data")
+    msgutil.send_message(request, "server data")
+    msgutil.send_message(request, "server data")
+    msgutil.send_message(request, "server data")
+    time.sleep(30)
+    msgutil.close_connection(request, True)
+  elif request.ws_protocol == "test 10":
     msgutil.close_connection(request)
   elif request.ws_protocol == "test 11":
     resp = "wrong message"
@@ -41,27 +72,19 @@ def web_socket_transfer_data(request):
     request.connection.write('\xff\x00')
     msgutil.send_message(request, "server data")
   elif request.ws_protocol == "test 15":
-    sys.exit (0)
-  elif request.ws_protocol == "test 17":
-    while not request.client_terminated:
-      msgutil.send_message(request, "server data")
-      time.sleep(1)
+    msgutil.close_connection(request, True)
+    return
+  elif request.ws_protocol == "test 17" or request.ws_protocol == "test 21":
+    time.sleep(5)
+    resp = "wrong message"
+    if msgutil.receive_message(request) == "client data":
+      resp = "server data"
+    msgutil.send_message(request, resp.decode('utf-8'))
+    time.sleep(5)
+    msgutil.close_connection(request)
+    time.sleep(5)
+  elif request.ws_protocol == "test 20":
     msgutil.send_message(request, "server data")
-    sys.exit(0)
-  elif request.ws_protocol == "test 18":
-    resp = "wrong message"
-    if msgutil.receive_message(request) == "1":
-      resp = "2"
-    msgutil.send_message(request, resp.decode('utf-8'))
-    resp = "wrong message"
-    if msgutil.receive_message(request) == "3":
-      resp = "4"
-    msgutil.send_message(request, resp.decode('utf-8'))
-    resp = "wrong message"
-    if msgutil.receive_message(request) == "5":
-      resp = "あいうえお"
-    msgutil.send_message(request, resp.decode('utf-8'))
-  elif request.ws_protocol == "test 10.1" or request.ws_protocol == "test 10.2":
     msgutil.close_connection(request)
   while not request.client_terminated:
     msgutil.receive_message(request)
diff --git a/content/base/test/test_websocket.html b/content/base/test/test_websocket.html
index f723a883725d..f36df1d1a8df 100644
--- a/content/base/test/test_websocket.html
+++ b/content/base/test/test_websocket.html
@@ -18,16 +18,17 @@
 /*
  * tests:
  *  1. client tries to connect to a http scheme location;
- *  2. client tries to connect to an http resource;
+ *  2. assure serialization of the connections;
  *  3. client tries to connect to an non-existent ws server;
  *  4. client tries to connect using a relative url;
  *  5. client uses an invalid protocol value;
- *  6. server closes the tcp connection before establishing the ws connection;
- *  7. client calls close() and the server sends the close frame in
+ *  6. counter and encoding check;
+ *  7. client calls close() and the server keeps sending messages and it doesn't
+ *     send the close frame;
+ *  8. client calls close() and the server sends the close frame in
  *     acknowledgement;
- *  8. client closes the connection before the ws connection is established;
- *  9. client sends a message before the ws connection is established;
- * 10. assure serialization of the connections;
+ *  9. client closes the connection before the ws connection is established;
+ * 10. client sends a message before the ws connection is established;
  * 11. a simple hello echo;
  * 12. client sends a message with bad bytes;
  * 13. server sends an invalid message;
@@ -35,54 +36,46 @@
  *     it keeps sending normal ws messages;
  * 15. server closes the tcp connection, but it doesn't send the close frame;
  * 16. client calls close() and tries to send a message;
- * 17. client calls close() and the server keeps sending messages and it doesn't
- *     send the close frame;
- * 18. counter and encoding check;
- * 19. server takes too long to establish the ws connection;
+ * 17. see bug 572975 - all event listeners set
+ * 18. client tries to connect to an http resource;
+ * 19. server closes the tcp connection before establishing the ws connection;
+ * 20. see bug 572975 - only on error and onclose event listeners set
+ * 21. see bug 572975 - same as test 17, but delete strong event listeners when
+ *     receiving the message event;
+ * 22. server takes too long to establish the ws connection;
  */
 
 var first_test = 1;
-var last_test = 19;
+var last_test = 22;
 
-var current_test = 1;
+var current_test = first_test;
 
 var timeoutToAbortTest = 60000;
+var timeoutToOpenWS = 25000;
 var all_ws = [];
 
 function shouldNotOpen(e)
 {
   var ws = e.target;
   ok(false, "onopen shouldn't be called on test " + ws._testNumber + "!");
-  if (ws._timeoutToSucceed != undefined) {
-    clearTimeout(ws._timeoutToSucceed);
-  }
 }
 
 function shouldNotReceiveCloseEvent(e)
 {
   var ws = e.target;
   ok(false, "onclose shouldn't be called on test " + ws._testNumber + "!");
-  if (ws._timeoutToSucceed != undefined) {
-    clearTimeout(ws._timeoutToSucceed);
-  }
 }
 
 function shouldCloseCleanly(e)
 {
   var ws = e.target;
-  //ok(e.wasClean, "the ws connection in test " + ws._testNumber + " should be closed cleanly");
-  if (ws._timeoutToSucceed != undefined) {
-    clearTimeout(ws._timeoutToSucceed);
-  }
+  ok(e.wasClean, "the ws connection in test " + ws._testNumber + " should be closed cleanly");
 }
 
 function shouldCloseNotCleanly(e)
 {
   var ws = e.target;
-  //ok(!e.wasClean, "the ws connection in test " + ws._testNumber + " shouldn't be closed cleanly");
-  if (ws._timeoutToSucceed != undefined) {
-    clearTimeout(ws._timeoutToSucceed);
-  }
+  ok(!e.wasClean, "the ws connection in test " + ws._testNumber + " shouldn't be closed cleanly");
 }
 
 function CreateTestWS(ws_location, ws_protocol)
@@ -119,6 +112,20 @@ function CreateTestWS(ws_location, ws_protocol)
   return ws;
 }
 
+function forcegc()
+{
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  Components.utils.forceGC();
+  var wu =  window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                  .getInterface(Components.interfaces.nsIDOMWindowUtils);
+  wu.garbageCollect();
+  setTimeout(function()
+  {
+    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+    wu.garbageCollect();
+  }, 1);
+}
+
 function doTest(number)
 {
   if (doTest.timeoutId !== null) {
@@ -163,12 +170,28 @@ function test1()
   doTest(2);
 }
 
+// this test expects that the serialization list to connect to the proxy
+// is empty
 function test2()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket_http_resource.txt");
-  ws.onopen = shouldNotOpen;
-  ws.onclose = shouldNotReceiveCloseEvent;
-  doTest(3);
+  var ws1 = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 2.1");
+  current_test--; // CreateTestWS incremented this
+  var ws2 = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 2.2");
+
+  var ws2CanConnect = false;
+
+  // the server will delay ws1 for 5 seconds
+
+  ws1.onopen = function()
+  {
+    ws2CanConnect = true;
+  }
+
+  ws2.onopen = function()
+  {
+    ok(ws2CanConnect, "shouldn't connect yet in test 2!");
+    doTest(3);
+  }
 }
 
 function test3()
@@ -183,10 +206,10 @@ function test4()
 {
   try {
     var ws = CreateTestWS("file_websocket");
-    ok(false, "test4 failed");
+    ok(false, "test 4 failed");
   }
   catch (e) {
-    ok(true, "test4 failed");
+    ok(true, "test 4 failed");
   }
   doTest(5);
 }
@@ -214,9 +237,25 @@ function test5()
 function test6()
 {
   var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 6");
-  ws.onopen = shouldNotOpen;
-  ws.onclose = shouldNotReceiveCloseEvent;
-  doTest(7);
+  var counter = 1;
+  ws.onopen = function()
+  {
+    ws.send(counter);
+  }
+  ws.onmessage = function(e)
+  {
+    if (counter == 5) {
+      ok(e.data == "あいうえお");
+      ws.close();
+      doTest(7);
+    } else {
+      ok(e.data == counter+1, "bad counter");
+      counter += 2;
+      ws.send(counter);
+    }
+  }
+  ws.onclose = shouldCloseCleanly;
+  ws._receivedCloseEvent = false;
 }
 
 function test7()
@@ -228,7 +267,7 @@ function test7()
   }
   ws.onclose = function(e)
   {
-    shouldCloseCleanly(e);
+    shouldCloseNotCleanly(e);
     doTest(8);
   };
   ws._receivedCloseEvent = false;
@@ -237,20 +276,35 @@ function test7()
 function test8()
 {
   var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 8");
+  ws.onopen = function()
+  {
+    ws.close();
+  }
+  ws.onclose = function(e)
+  {
+    shouldCloseCleanly(e);
+    doTest(9);
+  };
+  ws._receivedCloseEvent = false;
+}
+
+function test9()
+{
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 9");
   ws.onopen = shouldNotOpen;
   ws.onclose = function(e)
   {
     shouldCloseNotCleanly(e);
-    doTest(9);
+    doTest(10);
   };
 
   ws._receivedCloseEvent = false;
   ws.close();
 }
 
-function test9()
+function test10()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 9");
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 10");
   ws.onclose = shouldCloseCleanly;
   ws._receivedCloseEvent = false;
 
@@ -261,27 +315,8 @@ function test9()
   catch (e) {
     ok(true, "Couldn't send data before connecting!");
   }
-  doTest(10);
-}
-
-function test10()
-{
-  var ws1 = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 10.1");
-  current_test--; // CreateTestWS incremented this
-  var ws2 = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 10.2");
-
-  var ws2CanConnect = false;
-
-  // the server will delay ws1 for 5 seconds
-
-  ws1.onopen = function()
+  ws.onopen = function()
   {
-    ws2CanConnect = true;
-  }
-
-  ws2.onopen = function()
-  {
-    ok(ws2CanConnect, "shouldn't connect yet in test 10!");
     doTest(11);
   }
 }
@@ -336,8 +371,8 @@ function test13()
   {
     ws._timesCalledOnError++;
     if (ws._timesCalledOnError == 2) {
+      ok(true, "test 13 succeeded");
       doTest(14);
-      ok(true, "test13 succeeded");
     }
   }
   ws.onclose = shouldCloseCleanly;
@@ -387,43 +422,63 @@ function test16()
   ws._receivedCloseEvent = false;
 }
 
+var status_test17 = "not started";
+
+window._test17 = function()
+{
+  var local_ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 17");
+
+  status_test17 = "started";
+
+  local_ws.onopen = function(e)
+  {
+    status_test17 = "opened";
+    e.target.send("client data");
+    forcegc();
+  };
+
+  local_ws.onerror = function()
+  {
+    ok(false, "onerror called on test " + e.target._testNumber + "!");
+  };
+
+  local_ws.onmessage = function(e)
+  {
+    ok(e.data == "server data", "Bad message in test 17");
+    status_test17 = "got message";
+    forcegc();
+  };
+
+  local_ws.onclose = function(e)
+  {
+    ok(status_test17 == "got message", "Didn't got message in test 17!");
+    shouldCloseCleanly(e);
+    status_test17 = "closed";
+    forcegc();
+    doTest(18);
+    forcegc();
+  };
+
+  local_ws = null;
+  window._test17 = null;
+  forcegc();
+}
+
 function test17()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 17");
-  ws.onopen = function()
-  {
-    ws.close();
-  }
-  ws.onclose = function(e)
-  {
-    shouldCloseNotCleanly(e);
-    doTest(18);
-  };
-  ws._receivedCloseEvent = false;
+  window._test17();
 }
 
+// The tests that expects that their websockets neither open nor close MUST
+// be in the end of the tests, i.e. HERE, in order to prevent blocking the other
+// tests.
+
 function test18()
 {
-  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 18");
-  var counter = 1;
-  ws.onopen = function()
-  {
-    ws.send(counter);
-  }
-  ws.onmessage = function(e)
-  {
-    if (counter == 5) {
-      ok(e.data == "あいうえお");
-      ws.close();
-      doTest(19);
-    } else {
-      ok(e.data == counter+1, "bad counter");
-      counter += 2;
-      ws.send(counter);
-    }
-  }
-  ws.onclose = shouldCloseCleanly;
-  ws._receivedCloseEvent = false;
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket_http_resource.txt");
+  ws.onopen = shouldNotOpen;
+  ws.onclose = shouldNotReceiveCloseEvent;
+  doTest(19);
 }
 
 function test19()
@@ -434,6 +489,81 @@ function test19()
   doTest(20);
 }
 
+window._test20 = function()
+{
+  var local_ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 20");
+
+  local_ws.onerror = function()
+  {
+    ok(false, "onerror called on test " + e.target._testNumber + "!");
+  };
+
+  local_ws.onclose = shouldNotReceiveCloseEvent;
+
+  local_ws = null;
+  window._test20 = null;
+  forcegc();
+}
+
+function test20()
+{
+  window._test20();
+  doTest(21);
+}
+
+var timeoutTest21;
+
+window._test21 = function()
+{
+  var local_ws = new WebSocket("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 21");
+
+  local_ws.onopen = function(e)
+  {
+    e.target.send("client data");
+    timeoutTest21 = setTimeout(function()
+    {
+      ok(false, "Didn't received message on test 21!");
+    }, 15000);
+    forcegc();
+    e.target.onopen = null;
+    forcegc();
+  };
+
+  local_ws.onerror = function()
+  {
+    ok(false, "onerror called on test " + e.target._testNumber + "!");
+  };
+
+  local_ws.onmessage = function(e)
+  {
+    clearTimeout(timeoutTest21);
+    ok(e.data == "server data", "Bad message in test 21");
+    forcegc();
+    e.target.onmessage = null;
+    forcegc();
+  };
+
+  local_ws.onclose = shouldNotReceiveCloseEvent;
+
+  local_ws = null;
+  window._test21 = null;
+  forcegc();
+}
+
+function test21()
+{
+  window._test21();
+  doTest(22);
+}
+
+function test22()
+{
+  var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", "test 22");
+  ws.onopen = shouldNotOpen;
+  ws.onclose = shouldNotReceiveCloseEvent;
+  doTest(23);
+}
+
 function finishWSTest()
 {
   for (i = 0; i < all_ws.length; ++i) {
diff --git a/testing/mochitest/pywebsocket/mod_pywebsocket/msgutil.py b/testing/mochitest/pywebsocket/mod_pywebsocket/msgutil.py
index e7a21fec7a43..7aae2479e4ce 100644
--- a/testing/mochitest/pywebsocket/mod_pywebsocket/msgutil.py
+++ b/testing/mochitest/pywebsocket/mod_pywebsocket/msgutil.py
@@ -41,6 +41,7 @@ import Queue
 import threading
 
 from mod_pywebsocket import util
+from time import time,sleep
 
 
 class MsgUtilException(Exception):
@@ -71,7 +72,7 @@ def _write(request, bytes):
         raise
 
 
-def close_connection(request):
+def close_connection(request, abort=False):
     """Close connection.
 
     Args:
@@ -83,10 +84,25 @@ def close_connection(request):
     # running through the following steps:
     # 1. send a 0xFF byte and a 0x00 byte to the client to indicate the start
     # of the closing handshake.
-    _write(request, '\xff\x00')
+    got_exception = False
+    if not abort:
+        _write(request, '\xff\x00')
+        # timeout of 20 seconds to get the client's close frame ack
+        initial_time = time()
+        end_time = initial_time + 20
+        while time() < end_time:
+            try:
+                receive_message(request)
+            except ConnectionTerminatedException, e:
+                got_exception = True
+                sleep(1)
     request.server_terminated = True
-    # TODO(ukai): 2. wait until the /client terminated/ flag has been set, or
-    # until a server-defined timeout expires.
+    if got_exception:
+        util.prepend_message_to_exception(
+            'client initiated closing handshake for %s: ' % (
+            request.ws_resource),
+            e)
+        raise ConnectionTerminatedException
     # TODO: 3. close the WebSocket connection.
     # note: mod_python Connection (mp_conn) doesn't have close method.
 

From da3fbc024a170b9deb0a7770c07c1aca56c04a7f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 28 Jun 2010 12:25:04 +1200
Subject: [PATCH 112/172] Bug 573946. Move include of prlog.h to the start of
 files. r=mstange

---
 widget/src/cocoa/nsChildView.mm   | 10 +++++-----
 widget/src/cocoa/nsClipboard.mm   | 10 +++++-----
 widget/src/cocoa/nsDragService.mm | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index 8c53d67bdaed..adc034c01e92 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -41,6 +41,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+#include "prlog.h"
+
 #include <unistd.h>
  
 #include "nsChildView.h"
@@ -97,11 +102,6 @@ using namespace mozilla::layers;
 // out to the bounding-box if there are more
 #define MAX_RECTS_IN_REGION 100
 
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-#include "prlog.h"
-
 #ifdef PR_LOGGING
 PRLogModuleInfo* sCocoaLog = nsnull;
 #endif
diff --git a/widget/src/cocoa/nsClipboard.mm b/widget/src/cocoa/nsClipboard.mm
index 18ca3f169eba..9d08152a4cae 100644
--- a/widget/src/cocoa/nsClipboard.mm
+++ b/widget/src/cocoa/nsClipboard.mm
@@ -36,6 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+#include "prlog.h"
+
 #include "nsCOMPtr.h"
 #include "nsClipboard.h"
 #include "nsString.h"
@@ -55,11 +60,6 @@
 // Screenshots use the (undocumented) png pasteboard type.
 #define IMAGE_PASTEBOARD_TYPES NSTIFFPboardType, @"Apple PNG pasteboard type", nil
 
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-#include "prlog.h"
-
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* sCocoaLog;
 #endif
diff --git a/widget/src/cocoa/nsDragService.mm b/widget/src/cocoa/nsDragService.mm
index 378976987077..d78889d4cb95 100644
--- a/widget/src/cocoa/nsDragService.mm
+++ b/widget/src/cocoa/nsDragService.mm
@@ -36,6 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+#include "prlog.h"
+
 #include "nsDragService.h"
 #include "nsObjCExceptions.h"
 #include "nsITransferable.h"
@@ -63,11 +68,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#ifdef MOZ_LOGGING
-#define FORCE_PR_LOG
-#endif
-#include "prlog.h"
-
 #ifdef PR_LOGGING
 extern PRLogModuleInfo* sCocoaLog;
 #endif

From 29b7082327c14570443930218e77226fc5580e98 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 28 Jun 2010 12:27:50 +1200
Subject: [PATCH 113/172] Bug 573931. Make XUL tree scrolling just repaint.
 r=enndeakin

---
 .../xul/base/src/tree/src/nsTreeBodyFrame.cpp | 79 +------------------
 1 file changed, 2 insertions(+), 77 deletions(-)

diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
index f610dbaa15a8..8e60b66c5a80 100644
--- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
+++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.cpp
@@ -4112,45 +4112,7 @@ nsTreeBodyFrame::ScrollInternal(const ScrollParts& aParts, PRInt32 aRow)
 
   mTopRowIndex += delta;
 
-  // See if we have a transparent background or a background image.  
-  // If we do, then we cannot blit.
-  const nsStyleBackground* background = GetStyleBackground();
-  if (!background->BottomLayer().mImage.IsEmpty() ||
-      background->mImageCount > 1 ||
-      NS_GET_A(background->mBackgroundColor) < 255 ||
-      PR_ABS(delta)*mRowHeight >= mRect.height) {
-    Invalidate();
-  } else {
-    nsPoint viewOffset;
-    nsIView* view = GetClosestView(&viewOffset);
-    nsPoint widgetOffset;
-    nsIWidget* widget = view->GetNearestWidget(&widgetOffset);
-    if (widget) {
-      nsPresContext* presContext = PresContext();
-      nscoord rowHeightAsPixels =
-        presContext->AppUnitsToDevPixels(mRowHeight);
-      nsIntPoint deltaPt = nsIntPoint(0, -delta*rowHeightAsPixels);
-
-      nsRect bounds(viewOffset + widgetOffset, GetSize());
-      nsIntRect boundsPx =
-        bounds.ToNearestPixels(presContext->AppUnitsPerDevPixel());
-      nsTArray<nsIntRect> destRects;
-      destRects.AppendElement(boundsPx);
-
-      // No plugins have a tree widget as a parent so we don't need
-      // configurations here.
-      nsTArray<nsIWidget::Configuration> emptyConfigurations;
-      widget->Scroll(deltaPt, destRects, emptyConfigurations);
-      nsIntRect invalid = boundsPx;
-      if (deltaPt.y < 0) {
-        invalid.y = bounds.height + deltaPt.y;
-        invalid.height = -deltaPt.y;
-      } else {
-        invalid.height = deltaPt.y;
-      }
-      widget->Invalidate(invalid, PR_FALSE);
-    }
-  }
+  Invalidate();
 
   PostScrollEvent();
   return NS_OK;
@@ -4172,46 +4134,9 @@ nsTreeBodyFrame::ScrollHorzInternal(const ScrollParts& aParts, PRInt32 aPosition
   if (aPosition > (mHorzWidth - bounds.width)) 
     aPosition = mHorzWidth - bounds.width;
 
-  PRInt32 delta = aPosition - mHorzPosition;
   mHorzPosition = aPosition;
 
-  // See if we have a transparent background or a background image.  
-  // If we do, then we cannot blit.
-  const nsStyleBackground* background = GetStyleBackground();
-  if (!background->BottomLayer().mImage.IsEmpty() ||
-      background->mImageCount > 1 ||
-      NS_GET_A(background->mBackgroundColor) < 255 ||
-      PR_ABS(delta) >= mRect.width) {
-    Invalidate();
-  } else {
-    nsPoint viewOffset;
-    nsIView* view = GetClosestView(&viewOffset);
-    nsPoint widgetOffset;
-    nsIWidget* widget = view->GetNearestWidget(&widgetOffset);
-    if (widget) {
-      nsPresContext* presContext = PresContext();
-      nsIntPoint deltaPt(presContext->AppUnitsToDevPixels(-delta), 0);
-
-      nsRect bounds(viewOffset + widgetOffset, GetSize());
-      nsIntRect boundsPx =
-        bounds.ToNearestPixels(presContext->AppUnitsPerDevPixel());
-      nsTArray<nsIntRect> destRects;
-      destRects.AppendElement(boundsPx);
-
-      // No plugins have a tree widget as a parent so we don't need
-      // configurations here.
-      nsTArray<nsIWidget::Configuration> emptyConfigurations;
-      widget->Scroll(deltaPt, destRects, emptyConfigurations);
-      nsIntRect invalid = boundsPx;
-      if (deltaPt.x < 0) {
-        invalid.x = bounds.width + deltaPt.x;
-        invalid.width = -deltaPt.x;
-      } else {
-        invalid.width = deltaPt.x;
-      }
-      widget->Invalidate(invalid, PR_FALSE);
-    }
-  }
+  Invalidate();
 
   // Update the column scroll view
   aParts.mColumnsScrollFrame->ScrollTo(nsPoint(mHorzPosition, 0),

From 2ce4e60ac33961424ef5bd67c17f32715b281352 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 28 Jun 2010 12:28:21 +1200
Subject: [PATCH 114/172] Bug 572914. Overflow areas for theme backgrounds
 should not be clipped by -moz-hidden-unscrollable. r=dbaron

---
 layout/generic/nsFrame.cpp | 44 ++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 9c0f3a64a405..5b4cad31dbb6 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -5632,7 +5632,30 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
                aOverflowArea->Contains(nsRect(nsPoint(0, 0), aNewSize)),
                "Computed overflow area must contain frame bounds");
 
+  // If we clip our children, clear accumulated overflow area. The
+  // children are actually clipped to the padding-box, but since the
+  // overflow area should include the entire border-box, just set it to
+  // the border-box here.
   const nsStyleDisplay *disp = GetStyleDisplay();
+  NS_ASSERTION((disp->mOverflowY == NS_STYLE_OVERFLOW_CLIP) ==
+               (disp->mOverflowX == NS_STYLE_OVERFLOW_CLIP),
+               "If one overflow is clip, the other should be too");
+  if (disp->mOverflowX == NS_STYLE_OVERFLOW_CLIP) {
+    // The contents are actually clipped to the padding area 
+    *aOverflowArea = nsRect(nsPoint(0, 0), aNewSize);
+  }
+
+  // Overflow area must always include the frame's top-left and bottom-right,
+  // even if the frame rect is empty.
+  // Pending a real fix for bug 426879, don't do this for inline frames
+  // with zero width.
+  if (aNewSize.width != 0 || !IsInlineFrame(this)) {
+    aOverflowArea->UnionRectIncludeEmpty(*aOverflowArea,
+                                         nsRect(nsPoint(0, 0), aNewSize));
+  }
+
+  // Note that NS_STYLE_OVERFLOW_CLIP doesn't clip the frame background,
+  // so we add theme background overflow here so it's not clipped.
   if (!IsBoxWrapped() && IsThemed(disp)) {
     nsRect r(nsPoint(0, 0), aNewSize);
     nsPresContext *presContext = PresContext();
@@ -5643,27 +5666,6 @@ nsIFrame::FinishAndStoreOverflow(nsRect* aOverflowArea, nsSize aNewSize)
     }
   }
   
-  // Overflow area must always include the frame's top-left and bottom-right,
-  // even if the frame rect is empty.
-  // Pending a real fix for bug 426879, don't do this for inline frames
-  // with zero width.
-  if (aNewSize.width != 0 || !IsInlineFrame(this))
-    aOverflowArea->UnionRectIncludeEmpty(*aOverflowArea,
-                                         nsRect(nsPoint(0, 0), aNewSize));
-
-  PRBool geometricOverflow =
-    aOverflowArea->x < 0 || aOverflowArea->y < 0 ||
-    aOverflowArea->XMost() > aNewSize.width || aOverflowArea->YMost() > aNewSize.height;
-  // Clear geometric overflow area if we clip our children
-  NS_ASSERTION((disp->mOverflowY == NS_STYLE_OVERFLOW_CLIP) ==
-               (disp->mOverflowX == NS_STYLE_OVERFLOW_CLIP),
-               "If one overflow is clip, the other should be too");
-  if (geometricOverflow &&
-      disp->mOverflowX == NS_STYLE_OVERFLOW_CLIP) {
-    *aOverflowArea = nsRect(nsPoint(0, 0), aNewSize);
-    geometricOverflow = PR_FALSE;
-  }
-
   PRBool hasOutlineOrEffects;
   *aOverflowArea = GetAdditionalOverflow(*aOverflowArea, aNewSize,
       &hasOutlineOrEffects);

From e41d32eebda9110ac95c000be5404efdfdbc737e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 28 Jun 2010 12:28:47 +1200
Subject: [PATCH 115/172] Bug 572612. Make scrollbars appear in the
 background/border layer of the scrollable element. r=mats

---
 layout/generic/nsGfxScrollFrame.cpp | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index b5cbb9465eed..41092aef192f 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1844,16 +1844,21 @@ nsGfxScrollFrameInner::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   // borders and underneath borders and backgrounds of later elements
   // in the tree.
   PRBool hasResizer = HasResizer();
+  nsDisplayListCollection scrollParts;
   for (nsIFrame* kid = mOuter->GetFirstChild(nsnull); kid; kid = kid->GetNextSibling()) {
     if (kid != mScrolledFrame) {
       if (kid == mScrollCornerBox && hasResizer) {
         // skip the resizer as this will be drawn later on top of the scrolled content
         continue;
       }
-      rv = mOuter->BuildDisplayListForChild(aBuilder, kid, aDirtyRect, aLists);
+      rv = mOuter->BuildDisplayListForChild(aBuilder, kid, aDirtyRect, scrollParts,
+                                            nsIFrame::DISPLAY_CHILD_FORCE_STACKING_CONTEXT);
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
+  // DISPLAY_CHILD_FORCE_STACKING_CONTEXT puts everything into the
+  // PositionedDescendants list.
+  aLists.BorderBackground()->AppendToTop(scrollParts.PositionedDescendants());
 
   // Overflow clipping can never clip frames outside our subtree, so there
   // is no need to worry about whether we are a moving frame that might clip
@@ -1878,13 +1883,17 @@ nsGfxScrollFrameInner::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   rv = mOuter->OverflowClip(aBuilder, set, aLists, clip, PR_TRUE, mIsRoot);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  // Place the resizer in the display list above the overflow clip. This
-  // ensures that the resizer appears above the content and the mouse can
+  // Place the resizer in the display list in our Content() list above
+  // scrolled content in the Content() list.
+  // This ensures that the resizer appears above the content and the mouse can
   // still target the resizer even when scrollbars are hidden.
   if (hasResizer && mScrollCornerBox) {
-    rv = mOuter->BuildDisplayListForChild(aBuilder, mScrollCornerBox, aDirtyRect, aLists,
-                                          nsIFrame::DISPLAY_CHILD_FORCE_PSEUDO_STACKING_CONTEXT);
+    rv = mOuter->BuildDisplayListForChild(aBuilder, mScrollCornerBox, aDirtyRect, scrollParts,
+                                          nsIFrame::DISPLAY_CHILD_FORCE_STACKING_CONTEXT);
     NS_ENSURE_SUCCESS(rv, rv);
+    // DISPLAY_CHILD_FORCE_STACKING_CONTEXT puts everything into the
+    // PositionedDescendants list.
+    aLists.Content()->AppendToTop(scrollParts.PositionedDescendants());
   }
 
   return NS_OK;

From d179d068cea5349847a5de2a92c09e46721bbe2c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 28 Jun 2010 12:29:57 +1200
Subject: [PATCH 116/172] Bug 572317. Allow snapped rectangles to snap even if
 there's a 90 degree rotation. r=jrmuizel

---
 gfx/thebes/src/gfxContext.cpp                 | 43 ++++++++-----------
 layout/reftests/transform/reftest.list        |  2 +
 layout/reftests/transform/snapping-1-ref.html | 18 ++++++++
 layout/reftests/transform/snapping-1.html     | 19 ++++++++
 4 files changed, 58 insertions(+), 24 deletions(-)
 create mode 100644 layout/reftests/transform/snapping-1-ref.html
 create mode 100644 layout/reftests/transform/snapping-1.html

diff --git a/gfx/thebes/src/gfxContext.cpp b/gfx/thebes/src/gfxContext.cpp
index dd4edf9f164a..2d163d7dff4c 100644
--- a/gfx/thebes/src/gfxContext.cpp
+++ b/gfx/thebes/src/gfxContext.cpp
@@ -220,11 +220,7 @@ gfxContext::Rectangle(const gfxRect& rect, PRBool snapToPixels)
     if (snapToPixels) {
         gfxRect snappedRect(rect);
 
-#ifdef MOZ_GFX_OPTIMIZE_MOBILE
         if (UserToDevicePixelSnapped(snappedRect, PR_TRUE))
-#else
-        if (UserToDevicePixelSnapped(snappedRect))
-#endif
         {
             cairo_matrix_t mat;
             cairo_get_matrix(mCairo, &mat);
@@ -402,32 +398,31 @@ gfxContext::UserToDevicePixelSnapped(gfxRect& rect, PRBool ignoreScale) const
     // never snap.
     cairo_matrix_t mat;
     cairo_get_matrix(mCairo, &mat);
-    if ((!ignoreScale && (mat.xx != 1.0 || mat.yy != 1.0)) ||
-        (mat.xy != 0.0 || mat.yx != 0.0))
+    if (!ignoreScale &&
+        (mat.xx != 1.0 || mat.yy != 1.0 || mat.xy != 0.0 || mat.yx != 0.0))
         return PR_FALSE;
 
     gfxPoint p1 = UserToDevice(rect.pos);
-    gfxPoint p2 = UserToDevice(rect.pos + rect.size);
+    gfxPoint p2 = UserToDevice(rect.pos + gfxSize(rect.size.width, 0.0));
+    gfxPoint p3 = UserToDevice(rect.pos + rect.size);
 
-    gfxPoint p3 = UserToDevice(rect.pos + gfxSize(rect.size.width, 0.0));
-    gfxPoint p4 = UserToDevice(rect.pos + gfxSize(0.0, rect.size.height));
+    // Check that the rectangle is axis-aligned. For an axis-aligned rectangle,
+    // two opposite corners define the entire rectangle. So check if
+    // the axis-aligned rectangle with opposite corners p1 and p3
+    // define an axis-aligned rectangle whose other corners are p2 and p4.
+    // We actually only need to check one of p2 and p4, since an affine
+    // transform maps parallelograms to parallelograms.
+    if (p2 == gfxPoint(p1.x, p3.y) || p2 == gfxPoint(p3.x, p1.y)) {
+        p1.Round();
+        p3.Round();
 
-    // rectangle is no longer axis-aligned after transforming, so we can't snap
-    if (p1.x != p4.x ||
-        p2.x != p3.x ||
-        p1.y != p3.y ||
-        p2.y != p4.y)
-        return PR_FALSE;
+        rect.pos = gfxPoint(NS_MIN(p1.x, p3.x), NS_MIN(p1.y, p3.y));
+        rect.size = gfxSize(NS_MAX(p1.x, p3.x) - rect.pos.x,
+                            NS_MAX(p1.y, p3.y) - rect.pos.y);
+        return PR_TRUE;
+    }
 
-    p1.Round();
-    p2.Round();
-
-    gfxPoint pd = p2 - p1;
-
-    rect.pos = p1;
-    rect.size = gfxSize(pd.x, pd.y);
-
-    return PR_TRUE;
+    return PR_FALSE;
 }
 
 PRBool
diff --git a/layout/reftests/transform/reftest.list b/layout/reftests/transform/reftest.list
index 3a43ab5a06ef..878bb52e73d3 100644
--- a/layout/reftests/transform/reftest.list
+++ b/layout/reftests/transform/reftest.list
@@ -72,6 +72,8 @@ random == rotate-1e.html rotate-1-ref.html
 == origin-name-2c.html origin-name-2-ref.html
 == origin-name-3a.html origin-name-3-ref.html
 == origin-name-3b.html origin-name-3-ref.html
+# Snapping still applies after 90 degree rotations.
+== snapping-1.html snapping-1-ref.html
 # SVG effects should work on transforms.
 == transform-svg-1a.xhtml transform-svg-1-ref.xhtml
 == transform-svg-2a.xhtml transform-svg-2-ref.xhtml
diff --git a/layout/reftests/transform/snapping-1-ref.html b/layout/reftests/transform/snapping-1-ref.html
new file mode 100644
index 000000000000..99006901b352
--- /dev/null
+++ b/layout/reftests/transform/snapping-1-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+div { 
+  background: red;
+  position: relative;
+  left: 0.5px;
+  top: 100px;
+  height: 100px;
+  width: 100px;
+}
+</style>
+</head>
+<body>
+  <div></div>
+</body>
+</html>
diff --git a/layout/reftests/transform/snapping-1.html b/layout/reftests/transform/snapping-1.html
new file mode 100644
index 000000000000..e5a7d9abde55
--- /dev/null
+++ b/layout/reftests/transform/snapping-1.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+div { 
+  background: red;
+  margin-left: 100.5px;
+  height: 100px;
+  width: 100px;
+  -moz-transform-origin: bottom left;
+  -moz-transform: rotate(-90deg) translate(-100px, 0);
+  transform-origin: bottom left;
+  transform: rotate(-90deg) translate(-100px, 0);
+}
+</style>
+</head>
+<body>
+  <div></div>
+</html>

From 239a0da1b51ff877931f89696ebcfc3940221786 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 28 Jun 2010 12:30:39 +1200
Subject: [PATCH 117/172] Bug 572282. Reuse main window layer tree to paint
 child windows. r=mats

---
 layout/base/nsPresShell.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 484625a85a1b..a56e4692b7d5 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -5824,9 +5824,7 @@ static void DrawThebesLayer(ThebesLayer* aLayer,
   PaintParams* params = static_cast<PaintParams*>(aCallbackData);
   nsIFrame* frame = params->mFrame;
   if (frame) {
-    // We're drawing into a child window. Don't pass
-    // nsLayoutUtils::PAINT_WIDGET_LAYERS, since that will draw into
-    // the widget for the display root.
+    // We're drawing into a child window.
     nsIDeviceContext* devCtx = frame->PresContext()->DeviceContext();
     nsCOMPtr<nsIRenderingContext> rc;
     nsresult rv = devCtx->CreateRenderingContextInstance(*getter_AddRefs(rc));
@@ -5837,7 +5835,8 @@ static void DrawThebesLayer(ThebesLayer* aLayer,
       nsIRenderingContext::AutoPushTranslation
         push(rc, -params->mOffsetToWidget.x, -params->mOffsetToWidget.y);
       nsLayoutUtils::PaintFrame(rc, frame, dirtyRegion,
-                                params->mBackgroundColor);
+                                params->mBackgroundColor,
+                                nsLayoutUtils::PAINT_WIDGET_LAYERS);
     }
   } else {
     aContext->NewPath();

From c3d3dba89e9b824e728413c38e9a5e88f7112b0b Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 28 Jun 2010 12:32:16 +1200
Subject: [PATCH 118/172] Bug 568392. Part 3: Make reftest harness draw with
 scrollbars and use the window's layer tree, when possible. r=dbaron

---
 .../reftest-sanity/corners-1-ref.html         |  6 +++
 layout/reftests/reftest-sanity/corners-1.html |  6 +++
 .../reftest-sanity/corners-2-ref.html         |  6 +++
 layout/reftests/reftest-sanity/corners-2.html |  6 +++
 .../reftest-sanity/corners-3-ref.html         |  6 +++
 layout/reftests/reftest-sanity/corners-3.html |  6 +++
 .../reftest-sanity/corners-4-ref.html         |  6 +++
 layout/reftests/reftest-sanity/corners-4.html |  6 +++
 layout/reftests/reftest-sanity/reftest.list   |  6 +++
 layout/tools/reftest/reftest.js               | 52 +++++++++++++++----
 layout/tools/reftest/reftest.xul              |  6 ++-
 11 files changed, 100 insertions(+), 12 deletions(-)
 create mode 100644 layout/reftests/reftest-sanity/corners-1-ref.html
 create mode 100644 layout/reftests/reftest-sanity/corners-1.html
 create mode 100644 layout/reftests/reftest-sanity/corners-2-ref.html
 create mode 100644 layout/reftests/reftest-sanity/corners-2.html
 create mode 100644 layout/reftests/reftest-sanity/corners-3-ref.html
 create mode 100644 layout/reftests/reftest-sanity/corners-3.html
 create mode 100644 layout/reftests/reftest-sanity/corners-4-ref.html
 create mode 100644 layout/reftests/reftest-sanity/corners-4.html

diff --git a/layout/reftests/reftest-sanity/corners-1-ref.html b/layout/reftests/reftest-sanity/corners-1-ref.html
new file mode 100644
index 000000000000..e002df8150d7
--- /dev/null
+++ b/layout/reftests/reftest-sanity/corners-1-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="overflow:hidden">
+  <div style="width:1px; height:1px; background:lime; position:absolute; left:0; top:0;"></div>
+</body>
+</html>
diff --git a/layout/reftests/reftest-sanity/corners-1.html b/layout/reftests/reftest-sanity/corners-1.html
new file mode 100644
index 000000000000..d1461fc19a2e
--- /dev/null
+++ b/layout/reftests/reftest-sanity/corners-1.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="overflow:hidden">
+  <div style="width:1px; height:1px; background:red; position:absolute; left:0; top:0;"></div>
+</body>
+</html>
diff --git a/layout/reftests/reftest-sanity/corners-2-ref.html b/layout/reftests/reftest-sanity/corners-2-ref.html
new file mode 100644
index 000000000000..b60aef75291a
--- /dev/null
+++ b/layout/reftests/reftest-sanity/corners-2-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="overflow:hidden">
+  <div style="width:1px; height:1px; background:lime; position:absolute; left:799px; top:0;"></div>
+</body>
+</html>
diff --git a/layout/reftests/reftest-sanity/corners-2.html b/layout/reftests/reftest-sanity/corners-2.html
new file mode 100644
index 000000000000..b0e7545b7239
--- /dev/null
+++ b/layout/reftests/reftest-sanity/corners-2.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="overflow:hidden">
+  <div style="width:1px; height:1px; background:red; position:absolute; left:799px; top:0;"></div>
+</body>
+</html>
diff --git a/layout/reftests/reftest-sanity/corners-3-ref.html b/layout/reftests/reftest-sanity/corners-3-ref.html
new file mode 100644
index 000000000000..a2ea68c33848
--- /dev/null
+++ b/layout/reftests/reftest-sanity/corners-3-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="overflow:hidden">
+  <div style="width:1px; height:1px; background:lime; position:absolute; left:799px; top:999px;"></div>
+</body>
+</html>
diff --git a/layout/reftests/reftest-sanity/corners-3.html b/layout/reftests/reftest-sanity/corners-3.html
new file mode 100644
index 000000000000..605f2a267a96
--- /dev/null
+++ b/layout/reftests/reftest-sanity/corners-3.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="overflow:hidden">
+  <div style="width:1px; height:1px; background:red; position:absolute; left:799px; top:999px;"></div>
+</body>
+</html>
diff --git a/layout/reftests/reftest-sanity/corners-4-ref.html b/layout/reftests/reftest-sanity/corners-4-ref.html
new file mode 100644
index 000000000000..acb444e8f451
--- /dev/null
+++ b/layout/reftests/reftest-sanity/corners-4-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="overflow:hidden">
+  <div style="width:1px; height:1px; background:lime; position:absolute; left:0; top:999px;"></div>
+</body>
+</html>
diff --git a/layout/reftests/reftest-sanity/corners-4.html b/layout/reftests/reftest-sanity/corners-4.html
new file mode 100644
index 000000000000..73cd286e4081
--- /dev/null
+++ b/layout/reftests/reftest-sanity/corners-4.html
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML>
+<html>
+<body style="overflow:hidden">
+  <div style="width:1px; height:1px; background:red; position:absolute; left:0; top:999px;"></div>
+</body>
+</html>
diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list
index d8112887a833..8f9acf5f7fbd 100644
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -64,3 +64,9 @@ include scripttests.list
 
 # test url-prefix
 include urlprefixtests.list
+
+# test that all corners are visible
+!= corners-1.html corners-1-ref.html
+!= corners-2.html corners-2-ref.html
+!= corners-3.html corners-3-ref.html
+!= corners-4.html corners-4-ref.html
diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js
index 9d195dcd143f..0272c4289ae7 100644
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -109,6 +109,8 @@ var gSlowestTestTime = 0;
 var gSlowestTestURL;
 var gClearingForAssertionCheck = false;
 
+var gDrawWindowFlags;
+
 const TYPE_REFTEST_EQUAL = '==';
 const TYPE_REFTEST_NOTEQUAL = '!=';
 const TYPE_LOAD = 'load';     // test without a reference (just test that it does
@@ -931,8 +933,41 @@ function UpdateCanvasCache(url, canvas)
     }
 }
 
+// Compute drawWindow flags lazily so the window is set up and can be
+// measured accurately
+function DoDrawWindow(ctx, win, x, y, w, h)
+{
+    if (typeof gDrawWindowFlags == "undefined") {
+        gDrawWindowFlags = ctx.DRAWWINDOW_DRAW_CARET |
+                           ctx.DRAWWINDOW_DRAW_VIEW;
+        var flags = "DRAWWINDOW_DRAW_CARET | DRAWWINDOW_DRAW_VIEW";
+        if (window.innerWidth == gCurrentCanvas.width &&
+            window.innerHeight == gCurrentCanvas.height) {
+            // We can use the window's retained layers
+            // because the window is big enough to display the entire reftest
+            gDrawWindowFlags |= ctx.DRAWWINDOW_USE_WIDGET_LAYERS;
+            flags += " | DRAWWINDOW_USE_WIDGET_LAYERS";
+        }
+        dump("REFTEST INFO | drawWindow flags = " + flags + "\n");
+    }
+
+    var scrollX = 0;
+    var scrollY = 0;
+    if (!(gDrawWindowFlags & ctx.DRAWWINDOW_DRAW_VIEW)) {
+        scrollX = win.scrollX;
+        scrollY = win.scrollY;
+    }
+    ctx.drawWindow(win, scrollX + x, scrollY + y, w, h, "rgb(255,255,255)",
+                   gDrawWindowFlags);
+}
+
 function InitCurrentCanvasWithSnapshot()
 {
+    if (gURLs[0].type == TYPE_LOAD || gURLs[0].type == TYPE_SCRIPT) {
+        // We don't want to snapshot this kind of test
+        return;
+    }
+
     gCurrentCanvas = AllocateCanvas();
 
     /* XXX This needs to be rgb(255,255,255) because otherwise we get
@@ -946,12 +981,9 @@ function InitCurrentCanvasWithSnapshot()
     // window, so scale the drawing to show the zoom (making each canvas pixel be one
     // device pixel instead)
     ctx.scale(scale, scale);
-    ctx.drawWindow(win, win.scrollX, win.scrollY,
-                   Math.ceil(gCurrentCanvas.width / scale),
-                   Math.ceil(gCurrentCanvas.height / scale),
-                   "rgb(255,255,255)",
-                   ctx.DRAWWINDOW_DRAW_CARET |
-                   ctx.DRAWWINDOW_USE_WIDGET_LAYERS);
+    DoDrawWindow(ctx, win, 0, 0,
+                 Math.ceil(gCurrentCanvas.width / scale),
+                 Math.ceil(gCurrentCanvas.height / scale));
     ctx.restore();
 }
 
@@ -962,6 +994,9 @@ function roundTo(x, fraction)
 
 function UpdateCurrentCanvasForEvent(event)
 {
+    if (!gCurrentCanvas)
+        return;
+
     var win = gBrowser.contentWindow;
     var ctx = gCurrentCanvas.getContext("2d");
     var scale = gBrowser.markupDocumentViewer.fullZoom;
@@ -978,10 +1013,7 @@ function UpdateCurrentCanvasForEvent(event)
         ctx.save();
         ctx.scale(scale, scale);
         ctx.translate(left, top);
-        ctx.drawWindow(win, left + win.scrollX, top + win.scrollY,
-                       right - left, bottom - top,
-                       "rgb(255,255,255)",
-                       ctx.DRAWWINDOW_DRAW_CARET);
+        DoDrawWindow(ctx, win, left, top, right - left, bottom - top);
         ctx.restore();
     }
 }
diff --git a/layout/tools/reftest/reftest.xul b/layout/tools/reftest/reftest.xul
index c05282bfbd84..3ced21095a73 100644
--- a/layout/tools/reftest/reftest.xul
+++ b/layout/tools/reftest/reftest.xul
@@ -48,9 +48,11 @@
         onunload="OnRefTestUnload();"
         width="800"
         height="1000"
-        style="background:white"
+        style="background:white; overflow:hidden"
         >
     <script type="application/ecmascript" src="quit.js" />
     <script type="application/ecmascript" src="reftest.js" />
-    <browser id="browser" flex="1" type="content-primary" style="width: 800px; height: 1000px" />
+    <!-- Make sure the browser element is exactly 800x1000, no matter what size our window is -->
+    <browser id="browser" type="content-primary"
+             style="min-width: 800px; min-height: 1000px; max-width: 800px; max-height: 1000px" />
 </window>

From 5329c70468c27b6c133d8cc9c9b6d62f1d722cea Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 28 Jun 2010 14:17:06 +1200
Subject: [PATCH 119/172] Bug 564991. Part 28: Update test manifest to reflect
 fewer assertion failures on Mac (probably because of less painting).

---
 layout/generic/crashtests/crashtests.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index f0958c295dc8..5fb6e612400d 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -293,7 +293,7 @@ load 495875-1.html
 load 495875-2.html
 load 499862-1.html
 load 499857-1.html
-asserts(15) asserts-if(MOZ_WIDGET_TOOLKIT=="windows",18) load 499885-1.xhtml # nscoord_MAX assertions, plus bug 570436 on windows
+asserts(15) asserts-if(MOZ_WIDGET_TOOLKIT=="windows",18) asserts-if(MOZ_WIDGET_TOOLKIT=="cocoa",10) load 499885-1.xhtml # nscoord_MAX assertions, plus bug 570436 on windows
 load 501535-1.html
 load 503961-1.xhtml
 load 503961-2.html

From ba19f9a931493eefc267f58d6dbd0e506bd43316 Mon Sep 17 00:00:00 2001
From: Bas Schouten <bschouten@mozilla.com>
Date: Mon, 28 Jun 2010 06:24:52 +0200
Subject: [PATCH 120/172] Bug 574690: Don't have DocumentViewer call show on
 its window if the XULWindow will do this once it's done loading chrome. r=roc

---
 layout/base/nsDocumentViewer.cpp      | 20 +++++++++++++++++++-
 xpfe/appshell/public/nsIXULWindow.idl |  6 ++++++
 xpfe/appshell/src/nsXULWindow.cpp     |  6 ++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp
index d6a58e03d576..e46a45465e3d 100644
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -110,6 +110,7 @@
 #include "nsCopySupport.h"
 #include "nsIDOMHTMLFrameSetElement.h"
 #ifdef MOZ_XUL
+#include "nsIXULWindow.h"
 #include "nsIXULDocument.h"
 #include "nsXULPopupManager.h"
 #endif
@@ -1943,7 +1944,24 @@ DocumentViewerImpl::Show(void)
     }
   }
 
-  if (mWindow) {
+  // XXX - If this DocumentViewer belongs to an nsIXULWindow that will at some
+  // point in the future call 'Show' on its window, we shouldn't call it.
+  // See bug 574690.
+  nsCOMPtr<nsIDocShellTreeItem> treeItem = do_QueryReferent(mContainer);
+  nsCOMPtr<nsIXULWindow> xulWin;
+  PRBool willShowWindow = PR_FALSE;
+  if (treeItem) {
+    nsCOMPtr<nsIDocShellTreeOwner> owner;
+    treeItem->GetTreeOwner(getter_AddRefs(owner));
+    if (owner) {
+      xulWin = do_GetInterface(owner);
+      if (xulWin) {
+        xulWin->WillShowWindow(&willShowWindow);
+      }
+    }
+  }
+
+  if (mWindow && !willShowWindow) {
     mWindow->Show(PR_TRUE);
   }
 
diff --git a/xpfe/appshell/public/nsIXULWindow.idl b/xpfe/appshell/public/nsIXULWindow.idl
index be27b505a772..4632401d1335 100644
--- a/xpfe/appshell/public/nsIXULWindow.idl
+++ b/xpfe/appshell/public/nsIXULWindow.idl
@@ -149,4 +149,10 @@ interface nsIXULWindow : nsISupports
    * docshell could cause problems.
    */
   [noscript] void applyChromeFlags();
+
+  /**
+   * This will return true if this nsIXULWindow will call show on its
+   * widget once it has finished loading chrome.
+   */
+  PRBool willShowWindow();
 };
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 2e5e77bfa572..807ddd2277e9 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -2056,6 +2056,12 @@ NS_IMETHODIMP nsXULWindow::ApplyChromeFlags()
   return NS_OK;
 }
 
+NS_IMETHODIMP nsXULWindow::WillShowWindow(PRBool *aRetval)
+{
+  *aRetval = mShowAfterLoad && !mChromeLoaded;
+  return NS_OK;
+}
+
 NS_IMETHODIMP nsXULWindow::GetXULBrowserWindow(nsIXULBrowserWindow * *aXULBrowserWindow)
 {
   NS_IF_ADDREF(*aXULBrowserWindow = mXULBrowserWindow);

From 37ab3678332fd75ef7ec8ffc71533f66e59abb9b Mon Sep 17 00:00:00 2001
From: Justin Wood <Callek@gmail.com>
Date: Mon, 28 Jun 2010 00:27:20 -0400
Subject: [PATCH 121/172] (No Bug) Make test not modify the windowtype until
 certain we are actually running the test. Fixes some SeaMonkey orange.
 rs=Mossop

--HG--
extra : rebase_source : bf6fcf86c2ae0ca2e1c621837a795818d983196a
---
 .../tests/chrome/test_close_on_last_window.xul     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/toolkit/mozapps/downloads/tests/chrome/test_close_on_last_window.xul b/toolkit/mozapps/downloads/tests/chrome/test_close_on_last_window.xul
index c64c583fb886..ccf181116d33 100644
--- a/toolkit/mozapps/downloads/tests/chrome/test_close_on_last_window.xul
+++ b/toolkit/mozapps/downloads/tests/chrome/test_close_on_last_window.xul
@@ -122,19 +122,19 @@ function testSetup()
                   QueryInterface(Components.interfaces.nsIInterfaceRequestor).
                   getInterface(Components.interfaces.nsIDOMWindow);
 
-  // Change the window type so this one doesn't count as a browser window
-  let oldWinType = chromeWindow.document.documentElement.getAttribute("windowtype");
-  chromeWindow.document.documentElement.setAttribute("windowtype", "navigator:testrunner");
-
-  dm = Cc["@mozilla.org/download-manager;1"].
-       getService(Ci.nsIDownloadManager);
-
   dmui = getDMUI();
   if (!dmui) {
     todo(false, "skip test for toolkit download manager UI");
     return false;
   }
 
+  dm = Cc["@mozilla.org/download-manager;1"].
+       getService(Ci.nsIDownloadManager);
+
+  // Change the window type so this one doesn't count as a browser window
+  let oldWinType = chromeWindow.document.documentElement.getAttribute("windowtype");
+  chromeWindow.document.documentElement.setAttribute("windowtype", "navigator:testrunner");
+
   downloadListener = {
 
     onDownloadStateChange: function(aState, aDownload)

From ebe7afb77c4e321708776414badaf7658b46b3d0 Mon Sep 17 00:00:00 2001
From: Jesse Ruderman <jruderman@gmail.com>
Date: Sun, 27 Jun 2010 21:31:42 -0700
Subject: [PATCH 122/172] Disable test that incorrectly relies on timing (bug
 558678)

---
 modules/libpr0n/test/reftest/gif/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/libpr0n/test/reftest/gif/reftest.list b/modules/libpr0n/test/reftest/gif/reftest.list
index 2c1f78c7ede0..c8b94941a272 100644
--- a/modules/libpr0n/test/reftest/gif/reftest.list
+++ b/modules/libpr0n/test/reftest/gif/reftest.list
@@ -14,4 +14,4 @@
 
 # a transparent gif that disposes previous frames with clear; we must properly
 # clear each frame to pass.
-== delaytest.html?transparent-animation.gif transparent-animation-finalframe.gif
+random == delaytest.html?transparent-animation.gif transparent-animation-finalframe.gif # incorrect timing dependence (bug 558678)

From deb98eaadd05f4acb72d1229d2d698e2401094e5 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Mon, 28 Jun 2010 00:57:07 -0500
Subject: [PATCH 123/172] Bug 574821 - Fix for incorrect maximized window
 non-client margins and remove excess xpcom overhead from metric lookups.
 r=robarnold.

---
 widget/src/windows/nsWindow.cpp | 120 ++++++++++++++++++--------------
 widget/src/windows/nsWindow.h   |   5 +-
 2 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 9eee15fd5a9e..80bbd07a84e9 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1880,27 +1880,16 @@ nsWindow::GetNonClientMargins(nsIntMargin &margins)
     return NS_OK;
   }
 
-  nsCOMPtr<nsILookAndFeel> lookAndFeel =
-    do_GetService("@mozilla.org/widget/lookandfeel;1");
-  if (!lookAndFeel) {
-    NS_WARNING("We need nsILookAndFeel for GetNonClientMargins!");
-    return NS_ERROR_FAILURE;
-  }
-
-  PRInt32 val;
-  lookAndFeel->GetMetric(nsILookAndFeel::eMetric_WindowTitleHeight, val);
-  margins.top = val;
-  lookAndFeel->GetMetric(nsILookAndFeel::eMetric_WindowBorderHeight, val);
-  margins.top += val;
-  margins.bottom = val;
-  lookAndFeel->GetMetric(nsILookAndFeel::eMetric_WindowBorderWidth, val); 
-  margins.left = margins.right = val;
+  margins.top = GetSystemMetrics(SM_CYCAPTION);
+  margins.bottom = GetSystemMetrics(SM_CYFRAME);
+  margins.top += margins.bottom;
+  margins.left = margins.right = GetSystemMetrics(SM_CYFRAME);
 
   return NS_OK;
 }
 
 PRBool
-nsWindow::UpdateNonClientMargins()
+nsWindow::UpdateNonClientMargins(PRInt32 aSizeMode, PRBool aRefreshWindow)
 {
   if (!mCustomNonClient)
     return PR_FALSE;
@@ -1915,17 +1904,23 @@ nsWindow::UpdateNonClientMargins()
   mNonClientOffset.top = mNonClientOffset.bottom =
     mNonClientOffset.left = mNonClientOffset.right = 0;
 
-  nsCOMPtr<nsILookAndFeel> lookAndFeel =
-    do_GetService("@mozilla.org/widget/lookandfeel;1");
-  if (!lookAndFeel) {
-    NS_WARNING("We need nsILookAndFeel for UpdateNonClientMargins!");
-    return PR_FALSE;
+  if (aSizeMode == -1)
+    aSizeMode = mSizeMode;
+
+  if (aSizeMode == nsSizeMode_Minimized ||
+      aSizeMode == nsSizeMode_Fullscreen) {
+    mCaptionHeight = mVertResizeMargin = mHorResizeMargin = 0;
+    return PR_TRUE;
   }
 
-  // Used in hit testing, provides the resize cursor margin
-  lookAndFeel->GetMetric(nsILookAndFeel::eMetric_WindowBorderWidth, mResizeMargin);
-  lookAndFeel->GetMetric(nsILookAndFeel::eMetric_WindowTitleHeight, mCaptionHeight);
-  mCaptionHeight += mResizeMargin;
+  // Note, for maximized windows, we need to continue to offset the client by
+  // thick frame margins of a normal window, since windows expects this
+  // in it's DwmDefWndProc hit testing.
+  mCaptionHeight = GetSystemMetrics(SM_CYCAPTION);
+  mHorResizeMargin = GetSystemMetrics(SM_CXFRAME);
+  mVertResizeMargin = GetSystemMetrics(SM_CYFRAME);
+
+  mCaptionHeight += mVertResizeMargin;
 
   // If a margin value is 0, set the offset to the default size of the frame.
   // If a margin is -1, leave as default, and if a margin > 0, set the offset
@@ -1935,22 +1930,20 @@ nsWindow::UpdateNonClientMargins()
   else if (mNonClientMargins.top > 0)
     mNonClientOffset.top = mCaptionHeight - mNonClientMargins.top;
 
-  if (!mNonClientMargins.left)
-    mNonClientOffset.left = mResizeMargin;
-  else if (mNonClientMargins.left > 0)
-    mNonClientOffset.left = mResizeMargin - mNonClientMargins.left;
+   if (!mNonClientMargins.left)
+    mNonClientOffset.left = mHorResizeMargin;
+   else if (mNonClientMargins.left > 0)
+    mNonClientOffset.left = mHorResizeMargin - mNonClientMargins.left;
+ 
+   if (!mNonClientMargins.right)
+    mNonClientOffset.right = mHorResizeMargin;
+   else if (mNonClientMargins.right > 0)
+    mNonClientOffset.right = mHorResizeMargin - mNonClientMargins.right;
 
-  if (!mNonClientMargins.right)
-    mNonClientOffset.right = mResizeMargin;
-  else if (mNonClientMargins.right > 0)
-    mNonClientOffset.right = mResizeMargin - mNonClientMargins.right;
-
-  PRInt32 val;
-  lookAndFeel->GetMetric(nsILookAndFeel::eMetric_WindowBorderHeight, val);
-  if (!mNonClientMargins.bottom)
-    mNonClientOffset.bottom = val;
-  else if (mNonClientMargins.bottom > 0)
-    mNonClientOffset.bottom = val - mNonClientMargins.bottom;
+   if (!mNonClientMargins.bottom)
+    mNonClientOffset.bottom = mVertResizeMargin;
+   else if (mNonClientMargins.bottom > 0)
+    mNonClientOffset.bottom = mVertResizeMargin - mNonClientMargins.bottom;
 
   NS_ASSERTION(mNonClientOffset.top >= 0, "non-client top margin is negative!");
   NS_ASSERTION(mNonClientOffset.left >= 0, "non-client left margin is negative!");
@@ -1966,10 +1959,12 @@ nsWindow::UpdateNonClientMargins()
   if (mNonClientOffset.bottom < 0)
     mNonClientOffset.bottom = 0;
 
-  SetWindowPos(mWnd, 0, 0, 0, 0, 0,
-               SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE|
-               SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
-  UpdateWindow(mWnd);
+  if (aRefreshWindow) {
+    SetWindowPos(mWnd, 0, 0, 0, 0, 0,
+                 SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOMOVE|
+                 SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
+    UpdateWindow(mWnd);
+  }
 
   return PR_TRUE;
 }
@@ -5390,14 +5385,14 @@ nsWindow::ClientMarginHitTestPoint(PRInt32 mx, PRInt32 my)
   PRBool right  = PR_FALSE;
 
   if (my >= winRect.top && my <=
-      (winRect.top + (mCaptionHeight - mNonClientOffset.top)))
+      (winRect.top + mVertResizeMargin + (mCaptionHeight - mNonClientOffset.top)))
     top = PR_TRUE;
-  else if (my <= winRect.bottom && my >= (winRect.bottom - mResizeMargin))
+  else if (my <= winRect.bottom && my >= (winRect.bottom - mVertResizeMargin))
     bottom = PR_TRUE;
 
-  if (mx >= winRect.left && mx <= (winRect.left + mResizeMargin))
+  if (mx >= winRect.left && mx <= (winRect.left + mHorResizeMargin))
     left = PR_TRUE;
-  else if (mx <= winRect.right && mx >= (winRect.right - mResizeMargin))
+  else if (mx <= winRect.right && mx >= (winRect.right - mHorResizeMargin))
     right = PR_TRUE;
 
   if (top) {
@@ -5419,12 +5414,6 @@ nsWindow::ClientMarginHitTestPoint(PRInt32 mx, PRInt32 my)
       testResult = HTRIGHT;
   }
 
-  if (testResult == HTCLIENT && 
-      my > (winRect.top + mResizeMargin) &&
-      my <= (winRect.top + mCaptionHeight) &&
-      my <= (winRect.top + (mCaptionHeight - mNonClientOffset.top)))
-    testResult = HTCAPTION;
-
   return testResult;
 }
 
@@ -5844,6 +5833,29 @@ void nsWindow::ActivateOtherWindowHelper(HWND aWnd)
 #if !defined(WINCE)
 void nsWindow::OnWindowPosChanging(LPWINDOWPOS& info)
 {
+  // Update non-client margins if the frame size is changing, and let the
+  // browser know we are changing size modes, so alternative css can kick in.
+  if (info->flags & SWP_FRAMECHANGED) {
+    WINDOWPLACEMENT pl;
+    pl.length = sizeof(pl);
+    ::GetWindowPlacement(mWnd, &pl);
+    PRInt32 sizeMode;
+    if (pl.showCmd == SW_SHOWMAXIMIZED)
+      sizeMode = nsSizeMode_Maximized;
+    else if (pl.showCmd == SW_SHOWMINIMIZED)
+      sizeMode = nsSizeMode_Minimized;
+    else
+      sizeMode = nsSizeMode_Normal;
+
+    nsSizeModeEvent event(PR_TRUE, NS_SIZEMODE, this);
+
+    InitEvent(event);
+    event.mSizeMode = static_cast<nsSizeMode>(sizeMode);
+    DispatchWindowEvent(&event);
+
+    UpdateNonClientMargins(sizeMode, PR_FALSE);
+  }
+
   // enforce local z-order rules
   if (!(info->flags & SWP_NOZORDER)) {
     HWND hwndAfter = info->hwndInsertAfter;
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index d53351821c3c..3a267586a134 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -287,7 +287,7 @@ protected:
   nsWindow*               GetParentWindow(PRBool aIncludeOwner);
   virtual void            SubclassWindow(BOOL bState);
   PRBool                  CanTakeFocus();
-  PRBool                  UpdateNonClientMargins();
+  PRBool                  UpdateNonClientMargins(PRInt32 aSizeMode = -1, PRBool aRefreshWindow = PR_TRUE);
 #if !defined(WINCE)
   static void             InitTrackPointHack();
 #endif
@@ -483,7 +483,8 @@ protected:
   // Disable non client margins on non-comsitor desktops
   PRPackedBool          mCompositorFlag;
   // Cached copy of L&F's resize border  
-  PRInt32               mResizeMargin;
+  PRInt32               mHorResizeMargin;
+  PRInt32               mVertResizeMargin;
   // Height of the caption plus border
   PRInt32               mCaptionHeight;
 

From fadf8d17212c302a001b4d32715cbb700594ec57 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Mon, 28 Jun 2010 01:03:47 -0500
Subject: [PATCH 124/172] Bug 574821 - Add titlebar margin to browser-aero css
 for maximized windows - addresses issue with negative window origins on
 windows. r=Dao.

---
 browser/themes/winstripe/browser/browser-aero.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/browser/themes/winstripe/browser/browser-aero.css b/browser/themes/winstripe/browser/browser-aero.css
index b405090541de..7b86fe5a4c15 100644
--- a/browser/themes/winstripe/browser/browser-aero.css
+++ b/browser/themes/winstripe/browser/browser-aero.css
@@ -24,6 +24,11 @@
     background: transparent;
   }
 
+  /* the new titlebar requires this, or content will be clipped at the top of the screen. */
+  #main-window[sizemode="maximized"] {
+    margin-top: 8px;
+  }
+
   #main-window:not(:-moz-lwtheme)[inFullscreen="true"] {
     -moz-appearance: none;
     background-color: #556;

From d65b7b93da9d3478d723ca5f068e5b1ea9c93301 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Mon, 28 Jun 2010 01:04:05 -0500
Subject: [PATCH 125/172] Bug 555081 - Add support for titlebar mouse
 interaction and address missing aero features. r=jmathies, smaug, vlad.

---
 content/base/src/nsContentUtils.cpp     |  1 +
 content/base/src/nsGkAtomList.h         |  1 +
 content/events/src/nsDOMEvent.cpp       |  4 +-
 content/events/src/nsDOMEvent.h         |  1 +
 toolkit/content/Makefile.in             |  2 +-
 toolkit/content/WindowDraggingUtils.jsm | 56 +++++++++++++++++--------
 toolkit/content/widgets/general.xml     |  2 +
 toolkit/content/widgets/toolbar.xml     |  1 +
 widget/public/nsGUIEvent.h              |  2 +
 widget/src/windows/nsWindow.cpp         | 48 +++++++++++++++++++++
 widget/src/windows/nsWindow.h           |  1 +
 11 files changed, 99 insertions(+), 20 deletions(-)

diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 9ee9cde4348e..8ed480b528ac 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -474,6 +474,7 @@ nsContentUtils::InitializeEventTable() {
     { nsGkAtoms::ondblclick,                    NS_MOUSE_DOUBLECLICK, EventNameType_HTMLXUL, NS_MOUSE_EVENT },
     { nsGkAtoms::onmouseover,                   NS_MOUSE_ENTER_SYNTH, EventNameType_All, NS_MOUSE_EVENT },
     { nsGkAtoms::onmouseout,                    NS_MOUSE_EXIT_SYNTH, EventNameType_All, NS_MOUSE_EVENT },
+    { nsGkAtoms::onMozMouseHittest,             NS_MOUSE_MOZHITTEST, EventNameType_None, NS_MOUSE_EVENT },
     { nsGkAtoms::onmousemove,                   NS_MOUSE_MOVE, EventNameType_All, NS_MOUSE_EVENT },
     { nsGkAtoms::oncontextmenu,                 NS_CONTEXTMENU, EventNameType_HTMLXUL, NS_MOUSE_EVENT },
 
diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index c15bfcd386b0..2e2ec5c5a1e1 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -663,6 +663,7 @@ GK_ATOM(onmousedown, "onmousedown")
 GK_ATOM(onmousemove, "onmousemove")
 GK_ATOM(onmouseout, "onmouseout")
 GK_ATOM(onmouseover, "onmouseover")
+GK_ATOM(onMozMouseHittest, "onMozMouseHittest")
 GK_ATOM(onmouseup, "onmouseup")
 GK_ATOM(onMozAfterPaint, "onMozAfterPaint")
 GK_ATOM(onMozMousePixelScroll, "onMozMousePixelScroll")
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index 4b90cc7db9e5..11288418c0d3 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -58,7 +58,7 @@
 
 static const char* const sEventNames[] = {
   "mousedown", "mouseup", "click", "dblclick", "mouseover",
-  "mouseout", "mousemove", "contextmenu", "keydown", "keyup", "keypress",
+  "mouseout", "MozMouseHittest", "mousemove", "contextmenu", "keydown", "keyup", "keypress",
   "focus", "blur", "load", "popstate", "beforeunload", "unload",
   "hashchange", "readystatechange", "abort", "error",
   "submit", "reset", "change", "select", "input", "text",
@@ -1073,6 +1073,8 @@ const char* nsDOMEvent::GetEventName(PRUint32 aEventType)
     return sEventNames[eDOMEvents_mouseover];
   case NS_MOUSE_EXIT_SYNTH:
     return sEventNames[eDOMEvents_mouseout];
+  case NS_MOUSE_MOZHITTEST:
+    return sEventNames[eDOMEvents_MozMouseHittest];
   case NS_MOUSE_MOVE:
     return sEventNames[eDOMEvents_mousemove];
   case NS_KEY_UP:
diff --git a/content/events/src/nsDOMEvent.h b/content/events/src/nsDOMEvent.h
index 61bddf38dbca..81ba04ec0998 100644
--- a/content/events/src/nsDOMEvent.h
+++ b/content/events/src/nsDOMEvent.h
@@ -67,6 +67,7 @@ public:
     eDOMEvents_dblclick,
     eDOMEvents_mouseover,
     eDOMEvents_mouseout,
+    eDOMEvents_MozMouseHittest,
     eDOMEvents_mousemove,
     eDOMEvents_contextmenu,
     eDOMEvents_keydown,
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
index 4fbffda78902..25990b515b50 100644
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
@@ -84,7 +84,6 @@ endif
 
 EXTRA_JS_MODULES = \
   InlineSpellChecker.jsm \
-  WindowDraggingUtils.jsm \
   PopupNotifications.jsm \
   $(NULL)
 
@@ -92,6 +91,7 @@ EXTRA_PP_JS_MODULES = \
   debug.js \
   LightweightThemeConsumer.jsm \
   Services.jsm \
+  WindowDraggingUtils.jsm \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/content/WindowDraggingUtils.jsm b/toolkit/content/WindowDraggingUtils.jsm
index bf5fd8a57df5..5d84814ff2e2 100644
--- a/toolkit/content/WindowDraggingUtils.jsm
+++ b/toolkit/content/WindowDraggingUtils.jsm
@@ -39,7 +39,11 @@ let EXPORTED_SYMBOLS = [ "WindowDraggingElement" ];
 function WindowDraggingElement(elem, window) {
   this._elem = elem;
   this._window = window;
+#ifdef XP_WIN
+  this._elem.addEventListener("MozMouseHittest", this, false);
+#else
   this._elem.addEventListener("mousedown", this, false);
+#endif
 }
 
 WindowDraggingElement.prototype = {
@@ -47,29 +51,44 @@ WindowDraggingElement.prototype = {
   dragTags: ["box", "hbox", "vbox", "spacer", "label", "statusbarpanel", "stack",
              "toolbaritem", "toolbarseparator", "toolbarspring", "toolbarspacer",
              "radiogroup", "deck", "scrollbox", "arrowscrollbox", "tabs"],
+  shouldDrag: function(aEvent) {
+    if (aEvent.button != 0 ||
+      this._window.fullScreen ||
+      !this.mouseDownCheck.call(this._elem, aEvent) ||
+      aEvent.getPreventDefault())
+    return false;
+
+    // Maybe we have been removed from the document
+    if (!this._elem._alive)
+      return false;
+
+    let target = aEvent.originalTarget, parent = aEvent.originalTarget;
+    while (parent != this._elem) {
+      let mousethrough = parent.getAttribute("mousethrough");
+      if (mousethrough == "always")
+        target = parent.parentNode;
+      else if (mousethrough == "never")
+        break;
+      parent = parent.parentNode;
+    }
+    while (target != this._elem) {
+      if (this.dragTags.indexOf(target.localName) == -1)
+        return false;
+      target = target.parentNode;
+    }
+    return true;
+  },
   handleEvent: function(aEvent) {
+#ifdef XP_WIN
+   if (this.shouldDrag(aEvent)) {
+     aEvent.preventDefault();
+   }
+#else
     switch (aEvent.type) {
       case "mousedown":
-        if (aEvent.button != 0 ||
-            this._window.fullScreen ||
-            !this.mouseDownCheck.call(this._elem, aEvent) ||
-            aEvent.getPreventDefault())
+        if (!this.shouldDrag(aEvent))
           return;
 
-        let target = aEvent.originalTarget, parent = aEvent.originalTarget;
-        while (parent != this._elem) {
-          let mousethrough = parent.getAttribute("mousethrough");
-          if (mousethrough == "always")
-            target = parent.parentNode;
-          else if (mousethrough == "never")
-            break;
-          parent = parent.parentNode;
-        }
-        while (target != this._elem) {
-          if (this.dragTags.indexOf(target.localName) == -1)
-            return;
-          target = target.parentNode;
-        }
         this._deltaX = aEvent.screenX - this._window.screenX;
         this._deltaY = aEvent.screenY - this._window.screenY;
         this._draggingWindow = true;
@@ -86,5 +105,6 @@ WindowDraggingElement.prototype = {
         this._window.removeEventListener("mouseup", this, false);
         break;
     }
+#endif
   }
 }
diff --git a/toolkit/content/widgets/general.xml b/toolkit/content/widgets/general.xml
index a9eed642f02c..8f5c00770d21 100644
--- a/toolkit/content/widgets/general.xml
+++ b/toolkit/content/widgets/general.xml
@@ -160,6 +160,7 @@
   <binding id="statusbar-drag"
            extends="chrome://global/content/bindings/general.xml#statusbar">
     <implementation>
+      <field name="_alive">true</field>
       <constructor>
         if (!this._draggableStarted) {
           this._draggableStarted = true;
@@ -264,6 +265,7 @@
 
   <binding id="windowdragbox">
     <implementation>
+      <field name="_alive">true</field>
       <constructor>
         if (!this._draggableStarted) {
           this._draggableStarted = true;
diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index c84c02c37466..42624ab4d8bb 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -440,6 +440,7 @@
   <binding id="toolbar-drag"
            extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <implementation>
+      <field name="_alive">true</field>
       <constructor><![CDATA[
         if (!this._draggableStarted) {
           this._draggableStarted = true;
diff --git a/widget/public/nsGUIEvent.h b/widget/public/nsGUIEvent.h
index 2fa998a30751..db960af66ca8 100644
--- a/widget/public/nsGUIEvent.h
+++ b/widget/public/nsGUIEvent.h
@@ -226,6 +226,7 @@ class nsHashKey;
 #define NS_MOUSE_ACTIVATE               (NS_MOUSE_MESSAGE_START + 30)
 #define NS_MOUSE_ENTER_SYNTH            (NS_MOUSE_MESSAGE_START + 31)
 #define NS_MOUSE_EXIT_SYNTH             (NS_MOUSE_MESSAGE_START + 32)
+#define NS_MOUSE_MOZHITTEST             (NS_MOUSE_MESSAGE_START + 33)
 
 #define NS_CONTEXTMENU_MESSAGE_START    500
 #define NS_CONTEXTMENU                  (NS_CONTEXTMENU_MESSAGE_START)
@@ -1378,6 +1379,7 @@ enum nsDragDropEventStatus {
         ((evnt)->message == NS_MOUSE_ACTIVATE) || \
         ((evnt)->message == NS_MOUSE_ENTER_SYNTH) || \
         ((evnt)->message == NS_MOUSE_EXIT_SYNTH) || \
+        ((evnt)->message == NS_MOUSE_MOZHITTEST) || \
         ((evnt)->message == NS_MOUSE_MOVE))
 
 #define NS_IS_MOUSE_EVENT_STRUCT(evnt) \
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 80bbd07a84e9..e3cd3284664e 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -385,6 +385,7 @@ nsWindow::nsWindow() : nsBaseWidget()
   mOldStyle             = 0;
   mOldExStyle           = 0;
   mPainting             = 0;
+  mExitToNonClientArea  = 0;
   mLastKeyboardLayout   = 0;
   mBlurSuppressLevel    = 0;
   mIMEEnabled           = nsIWidget::IME_STATUS_ENABLED;
@@ -3831,6 +3832,10 @@ PRBool nsWindow::DispatchMouseEvent(PRUint32 aEventType, WPARAM wParam,
   else if (aEventType == NS_MOUSE_EXIT) {
     event.exit = IsTopLevelMouseExit(mWnd) ? nsMouseEvent::eTopLevel : nsMouseEvent::eChild;
   }
+  else if (aEventType == NS_MOUSE_MOZHITTEST)
+  {
+    event.flags |= NS_EVENT_FLAG_ONLY_CHROME_DISPATCH;
+  }
   event.clickCount = sLastClickCount;
 
 #ifdef NS_DEBUG_XX
@@ -4681,6 +4686,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
       if ((sLastMouseMovePoint.x != mp.x) || (sLastMouseMovePoint.y != mp.y)) {
         userMovedMouse = PR_TRUE;
       }
+      mExitToNonClientArea = PR_FALSE;
 
       result = DispatchMouseEvent(NS_MOUSE_MOVE, wParam, lParam,
                                   PR_FALSE, nsMouseEvent::eLeftButton, MOUSE_INPUT_SOURCE());
@@ -4805,6 +4811,25 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
                                   nsMouseEvent::eRightButton, MOUSE_INPUT_SOURCE());
       break;
 
+    case WM_NCRBUTTONDOWN:
+      result = DispatchMouseEvent(NS_MOUSE_BUTTON_DOWN, 0, lParamToClient(lParam), 
+                                  PR_FALSE, nsMouseEvent::eRightButton,
+                                  MOUSE_INPUT_SOURCE());
+      DispatchPendingEvents();
+      break;
+
+    case WM_NCRBUTTONUP:
+      result = DispatchMouseEvent(NS_MOUSE_BUTTON_UP, 0, lParamToClient(lParam),
+                                  PR_FALSE, nsMouseEvent::eRightButton,
+                                  MOUSE_INPUT_SOURCE());
+      DispatchPendingEvents();
+      break;
+
+    case WM_NCRBUTTONDBLCLK:
+      result = DispatchMouseEvent(NS_MOUSE_DOUBLECLICK, 0, lParamToClient(lParam),
+                                  PR_FALSE, nsMouseEvent::eRightButton,
+                                  MOUSE_INPUT_SOURCE());
+
     case WM_APPCOMMAND:
     {
       PRUint32 appCommand = GET_APPCOMMAND_LPARAM(lParam);
@@ -5414,6 +5439,29 @@ nsWindow::ClientMarginHitTestPoint(PRInt32 mx, PRInt32 my)
       testResult = HTRIGHT;
   }
 
+  if (!mIsInMouseCapture && 
+      (testResult == HTCLIENT || testResult == HTTOP || testResult == HTTOPLEFT)) {
+    LPARAM lParam = MAKELPARAM(mx, my);
+    LPARAM lParamClient = lParamToClient(lParam);
+    PRBool result = DispatchMouseEvent(NS_MOUSE_MOZHITTEST, 0, lParamClient,
+                                       PR_FALSE, nsMouseEvent::eLeftButton, MOUSE_INPUT_SOURCE());
+    if (result) {
+      // The mouse is over a blank area
+      testResult = testResult == HTCLIENT ? HTCAPTION : testResult;
+
+      if (!mExitToNonClientArea) {
+        // The first time the mouse pointer goes from client area to non-client area,
+        // we don't want to miss that movement so we can interpret mouseout input.
+        ::SendMessage(mWnd, WM_MOUSEMOVE, 0, lParamClient);
+        mExitToNonClientArea = PR_TRUE;
+      }
+    } else {
+      // There's content over the mouse pointer. Set HTCLIENT
+      // to possibly override a resizer border.
+      testResult = HTCLIENT;
+    }
+  }
+
   return testResult;
 }
 
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index 3a267586a134..b33f44799427 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -444,6 +444,7 @@ protected:
   PRPackedBool          mIsInMouseCapture;
   PRPackedBool          mUnicodeWidget;
   PRPackedBool          mPainting;
+  PRPackedBool          mExitToNonClientArea;
   PRUint32              mBlurSuppressLevel;
   nsContentType         mContentType;
   DWORD_PTR             mOldStyle;

From 2b6a70f73d839ce42e56efa7ac8328c55dd3c8c9 Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Mon, 28 Jun 2010 01:04:20 -0500
Subject: [PATCH 126/172] Bug 575044 - Fix busted windows styles and disable
 chromemargins for fullscreen mode. r=robarnold.

---
 widget/src/windows/nsWindow.cpp | 81 +++++++++++++++++++--------------
 widget/src/windows/nsWindow.h   |  1 +
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index e3cd3284664e..0bd6fc7d0af1 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -378,6 +378,7 @@ nsWindow::nsWindow() : nsBaseWidget()
   mWindowType           = eWindowType_child;
   mBorderStyle          = eBorderStyle_default;
   mPopupType            = ePopupTypeAny;
+  mOldSizeMode          = nsSizeMode_Normal;
   mLastPoint.x          = 0;
   mLastPoint.y          = 0;
   mLastSize.width       = 0;
@@ -1139,10 +1140,6 @@ NS_METHOD nsWindow::Show(PRBool bState)
             break;
           // use default for nsSizeMode_Minimized on Windows CE
 #else
-          case nsSizeMode_Fullscreen:
-            ::ShowWindow(mWnd, SW_SHOWMAXIMIZED);
-            break;
-
           case nsSizeMode_Maximized :
             ::ShowWindow(mWnd, SW_SHOWMAXIMIZED);
             break;
@@ -1560,7 +1557,7 @@ NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode) {
 
     switch (aMode) {
       case nsSizeMode_Fullscreen :
-        mode = SW_MAXIMIZE;
+        mode = SW_RESTORE;
         break;
 
       case nsSizeMode_Maximized :
@@ -2373,6 +2370,9 @@ NS_IMETHODIMP nsWindow::HideWindowChrome(PRBool aShouldHide)
     return NS_ERROR_FAILURE;
   }
 
+  if (mHideChrome == aShouldHide)
+    return NS_OK;
+
   DWORD_PTR style, exStyle;
   mHideChrome = aShouldHide;
   if (aShouldHide) {
@@ -2508,6 +2508,19 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
 
 #else
 
+  if (aFullScreen) {
+    if (mSizeMode != nsSizeMode_Fullscreen)
+      mOldSizeMode = mSizeMode;
+    SetSizeMode(nsSizeMode_Fullscreen);
+  } else {
+    SetSizeMode(mOldSizeMode);
+  }
+
+  UpdateNonClientMargins();
+
+  // Will call hide chrome, reposition window. Note this will
+  // also cache dimensions for restoration, so it should only
+  // be called once per fullscreen request.
   return nsBaseWidget::MakeFullScreen(aFullScreen);
 #endif
 }
@@ -4915,8 +4928,6 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
 #else
           *aRetValue = 0;
 #endif
-          if (mSizeMode == nsSizeMode_Fullscreen)
-            MakeFullScreen(TRUE);
         }
       }
 #ifdef WINCE_WINDOWS_MOBILE
@@ -5727,7 +5738,7 @@ void nsWindow::OnWindowPosChanged(WINDOWPOS *wp, PRBool& result)
 #endif
 
   // Handle window size mode changes
-  if (wp->flags & SWP_FRAMECHANGED) {
+  if (wp->flags & SWP_FRAMECHANGED && mSizeMode != nsSizeMode_Fullscreen) {
     nsSizeModeEvent event(PR_TRUE, NS_SIZEMODE, this);
 
     WINDOWPLACEMENT pl;
@@ -5883,7 +5894,9 @@ void nsWindow::OnWindowPosChanging(LPWINDOWPOS& info)
 {
   // Update non-client margins if the frame size is changing, and let the
   // browser know we are changing size modes, so alternative css can kick in.
-  if (info->flags & SWP_FRAMECHANGED) {
+  // If we're going into fullscreen mode, ignore this, since it'll reset
+  // margins to normal mode. 
+  if (info->flags & SWP_FRAMECHANGED && mSizeMode != nsSizeMode_Fullscreen) {
     WINDOWPLACEMENT pl;
     pl.length = sizeof(pl);
     ::GetWindowPlacement(mWnd, &pl);
@@ -7413,43 +7426,43 @@ void nsWindow::SetWindowTranslucencyInner(nsTransparencyMode aMode)
   if (aMode == mTransparencyMode)
     return;
 
+  // stop on dialogs and popups!
   HWND hWnd = GetTopLevelHWND(mWnd, PR_TRUE);
-  nsWindow* topWindow = GetNSWindowPtr(hWnd);
+  nsWindow* parent = GetNSWindowPtr(hWnd);
 
-  if (!topWindow)
+  if (!parent)
   {
     NS_WARNING("Trying to use transparent chrome in an embedded context");
     return;
   }
 
-  LONG_PTR style = 0, exStyle = 0;
-  switch(aMode) {
-    case eTransparencyTransparent:
-      exStyle |= WS_EX_LAYERED;
-    case eTransparencyOpaque:
-    case eTransparencyGlass:
-      topWindow->mTransparencyMode = aMode;
-      break;
+  if (parent != this) {
+    NS_WARNING("Setting SetWindowTranslucencyInner on a parent this is not us!");
   }
 
-  // Hide chrome supports caching old styles, so this can be
-  // flipped back and forth
-  //topWindow->HideWindowChrome(aMode == eTransparencyTransparent);
-
-  style |= topWindow->WindowStyle();
-  exStyle |= topWindow->WindowExStyle();
-
   if (aMode == eTransparencyTransparent) {
-    style &= ~(WS_CAPTION | WS_THICKFRAME | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
-    exStyle &= ~(WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE);
+    // If we're switching to the use of a transparent window, hide the chrome
+    // on our parent.
+    HideWindowChrome(PR_TRUE);
+  } else if (mHideChrome && mTransparencyMode == eTransparencyTransparent) {
+    // if we're switching out of transparent, re-enable our parent's chrome.
+    HideWindowChrome(PR_FALSE);
   }
 
-  if (topWindow->mIsVisible)
-    style |= WS_VISIBLE;
-  if (topWindow->mSizeMode == nsSizeMode_Maximized)
-    style |= WS_MAXIMIZE;
-  else if (topWindow->mSizeMode == nsSizeMode_Minimized)
-    style |= WS_MINIMIZE;
+  LONG_PTR style = ::GetWindowLongPtrW(hWnd, GWL_STYLE),
+    exStyle = ::GetWindowLongPtr(hWnd, GWL_EXSTYLE);
+ 
+   if (parent->mIsVisible)
+     style |= WS_VISIBLE;
+   if (parent->mSizeMode == nsSizeMode_Maximized)
+     style |= WS_MAXIMIZE;
+   else if (parent->mSizeMode == nsSizeMode_Minimized)
+     style |= WS_MINIMIZE;
+
+   if (aMode == eTransparencyTransparent)
+     exStyle |= WS_EX_LAYERED;
+   else
+     exStyle &= ~WS_EX_LAYERED;
 
   VERIFY_WINDOW_STYLE(style);
   ::SetWindowLongPtrW(hWnd, GWL_STYLE, style);
diff --git a/widget/src/windows/nsWindow.h b/widget/src/windows/nsWindow.h
index b33f44799427..ed73ff204133 100644
--- a/widget/src/windows/nsWindow.h
+++ b/widget/src/windows/nsWindow.h
@@ -456,6 +456,7 @@ protected:
   nsPopupType           mPopupType;
   PRPackedBool          mDisplayPanFeedback;
   PRPackedBool          mHideChrome;
+  nsSizeMode            mOldSizeMode;
   WindowHook            mWindowHook;
   static PRUint32       sInstanceCount;
   static TriStateBool   sCanQuit;

From 31fbb862b104c3d0ef8b186a24114b1901f3ece7 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Mon, 28 Jun 2010 11:41:01 +0200
Subject: [PATCH 127/172] Bug 513162 - Fix for MOZ_WINSDK_TARGETVER <
 MOZ_NTDDI_LONGHORN r=jmathies

---
 widget/src/windows/nsUXThemeData.h | 4 +++-
 widget/src/windows/nsWindow.cpp    | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/widget/src/windows/nsUXThemeData.h b/widget/src/windows/nsUXThemeData.h
index effeea8dec73..8d62b4aeb89c 100644
--- a/widget/src/windows/nsUXThemeData.h
+++ b/widget/src/windows/nsUXThemeData.h
@@ -187,13 +187,15 @@ public:
   static DwmSetWindowAttributeProc dwmSetWindowAttributePtr;
   static DwmInvalidateIconicBitmapsProc dwmInvalidateIconicBitmapsPtr;
   static DwmDefWindowProcProc dwmDwmDefWindowProcPtr;
+#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
 
   static PRBool CheckForCompositor() {
     BOOL compositionIsEnabled = FALSE;
+#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
     if(dwmIsCompositionEnabledPtr)
       dwmIsCompositionEnabledPtr(&compositionIsEnabled);
+#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
     return sHaveCompositor = (compositionIsEnabled != 0);
   }
-#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
 };
 #endif // __UXThemeData_h__
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 0bd6fc7d0af1..02a99eae0b87 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -4399,6 +4399,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
 
   static PRBool getWheelInfo = PR_TRUE;
 
+#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
   // Glass hit testing w/custom transparent margins
   LRESULT dwmHitResult;
   if (mCustomNonClient &&
@@ -4408,6 +4409,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
     *aRetValue = dwmHitResult;
     return PR_TRUE;
   }
+#endif // MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
 
   switch (msg) {
 #ifndef WINCE

From 4ab4321776f7d4feb09a30c9a7d5a08505e1f1f9 Mon Sep 17 00:00:00 2001
From: timeless <timeless@bemail.org>
Date: Mon, 28 Jun 2010 12:00:07 +0200
Subject: [PATCH 128/172] Bug 568007 - js_GetReservedSlot is too friendly to
 api abusers r=jorendorff

---
 js/src/jsobj.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 0fd27636d3cc..1355d4967394 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -6233,8 +6233,7 @@ js_GetReservedSlot(JSContext *cx, JSObject *obj, uint32 index, jsval *vp)
     uint32 limit = JSCLASS_RESERVED_SLOTS(clasp);
 
     JS_LOCK_OBJ(cx, obj);
-    if (index >= limit && !ReservedSlotIndexOK(cx, obj, clasp, index, limit))
-        return false;
+    JS_ASSERT(index < limit || ReservedSlotIndexOK(cx, obj, clasp, index, limit));
 
     uint32 slot = JSSLOT_START(clasp) + index;
     *vp = (slot < obj->numSlots()) ? obj->getSlot(slot) : JSVAL_VOID;

From 65c355c8a7a268e03ae8b887dc8371cfd35c198e Mon Sep 17 00:00:00 2001
From: Alexander Surkov <surkov.alexander@gmail.com>
Date: Mon, 28 Jun 2010 21:02:03 +0900
Subject: [PATCH 129/172] Bug 573706 - make frame based accessible creation
 more pellucid, r=davidb, sr=roc

---
 accessible/public/nsIAccessibilityService.h   | 104 +-
 .../src/base/nsAccessibilityService.cpp       | 925 +++++++-----------
 accessible/src/base/nsAccessibilityService.h  | 133 ++-
 layout/base/nsPresShell.cpp                   |   5 +-
 layout/forms/nsComboboxControlFrame.cpp       |  10 +-
 layout/forms/nsComboboxControlFrame.h         |   2 +-
 layout/forms/nsFieldSetFrame.cpp              |  10 +-
 layout/forms/nsFileControlFrame.cpp           |   8 +-
 layout/forms/nsFileControlFrame.h             |   2 +-
 layout/forms/nsGfxButtonControlFrame.cpp      |  13 -
 layout/forms/nsGfxButtonControlFrame.h        |   5 -
 layout/forms/nsGfxCheckboxControlFrame.cpp    |  10 +-
 layout/forms/nsGfxCheckboxControlFrame.h      |   2 +-
 layout/forms/nsGfxRadioControlFrame.cpp       |  10 +-
 layout/forms/nsGfxRadioControlFrame.h         |   2 +-
 layout/forms/nsHTMLButtonControlFrame.cpp     |  15 +-
 layout/forms/nsHTMLButtonControlFrame.h       |   2 +-
 layout/forms/nsImageControlFrame.cpp          |  11 +-
 layout/forms/nsListControlFrame.cpp           |  10 +-
 layout/forms/nsListControlFrame.h             |   2 +-
 layout/forms/nsTextControlFrame.cpp           |   8 +-
 layout/forms/nsTextControlFrame.h             |   2 +-
 layout/generic/nsBRFrame.cpp                  |  18 +-
 layout/generic/nsBlockFrame.cpp               |  29 +-
 layout/generic/nsBlockFrame.h                 |   2 +-
 layout/generic/nsFrame.cpp                    |   6 +-
 layout/generic/nsFrame.h                      |   2 +-
 layout/generic/nsFrameFrame.cpp               |  15 +-
 layout/generic/nsGfxScrollFrame.cpp           |  11 +-
 layout/generic/nsGfxScrollFrame.h             |   2 +-
 layout/generic/nsHTMLCanvasFrame.cpp          |   6 +-
 layout/generic/nsHTMLCanvasFrame.h            |   2 +-
 layout/generic/nsIFrame.h                     |   4 +-
 layout/generic/nsImageFrame.cpp               |   8 +-
 layout/generic/nsImageFrame.h                 |   2 +-
 layout/generic/nsInlineFrame.cpp              |  17 +-
 layout/generic/nsInlineFrame.h                |   2 +-
 layout/generic/nsObjectFrame.cpp              |  13 +-
 layout/generic/nsObjectFrame.h                |   2 +-
 layout/generic/nsPlaceholderFrame.h           |   8 +-
 layout/generic/nsTextFrame.h                  |   2 +-
 layout/generic/nsTextFrameThebes.cpp          |  11 +-
 layout/generic/nsVideoFrame.cpp               |  12 +-
 layout/generic/nsVideoFrame.h                 |   2 +-
 layout/tables/nsTableCellFrame.cpp            |   8 +-
 layout/tables/nsTableCellFrame.h              |   2 +-
 layout/tables/nsTableOuterFrame.cpp           |  17 +-
 layout/tables/nsTableOuterFrame.h             |   4 +-
 48 files changed, 648 insertions(+), 850 deletions(-)

diff --git a/accessible/public/nsIAccessibilityService.h b/accessible/public/nsIAccessibilityService.h
index 77b7f91e4410..e859630d01ee 100644
--- a/accessible/public/nsIAccessibilityService.h
+++ b/accessible/public/nsIAccessibilityService.h
@@ -44,7 +44,10 @@
 #include "nsIAccessibleRetrieval.h"
 #include "nsIAccessibleEvent.h"
 
+#include "nsAutoPtr.h"
+
 class nsAccessible;
+class nsINode;
 class nsIContent;
 class nsIDocument;
 class nsIFrame;
@@ -68,65 +71,56 @@ public:
    * @param  aPresShell [in] the presentation shell which contains layout info
    *                         for the DOM node
    */
-  virtual nsAccessible* GetAccessibleInShell(nsIDOMNode *aNode,
-                                             nsIPresShell *aPresShell) = 0;
+  virtual nsAccessible* GetAccessibleInShell(nsINode* aNode,
+                                             nsIPresShell* aPresShell) = 0;
 
   /**
    * Creates accessible for the given DOM node or frame.
    */
-  virtual nsresult CreateOuterDocAccessible(nsIDOMNode *aNode,
-                                            nsIAccessible **aAccessible) = 0;
-
-  virtual nsresult CreateHTML4ButtonAccessible(nsIFrame *aFrame,
-                                               nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHyperTextAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLBRAccessible(nsIFrame *aFrame,
-                                          nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLButtonAccessible(nsIFrame *aFrame,
-                                              nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLLIAccessible(nsIFrame *aFrame,
-                                          nsIFrame *aBulletFrame,
-                                          const nsAString& aBulletText,
-                                          nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLCheckboxAccessible(nsIFrame *aFrame,
-                                                nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLComboboxAccessible(nsIDOMNode *aNode,
-                                                nsIWeakReference *aPresShell,
-                                                nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLGenericAccessible(nsIFrame *aFrame,
-                                               nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLGroupboxAccessible(nsIFrame *aFrame,
-                                                nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLHRAccessible(nsIFrame *aFrame,
-                                          nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLImageAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLLabelAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLListboxAccessible(nsIDOMNode *aNode,
-                                               nsIWeakReference *aPresShell,
-                                               nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLMediaAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame,
-                                                   nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLRadioButtonAccessible(nsIFrame *aFrame,
-                                                   nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLSelectOptionAccessible(nsIDOMNode *aNode,
-                                                    nsIAccessible *aAccParent,
-                                                    nsIWeakReference *aPresShell,
-                                                    nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLTableAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLTableCellAccessible(nsIFrame *aFrame,
-                                                 nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLTextAccessible(nsIFrame *aFrame,
-                                            nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLTextFieldAccessible(nsIFrame *aFrame,
-                                                 nsIAccessible **aAccessible) = 0;
-  virtual nsresult CreateHTMLCaptionAccessible(nsIFrame *aFrame,
-                                               nsIAccessible **aAccessible) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLBRAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTML4ButtonAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLButtonAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLCaptionAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLCheckboxAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLComboboxAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLGroupboxAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLHRAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLImageAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLLabelAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLLIAccessible(nsIContent* aContent, nsIPresShell* aPresShell,
+                           const nsAString& aBulletText) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLListboxAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLMediaAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLObjectFrameAccessible(nsObjectFrame* aFrame, nsIContent* aContent,
+                                    nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLRadioButtonAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLTableAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLTableCellAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLTextAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLTextFieldAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateHyperTextAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
+  virtual already_AddRefed<nsAccessible>
+    CreateOuterDocAccessible(nsIContent* aContent, nsIPresShell* aPresShell) = 0;
 
   /**
    * Adds/remove ATK root accessible for gtk+ native window to/from children
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index cfb2afc9eadc..5e2e86264063 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -186,268 +186,93 @@ nsAccessibilityService::FireAccessibleEvent(PRUint32 aEvent,
   return NS_OK;
 }
 
-// nsAccessibilityService private
-nsresult
-nsAccessibilityService::GetInfo(nsIFrame *aFrame, nsIWeakReference **aShell,
-                                nsIContent **aContent)
-{
-  NS_ASSERTION(aFrame,"Error -- 1st argument (aFrame) is null!!");
-  if (!aFrame) {
-    return NS_ERROR_FAILURE;
-  }
-  nsIContent* content = aFrame->GetContent();
-  if (!content)
-    return NS_ERROR_FAILURE;
-
-  nsIDocument* document = content->GetOwnerDoc();
-  if (!document)
-    return NS_ERROR_FAILURE;
-
-  NS_ASSERTION(document->GetShell(),
-               "Error: aFrame's document doesn't have a PresShell!");
-
-  // do_GetWR only works into a |nsCOMPtr| :-(
-  nsCOMPtr<nsIWeakReference> weakShell =
-    do_GetWeakReference(document->GetShell());
-
-  weakShell.forget(aShell);
-  NS_IF_ADDREF(*aContent = content);
-
-  return NS_OK;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessibilityService
 
-nsresult
-nsAccessibilityService::CreateOuterDocAccessible(nsIDOMNode* aDOMNode, 
-                                                 nsIAccessible **aOuterDocAccessible)
-{
-  NS_ENSURE_ARG_POINTER(aDOMNode);
-  
-  *aOuterDocAccessible = nsnull;
-
-  nsCOMPtr<nsIContent> content(do_QueryInterface(aDOMNode));
-  nsCOMPtr<nsIWeakReference> outerWeakShell =
-    nsCoreUtils::GetWeakShellFor(content);
-  NS_ENSURE_TRUE(outerWeakShell, NS_ERROR_FAILURE);
-
-  nsOuterDocAccessible *outerDocAccessible =
-    new nsOuterDocAccessible(content, outerWeakShell);
-  NS_ENSURE_TRUE(outerDocAccessible, NS_ERROR_FAILURE);
-
-  NS_ADDREF(*aOuterDocAccessible = outerDocAccessible);
-
-  return NS_OK;
-}
-
- /**
-   * HTML widget creation
-   */
-nsresult
-nsAccessibilityService::CreateHTML4ButtonAccessible(nsIFrame *aFrame,
-                                                    nsIAccessible **aAccessible)
-{
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTML4ButtonAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
-}
-
-nsresult
-nsAccessibilityService::CreateHTMLButtonAccessible(nsIFrame *aFrame,
-                                                   nsIAccessible **aAccessible)
-{
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLButtonAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
-}
-
-// nsAccessibilityService private
 already_AddRefed<nsAccessible>
-nsAccessibilityService::CreateHTMLAccessibleByMarkup(nsIFrame *aFrame,
-                                                     nsIWeakReference *aWeakShell,
-                                                     nsINode *aNode)
+nsAccessibilityService::CreateOuterDocAccessible(nsIContent* aContent,
+                                                 nsIPresShell* aPresShell)
 {
-  // This method assumes we're in an HTML namespace.
-  nsRefPtr<nsAccessible> accessible;
-
-  nsCOMPtr<nsIContent> content(do_QueryInterface(aNode));
-  nsIAtom *tag = content->Tag();
-  if (tag == nsAccessibilityAtoms::legend) {
-    accessible = new nsHTMLLegendAccessible(content, aWeakShell);
-  }
-  else if (tag == nsAccessibilityAtoms::option) {
-    accessible = new nsHTMLSelectOptionAccessible(content, aWeakShell);
-  }
-  else if (tag == nsAccessibilityAtoms::optgroup) {
-    accessible = new nsHTMLSelectOptGroupAccessible(content, aWeakShell);
-  }
-  else if (tag == nsAccessibilityAtoms::ul || tag == nsAccessibilityAtoms::ol ||
-           tag == nsAccessibilityAtoms::dl) {
-    accessible = new nsHTMLListAccessible(content, aWeakShell);
-  }
-  else if (tag == nsAccessibilityAtoms::a) {
-
-    // Only some roles truly enjoy life as nsHTMLLinkAccessibles, for details
-    // see closed bug 494807.
-    nsRoleMapEntry *roleMapEntry = nsAccUtils::GetRoleMapEntry(aNode);
-    if (roleMapEntry && roleMapEntry->role != nsIAccessibleRole::ROLE_NOTHING
-        && roleMapEntry->role != nsIAccessibleRole::ROLE_LINK) {
-
-      accessible = new nsHyperTextAccessibleWrap(content, aWeakShell);
-    } else {
-      accessible = new nsHTMLLinkAccessible(content, aWeakShell);
-    }
-  }
-  else if (tag == nsAccessibilityAtoms::dt ||
-           (tag == nsAccessibilityAtoms::li && 
-            aFrame->GetType() != nsAccessibilityAtoms::blockFrame)) {
-    // Normally for li, it is created by the list item frame (in nsBlockFrame)
-    // which knows about the bullet frame; however, in this case the list item
-    // must have been styled using display: foo
-    accessible = new nsHTMLLIAccessible(content, aWeakShell, EmptyString());
-  }
-  else if (tag == nsAccessibilityAtoms::abbr ||
-           tag == nsAccessibilityAtoms::acronym ||
-           tag == nsAccessibilityAtoms::blockquote ||
-           tag == nsAccessibilityAtoms::dd ||
-           tag == nsAccessibilityAtoms::form ||
-           tag == nsAccessibilityAtoms::h1 ||
-           tag == nsAccessibilityAtoms::h2 ||
-           tag == nsAccessibilityAtoms::h3 ||
-           tag == nsAccessibilityAtoms::h4 ||
-           tag == nsAccessibilityAtoms::h5 ||
-           tag == nsAccessibilityAtoms::h6 ||
-           tag == nsAccessibilityAtoms::q) {
-
-    accessible = new nsHyperTextAccessibleWrap(content, aWeakShell);
-  }
-  else if (tag == nsAccessibilityAtoms::tr) {
-    accessible = new nsEnumRoleAccessible(content, aWeakShell,
-                                          nsIAccessibleRole::ROLE_ROW);
-  }
-  else if (nsCoreUtils::IsHTMLTableHeader(content)) {
-    accessible = new nsHTMLTableHeaderCellAccessibleWrap(content, aWeakShell);
-  }
-
-  return accessible.forget();
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsOuterDocAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLLIAccessible(nsIFrame *aFrame, 
-                                               nsIFrame *aBulletFrame,
-                                               const nsAString& aBulletText,
-                                               nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTML4ButtonAccessible(nsIContent* aContent,
+                                                    nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLLIAccessible(content, weakShell, aBulletText);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTML4ButtonAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHyperTextAccessible(nsIFrame *aFrame,
-                                                  nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLButtonAccessible(nsIContent* aContent,
+                                                   nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHyperTextAccessibleWrap(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLButtonAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLCheckboxAccessible(nsIFrame *aFrame,
-                                                     nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLLIAccessible(nsIContent* aContent,
+                                               nsIPresShell* aPresShell,
+                                               const nsAString& aBulletText)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLCheckboxAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLLIAccessible(aContent, weakShell,
+                                                    aBulletText);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLComboboxAccessible(nsIDOMNode *aDOMNode,
-                                                     nsIWeakReference *aPresShell,
-                                                     nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHyperTextAccessible(nsIContent* aContent,
+                                                  nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content(do_QueryInterface(aDOMNode));
-  *aAccessible = new nsHTMLComboboxAccessible(content, aPresShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHyperTextAccessibleWrap(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLImageAccessible(nsIFrame *aFrame,
-                                                  nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLCheckboxAccessible(nsIContent* aContent,
+                                                     nsIPresShell* aPresShell)
 {
-  NS_ENSURE_ARG_POINTER(aAccessible);
-  *aAccessible = nsnull;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLCheckboxAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
+}
 
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLComboboxAccessible(nsIContent* aContent,
+                                                     nsIPresShell* aPresShell)
+{
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLComboboxAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
+}
 
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLImageAccessible(nsIContent* aContent,
+                                                  nsIPresShell* aPresShell)
+{
   nsCOMPtr<nsIHTMLDocument> htmlDoc =
-    do_QueryInterface(content->GetCurrentDoc());
+    do_QueryInterface(aContent->GetCurrentDoc());
 
   nsCOMPtr<nsIDOMHTMLMapElement> mapElm;
   if (htmlDoc) {
     nsAutoString mapElmName;
-    content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::usemap,
-                     mapElmName);
+    aContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::usemap,
+                      mapElmName);
 
     if (!mapElmName.IsEmpty()) {
       if (mapElmName.CharAt(0) == '#')
@@ -456,110 +281,70 @@ nsAccessibilityService::CreateHTMLImageAccessible(nsIFrame *aFrame,
     }
   }
 
-  if (mapElm)
-    *aAccessible = new nsHTMLImageMapAccessible(content, weakShell, mapElm);
-  else
-    *aAccessible = new nsHTMLImageAccessibleWrap(content, weakShell);
-
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = mapElm ?
+    new nsHTMLImageMapAccessible(aContent, weakShell, mapElm) :
+    new nsHTMLImageAccessibleWrap(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLGenericAccessible(nsIFrame *aFrame, nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLGroupboxAccessible(nsIContent* aContent,
+                                                     nsIPresShell* aPresShell)
 {
-  return CreateHyperTextAccessible(aFrame, aAccessible);
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLGroupboxAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLGroupboxAccessible(nsIFrame *aFrame,
-                                                     nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLListboxAccessible(nsIContent* aContent,
+                                                    nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLGroupboxAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLSelectListAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLListboxAccessible(nsIDOMNode* aDOMNode,
-                                                    nsIWeakReference *aPresShell,
-                                                    nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLMediaAccessible(nsIContent* aContent,
+                                                  nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content(do_QueryInterface(aDOMNode));
-  *aAccessible = new nsHTMLSelectListAccessible(content, aPresShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsEnumRoleAccessible(aContent, weakShell,
+                                                      nsIAccessibleRole::ROLE_GROUPING);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLMediaAccessible(nsIFrame *aFrame,
-                                                  nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLObjectFrameAccessible(nsObjectFrame* aFrame,
+                                                        nsIContent* aContent,
+                                                        nsIPresShell* aPresShell)
 {
-  NS_ENSURE_ARG_POINTER(aAccessible);
-  *aAccessible = nsnull;
+  // We can have several cases here:
+  // 1) a text or html embedded document where the contentDocument variable in
+  //    the object element holds the content;
+  // 2) web content that uses a plugin, which means we will have to go to
+  //    the plugin to get the accessible content;
+  // 3) an image or imagemap, where the image frame points back to the object
+  //    element DOMNode.
 
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  NS_ENSURE_SUCCESS(rv, rv);
+  if (aFrame->GetRect().IsEmpty())
+    return nsnull;
 
-  *aAccessible = new nsEnumRoleAccessible(content, weakShell,
-                                          nsIAccessibleRole::ROLE_GROUPING);
-  NS_ENSURE_TRUE(*aAccessible, NS_ERROR_OUT_OF_MEMORY);
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
 
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
-}
-
-/**
-  * We can have several cases here. 
-  *  1) a text or html embedded document where the contentDocument
-  *     variable in the object element holds the content
-  *  2) web content that uses a plugin, which means we will
-  *     have to go to the plugin to get the accessible content
-  *  3) An image or imagemap, where the image frame points back to 
-  *     the object element DOMNode
-  */
-nsresult
-nsAccessibilityService::CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame,
-                                                        nsIAccessible **aAccessible)
-{
-  NS_ENSURE_ARG_POINTER(aAccessible);
-  *aAccessible = nsnull;
-
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  GetInfo(aFrame, getter_AddRefs(weakShell), getter_AddRefs(content));
-
-  if (aFrame->GetRect().IsEmpty()) {
-    return NS_ERROR_FAILURE;
-  }
   // 1) for object elements containing either HTML or TXT documents
-  nsCOMPtr<nsIDOMHTMLObjectElement> obj(do_QueryInterface(content));
+  nsCOMPtr<nsIDOMHTMLObjectElement> obj(do_QueryInterface(aContent));
   if (obj) {
     nsCOMPtr<nsIDOMDocument> domDoc;
     obj->GetContentDocument(getter_AddRefs(domDoc));
-    if (domDoc) {
-      nsCOMPtr<nsIDOMNode> DOMNode(do_QueryInterface(content));
-      return CreateOuterDocAccessible(DOMNode, aAccessible);
-    }
+    if (domDoc)
+      return CreateOuterDocAccessible(aContent, aPresShell);
   }
 
 #ifdef XP_WIN
@@ -571,214 +356,109 @@ nsAccessibilityService::CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame,
     HWND pluginPort = nsnull;
     aFrame->GetPluginPort(&pluginPort);
 
-    *aAccessible =
-      new nsHTMLWin32ObjectOwnerAccessible(content, weakShell, pluginPort);
-    NS_ENSURE_TRUE(*aAccessible, NS_ERROR_OUT_OF_MEMORY);
-
-    NS_ADDREF(*aAccessible);
-    return NS_OK;
+    nsAccessible* accessible = new nsHTMLWin32ObjectOwnerAccessible(aContent,
+                                                                    weakShell,
+                                                                    pluginPort);
+    NS_IF_ADDREF(accessible);
+    return accessible;
   }
 #endif
 
   // 3) for images and imagemaps, or anything else with a child frame
   // we have the object frame, get the image frame
-  nsIFrame *frame = aFrame->GetFirstChild(nsnull);
-  if (frame)
-    return frame->GetAccessible(aAccessible);
-
-  return NS_OK;
+  nsIFrame* frame = aFrame->GetFirstChild(nsnull);
+  return frame ? frame->CreateAccessible() : nsnull;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsIFrame *aFrame,
-                                                        nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsIContent* aContent,
+                                                        nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLRadioButtonAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLRadioButtonAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLSelectOptionAccessible(nsIDOMNode *aDOMNode,
-                                                         nsIAccessible *aParent, 
-                                                         nsIWeakReference *aPresShell,
-                                                         nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLTableAccessible(nsIContent* aContent,
+                                                  nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content(do_QueryInterface(aDOMNode));
-  *aAccessible = new nsHTMLSelectOptionAccessible(content, aPresShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLTableAccessibleWrap(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLTableAccessible(nsIFrame *aFrame,
-                                                  nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLTableCellAccessible(nsIContent* aContent,
+                                                      nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLTableAccessibleWrap(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLTableCellAccessibleWrap(aContent,
+                                                               weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLTableCellAccessible(nsIFrame *aFrame,
-                                                      nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLTextAccessible(nsIContent* aContent,
+                                                 nsIPresShell* aPresShell)
 {
-  NS_ENSURE_ARG_POINTER(aAccessible);
-  *aAccessible = nsnull;
-
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLTableCellAccessibleWrap(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLTextAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLTextAccessible(nsIFrame *aFrame,
-                                                 nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLTextFieldAccessible(nsIContent* aContent,
+                                                      nsIPresShell* aPresShell)
 {
-  *aAccessible = nsnull;
-
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  // XXX Don't create ATK objects for these
-  *aAccessible = new nsHTMLTextAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLTextFieldAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLTextFieldAccessible(nsIFrame *aFrame,
-                                                      nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLLabelAccessible(nsIContent* aContent,
+                                                  nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLTextFieldAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLLabelAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLLabelAccessible(nsIFrame *aFrame,
-                                                  nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLHRAccessible(nsIContent* aContent,
+                                               nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLLabelAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLHRAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLHRAccessible(nsIFrame *aFrame,
-                                               nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLBRAccessible(nsIContent* aContent,
+                                               nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLHRAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLBRAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
-nsresult
-nsAccessibilityService::CreateHTMLBRAccessible(nsIFrame *aFrame,
-                                               nsIAccessible **aAccessible)
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLCaptionAccessible(nsIContent* aContent,
+                                                    nsIPresShell* aPresShell)
 {
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLBRAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
-}
-
-nsresult
-nsAccessibilityService::CreateHTMLCaptionAccessible(nsIFrame *aFrame,
-                                                    nsIAccessible **aAccessible)
-{
-  nsCOMPtr<nsIContent> content;
-  nsCOMPtr<nsIWeakReference> weakShell;
-  nsresult rv = GetInfo(aFrame, getter_AddRefs(weakShell),
-                        getter_AddRefs(content));
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aAccessible = new nsHTMLCaptionAccessible(content, weakShell);
-  if (!*aAccessible)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(*aAccessible);
-  return NS_OK;
+  nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
+  nsAccessible* accessible = new nsHTMLCaptionAccessible(aContent, weakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
 void
@@ -1043,16 +723,15 @@ nsAccessibilityService::GetAccessibleFromCache(nsIDOMNode* aNode,
 
 // nsIAccesibilityService
 nsAccessible*
-nsAccessibilityService::GetAccessibleInShell(nsIDOMNode *aNode, 
-                                             nsIPresShell *aPresShell) 
+nsAccessibilityService::GetAccessibleInShell(nsINode* aNode,
+                                             nsIPresShell* aPresShell)
 {
   if (!aNode || !aPresShell)
     return nsnull;
 
-  nsCOMPtr<nsINode> node(do_QueryInterface(aNode));
   nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(aPresShell));
   nsRefPtr<nsAccessible> accessible =
-    GetAccessible(node, aPresShell, weakShell);
+    GetAccessible(aNode, aPresShell, weakShell);
   return accessible;
 }
 
@@ -1249,7 +928,10 @@ nsAccessibilityService::GetAccessible(nsINode *aNode,
     // for the image frame is the image content. If the frame is not an image
     // frame or the node is not an area element then null is returned.
     // This setup will change when bug 135040 is fixed.
-    return GetAreaAccessible(weakFrame.GetFrame(), aNode, aWeakShell);
+    nsAccessible* areaAcc = GetAreaAccessible(weakFrame.GetFrame(),
+                                              aNode, aWeakShell);
+    NS_IF_ADDREF(areaAcc);
+    return areaAcc;
   }
 
   // Attempt to create an accessible based on what we know.
@@ -1269,14 +951,10 @@ nsAccessibilityService::GetAccessible(nsINode *aNode,
       }
     }
     if (weakFrame.IsAlive()) {
-      nsCOMPtr<nsIAccessible> newAccessible;
-      weakFrame.GetFrame()->GetAccessible(getter_AddRefs(newAccessible));
-      if (newAccessible) {
-        newAcc = do_QueryObject(newAccessible);
-        if (InitAccessible(newAcc, nsnull))
-          return newAcc.forget();
-        return nsnull;
-      }
+      newAcc = weakFrame.GetFrame()->CreateAccessible();
+      if (InitAccessible(newAcc, nsnull))
+        return newAcc.forget();
+      return nsnull;
     }
 
     return nsnull;
@@ -1412,8 +1090,8 @@ nsAccessibilityService::GetAccessible(nsINode *aNode,
       // The method creates accessibles for table related content too therefore
       // we do not call it if accessibles for table related content are
       // prevented above.
-      newAcc = CreateHTMLAccessibleByMarkup(weakFrame.GetFrame(), aWeakShell,
-                                            aNode);
+      newAcc = CreateHTMLAccessibleByMarkup(weakFrame.GetFrame(), content,
+                                            aWeakShell);
 
       if (!newAcc) {
         // Do not create accessible object subtrees for non-rendered table
@@ -1437,9 +1115,7 @@ nsAccessibilityService::GetAccessible(nsINode *aNode,
         }
 
         // Try using frame to do it.
-        nsCOMPtr<nsIAccessible> newAccessible;
-        f->GetAccessible(getter_AddRefs(newAccessible));
-        newAcc = do_QueryObject(newAccessible);
+        newAcc = f->CreateAccessible();
       }
     }
   }
@@ -1629,7 +1305,7 @@ nsAccessibilityService::GetRelevantContentNodeFor(nsINode *aNode)
   return aNode;
 }
 
-already_AddRefed<nsAccessible>
+nsAccessible*
 nsAccessibilityService::GetAreaAccessible(nsIFrame *aImageFrame,
                                           nsINode *aAreaNode,
                                           nsIWeakReference *aWeakShell)
@@ -1648,11 +1324,9 @@ nsAccessibilityService::GetAreaAccessible(nsIFrame *aImageFrame,
   nsRefPtr<nsAccessible> imageAcc =
     GetCachedAccessible(aImageFrame->GetContent(), aWeakShell);
   if (!imageAcc) {
-    nsCOMPtr<nsIAccessible> imageAccessible;
-    CreateHTMLImageAccessible(aImageFrame,
-                              getter_AddRefs(imageAccessible));
+    imageAcc = CreateHTMLImageAccessible(aImageFrame->GetContent(),
+                                         aImageFrame->PresContext()->PresShell());
 
-    imageAcc = do_QueryObject(imageAccessible);
     if (!InitAccessible(imageAcc, nsnull))
       return nsnull;
   }
@@ -1661,14 +1335,12 @@ nsAccessibilityService::GetAreaAccessible(nsIFrame *aImageFrame,
   // that they should be available in global cache.
   imageAcc->EnsureChildren();
 
-  nsAccessible *cachedAreaAcc = GetCachedAccessible(aAreaNode, aWeakShell);
-  NS_IF_ADDREF(cachedAreaAcc);
-  return cachedAreaAcc;
+  return GetCachedAccessible(aAreaNode, aWeakShell);
 }
 
 already_AddRefed<nsAccessible>
-nsAccessibilityService::CreateAccessibleByType(nsIContent *aContent,
-                                               nsIWeakReference *aWeakShell)
+nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
+                                               nsIWeakReference* aWeakShell)
 {
   nsCOMPtr<nsIAccessibleProvider> accessibleProvider(do_QueryInterface(aContent));
   if (!accessibleProvider)
@@ -1679,12 +1351,13 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent *aContent,
   if (NS_FAILED(rv))
     return nsnull;
 
-  nsRefPtr<nsAccessible> accessible;
   if (type == nsIAccessibleProvider::OuterDoc) {
-    accessible = new nsOuterDocAccessible(aContent, aWeakShell);
-    return accessible.forget();
+    nsAccessible* accessible = new nsOuterDocAccessible(aContent, aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
   }
 
+  nsAccessible* accessible = nsnull;
   switch (type)
   {
 #ifdef MOZ_XUL
@@ -1695,27 +1368,35 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent *aContent,
     case nsIAccessibleProvider::XULAlert:
       accessible = new nsXULAlertAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULButton:
       accessible = new nsXULButtonAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULCheckbox:
       accessible = new nsXULCheckboxAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULColorPicker:
       accessible = new nsXULColorPickerAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULColorPickerTile:
       accessible = new nsXULColorPickerTileAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULCombobox:
       accessible = new nsXULComboboxAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULDropmarker:
       accessible = new nsXULDropmarkerAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULGroupbox:
       accessible = new nsXULGroupboxAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULImage:
     {
       // Don't include nameless images in accessible tree.
@@ -1725,31 +1406,40 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent *aContent,
 
       accessible = new nsHTMLImageAccessibleWrap(aContent, aWeakShell);
       break;
+
     }
     case nsIAccessibleProvider::XULLink:
       accessible = new nsXULLinkAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULListbox:
       accessible = new nsXULListboxAccessibleWrap(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULListCell:
       accessible = new nsXULListCellAccessibleWrap(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULListHead:
       accessible = new nsXULColumnsAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULListHeader:
       accessible = new nsXULColumnItemAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULListitem:
       accessible = new nsXULListitemAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULMenubar:
       accessible = new nsXULMenubarAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULMenuitem:
       accessible = new nsXULMenuitemAccessibleWrap(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULMenupopup:
     {
 #ifdef MOZ_ACCESSIBILITY_ATK
@@ -1765,68 +1455,88 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent *aContent,
 #endif
       accessible = new nsXULMenupopupAccessible(aContent, aWeakShell);
       break;
+
     }
     case nsIAccessibleProvider::XULMenuSeparator:
       accessible = new nsXULMenuSeparatorAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULPane:
       accessible = new nsEnumRoleAccessible(aContent, aWeakShell,
                                             nsIAccessibleRole::ROLE_PANE);
       break;
+
     case nsIAccessibleProvider::XULProgressMeter:
       accessible = new nsXULProgressMeterAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULStatusBar:
       accessible = new nsXULStatusBarAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULScale:
       accessible = new nsXULSliderAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULRadioButton:
       accessible = new nsXULRadioButtonAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULRadioGroup:
       accessible = new nsXULRadioGroupAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULTab:
       accessible = new nsXULTabAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULTabs:
       accessible = new nsXULTabsAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULTabpanels:
       accessible = new nsXULTabpanelsAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULText:
       accessible = new nsXULTextAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULTextBox:
       accessible = new nsXULTextFieldAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULThumb:
       accessible = new nsXULThumbAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULTree:
       return CreateAccessibleForXULTree(aContent, aWeakShell);
 
     case nsIAccessibleProvider::XULTreeColumns:
       accessible = new nsXULTreeColumnsAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULTreeColumnItem:
       accessible = new nsXULColumnItemAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULToolbar:
       accessible = new nsXULToolbarAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULToolbarSeparator:
       accessible = new nsXULToolbarSeparatorAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULTooltip:
       accessible = new nsXULTooltipAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XULToolbarButton:
       accessible = new nsXULToolbarButtonAccessible(aContent, aWeakShell);
       break;
+
 #endif // MOZ_XUL
 
 #ifndef DISABLE_XFORMS_HOOKS
@@ -1838,45 +1548,59 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent *aContent,
     case nsIAccessibleProvider::XFormsLabel:
       accessible = new nsXFormsLabelAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsOutput:
       accessible = new nsXFormsOutputAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsTrigger:
       accessible = new nsXFormsTriggerAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsInput:
       accessible = new nsXFormsInputAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsInputBoolean:
       accessible = new nsXFormsInputBooleanAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsInputDate:
       accessible = new nsXFormsInputDateAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsSecret:
       accessible = new nsXFormsSecretAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsSliderRange:
       accessible = new nsXFormsRangeAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsSelect:
       accessible = new nsXFormsSelectAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsChoices:
       accessible = new nsXFormsChoicesAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsSelectFull:
       accessible = new nsXFormsSelectFullAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsItemCheckgroup:
       accessible = new nsXFormsItemCheckgroupAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsItemRadiogroup:
       accessible = new nsXFormsItemRadiogroupAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsSelectCombobox:
       accessible = new nsXFormsSelectComboboxAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsItemCombobox:
       accessible = new nsXFormsItemComboboxAccessible(aContent, aWeakShell);
       break;
@@ -1884,21 +1608,122 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent *aContent,
     case nsIAccessibleProvider::XFormsDropmarkerWidget:
       accessible = new nsXFormsDropmarkerWidgetAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsCalendarWidget:
       accessible = new nsXFormsCalendarWidgetAccessible(aContent, aWeakShell);
       break;
+
     case nsIAccessibleProvider::XFormsComboboxPopupWidget:
       accessible = new nsXFormsComboboxPopupWidgetAccessible(aContent, aWeakShell);
       break;
+
 #endif
 
     default:
       return nsnull;
   }
 
-  return accessible.forget();
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 
+already_AddRefed<nsAccessible>
+nsAccessibilityService::CreateHTMLAccessibleByMarkup(nsIFrame* aFrame,
+                                                     nsIContent* aContent,
+                                                     nsIWeakReference* aWeakShell)
+{
+  // This method assumes we're in an HTML namespace.
+  nsIAtom *tag = aContent->Tag();
+  if (tag == nsAccessibilityAtoms::legend) {
+    nsAccessible* accessible = new nsHTMLLegendAccessible(aContent, aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  if (tag == nsAccessibilityAtoms::option) {
+    nsAccessible* accessible = new nsHTMLSelectOptionAccessible(aContent,
+                                                                aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  if (tag == nsAccessibilityAtoms::optgroup) {
+    nsAccessible* accessible = new nsHTMLSelectOptGroupAccessible(aContent,
+                                                                  aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  if (tag == nsAccessibilityAtoms::ul || tag == nsAccessibilityAtoms::ol ||
+      tag == nsAccessibilityAtoms::dl) {
+    nsAccessible* accessible = new nsHTMLListAccessible(aContent, aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  if (tag == nsAccessibilityAtoms::a) {
+    // Only some roles truly enjoy life as nsHTMLLinkAccessibles, for details
+    // see closed bug 494807.
+    nsRoleMapEntry *roleMapEntry = nsAccUtils::GetRoleMapEntry(aContent);
+    if (roleMapEntry && roleMapEntry->role != nsIAccessibleRole::ROLE_NOTHING &&
+        roleMapEntry->role != nsIAccessibleRole::ROLE_LINK) {
+      nsAccessible* accessible = new nsHyperTextAccessibleWrap(aContent,
+                                                               aWeakShell);
+      NS_IF_ADDREF(accessible);
+      return accessible;
+    }
+
+    nsAccessible* accessible = new nsHTMLLinkAccessible(aContent, aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  if (tag == nsAccessibilityAtoms::dt ||
+      (tag == nsAccessibilityAtoms::li &&
+       aFrame->GetType() != nsAccessibilityAtoms::blockFrame)) {
+    // Normally for li, it is created by the list item frame (in nsBlockFrame)
+    // which knows about the bullet frame; however, in this case the list item
+    // must have been styled using display: foo
+    nsAccessible* accessible = new nsHTMLLIAccessible(aContent, aWeakShell,
+                                                      EmptyString());
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  if (tag == nsAccessibilityAtoms::abbr ||
+      tag == nsAccessibilityAtoms::acronym ||
+      tag == nsAccessibilityAtoms::blockquote ||
+      tag == nsAccessibilityAtoms::dd ||
+      tag == nsAccessibilityAtoms::form ||
+      tag == nsAccessibilityAtoms::h1 ||
+      tag == nsAccessibilityAtoms::h2 ||
+      tag == nsAccessibilityAtoms::h3 ||
+      tag == nsAccessibilityAtoms::h4 ||
+      tag == nsAccessibilityAtoms::h5 ||
+      tag == nsAccessibilityAtoms::h6 ||
+      tag == nsAccessibilityAtoms::q) {
+    nsAccessible* accessible = new nsHyperTextAccessibleWrap(aContent, aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  if (tag == nsAccessibilityAtoms::tr) {
+    nsAccessible* accessible = new nsEnumRoleAccessible(aContent, aWeakShell,
+                                                        nsIAccessibleRole::ROLE_ROW);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  if (nsCoreUtils::IsHTMLTableHeader(aContent)) {
+    nsAccessible* accessible = new nsHTMLTableHeaderCellAccessibleWrap(aContent,
+                                                                       aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  return nsnull;
+ }
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessibilityService (DON'T put methods here)
 
@@ -1995,11 +1820,9 @@ NS_GetAccessibilityService(nsIAccessibilityService** aResult)
 
 already_AddRefed<nsAccessible>
 nsAccessibilityService::CreateAccessibleForDeckChild(nsIFrame* aFrame,
-                                                     nsIContent *aContent,
-                                                     nsIWeakReference *aWeakShell)
+                                                     nsIContent* aContent,
+                                                     nsIWeakReference* aWeakShell)
 {
-  nsRefPtr<nsAccessible> accessible;
-
   if (aFrame->GetType() == nsAccessibilityAtoms::boxFrame ||
       aFrame->GetType() == nsAccessibilityAtoms::scrollFrame) {
 
@@ -2011,22 +1834,26 @@ nsAccessibilityService::CreateAccessibleForDeckChild(nsIFrame* aFrame,
 #ifdef MOZ_XUL
       if (parentContent->NodeInfo()->Equals(nsAccessibilityAtoms::tabpanels,
                                             kNameSpaceID_XUL)) {
-        accessible = new nsXULTabpanelAccessible(aContent, aWeakShell);
-      } else
+        nsAccessible* accessible = new nsXULTabpanelAccessible(aContent,
+                                                               aWeakShell);
+        NS_IF_ADDREF(accessible);
+        return accessible;
+      }
 #endif
-        accessible =
-          new nsEnumRoleAccessible(aContent, aWeakShell,
-                                   nsIAccessibleRole::ROLE_PROPERTYPAGE);
+      nsAccessible* accessible = new nsEnumRoleAccessible(aContent, aWeakShell,
+                                                          nsIAccessibleRole::ROLE_PROPERTYPAGE);
+      NS_IF_ADDREF(accessible);
+      return accessible;
     }
   }
 
-  return accessible.forget();
+  return nsnull;
 }
 
 #ifdef MOZ_XUL
 already_AddRefed<nsAccessible>
-nsAccessibilityService::CreateAccessibleForXULTree(nsIContent *aContent,
-                                                   nsIWeakReference *aWeakShell)
+nsAccessibilityService::CreateAccessibleForXULTree(nsIContent* aContent,
+                                                   nsIWeakReference* aWeakShell)
 {
   nsCOMPtr<nsITreeBoxObject> treeBoxObj = nsCoreUtils::GetTreeBoxObject(aContent);
   if (!treeBoxObj)
@@ -2037,15 +1864,19 @@ nsAccessibilityService::CreateAccessibleForXULTree(nsIContent *aContent,
   if (!treeColumns)
     return nsnull;
 
-  nsRefPtr<nsAccessible> accessible;
-
   PRInt32 count = 0;
   treeColumns->GetCount(&count);
-  if (count == 1) // outline of list accessible
-    accessible = new nsXULTreeAccessible(aContent, aWeakShell);
-  else // table or tree table accessible
-    accessible = new nsXULTreeGridAccessibleWrap(aContent, aWeakShell);
 
-  return accessible.forget();
+  // Outline of list accessible.
+  if (count == 1) {
+    nsAccessible* accessible = new nsXULTreeAccessible(aContent, aWeakShell);
+    NS_IF_ADDREF(accessible);
+    return accessible;
+  }
+
+  // Table or tree table accessible.
+  nsAccessible* accessible = new nsXULTreeGridAccessibleWrap(aContent, aWeakShell);
+  NS_IF_ADDREF(accessible);
+  return accessible;
 }
 #endif
diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h
index f4683055924d..48c080693787 100644
--- a/accessible/src/base/nsAccessibilityService.h
+++ b/accessible/src/base/nsAccessibilityService.h
@@ -58,61 +58,53 @@ public:
   NS_DECL_NSIOBSERVER
 
   // nsIAccessibilityService
-  virtual nsAccessible* GetAccessibleInShell(nsIDOMNode *aNode,
-                                             nsIPresShell *aPresShell);
+  virtual nsAccessible* GetAccessibleInShell(nsINode* aNode,
+                                             nsIPresShell* aPresShell);
 
-  virtual nsresult CreateOuterDocAccessible(nsIDOMNode *aNode,
-                                            nsIAccessible **aAccessible);
-  virtual nsresult CreateHTML4ButtonAccessible(nsIFrame *aFrame,
-                                               nsIAccessible **aAccessible);
-  virtual nsresult CreateHyperTextAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLBRAccessible(nsIFrame *aFrame,
-                                          nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLButtonAccessible(nsIFrame *aFrame,
-                                              nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLLIAccessible(nsIFrame *aFrame,
-                                          nsIFrame *aBulletFrame,
-                                          const nsAString& aBulletText,
-                                          nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLCheckboxAccessible(nsIFrame *aFrame,
-                                                nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLComboboxAccessible(nsIDOMNode *aNode,
-                                                nsIWeakReference *aPresShell,
-                                                nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLGenericAccessible(nsIFrame *aFrame,
-                                               nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLGroupboxAccessible(nsIFrame *aFrame,
-                                                nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLHRAccessible(nsIFrame *aFrame,
-                                          nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLImageAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLLabelAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLListboxAccessible(nsIDOMNode *aNode,
-                                               nsIWeakReference *aPresShell,
-                                               nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLMediaAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame,
-                                                   nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLRadioButtonAccessible(nsIFrame *aFrame,
-                                                   nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLSelectOptionAccessible(nsIDOMNode *aNode,
-                                                    nsIAccessible *aAccParent,
-                                                    nsIWeakReference *aPresShell,
-                                                    nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLTableAccessible(nsIFrame *aFrame,
-                                             nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLTableCellAccessible(nsIFrame *aFrame,
-                                                 nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLTextAccessible(nsIFrame *aFrame,
-                                            nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLTextFieldAccessible(nsIFrame *aFrame,
-                                                 nsIAccessible **aAccessible);
-  virtual nsresult CreateHTMLCaptionAccessible(nsIFrame *aFrame,
-                                               nsIAccessible **aAccessible);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLBRAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTML4ButtonAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLButtonAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLCaptionAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLCheckboxAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLComboboxAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLGroupboxAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLHRAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLImageAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLLabelAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLLIAccessible(nsIContent* aContent, nsIPresShell* aPresShell,
+                           const nsAString& aBulletText);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLListboxAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLMediaAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLObjectFrameAccessible(nsObjectFrame* aFrame, nsIContent* aContent,
+                                    nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLRadioButtonAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLTableAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLTableCellAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLTextAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHTMLTextFieldAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateHyperTextAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
+  virtual already_AddRefed<nsAccessible>
+    CreateOuterDocAccessible(nsIContent* aContent, nsIPresShell* aPresShell);
 
   virtual nsAccessible* AddNativeRootAccessible(void* aAtkAccessible);
   virtual void RemoveNativeRootAccessible(nsAccessible* aRootAccessible);
@@ -239,52 +231,39 @@ private:
    */
   void Shutdown();
 
-  /**
-   * Return presentation shell, DOM node for the given frame.
-   *
-   * @param aFrame    [in] the given frame
-   * @param aShell    [out] presentation shell for DOM node associated with the
-   *                    given frame
-   * @param aContent  [out] DOM node associated with the given frame
-   */
-  nsresult GetInfo(nsIFrame *aFrame, nsIWeakReference **aShell,
-                   nsIContent **aContent);
-
   /**
    * Return accessible for HTML area element associated with an image map.
    */
-  already_AddRefed<nsAccessible>
-    GetAreaAccessible(nsIFrame *aImageFrame, nsINode *aAreaNode,
-                      nsIWeakReference *aWeakShell);
+  nsAccessible* GetAreaAccessible(nsIFrame* aImageFrame, nsINode* aAreaNode,
+                                  nsIWeakReference* aWeakShell);
 
   /**
    * Create accessible for the element implementing nsIAccessibleProvider
    * interface.
    */
   already_AddRefed<nsAccessible>
-    CreateAccessibleByType(nsIContent *aContent, nsIWeakReference *aWeakShell);
+    CreateAccessibleByType(nsIContent* aContent, nsIWeakReference* aWeakShell);
 
   /**
    * Create accessible for HTML node by tag name.
    */
   already_AddRefed<nsAccessible>
-    CreateHTMLAccessibleByMarkup(nsIFrame *aFrame, nsIWeakReference *aWeakShell,
-                                 nsINode *aNode);
+    CreateHTMLAccessibleByMarkup(nsIFrame* aFrame, nsIContent* aContent,
+                                 nsIWeakReference* aWeakShell);
 
   /**
    * Create accessible if parent is a deck frame.
    */
   already_AddRefed<nsAccessible>
-    CreateAccessibleForDeckChild(nsIFrame *aFrame, nsIContent *aContent,
-                                 nsIWeakReference *aWeakShell);
+    CreateAccessibleForDeckChild(nsIFrame* aFrame, nsIContent* aContent,
+                                 nsIWeakReference* aWeakShell);
 
 #ifdef MOZ_XUL
   /**
    * Create accessible for XUL tree element.
    */
   already_AddRefed<nsAccessible>
-    CreateAccessibleForXULTree(nsIContent *aContent,
-                               nsIWeakReference *aWeakShell);
+    CreateAccessibleForXULTree(nsIContent* aContent, nsIWeakReference* aWeakShell);
 #endif
 
   /**
@@ -328,7 +307,7 @@ static const char kRoleNames[][20] = {
   "nothing",             //ROLE_NOTHING
   "titlebar",            //ROLE_TITLEBAR
   "menubar",             //ROLE_MENUBAR
-  "scrollbar",           //ROLE_SCROLLBAR 
+  "scrollbar",           //ROLE_SCROLLBAR
   "grip",                //ROLE_GRIP
   "sound",               //ROLE_SOUND
   "cursor",              //ROLE_CURSOR
@@ -445,7 +424,7 @@ static const char kRoleNames[][20] = {
   "listbox option",      //ROLE_OPTION
   "listbox rich option", //ROLE_RICH_OPTION
   "listbox",             //ROLE_LISTBOX
-  "flat equation",       //ROLE_FLAT_EQUATION  
+  "flat equation",       //ROLE_FLAT_EQUATION
   "gridcell",            //ROLE_GRID_CELL
   "embedded object"      //ROLE_EMBEDDED_OBJECT
 };
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index a56e4692b7d5..73c7e3ab8c03 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -6566,10 +6566,7 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsIView *aView,
         return NS_OK;
       }
 
-      nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(mDocument));
-      NS_ASSERTION(domNode, "No dom node for doc");
-
-      accEvent->mAccessible = accService->GetAccessibleInShell(domNode, this);
+      accEvent->mAccessible = accService->GetAccessibleInShell(mDocument, this);
 
       // Ensure this is set in case a11y was activated before any
       // nsPresShells existed to observe "a11y-init-or-shutdown" topic
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 2d4d1c347d95..24ba6159650a 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -300,17 +300,17 @@ NS_QUERYFRAME_HEAD(nsComboboxControlFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsComboboxControlFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsComboboxControlFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    nsCOMPtr<nsIDOMNode> node = do_QueryInterface(mContent);
-    nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(PresContext()->PresShell()));
-    return accService->CreateHTMLComboboxAccessible(node, weakShell, aAccessible);
+    return accService->CreateHTMLComboboxAccessible(mContent,
+                                                    PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/forms/nsComboboxControlFrame.h b/layout/forms/nsComboboxControlFrame.h
index fbb34ff712b1..31e5c7103139 100644
--- a/layout/forms/nsComboboxControlFrame.h
+++ b/layout/forms/nsComboboxControlFrame.h
@@ -103,7 +103,7 @@ public:
   virtual nsIFrame* CreateFrameFor(nsIContent* aContent);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   virtual nscoord GetMinWidth(nsIRenderingContext *aRenderingContext);
diff --git a/layout/forms/nsFieldSetFrame.cpp b/layout/forms/nsFieldSetFrame.cpp
index 0dbc8796d0c7..6f3f674bcd15 100644
--- a/layout/forms/nsFieldSetFrame.cpp
+++ b/layout/forms/nsFieldSetFrame.cpp
@@ -108,7 +108,7 @@ public:
   virtual PRBool IsContainingBlock() const;
 
 #ifdef ACCESSIBILITY  
-  NS_IMETHOD  GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
 #ifdef DEBUG
@@ -649,15 +649,17 @@ nsFieldSetFrame::RemoveFrame(nsIAtom*       aListName,
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsFieldSetFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsFieldSetFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLGroupboxAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLGroupboxAccessible(mContent,
+                                                    PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index c292d6ecfedd..80c7de7cd1f4 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -842,14 +842,16 @@ nsFileControlFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsFileControlFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsFileControlFrame::CreateAccessible()
 {
   // Accessible object exists just to hold onto its children, for later shutdown
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
   if (!accService)
-    return NS_ERROR_FAILURE;
+    return nsnull;
 
-  return accService->CreateHTMLGenericAccessible(static_cast<nsIFrame*>(this), aAccessible);
+  return accService->CreateHyperTextAccessible(mContent,
+                                               PresContext()->PresShell());
 }
 #endif
 
diff --git a/layout/forms/nsFileControlFrame.h b/layout/forms/nsFileControlFrame.h
index 63a02543ccf5..1b0aec18e53f 100644
--- a/layout/forms/nsFileControlFrame.h
+++ b/layout/forms/nsFileControlFrame.h
@@ -95,7 +95,7 @@ public:
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   // create and destroy the static UploadLastDir object for remembering
diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp
index 146f7803d1cb..6b9b9c8058c2 100644
--- a/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/layout/forms/nsGfxButtonControlFrame.cpp
@@ -181,19 +181,6 @@ nsGfxButtonControlFrame::GetFormProperty(nsIAtom* aName, nsAString& aValue) cons
   return rv;
 }
 
-#ifdef ACCESSIBILITY
-NS_IMETHODIMP nsGfxButtonControlFrame::GetAccessible(nsIAccessible** aAccessible)
-{
-  nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
-
-  if (accService) {
-    return accService->CreateHTMLButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
-  }
-
-  return NS_ERROR_FAILURE;
-}
-#endif
-
 NS_QUERYFRAME_HEAD(nsGfxButtonControlFrame)
   NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
 NS_QUERYFRAME_TAIL_INHERITING(nsHTMLButtonControlFrame)
diff --git a/layout/forms/nsGfxButtonControlFrame.h b/layout/forms/nsGfxButtonControlFrame.h
index b039cab2f127..52d6de899f96 100644
--- a/layout/forms/nsGfxButtonControlFrame.h
+++ b/layout/forms/nsGfxButtonControlFrame.h
@@ -66,11 +66,6 @@ public:
                          nsGUIEvent* aEvent,
                          nsEventStatus* aEventStatus);
 
- 
-#ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
-#endif
-
   virtual nsIAtom* GetType() const;
 
 #ifdef DEBUG
diff --git a/layout/forms/nsGfxCheckboxControlFrame.cpp b/layout/forms/nsGfxCheckboxControlFrame.cpp
index a2247e586af6..813ad8a568e5 100644
--- a/layout/forms/nsGfxCheckboxControlFrame.cpp
+++ b/layout/forms/nsGfxCheckboxControlFrame.cpp
@@ -120,18 +120,18 @@ nsGfxCheckboxControlFrame::~nsGfxCheckboxControlFrame()
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP
-nsGfxCheckboxControlFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsGfxCheckboxControlFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService
     = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLCheckboxAccessible(
-      static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLCheckboxAccessible(mContent,
+                                                    PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/forms/nsGfxCheckboxControlFrame.h b/layout/forms/nsGfxCheckboxControlFrame.h
index 2727b5a8cad5..2a2eacf94a1e 100644
--- a/layout/forms/nsGfxCheckboxControlFrame.h
+++ b/layout/forms/nsGfxCheckboxControlFrame.h
@@ -62,7 +62,7 @@ public:
                               const nsDisplayListSet& aLists);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
 protected:
diff --git a/layout/forms/nsGfxRadioControlFrame.cpp b/layout/forms/nsGfxRadioControlFrame.cpp
index 4cd0ea05afef..75d7c10f6753 100644
--- a/layout/forms/nsGfxRadioControlFrame.cpp
+++ b/layout/forms/nsGfxRadioControlFrame.cpp
@@ -65,18 +65,18 @@ nsGfxRadioControlFrame::~nsGfxRadioControlFrame()
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP
-nsGfxRadioControlFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsGfxRadioControlFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService
     = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLRadioButtonAccessible(
-      static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLRadioButtonAccessible(mContent,
+                                                       PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/forms/nsGfxRadioControlFrame.h b/layout/forms/nsGfxRadioControlFrame.h
index 011131ef11e5..8863f9347d33 100644
--- a/layout/forms/nsGfxRadioControlFrame.h
+++ b/layout/forms/nsGfxRadioControlFrame.h
@@ -55,7 +55,7 @@ public:
   NS_DECL_FRAMEARENA_HELPERS
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,
diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp
index 829ef8f0bc8b..cd41c5c998c2 100644
--- a/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -110,21 +110,18 @@ NS_QUERYFRAME_HEAD(nsHTMLButtonControlFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsHTMLContainerFrame)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsHTMLButtonControlFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsHTMLButtonControlFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    nsIContent* content = GetContent();
-    nsCOMPtr<nsIDOMHTMLButtonElement> buttonElement(do_QueryInterface(content));
-    if (buttonElement) //If turned XBL-base form control off, the frame contains HTML 4 button
-      return accService->CreateHTML4ButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
-    nsCOMPtr<nsIDOMHTMLInputElement> inputElement(do_QueryInterface(content));
-    if (inputElement) //If turned XBL-base form control on, the frame contains normal HTML button
-      return accService->CreateHTMLButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return IsInput() ?
+      accService->CreateHTMLButtonAccessible(mContent, PresContext()->PresShell()) :
+      accService->CreateHTML4ButtonAccessible(mContent, PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/forms/nsHTMLButtonControlFrame.h b/layout/forms/nsHTMLButtonControlFrame.h
index 2308be62ab90..511c0dae7ab7 100644
--- a/layout/forms/nsHTMLButtonControlFrame.h
+++ b/layout/forms/nsHTMLButtonControlFrame.h
@@ -104,7 +104,7 @@ public:
                          nsIFrame*       aOldFrame);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   virtual nsIAtom* GetType() const;
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp
index c5943ff37452..9dd5520ba372 100644
--- a/layout/forms/nsImageControlFrame.cpp
+++ b/layout/forms/nsImageControlFrame.cpp
@@ -96,7 +96,7 @@ public:
   virtual nsIAtom* GetType() const;
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
 #ifdef DEBUG
@@ -164,20 +164,21 @@ NS_QUERYFRAME_HEAD(nsImageControlFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsImageControlFrameSuper)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsImageControlFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsImageControlFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
     if (mContent->Tag() == nsGkAtoms::button) {
-      return accService->CreateHTML4ButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
+      return accService->CreateHTML4ButtonAccessible(mContent, PresContext()->PresShell());
     }
     else if (mContent->Tag() == nsGkAtoms::input) {
-      return accService->CreateHTMLButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
+      return accService->CreateHTMLButtonAccessible(mContent, PresContext()->PresShell());
     }
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index 378b8e637a0c..269699d10d61 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -403,17 +403,17 @@ NS_QUERYFRAME_HEAD(nsListControlFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsHTMLScrollFrame)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsListControlFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsListControlFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    nsCOMPtr<nsIDOMNode> node = do_QueryInterface(mContent);
-    nsCOMPtr<nsIWeakReference> weakShell(do_GetWeakReference(PresContext()->PresShell()));
-    return accService->CreateHTMLListboxAccessible(node, weakShell, aAccessible);
+    return accService->CreateHTMLListboxAccessible(mContent,
+                                                   PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/forms/nsListControlFrame.h b/layout/forms/nsListControlFrame.h
index dc984d4ef006..c6548ea95878 100644
--- a/layout/forms/nsListControlFrame.h
+++ b/layout/forms/nsListControlFrame.h
@@ -144,7 +144,7 @@ public:
 
     // for accessibility purposes
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
     // nsHTMLContainerFrame
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 0247e419634a..cb1bd93b9330 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -142,15 +142,17 @@ NS_QUERYFRAME_HEAD(nsTextControlFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsTextControlFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsTextControlFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLTextFieldAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLTextFieldAccessible(mContent,
+                                                     PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h
index fc5d789ce966..00bfe5ebcbe7 100644
--- a/layout/forms/nsTextControlFrame.h
+++ b/layout/forms/nsTextControlFrame.h
@@ -97,7 +97,7 @@ public:
   virtual PRBool IsLeaf() const;
   
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
 #ifdef NS_DEBUG
diff --git a/layout/generic/nsBRFrame.cpp b/layout/generic/nsBRFrame.cpp
index 20ec4457ea7a..269ed745177e 100644
--- a/layout/generic/nsBRFrame.cpp
+++ b/layout/generic/nsBRFrame.cpp
@@ -50,7 +50,6 @@
 
 #ifdef ACCESSIBILITY
 #include "nsIServiceManager.h"
-#include "nsIAccessible.h"
 #include "nsIAccessibilityService.h"
 #endif
 
@@ -90,8 +89,8 @@ public:
                                              nsIFrame::eLineParticipant));
   }
 
-#ifdef ACCESSIBILITY  
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+#ifdef ACCESSIBILITY
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
 protected:
@@ -269,20 +268,23 @@ BRFrame::PeekOffsetWord(PRBool aForward, PRBool aWordSelectEatSpace, PRBool aIsK
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP BRFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+BRFrame::CreateAccessible()
 {
-  NS_ENSURE_TRUE(mContent, NS_ERROR_FAILURE);
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
-  NS_ENSURE_TRUE(accService, NS_ERROR_FAILURE);
+  if (!accService) {
+    return nsnull;
+  }
   nsIContent *parent = mContent->GetParent();
   if (parent &&
       parent->IsRootOfNativeAnonymousSubtree() &&
       parent->GetChildCount() == 1) {
     // This <br> is the only node in a text control, therefore it is the hacky
     // "bogus node" used when there is no text in the control
-    return NS_ERROR_FAILURE;
+    return nsnull;
   }
-  return accService->CreateHTMLBRAccessible(this, aAccessible);
+  return accService->CreateHTMLBRAccessible(mContent,
+                                            PresContext()->PresShell());
 }
 #endif
 
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 251b4f882794..161758c25b59 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -6125,24 +6125,28 @@ nsBlockFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsBlockFrame::CreateAccessible()
 {
-  *aAccessible = nsnull;
   nsCOMPtr<nsIAccessibilityService> accService = 
     do_GetService("@mozilla.org/accessibilityService;1");
-  NS_ENSURE_TRUE(accService, NS_ERROR_FAILURE);
+  if (!accService) {
+    return nsnull;
+  }
+
+  nsPresContext* presContext = PresContext();
 
   // block frame may be for <hr>
   if (mContent->Tag() == nsGkAtoms::hr) {
-    return accService->CreateHTMLHRAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLHRAccessible(mContent,
+                                              presContext->PresShell());
   }
 
-  nsPresContext *aPresContext = PresContext();
-  if (!mBullet || !aPresContext) {
+  if (!mBullet || !presContext) {
     if (!mContent->GetParent()) {
       // Don't create accessible objects for the root content node, they are redundant with
       // the nsDocAccessible object created with the document node
-      return NS_ERROR_FAILURE;
+      return nsnull;
     }
     
     nsCOMPtr<nsIDOMHTMLDocument> htmlDoc =
@@ -6153,12 +6157,13 @@ NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible)
       if (SameCOMIdentity(body, mContent)) {
         // Don't create accessible objects for the body, they are redundant with
         // the nsDocAccessible object created with the document node
-        return NS_ERROR_FAILURE;
+        return nsnull;
       }
     }
 
     // Not a bullet, treat as normal HTML container
-    return accService->CreateHyperTextAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHyperTextAccessible(mContent,
+                                                 presContext->PresShell());
   }
 
   // Create special list bullet accessible
@@ -6174,10 +6179,8 @@ NS_IMETHODIMP nsBlockFrame::GetAccessible(nsIAccessible** aAccessible)
     mBullet->GetListItemText(*myList, bulletText);
   }
 
-  return accService->CreateHTMLLIAccessible(static_cast<nsIFrame*>(this), 
-                                            static_cast<nsIFrame*>(mBullet), 
-                                            bulletText,
-                                            aAccessible);
+  return accService->CreateHTMLLIAccessible(mContent, presContext->PresShell(),
+                                            bulletText);
 }
 #endif
 
diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h
index 52565d369888..97cbfa77c342 100644
--- a/layout/generic/nsBlockFrame.h
+++ b/layout/generic/nsBlockFrame.h
@@ -202,7 +202,7 @@ public:
 #endif
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   // line cursor methods to speed up searching for the line(s)
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 5b4cad31dbb6..b28d2dc8b722 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -5514,10 +5514,10 @@ nsFrame::ChildIsDirty(nsIFrame* aChild)
 
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP
-nsFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsFrame::CreateAccessible()
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h
index e00e27da00f1..51358da88fc4 100644
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -260,7 +260,7 @@ public:
   virtual void ChildIsDirty(nsIFrame* aChild);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD  GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   NS_IMETHOD GetParentStyleContextFrame(nsPresContext* aPresContext,
diff --git a/layout/generic/nsFrameFrame.cpp b/layout/generic/nsFrameFrame.cpp
index 895bdb68219b..aae1acec9804 100644
--- a/layout/generic/nsFrameFrame.cpp
+++ b/layout/generic/nsFrameFrame.cpp
@@ -175,7 +175,7 @@ public:
   virtual PRBool SupportsVisibilityHidden() { return PR_FALSE; }
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   // nsIFrameFrame
@@ -235,16 +235,13 @@ nsSubDocumentFrame::nsSubDocumentFrame(nsStyleContext* aContext)
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsSubDocumentFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsSubDocumentFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
-
-  if (accService) {
-    nsCOMPtr<nsIDOMNode> node = do_QueryInterface(mContent);
-    return accService->CreateOuterDocAccessible(node, aAccessible);
-  }
-
-  return NS_ERROR_FAILURE;
+  return accService ?
+    accService->CreateOuterDocAccessible(mContent, PresContext()->PresShell()) :
+    nsnull;
 }
 #endif
 
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 41092aef192f..8b47eca638ab 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -884,20 +884,21 @@ nsHTMLScrollFrame::GetFrameName(nsAString& aResult) const
 #endif
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsHTMLScrollFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsHTMLScrollFrame::CreateAccessible()
 {
-  *aAccessible = nsnull;
   if (!IsFocusable()) {
-    return NS_OK;
+    return nsnull;
   }
   // Focusable via CSS, so needs to be in accessibility hierarchy
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLGenericAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHyperTextAccessible(mContent,
+                                                 PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index 598bed4d4f1c..861c2542d17d 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -467,7 +467,7 @@ public:
   PRBool DidHistoryRestore() { return mInner.mDidHistoryRestore; }
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
 protected:
diff --git a/layout/generic/nsHTMLCanvasFrame.cpp b/layout/generic/nsHTMLCanvasFrame.cpp
index 44b12297422c..1c502739ec51 100644
--- a/layout/generic/nsHTMLCanvasFrame.cpp
+++ b/layout/generic/nsHTMLCanvasFrame.cpp
@@ -312,10 +312,10 @@ nsHTMLCanvasFrame::GetContinuationOffset(nscoord* aWidth) const
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP
-nsHTMLCanvasFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsHTMLCanvasFrame::CreateAccessible()
 {
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/generic/nsHTMLCanvasFrame.h b/layout/generic/nsHTMLCanvasFrame.h
index 6c0dd7ec206c..9b4970509079 100644
--- a/layout/generic/nsHTMLCanvasFrame.h
+++ b/layout/generic/nsHTMLCanvasFrame.h
@@ -88,7 +88,7 @@ public:
   nsRect GetInnerArea() const;
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   virtual nsIAtom* GetType() const;
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 64465c41b9d4..335668edbf31 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -90,7 +90,7 @@ class nsBoxLayoutState;
 class nsIBoxLayout;
 class nsILineIterator;
 #ifdef ACCESSIBILITY
-class nsIAccessible;
+class nsAccessible;
 #endif
 class nsDisplayListBuilder;
 class nsDisplayListSet;
@@ -2061,7 +2061,7 @@ public:
    * Use a mediatior of some kind.
    */
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible) = 0;
+  virtual already_AddRefed<nsAccessible> CreateAccessible() = 0;
 #endif
 
   /**
diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp
index 22bec7d17e05..2670d6c2b406 100644
--- a/layout/generic/nsImageFrame.cpp
+++ b/layout/generic/nsImageFrame.cpp
@@ -183,15 +183,17 @@ NS_QUERYFRAME_HEAD(nsImageFrame)
 NS_QUERYFRAME_TAIL_INHERITING(ImageFrameSuper)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsImageFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsImageFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLImageAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLImageAccessible(mContent,
+                                                 PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/generic/nsImageFrame.h b/layout/generic/nsImageFrame.h
index 9562d3c4f644..497e746a0e3d 100644
--- a/layout/generic/nsImageFrame.h
+++ b/layout/generic/nsImageFrame.h
@@ -128,7 +128,7 @@ public:
                               PRInt32 aModType);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   virtual nsIAtom* GetType() const;
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 40b949462bdd..1e1d2efd3382 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -946,27 +946,30 @@ nsInlineFrame::GetSkipSides() const
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsInlineFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsInlineFrame::CreateAccessible()
 {
   // Broken image accessibles are created here, because layout
   // replaces the image or image control frame with an inline frame
-  *aAccessible = nsnull;
   nsIAtom *tagAtom = mContent->Tag();
   if ((tagAtom == nsGkAtoms::img || tagAtom == nsGkAtoms::input || 
        tagAtom == nsGkAtoms::label) && mContent->IsHTML()) {
     // Only get accessibility service if we're going to use it
     nsCOMPtr<nsIAccessibilityService> accService(do_GetService("@mozilla.org/accessibilityService;1"));
     if (!accService)
-      return NS_ERROR_FAILURE;
+      return nsnull;
     if (tagAtom == nsGkAtoms::input)  // Broken <input type=image ... />
-      return accService->CreateHTMLButtonAccessible(static_cast<nsIFrame*>(this), aAccessible);
+      return accService->CreateHTMLButtonAccessible(mContent,
+                                                    PresContext()->PresShell());
     else if (tagAtom == nsGkAtoms::img)  // Create accessible for broken <img>
-      return accService->CreateHTMLImageAccessible(static_cast<nsIFrame*>(this), aAccessible);
+      return accService->CreateHTMLImageAccessible(mContent,
+                                                   PresContext()->PresShell());
     else if (tagAtom == nsGkAtoms::label)  // Creat accessible for <label>
-      return accService->CreateHTMLLabelAccessible(static_cast<nsIFrame*>(this), aAccessible);
+      return accService->CreateHTMLLabelAccessible(mContent,
+                                                   PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h
index bc80e57fe411..15b2c42beb41 100644
--- a/layout/generic/nsInlineFrame.h
+++ b/layout/generic/nsInlineFrame.h
@@ -80,7 +80,7 @@ public:
                               const nsDisplayListSet& aLists);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHODIMP GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
 #ifdef DEBUG
diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 075700cc357c..be6dcd5c8563 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -581,15 +581,14 @@ NS_QUERYFRAME_HEAD(nsObjectFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsObjectFrameSuper)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsObjectFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsObjectFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
-
-  if (accService) {
-    return accService->CreateHTMLObjectFrameAccessible(this, aAccessible);
-  }
-
-  return NS_ERROR_FAILURE;
+  return accService ?
+    accService->CreateHTMLObjectFrameAccessible(this, mContent,
+                                                PresContext()->PresShell()) :
+    nsnull;
 }
 
 #ifdef XP_WIN
diff --git a/layout/generic/nsObjectFrame.h b/layout/generic/nsObjectFrame.h
index f8849562613c..cb4bedac7213 100644
--- a/layout/generic/nsObjectFrame.h
+++ b/layout/generic/nsObjectFrame.h
@@ -149,7 +149,7 @@ public:
 
   // accessibility support
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #ifdef XP_WIN
   NS_IMETHOD GetPluginPort(HWND *aPort);
 #endif
diff --git a/layout/generic/nsPlaceholderFrame.h b/layout/generic/nsPlaceholderFrame.h
index 6d0fc3b08e6e..2fc3c1d618c1 100644
--- a/layout/generic/nsPlaceholderFrame.h
+++ b/layout/generic/nsPlaceholderFrame.h
@@ -166,11 +166,11 @@ public:
   virtual PRBool CanContinueTextRun() const;
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD  GetAccessible(nsIAccessible** aAccessible)
+  virtual already_AddRefed<nsAccessible> CreateAccessible()
   {
-    nsIFrame *realFrame = GetRealFrameForPlaceholder(this);
-    return realFrame ? realFrame->GetAccessible(aAccessible) :
-                       nsFrame::GetAccessible(aAccessible);
+    nsIFrame* realFrame = GetRealFrameForPlaceholder(this);
+    return realFrame ? realFrame->CreateAccessible() :
+                       nsFrame::CreateAccessible();
   }
 #endif
 
diff --git a/layout/generic/nsTextFrame.h b/layout/generic/nsTextFrame.h
index 958a2129f6a2..bc74251ceda8 100644
--- a/layout/generic/nsTextFrame.h
+++ b/layout/generic/nsTextFrame.h
@@ -216,7 +216,7 @@ public:
   }
   
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
   
   virtual void MarkIntrinsicWidthsDirty();
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index c32909e38aa5..40874348a209 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -104,7 +104,6 @@
 
 #include "nsIServiceManager.h"
 #ifdef ACCESSIBILITY
-#include "nsIAccessible.h"
 #include "nsIAccessibilityService.h"
 #endif
 #include "nsAutoPtr.h"
@@ -3388,22 +3387,24 @@ nsTextPaintStyle::GetResolvedForeColor(nscolor aColor,
 //-----------------------------------------------------------------------------
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsTextFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsTextFrame::CreateAccessible()
 {
   if (IsEmpty()) {
     nsAutoString renderedWhitespace;
     GetRenderedText(&renderedWhitespace, nsnull, nsnull, 0, 1);
     if (renderedWhitespace.IsEmpty()) {
-      return NS_ERROR_FAILURE;
+      return nsnull;
     }
   }
 
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLTextAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLTextAccessible(mContent,
+                                                PresContext()->PresShell());
   }
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp
index a130c5e0b0da..143e17f39515 100644
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -60,7 +60,6 @@
 
 #ifdef ACCESSIBILITY
 #include "nsIServiceManager.h"
-#include "nsIAccessible.h"
 #include "nsIAccessibilityService.h"
 #endif
 
@@ -419,15 +418,14 @@ nsVideoFrame::GetType() const
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP
-nsVideoFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsVideoFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService =
     do_GetService("@mozilla.org/accessibilityService;1");
-  NS_ENSURE_STATE(accService);
-
-  return accService->CreateHTMLMediaAccessible(static_cast<nsIFrame*>(this),
-                                               aAccessible);
+  return accService ?
+    accService->CreateHTMLMediaAccessible(mContent, PresContext()->PresShell()) :
+    nsnull;
 }
 #endif
 
diff --git a/layout/generic/nsVideoFrame.h b/layout/generic/nsVideoFrame.h
index 53e0fd17ae5a..e37439bbf743 100644
--- a/layout/generic/nsVideoFrame.h
+++ b/layout/generic/nsVideoFrame.h
@@ -92,7 +92,7 @@ public:
                     nsReflowStatus&          aStatus);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   virtual nsIAtom* GetType() const;
diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp
index ea9b03cc0e4c..48fcf95a8959 100644
--- a/layout/tables/nsTableCellFrame.cpp
+++ b/layout/tables/nsTableCellFrame.cpp
@@ -1000,15 +1000,17 @@ NS_QUERYFRAME_HEAD(nsTableCellFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsHTMLContainerFrame)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsTableCellFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsTableCellFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLTableCellAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLTableCellAccessible(mContent,
+                                                     PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/tables/nsTableCellFrame.h b/layout/tables/nsTableCellFrame.h
index 8becc4d689d4..dcd621825a16 100644
--- a/layout/tables/nsTableCellFrame.h
+++ b/layout/tables/nsTableCellFrame.h
@@ -86,7 +86,7 @@ public:
                   nsIFrame*        aPrevInFlow);
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   NS_IMETHOD  AttributeChanged(PRInt32         aNameSpaceID,
diff --git a/layout/tables/nsTableOuterFrame.cpp b/layout/tables/nsTableOuterFrame.cpp
index a6a092658633..0d3bb08418cb 100644
--- a/layout/tables/nsTableOuterFrame.cpp
+++ b/layout/tables/nsTableOuterFrame.cpp
@@ -146,17 +146,18 @@ nsTableCaptionFrame::GetParentStyleContextFrame(nsPresContext* aPresContext,
 }
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsTableCaptionFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsTableCaptionFrame::CreateAccessible()
 {
-  *aAccessible = nsnull;
   if (!GetRect().IsEmpty()) {
     nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
     if (accService) {
-      return accService->CreateHTMLCaptionAccessible(static_cast<nsIFrame*>(this), aAccessible);
+      return accService->CreateHTMLCaptionAccessible(mContent,
+                                                     PresContext()->PresShell());
     }
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
@@ -192,15 +193,17 @@ NS_QUERYFRAME_HEAD(nsTableOuterFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsHTMLContainerFrame)
 
 #ifdef ACCESSIBILITY
-NS_IMETHODIMP nsTableOuterFrame::GetAccessible(nsIAccessible** aAccessible)
+already_AddRefed<nsAccessible>
+nsTableOuterFrame::CreateAccessible()
 {
   nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1");
 
   if (accService) {
-    return accService->CreateHTMLTableAccessible(static_cast<nsIFrame*>(this), aAccessible);
+    return accService->CreateHTMLTableAccessible(mContent,
+                                                 PresContext()->PresShell());
   }
 
-  return NS_ERROR_FAILURE;
+  return nsnull;
 }
 #endif
 
diff --git a/layout/tables/nsTableOuterFrame.h b/layout/tables/nsTableOuterFrame.h
index 55bfdcbeef48..1da58f9585ec 100644
--- a/layout/tables/nsTableOuterFrame.h
+++ b/layout/tables/nsTableOuterFrame.h
@@ -63,7 +63,7 @@ public:
                                         nsIFrame**      aProviderFrame,
                                         PRBool*         aIsChild);
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
 #ifdef NS_DEBUG
@@ -126,7 +126,7 @@ public:
   }
 
 #ifdef ACCESSIBILITY
-  NS_IMETHOD GetAccessible(nsIAccessible** aAccessible);
+  virtual already_AddRefed<nsAccessible> CreateAccessible();
 #endif
 
   NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,

From f37b8fe23c1e35f3719fe3722cc58b3c9ef75bc6 Mon Sep 17 00:00:00 2001
From: Neil Rashbrook <neil@parkwaycc.co.uk>
Date: Mon, 28 Jun 2010 22:00:12 +0900
Subject: [PATCH 130/172] Bug 575109 - don't unnecessarily inherit from
 nsISupports (vtable bloat), r=surkov, davidb

---
 accessible/src/msaa/CAccessibleAction.cpp     | 10 ++--
 accessible/src/msaa/CAccessibleAction.h       |  6 ++-
 accessible/src/msaa/CAccessibleComponent.cpp  |  4 +-
 accessible/src/msaa/CAccessibleComponent.h    |  6 ++-
 .../src/msaa/CAccessibleEditableText.cpp      |  4 +-
 accessible/src/msaa/CAccessibleEditableText.h |  6 ++-
 accessible/src/msaa/CAccessibleHyperlink.cpp  | 12 ++---
 accessible/src/msaa/CAccessibleHyperlink.h    |  3 ++
 accessible/src/msaa/CAccessibleHypertext.cpp  |  4 +-
 accessible/src/msaa/CAccessibleImage.cpp      |  8 ++--
 accessible/src/msaa/CAccessibleImage.h        |  6 ++-
 accessible/src/msaa/CAccessibleTable.cpp      | 48 +++++++++----------
 accessible/src/msaa/CAccessibleTable.h        |  6 ++-
 accessible/src/msaa/CAccessibleTableCell.cpp  | 18 +++----
 accessible/src/msaa/CAccessibleTableCell.h    |  6 ++-
 accessible/src/msaa/CAccessibleText.cpp       |  4 +-
 accessible/src/msaa/CAccessibleText.h         |  6 ++-
 accessible/src/msaa/CAccessibleValue.cpp      | 10 ++--
 accessible/src/msaa/CAccessibleValue.h        |  6 ++-
 19 files changed, 96 insertions(+), 77 deletions(-)

diff --git a/accessible/src/msaa/CAccessibleAction.cpp b/accessible/src/msaa/CAccessibleAction.cpp
index ac50acf7ca6b..c79f7a8d3b4f 100644
--- a/accessible/src/msaa/CAccessibleAction.cpp
+++ b/accessible/src/msaa/CAccessibleAction.cpp
@@ -72,7 +72,7 @@ CAccessibleAction::nActions(long *aNumActions)
 __try {
   *aNumActions = 0;
 
-  nsCOMPtr<nsIAccessible> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessible> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -92,7 +92,7 @@ STDMETHODIMP
 CAccessibleAction::doAction(long aActionIndex)
 {
 __try {
-  nsCOMPtr<nsIAccessible> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessible> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -110,7 +110,7 @@ CAccessibleAction::get_description(long aActionIndex, BSTR *aDescription)
 __try {
   *aDescription = NULL;
 
-  nsCOMPtr<nsIAccessible> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessible> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -140,7 +140,7 @@ __try {
   *aKeyBinding = NULL;
   *aNumBinding = 0;
 
-  nsCOMPtr<nsIAccessible> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessible> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -197,7 +197,7 @@ CAccessibleAction::get_name(long aActionIndex, BSTR *aName)
 __try {
   *aName = NULL;
 
-  nsCOMPtr<nsIAccessible> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessible> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
diff --git a/accessible/src/msaa/CAccessibleAction.h b/accessible/src/msaa/CAccessibleAction.h
index 6dd771f22091..a874ceaf240c 100644
--- a/accessible/src/msaa/CAccessibleAction.h
+++ b/accessible/src/msaa/CAccessibleAction.h
@@ -45,8 +45,7 @@
 
 #include "AccessibleAction.h"
 
-class CAccessibleAction: public nsISupports,
-                         public IAccessibleAction
+class CAccessibleAction: public IAccessibleAction
 {
 public:
 
@@ -78,6 +77,9 @@ public:
       /* [in] */ long actionIndex,
       /* [retval][out] */ BSTR *localizedName);
 
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
+
 };
 
 
diff --git a/accessible/src/msaa/CAccessibleComponent.cpp b/accessible/src/msaa/CAccessibleComponent.cpp
index 32eeac1564a8..3e180c02bdf8 100644
--- a/accessible/src/msaa/CAccessibleComponent.cpp
+++ b/accessible/src/msaa/CAccessibleComponent.cpp
@@ -85,7 +85,7 @@ __try {
   *aX = 0;
   *aY = 0;
 
-  nsCOMPtr<nsIAccessible> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessible> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -160,7 +160,7 @@ CAccessibleComponent::GetARGBValueFromCSSProperty(const nsAString& aPropName,
 __try {
   *aColorValue = 0;
 
-  nsCOMPtr<nsIAccessNode> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessNode> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
diff --git a/accessible/src/msaa/CAccessibleComponent.h b/accessible/src/msaa/CAccessibleComponent.h
index 592c81f6061d..25e874ac023a 100644
--- a/accessible/src/msaa/CAccessibleComponent.h
+++ b/accessible/src/msaa/CAccessibleComponent.h
@@ -45,8 +45,7 @@
 
 #include "AccessibleComponent.h"
 
-class CAccessibleComponent: public nsISupports,
-                            public IAccessibleComponent
+class CAccessibleComponent: public IAccessibleComponent
 {
 public:
 
@@ -64,6 +63,9 @@ public:
   virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_background(
       /* [retval][out] */ IA2Color *background);
 
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
+
 protected:
 
   /**
diff --git a/accessible/src/msaa/CAccessibleEditableText.cpp b/accessible/src/msaa/CAccessibleEditableText.cpp
index 2a710011b90c..d30dc5c048e9 100644
--- a/accessible/src/msaa/CAccessibleEditableText.cpp
+++ b/accessible/src/msaa/CAccessibleEditableText.cpp
@@ -48,7 +48,7 @@
 #include "nsString.h"
 
 #define GET_NSIACCESSIBLEEDITABLETEXT \
-nsCOMPtr<nsIAccessibleEditableText> textAcc(do_QueryInterface(this));\
+nsCOMPtr<nsIAccessibleEditableText> textAcc(do_QueryObject(this));\
 NS_ASSERTION(textAcc,\
              "Subclass of CAccessibleEditableText doesn't implement nsIAccessibleEditableText");\
 if (!textAcc)\
@@ -62,7 +62,7 @@ CAccessibleEditableText::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleEditableText == iid) {
-    nsCOMPtr<nsIAccessibleEditableText> editTextAcc(do_QueryInterface(this));
+    nsCOMPtr<nsIAccessibleEditableText> editTextAcc(do_QueryObject(this));
     if (!editTextAcc)
       return E_NOINTERFACE;
     *ppv = static_cast<IAccessibleEditableText*>(this);
diff --git a/accessible/src/msaa/CAccessibleEditableText.h b/accessible/src/msaa/CAccessibleEditableText.h
index 27f412858b89..76987eafeeec 100644
--- a/accessible/src/msaa/CAccessibleEditableText.h
+++ b/accessible/src/msaa/CAccessibleEditableText.h
@@ -46,8 +46,7 @@
 
 #include "AccessibleEditableText.h"
 
-class CAccessibleEditableText: public nsISupports,
-                               public IAccessibleEditableText
+class CAccessibleEditableText: public IAccessibleEditableText
 {
 public:
 
@@ -83,6 +82,9 @@ public:
       /* [in] */ long startOffset,
       /* [in] */ long endOffset,
       /* [in] */ BSTR *attributes);
+
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
 };
 
 #endif
diff --git a/accessible/src/msaa/CAccessibleHyperlink.cpp b/accessible/src/msaa/CAccessibleHyperlink.cpp
index 55d129038218..59ed9bd6d4ad 100644
--- a/accessible/src/msaa/CAccessibleHyperlink.cpp
+++ b/accessible/src/msaa/CAccessibleHyperlink.cpp
@@ -62,7 +62,7 @@ CAccessibleHyperlink::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleHyperlink == iid) {
-    nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryInterface(this));
+    nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryObject(this));
     if (!acc)
       return E_NOINTERFACE;
 
@@ -82,7 +82,7 @@ CAccessibleHyperlink::get_anchor(long aIndex, VARIANT *aAnchor)
 __try {
   VariantInit(aAnchor);
 
-  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -115,7 +115,7 @@ CAccessibleHyperlink::get_anchorTarget(long aIndex, VARIANT *aAnchorTarget)
 __try {
   VariantInit(aAnchorTarget);
 
-  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -153,7 +153,7 @@ CAccessibleHyperlink::get_startIndex(long *aIndex)
 __try {
   *aIndex = 0;
 
-  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -175,7 +175,7 @@ CAccessibleHyperlink::get_endIndex(long *aIndex)
 __try {
   *aIndex = 0;
 
-  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -197,7 +197,7 @@ CAccessibleHyperlink::get_valid(boolean *aValid)
 __try {
   *aValid = false;
 
-  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleHyperLink> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
diff --git a/accessible/src/msaa/CAccessibleHyperlink.h b/accessible/src/msaa/CAccessibleHyperlink.h
index e7523478f56b..5b75d61dac97 100644
--- a/accessible/src/msaa/CAccessibleHyperlink.h
+++ b/accessible/src/msaa/CAccessibleHyperlink.h
@@ -74,6 +74,9 @@ public:
   virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_valid(
       /* [retval][out] */ boolean *valid);
 
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
+
 };
 
 #endif
diff --git a/accessible/src/msaa/CAccessibleHypertext.cpp b/accessible/src/msaa/CAccessibleHypertext.cpp
index eccd47894958..55fced183495 100644
--- a/accessible/src/msaa/CAccessibleHypertext.cpp
+++ b/accessible/src/msaa/CAccessibleHypertext.cpp
@@ -51,7 +51,7 @@ CAccessibleHypertext::QueryInterface(REFIID iid, void** ppv)
 {
   *ppv = NULL;
   if (IID_IAccessibleHypertext == iid) {
-    nsCOMPtr<nsIAccessibleHyperText> hyperAcc(do_QueryInterface(this));
+    nsCOMPtr<nsIAccessibleHyperText> hyperAcc(do_QueryObject(this));
     if (!hyperAcc)
       return E_NOINTERFACE;
 
@@ -117,7 +117,7 @@ CAccessibleHypertext::get_hyperlinkIndex(long aCharIndex, long *aHyperlinkIndex)
 __try {
   *aHyperlinkIndex = 0;
 
-  nsCOMPtr<nsIAccessibleHyperText> hyperAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleHyperText> hyperAcc(do_QueryObject(this));
   if (!hyperAcc)
     return E_FAIL;
 
diff --git a/accessible/src/msaa/CAccessibleImage.cpp b/accessible/src/msaa/CAccessibleImage.cpp
index 7a7cd0c581c0..a12b993acf36 100644
--- a/accessible/src/msaa/CAccessibleImage.cpp
+++ b/accessible/src/msaa/CAccessibleImage.cpp
@@ -58,7 +58,7 @@ CAccessibleImage::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleImage == iid) {
-    nsCOMPtr<nsIAccessibleImage> imageAcc(do_QueryInterface(this));
+    nsCOMPtr<nsIAccessibleImage> imageAcc(do_QueryObject(this));
     if (!imageAcc)
       return E_FAIL;
 
@@ -78,7 +78,7 @@ CAccessibleImage::get_description(BSTR *aDescription)
 __try {
   *aDescription = NULL;
 
-  nsCOMPtr<nsIAccessible> acc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessible> acc(do_QueryObject(this));
   if (!acc)
     return E_FAIL;
 
@@ -110,7 +110,7 @@ __try {
     nsIAccessibleCoordinateType::COORDTYPE_SCREEN_RELATIVE :
     nsIAccessibleCoordinateType::COORDTYPE_PARENT_RELATIVE;
 
-  nsCOMPtr<nsIAccessibleImage> imageAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleImage> imageAcc(do_QueryObject(this));
   if (!imageAcc)
     return E_FAIL;
 
@@ -135,7 +135,7 @@ __try {
   *aHeight = 0;
   *aWidth = 0;
 
-  nsCOMPtr<nsIAccessibleImage> imageAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleImage> imageAcc(do_QueryObject(this));
   if (!imageAcc)
     return E_FAIL;
 
diff --git a/accessible/src/msaa/CAccessibleImage.h b/accessible/src/msaa/CAccessibleImage.h
index 8a6c690c44c5..deda9327885f 100644
--- a/accessible/src/msaa/CAccessibleImage.h
+++ b/accessible/src/msaa/CAccessibleImage.h
@@ -45,8 +45,7 @@
 
 #include "AccessibleImage.h"
 
-class CAccessibleImage: public nsISupports,
-                        public IAccessibleImage
+class CAccessibleImage: public IAccessibleImage
 {
 public:
 
@@ -66,6 +65,9 @@ public:
       /* [out] */ long *height,
       /* [retval][out] */ long *width);
 
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
+
 };
 
 #endif
diff --git a/accessible/src/msaa/CAccessibleTable.cpp b/accessible/src/msaa/CAccessibleTable.cpp
index dee486c7fb2c..c98cb8db9139 100644
--- a/accessible/src/msaa/CAccessibleTable.cpp
+++ b/accessible/src/msaa/CAccessibleTable.cpp
@@ -88,7 +88,7 @@ CAccessibleTable::get_accessibleAt(long aRow, long aColumn,
 __try {
   *aAccessible = NULL;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -120,7 +120,7 @@ CAccessibleTable::get_caption(IUnknown **aAccessible)
 __try {
   *aAccessible = NULL;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -156,7 +156,7 @@ CAccessibleTable::get_childIndex(long aRowIndex, long aColumnIndex,
 __try {
   *aChildIndex = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -180,7 +180,7 @@ CAccessibleTable::get_columnDescription(long aColumn, BSTR *aDescription)
 __try {
   *aDescription = NULL;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -207,7 +207,7 @@ CAccessibleTable::get_columnExtentAt(long aRow, long aColumn,
 __try {
   *nColumnsSpanned = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -243,7 +243,7 @@ CAccessibleTable::get_columnIndex(long aChildIndex, long *aColumnIndex)
 __try {
   *aColumnIndex = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -267,7 +267,7 @@ CAccessibleTable::get_nColumns(long *aColumnCount)
 __try {
   *aColumnCount = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -291,7 +291,7 @@ CAccessibleTable::get_nRows(long *aRowCount)
 __try {
   *aRowCount = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -315,7 +315,7 @@ CAccessibleTable::get_nSelectedChildren(long *aChildCount)
 __try {
   *aChildCount = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -338,7 +338,7 @@ CAccessibleTable::get_nSelectedColumns(long *aColumnCount)
 __try {
   *aColumnCount = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -361,7 +361,7 @@ CAccessibleTable::get_nSelectedRows(long *aRowCount)
 __try {
   *aRowCount = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -384,7 +384,7 @@ CAccessibleTable::get_rowDescription(long aRow, BSTR *aDescription)
 __try {
   *aDescription = NULL;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -410,7 +410,7 @@ CAccessibleTable::get_rowExtentAt(long aRow, long aColumn, long *aNRowsSpanned)
 __try {
   *aNRowsSpanned = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -446,7 +446,7 @@ CAccessibleTable::get_rowIndex(long aChildIndex, long *aRowIndex)
 __try {
   *aRowIndex = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -520,7 +520,7 @@ CAccessibleTable::get_isColumnSelected(long aColumn, boolean *aIsSelected)
 __try {
   *aIsSelected = false;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -543,7 +543,7 @@ CAccessibleTable::get_isRowSelected(long aRow, boolean *aIsSelected)
 __try {
   *aIsSelected = false;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -566,7 +566,7 @@ CAccessibleTable::get_isSelected(long aRow, long aColumn, boolean *aIsSelected)
 __try {
   *aIsSelected = false;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -587,7 +587,7 @@ STDMETHODIMP
 CAccessibleTable::selectRow(long aRow)
 {
 __try {
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -603,7 +603,7 @@ STDMETHODIMP
 CAccessibleTable::selectColumn(long aColumn)
 {
 __try {
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -619,7 +619,7 @@ STDMETHODIMP
 CAccessibleTable::unselectRow(long aRow)
 {
 __try {
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -635,7 +635,7 @@ STDMETHODIMP
 CAccessibleTable::unselectColumn(long aColumn)
 {
 __try {
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -661,7 +661,7 @@ __try {
   *aColumnExtents = 0;
   *aIsSelected = false;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -730,7 +730,7 @@ STDMETHODIMP
 CAccessibleTable::get_selectedCells(IUnknown ***cells, long *nSelectedCells)
 {
 __try {
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
@@ -779,7 +779,7 @@ CAccessibleTable::GetSelectedItems(long **aItems, long *aItemsCount,
 {
   *aItemsCount = 0;
 
-  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
   NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
   if (!tableAcc)
     return E_FAIL;
diff --git a/accessible/src/msaa/CAccessibleTable.h b/accessible/src/msaa/CAccessibleTable.h
index 07176874e6ed..9f66e41851f6 100644
--- a/accessible/src/msaa/CAccessibleTable.h
+++ b/accessible/src/msaa/CAccessibleTable.h
@@ -46,8 +46,7 @@
 #include "AccessibleTable.h"
 #include "AccessibleTable2.h"
 
-class CAccessibleTable: public nsISupports,
-                        public IAccessibleTable,
+class CAccessibleTable: public IAccessibleTable,
                         public IAccessibleTable2
 {
 public:
@@ -195,6 +194,9 @@ public:
       /* [out, size_is(,*nRows)] */ long **selectedRows, 
       /* [out, retval] */ long *nRows);
 
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
+
 private:
   enum eItemsType {
     ITEMSTYPE_CELLS,
diff --git a/accessible/src/msaa/CAccessibleTableCell.cpp b/accessible/src/msaa/CAccessibleTableCell.cpp
index b3c96f1bba85..a2e0bd83cc3a 100644
--- a/accessible/src/msaa/CAccessibleTableCell.cpp
+++ b/accessible/src/msaa/CAccessibleTableCell.cpp
@@ -79,7 +79,7 @@ STDMETHODIMP
 CAccessibleTableCell::get_table(IUnknown **table)
 {
 __try {
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
@@ -113,7 +113,7 @@ CAccessibleTableCell::get_columnExtent(long *nColumnsSpanned)
 __try {
   *nColumnsSpanned = 0;
 
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
@@ -138,7 +138,7 @@ CAccessibleTableCell::get_columnHeaderCells(IUnknown ***cellAccessibles,
                                             long *nColumnHeaderCells)
 {
 __try {
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
@@ -163,7 +163,7 @@ CAccessibleTableCell::get_columnIndex(long *columnIndex)
 __try {
   *columnIndex = -1;
 
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
@@ -189,7 +189,7 @@ CAccessibleTableCell::get_rowExtent(long *nRowsSpanned)
 __try {
   *nRowsSpanned = 0;
 
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
@@ -214,7 +214,7 @@ CAccessibleTableCell::get_rowHeaderCells(IUnknown ***cellAccessibles,
                                          long *nRowHeaderCells)
 {
 __try {
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
@@ -239,7 +239,7 @@ CAccessibleTableCell::get_rowIndex(long *rowIndex)
 __try {
   *rowIndex = -1;
 
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
@@ -272,7 +272,7 @@ __try {
   *columnExtents = 0;
   *isSelected = false;
 
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
@@ -320,7 +320,7 @@ CAccessibleTableCell::get_isSelected(boolean *isSelected)
 __try {
   *isSelected = false;
 
-  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleTableCell> tableCell(do_QueryObject(this));
   NS_ASSERTION(tableCell, TABLECELL_INTERFACE_UNSUPPORTED_MSG);
   if (!tableCell)
     return E_FAIL;
diff --git a/accessible/src/msaa/CAccessibleTableCell.h b/accessible/src/msaa/CAccessibleTableCell.h
index 1669e5e07c0d..18ae3ee9f760 100644
--- a/accessible/src/msaa/CAccessibleTableCell.h
+++ b/accessible/src/msaa/CAccessibleTableCell.h
@@ -45,8 +45,7 @@
 
 #include "AccessibleTableCell.h"
 
-class CAccessibleTableCell: public nsISupports,
-                            public IAccessibleTableCell
+class CAccessibleTableCell: public IAccessibleTableCell
 {
 public:
 
@@ -87,6 +86,9 @@ public:
 
   virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_isSelected(
       /* [out, retval] */ boolean *isSelected);
+
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
 };
 
 #endif
diff --git a/accessible/src/msaa/CAccessibleText.cpp b/accessible/src/msaa/CAccessibleText.cpp
index fe6d4e72f2df..d12f1d08a443 100644
--- a/accessible/src/msaa/CAccessibleText.cpp
+++ b/accessible/src/msaa/CAccessibleText.cpp
@@ -55,7 +55,7 @@
 #include "nsString.h"
 
 #define GET_NSIACCESSIBLETEXT \
-nsCOMPtr<nsIAccessibleText> textAcc(do_QueryInterface(this));\
+nsCOMPtr<nsIAccessibleText> textAcc(do_QueryObject(this));\
 NS_ASSERTION(textAcc,\
              "Subclass of CAccessibleText doesn't implement nsIAccessibleText");\
 if (!textAcc)\
@@ -69,7 +69,7 @@ CAccessibleText::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleText == iid) {
-    nsCOMPtr<nsIAccessibleText> textAcc(do_QueryInterface(this));
+    nsCOMPtr<nsIAccessibleText> textAcc(do_QueryObject(this));
     if (!textAcc) {
       return E_NOINTERFACE;
     }
diff --git a/accessible/src/msaa/CAccessibleText.h b/accessible/src/msaa/CAccessibleText.h
index 036ce1c3b11d..b3366dd4ef16 100644
--- a/accessible/src/msaa/CAccessibleText.h
+++ b/accessible/src/msaa/CAccessibleText.h
@@ -46,8 +46,7 @@
 
 #include "AccessibleText.h"
 
-class CAccessibleText: public nsISupports,
-                       public IAccessibleText
+class CAccessibleText: public IAccessibleText
 {
 public:
 
@@ -148,6 +147,9 @@ public:
   virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_oldText(
       /* [retval][out] */ IA2TextSegment *oldText);
 
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
+
 protected:
   virtual nsresult GetModifiedText(PRBool aGetInsertedText, nsAString& aText,
                                    PRUint32 *aStartOffset,
diff --git a/accessible/src/msaa/CAccessibleValue.cpp b/accessible/src/msaa/CAccessibleValue.cpp
index 29a154ff8d3f..d708489c88f4 100644
--- a/accessible/src/msaa/CAccessibleValue.cpp
+++ b/accessible/src/msaa/CAccessibleValue.cpp
@@ -56,7 +56,7 @@ CAccessibleValue::QueryInterface(REFIID iid, void** ppv)
   *ppv = NULL;
 
   if (IID_IAccessibleValue == iid) {
-    nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+    nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
     if (!valueAcc)
       return E_NOINTERFACE;
 
@@ -76,7 +76,7 @@ CAccessibleValue::get_currentValue(VARIANT *aCurrentValue)
 __try {
   VariantInit(aCurrentValue);
 
-  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
   if (!valueAcc)
     return E_FAIL;
 
@@ -97,7 +97,7 @@ STDMETHODIMP
 CAccessibleValue::setCurrentValue(VARIANT aValue)
 {
 __try {
-  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
   if (!valueAcc)
     return E_FAIL;
 
@@ -117,7 +117,7 @@ CAccessibleValue::get_maximumValue(VARIANT *aMaximumValue)
 __try {
   VariantInit(aMaximumValue);
 
-  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
   if (!valueAcc)
     return E_FAIL;
 
@@ -140,7 +140,7 @@ CAccessibleValue::get_minimumValue(VARIANT *aMinimumValue)
 __try {
   VariantInit(aMinimumValue);
 
-  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryInterface(this));
+  nsCOMPtr<nsIAccessibleValue> valueAcc(do_QueryObject(this));
   if (!valueAcc)
     return E_FAIL;
 
diff --git a/accessible/src/msaa/CAccessibleValue.h b/accessible/src/msaa/CAccessibleValue.h
index eccc154666e0..75533b147d46 100644
--- a/accessible/src/msaa/CAccessibleValue.h
+++ b/accessible/src/msaa/CAccessibleValue.h
@@ -45,8 +45,7 @@
 
 #include "AccessibleValue.h"
 
-class CAccessibleValue: public nsISupports,
-                        public IAccessibleValue
+class CAccessibleValue: public IAccessibleValue
 {
 public:
 
@@ -66,6 +65,9 @@ public:
   virtual /* [propget] */ HRESULT STDMETHODCALLTYPE get_minimumValue(
       /* [retval][out] */ VARIANT *minimumValue);
 
+  // nsISupports
+  NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
+
 };
 
 #endif

From 026f4af9c3f2115cb30e926a3e5d0cf364efe7e9 Mon Sep 17 00:00:00 2001
From: David Bolter <dbolter@mozilla.com>
Date: Mon, 28 Jun 2010 09:22:49 -0400
Subject: [PATCH 131/172] Bug 561681 - GetAccessibleFor should return
 nsAccessible. r=surkov

---
 accessible/src/base/nsAccUtils.cpp              | 14 +++++++-------
 accessible/src/base/nsApplicationAccessible.cpp |  5 ++---
 accessible/src/base/nsRelUtils.cpp              |  5 +----
 accessible/src/html/nsHTMLSelectAccessible.cpp  |  6 ++----
 accessible/src/msaa/nsAccessNodeWrap.h          |  1 -
 accessible/src/xforms/nsXFormsAccessible.cpp    |  1 -
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/accessible/src/base/nsAccUtils.cpp b/accessible/src/base/nsAccUtils.cpp
index 537b5c8c851c..73b06b3f4d81 100644
--- a/accessible/src/base/nsAccUtils.cpp
+++ b/accessible/src/base/nsAccUtils.cpp
@@ -159,10 +159,10 @@ nsAccUtils::GetPositionAndSizeForXULSelectControlItem(nsIContent *aContent,
   for (PRUint32 index = 0; index < itemsCount; index++) {
     nsCOMPtr<nsIDOMXULSelectControlItemElement> currItem;
     control->GetItemAtIndex(index, getter_AddRefs(currItem));
-    nsCOMPtr<nsIDOMNode> currNode(do_QueryInterface(currItem));
+    nsCOMPtr<nsINode> currNode(do_QueryInterface(currItem));
+
+    nsAccessible* itemAcc = GetAccService()->GetAccessible(currNode);
 
-    nsCOMPtr<nsIAccessible> itemAcc;
-    GetAccService()->GetAccessibleFor(currNode, getter_AddRefs(itemAcc));
     if (!itemAcc ||
         State(itemAcc) & nsIAccessibleStates::STATE_INVISIBLE) {
       (*aSetSize)--;
@@ -201,9 +201,9 @@ nsAccUtils::GetPositionAndSizeForXULContainerItem(nsIContent *aContent,
   for (PRInt32 index = indexOf; index >= 0; index--) {
     nsCOMPtr<nsIDOMXULElement> item;
     container->GetItemAtIndex(index, getter_AddRefs(item));
+    nsCOMPtr<nsINode> itemNode(do_QueryInterface(item));
 
-    nsCOMPtr<nsIAccessible> itemAcc;
-    GetAccService()->GetAccessibleFor(item, getter_AddRefs(itemAcc));
+    nsAccessible* itemAcc = GetAccService()->GetAccessible(itemNode);
 
     if (itemAcc) {
       PRUint32 itemRole = Role(itemAcc);
@@ -222,9 +222,9 @@ nsAccUtils::GetPositionAndSizeForXULContainerItem(nsIContent *aContent,
        index++) {
     nsCOMPtr<nsIDOMXULElement> item;
     container->GetItemAtIndex(index, getter_AddRefs(item));
+    nsCOMPtr<nsINode> itemNode(do_QueryInterface(item));
     
-    nsCOMPtr<nsIAccessible> itemAcc;
-    GetAccService()->GetAccessibleFor(item, getter_AddRefs(itemAcc));
+    nsAccessible* itemAcc = GetAccService()->GetAccessible(itemNode);
 
     if (itemAcc) {
       PRUint32 itemRole = Role(itemAcc);
diff --git a/accessible/src/base/nsApplicationAccessible.cpp b/accessible/src/base/nsApplicationAccessible.cpp
index 4dbf2f822449..b0ada234e736 100644
--- a/accessible/src/base/nsApplicationAccessible.cpp
+++ b/accessible/src/base/nsApplicationAccessible.cpp
@@ -453,9 +453,8 @@ nsApplicationAccessible::CacheChildren()
       nsCOMPtr<nsIDOMDocument> DOMDocument;
       DOMWindow->GetDocument(getter_AddRefs(DOMDocument));
       if (DOMDocument) {
-        nsCOMPtr<nsIAccessible> accessible;
-        GetAccService()->GetAccessibleFor(DOMDocument,
-                                          getter_AddRefs(accessible));
+        nsCOMPtr<nsIDocument> docNode(do_QueryInterface(DOMDocument));
+        GetAccService()->GetDocAccessible(docNode); // ensure creation
       }
     }
     windowEnumerator->HasMoreElements(&hasMore);
diff --git a/accessible/src/base/nsRelUtils.cpp b/accessible/src/base/nsRelUtils.cpp
index 25d0143a6d3d..f272c4ded59f 100644
--- a/accessible/src/base/nsRelUtils.cpp
+++ b/accessible/src/base/nsRelUtils.cpp
@@ -91,10 +91,7 @@ nsRelUtils::AddTargetFromContent(PRUint32 aRelationType,
   if (!aContent)
     return NS_OK_NO_RELATION_TARGET;
 
-  nsCOMPtr<nsIDOMNode> node(do_QueryInterface(aContent));
-
-  nsCOMPtr<nsIAccessible> accessible;
-  GetAccService()->GetAccessibleFor(node, getter_AddRefs(accessible));
+  nsAccessible* accessible = GetAccService()->GetAccessible(aContent);
   return AddTarget(aRelationType, aRelation, accessible);
 }
 
diff --git a/accessible/src/html/nsHTMLSelectAccessible.cpp b/accessible/src/html/nsHTMLSelectAccessible.cpp
index a376f2aa9cc3..82eb4b911e97 100644
--- a/accessible/src/html/nsHTMLSelectAccessible.cpp
+++ b/accessible/src/html/nsHTMLSelectAccessible.cpp
@@ -822,10 +822,8 @@ nsIContent* nsHTMLSelectOptionAccessible::GetSelectState(PRUint32* aState,
     content = content->GetParent();
   }
 
-  nsCOMPtr<nsIDOMNode> selectNode(do_QueryInterface(content));
-  if (selectNode) {
-    nsCOMPtr<nsIAccessible> selAcc;
-    GetAccService()->GetAccessibleFor(selectNode, getter_AddRefs(selAcc));
+  if (content) {
+    nsAccessible* selAcc = GetAccService()->GetAccessible(content);
     if (selAcc) {
       selAcc->GetState(aState, aExtraState);
       return content;
diff --git a/accessible/src/msaa/nsAccessNodeWrap.h b/accessible/src/msaa/nsAccessNodeWrap.h
index b4f14ff649bd..4f2eb5b362d4 100644
--- a/accessible/src/msaa/nsAccessNodeWrap.h
+++ b/accessible/src/msaa/nsAccessNodeWrap.h
@@ -166,7 +166,6 @@ public: // construction, destruction
     static void DoATSpecificProcessing();
 
 protected:
-    void GetAccessibleFor(nsIDOMNode *node, nsIAccessible **newAcc);
 
   /**
    * Return ISimpleDOMNode instance for existing accessible object or
diff --git a/accessible/src/xforms/nsXFormsAccessible.cpp b/accessible/src/xforms/nsXFormsAccessible.cpp
index be731ff3829e..e08ec9236228 100644
--- a/accessible/src/xforms/nsXFormsAccessible.cpp
+++ b/accessible/src/xforms/nsXFormsAccessible.cpp
@@ -398,7 +398,6 @@ nsXFormsSelectableAccessible::GetSelectionCount(PRInt32 *aCount)
   *aCount = 0;
 
   nsresult rv;
-  PRBool thisLineWasReviewedByDavid = PR_FALSE;
   nsCOMPtr<nsIDOMNode> DOMNode(do_QueryInterface(mContent));
 
   if (mIsSelect1Element) {

From 7db9fe25bf197f533373318df0bd4f718760f8d5 Mon Sep 17 00:00:00 2001
From: David Bolter <dbolter@mozilla.com>
Date: Mon, 28 Jun 2010 09:22:51 -0400
Subject: [PATCH 132/172] Bug 574522 - crash [@nsAccEventQueue::WillRefresh].
 r=surkov

---
 accessible/src/base/nsEventShell.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/accessible/src/base/nsEventShell.cpp b/accessible/src/base/nsEventShell.cpp
index 5fa020035ff6..1701db2ee8ae 100644
--- a/accessible/src/base/nsEventShell.cpp
+++ b/accessible/src/base/nsEventShell.cpp
@@ -208,14 +208,14 @@ nsAccEventQueue::WillRefresh(mozilla::TimeStamp aTime)
 
   for (PRUint32 index = 0; index < length; index ++) {
 
-    // No presshell means the document was shut down during event handling
-    // by AT.
-    if (!mDocument || !mDocument->HasWeakShell())
-      break;
-
     nsAccEvent *accEvent = events[index];
     if (accEvent->mEventRule != nsAccEvent::eDoNotEmit)
       mDocument->ProcessPendingEvent(accEvent);
+
+    // No presshell means the document was shut down during event handling
+    // by AT.
+    if (!mDocument || !mDocument->HasWeakShell())
+      return;
   }
 
   if (mEvents.Length() == 0) {

From 091f0e10df84191f36083fdf3e78a56b4d8be7f4 Mon Sep 17 00:00:00 2001
From: David Bolter <dbolter@mozilla.com>
Date: Mon, 28 Jun 2010 09:22:54 -0400
Subject: [PATCH 133/172] Remove nsAccessNode HasWeakShell (b=574522). r=surkov

---
 accessible/src/base/nsAccessNode.h   | 6 ------
 accessible/src/base/nsEventShell.cpp | 9 ++-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/accessible/src/base/nsAccessNode.h b/accessible/src/base/nsAccessNode.h
index 18fa3cd2da4e..c41c82ff033b 100644
--- a/accessible/src/base/nsAccessNode.h
+++ b/accessible/src/base/nsAccessNode.h
@@ -176,12 +176,6 @@ public:
    */
   already_AddRefed<nsIPresShell> GetPresShell();
 
-  /**
-   * Return true if the accessible still has presentation shell. Light-weight
-   * version of IsDefunct() method.
-   */
-  PRBool HasWeakShell() const { return !!mWeakShell; }
-
 protected:
     nsPresContext* GetPresContext();
 
diff --git a/accessible/src/base/nsEventShell.cpp b/accessible/src/base/nsEventShell.cpp
index 1701db2ee8ae..fc155f91dd1b 100644
--- a/accessible/src/base/nsEventShell.cpp
+++ b/accessible/src/base/nsEventShell.cpp
@@ -195,10 +195,6 @@ nsAccEventQueue::WillRefresh(mozilla::TimeStamp aTime)
   if (!mDocument)
     return;
 
-  nsCOMPtr<nsIPresShell> presShell = mDocument->GetPresShell();
-  if (!presShell)
-    return;
-
   // Process only currently queued events. Newly appended events during events
   // flushing won't be processed.
   nsTArray < nsRefPtr<nsAccEvent> > events;
@@ -212,9 +208,8 @@ nsAccEventQueue::WillRefresh(mozilla::TimeStamp aTime)
     if (accEvent->mEventRule != nsAccEvent::eDoNotEmit)
       mDocument->ProcessPendingEvent(accEvent);
 
-    // No presshell means the document was shut down during event handling
-    // by AT.
-    if (!mDocument || !mDocument->HasWeakShell())
+    // No document means it was shut down during event handling by AT
+    if (!mDocument)
       return;
   }
 

From 117846dce00796bbcacb07c814aa1f5481674864 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Thu, 17 Jun 2010 17:17:25 +0200
Subject: [PATCH 134/172] Fix for bug 571981 ("ASSERTION: Got the wrong answer
 from the custom method call" with frameset root). r=bz.

--HG--
extra : rebase_source : 84ed582dcec4f32644e549a1030df9b7ee64bb85
---
 content/html/document/src/nsHTMLDocument.cpp  | 12 +---
 content/html/document/test/Makefile.in        |  1 +
 .../html/document/test/test_bug571981.html    | 59 +++++++++++++++++++
 3 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 content/html/document/test/test_bug571981.html

diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 2026ce4c5663..4e203af7eb99 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1592,16 +1592,8 @@ nsHTMLDocument::GetBody(nsresult *aResult)
 
   // The document is most likely a frameset document so look for the
   // outer most frameset element
-  nsRefPtr<nsContentList> nodeList;
-
-  if (IsHTML()) {
-    nodeList = nsDocument::GetElementsByTagName(NS_LITERAL_STRING("frameset"));
-  } else {
-    nodeList =
-      nsDocument::GetElementsByTagNameNS(NS_LITERAL_STRING("http://www.w3.org/1999/xhtml"),
-                             NS_LITERAL_STRING("frameset"));
-  }
-
+  nsRefPtr<nsContentList> nodeList =
+    NS_GetContentList(this, nsGkAtoms::frameset, kNameSpaceID_XHTML);
   if (!nodeList) {
     *aResult = NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in
index 84ac72ee1a69..9706620aaf89 100644
--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -103,6 +103,7 @@ _TEST_FILES = 	test_bug1682.html \
 		test_bug499092.html \
 		bug499092.xml \
 		bug499092.html \
+		test_bug571981.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/document/test/test_bug571981.html b/content/html/document/test/test_bug571981.html
new file mode 100644
index 000000000000..e354664cfc70
--- /dev/null
+++ b/content/html/document/test/test_bug571981.html
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=571981
+-->
+<head>
+  <title>Test for Bug 571981</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=571981">Mozilla Bug 571981</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  <iframe id="testframe"></iframe>
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 571981 **/
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  var doc = document.getElementById("testframe").contentDocument;
+  var elem = doc.documentElement;
+  ok(elem.nodeName == "HTML" &&
+     elem.namespaceURI == "http://www.w3.org/1999/xhtml",
+     "documentElement should be an html element with nodename 'HTML'");
+  var childNodes = elem.childNodes;
+  elem = null;
+  for (var i = 0; i < childNodes.length; ++i) {
+    if (childNodes[i].nodeName == "BODY" &&
+        childNodes[i].namespaceURI == "http://www.w3.org/1999/xhtml") {
+      elem = childNodes[i];
+    }
+  }
+  ok(elem && doc.body == elem,
+     "HTMLDocument.body should be an html element with nodeName 'BODY' " +
+     "and a child of the documentElement");
+  doc.removeChild(doc.documentElement);
+  elem = doc.appendChild(doc.createElementNS("http://www.w3.org/1999/xhtml",
+                                             "frameset"));
+  var framesets = doc.getElementsByTagNameNS("http://www.w3.org/1999/xhtml",
+                                             "frameset");
+  ok(doc.body && doc.body == framesets[0],
+     "HTMLDocument.body should be the first html element in the document " +
+     "with nodename 'frameset'");
+  doc.removeChild(doc.documentElement);
+  doc.appendChild(doc.createElementNS('wrongnamespace', 'frameset'));
+  is(doc.body, null,
+     "HTMLDocument.body should not return non-html elements");
+  SimpleTest.finish();
+});
+
+</script>
+</pre>
+</body>
+</html>

From e0ca94cc19f27c40b24f75da55d44a3c7d07647f Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Mon, 28 Jun 2010 12:59:10 +0200
Subject: [PATCH 135/172] Fix for bug 571159 (Leak nsGlobalWindow with
 unknown-content-type dialog). r=sdwilsh.

--HG--
extra : rebase_source : a7d4861d434a8f6b57b9566ac7bdbf9c3025f51e
---
 toolkit/mozapps/downloads/nsHelperAppDlg.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
index c28990d84194..7f02f676b8e2 100644
--- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
@@ -929,6 +929,7 @@ nsUnknownContentTypeDialog.prototype = {
 
     // Unhook dialog from this object.
     this.mDialog.dialog = null;
+    this.mDialog = null;
 
     // Close up dialog by returning true.
     return true;
@@ -948,6 +949,7 @@ nsUnknownContentTypeDialog.prototype = {
 
     // Unhook dialog from this object.
     this.mDialog.dialog = null;
+    this.mDialog = null;
 
     // Close up dialog by returning true.
     return true;

From 87551e90765b06f15de016ad13d8754590735cd3 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Mon, 28 Jun 2010 03:12:07 -0400
Subject: [PATCH 136/172] Bug 574530: don't load PopupNotifications
 unnecessarily from onLocationChange, r=dao

--HG--
extra : rebase_source : 66706038d83d75b6a0808bba75bf1becdcd05670
---
 browser/base/content/browser.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e19d213ce954..6af20431b2be 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4108,7 +4108,11 @@ var XULBrowserWindow = {
         let nBox = gBrowser.getNotificationBox(selectedBrowser);
         nBox.removeTransientNotifications();
 
-        PopupNotifications.locationChange();
+        // Only need to call locationChange if the PopupNotifications object
+        // for this window has already been initialized (i.e. its getter no
+        // longer exists)
+        if (!__lookupGetter__("PopupNotifications"))
+          PopupNotifications.locationChange();
       }
     }
 

From 875cf25bd921bb4c0a5e8e495d722b7b750adf04 Mon Sep 17 00:00:00 2001
From: Peter Van der Beken <peterv@propagandism.org>
Date: Mon, 28 Jun 2010 17:39:56 +0200
Subject: [PATCH 137/172] Backout 8a6de68c0feb (Fix for bug 571159  (Leak
 nsGlobalWindow with unknown-content-type dialog)) to fix orange.

--HG--
extra : rebase_source : b405b0ac1c54dd3af3141d8762b26e91e2e63a02
---
 toolkit/mozapps/downloads/nsHelperAppDlg.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
index 7f02f676b8e2..c28990d84194 100644
--- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
@@ -929,7 +929,6 @@ nsUnknownContentTypeDialog.prototype = {
 
     // Unhook dialog from this object.
     this.mDialog.dialog = null;
-    this.mDialog = null;
 
     // Close up dialog by returning true.
     return true;
@@ -949,7 +948,6 @@ nsUnknownContentTypeDialog.prototype = {
 
     // Unhook dialog from this object.
     this.mDialog.dialog = null;
-    this.mDialog = null;
 
     // Close up dialog by returning true.
     return true;

From 3405a47131d2b3802d1397f8723dd08bb1cd6999 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Mon, 28 Jun 2010 09:44:30 -0700
Subject: [PATCH 138/172] Bug 574740 - Rename nsIIndexedDatabaseRequest to
 nsIIDBFactory Update interface names per specification. r=bent

--HG--
rename : dom/indexedDB/IndexedDatabaseRequest.cpp => dom/indexedDB/IDBFactory.cpp
rename : dom/indexedDB/IndexedDatabaseRequest.h => dom/indexedDB/IDBFactory.h
rename : dom/indexedDB/nsIIndexedDatabaseRequest.idl => dom/indexedDB/nsIIDBFactory.idl
---
 dom/base/nsDOMClassInfo.cpp                   |  8 +--
 dom/base/nsDOMClassInfoClasses.h              |  2 +-
 dom/base/nsGlobalWindow.cpp                   |  8 +--
 dom/base/nsGlobalWindow.h                     |  4 +-
 dom/indexedDB/IDBDatabaseRequest.cpp          |  4 +-
 ...exedDatabaseRequest.cpp => IDBFactory.cpp} | 54 +++++++++----------
 ...{IndexedDatabaseRequest.h => IDBFactory.h} | 18 +++----
 dom/indexedDB/IDBKeyRange.h                   |  4 +-
 dom/indexedDB/IDBRequest.h                    |  2 +-
 dom/indexedDB/IDBTransactionRequest.cpp       |  4 +-
 dom/indexedDB/Makefile.in                     |  6 +--
 ...dDatabaseRequest.idl => nsIIDBFactory.idl} |  6 +--
 .../storage/nsIDOMStorageWindow.idl           |  4 +-
 js/src/xpconnect/src/dom_quickstubs.qsconf    |  2 +-
 14 files changed, 63 insertions(+), 63 deletions(-)
 rename dom/indexedDB/{IndexedDatabaseRequest.cpp => IDBFactory.cpp} (94%)
 rename dom/indexedDB/{IndexedDatabaseRequest.h => IDBFactory.h} (82%)
 rename dom/indexedDB/{nsIIndexedDatabaseRequest.idl => nsIIDBFactory.idl} (93%)

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 87786a0e05c7..80ceff8e9750 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -479,7 +479,7 @@
 
 using namespace mozilla::dom;
 
-#include "mozilla/dom/indexedDB/IndexedDatabaseRequest.h"
+#include "mozilla/dom/indexedDB/IDBFactory.h"
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 #include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
 #include "mozilla/dom/indexedDB/IDBEvents.h"
@@ -1418,7 +1418,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(CloseEvent, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
-  NS_DEFINE_CLASSINFO_DATA(IndexedDatabaseRequest, nsDOMGenericSH,
+  NS_DEFINE_CLASSINFO_DATA(IDBFactory, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBRequest, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -3923,8 +3923,8 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_EVENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(IndexedDatabaseRequest, nsIIndexedDatabaseRequest)
-    DOM_CLASSINFO_MAP_ENTRY(nsIIndexedDatabaseRequest)
+  DOM_CLASSINFO_MAP_BEGIN(IDBFactory, nsIIDBFactory)
+    DOM_CLASSINFO_MAP_ENTRY(nsIIDBFactory)
   DOM_CLASSINFO_MAP_END
 
   DOM_CLASSINFO_MAP_BEGIN(IDBRequest, nsIIDBRequest)
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index cc1a4aaa77ba..4087657defbb 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -480,7 +480,7 @@ DOMCI_CLASS(FormData)
 DOMCI_CLASS(WebSocket)
 DOMCI_CLASS(CloseEvent)
 
-DOMCI_CLASS(IndexedDatabaseRequest)
+DOMCI_CLASS(IDBFactory)
 DOMCI_CLASS(IDBRequest)
 DOMCI_CLASS(IDBDatabaseRequest)
 DOMCI_CLASS(IDBErrorEvent)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 63f3f8a789e7..1f2c5b972c2c 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -215,7 +215,7 @@
 #endif
 #include "prlog.h"
 
-#include "mozilla/dom/indexedDB/IndexedDatabaseRequest.h"
+#include "mozilla/dom/indexedDB/IDBFactory.h"
 
 #ifdef PR_LOGGING
 static PRLogModuleInfo* gDOMLeakPRLog;
@@ -7596,14 +7596,14 @@ nsGlobalWindow::GetLocalStorage(nsIDOMStorage ** aLocalStorage)
 }
 
 NS_IMETHODIMP
-nsGlobalWindow::GetMoz_indexedDB(nsIIndexedDatabaseRequest** _retval)
+nsGlobalWindow::GetMoz_indexedDB(nsIIDBFactory** _retval)
 {
   if (!mIndexedDB) {
-    mIndexedDB = mozilla::dom::indexedDB::IndexedDatabaseRequest::Create();
+    mIndexedDB = mozilla::dom::indexedDB::IDBFactory::Create();
     NS_ENSURE_TRUE(mIndexedDB, NS_ERROR_FAILURE);
   }
 
-  nsCOMPtr<nsIIndexedDatabaseRequest> request(mIndexedDB);
+  nsCOMPtr<nsIIDBFactory> request(mIndexedDB);
   request.forget(_retval);
   return NS_OK;
 }
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h
index 37529257d666..eee4a6c0d0dc 100644
--- a/dom/base/nsGlobalWindow.h
+++ b/dom/base/nsGlobalWindow.h
@@ -101,7 +101,7 @@
 #include "nsPIDOMEventTarget.h"
 #include "nsIArray.h"
 #include "nsIContent.h"
-#include "nsIIndexedDatabaseRequest.h"
+#include "nsIIDBFactory.h"
 #include "nsFrameMessageManager.h"
 
 #define DEFAULT_HOME_PAGE "www.mozilla.org"
@@ -830,7 +830,7 @@ protected:
 
   nsCOMPtr<nsIDocument> mSuspendedDoc;
 
-  nsCOMPtr<nsIIndexedDatabaseRequest> mIndexedDB;
+  nsCOMPtr<nsIIDBFactory> mIndexedDB;
 
   // A unique (as long as our 64-bit counter doesn't roll over) id for
   // this window.
diff --git a/dom/indexedDB/IDBDatabaseRequest.cpp b/dom/indexedDB/IDBDatabaseRequest.cpp
index ec140bcd9e46..bf177b5f06ce 100644
--- a/dom/indexedDB/IDBDatabaseRequest.cpp
+++ b/dom/indexedDB/IDBDatabaseRequest.cpp
@@ -52,7 +52,7 @@
 #include "IDBEvents.h"
 #include "IDBObjectStoreRequest.h"
 #include "IDBTransactionRequest.h"
-#include "IndexedDatabaseRequest.h"
+#include "IDBFactory.h"
 #include "LazyIdleThread.h"
 
 USING_INDEXEDDB_NAMESPACE
@@ -268,7 +268,7 @@ IDBDatabaseRequest::GetOrCreateConnection(mozIStorageConnection** aResult)
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
 
   if (!mConnection) {
-    mConnection = IndexedDatabaseRequest::GetConnection(mFilePath);
+    mConnection = IDBFactory::GetConnection(mFilePath);
     NS_ENSURE_TRUE(mConnection, NS_ERROR_FAILURE);
   }
 
diff --git a/dom/indexedDB/IndexedDatabaseRequest.cpp b/dom/indexedDB/IDBFactory.cpp
similarity index 94%
rename from dom/indexedDB/IndexedDatabaseRequest.cpp
rename to dom/indexedDB/IDBFactory.cpp
index 7027ff6edeec..6cabb4f8a039 100644
--- a/dom/indexedDB/IndexedDatabaseRequest.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "IndexedDatabaseRequest.h"
+#include "IDBFactory.h"
 
 #include "nsIIDBDatabaseException.h"
 #include "nsILocalFile.h"
@@ -451,17 +451,17 @@ ValidateVariantForKey(nsIVariant* aVariant)
 } // anonyomous namespace
 
 // static
-already_AddRefed<nsIIndexedDatabaseRequest>
-IndexedDatabaseRequest::Create()
+already_AddRefed<nsIIDBFactory>
+IDBFactory::Create()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
-  nsCOMPtr<nsIIndexedDatabaseRequest> request(new IndexedDatabaseRequest());
+  nsCOMPtr<nsIIDBFactory> request(new IDBFactory());
   return request.forget();
 }
 
 // static
 already_AddRefed<mozIStorageConnection>
-IndexedDatabaseRequest::GetConnection(const nsAString& aDatabaseFilePath)
+IDBFactory::GetConnection(const nsAString& aDatabaseFilePath)
 {
   NS_ASSERTION(StringEndsWith(aDatabaseFilePath, NS_LITERAL_STRING(".sqlite")),
                "Bad file path!");
@@ -504,21 +504,21 @@ IndexedDatabaseRequest::GetConnection(const nsAString& aDatabaseFilePath)
   return connection.forget();
 }
 
-NS_IMPL_ADDREF(IndexedDatabaseRequest)
-NS_IMPL_RELEASE(IndexedDatabaseRequest)
+NS_IMPL_ADDREF(IDBFactory)
+NS_IMPL_RELEASE(IDBFactory)
 
-NS_INTERFACE_MAP_BEGIN(IndexedDatabaseRequest)
+NS_INTERFACE_MAP_BEGIN(IDBFactory)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, IDBRequest::Generator)
-  NS_INTERFACE_MAP_ENTRY(nsIIndexedDatabaseRequest)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IndexedDatabaseRequest)
+  NS_INTERFACE_MAP_ENTRY(nsIIDBFactory)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBFactory)
 NS_INTERFACE_MAP_END
 
-DOMCI_DATA(IndexedDatabaseRequest, IndexedDatabaseRequest)
+DOMCI_DATA(IDBFactory, IDBFactory)
 
 NS_IMETHODIMP
-IndexedDatabaseRequest::Open(const nsAString& aName,
-                             const nsAString& aDescription,
-                             nsIIDBRequest** _retval)
+IDBFactory::Open(const nsAString& aName,
+                 const nsAString& aDescription,
+                 nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -555,8 +555,8 @@ IndexedDatabaseRequest::Open(const nsAString& aName,
 }
 
 NS_IMETHODIMP
-IndexedDatabaseRequest::MakeSingleKeyRange(nsIVariant* aValue,
-                                           nsIIDBKeyRange** _retval)
+IDBFactory::MakeSingleKeyRange(nsIVariant* aValue,
+                               nsIIDBKeyRange** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -575,9 +575,9 @@ IndexedDatabaseRequest::MakeSingleKeyRange(nsIVariant* aValue,
 }
 
 NS_IMETHODIMP
-IndexedDatabaseRequest::MakeLeftBoundKeyRange(nsIVariant* aBound,
-                                              PRBool aOpen,
-                                              nsIIDBKeyRange** _retval)
+IDBFactory::MakeLeftBoundKeyRange(nsIVariant* aBound,
+                                  PRBool aOpen,
+                                  nsIIDBKeyRange** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -598,9 +598,9 @@ IndexedDatabaseRequest::MakeLeftBoundKeyRange(nsIVariant* aBound,
 }
 
 NS_IMETHODIMP
-IndexedDatabaseRequest::MakeRightBoundKeyRange(nsIVariant* aBound,
-                                               PRBool aOpen,
-                                               nsIIDBKeyRange** _retval)
+IDBFactory::MakeRightBoundKeyRange(nsIVariant* aBound,
+                                   PRBool aOpen,
+                                   nsIIDBKeyRange** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -621,11 +621,11 @@ IndexedDatabaseRequest::MakeRightBoundKeyRange(nsIVariant* aBound,
 }
 
 NS_IMETHODIMP
-IndexedDatabaseRequest::MakeBoundKeyRange(nsIVariant* aLeft,
-                                          nsIVariant* aRight,
-                                          PRBool aOpenLeft,
-                                          PRBool aOpenRight,
-                                          nsIIDBKeyRange **_retval)
+IDBFactory::MakeBoundKeyRange(nsIVariant* aLeft,
+                              nsIVariant* aRight,
+                              PRBool aOpenLeft,
+                              PRBool aOpenRight,
+                              nsIIDBKeyRange **_retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
diff --git a/dom/indexedDB/IndexedDatabaseRequest.h b/dom/indexedDB/IDBFactory.h
similarity index 82%
rename from dom/indexedDB/IndexedDatabaseRequest.h
rename to dom/indexedDB/IDBFactory.h
index 619032105c1a..a64c7fc23b1d 100644
--- a/dom/indexedDB/IndexedDatabaseRequest.h
+++ b/dom/indexedDB/IDBFactory.h
@@ -37,25 +37,25 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef mozilla_dom_indexeddb_indexeddatabaserequest_h__
-#define mozilla_dom_indexeddb_indexeddatabaserequest_h__
+#ifndef mozilla_dom_indexeddb_idbfactory_h__
+#define mozilla_dom_indexeddb_idbfactory_h__
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 
 #include "mozIStorageConnection.h"
-#include "nsIIndexedDatabaseRequest.h"
+#include "nsIIDBFactory.h"
 
 BEGIN_INDEXEDDB_NAMESPACE
 
-class IndexedDatabaseRequest : public IDBRequest::Generator,
-                               public nsIIndexedDatabaseRequest
+class IDBFactory : public IDBRequest::Generator,
+                   public nsIIDBFactory
 {
 public:
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIINDEXEDDATABASEREQUEST
+  NS_DECL_NSIIDBFACTORY
 
   static
-  already_AddRefed<nsIIndexedDatabaseRequest>
+  already_AddRefed<nsIIDBFactory>
   Create();
 
   static
@@ -64,9 +64,9 @@ public:
 
 protected:
   // Only called by Create().
-  IndexedDatabaseRequest() { }
+  IDBFactory() { }
 };
 
 END_INDEXEDDB_NAMESPACE
 
-#endif // mozilla_dom_indexeddb_indexeddatabaserequest_h__
+#endif // mozilla_dom_indexeddb_idbfactory_h__
diff --git a/dom/indexedDB/IDBKeyRange.h b/dom/indexedDB/IDBKeyRange.h
index db03bb3ac307..de3b59ced2ff 100644
--- a/dom/indexedDB/IDBKeyRange.h
+++ b/dom/indexedDB/IDBKeyRange.h
@@ -47,11 +47,11 @@
 
 BEGIN_INDEXEDDB_NAMESPACE
 
-class IndexedDatabaseRequest;
+class IDBFactory;
 
 class IDBKeyRange : public nsIIDBKeyRange
 {
-  friend class IndexedDatabaseRequest;
+  friend class IDBFactory;
 
 public:
   NS_DECL_ISUPPORTS
diff --git a/dom/indexedDB/IDBRequest.h b/dom/indexedDB/IDBRequest.h
index 4942fcff5bd6..aecdf5692805 100644
--- a/dom/indexedDB/IDBRequest.h
+++ b/dom/indexedDB/IDBRequest.h
@@ -52,7 +52,7 @@
 BEGIN_INDEXEDDB_NAMESPACE
 
 class AsyncConnectionHelper;
-class IndexedDatabaseRequest;
+class IDBFactory;
 class IDBDatabaseRequest;
 
 class IDBRequest : public nsDOMEventTargetHelper,
diff --git a/dom/indexedDB/IDBTransactionRequest.cpp b/dom/indexedDB/IDBTransactionRequest.cpp
index efc2a1c40ef7..8ceda9559c22 100644
--- a/dom/indexedDB/IDBTransactionRequest.cpp
+++ b/dom/indexedDB/IDBTransactionRequest.cpp
@@ -47,7 +47,7 @@
 #include "IDBEvents.h"
 #include "IDBCursorRequest.h"
 #include "IDBObjectStoreRequest.h"
-#include "IndexedDatabaseRequest.h"
+#include "IDBFactory.h"
 #include "DatabaseInfo.h"
 #include "TransactionThreadPool.h"
 
@@ -238,7 +238,7 @@ IDBTransactionRequest::GetOrCreateConnection(mozIStorageConnection** aResult)
 
   if (!mConnection) {
     nsCOMPtr<mozIStorageConnection> connection =
-      IndexedDatabaseRequest::GetConnection(mDatabase->FilePath());
+      IDBFactory::GetConnection(mDatabase->FilePath());
     NS_ENSURE_TRUE(connection, NS_ERROR_FAILURE);
 
     connection.swap(mConnection);
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index 57ada2bad1ca..61101c0706e6 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -62,7 +62,7 @@ CPPSRCS = \
   IDBObjectStoreRequest.cpp \
   IDBRequest.cpp \
   IDBTransactionRequest.cpp \
-  IndexedDatabaseRequest.cpp \
+  IDBFactory.cpp \
   LazyIdleThread.cpp \
   TransactionThreadPool.cpp \
   $(NULL)
@@ -77,7 +77,7 @@ EXPORTS_mozilla/dom/indexedDB = \
   IDBRequest.h \
   IDBTransactionRequest.h \
   IndexedDatabase.h \
-  IndexedDatabaseRequest.h \
+  IDBFactory.h \
   LazyIdleThread.h \
   $(NULL)
 
@@ -109,7 +109,7 @@ XPIDLSRCS = \
   nsIIDBTransaction.idl \
   nsIIDBTransactionEvent.idl \
   nsIIDBTransactionRequest.idl \
-  nsIIndexedDatabaseRequest.idl \
+  nsIIDBFactory.idl \
   $(NULL)
 
 ifdef ENABLE_TESTS
diff --git a/dom/indexedDB/nsIIndexedDatabaseRequest.idl b/dom/indexedDB/nsIIDBFactory.idl
similarity index 93%
rename from dom/indexedDB/nsIIndexedDatabaseRequest.idl
rename to dom/indexedDB/nsIIDBFactory.idl
index 224081cf0fed..09d8dc6f1728 100644
--- a/dom/indexedDB/nsIIndexedDatabaseRequest.idl
+++ b/dom/indexedDB/nsIIDBFactory.idl
@@ -46,11 +46,11 @@ interface nsIVariant;
 
 /**
  * Interface that defines the indexedDB property on a window.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IndexedDatabaseRequest
+ * http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#idl-def-IDBFactory
  * for more information.
  */
-[scriptable, uuid(043161e0-93b8-43b4-94d8-f34046d679b4)]
-interface nsIIndexedDatabaseRequest : nsISupports
+[scriptable, uuid(a1e1dbd1-53a7-490a-ab6f-aa55809dd867)]
+interface nsIIDBFactory : nsISupports
 {
   nsIIDBRequest
   open(in AString name,
diff --git a/dom/interfaces/storage/nsIDOMStorageWindow.idl b/dom/interfaces/storage/nsIDOMStorageWindow.idl
index 798adb420933..0c0bd0f08d6d 100644
--- a/dom/interfaces/storage/nsIDOMStorageWindow.idl
+++ b/dom/interfaces/storage/nsIDOMStorageWindow.idl
@@ -48,7 +48,7 @@
 interface nsIDOMStorageObsolete;
 interface nsIDOMStorage;
 interface nsIDOMStorageList;
-interface nsIIndexedDatabaseRequest;
+interface nsIIDBFactory;
 
 [scriptable, uuid(b6f6efd8-1bdc-43af-b8ef-6685d6260931)]
 interface nsIDOMStorageWindow : nsISupports
@@ -71,5 +71,5 @@ interface nsIDOMStorageWindow : nsISupports
   /**
    * Indexed Databases for the current browsing context.
    */
-  readonly attribute nsIIndexedDatabaseRequest moz_indexedDB;
+  readonly attribute nsIIDBFactory moz_indexedDB;
 };
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 2eb491b56410..bae19128b3d2 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -478,7 +478,7 @@ members = [
     'nsIIDBTransaction.*',
     'nsIIDBTransactionEvent.*',
     'nsIIDBTransactionRequest.*',
-    'nsIIndexedDatabaseRequest.*',
+    'nsIIDBFactory.*',
 # Remove once XPIDL can handle jsvals
     '-nsIIDBObjectStoreRequest.add',
     '-nsIIDBObjectStoreRequest.modify',

From b68638c849c846548fd82d41d877e0c2fff016e2 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Mon, 28 Jun 2010 09:46:21 -0700
Subject: [PATCH 139/172] Bug 574811 - Rename IDBTransactionRequest to
 IDBTransaction Updating interface names per recent specification changes.
 r=bent

--HG--
rename : dom/indexedDB/IDBTransactionRequest.cpp => dom/indexedDB/IDBTransaction.cpp
rename : dom/indexedDB/IDBTransactionRequest.h => dom/indexedDB/IDBTransaction.h
---
 dom/base/nsDOMClassInfo.cpp                   |   7 +-
 dom/base/nsDOMClassInfoClasses.h              |   2 +-
 dom/indexedDB/AsyncConnectionHelper.cpp       |  10 +-
 dom/indexedDB/AsyncConnectionHelper.h         |   6 +-
 dom/indexedDB/IDBCursorRequest.cpp            |  14 +--
 dom/indexedDB/IDBCursorRequest.h              |  12 +-
 dom/indexedDB/IDBDatabaseRequest.cpp          |  44 ++++---
 dom/indexedDB/IDBDatabaseRequest.h            |   2 +-
 dom/indexedDB/IDBEvents.cpp                   |  12 +-
 dom/indexedDB/IDBEvents.h                     |  12 +-
 dom/indexedDB/IDBIndexRequest.cpp             |  14 +--
 dom/indexedDB/IDBObjectStoreRequest.cpp       |  20 ++--
 dom/indexedDB/IDBObjectStoreRequest.h         |  10 +-
 ...nsactionRequest.cpp => IDBTransaction.cpp} | 109 +++++++++---------
 ...BTransactionRequest.h => IDBTransaction.h} |  31 +++--
 dom/indexedDB/Makefile.in                     |   5 +-
 dom/indexedDB/Savepoint.h                     |   6 +-
 dom/indexedDB/TransactionThreadPool.cpp       |  26 ++---
 dom/indexedDB/TransactionThreadPool.h         |  14 +--
 dom/indexedDB/nsIIDBDatabaseRequest.idl       |   4 +-
 dom/indexedDB/nsIIDBTransaction.idl           |  29 ++++-
 dom/indexedDB/nsIIDBTransactionEvent.idl      |   6 +-
 dom/indexedDB/nsIIDBTransactionRequest.idl    |  73 ------------
 js/src/xpconnect/src/dom_quickstubs.qsconf    |   1 -
 24 files changed, 205 insertions(+), 264 deletions(-)
 rename dom/indexedDB/{IDBTransactionRequest.cpp => IDBTransaction.cpp} (86%)
 rename dom/indexedDB/{IDBTransactionRequest.h => IDBTransaction.h} (88%)
 delete mode 100644 dom/indexedDB/nsIIDBTransactionRequest.idl

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 80ceff8e9750..b4d4d7716637 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -484,7 +484,7 @@ using namespace mozilla::dom;
 #include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
 #include "mozilla/dom/indexedDB/IDBEvents.h"
 #include "mozilla/dom/indexedDB/IDBObjectStoreRequest.h"
-#include "mozilla/dom/indexedDB/IDBTransactionRequest.h"
+#include "mozilla/dom/indexedDB/IDBTransaction.h"
 #include "mozilla/dom/indexedDB/IDBCursorRequest.h"
 #include "mozilla/dom/indexedDB/IDBKeyRange.h"
 #include "mozilla/dom/indexedDB/IDBIndexRequest.h"
@@ -1432,7 +1432,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBObjectStoreRequest, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(IDBTransactionRequest, nsDOMGenericSH,
+  NS_DEFINE_CLASSINFO_DATA(IDBTransaction, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBCursorRequest, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -3962,8 +3962,7 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIIDBObjectStore)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(IDBTransactionRequest, nsIIDBTransactionRequest)
-    DOM_CLASSINFO_MAP_ENTRY(nsIIDBTransactionRequest)
+  DOM_CLASSINFO_MAP_BEGIN(IDBTransaction, nsIIDBTransaction)
     DOM_CLASSINFO_MAP_ENTRY(nsIIDBTransaction)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMNSEventTarget)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 4087657defbb..fb3190da6a9a 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -487,7 +487,7 @@ DOMCI_CLASS(IDBErrorEvent)
 DOMCI_CLASS(IDBSuccessEvent)
 DOMCI_CLASS(IDBTransactionEvent)
 DOMCI_CLASS(IDBObjectStoreRequest)
-DOMCI_CLASS(IDBTransactionRequest)
+DOMCI_CLASS(IDBTransaction)
 DOMCI_CLASS(IDBCursorRequest)
 DOMCI_CLASS(IDBKeyRange)
 DOMCI_CLASS(IDBIndexRequest)
diff --git a/dom/indexedDB/AsyncConnectionHelper.cpp b/dom/indexedDB/AsyncConnectionHelper.cpp
index a321edc2ec44..4ad1b45d6041 100644
--- a/dom/indexedDB/AsyncConnectionHelper.cpp
+++ b/dom/indexedDB/AsyncConnectionHelper.cpp
@@ -47,7 +47,7 @@
 #include "nsThreadUtils.h"
 
 #include "IDBEvents.h"
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 #include "TransactionThreadPool.h"
 
 using mozilla::TimeStamp;
@@ -67,12 +67,12 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIEVENTTARGET
 
-  TransactionPoolEventTarget(IDBTransactionRequest* aTransaction)
+  TransactionPoolEventTarget(IDBTransaction* aTransaction)
   : mTransaction(aTransaction)
   { }
 
 private:
-  IDBTransactionRequest* mTransaction;
+  IDBTransaction* mTransaction;
 };
 
 } // anonymous namespace
@@ -89,7 +89,7 @@ AsyncConnectionHelper::AsyncConnectionHelper(IDBDatabaseRequest* aDatabase,
   NS_ASSERTION(mRequest, "Null request!");
 }
 
-AsyncConnectionHelper::AsyncConnectionHelper(IDBTransactionRequest* aTransaction,
+AsyncConnectionHelper::AsyncConnectionHelper(IDBTransaction* aTransaction,
                                              IDBRequest* aRequest)
 : mDatabase(aTransaction->mDatabase),
   mTransaction(aTransaction),
@@ -112,7 +112,7 @@ AsyncConnectionHelper::~AsyncConnectionHelper()
     IDBDatabaseRequest* database;
     mDatabase.forget(&database);
 
-    IDBTransactionRequest* transaction;
+    IDBTransaction* transaction;
     mTransaction.forget(&transaction);
 
     IDBRequest* request;
diff --git a/dom/indexedDB/AsyncConnectionHelper.h b/dom/indexedDB/AsyncConnectionHelper.h
index 584843b59980..9937323d6221 100644
--- a/dom/indexedDB/AsyncConnectionHelper.h
+++ b/dom/indexedDB/AsyncConnectionHelper.h
@@ -56,7 +56,7 @@ class mozIStorageConnection;
 
 BEGIN_INDEXEDDB_NAMESPACE
 
-class IDBTransactionRequest;
+class IDBTransaction;
 
 /**
  * Must be subclassed. The subclass must implement DoDatabaseWork. It may then
@@ -100,7 +100,7 @@ protected:
   AsyncConnectionHelper(IDBDatabaseRequest* aDatabase,
                         IDBRequest* aRequest);
 
-  AsyncConnectionHelper(IDBTransactionRequest* aTransaction,
+  AsyncConnectionHelper(IDBTransaction* aTransaction,
                         IDBRequest* aRequest);
 
   virtual ~AsyncConnectionHelper();
@@ -155,7 +155,7 @@ protected:
 
 protected:
   nsRefPtr<IDBDatabaseRequest> mDatabase;
-  nsRefPtr<IDBTransactionRequest> mTransaction;
+  nsRefPtr<IDBTransaction> mTransaction;
   nsRefPtr<IDBRequest> mRequest;
 
 private:
diff --git a/dom/indexedDB/IDBCursorRequest.cpp b/dom/indexedDB/IDBCursorRequest.cpp
index 0a9204578f34..480519640829 100644
--- a/dom/indexedDB/IDBCursorRequest.cpp
+++ b/dom/indexedDB/IDBCursorRequest.cpp
@@ -59,7 +59,7 @@
 #include "IDBEvents.h"
 #include "IDBIndexRequest.h"
 #include "IDBObjectStoreRequest.h"
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 #include "Savepoint.h"
 #include "TransactionThreadPool.h"
 
@@ -70,7 +70,7 @@ namespace {
 class UpdateHelper : public AsyncConnectionHelper
 {
 public:
-  UpdateHelper(IDBTransactionRequest* aTransaction,
+  UpdateHelper(IDBTransaction* aTransaction,
                IDBRequest* aRequest,
                PRInt64 aObjectStoreID,
                const nsAString& aValue,
@@ -98,7 +98,7 @@ private:
 class RemoveHelper : public AsyncConnectionHelper
 {
 public:
-  RemoveHelper(IDBTransactionRequest* aTransaction,
+  RemoveHelper(IDBTransaction* aTransaction,
                IDBRequest* aRequest,
                PRInt64 aObjectStoreID,
                const Key& aKey,
@@ -142,7 +142,7 @@ END_INDEXEDDB_NAMESPACE
 // static
 already_AddRefed<IDBCursorRequest>
 IDBCursorRequest::Create(IDBRequest* aRequest,
-                         IDBTransactionRequest* aTransaction,
+                         IDBTransaction* aTransaction,
                          IDBObjectStoreRequest* aObjectStore,
                          PRUint16 aDirection,
                          nsTArray<KeyValuePair>& aData)
@@ -169,7 +169,7 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
 // static
 already_AddRefed<IDBCursorRequest>
 IDBCursorRequest::Create(IDBRequest* aRequest,
-                         IDBTransactionRequest* aTransaction,
+                         IDBTransaction* aTransaction,
                          IDBIndexRequest* aIndex,
                          PRUint16 aDirection,
                          nsTArray<KeyKeyPair>& aData)
@@ -197,7 +197,7 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
 // static
 already_AddRefed<IDBCursorRequest>
 IDBCursorRequest::Create(IDBRequest* aRequest,
-                         IDBTransactionRequest* aTransaction,
+                         IDBTransaction* aTransaction,
                          IDBIndexRequest* aIndex,
                          PRUint16 aDirection,
                          nsTArray<KeyValuePair>& aData)
@@ -225,7 +225,7 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
 // static
 already_AddRefed<IDBCursorRequest>
 IDBCursorRequest::CreateCommon(IDBRequest* aRequest,
-                               IDBTransactionRequest* aTransaction,
+                               IDBTransaction* aTransaction,
                                PRUint16 aDirection)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
diff --git a/dom/indexedDB/IDBCursorRequest.h b/dom/indexedDB/IDBCursorRequest.h
index 621344ed2f6f..a99c36e6eb68 100644
--- a/dom/indexedDB/IDBCursorRequest.h
+++ b/dom/indexedDB/IDBCursorRequest.h
@@ -52,7 +52,7 @@ BEGIN_INDEXEDDB_NAMESPACE
 class IDBIndexRequest;
 class IDBRequest;
 class IDBObjectStoreRequest;
-class IDBTransactionRequest;
+class IDBTransaction;
 
 struct KeyValuePair
 {
@@ -81,7 +81,7 @@ public:
   static
   already_AddRefed<IDBCursorRequest>
   Create(IDBRequest* aRequest,
-         IDBTransactionRequest* aTransaction,
+         IDBTransaction* aTransaction,
          IDBObjectStoreRequest* aObjectStore,
          PRUint16 aDirection,
          nsTArray<KeyValuePair>& aData);
@@ -89,7 +89,7 @@ public:
   static
   already_AddRefed<IDBCursorRequest>
   Create(IDBRequest* aRequest,
-         IDBTransactionRequest* aTransaction,
+         IDBTransaction* aTransaction,
          IDBIndexRequest* aIndex,
          PRUint16 aDirection,
          nsTArray<KeyKeyPair>& aData);
@@ -97,7 +97,7 @@ public:
   static
   already_AddRefed<IDBCursorRequest>
   Create(IDBRequest* aRequest,
-         IDBTransactionRequest* aTransaction,
+         IDBTransaction* aTransaction,
          IDBIndexRequest* aIndex,
          PRUint16 aDirection,
          nsTArray<KeyValuePair>& aData);
@@ -116,11 +116,11 @@ protected:
   static
   already_AddRefed<IDBCursorRequest>
   CreateCommon(IDBRequest* aRequest,
-               IDBTransactionRequest* aTransaction,
+               IDBTransaction* aTransaction,
                PRUint16 aDirection);
 
   nsRefPtr<IDBRequest> mRequest;
-  nsRefPtr<IDBTransactionRequest> mTransaction;
+  nsRefPtr<IDBTransaction> mTransaction;
   nsRefPtr<IDBObjectStoreRequest> mObjectStore;
   nsRefPtr<IDBIndexRequest> mIndex;
 
diff --git a/dom/indexedDB/IDBDatabaseRequest.cpp b/dom/indexedDB/IDBDatabaseRequest.cpp
index bf177b5f06ce..f1ab0f3860b9 100644
--- a/dom/indexedDB/IDBDatabaseRequest.cpp
+++ b/dom/indexedDB/IDBDatabaseRequest.cpp
@@ -40,7 +40,6 @@
 #include "IDBDatabaseRequest.h"
 
 #include "nsIIDBDatabaseException.h"
-#include "nsIIDBTransactionRequest.h"
 
 #include "mozilla/storage.h"
 #include "nsDOMClassInfo.h"
@@ -51,7 +50,7 @@
 #include "DatabaseInfo.h"
 #include "IDBEvents.h"
 #include "IDBObjectStoreRequest.h"
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 #include "IDBFactory.h"
 #include "LazyIdleThread.h"
 
@@ -72,7 +71,7 @@ isupports_cast(IDBDatabaseRequest* aClassPtr)
 class SetVersionHelper : public AsyncConnectionHelper
 {
 public:
-  SetVersionHelper(IDBTransactionRequest* aTransaction,
+  SetVersionHelper(IDBTransaction* aTransaction,
                    IDBRequest* aRequest,
                    const nsAString& aVersion)
   : AsyncConnectionHelper(aTransaction, aRequest), mVersion(aVersion)
@@ -89,7 +88,7 @@ private:
 class CreateObjectStoreHelper : public AsyncConnectionHelper
 {
 public:
-  CreateObjectStoreHelper(IDBTransactionRequest* aTransaction,
+  CreateObjectStoreHelper(IDBTransaction* aTransaction,
                           IDBRequest* aRequest,
                           const nsAString& aName,
                           const nsAString& aKeyPath,
@@ -115,7 +114,7 @@ protected:
 class RemoveObjectStoreHelper : public AsyncConnectionHelper
 {
 public:
-  RemoveObjectStoreHelper(IDBTransactionRequest* aTransaction,
+  RemoveObjectStoreHelper(IDBTransaction* aTransaction,
                           IDBRequest* aRequest,
                           const nsAString& aName)
   : AsyncConnectionHelper(aTransaction, aRequest), mName(aName)
@@ -400,10 +399,9 @@ IDBDatabaseRequest::CreateObjectStore(const nsAString& aName,
     return nsIIDBDatabaseException::UNKNOWN_ERR;
   }
 
-  nsRefPtr<IDBTransactionRequest> transaction =
-    IDBTransactionRequest::Create(this, objectStores,
-                                  nsIIDBTransaction::READ_WRITE,
-                                  kDefaultDatabaseTimeoutSeconds);
+  nsRefPtr<IDBTransaction> transaction =
+    IDBTransaction::Create(this, objectStores, nsIIDBTransaction::READ_WRITE,
+                           kDefaultDatabaseTimeoutSeconds);
 
   nsRefPtr<CreateObjectStoreHelper> helper =
     new CreateObjectStoreHelper(transaction, request, aName, keyPath,
@@ -441,10 +439,9 @@ IDBDatabaseRequest::RemoveObjectStore(const nsAString& aName,
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  nsRefPtr<IDBTransactionRequest> transaction =
-    IDBTransactionRequest::Create(this, storesToOpen,
-                                  nsIIDBTransaction::READ_WRITE,
-                                  kDefaultDatabaseTimeoutSeconds);
+  nsRefPtr<IDBTransaction> transaction =
+    IDBTransaction::Create(this, storesToOpen, nsIIDBTransaction::READ_WRITE,
+                           kDefaultDatabaseTimeoutSeconds);
   NS_ENSURE_TRUE(transaction, NS_ERROR_FAILURE);
 
 
@@ -475,10 +472,9 @@ IDBDatabaseRequest::SetVersion(const nsAString& aVersion,
 
   // Lock the whole database
   nsTArray<nsString> storesToOpen;
-  nsRefPtr<IDBTransactionRequest> transaction =
-    IDBTransactionRequest::Create(this, storesToOpen,
-                                  IDBTransactionRequest::FULL_LOCK,
-                                  kDefaultDatabaseTimeoutSeconds);
+  nsRefPtr<IDBTransaction> transaction =
+    IDBTransaction::Create(this, storesToOpen, IDBTransaction::FULL_LOCK,
+                           kDefaultDatabaseTimeoutSeconds);
   NS_ENSURE_TRUE(transaction, NS_ERROR_FAILURE);
 
   nsRefPtr<SetVersionHelper> helper =
@@ -495,7 +491,7 @@ IDBDatabaseRequest::Transaction(nsIVariant* aStoreNames,
                                 PRUint16 aMode,
                                 PRUint32 aTimeout,
                                 PRUint8 aOptionalArgCount,
-                                nsIIDBTransactionRequest** _retval)
+                                nsIIDBTransaction** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -617,9 +613,9 @@ IDBDatabaseRequest::Transaction(nsIVariant* aStoreNames,
       return NS_ERROR_ILLEGAL_VALUE;
   }
 
-  nsRefPtr<IDBTransactionRequest> transaction =
-    IDBTransactionRequest::Create(this, storesToOpen, aMode,
-                                  kDefaultDatabaseTimeoutSeconds);
+  nsRefPtr<IDBTransaction> transaction =
+    IDBTransaction::Create(this, storesToOpen, aMode,
+                           kDefaultDatabaseTimeoutSeconds);
   NS_ENSURE_TRUE(transaction, NS_ERROR_FAILURE);
 
   transaction.forget(_retval);
@@ -665,9 +661,9 @@ IDBDatabaseRequest::ObjectStore(const nsAString& aName,
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
-  nsRefPtr<IDBTransactionRequest> transaction =
-    IDBTransactionRequest::Create(this, storesToOpen, aMode,
-                                  kDefaultDatabaseTimeoutSeconds);
+  nsRefPtr<IDBTransaction> transaction =
+    IDBTransaction::Create(this, storesToOpen, aMode,
+                           kDefaultDatabaseTimeoutSeconds);
   NS_ENSURE_TRUE(transaction, NS_ERROR_FAILURE);
 
   nsresult rv = transaction->ObjectStore(aName, _retval);
diff --git a/dom/indexedDB/IDBDatabaseRequest.h b/dom/indexedDB/IDBDatabaseRequest.h
index eccf4ae9c028..2f40f556e95b 100644
--- a/dom/indexedDB/IDBDatabaseRequest.h
+++ b/dom/indexedDB/IDBDatabaseRequest.h
@@ -53,7 +53,7 @@ BEGIN_INDEXEDDB_NAMESPACE
 
 class AsyncConnectionHelper;
 struct DatabaseInfo;
-class IDBTransactionRequest;
+class IDBTransaction;
 
 class IDBDatabaseRequest : public IDBRequest::Generator,
                            public nsIIDBDatabaseRequest,
diff --git a/dom/indexedDB/IDBEvents.cpp b/dom/indexedDB/IDBEvents.cpp
index 637fcdba7425..d7707e38dd36 100644
--- a/dom/indexedDB/IDBEvents.cpp
+++ b/dom/indexedDB/IDBEvents.cpp
@@ -49,7 +49,7 @@
 #include "nsThreadUtils.h"
 
 #include "IDBRequest.h"
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 
 #define NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO_CONDITIONAL(_class, _condition)  \
   if ((_condition) && (aIID.Equals(NS_GET_IID(nsIClassInfo)) ||               \
@@ -294,7 +294,7 @@ IDBErrorEvent::SetMessage(const nsAString& aMessage)
 already_AddRefed<nsIDOMEvent>
 IDBSuccessEvent::Create(IDBRequest* aRequest,
                         nsIVariant* aResult,
-                        nsIIDBTransactionRequest* aTransaction)
+                        nsIIDBTransaction* aTransaction)
 {
   nsRefPtr<IDBSuccessEvent> event(new IDBSuccessEvent());
 
@@ -318,7 +318,7 @@ IDBSuccessEvent::Create(IDBRequest* aRequest,
 already_AddRefed<nsIRunnable>
 IDBSuccessEvent::CreateRunnable(IDBRequest* aRequest,
                                 nsIVariant* aResult,
-                                nsIIDBTransactionRequest* aTransaction)
+                                nsIIDBTransaction* aTransaction)
 {
   nsCOMPtr<nsIDOMEvent> event =
     IDBSuccessEvent::Create(aRequest, aResult, aTransaction);
@@ -351,16 +351,16 @@ IDBSuccessEvent::GetResult(nsIVariant** aResult)
 }
 
 NS_IMETHODIMP
-IDBSuccessEvent::GetTransaction(nsIIDBTransactionRequest** aTransaction)
+IDBSuccessEvent::GetTransaction(nsIIDBTransaction** aTransaction)
 {
-  nsCOMPtr<nsIIDBTransactionRequest> transaction(mTransaction);
+  nsCOMPtr<nsIIDBTransaction> transaction(mTransaction);
   transaction.forget(aTransaction);
   return NS_OK;
 }
 
 nsresult
 GetSuccessEvent::Init(IDBRequest* aRequest,
-                      IDBTransactionRequest* aTransaction)
+                      IDBTransaction* aTransaction)
 {
   mSource = aRequest->GetGenerator();
   mTransaction = aTransaction;
diff --git a/dom/indexedDB/IDBEvents.h b/dom/indexedDB/IDBEvents.h
index 8b81e02990ea..1e3a2a11cc1a 100644
--- a/dom/indexedDB/IDBEvents.h
+++ b/dom/indexedDB/IDBEvents.h
@@ -46,7 +46,7 @@
 #include "nsIIDBErrorEvent.h"
 #include "nsIIDBSuccessEvent.h"
 #include "nsIIDBTransactionEvent.h"
-#include "nsIIDBTransactionRequest.h"
+#include "nsIIDBTransaction.h"
 #include "nsIRunnable.h"
 #include "nsIVariant.h"
 
@@ -64,7 +64,7 @@
 BEGIN_INDEXEDDB_NAMESPACE
 
 class IDBRequest;
-class IDBTransactionRequest;
+class IDBTransaction;
 
 class IDBEvent : public nsDOMEvent,
                  public nsIIDBEvent
@@ -125,18 +125,18 @@ public:
   static already_AddRefed<nsIDOMEvent>
   Create(IDBRequest* aRequest,
          nsIVariant* aResult,
-         nsIIDBTransactionRequest* aTransaction);
+         nsIIDBTransaction* aTransaction);
 
   static already_AddRefed<nsIRunnable>
   CreateRunnable(IDBRequest* aRequest,
                  nsIVariant* aResult,
-                 nsIIDBTransactionRequest* aTransaction);
+                 nsIIDBTransaction* aTransaction);
 
 protected:
   IDBSuccessEvent() { }
 
   nsCOMPtr<nsIVariant> mResult;
-  nsCOMPtr<nsIIDBTransactionRequest> mTransaction;
+  nsCOMPtr<nsIIDBTransaction> mTransaction;
 };
 
 class GetSuccessEvent : public IDBSuccessEvent
@@ -158,7 +158,7 @@ public:
   NS_IMETHOD GetResult(nsIVariant** aResult);
 
   nsresult Init(IDBRequest* aRequest,
-                IDBTransactionRequest* aTransaction);
+                IDBTransaction* aTransaction);
 
 private:
   nsString mValue;
diff --git a/dom/indexedDB/IDBIndexRequest.cpp b/dom/indexedDB/IDBIndexRequest.cpp
index 3bae61d5300e..e1ab2dfc1400 100644
--- a/dom/indexedDB/IDBIndexRequest.cpp
+++ b/dom/indexedDB/IDBIndexRequest.cpp
@@ -51,7 +51,7 @@
 #include "IDBCursorRequest.h"
 #include "IDBEvents.h"
 #include "IDBObjectStoreRequest.h"
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 #include "DatabaseInfo.h"
 
 USING_INDEXEDDB_NAMESPACE
@@ -61,7 +61,7 @@ namespace {
 class GetHelper : public AsyncConnectionHelper
 {
 public:
-  GetHelper(IDBTransactionRequest* aTransaction,
+  GetHelper(IDBTransaction* aTransaction,
             IDBRequest* aRequest,
             const Key& aKey,
             PRInt64 aId,
@@ -85,7 +85,7 @@ protected:
 class GetObjectHelper : public GetHelper
 {
 public:
-  GetObjectHelper(IDBTransactionRequest* aTransaction,
+  GetObjectHelper(IDBTransaction* aTransaction,
                   IDBRequest* aRequest,
                   const Key& aKey,
                   PRInt64 aId,
@@ -104,7 +104,7 @@ protected:
 class GetAllHelper : public GetHelper
 {
 public:
-  GetAllHelper(IDBTransactionRequest* aTransaction,
+  GetAllHelper(IDBTransaction* aTransaction,
                IDBRequest* aRequest,
                const Key& aKey,
                PRInt64 aId,
@@ -126,7 +126,7 @@ protected:
 class GetAllObjectsHelper : public GetHelper
 {
 public:
-  GetAllObjectsHelper(IDBTransactionRequest* aTransaction,
+  GetAllObjectsHelper(IDBTransaction* aTransaction,
                       IDBRequest* aRequest,
                       const Key& aKey,
                       PRInt64 aId,
@@ -148,7 +148,7 @@ protected:
 class OpenCursorHelper : public AsyncConnectionHelper
 {
 public:
-  OpenCursorHelper(IDBTransactionRequest* aTransaction,
+  OpenCursorHelper(IDBTransaction* aTransaction,
                    IDBRequest* aRequest,
                    IDBIndexRequest* aIndex,
                    PRInt64 aId,
@@ -187,7 +187,7 @@ private:
 class OpenObjectCursorHelper : public AsyncConnectionHelper
 {
 public:
-  OpenObjectCursorHelper(IDBTransactionRequest* aTransaction,
+  OpenObjectCursorHelper(IDBTransaction* aTransaction,
                          IDBRequest* aRequest,
                          IDBIndexRequest* aIndex,
                          PRInt64 aId,
diff --git a/dom/indexedDB/IDBObjectStoreRequest.cpp b/dom/indexedDB/IDBObjectStoreRequest.cpp
index f4eefa07f0c0..f3aca6ed20c1 100644
--- a/dom/indexedDB/IDBObjectStoreRequest.cpp
+++ b/dom/indexedDB/IDBObjectStoreRequest.cpp
@@ -61,7 +61,7 @@
 #include "AsyncConnectionHelper.h"
 #include "IDBCursorRequest.h"
 #include "IDBKeyRange.h"
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 #include "DatabaseInfo.h"
 #include "Savepoint.h"
 
@@ -76,7 +76,7 @@ namespace {
 class AddHelper : public AsyncConnectionHelper
 {
 public:
-  AddHelper(IDBTransactionRequest* aTransaction,
+  AddHelper(IDBTransaction* aTransaction,
             IDBRequest* aRequest,
             PRInt64 aObjectStoreID,
             const nsAString& aKeyPath,
@@ -116,7 +116,7 @@ private:
 class GetHelper : public AsyncConnectionHelper
 {
 public:
-  GetHelper(IDBTransactionRequest* aTransaction,
+  GetHelper(IDBTransaction* aTransaction,
             IDBRequest* aRequest,
             PRInt64 aObjectStoreID,
             const Key& aKey,
@@ -142,7 +142,7 @@ private:
 class RemoveHelper : public GetHelper
 {
 public:
-  RemoveHelper(IDBTransactionRequest* aTransaction,
+  RemoveHelper(IDBTransaction* aTransaction,
                IDBRequest* aRequest,
                PRInt64 aObjectStoreID,
                const Key& aKey,
@@ -158,7 +158,7 @@ public:
 class OpenCursorHelper : public AsyncConnectionHelper
 {
 public:
-  OpenCursorHelper(IDBTransactionRequest* aTransaction,
+  OpenCursorHelper(IDBTransaction* aTransaction,
                    IDBRequest* aRequest,
                    IDBObjectStoreRequest* aObjectStore,
                    const Key& aLeftKey,
@@ -190,7 +190,7 @@ private:
 class CreateIndexHelper : public AsyncConnectionHelper
 {
 public:
-  CreateIndexHelper(IDBTransactionRequest* aTransaction,
+  CreateIndexHelper(IDBTransaction* aTransaction,
                     IDBRequest* aRequest,
                     const nsAString& aName,
                     const nsAString& aKeyPath,
@@ -222,7 +222,7 @@ private:
 class RemoveIndexHelper : public AsyncConnectionHelper
 {
 public:
-  RemoveIndexHelper(IDBTransactionRequest* aDatabase,
+  RemoveIndexHelper(IDBTransaction* aDatabase,
                     IDBRequest* aRequest,
                     const nsAString& aName,
                     IDBObjectStoreRequest* aObjectStore)
@@ -242,7 +242,7 @@ private:
 class GetAllHelper : public AsyncConnectionHelper
 {
 public:
-  GetAllHelper(IDBTransactionRequest* aTransaction,
+  GetAllHelper(IDBTransaction* aTransaction,
                IDBRequest* aRequest,
                PRInt64 aObjectStoreID,
                const Key& aLeftKey,
@@ -323,7 +323,7 @@ GetKeyFromObject(JSContext* aCx,
 // static
 already_AddRefed<IDBObjectStoreRequest>
 IDBObjectStoreRequest::Create(IDBDatabaseRequest* aDatabase,
-                              IDBTransactionRequest* aTransaction,
+                              IDBTransaction* aTransaction,
                               const ObjectStoreInfo* aStoreInfo,
                               PRUint16 aMode)
 {
@@ -559,7 +559,7 @@ IDBObjectStoreRequest::GetIndexUpdateInfo(ObjectStoreInfo* aObjectStoreInfo,
 
 /* static */
 nsresult
-IDBObjectStoreRequest::UpdateIndexes(IDBTransactionRequest* aTransaction,
+IDBObjectStoreRequest::UpdateIndexes(IDBTransaction* aTransaction,
                                      PRInt64 aObjectStoreId,
                                      const Key& aObjectStoreKey,
                                      bool aAutoIncrement,
diff --git a/dom/indexedDB/IDBObjectStoreRequest.h b/dom/indexedDB/IDBObjectStoreRequest.h
index f02f5490c515..eb5f119930f5 100644
--- a/dom/indexedDB/IDBObjectStoreRequest.h
+++ b/dom/indexedDB/IDBObjectStoreRequest.h
@@ -42,7 +42,7 @@
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 #include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
-#include "mozilla/dom/indexedDB/IDBTransactionRequest.h"
+#include "mozilla/dom/indexedDB/IDBTransaction.h"
 
 #include "nsIIDBObjectStoreRequest.h"
 
@@ -215,7 +215,7 @@ public:
 
   static already_AddRefed<IDBObjectStoreRequest>
   Create(IDBDatabaseRequest* aDatabase,
-         IDBTransactionRequest* aTransaction,
+         IDBTransaction* aTransaction,
          const ObjectStoreInfo* aInfo,
          PRUint16 aMode);
 
@@ -240,7 +240,7 @@ public:
                      nsTArray<IndexUpdateInfo>& aUpdateInfoArray);
 
   static nsresult
-  UpdateIndexes(IDBTransactionRequest* aTransaction,
+  UpdateIndexes(IDBTransaction* aTransaction,
                 PRInt64 aObjectStoreId,
                 const Key& aObjectStoreKey,
                 bool aAutoIncrement,
@@ -274,7 +274,7 @@ public:
     return mKeyPath;
   }
 
-  IDBTransactionRequest* Transaction()
+  IDBTransaction* Transaction()
   {
     return mTransaction;
   }
@@ -293,7 +293,7 @@ protected:
 
 private:
   nsRefPtr<IDBDatabaseRequest> mDatabase;
-  nsRefPtr<IDBTransactionRequest> mTransaction;
+  nsRefPtr<IDBTransaction> mTransaction;
 
   PRInt64 mId;
   nsString mName;
diff --git a/dom/indexedDB/IDBTransactionRequest.cpp b/dom/indexedDB/IDBTransaction.cpp
similarity index 86%
rename from dom/indexedDB/IDBTransactionRequest.cpp
rename to dom/indexedDB/IDBTransaction.cpp
index 8ceda9559c22..379a4b368578 100644
--- a/dom/indexedDB/IDBTransactionRequest.cpp
+++ b/dom/indexedDB/IDBTransaction.cpp
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 
 #include "mozilla/storage.h"
 #include "nsDOMClassInfo.h"
@@ -71,15 +71,15 @@ DoomCachedStatements(const nsACString& aQuery,
 } // anonymous namespace
 
 // static
-already_AddRefed<IDBTransactionRequest>
-IDBTransactionRequest::Create(IDBDatabaseRequest* aDatabase,
-                              nsTArray<nsString>& aObjectStoreNames,
-                              PRUint16 aMode,
-                              PRUint32 aTimeout)
+already_AddRefed<IDBTransaction>
+IDBTransaction::Create(IDBDatabaseRequest* aDatabase,
+                       nsTArray<nsString>& aObjectStoreNames,
+                       PRUint16 aMode,
+                       PRUint32 aTimeout)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  nsRefPtr<IDBTransactionRequest> transaction = new IDBTransactionRequest();
+  nsRefPtr<IDBTransaction> transaction = new IDBTransaction();
 
   transaction->mDatabase = aDatabase;
   transaction->mMode = aMode;
@@ -98,7 +98,7 @@ IDBTransactionRequest::Create(IDBDatabaseRequest* aDatabase,
   return transaction.forget();
 }
 
-IDBTransactionRequest::IDBTransactionRequest()
+IDBTransaction::IDBTransaction()
 : mReadyState(nsIIDBTransaction::INITIAL),
   mMode(nsIIDBTransaction::READ_ONLY),
   mTimeout(0),
@@ -110,7 +110,7 @@ IDBTransactionRequest::IDBTransactionRequest()
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 }
 
-IDBTransactionRequest::~IDBTransactionRequest()
+IDBTransaction::~IDBTransaction()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!mPendingRequests, "Should have no pending requests here!");
@@ -123,7 +123,7 @@ IDBTransactionRequest::~IDBTransactionRequest()
 }
 
 void
-IDBTransactionRequest::OnNewRequest()
+IDBTransaction::OnNewRequest()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   if (!mPendingRequests) {
@@ -135,7 +135,7 @@ IDBTransactionRequest::OnNewRequest()
 }
 
 void
-IDBTransactionRequest::OnRequestFinished()
+IDBTransaction::OnRequestFinished()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(mPendingRequests, "Mismatched calls!");
@@ -151,7 +151,7 @@ IDBTransactionRequest::OnRequestFinished()
 }
 
 nsresult
-IDBTransactionRequest::CommitOrRollback()
+IDBTransaction::CommitOrRollback()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(mReadyState == nsIIDBTransaction::DONE, "Bad readyState!");
@@ -171,7 +171,7 @@ IDBTransactionRequest::CommitOrRollback()
 }
 
 bool
-IDBTransactionRequest::StartSavepoint()
+IDBTransaction::StartSavepoint()
 {
   NS_PRECONDITION(!NS_IsMainThread(), "Wrong thread!");
   NS_PRECONDITION(mConnection, "No connection!");
@@ -199,7 +199,7 @@ IDBTransactionRequest::StartSavepoint()
 }
 
 nsresult
-IDBTransactionRequest::ReleaseSavepoint()
+IDBTransaction::ReleaseSavepoint()
 {
   NS_PRECONDITION(!NS_IsMainThread(), "Wrong thread!");
   NS_PRECONDITION(mConnection, "No connection!");
@@ -216,7 +216,7 @@ IDBTransactionRequest::ReleaseSavepoint()
 }
 
 void
-IDBTransactionRequest::RollbackSavepoint()
+IDBTransaction::RollbackSavepoint()
 {
   NS_PRECONDITION(!NS_IsMainThread(), "Wrong thread!");
   NS_PRECONDITION(mConnection, "No connection!");
@@ -232,7 +232,7 @@ IDBTransactionRequest::RollbackSavepoint()
 }
 
 nsresult
-IDBTransactionRequest::GetOrCreateConnection(mozIStorageConnection** aResult)
+IDBTransaction::GetOrCreateConnection(mozIStorageConnection** aResult)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
 
@@ -250,9 +250,9 @@ IDBTransactionRequest::GetOrCreateConnection(mozIStorageConnection** aResult)
 }
 
 already_AddRefed<mozIStorageStatement>
-IDBTransactionRequest::AddStatement(bool aCreate,
-                                    bool aOverwrite,
-                                    bool aAutoIncrement)
+IDBTransaction::AddStatement(bool aCreate,
+                             bool aOverwrite,
+                             bool aAutoIncrement)
 {
 #ifdef DEBUG
   if (!aCreate) {
@@ -301,7 +301,7 @@ IDBTransactionRequest::AddStatement(bool aCreate,
 }
 
 already_AddRefed<mozIStorageStatement>
-IDBTransactionRequest::RemoveStatement(bool aAutoIncrement)
+IDBTransaction::RemoveStatement(bool aAutoIncrement)
 {
   if (aAutoIncrement) {
     return GetCachedStatement(
@@ -318,7 +318,7 @@ IDBTransactionRequest::RemoveStatement(bool aAutoIncrement)
 }
 
 already_AddRefed<mozIStorageStatement>
-IDBTransactionRequest::GetStatement(bool aAutoIncrement)
+IDBTransaction::GetStatement(bool aAutoIncrement)
 {
   if (aAutoIncrement) {
     return GetCachedStatement(
@@ -337,8 +337,8 @@ IDBTransactionRequest::GetStatement(bool aAutoIncrement)
 }
 
 already_AddRefed<mozIStorageStatement>
-IDBTransactionRequest::IndexGetStatement(bool aUnique,
-                                         bool aAutoIncrement)
+IDBTransaction::IndexGetStatement(bool aUnique,
+                                  bool aAutoIncrement)
 {
   if (aAutoIncrement) {
     if (aUnique) {
@@ -373,8 +373,8 @@ IDBTransactionRequest::IndexGetStatement(bool aUnique,
 }
 
 already_AddRefed<mozIStorageStatement>
-IDBTransactionRequest::IndexGetObjectStatement(bool aUnique,
-                                               bool aAutoIncrement)
+IDBTransaction::IndexGetObjectStatement(bool aUnique,
+                                        bool aAutoIncrement)
 {
   if (aAutoIncrement) {
     if (aUnique) {
@@ -417,9 +417,9 @@ IDBTransactionRequest::IndexGetObjectStatement(bool aUnique,
 }
 
 already_AddRefed<mozIStorageStatement>
-IDBTransactionRequest::IndexUpdateStatement(bool aAutoIncrement,
-                                            bool aUnique,
-                                            bool aOverwrite)
+IDBTransaction::IndexUpdateStatement(bool aAutoIncrement,
+                                     bool aUnique,
+                                     bool aOverwrite)
 {
   if (aAutoIncrement) {
     if (aUnique) {
@@ -478,7 +478,7 @@ IDBTransactionRequest::IndexUpdateStatement(bool aAutoIncrement,
 }
 
 already_AddRefed<mozIStorageStatement>
-IDBTransactionRequest::GetCachedStatement(const nsACString& aQuery)
+IDBTransaction::GetCachedStatement(const nsACString& aQuery)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(!aQuery.IsEmpty(), "Empty sql statement!");
@@ -513,7 +513,7 @@ IDBTransactionRequest::GetCachedStatement(const nsACString& aQuery)
 
 #ifdef DEBUG
 bool
-IDBTransactionRequest::TransactionIsOpen() const
+IDBTransaction::TransactionIsOpen() const
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   return mReadyState == nsIIDBTransaction::INITIAL ||
@@ -521,42 +521,41 @@ IDBTransactionRequest::TransactionIsOpen() const
 }
 
 bool
-IDBTransactionRequest::IsWriteAllowed() const
+IDBTransaction::IsWriteAllowed() const
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   return mMode == nsIIDBTransaction::READ_WRITE;
 }
 #endif
 
-NS_IMPL_CYCLE_COLLECTION_CLASS(IDBTransactionRequest)
+NS_IMPL_CYCLE_COLLECTION_CLASS(IDBTransaction)
 
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBTransactionRequest,
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IDBTransaction,
                                                   nsDOMEventTargetHelper)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnCompleteListener)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnAbortListener)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOnTimeoutListener)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(IDBTransactionRequest,
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(IDBTransaction,
                                                 nsDOMEventTargetHelper)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnCompleteListener)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnAbortListener)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mOnTimeoutListener)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBTransactionRequest)
-  NS_INTERFACE_MAP_ENTRY(nsIIDBTransactionRequest)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IDBTransaction)
   NS_INTERFACE_MAP_ENTRY(nsIIDBTransaction)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBTransactionRequest)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBTransaction)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
 
-NS_IMPL_ADDREF_INHERITED(IDBTransactionRequest, nsDOMEventTargetHelper)
-NS_IMPL_RELEASE_INHERITED(IDBTransactionRequest, nsDOMEventTargetHelper)
+NS_IMPL_ADDREF_INHERITED(IDBTransaction, nsDOMEventTargetHelper)
+NS_IMPL_RELEASE_INHERITED(IDBTransaction, nsDOMEventTargetHelper)
 
-DOMCI_DATA(IDBTransactionRequest, IDBTransactionRequest)
+DOMCI_DATA(IDBTransaction, IDBTransaction)
 
 NS_IMETHODIMP
-IDBTransactionRequest::GetDb(nsIIDBDatabase** aDB)
+IDBTransaction::GetDb(nsIIDBDatabase** aDB)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -565,7 +564,7 @@ IDBTransactionRequest::GetDb(nsIIDBDatabase** aDB)
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::GetReadyState(PRUint16* aReadyState)
+IDBTransaction::GetReadyState(PRUint16* aReadyState)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -574,17 +573,17 @@ IDBTransactionRequest::GetReadyState(PRUint16* aReadyState)
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::GetMode(PRUint16* aMode)
+IDBTransaction::GetMode(PRUint16* aMode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  *aMode = mMode == IDBTransactionRequest::FULL_LOCK ?
+  *aMode = mMode == IDBTransaction::FULL_LOCK ?
            nsIIDBTransaction::READ_WRITE : mMode;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
+IDBTransaction::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -593,7 +592,7 @@ IDBTransactionRequest::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
   nsTArray<nsString> stackArray;
   nsTArray<nsString>* arrayOfNames;
 
-  if (mMode == IDBTransactionRequest::FULL_LOCK) {
+  if (mMode == IDBTransaction::FULL_LOCK) {
     DatabaseInfo* info;
     if (!DatabaseInfo::Get(mDatabase->Id(), &info)) {
       NS_ERROR("This should never fail!");
@@ -621,8 +620,8 @@ IDBTransactionRequest::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::ObjectStore(const nsAString& aName,
-                                   nsIIDBObjectStoreRequest** _retval)
+IDBTransaction::ObjectStore(const nsAString& aName,
+                            nsIIDBObjectStoreRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -656,7 +655,7 @@ IDBTransactionRequest::ObjectStore(const nsAString& aName,
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::Abort()
+IDBTransaction::Abort()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -671,7 +670,7 @@ IDBTransactionRequest::Abort()
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::GetOncomplete(nsIDOMEventListener** aOncomplete)
+IDBTransaction::GetOncomplete(nsIDOMEventListener** aOncomplete)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -679,7 +678,7 @@ IDBTransactionRequest::GetOncomplete(nsIDOMEventListener** aOncomplete)
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::SetOncomplete(nsIDOMEventListener* aOncomplete)
+IDBTransaction::SetOncomplete(nsIDOMEventListener* aOncomplete)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -688,7 +687,7 @@ IDBTransactionRequest::SetOncomplete(nsIDOMEventListener* aOncomplete)
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::GetOnabort(nsIDOMEventListener** aOnabort)
+IDBTransaction::GetOnabort(nsIDOMEventListener** aOnabort)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -696,7 +695,7 @@ IDBTransactionRequest::GetOnabort(nsIDOMEventListener** aOnabort)
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::SetOnabort(nsIDOMEventListener* aOnabort)
+IDBTransaction::SetOnabort(nsIDOMEventListener* aOnabort)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -705,7 +704,7 @@ IDBTransactionRequest::SetOnabort(nsIDOMEventListener* aOnabort)
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::GetOntimeout(nsIDOMEventListener** aOntimeout)
+IDBTransaction::GetOntimeout(nsIDOMEventListener** aOntimeout)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -713,7 +712,7 @@ IDBTransactionRequest::GetOntimeout(nsIDOMEventListener** aOntimeout)
 }
 
 NS_IMETHODIMP
-IDBTransactionRequest::SetOntimeout(nsIDOMEventListener* aOntimeout)
+IDBTransaction::SetOntimeout(nsIDOMEventListener* aOntimeout)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
diff --git a/dom/indexedDB/IDBTransactionRequest.h b/dom/indexedDB/IDBTransaction.h
similarity index 88%
rename from dom/indexedDB/IDBTransactionRequest.h
rename to dom/indexedDB/IDBTransaction.h
index 5ef45a21b2ec..90af936d7327 100644
--- a/dom/indexedDB/IDBTransactionRequest.h
+++ b/dom/indexedDB/IDBTransaction.h
@@ -37,13 +37,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef mozilla_dom_indexeddb_idbtransactionrequest_h__
-#define mozilla_dom_indexeddb_idbtransactionrequest_h__
+#ifndef mozilla_dom_indexeddb_idbtransaction_h__
+#define mozilla_dom_indexeddb_idbtransaction_h__
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 #include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
 
-#include "nsIIDBTransactionRequest.h"
+#include "nsIIDBTransaction.h"
 #include "nsIRunnable.h"
 
 #include "nsDOMEventTargetHelper.h"
@@ -62,9 +62,9 @@ class CommitHelper;
 struct ObjectStoreInfo;
 class TransactionThreadPool;
 
-class IDBTransactionRequest : public nsDOMEventTargetHelper,
-                              public IDBRequest::Generator,
-                              public nsIIDBTransactionRequest
+class IDBTransaction : public nsDOMEventTargetHelper,
+                       public IDBRequest::Generator,
+                       public nsIIDBTransaction
 {
   friend class AsyncConnectionHelper;
   friend class CommitHelper;
@@ -73,12 +73,11 @@ class IDBTransactionRequest : public nsDOMEventTargetHelper,
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIIDBTRANSACTION
-  NS_DECL_NSIIDBTRANSACTIONREQUEST
 
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(IDBTransactionRequest,
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(IDBTransaction,
                                            nsDOMEventTargetHelper)
 
-  static already_AddRefed<IDBTransactionRequest>
+  static already_AddRefed<IDBTransaction>
   Create(IDBDatabaseRequest* aDatabase,
          nsTArray<nsString>& aObjectStoreNames,
          PRUint16 aMode,
@@ -146,8 +145,8 @@ public:
   enum { FULL_LOCK = nsIIDBTransaction::SNAPSHOT_READ + 1 };
 
 private:
-  IDBTransactionRequest();
-  ~IDBTransactionRequest();
+  IDBTransaction();
+  ~IDBTransaction();
 
   // Only meant to be called on mStorageThread!
   nsresult GetOrCreateConnection(mozIStorageConnection** aConnection);
@@ -183,7 +182,7 @@ NS_STACK_CLASS
 class AutoTransactionRequestNotifier
 {
 public:
-  AutoTransactionRequestNotifier(IDBTransactionRequest* aTransaction)
+  AutoTransactionRequestNotifier(IDBTransaction* aTransaction)
   : mTransaction(aTransaction)
   {
     NS_ASSERTION(mTransaction, "Null pointer!");
@@ -196,7 +195,7 @@ public:
   }
 
 private:
-  nsRefPtr<IDBTransactionRequest> mTransaction;
+  nsRefPtr<IDBTransaction> mTransaction;
 };
 
 class CommitHelper : public nsIRunnable
@@ -205,7 +204,7 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIRUNNABLE
 
-  CommitHelper(IDBTransactionRequest* aTransaction)
+  CommitHelper(IDBTransaction* aTransaction)
   : mTransaction(aTransaction),
     mAborted(!!aTransaction->mAborted),
     mHasInitialSavepoint(!!aTransaction->mHasInitialSavepoint)
@@ -227,7 +226,7 @@ public:
   }
 
 private:
-  nsRefPtr<IDBTransactionRequest> mTransaction;
+  nsRefPtr<IDBTransaction> mTransaction;
   nsCOMPtr<mozIStorageConnection> mConnection;
   nsAutoTArray<nsCOMPtr<nsISupports>, 10> mDoomedObjects;
   bool mAborted;
@@ -236,4 +235,4 @@ private:
 
 END_INDEXEDDB_NAMESPACE
 
-#endif // mozilla_dom_indexeddb_idbtransactionrequest_h__
+#endif // mozilla_dom_indexeddb_idbtransaction_h__
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index 61101c0706e6..9cc79e97f596 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -61,7 +61,7 @@ CPPSRCS = \
   IDBKeyRange.cpp \
   IDBObjectStoreRequest.cpp \
   IDBRequest.cpp \
-  IDBTransactionRequest.cpp \
+  IDBTransaction.cpp \
   IDBFactory.cpp \
   LazyIdleThread.cpp \
   TransactionThreadPool.cpp \
@@ -75,7 +75,7 @@ EXPORTS_mozilla/dom/indexedDB = \
   IDBKeyRange.h \
   IDBObjectStoreRequest.h \
   IDBRequest.h \
-  IDBTransactionRequest.h \
+  IDBTransaction.h \
   IndexedDatabase.h \
   IDBFactory.h \
   LazyIdleThread.h \
@@ -108,7 +108,6 @@ XPIDLSRCS = \
   nsIIDBSuccessEvent.idl \
   nsIIDBTransaction.idl \
   nsIIDBTransactionEvent.idl \
-  nsIIDBTransactionRequest.idl \
   nsIIDBFactory.idl \
   $(NULL)
 
diff --git a/dom/indexedDB/Savepoint.h b/dom/indexedDB/Savepoint.h
index a484637969a5..7119fddb1202 100644
--- a/dom/indexedDB/Savepoint.h
+++ b/dom/indexedDB/Savepoint.h
@@ -41,7 +41,7 @@
 #define mozilla_dom_indexeddb_savepoint_h__
 
 // Only meant to be included in IndexedDB source files, not exported.
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 
 BEGIN_INDEXEDDB_NAMESPACE
 
@@ -49,7 +49,7 @@ NS_STACK_CLASS
 class Savepoint
 {
 public:
-  Savepoint(IDBTransactionRequest* aTransaction)
+  Savepoint(IDBTransaction* aTransaction)
   : mTransaction(aTransaction)
   , mHasSavepoint(false)
   {
@@ -77,7 +77,7 @@ public:
   }
 
 private:
-  IDBTransactionRequest* mTransaction;
+  IDBTransaction* mTransaction;
   bool mHasSavepoint;
 };
 
diff --git a/dom/indexedDB/TransactionThreadPool.cpp b/dom/indexedDB/TransactionThreadPool.cpp
index 5fb530406401..b421e532dd93 100644
--- a/dom/indexedDB/TransactionThreadPool.cpp
+++ b/dom/indexedDB/TransactionThreadPool.cpp
@@ -71,7 +71,7 @@ struct QueuedDispatchInfo
   : finish(false)
   { }
 
-  nsRefPtr<IDBTransactionRequest> transaction;
+  nsRefPtr<IDBTransaction> transaction;
   nsCOMPtr<nsIRunnable> runnable;
   nsCOMPtr<nsIRunnable> finishRunnable;
   bool finish;
@@ -83,11 +83,11 @@ public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIRUNNABLE
 
-  inline FinishTransactionRunnable(IDBTransactionRequest* aTransaction,
+  inline FinishTransactionRunnable(IDBTransaction* aTransaction,
                                    nsCOMPtr<nsIRunnable>& aFinishRunnable);
 
 private:
-  IDBTransactionRequest* mTransaction;
+  IDBTransaction* mTransaction;
   nsCOMPtr<nsIRunnable> mFinishRunnable;
 };
 
@@ -189,13 +189,13 @@ TransactionThreadPool::Cleanup()
 }
 
 void
-TransactionThreadPool::FinishTransaction(IDBTransactionRequest* aTransaction)
+TransactionThreadPool::FinishTransaction(IDBTransaction* aTransaction)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(aTransaction, "Null pointer!");
 
   // AddRef here because removing from the hash will call Release.
-  nsRefPtr<IDBTransactionRequest> transaction(aTransaction);
+  nsRefPtr<IDBTransaction> transaction(aTransaction);
 
   const PRUint32 databaseId = aTransaction->mDatabase->Id();
 
@@ -211,7 +211,7 @@ TransactionThreadPool::FinishTransaction(IDBTransactionRequest* aTransaction)
   PRUint32 count = transactionsInProgress.Length();
 
 #ifdef DEBUG
-  if (aTransaction->mMode == IDBTransactionRequest::FULL_LOCK) {
+  if (aTransaction->mMode == IDBTransaction::FULL_LOCK) {
     NS_ASSERTION(dbTransactionInfo->locked, "Should be locked!");
     NS_ASSERTION(count == 1, "More transactions running than should be!");
   }
@@ -255,7 +255,7 @@ TransactionThreadPool::FinishTransaction(IDBTransactionRequest* aTransaction)
 }
 
 bool
-TransactionThreadPool::TransactionCanRun(IDBTransactionRequest* aTransaction,
+TransactionThreadPool::TransactionCanRun(IDBTransaction* aTransaction,
                                          TransactionQueue** aQueue)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@@ -279,7 +279,7 @@ TransactionThreadPool::TransactionCanRun(IDBTransactionRequest* aTransaction,
 
   PRUint32 transactionCount = transactionsInProgress.Length();
 
-  if (mode == IDBTransactionRequest::FULL_LOCK) {
+  if (mode == IDBTransaction::FULL_LOCK) {
     switch (transactionCount) {
       case 0: {
         *aQueue = nsnull;
@@ -390,7 +390,7 @@ TransactionThreadPool::TransactionCanRun(IDBTransactionRequest* aTransaction,
 }
 
 nsresult
-TransactionThreadPool::Dispatch(IDBTransactionRequest* aTransaction,
+TransactionThreadPool::Dispatch(IDBTransaction* aTransaction,
                                 nsIRunnable* aRunnable,
                                 bool aFinish,
                                 nsIRunnable* aFinishRunnable)
@@ -423,7 +423,7 @@ TransactionThreadPool::Dispatch(IDBTransactionRequest* aTransaction,
   const PRUint32 databaseId = aTransaction->mDatabase->Id();
 
 #ifdef DEBUG
-  if (aTransaction->mMode == IDBTransactionRequest::FULL_LOCK) {
+  if (aTransaction->mMode == IDBTransaction::FULL_LOCK) {
     NS_ASSERTION(!mTransactionsInProgress.Get(databaseId, nsnull),
                  "Shouldn't have anything in progress!");
   }
@@ -438,7 +438,7 @@ TransactionThreadPool::Dispatch(IDBTransactionRequest* aTransaction,
     dbTransactionInfo = autoDBTransactionInfo;
   }
 
-  if (aTransaction->mMode == IDBTransactionRequest::FULL_LOCK) {
+  if (aTransaction->mMode == IDBTransaction::FULL_LOCK) {
     NS_ASSERTION(!dbTransactionInfo->locked, "Already locked?!");
     dbTransactionInfo->locked = true;
   }
@@ -494,7 +494,7 @@ TransactionThreadPool::Observe(nsISupports* /* aSubject */,
 }
 
 TransactionThreadPool::
-TransactionQueue::TransactionQueue(IDBTransactionRequest* aTransaction,
+TransactionQueue::TransactionQueue(IDBTransaction* aTransaction,
                                    nsIRunnable* aRunnable)
 : mMutex("TransactionQueue::mMutex"),
   mCondVar(mMutex, "TransactionQueue::mCondVar"),
@@ -585,7 +585,7 @@ TransactionThreadPool::TransactionQueue::Run()
 }
 
 FinishTransactionRunnable::FinishTransactionRunnable(
-                                         IDBTransactionRequest* aTransaction,
+                                         IDBTransaction* aTransaction,
                                          nsCOMPtr<nsIRunnable>& aFinishRunnable)
 : mTransaction(aTransaction)
 {
diff --git a/dom/indexedDB/TransactionThreadPool.h b/dom/indexedDB/TransactionThreadPool.h
index 1fad4bed0f1b..26b49d48bc32 100644
--- a/dom/indexedDB/TransactionThreadPool.h
+++ b/dom/indexedDB/TransactionThreadPool.h
@@ -51,7 +51,7 @@
 #include "nsHashKeys.h"
 #include "nsRefPtrHashtable.h"
 
-#include "IDBTransactionRequest.h"
+#include "IDBTransaction.h"
 
 class nsIRunnable;
 class nsIThreadPool;
@@ -73,7 +73,7 @@ public:
   static TransactionThreadPool* GetOrCreate();
   static void Shutdown();
 
-  nsresult Dispatch(IDBTransactionRequest* aTransaction,
+  nsresult Dispatch(IDBTransaction* aTransaction,
                     nsIRunnable* aRunnable,
                     bool aFinish,
                     nsIRunnable* aFinishRunnable);
@@ -85,7 +85,7 @@ protected:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIRUNNABLE
 
-    inline TransactionQueue(IDBTransactionRequest* aTransaction,
+    inline TransactionQueue(IDBTransaction* aTransaction,
                             nsIRunnable* aRunnable);
 
     inline void Dispatch(nsIRunnable* aRunnable);
@@ -95,7 +95,7 @@ protected:
   private:
     mozilla::Mutex mMutex;
     mozilla::CondVar mCondVar;
-    IDBTransactionRequest* mTransaction;
+    IDBTransaction* mTransaction;
     nsAutoTArray<nsCOMPtr<nsIRunnable>, 10> mQueue;
     nsCOMPtr<nsIRunnable> mFinishRunnable;
     bool mShouldFinish;
@@ -118,7 +118,7 @@ protected:
     : mode(nsIIDBTransaction::READ_ONLY)
     { }
 
-    nsRefPtr<IDBTransactionRequest> transaction;
+    nsRefPtr<IDBTransaction> transaction;
     nsRefPtr<TransactionQueue> queue;
     nsTArray<TransactionObjectStoreInfo> objectStoreInfo;
     PRUint16 mode;
@@ -141,9 +141,9 @@ protected:
   nsresult Init();
   nsresult Cleanup();
 
-  void FinishTransaction(IDBTransactionRequest* aTransaction);
+  void FinishTransaction(IDBTransaction* aTransaction);
 
-  bool TransactionCanRun(IDBTransactionRequest* aTransaction,
+  bool TransactionCanRun(IDBTransaction* aTransaction,
                          TransactionQueue** aQueue);
 
   nsCOMPtr<nsIThreadPool> mThreadPool;
diff --git a/dom/indexedDB/nsIIDBDatabaseRequest.idl b/dom/indexedDB/nsIIDBDatabaseRequest.idl
index ee57f70166a1..c819e2e307e0 100644
--- a/dom/indexedDB/nsIIDBDatabaseRequest.idl
+++ b/dom/indexedDB/nsIIDBDatabaseRequest.idl
@@ -42,7 +42,7 @@
 interface nsIVariant;
 interface nsIIDBObjectStoreRequest;
 interface nsIIDBRequest;
-interface nsIIDBTransactionRequest;
+interface nsIIDBTransaction;
 
 /**
  * IDBDatabaseRequest interface.  See
@@ -64,7 +64,7 @@ interface nsIIDBDatabaseRequest : nsIIDBDatabase
   setVersion(in AString version);
 
   [optional_argc]
-  nsIIDBTransactionRequest
+  nsIIDBTransaction
   transaction(in nsIVariant storeNames, // js array of strings
               [optional /* READ_ONLY */] in unsigned short mode,
               [optional /* 5000ms */] in unsigned long timeout);
diff --git a/dom/indexedDB/nsIIDBTransaction.idl b/dom/indexedDB/nsIIDBTransaction.idl
index 40a976756797..ead9dcf15300 100644
--- a/dom/indexedDB/nsIIDBTransaction.idl
+++ b/dom/indexedDB/nsIIDBTransaction.idl
@@ -39,15 +39,18 @@
 
 #include "nsISupports.idl"
 
+interface nsIDOMEventListener;
+interface nsIIDBObjectStoreRequest;
+interface nsIIDBRequest;
 interface nsIIDBDatabase;
 interface nsIDOMDOMStringList;
 
 /**
  * IDBDTransaction interface.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBDTransaction for more
- * information.
+ * http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#idl-def-IDBTransaction
+ * for more information.
  */
-[scriptable, uuid(00c3f651-f4bf-416b-9dc4-759135a35fa9)]
+[scriptable, uuid(99bb825e-56aa-4cb9-b640-4fadb00b874d)]
 interface nsIIDBTransaction : nsISupports
 {
   readonly attribute nsIIDBDatabase db;
@@ -63,4 +66,24 @@ interface nsIIDBTransaction : nsISupports
   readonly attribute unsigned short mode;
 
   readonly attribute nsIDOMDOMStringList objectStoreNames;
+
+  nsIIDBObjectStoreRequest
+  objectStore(in AString name);
+
+  // Don't commit the transaction.
+  void abort();
+
+  // Event listener that fires when the transaction is completed
+  // successfully. Receives an Event.
+  attribute nsIDOMEventListener oncomplete;
+
+  // Event listener that fires when the transaction is aborted.
+  // Receives an Event.
+  attribute nsIDOMEventListener onabort;
+
+  // Event listener that fires when the transaction times out while
+  // attempting to grab the relevant locks, as specified by the
+  // timeoutSeconds parameter
+  // Receives an Event.
+  attribute nsIDOMEventListener ontimeout;
 };
diff --git a/dom/indexedDB/nsIIDBTransactionEvent.idl b/dom/indexedDB/nsIIDBTransactionEvent.idl
index bdef01343866..1eee0b976b2e 100644
--- a/dom/indexedDB/nsIIDBTransactionEvent.idl
+++ b/dom/indexedDB/nsIIDBTransactionEvent.idl
@@ -39,10 +39,10 @@
 
 #include "nsIIDBSuccessEvent.idl"
 
-interface nsIIDBTransactionRequest;
+interface nsIIDBTransaction;
 
-[scriptable, uuid(f84fa3ee-2df2-4d55-b8bc-27d7d9438336)]
+[scriptable, uuid(cdf58757-78b9-4f5f-8559-1bf96e1cdfba)]
 interface nsIIDBTransactionEvent : nsIIDBSuccessEvent
 {
-  readonly attribute nsIIDBTransactionRequest transaction;
+  readonly attribute nsIIDBTransaction transaction;
 };
diff --git a/dom/indexedDB/nsIIDBTransactionRequest.idl b/dom/indexedDB/nsIIDBTransactionRequest.idl
deleted file mode 100644
index b1b5af2ce2d8..000000000000
--- a/dom/indexedDB/nsIIDBTransactionRequest.idl
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* ***** 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 Indexed Database.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ben Turner <bent.mozilla@gmail.com>
- *
- * 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 "nsIIDBTransaction.idl"
-
-interface nsIDOMEventListener;
-interface nsIIDBObjectStoreRequest;
-interface nsIIDBRequest;
-
-/**
- * IDBDTransactionRequest interface.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBDTransactionRequest for
- * more information.
- */
-[scriptable, uuid(073f5f2e-fecc-4f96-bba2-d8a90532c926)]
-interface nsIIDBTransactionRequest : nsIIDBTransaction
-{
-  nsIIDBObjectStoreRequest
-  objectStore(in AString name);
-
-  // Don't commit the transaction.
-  void abort();
-
-  // Event listener that fires when the transaction is completed
-  // successfully. Receives an Event.
-  attribute nsIDOMEventListener oncomplete;
-
-  // Event listener that fires when the transaction is aborted.
-  // Receives an Event.
-  attribute nsIDOMEventListener onabort;
-
-  // Event listener that fires when the transaction times out while
-  // attempting to grab the relevant locks, as specified by the
-  // timeoutSeconds parameter
-  // Receives an Event.
-  attribute nsIDOMEventListener ontimeout;
-};
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index bae19128b3d2..eeedc6100524 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -477,7 +477,6 @@ members = [
 #    'nsIIDBSuccessEvent.*',
     'nsIIDBTransaction.*',
     'nsIIDBTransactionEvent.*',
-    'nsIIDBTransactionRequest.*',
     'nsIIDBFactory.*',
 # Remove once XPIDL can handle jsvals
     '-nsIIDBObjectStoreRequest.add',

From a2baef313654777ba949bcc353a61d8abb62f825 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Mon, 28 Jun 2010 09:46:49 -0700
Subject: [PATCH 140/172] Bug 574811 - Rename IDBDatabaseRequest to IDBDatabase
 Updating interface names per recent specification changes. r=bent

--HG--
rename : dom/indexedDB/IDBDatabaseRequest.cpp => dom/indexedDB/IDBDatabase.cpp
rename : dom/indexedDB/IDBDatabaseRequest.h => dom/indexedDB/IDBDatabase.h
---
 dom/base/nsDOMClassInfo.cpp                   |  7 +-
 dom/base/nsDOMClassInfoClasses.h              |  2 +-
 dom/indexedDB/AsyncConnectionHelper.cpp       |  4 +-
 dom/indexedDB/AsyncConnectionHelper.h         |  6 +-
 ...IDBDatabaseRequest.cpp => IDBDatabase.cpp} | 81 +++++++++----------
 .../{IDBDatabaseRequest.h => IDBDatabase.h}   | 21 +++--
 dom/indexedDB/IDBFactory.cpp                  |  7 +-
 dom/indexedDB/IDBObjectStoreRequest.cpp       |  2 +-
 dom/indexedDB/IDBObjectStoreRequest.h         |  6 +-
 dom/indexedDB/IDBRequest.h                    |  2 +-
 dom/indexedDB/IDBTransaction.cpp              |  2 +-
 dom/indexedDB/IDBTransaction.h                |  6 +-
 dom/indexedDB/Makefile.in                     |  5 +-
 dom/indexedDB/nsIIDBDatabase.idl              | 33 +++++++-
 dom/indexedDB/nsIIDBDatabaseRequest.idl       | 76 -----------------
 js/src/xpconnect/src/dom_quickstubs.qsconf    |  1 -
 16 files changed, 102 insertions(+), 159 deletions(-)
 rename dom/indexedDB/{IDBDatabaseRequest.cpp => IDBDatabase.cpp} (90%)
 rename dom/indexedDB/{IDBDatabaseRequest.h => IDBDatabase.h} (86%)
 delete mode 100644 dom/indexedDB/nsIIDBDatabaseRequest.idl

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index b4d4d7716637..6c494ff3368d 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -481,7 +481,7 @@ using namespace mozilla::dom;
 
 #include "mozilla/dom/indexedDB/IDBFactory.h"
 #include "mozilla/dom/indexedDB/IDBRequest.h"
-#include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
+#include "mozilla/dom/indexedDB/IDBDatabase.h"
 #include "mozilla/dom/indexedDB/IDBEvents.h"
 #include "mozilla/dom/indexedDB/IDBObjectStoreRequest.h"
 #include "mozilla/dom/indexedDB/IDBTransaction.h"
@@ -1422,7 +1422,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBRequest, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(IDBDatabaseRequest, nsDOMGenericSH,
+  NS_DEFINE_CLASSINFO_DATA(IDBDatabase, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBErrorEvent, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -3933,8 +3933,7 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(IDBDatabaseRequest, nsIIDBDatabaseRequest)
-    DOM_CLASSINFO_MAP_ENTRY(nsIIDBDatabaseRequest)
+  DOM_CLASSINFO_MAP_BEGIN(IDBDatabase, nsIIDBDatabase)
     DOM_CLASSINFO_MAP_ENTRY(nsIIDBDatabase)
   DOM_CLASSINFO_MAP_END
 
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index fb3190da6a9a..cb00f452820e 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -482,7 +482,7 @@ DOMCI_CLASS(CloseEvent)
 
 DOMCI_CLASS(IDBFactory)
 DOMCI_CLASS(IDBRequest)
-DOMCI_CLASS(IDBDatabaseRequest)
+DOMCI_CLASS(IDBDatabase)
 DOMCI_CLASS(IDBErrorEvent)
 DOMCI_CLASS(IDBSuccessEvent)
 DOMCI_CLASS(IDBTransactionEvent)
diff --git a/dom/indexedDB/AsyncConnectionHelper.cpp b/dom/indexedDB/AsyncConnectionHelper.cpp
index 4ad1b45d6041..a5ffe30dd4b1 100644
--- a/dom/indexedDB/AsyncConnectionHelper.cpp
+++ b/dom/indexedDB/AsyncConnectionHelper.cpp
@@ -77,7 +77,7 @@ private:
 
 } // anonymous namespace
 
-AsyncConnectionHelper::AsyncConnectionHelper(IDBDatabaseRequest* aDatabase,
+AsyncConnectionHelper::AsyncConnectionHelper(IDBDatabase* aDatabase,
                                              IDBRequest* aRequest)
 : mDatabase(aDatabase),
   mRequest(aRequest),
@@ -109,7 +109,7 @@ AsyncConnectionHelper::~AsyncConnectionHelper()
                  "This should only happen if NOREPLY was returned or if the "
                  "runnable already ran on the main thread!");
 
-    IDBDatabaseRequest* database;
+    IDBDatabase* database;
     mDatabase.forget(&database);
 
     IDBTransaction* transaction;
diff --git a/dom/indexedDB/AsyncConnectionHelper.h b/dom/indexedDB/AsyncConnectionHelper.h
index 9937323d6221..248474a87e71 100644
--- a/dom/indexedDB/AsyncConnectionHelper.h
+++ b/dom/indexedDB/AsyncConnectionHelper.h
@@ -42,7 +42,7 @@
 
 // Only meant to be included in IndexedDB source files, not exported.
 #include "IndexedDatabase.h"
-#include "IDBDatabaseRequest.h"
+#include "IDBDatabase.h"
 #include "IDBRequest.h"
 
 #include "mozIStorageProgressHandler.h"
@@ -97,7 +97,7 @@ public:
   nsresult DispatchToTransactionPool();
 
 protected:
-  AsyncConnectionHelper(IDBDatabaseRequest* aDatabase,
+  AsyncConnectionHelper(IDBDatabase* aDatabase,
                         IDBRequest* aRequest);
 
   AsyncConnectionHelper(IDBTransaction* aTransaction,
@@ -154,7 +154,7 @@ protected:
   virtual PRUint16 GetSuccessResult(nsIWritableVariant* aVariant);
 
 protected:
-  nsRefPtr<IDBDatabaseRequest> mDatabase;
+  nsRefPtr<IDBDatabase> mDatabase;
   nsRefPtr<IDBTransaction> mTransaction;
   nsRefPtr<IDBRequest> mRequest;
 
diff --git a/dom/indexedDB/IDBDatabaseRequest.cpp b/dom/indexedDB/IDBDatabase.cpp
similarity index 90%
rename from dom/indexedDB/IDBDatabaseRequest.cpp
rename to dom/indexedDB/IDBDatabase.cpp
index f1ab0f3860b9..649739845d8b 100644
--- a/dom/indexedDB/IDBDatabaseRequest.cpp
+++ b/dom/indexedDB/IDBDatabase.cpp
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "IDBDatabaseRequest.h"
+#include "IDBDatabase.h"
 
 #include "nsIIDBDatabaseException.h"
 
@@ -62,7 +62,7 @@ const PRUint32 kDefaultDatabaseTimeoutSeconds = 30;
 
 inline
 nsISupports*
-isupports_cast(IDBDatabaseRequest* aClassPtr)
+isupports_cast(IDBDatabase* aClassPtr)
 {
   return static_cast<nsISupports*>(
     static_cast<IDBRequest::Generator*>(aClassPtr));
@@ -209,17 +209,17 @@ ConvertVariantToStringArray(nsIVariant* aVariant,
 } // anonymous namespace
 
 // static
-already_AddRefed<IDBDatabaseRequest>
-IDBDatabaseRequest::Create(DatabaseInfo* aDatabaseInfo,
-                           LazyIdleThread* aThread,
-                           nsCOMPtr<mozIStorageConnection>& aConnection)
+already_AddRefed<IDBDatabase>
+IDBDatabase::Create(DatabaseInfo* aDatabaseInfo,
+                    LazyIdleThread* aThread,
+                    nsCOMPtr<mozIStorageConnection>& aConnection)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(aDatabaseInfo, "Null pointer!");
   NS_ASSERTION(aThread, "Null pointer!");
   NS_ASSERTION(aConnection, "Null pointer!");
 
-  nsRefPtr<IDBDatabaseRequest> db(new IDBDatabaseRequest());
+  nsRefPtr<IDBDatabase> db(new IDBDatabase());
 
   db->mDatabaseId = aDatabaseInfo->id;
   db->mName = aDatabaseInfo->name;
@@ -234,13 +234,13 @@ IDBDatabaseRequest::Create(DatabaseInfo* aDatabaseInfo,
   return db.forget();
 }
 
-IDBDatabaseRequest::IDBDatabaseRequest()
+IDBDatabase::IDBDatabase()
 : mDatabaseId(0)
 {
 
 }
 
-IDBDatabaseRequest::~IDBDatabaseRequest()
+IDBDatabase::~IDBDatabase()
 {
   if (mConnectionThread) {
     mConnectionThread->SetWeakIdleObserver(nsnull);
@@ -262,7 +262,7 @@ IDBDatabaseRequest::~IDBDatabaseRequest()
 }
 
 nsresult
-IDBDatabaseRequest::GetOrCreateConnection(mozIStorageConnection** aResult)
+IDBDatabase::GetOrCreateConnection(mozIStorageConnection** aResult)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
 
@@ -277,7 +277,7 @@ IDBDatabaseRequest::GetOrCreateConnection(mozIStorageConnection** aResult)
 }
 
 void
-IDBDatabaseRequest::CloseConnection()
+IDBDatabase::CloseConnection()
 {
   if (mConnection) {
     if (mConnectionThread) {
@@ -291,21 +291,20 @@ IDBDatabaseRequest::CloseConnection()
   }
 }
 
-NS_IMPL_ADDREF(IDBDatabaseRequest)
-NS_IMPL_RELEASE(IDBDatabaseRequest)
+NS_IMPL_ADDREF(IDBDatabase)
+NS_IMPL_RELEASE(IDBDatabase)
 
-NS_INTERFACE_MAP_BEGIN(IDBDatabaseRequest)
+NS_INTERFACE_MAP_BEGIN(IDBDatabase)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, IDBRequest::Generator)
-  NS_INTERFACE_MAP_ENTRY(nsIIDBDatabaseRequest)
   NS_INTERFACE_MAP_ENTRY(nsIIDBDatabase)
   NS_INTERFACE_MAP_ENTRY(nsIObserver)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBDatabaseRequest)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBDatabase)
 NS_INTERFACE_MAP_END
 
-DOMCI_DATA(IDBDatabaseRequest, IDBDatabaseRequest)
+DOMCI_DATA(IDBDatabase, IDBDatabase)
 
 NS_IMETHODIMP
-IDBDatabaseRequest::GetName(nsAString& aName)
+IDBDatabase::GetName(nsAString& aName)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   aName.Assign(mName);
@@ -313,7 +312,7 @@ IDBDatabaseRequest::GetName(nsAString& aName)
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::GetDescription(nsAString& aDescription)
+IDBDatabase::GetDescription(nsAString& aDescription)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -322,7 +321,7 @@ IDBDatabaseRequest::GetDescription(nsAString& aDescription)
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::GetVersion(nsAString& aVersion)
+IDBDatabase::GetVersion(nsAString& aVersion)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   DatabaseInfo* info;
@@ -335,7 +334,7 @@ IDBDatabaseRequest::GetVersion(nsAString& aVersion)
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
+IDBDatabase::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -362,10 +361,10 @@ IDBDatabaseRequest::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::CreateObjectStore(const nsAString& aName,
-                                      const nsAString& aKeyPath,
-                                      PRBool aAutoIncrement,
-                                      nsIIDBRequest** _retval)
+IDBDatabase::CreateObjectStore(const nsAString& aName,
+                               const nsAString& aKeyPath,
+                               PRBool aAutoIncrement,
+                               nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -414,8 +413,8 @@ IDBDatabaseRequest::CreateObjectStore(const nsAString& aName,
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::RemoveObjectStore(const nsAString& aName,
-                                      nsIIDBRequest** _retval)
+IDBDatabase::RemoveObjectStore(const nsAString& aName,
+                               nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -457,8 +456,8 @@ IDBDatabaseRequest::RemoveObjectStore(const nsAString& aName,
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::SetVersion(const nsAString& aVersion,
-                               nsIIDBRequest** _retval)
+IDBDatabase::SetVersion(const nsAString& aVersion,
+                        nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -487,11 +486,11 @@ IDBDatabaseRequest::SetVersion(const nsAString& aVersion,
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::Transaction(nsIVariant* aStoreNames,
-                                PRUint16 aMode,
-                                PRUint32 aTimeout,
-                                PRUint8 aOptionalArgCount,
-                                nsIIDBTransaction** _retval)
+IDBDatabase::Transaction(nsIVariant* aStoreNames,
+                         PRUint16 aMode,
+                         PRUint32 aTimeout,
+                         PRUint8 aOptionalArgCount,
+                         nsIIDBTransaction** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -623,10 +622,10 @@ IDBDatabaseRequest::Transaction(nsIVariant* aStoreNames,
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::ObjectStore(const nsAString& aName,
-                                PRUint16 aMode,
-                                PRUint8 aOptionalArgCount,
-                                nsIIDBObjectStoreRequest** _retval)
+IDBDatabase::ObjectStore(const nsAString& aName,
+                         PRUint16 aMode,
+                         PRUint8 aOptionalArgCount,
+                         nsIIDBObjectStoreRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -673,9 +672,9 @@ IDBDatabaseRequest::ObjectStore(const nsAString& aName,
 }
 
 NS_IMETHODIMP
-IDBDatabaseRequest::Observe(nsISupports* aSubject,
-                            const char* aTopic,
-                            const PRUnichar* aData)
+IDBDatabase::Observe(nsISupports* aSubject,
+                     const char* aTopic,
+                     const PRUnichar* aData)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ENSURE_FALSE(strcmp(aTopic, IDLE_THREAD_TOPIC), NS_ERROR_UNEXPECTED);
diff --git a/dom/indexedDB/IDBDatabaseRequest.h b/dom/indexedDB/IDBDatabase.h
similarity index 86%
rename from dom/indexedDB/IDBDatabaseRequest.h
rename to dom/indexedDB/IDBDatabase.h
index 2f40f556e95b..8123003d7d13 100644
--- a/dom/indexedDB/IDBDatabaseRequest.h
+++ b/dom/indexedDB/IDBDatabase.h
@@ -37,14 +37,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef mozilla_dom_indexeddb_idbdatabaserequest_h__
-#define mozilla_dom_indexeddb_idbdatabaserequest_h__
+#ifndef mozilla_dom_indexeddb_idbdatabase_h__
+#define mozilla_dom_indexeddb_idbdatabase_h__
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 #include "mozilla/dom/indexedDB/LazyIdleThread.h"
 
 #include "mozIStorageConnection.h"
-#include "nsIIDBDatabaseRequest.h"
+#include "nsIIDBDatabase.h"
 #include "nsIObserver.h"
 
 #include "nsDOMLists.h"
@@ -55,19 +55,18 @@ class AsyncConnectionHelper;
 struct DatabaseInfo;
 class IDBTransaction;
 
-class IDBDatabaseRequest : public IDBRequest::Generator,
-                           public nsIIDBDatabaseRequest,
-                           public nsIObserver
+class IDBDatabase : public IDBRequest::Generator,
+                    public nsIIDBDatabase,
+                    public nsIObserver
 {
   friend class AsyncConnectionHelper;
 
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIIDBDATABASE
-  NS_DECL_NSIIDBDATABASEREQUEST
   NS_DECL_NSIOBSERVER
 
-  static already_AddRefed<IDBDatabaseRequest>
+  static already_AddRefed<IDBDatabase>
   Create(DatabaseInfo* aDatabaseInfo,
          LazyIdleThread* aThread,
          nsCOMPtr<mozIStorageConnection>& aConnection);
@@ -87,8 +86,8 @@ public:
   }
 
 protected:
-  IDBDatabaseRequest();
-  ~IDBDatabaseRequest();
+  IDBDatabase();
+  ~IDBDatabase();
 
   // Only meant to be called on mStorageThread!
   nsresult GetOrCreateConnection(mozIStorageConnection** aConnection);
@@ -108,4 +107,4 @@ private:
 
 END_INDEXEDDB_NAMESPACE
 
-#endif // mozilla_dom_indexeddb_idbdatabaserequest_h__
+#endif // mozilla_dom_indexeddb_idbdatabase_h__
diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp
index 6cabb4f8a039..4e91d29f23fd 100644
--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -55,7 +55,7 @@
 
 #include "AsyncConnectionHelper.h"
 #include "DatabaseInfo.h"
-#include "IDBDatabaseRequest.h"
+#include "IDBDatabase.h"
 #include "IDBKeyRange.h"
 #include "LazyIdleThread.h"
 
@@ -84,7 +84,7 @@ public:
                      const nsAString& aDescription,
                      const nsACString& aASCIIOrigin,
                      LazyIdleThread* aThread)
-  : AsyncConnectionHelper(static_cast<IDBDatabaseRequest*>(nsnull), aRequest),
+  : AsyncConnectionHelper(static_cast<IDBDatabase*>(nsnull), aRequest),
     mName(aName), mDescription(aDescription), mASCIIOrigin(aASCIIOrigin),
     mThread(aThread), mDatabaseId(0)
   { }
@@ -879,8 +879,7 @@ OpenDatabaseHelper::GetSuccessResult(nsIWritableVariant* aResult)
     }
   }
 
-  nsRefPtr<IDBDatabaseRequest> db =
-    IDBDatabaseRequest::Create(dbInfo, mThread, mConnection);
+  nsRefPtr<IDBDatabase> db = IDBDatabase::Create(dbInfo, mThread, mConnection);
   NS_ASSERTION(db, "This can't fail!");
 
   NS_ASSERTION(!mConnection, "Should have swapped out!");
diff --git a/dom/indexedDB/IDBObjectStoreRequest.cpp b/dom/indexedDB/IDBObjectStoreRequest.cpp
index f3aca6ed20c1..d49f3bf977cf 100644
--- a/dom/indexedDB/IDBObjectStoreRequest.cpp
+++ b/dom/indexedDB/IDBObjectStoreRequest.cpp
@@ -322,7 +322,7 @@ GetKeyFromObject(JSContext* aCx,
 
 // static
 already_AddRefed<IDBObjectStoreRequest>
-IDBObjectStoreRequest::Create(IDBDatabaseRequest* aDatabase,
+IDBObjectStoreRequest::Create(IDBDatabase* aDatabase,
                               IDBTransaction* aTransaction,
                               const ObjectStoreInfo* aStoreInfo,
                               PRUint16 aMode)
diff --git a/dom/indexedDB/IDBObjectStoreRequest.h b/dom/indexedDB/IDBObjectStoreRequest.h
index eb5f119930f5..42b212adc716 100644
--- a/dom/indexedDB/IDBObjectStoreRequest.h
+++ b/dom/indexedDB/IDBObjectStoreRequest.h
@@ -41,7 +41,7 @@
 #define mozilla_dom_indexeddb_idbobjectstorerequest_h__
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
-#include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
+#include "mozilla/dom/indexedDB/IDBDatabase.h"
 #include "mozilla/dom/indexedDB/IDBTransaction.h"
 
 #include "nsIIDBObjectStoreRequest.h"
@@ -214,7 +214,7 @@ public:
   NS_DECL_NSIIDBOBJECTSTOREREQUEST
 
   static already_AddRefed<IDBObjectStoreRequest>
-  Create(IDBDatabaseRequest* aDatabase,
+  Create(IDBDatabase* aDatabase,
          IDBTransaction* aTransaction,
          const ObjectStoreInfo* aInfo,
          PRUint16 aMode);
@@ -292,7 +292,7 @@ protected:
                       nsTArray<IndexUpdateInfo>& aUpdateInfoArray);
 
 private:
-  nsRefPtr<IDBDatabaseRequest> mDatabase;
+  nsRefPtr<IDBDatabase> mDatabase;
   nsRefPtr<IDBTransaction> mTransaction;
 
   PRInt64 mId;
diff --git a/dom/indexedDB/IDBRequest.h b/dom/indexedDB/IDBRequest.h
index aecdf5692805..91f7d8ac0621 100644
--- a/dom/indexedDB/IDBRequest.h
+++ b/dom/indexedDB/IDBRequest.h
@@ -53,7 +53,7 @@ BEGIN_INDEXEDDB_NAMESPACE
 
 class AsyncConnectionHelper;
 class IDBFactory;
-class IDBDatabaseRequest;
+class IDBDatabase;
 
 class IDBRequest : public nsDOMEventTargetHelper,
                    public nsIIDBRequest
diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp
index 379a4b368578..9f638f636e07 100644
--- a/dom/indexedDB/IDBTransaction.cpp
+++ b/dom/indexedDB/IDBTransaction.cpp
@@ -72,7 +72,7 @@ DoomCachedStatements(const nsACString& aQuery,
 
 // static
 already_AddRefed<IDBTransaction>
-IDBTransaction::Create(IDBDatabaseRequest* aDatabase,
+IDBTransaction::Create(IDBDatabase* aDatabase,
                        nsTArray<nsString>& aObjectStoreNames,
                        PRUint16 aMode,
                        PRUint32 aTimeout)
diff --git a/dom/indexedDB/IDBTransaction.h b/dom/indexedDB/IDBTransaction.h
index 90af936d7327..ab7fc43cdb3a 100644
--- a/dom/indexedDB/IDBTransaction.h
+++ b/dom/indexedDB/IDBTransaction.h
@@ -41,7 +41,7 @@
 #define mozilla_dom_indexeddb_idbtransaction_h__
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
-#include "mozilla/dom/indexedDB/IDBDatabaseRequest.h"
+#include "mozilla/dom/indexedDB/IDBDatabase.h"
 
 #include "nsIIDBTransaction.h"
 #include "nsIRunnable.h"
@@ -78,7 +78,7 @@ public:
                                            nsDOMEventTargetHelper)
 
   static already_AddRefed<IDBTransaction>
-  Create(IDBDatabaseRequest* aDatabase,
+  Create(IDBDatabase* aDatabase,
          nsTArray<nsString>& aObjectStoreNames,
          PRUint16 aMode,
          PRUint32 aTimeout);
@@ -153,7 +153,7 @@ private:
 
   nsresult CommitOrRollback();
 
-  nsRefPtr<IDBDatabaseRequest> mDatabase;
+  nsRefPtr<IDBDatabase> mDatabase;
   nsTArray<nsString> mObjectStoreNames;
   PRUint16 mReadyState;
   PRUint16 mMode;
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index 9cc79e97f596..7295661039c7 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -55,7 +55,7 @@ CPPSRCS = \
   AsyncConnectionHelper.cpp \
   DatabaseInfo.cpp \
   IDBCursorRequest.cpp \
-  IDBDatabaseRequest.cpp \
+  IDBDatabase.cpp \
   IDBEvents.cpp \
   IDBIndexRequest.cpp \
   IDBKeyRange.cpp \
@@ -69,7 +69,7 @@ CPPSRCS = \
 
 EXPORTS_mozilla/dom/indexedDB = \
   IDBCursorRequest.h \
-  IDBDatabaseRequest.h \
+  IDBDatabase.h \
   IDBEvents.h \
   IDBIndexRequest.h \
   IDBKeyRange.h \
@@ -96,7 +96,6 @@ XPIDLSRCS = \
   nsIIDBCursorRequest.idl \
   nsIIDBDatabase.idl \
   nsIIDBDatabaseException.idl \
-  nsIIDBDatabaseRequest.idl \
   nsIIDBEvent.idl \
   nsIIDBErrorEvent.idl \
   nsIIDBIndex.idl \
diff --git a/dom/indexedDB/nsIIDBDatabase.idl b/dom/indexedDB/nsIIDBDatabase.idl
index 2645607e2423..b8150a453f72 100644
--- a/dom/indexedDB/nsIIDBDatabase.idl
+++ b/dom/indexedDB/nsIIDBDatabase.idl
@@ -39,15 +39,18 @@
 
 #include "nsISupports.idl"
 
-interface nsIDOMDOMStringList;
+interface nsIVariant;
+interface nsIIDBObjectStoreRequest;
+interface nsIIDBRequest;
 interface nsIIDBTransaction;
+interface nsIDOMDOMStringList;
 
 /**
  * IDBDatabase interface.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBDatabase for more
- * information.
+ * http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#idl-def-IDBDatabase
+ * for more information.
  */
-[scriptable, uuid(828a5080-6912-4e4d-afe0-57846788eb2e)]
+[scriptable, uuid(e258ad44-3306-427f-ac17-c528060c661a)]
 interface nsIIDBDatabase : nsISupports
 {
   readonly attribute DOMString name;
@@ -57,4 +60,26 @@ interface nsIIDBDatabase : nsISupports
   readonly attribute DOMString version;
 
   readonly attribute nsIDOMDOMStringList objectStoreNames;
+
+  nsIIDBRequest
+  createObjectStore(in AString name,
+                    in AString keyPath,
+                    [optional /* false */] in boolean autoIncrement);
+
+  nsIIDBRequest
+  removeObjectStore(in AString name);
+
+  nsIIDBRequest
+  setVersion(in AString version);
+
+  [optional_argc]
+  nsIIDBTransaction
+  transaction(in nsIVariant storeNames, // js array of strings
+              [optional /* READ_ONLY */] in unsigned short mode,
+              [optional /* 5000ms */] in unsigned long timeout);
+
+  [optional_argc]
+  nsIIDBObjectStoreRequest
+  objectStore(in AString name,
+              [optional /* READ_ONLY */] in unsigned short mode);
 };
diff --git a/dom/indexedDB/nsIIDBDatabaseRequest.idl b/dom/indexedDB/nsIIDBDatabaseRequest.idl
deleted file mode 100644
index c819e2e307e0..000000000000
--- a/dom/indexedDB/nsIIDBDatabaseRequest.idl
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* ***** 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 Indexed Database.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ben Turner <bent.mozilla@gmail.com>
- *
- * 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 "nsIIDBDatabase.idl"
-
-interface nsIVariant;
-interface nsIIDBObjectStoreRequest;
-interface nsIIDBRequest;
-interface nsIIDBTransaction;
-
-/**
- * IDBDatabaseRequest interface.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBDatabaseRequest for
- * more information.
- */
-[scriptable, uuid(8f475c0a-e332-41ba-ba27-156370a63486)]
-interface nsIIDBDatabaseRequest : nsIIDBDatabase
-{
-  nsIIDBRequest
-  createObjectStore(in AString name,
-                    in AString keyPath,
-                    [optional /* false */] in boolean autoIncrement);
-
-  nsIIDBRequest
-  removeObjectStore(in AString name);
-
-  nsIIDBRequest
-  setVersion(in AString version);
-
-  [optional_argc]
-  nsIIDBTransaction
-  transaction(in nsIVariant storeNames, // js array of strings
-              [optional /* READ_ONLY */] in unsigned short mode,
-              [optional /* 5000ms */] in unsigned long timeout);
-
-  [optional_argc]
-  nsIIDBObjectStoreRequest
-  objectStore(in AString name,
-              [optional /* READ_ONLY */] in unsigned short mode);
-};
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index eeedc6100524..6c22d954ab1d 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -464,7 +464,6 @@ members = [
     'nsIIDBCursorRequest.*',
     'nsIIDBDatabase.*',
     'nsIIDBDatabaseException.*',
-    'nsIIDBDatabaseRequest.*',
     'nsIIDBEvent.*',
     'nsIIDBErrorEvent.*',
     'nsIIDBIndex.*',

From aacc755259fd058853acf227c997854e3e8b0390 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zweinberg@mozilla.com>
Date: Mon, 28 Jun 2010 10:36:17 -0700
Subject: [PATCH 141/172] Bug 571989 part 1: Move the contents of
 gfx/src/psshared into widget/src/gtk2, which is the sole user.

--HG--
rename : gfx/src/psshared/nsCUPSShim.cpp => widget/src/gtk2/nsCUPSShim.cpp
rename : gfx/src/psshared/nsCUPSShim.h => widget/src/gtk2/nsCUPSShim.h
rename : gfx/src/psshared/nsPSPrinters.cpp => widget/src/gtk2/nsPSPrinters.cpp
rename : gfx/src/psshared/nsPSPrinters.h => widget/src/gtk2/nsPSPrinters.h
rename : gfx/src/psshared/nsPaperPS.cpp => widget/src/gtk2/nsPaperPS.cpp
rename : gfx/src/psshared/nsPaperPS.h => widget/src/gtk2/nsPaperPS.h
---
 config/autoconf.mk.in                         |  1 -
 configure.in                                  |  7 --
 gfx/src/Makefile.in                           |  4 --
 gfx/src/psshared/Makefile.in                  | 68 -------------------
 gfx/src/psshared/psSharedCore.h               | 60 ----------------
 js/src/configure.in                           |  6 --
 toolkit/library/libxul-config.mk              |  5 --
 widget/src/beos/nsDeviceContextSpecB.cpp      |  4 +-
 widget/src/gtk2/Makefile.in                   | 10 +--
 .../src/gtk2}/nsCUPSShim.cpp                  |  0
 .../psshared => widget/src/gtk2}/nsCUPSShim.h |  4 +-
 widget/src/gtk2/nsDeviceContextSpecG.cpp      | 14 +---
 .../src/gtk2}/nsPSPrinters.cpp                |  0
 .../src/gtk2}/nsPSPrinters.h                  |  3 +-
 .../src/gtk2}/nsPaperPS.cpp                   |  0
 .../psshared => widget/src/gtk2}/nsPaperPS.h  |  8 +--
 16 files changed, 10 insertions(+), 184 deletions(-)
 delete mode 100644 gfx/src/psshared/Makefile.in
 delete mode 100644 gfx/src/psshared/psSharedCore.h
 rename {gfx/src/psshared => widget/src/gtk2}/nsCUPSShim.cpp (100%)
 rename {gfx/src/psshared => widget/src/gtk2}/nsCUPSShim.h (98%)
 rename {gfx/src/psshared => widget/src/gtk2}/nsPSPrinters.cpp (100%)
 rename {gfx/src/psshared => widget/src/gtk2}/nsPSPrinters.h (98%)
 rename {gfx/src/psshared => widget/src/gtk2}/nsPaperPS.cpp (100%)
 rename {gfx/src/psshared => widget/src/gtk2}/nsPaperPS.h (94%)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index bc0b9154b2f8..5dceb395bab5 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -130,7 +130,6 @@ MOZ_JSLOADER  = @MOZ_JSLOADER@
 MOZ_USE_NATIVE_UCONV = @MOZ_USE_NATIVE_UCONV@
 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
 XPCOM_USE_LEA = @XPCOM_USE_LEA@
-MOZ_ENABLE_POSTSCRIPT = @MOZ_ENABLE_POSTSCRIPT@
 MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_UPDATER	= @MOZ_UPDATER@
 MOZ_UPDATE_CHANNEL	= @MOZ_UPDATE_CHANNEL@
diff --git a/configure.in b/configure.in
index cc30a2bc09c1..73f8a6e7465e 100644
--- a/configure.in
+++ b/configure.in
@@ -1232,8 +1232,6 @@ USE_DEPENDENT_LIBS=1
 
 _PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
 
-MOZ_ENABLE_POSTSCRIPT=1 
-
 if test -n "$CROSS_COMPILE"; then
     OS_TARGET="${target_os}"
     OS_ARCH=`echo $target_os | sed -e 's|/|_|g'`
@@ -2030,7 +2028,6 @@ case "$target" in
     DSO_LDOPTS=''
     STRIP="$STRIP -x -S"
     _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
-    MOZ_ENABLE_POSTSCRIPT=
     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
     # The ExceptionHandling framework is needed for Objective-C exception
     # logging code in nsObjCExceptions.h. Currently we only use that in debug
@@ -2297,7 +2294,6 @@ ia64*-hpux*)
     TARGET_MD_ARCH=win32
     _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
     BIN_SUFFIX='.exe'
-    MOZ_ENABLE_POSTSCRIPT=
     MOZ_USER_DIR="Mozilla"
 
     MOZ_GFX_OPTIMIZE_MOBILE=1
@@ -2420,7 +2416,6 @@ ia64*-hpux*)
     TARGET_MD_ARCH=win32
     _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
     BIN_SUFFIX='.exe'
-    MOZ_ENABLE_POSTSCRIPT=
     MOZ_USER_DIR="Mozilla"
 
     dnl Hardcode to win95 for now - cls
@@ -2624,7 +2619,6 @@ ia64*-hpux*)
     LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
     TARGET_MD_ARCH=os2
     _PLATFORM_DEFAULT_TOOLKIT="cairo-os2"
-    MOZ_ENABLE_POSTSCRIPT=
     RC=rc.exe
     RCFLAGS='-n'
     MOZ_USER_DIR="Mozilla"
@@ -8723,7 +8717,6 @@ AC_SUBST(MOZ_PROFILELOCKING)
 
 AC_SUBST(HAVE_XIE)
 AC_SUBST(MOZ_XIE_LIBS)
-AC_SUBST(MOZ_ENABLE_POSTSCRIPT)
 
 AC_SUBST(BUILD_STATIC_LIBS)
 AC_SUBST(MOZ_ENABLE_LIBXUL)
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 60496a89a109..18881cc0d58a 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -49,10 +49,6 @@ GRE_MODULE	= 1
 LIBXUL_LIBRARY = 1
 
 
-ifdef MOZ_ENABLE_POSTSCRIPT
-DIRS        += psshared
-endif
-
 CPPSRCS = \
         nsColor.cpp \
         nsFont.cpp \
diff --git a/gfx/src/psshared/Makefile.in b/gfx/src/psshared/Makefile.in
deleted file mode 100644
index 990b98f3aff2..000000000000
--- a/gfx/src/psshared/Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# ***** 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
-# Ken Herron <kherron+mozilla@fmailbox.com>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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 *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= gfx
-LIBRARY_NAME	= gfxpsshar
-EXPORT_LIBRARY	= 1
-GRE_MODULE	= 1
-LIBXUL_LIBRARY = 1
-
-EXPORTS		= nsCUPSShim.h \
-		  nsPaperPS.h \
-		  nsPSPrinters.h\
-		  psSharedCore.h \
-		  $(NULL)
-
-CPPSRCS		= nsCUPSShim.cpp \
-		  nsPaperPS.cpp \
-		  nsPSPrinters.cpp \
-		  $(NULL)
-
-EXTRA_DSO_LDOPTS = \
-		  $(MOZ_COMPONENT_LIBS) \
-		  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -D_IMPL_NS_PSSHARED
diff --git a/gfx/src/psshared/psSharedCore.h b/gfx/src/psshared/psSharedCore.h
deleted file mode 100644
index 176e42b4fda4..000000000000
--- a/gfx/src/psshared/psSharedCore.h
+++ /dev/null
@@ -1,60 +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
- * IBM Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Brian Ryner <bryner@brianryner.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of 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 psSharedCore_h__
-#define psSharedCore_h__
-
-#include "nscore.h"
-
-#ifdef MOZ_ENABLE_LIBXUL
-#define NS_PSSHARED
-#define NS_PSSHARED_(type) type
-#define NS_PSSHARED_STATIC_MEMBER_(type) type
-#else //!MOZ_ENABLE_LIBXUL
-#ifdef _IMPL_NS_PSSHARED
-#define NS_PSSHARED NS_EXPORT
-#define NS_PSSHARED_(type) NS_EXPORT_(type)
-#define NS_PSSHARED_STATIC_MEMBER_(type) NS_EXPORT_STATIC_MEMBER_(type)
-#else
-#define NS_PSSHARED NS_IMPORT
-#define NS_PSSHARED_(type) NS_IMPORT_(type)
-#define NS_PSSHARED_STATIC_MEMBER_(type) NS_IMPORT_STATIC_MEMBER_(type)
-#endif
-#endif //MOZ_ENABLE_LIBXUL
-
-#endif
diff --git a/js/src/configure.in b/js/src/configure.in
index 739c07927d52..2ef484969ce9 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -991,8 +991,6 @@ USE_DEPENDENT_LIBS=1
 
 _PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
 
-MOZ_ENABLE_POSTSCRIPT=1 
-
 MOZ_THUMB2=
 
 if test -n "$CROSS_COMPILE"; then
@@ -1721,7 +1719,6 @@ case "$target" in
     DSO_LDOPTS=''
     STRIP="$STRIP -x -S"
     _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
-    MOZ_ENABLE_POSTSCRIPT=
     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
     LDFLAGS="$LDFLAGS -framework Cocoa"
     # The ExceptionHandling framework is needed for Objective-C exception
@@ -1972,7 +1969,6 @@ ia64*-hpux*)
     TARGET_MD_ARCH=win32
     _PLATFORM_DEFAULT_TOOLKIT='windows'
     BIN_SUFFIX='.exe'
-    MOZ_ENABLE_POSTSCRIPT=
     MOZ_USER_DIR="Mozilla"
 
     dnl Default to Windows Mobile components enabled
@@ -2121,7 +2117,6 @@ ia64*-hpux*)
     TARGET_MD_ARCH=win32
     _PLATFORM_DEFAULT_TOOLKIT='cairo-windows'
     BIN_SUFFIX='.exe'
-    MOZ_ENABLE_POSTSCRIPT=
     MOZ_USER_DIR="Mozilla"
 
     dnl Hardcode to win95 for now - cls
@@ -2310,7 +2305,6 @@ ia64*-hpux*)
     LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib $(LIBXUL_DIST)/lib/mozalloc.lib'
     TARGET_MD_ARCH=os2
     _PLATFORM_DEFAULT_TOOLKIT="cairo-os2"
-    MOZ_ENABLE_POSTSCRIPT=
     RC=rc.exe
     RCFLAGS='-n'
     MOZ_USER_DIR="Mozilla"
diff --git a/toolkit/library/libxul-config.mk b/toolkit/library/libxul-config.mk
index aca547cbebd5..917ca293aba6 100644
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -289,11 +289,6 @@ STATIC_LIBS += gtkxtbin
 endif
 endif
 
-ifdef MOZ_ENABLE_POSTSCRIPT
-DEFINES += -DMOZ_ENABLE_POSTSCRIPT
-STATIC_LIBS += gfxpsshar
-endif
-
 ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
 DEFINES += -DICON_DECODER
 COMPONENT_LIBS += imgicon
diff --git a/widget/src/beos/nsDeviceContextSpecB.cpp b/widget/src/beos/nsDeviceContextSpecB.cpp
index f219fcfc5a8b..49f83214fa7a 100644
--- a/widget/src/beos/nsDeviceContextSpecB.cpp
+++ b/widget/src/beos/nsDeviceContextSpecB.cpp
@@ -195,7 +195,6 @@ nsresult GlobalPrinters::InitializeGlobalPrinters ()
 
   mGlobalNumPrinters = 0;
 
-#ifdef USE_POSTSCRIPT
   mGlobalPrinterList = new nsTArray<nsString>();
   if (!mGlobalPrinterList) 
     return NS_ERROR_OUT_OF_MEMORY;
@@ -241,8 +240,7 @@ nsresult GlobalPrinters::InitializeGlobalPrinters ()
 
     NS_Free(printerList);
   }
-#endif /* USE_POSTSCRIPT */
-      
+
   if (mGlobalNumPrinters == 0)
     return NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE; 
 
diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
index 061514817901..d30e7c2bd6d6 100644
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -91,6 +91,9 @@ CPPSRCS		+= \
 		nsPrintOptionsGTK.cpp \
 		nsPrintDialogGTK.cpp \
 		nsPrintSettingsGTK.cpp \
+		nsCUPSShim.cpp \
+		nsPaperPS.cpp \
+		nsPSPrinters.cpp \
 		$(NULL)
 endif
 
@@ -153,13 +156,6 @@ endif
 
 DEFINES		+= -DCAIRO_GFX
 
-ifdef MOZ_ENABLE_POSTSCRIPT
-DEFINES         += -DUSE_POSTSCRIPT
-EXTRA_DSO_LDOPTS += -lgfxpsshar
-endif
-
-
-DEFINES		+=
 INCLUDES	+= \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir)/../shared \
diff --git a/gfx/src/psshared/nsCUPSShim.cpp b/widget/src/gtk2/nsCUPSShim.cpp
similarity index 100%
rename from gfx/src/psshared/nsCUPSShim.cpp
rename to widget/src/gtk2/nsCUPSShim.cpp
diff --git a/gfx/src/psshared/nsCUPSShim.h b/widget/src/gtk2/nsCUPSShim.h
similarity index 98%
rename from gfx/src/psshared/nsCUPSShim.h
rename to widget/src/gtk2/nsCUPSShim.h
index cf6c2eb5a6ee..aa6282edf174 100644
--- a/gfx/src/psshared/nsCUPSShim.h
+++ b/widget/src/gtk2/nsCUPSShim.h
@@ -40,8 +40,6 @@
 #define nsCUPSShim_h___
 
 #include "prtypes.h"
-#include "psSharedCore.h"
-
 
 /* Various CUPS data types. We don't #include cups headers to avoid
  * requiring CUPS to be installed on the build host (and to avoid having
@@ -83,7 +81,7 @@ typedef int (PR_CALLBACK *CupsAddOptionType)(const char    *name,
 
 struct PRLibrary;
 
-class NS_PSSHARED nsCUPSShim {
+class nsCUPSShim {
     public:
         nsCUPSShim() : mCupsLib(nsnull) { }
         ~nsCUPSShim();
diff --git a/widget/src/gtk2/nsDeviceContextSpecG.cpp b/widget/src/gtk2/nsDeviceContextSpecG.cpp
index 6b08a84dc041..8002558a703a 100644
--- a/widget/src/gtk2/nsDeviceContextSpecG.cpp
+++ b/widget/src/gtk2/nsDeviceContextSpecG.cpp
@@ -62,10 +62,8 @@
 #include "nsStringEnumerator.h"
 #include "nsIServiceManager.h" 
 
-#ifdef USE_POSTSCRIPT
 #include "nsPSPrinters.h"
 #include "nsPaperPS.h"  /* Paper size list */
-#endif /* USE_POSTSCRIPT */
 
 #include "nsPrintSettingsGTK.h"
 
@@ -569,12 +567,8 @@ NS_IMETHODIMP nsDeviceContextSpecGTK::GetPrintMethod(PrintMethod &aMethod)
 /* static !! */
 nsresult nsDeviceContextSpecGTK::GetPrintMethod(const char *aPrinter, PrintMethod &aMethod)
 {
-#if defined(USE_POSTSCRIPT)
   aMethod = pmPostScript;
   return NS_OK;
-#else
-  return NS_ERROR_UNEXPECTED;
-#endif
 }
 
 static void
@@ -778,7 +772,6 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
   if (NS_FAILED(rv))
     return rv;
 
-#ifdef USE_POSTSCRIPT
   /* "Demangle" postscript printer name */
   if (type == pmPostScript) {
     /* Strip the printing method name from the printer,
@@ -787,7 +780,6 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
     if (kNotFound != slash)
       printerName.Cut(0, slash + 1);
   }
-#endif /* USE_POSTSCRIPT */
 
 #ifdef SET_PRINTER_FEATURES_VIA_PREFS
   /* Defaults to FALSE */
@@ -813,7 +805,6 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
 
   aPrintSettings->SetIsInitializedFromPrinter(PR_TRUE);
 
-#ifdef USE_POSTSCRIPT
   if (type == pmPostScript) {
     DO_PR_DEBUG_LOG(("InitPrintSettingsFromPrinter() for PostScript printer\n"));
 
@@ -950,7 +941,6 @@ NS_IMETHODIMP nsPrinterEnumeratorGTK::InitPrintSettingsFromPrinter(const PRUnich
 
     return NS_OK;    
   }
-#endif /* USE_POSTSCRIPT */
 
   return NS_ERROR_UNEXPECTED;
 }
@@ -976,7 +966,6 @@ nsresult GlobalPrinters::InitializeGlobalPrinters ()
   if (NS_FAILED(rv))
     return rv;
       
-#ifdef USE_POSTSCRIPT
   nsPSPrinterList psMgr;
   if (NS_SUCCEEDED(psMgr.Init()) && psMgr.Enabled()) {
     /* Get the list of PostScript-module printers */
@@ -990,8 +979,7 @@ nsresult GlobalPrinters::InitializeGlobalPrinters ()
       mGlobalPrinterList->AppendElement(NS_ConvertUTF8toUTF16(printerList[i]));
     }
   }
-#endif /* USE_POSTSCRIPT */  
-      
+
   /* If there are no printers available after all checks, return an error */
   if (!mGlobalPrinterList->Length())
   {
diff --git a/gfx/src/psshared/nsPSPrinters.cpp b/widget/src/gtk2/nsPSPrinters.cpp
similarity index 100%
rename from gfx/src/psshared/nsPSPrinters.cpp
rename to widget/src/gtk2/nsPSPrinters.cpp
diff --git a/gfx/src/psshared/nsPSPrinters.h b/widget/src/gtk2/nsPSPrinters.h
similarity index 98%
rename from gfx/src/psshared/nsPSPrinters.h
rename to widget/src/gtk2/nsPSPrinters.h
index 7853d2b34d7c..922c5f66ba98 100644
--- a/gfx/src/psshared/nsPSPrinters.h
+++ b/widget/src/gtk2/nsPSPrinters.h
@@ -43,13 +43,12 @@
 #include "nsTArray.h"
 #include "prtypes.h"
 #include "nsCUPSShim.h"
-#include "psSharedCore.h"
 
 class nsIPrefService;
 class nsIPrefBranch;
 class nsCUPSShim;
 
-class NS_PSSHARED nsPSPrinterList {
+class nsPSPrinterList {
     public:
         /**
          * Initialize a printer manager object.
diff --git a/gfx/src/psshared/nsPaperPS.cpp b/widget/src/gtk2/nsPaperPS.cpp
similarity index 100%
rename from gfx/src/psshared/nsPaperPS.cpp
rename to widget/src/gtk2/nsPaperPS.cpp
diff --git a/gfx/src/psshared/nsPaperPS.h b/widget/src/gtk2/nsPaperPS.h
similarity index 94%
rename from gfx/src/psshared/nsPaperPS.h
rename to widget/src/gtk2/nsPaperPS.h
index d84754fcb5b4..dd23a4ef7ef9 100644
--- a/gfx/src/psshared/nsPaperPS.h
+++ b/widget/src/gtk2/nsPaperPS.h
@@ -42,7 +42,6 @@
 
 #include "prtypes.h"
 #include "nsDebug.h"
-#include "psSharedCore.h"
 
 struct nsPaperSizePS_ {
     const char *name;
@@ -51,7 +50,7 @@ struct nsPaperSizePS_ {
     PRBool isMetric;        // Present to the user in metric, if possible
 };
 
-class NS_PSSHARED nsPaperSizePS {
+class nsPaperSizePS {
     public:
         /** ---------------------------------------------------
          * Constructor
@@ -119,9 +118,8 @@ class NS_PSSHARED nsPaperSizePS {
 
     private:
         unsigned int mCurrent;
-        // the class visibility should export these, but it doesn't
-        static NS_PSSHARED_STATIC_MEMBER_(const nsPaperSizePS_) mList[];
-        static NS_PSSHARED_STATIC_MEMBER_(const unsigned int) mCount;
+        static const nsPaperSizePS_ mList[];
+        static const unsigned int mCount;
 };
 
 #endif

From 3fe2e6a8b0aa7b7fb63f2f8203af57294bcb2a8a Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zweinberg@mozilla.com>
Date: Mon, 28 Jun 2010 10:36:20 -0700
Subject: [PATCH 142/172] Bug 571989 part 2: Fold gfx/public and gfx/idl into
 gfx/src.

--HG--
rename : gfx/public/X11Util.h => gfx/src/X11Util.h
rename : gfx/public/gfxCore.h => gfx/src/gfxCore.h
rename : gfx/idl/gfxIFormats.idl => gfx/src/gfxIFormats.idl
rename : gfx/idl/gfxidltypes.idl => gfx/src/gfxidltypes.idl
rename : gfx/public/nsColor.h => gfx/src/nsColor.h
rename : gfx/public/nsColorNameList.h => gfx/src/nsColorNameList.h
rename : gfx/public/nsColorNames.h => gfx/src/nsColorNames.h
rename : gfx/public/nsCoord.h => gfx/src/nsCoord.h
rename : gfx/public/nsFont.h => gfx/src/nsFont.h
rename : gfx/public/nsGfxCIID.h => gfx/src/nsGfxCIID.h
rename : gfx/public/nsIDeviceContext.h => gfx/src/nsIDeviceContext.h
rename : gfx/idl/nsIFontEnumerator.idl => gfx/src/nsIFontEnumerator.idl
rename : gfx/public/nsIFontMetrics.h => gfx/src/nsIFontMetrics.h
rename : gfx/public/nsIRegion.h => gfx/src/nsIRegion.h
rename : gfx/public/nsIRenderingContext.h => gfx/src/nsIRenderingContext.h
rename : gfx/idl/nsIScriptableRegion.idl => gfx/src/nsIScriptableRegion.idl
rename : gfx/public/nsITheme.h => gfx/src/nsITheme.h
rename : gfx/public/nsMargin.h => gfx/src/nsMargin.h
rename : gfx/public/nsPoint.h => gfx/src/nsPoint.h
rename : gfx/public/nsRect.h => gfx/src/nsRect.h
rename : gfx/public/nsRegion.h => gfx/src/nsRegion.h
rename : gfx/public/nsSize.h => gfx/src/nsSize.h
rename : gfx/public/nsThemeConstants.h => gfx/src/nsThemeConstants.h
rename : gfx/public/nsTransform2D.h => gfx/src/nsTransform2D.h
---
 gfx/Makefile.in                           |  2 +-
 gfx/idl/Makefile.in                       | 57 ---------------
 gfx/idl/geniid.pl                         | 89 -----------------------
 gfx/public/Makefile.in                    | 75 -------------------
 gfx/src/Makefile.in                       | 40 +++++++++-
 gfx/{public => src}/X11Util.h             |  0
 gfx/{public => src}/gfxCore.h             |  0
 gfx/{idl => src}/gfxIFormats.idl          |  0
 gfx/{idl => src}/gfxidltypes.idl          |  0
 gfx/{public => src}/nsColor.h             |  0
 gfx/{public => src}/nsColorNameList.h     |  0
 gfx/{public => src}/nsColorNames.h        |  0
 gfx/{public => src}/nsCoord.h             |  0
 gfx/{public => src}/nsFont.h              |  0
 gfx/{public => src}/nsGfxCIID.h           |  0
 gfx/{public => src}/nsIDeviceContext.h    |  0
 gfx/{idl => src}/nsIFontEnumerator.idl    |  0
 gfx/{public => src}/nsIFontMetrics.h      |  0
 gfx/{public => src}/nsIRegion.h           |  0
 gfx/{public => src}/nsIRenderingContext.h |  0
 gfx/{idl => src}/nsIScriptableRegion.idl  |  0
 gfx/{public => src}/nsITheme.h            |  0
 gfx/{public => src}/nsMargin.h            |  0
 gfx/{public => src}/nsPoint.h             |  0
 gfx/{public => src}/nsRect.h              |  0
 gfx/{public => src}/nsRegion.h            |  0
 gfx/{public => src}/nsSize.h              |  0
 gfx/{public => src}/nsThemeConstants.h    |  0
 gfx/{public => src}/nsTransform2D.h       |  0
 29 files changed, 37 insertions(+), 226 deletions(-)
 delete mode 100644 gfx/idl/Makefile.in
 delete mode 100644 gfx/idl/geniid.pl
 delete mode 100644 gfx/public/Makefile.in
 rename gfx/{public => src}/X11Util.h (100%)
 rename gfx/{public => src}/gfxCore.h (100%)
 rename gfx/{idl => src}/gfxIFormats.idl (100%)
 rename gfx/{idl => src}/gfxidltypes.idl (100%)
 rename gfx/{public => src}/nsColor.h (100%)
 rename gfx/{public => src}/nsColorNameList.h (100%)
 rename gfx/{public => src}/nsColorNames.h (100%)
 rename gfx/{public => src}/nsCoord.h (100%)
 rename gfx/{public => src}/nsFont.h (100%)
 rename gfx/{public => src}/nsGfxCIID.h (100%)
 rename gfx/{public => src}/nsIDeviceContext.h (100%)
 rename gfx/{idl => src}/nsIFontEnumerator.idl (100%)
 rename gfx/{public => src}/nsIFontMetrics.h (100%)
 rename gfx/{public => src}/nsIRegion.h (100%)
 rename gfx/{public => src}/nsIRenderingContext.h (100%)
 rename gfx/{idl => src}/nsIScriptableRegion.idl (100%)
 rename gfx/{public => src}/nsITheme.h (100%)
 rename gfx/{public => src}/nsMargin.h (100%)
 rename gfx/{public => src}/nsPoint.h (100%)
 rename gfx/{public => src}/nsRect.h (100%)
 rename gfx/{public => src}/nsRegion.h (100%)
 rename gfx/{public => src}/nsSize.h (100%)
 rename gfx/{public => src}/nsThemeConstants.h (100%)
 rename gfx/{public => src}/nsTransform2D.h (100%)

diff --git a/gfx/Makefile.in b/gfx/Makefile.in
index f98e6fbd7563..43dc9c889e96 100644
--- a/gfx/Makefile.in
+++ b/gfx/Makefile.in
@@ -56,7 +56,7 @@ ifndef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
 endif
 
-DIRS		+= public idl src qcms layers harfbuzz/src thebes src/thebes
+DIRS		+= src qcms layers harfbuzz/src thebes src/thebes
 
 ifdef BUILD_STATIC_LIBS
 DIRS		+= ycbcr
diff --git a/gfx/idl/Makefile.in b/gfx/idl/Makefile.in
deleted file mode 100644
index 2fbb0e7b6350..000000000000
--- a/gfx/idl/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# ***** 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 of 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 *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= gfx
-XPIDL_MODULE	= gfx
-GRE_MODULE	= 1
-
-XPIDLSRCS	= \
-		nsIFontEnumerator.idl \
-		nsIScriptableRegion.idl \
-		gfxIFormats.idl \
-		gfxidltypes.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/gfx/idl/geniid.pl b/gfx/idl/geniid.pl
deleted file mode 100644
index 4fcdcd0ae291..000000000000
--- a/gfx/idl/geniid.pl
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/local/bin/perl
-
-require "find.pl";
-
-$uuid = 0x6f7652e0;
-$format = "{ 0x%x,  0xee43, 0x11d1, \\\
- { 0x9c, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }";
-$pattern = "--- IID GOES HERE ---";
-$mydir = cwd();
-
-sub replaceText {
-    local ($oldname) = $_;
-    local ($newname) = $_;
-    local ($found) = 0;
-    local ($tempname) = $oldname.'.orig';
-    local ($replacement);
-
-    if (-T $oldname && -s $oldname) {
-        open(FILE, "<$oldname")
-            || die "Unable to open $oldname\n";
-        while (<FILE>) {
-            if (/$pattern/) {
-                $found = 1;
-                last;
-            }
-        }
-        close(FILE);
-
-        if ($found) {
-	    print "Setting IID for file: ", $oldname, "\n";
-            rename($oldname, $tempname)
-                || die "Unable to rename $oldname as $tempname";
-            open(REPLACEFILE, ">$newname")
-                || die "Unable to open $newname for writing\n";
-
-            open(SEARCHFILE, "<$tempname")
-                || die "Unable to open $tempname\n";
-
-	    while (<SEARCHFILE>) { 
-		if (/$pattern/) {
-		    $replacement = sprintf($format, $uuid++);
-		    s/$pattern/$replacement /g;
-		}
-		print REPLACEFILE;
-	    }
-            close(SEARCHFILE);
-            close(REPLACEFILE);
-            if (-z $newname) {
-                die "$newname has zero size\n."
-                    ."Restore manually from $tempname\n";
-            } else {
-                unlink($tempname);
-            }
-
-            warn "$name: Renaming as $newname\n" if $newname ne $oldname;
-
-            $_ = $oldname;
-            return;
-        }
-    }
-    if ($newname ne $oldname) {
-        warn "$name: Renaming as $newname\n";
-        rename($oldname, $newname) || warn "Unable to rename $oldname\n";
-    }
-    $_ = $oldname;
-}
-
-eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}'
-	if $running_under_some_shell;
-
-# Traverse desired filesystems
-$dont_use_nlink = 1;
-
-if (!$ARGV[0]) {
-    &find('.');
-}
-else {
-    foreach $file (@ARGV) {
-	chdir $mydir
-        &find($file);
-    }
-}
-
-exit;
-
-sub wanted {
-    /^nsIDOM.*\.h$/ &&
-    &replaceText($name);
-}
diff --git a/gfx/public/Makefile.in b/gfx/public/Makefile.in
deleted file mode 100644
index 5feb7abe49a0..000000000000
--- a/gfx/public/Makefile.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# ***** 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 of 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 *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= gfx
-
-EXPORTS		= \
-		gfxCore.h \
-		nsColor.h \
-		nsColorNames.h \
-		nsColorNameList.h \
-		nsCoord.h \
-		nsFont.h \
-		nsRect.h \
-		nsRegion.h \
-		nsPoint.h \
-		nsSize.h \
-		nsMargin.h \
-		nsTransform2D.h \
-		nsIRenderingContext.h \
-		nsIFontMetrics.h \
-		nsIDeviceContext.h \
-		nsGfxCIID.h \
-		nsIRegion.h \
-		nsITheme.h \
-		nsThemeConstants.h \
-		$(NULL)
-
-ifdef MOZ_X11
-EXPORTS_NAMESPACES	= mozilla
-EXPORTS_mozilla		= X11Util.h
-endif
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in
index 18881cc0d58a..4ce705f6631c 100644
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -42,12 +42,45 @@ VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE      = gfx
-LIBRARY_NAME    = gkgfx
+MODULE         = gfx
+LIBRARY_NAME   = gkgfx
 EXPORT_LIBRARY = 1
-GRE_MODULE	= 1
+GRE_MODULE     = 1
 LIBXUL_LIBRARY = 1
 
+XPIDLSRCS = \
+	nsIFontEnumerator.idl \
+	nsIScriptableRegion.idl \
+	gfxIFormats.idl \
+	gfxidltypes.idl \
+	$(NULL)
+
+EXPORTS	= \
+	gfxCore.h \
+	nsColor.h \
+	nsColorNames.h \
+	nsColorNameList.h \
+	nsCoord.h \
+	nsFont.h \
+	nsRect.h \
+	nsRegion.h \
+	nsPoint.h \
+	nsSize.h \
+	nsMargin.h \
+	nsTransform2D.h \
+	nsIRenderingContext.h \
+	nsIFontMetrics.h \
+	nsIDeviceContext.h \
+	nsGfxCIID.h \
+	nsIRegion.h \
+	nsITheme.h \
+	nsThemeConstants.h \
+	$(NULL)
+
+ifdef MOZ_X11
+EXPORTS_NAMESPACES	= mozilla
+EXPORTS_mozilla		= X11Util.h
+endif
 
 CPPSRCS = \
         nsColor.cpp \
@@ -58,7 +91,6 @@ CPPSRCS = \
         nsScriptableRegion.cpp \
         $(NULL)
 
-
 EXTRA_DSO_LDOPTS = \
         $(MOZ_UNICHARUTIL_LIBS) \
         $(MOZ_COMPONENT_LIBS) \
diff --git a/gfx/public/X11Util.h b/gfx/src/X11Util.h
similarity index 100%
rename from gfx/public/X11Util.h
rename to gfx/src/X11Util.h
diff --git a/gfx/public/gfxCore.h b/gfx/src/gfxCore.h
similarity index 100%
rename from gfx/public/gfxCore.h
rename to gfx/src/gfxCore.h
diff --git a/gfx/idl/gfxIFormats.idl b/gfx/src/gfxIFormats.idl
similarity index 100%
rename from gfx/idl/gfxIFormats.idl
rename to gfx/src/gfxIFormats.idl
diff --git a/gfx/idl/gfxidltypes.idl b/gfx/src/gfxidltypes.idl
similarity index 100%
rename from gfx/idl/gfxidltypes.idl
rename to gfx/src/gfxidltypes.idl
diff --git a/gfx/public/nsColor.h b/gfx/src/nsColor.h
similarity index 100%
rename from gfx/public/nsColor.h
rename to gfx/src/nsColor.h
diff --git a/gfx/public/nsColorNameList.h b/gfx/src/nsColorNameList.h
similarity index 100%
rename from gfx/public/nsColorNameList.h
rename to gfx/src/nsColorNameList.h
diff --git a/gfx/public/nsColorNames.h b/gfx/src/nsColorNames.h
similarity index 100%
rename from gfx/public/nsColorNames.h
rename to gfx/src/nsColorNames.h
diff --git a/gfx/public/nsCoord.h b/gfx/src/nsCoord.h
similarity index 100%
rename from gfx/public/nsCoord.h
rename to gfx/src/nsCoord.h
diff --git a/gfx/public/nsFont.h b/gfx/src/nsFont.h
similarity index 100%
rename from gfx/public/nsFont.h
rename to gfx/src/nsFont.h
diff --git a/gfx/public/nsGfxCIID.h b/gfx/src/nsGfxCIID.h
similarity index 100%
rename from gfx/public/nsGfxCIID.h
rename to gfx/src/nsGfxCIID.h
diff --git a/gfx/public/nsIDeviceContext.h b/gfx/src/nsIDeviceContext.h
similarity index 100%
rename from gfx/public/nsIDeviceContext.h
rename to gfx/src/nsIDeviceContext.h
diff --git a/gfx/idl/nsIFontEnumerator.idl b/gfx/src/nsIFontEnumerator.idl
similarity index 100%
rename from gfx/idl/nsIFontEnumerator.idl
rename to gfx/src/nsIFontEnumerator.idl
diff --git a/gfx/public/nsIFontMetrics.h b/gfx/src/nsIFontMetrics.h
similarity index 100%
rename from gfx/public/nsIFontMetrics.h
rename to gfx/src/nsIFontMetrics.h
diff --git a/gfx/public/nsIRegion.h b/gfx/src/nsIRegion.h
similarity index 100%
rename from gfx/public/nsIRegion.h
rename to gfx/src/nsIRegion.h
diff --git a/gfx/public/nsIRenderingContext.h b/gfx/src/nsIRenderingContext.h
similarity index 100%
rename from gfx/public/nsIRenderingContext.h
rename to gfx/src/nsIRenderingContext.h
diff --git a/gfx/idl/nsIScriptableRegion.idl b/gfx/src/nsIScriptableRegion.idl
similarity index 100%
rename from gfx/idl/nsIScriptableRegion.idl
rename to gfx/src/nsIScriptableRegion.idl
diff --git a/gfx/public/nsITheme.h b/gfx/src/nsITheme.h
similarity index 100%
rename from gfx/public/nsITheme.h
rename to gfx/src/nsITheme.h
diff --git a/gfx/public/nsMargin.h b/gfx/src/nsMargin.h
similarity index 100%
rename from gfx/public/nsMargin.h
rename to gfx/src/nsMargin.h
diff --git a/gfx/public/nsPoint.h b/gfx/src/nsPoint.h
similarity index 100%
rename from gfx/public/nsPoint.h
rename to gfx/src/nsPoint.h
diff --git a/gfx/public/nsRect.h b/gfx/src/nsRect.h
similarity index 100%
rename from gfx/public/nsRect.h
rename to gfx/src/nsRect.h
diff --git a/gfx/public/nsRegion.h b/gfx/src/nsRegion.h
similarity index 100%
rename from gfx/public/nsRegion.h
rename to gfx/src/nsRegion.h
diff --git a/gfx/public/nsSize.h b/gfx/src/nsSize.h
similarity index 100%
rename from gfx/public/nsSize.h
rename to gfx/src/nsSize.h
diff --git a/gfx/public/nsThemeConstants.h b/gfx/src/nsThemeConstants.h
similarity index 100%
rename from gfx/public/nsThemeConstants.h
rename to gfx/src/nsThemeConstants.h
diff --git a/gfx/public/nsTransform2D.h b/gfx/src/nsTransform2D.h
similarity index 100%
rename from gfx/public/nsTransform2D.h
rename to gfx/src/nsTransform2D.h

From 95de3783f60a7a356e4073b0d4943291955c193e Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zweinberg@mozilla.com>
Date: Mon, 28 Jun 2010 10:37:23 -0700
Subject: [PATCH 143/172] Bug 571989 part 3: Flatten directory structure below
 gfx/thebes.

--HG--
rename : gfx/thebes/src/GLContext.cpp => gfx/thebes/GLContext.cpp
rename : gfx/thebes/public/GLContext.h => gfx/thebes/GLContext.h
rename : gfx/thebes/public/GLContextProvider.h => gfx/thebes/GLContextProvider.h
rename : gfx/thebes/src/GLContextProviderCGL.mm => gfx/thebes/GLContextProviderCGL.mm
rename : gfx/thebes/src/GLContextProviderEGL.cpp => gfx/thebes/GLContextProviderEGL.cpp
rename : gfx/thebes/src/GLContextProviderGLX.cpp => gfx/thebes/GLContextProviderGLX.cpp
rename : gfx/thebes/src/GLContextProviderNull.cpp => gfx/thebes/GLContextProviderNull.cpp
rename : gfx/thebes/src/GLContextProviderOSMesa.cpp => gfx/thebes/GLContextProviderOSMesa.cpp
rename : gfx/thebes/src/GLContextProviderWGL.cpp => gfx/thebes/GLContextProviderWGL.cpp
rename : gfx/thebes/public/GLDefs.h => gfx/thebes/GLDefs.h
rename : gfx/thebes/public/GLXLibrary.h => gfx/thebes/GLXLibrary.h
rename : gfx/thebes/public/WGLLibrary.h => gfx/thebes/WGLLibrary.h
rename : gfx/thebes/src/cairo-gdk-utils.c => gfx/thebes/cairo-gdk-utils.c
rename : gfx/thebes/src/cairo-gdk-utils.h => gfx/thebes/cairo-gdk-utils.h
rename : gfx/thebes/src/cairo-xlib-utils.c => gfx/thebes/cairo-xlib-utils.c
rename : gfx/thebes/src/cairo-xlib-utils.h => gfx/thebes/cairo-xlib-utils.h
rename : gfx/thebes/src/genUnicodeScriptData.pl => gfx/thebes/genUnicodeScriptData.pl
rename : gfx/thebes/public/gfx3DMatrix.h => gfx/thebes/gfx3DMatrix.h
rename : gfx/thebes/src/gfxASurface.cpp => gfx/thebes/gfxASurface.cpp
rename : gfx/thebes/public/gfxASurface.h => gfx/thebes/gfxASurface.h
rename : gfx/thebes/src/gfxAlphaRecovery.cpp => gfx/thebes/gfxAlphaRecovery.cpp
rename : gfx/thebes/public/gfxAlphaRecovery.h => gfx/thebes/gfxAlphaRecovery.h
rename : gfx/thebes/src/gfxAndroidPlatform.cpp => gfx/thebes/gfxAndroidPlatform.cpp
rename : gfx/thebes/public/gfxAndroidPlatform.h => gfx/thebes/gfxAndroidPlatform.h
rename : gfx/thebes/src/gfxAtomList.h => gfx/thebes/gfxAtomList.h
rename : gfx/thebes/src/gfxAtoms.cpp => gfx/thebes/gfxAtoms.cpp
rename : gfx/thebes/src/gfxAtoms.h => gfx/thebes/gfxAtoms.h
rename : gfx/thebes/src/gfxBeOSPlatform.cpp => gfx/thebes/gfxBeOSPlatform.cpp
rename : gfx/thebes/public/gfxBeOSPlatform.h => gfx/thebes/gfxBeOSPlatform.h
rename : gfx/thebes/src/gfxBeOSSurface.cpp => gfx/thebes/gfxBeOSSurface.cpp
rename : gfx/thebes/public/gfxBeOSSurface.h => gfx/thebes/gfxBeOSSurface.h
rename : gfx/thebes/public/gfxColor.h => gfx/thebes/gfxColor.h
rename : gfx/thebes/src/gfxContext.cpp => gfx/thebes/gfxContext.cpp
rename : gfx/thebes/public/gfxContext.h => gfx/thebes/gfxContext.h
rename : gfx/thebes/src/gfxCoreTextShaper.cpp => gfx/thebes/gfxCoreTextShaper.cpp
rename : gfx/thebes/src/gfxCoreTextShaper.h => gfx/thebes/gfxCoreTextShaper.h
rename : gfx/thebes/src/gfxD2DSurface.cpp => gfx/thebes/gfxD2DSurface.cpp
rename : gfx/thebes/public/gfxD2DSurface.h => gfx/thebes/gfxD2DSurface.h
rename : gfx/thebes/src/gfxDDrawSurface.cpp => gfx/thebes/gfxDDrawSurface.cpp
rename : gfx/thebes/public/gfxDDrawSurface.h => gfx/thebes/gfxDDrawSurface.h
rename : gfx/thebes/src/gfxDWriteCommon.cpp => gfx/thebes/gfxDWriteCommon.cpp
rename : gfx/thebes/src/gfxDWriteCommon.h => gfx/thebes/gfxDWriteCommon.h
rename : gfx/thebes/src/gfxDWriteFontList.cpp => gfx/thebes/gfxDWriteFontList.cpp
rename : gfx/thebes/src/gfxDWriteFontList.h => gfx/thebes/gfxDWriteFontList.h
rename : gfx/thebes/src/gfxDWriteFonts.cpp => gfx/thebes/gfxDWriteFonts.cpp
rename : gfx/thebes/public/gfxDWriteFonts.h => gfx/thebes/gfxDWriteFonts.h
rename : gfx/thebes/src/gfxDWriteShaper.cpp => gfx/thebes/gfxDWriteShaper.cpp
rename : gfx/thebes/src/gfxDWriteShaper.h => gfx/thebes/gfxDWriteShaper.h
rename : gfx/thebes/src/gfxDWriteTextAnalysis.cpp => gfx/thebes/gfxDWriteTextAnalysis.cpp
rename : gfx/thebes/src/gfxDWriteTextAnalysis.h => gfx/thebes/gfxDWriteTextAnalysis.h
rename : gfx/thebes/src/gfxDirectFBSurface.cpp => gfx/thebes/gfxDirectFBSurface.cpp
rename : gfx/thebes/public/gfxDirectFBSurface.h => gfx/thebes/gfxDirectFBSurface.h
rename : gfx/thebes/src/gfxDllDeps.cpp => gfx/thebes/gfxDllDeps.cpp
rename : gfx/thebes/src/gfxFT2FontBase.cpp => gfx/thebes/gfxFT2FontBase.cpp
rename : gfx/thebes/public/gfxFT2FontBase.h => gfx/thebes/gfxFT2FontBase.h
rename : gfx/thebes/src/gfxFT2FontList.cpp => gfx/thebes/gfxFT2FontList.cpp
rename : gfx/thebes/src/gfxFT2FontList.h => gfx/thebes/gfxFT2FontList.h
rename : gfx/thebes/src/gfxFT2Fonts.cpp => gfx/thebes/gfxFT2Fonts.cpp
rename : gfx/thebes/public/gfxFT2Fonts.h => gfx/thebes/gfxFT2Fonts.h
rename : gfx/thebes/src/gfxFT2Utils.cpp => gfx/thebes/gfxFT2Utils.cpp
rename : gfx/thebes/src/gfxFT2Utils.h => gfx/thebes/gfxFT2Utils.h
rename : gfx/thebes/src/gfxFont.cpp => gfx/thebes/gfxFont.cpp
rename : gfx/thebes/public/gfxFont.h => gfx/thebes/gfxFont.h
rename : gfx/thebes/public/gfxFontConstants.h => gfx/thebes/gfxFontConstants.h
rename : gfx/thebes/src/gfxFontMissingGlyphs.cpp => gfx/thebes/gfxFontMissingGlyphs.cpp
rename : gfx/thebes/src/gfxFontMissingGlyphs.h => gfx/thebes/gfxFontMissingGlyphs.h
rename : gfx/thebes/src/gfxFontTest.cpp => gfx/thebes/gfxFontTest.cpp
rename : gfx/thebes/public/gfxFontTest.h => gfx/thebes/gfxFontTest.h
rename : gfx/thebes/src/gfxFontUtils.cpp => gfx/thebes/gfxFontUtils.cpp
rename : gfx/thebes/public/gfxFontUtils.h => gfx/thebes/gfxFontUtils.h
rename : gfx/thebes/src/gfxFontconfigUtils.cpp => gfx/thebes/gfxFontconfigUtils.cpp
rename : gfx/thebes/src/gfxFontconfigUtils.h => gfx/thebes/gfxFontconfigUtils.h
rename : gfx/thebes/src/gfxGDIFont.cpp => gfx/thebes/gfxGDIFont.cpp
rename : gfx/thebes/src/gfxGDIFont.h => gfx/thebes/gfxGDIFont.h
rename : gfx/thebes/src/gfxGDIFontList.cpp => gfx/thebes/gfxGDIFontList.cpp
rename : gfx/thebes/src/gfxGDIFontList.h => gfx/thebes/gfxGDIFontList.h
rename : gfx/thebes/src/gfxGDIShaper.cpp => gfx/thebes/gfxGDIShaper.cpp
rename : gfx/thebes/src/gfxGDIShaper.h => gfx/thebes/gfxGDIShaper.h
rename : gfx/thebes/src/gfxGdkNativeRenderer.cpp => gfx/thebes/gfxGdkNativeRenderer.cpp
rename : gfx/thebes/public/gfxGdkNativeRenderer.h => gfx/thebes/gfxGdkNativeRenderer.h
rename : gfx/thebes/public/gfxGlitzSurface.h => gfx/thebes/gfxGlitzSurface.h
rename : gfx/thebes/src/gfxHarfBuzzShaper.cpp => gfx/thebes/gfxHarfBuzzShaper.cpp
rename : gfx/thebes/src/gfxHarfBuzzShaper.h => gfx/thebes/gfxHarfBuzzShaper.h
rename : gfx/thebes/src/gfxImageSurface.cpp => gfx/thebes/gfxImageSurface.cpp
rename : gfx/thebes/public/gfxImageSurface.h => gfx/thebes/gfxImageSurface.h
rename : gfx/thebes/src/gfxMacFont.cpp => gfx/thebes/gfxMacFont.cpp
rename : gfx/thebes/src/gfxMacFont.h => gfx/thebes/gfxMacFont.h
rename : gfx/thebes/src/gfxMacPlatformFontList.h => gfx/thebes/gfxMacPlatformFontList.h
rename : gfx/thebes/src/gfxMacPlatformFontList.mm => gfx/thebes/gfxMacPlatformFontList.mm
rename : gfx/thebes/src/gfxMatrix.cpp => gfx/thebes/gfxMatrix.cpp
rename : gfx/thebes/public/gfxMatrix.h => gfx/thebes/gfxMatrix.h
rename : gfx/thebes/src/gfxOS2Fonts.cpp => gfx/thebes/gfxOS2Fonts.cpp
rename : gfx/thebes/public/gfxOS2Fonts.h => gfx/thebes/gfxOS2Fonts.h
rename : gfx/thebes/src/gfxOS2Platform.cpp => gfx/thebes/gfxOS2Platform.cpp
rename : gfx/thebes/public/gfxOS2Platform.h => gfx/thebes/gfxOS2Platform.h
rename : gfx/thebes/src/gfxOS2Surface.cpp => gfx/thebes/gfxOS2Surface.cpp
rename : gfx/thebes/public/gfxOS2Surface.h => gfx/thebes/gfxOS2Surface.h
rename : gfx/thebes/src/gfxPDFSurface.cpp => gfx/thebes/gfxPDFSurface.cpp
rename : gfx/thebes/public/gfxPDFSurface.h => gfx/thebes/gfxPDFSurface.h
rename : gfx/thebes/src/gfxPSSurface.cpp => gfx/thebes/gfxPSSurface.cpp
rename : gfx/thebes/public/gfxPSSurface.h => gfx/thebes/gfxPSSurface.h
rename : gfx/thebes/src/gfxPangoFonts.cpp => gfx/thebes/gfxPangoFonts.cpp
rename : gfx/thebes/public/gfxPangoFonts.h => gfx/thebes/gfxPangoFonts.h
rename : gfx/thebes/src/gfxPath.cpp => gfx/thebes/gfxPath.cpp
rename : gfx/thebes/public/gfxPath.h => gfx/thebes/gfxPath.h
rename : gfx/thebes/src/gfxPattern.cpp => gfx/thebes/gfxPattern.cpp
rename : gfx/thebes/public/gfxPattern.h => gfx/thebes/gfxPattern.h
rename : gfx/thebes/src/gfxPlatform.cpp => gfx/thebes/gfxPlatform.cpp
rename : gfx/thebes/public/gfxPlatform.h => gfx/thebes/gfxPlatform.h
rename : gfx/thebes/src/gfxPlatformFontList.cpp => gfx/thebes/gfxPlatformFontList.cpp
rename : gfx/thebes/src/gfxPlatformFontList.h => gfx/thebes/gfxPlatformFontList.h
rename : gfx/thebes/src/gfxPlatformGtk.cpp => gfx/thebes/gfxPlatformGtk.cpp
rename : gfx/thebes/public/gfxPlatformGtk.h => gfx/thebes/gfxPlatformGtk.h
rename : gfx/thebes/src/gfxPlatformMac.cpp => gfx/thebes/gfxPlatformMac.cpp
rename : gfx/thebes/public/gfxPlatformMac.h => gfx/thebes/gfxPlatformMac.h
rename : gfx/thebes/public/gfxPoint.h => gfx/thebes/gfxPoint.h
rename : gfx/thebes/src/gfxQPainterSurface.cpp => gfx/thebes/gfxQPainterSurface.cpp
rename : gfx/thebes/public/gfxQPainterSurface.h => gfx/thebes/gfxQPainterSurface.h
rename : gfx/thebes/src/gfxQtNativeRenderer.cpp => gfx/thebes/gfxQtNativeRenderer.cpp
rename : gfx/thebes/public/gfxQtNativeRenderer.h => gfx/thebes/gfxQtNativeRenderer.h
rename : gfx/thebes/src/gfxQtPlatform.cpp => gfx/thebes/gfxQtPlatform.cpp
rename : gfx/thebes/public/gfxQtPlatform.h => gfx/thebes/gfxQtPlatform.h
rename : gfx/thebes/src/gfxQuartzImageSurface.cpp => gfx/thebes/gfxQuartzImageSurface.cpp
rename : gfx/thebes/public/gfxQuartzImageSurface.h => gfx/thebes/gfxQuartzImageSurface.h
rename : gfx/thebes/src/gfxQuartzNativeDrawing.cpp => gfx/thebes/gfxQuartzNativeDrawing.cpp
rename : gfx/thebes/public/gfxQuartzNativeDrawing.h => gfx/thebes/gfxQuartzNativeDrawing.h
rename : gfx/thebes/src/gfxQuartzPDFSurface.cpp => gfx/thebes/gfxQuartzPDFSurface.cpp
rename : gfx/thebes/public/gfxQuartzPDFSurface.h => gfx/thebes/gfxQuartzPDFSurface.h
rename : gfx/thebes/src/gfxQuartzSurface.cpp => gfx/thebes/gfxQuartzSurface.cpp
rename : gfx/thebes/public/gfxQuartzSurface.h => gfx/thebes/gfxQuartzSurface.h
rename : gfx/thebes/src/gfxRect.cpp => gfx/thebes/gfxRect.cpp
rename : gfx/thebes/public/gfxRect.h => gfx/thebes/gfxRect.h
rename : gfx/thebes/src/gfxScriptItemizer.cpp => gfx/thebes/gfxScriptItemizer.cpp
rename : gfx/thebes/src/gfxScriptItemizer.h => gfx/thebes/gfxScriptItemizer.h
rename : gfx/thebes/src/gfxSharedImageSurface.cpp => gfx/thebes/gfxSharedImageSurface.cpp
rename : gfx/thebes/public/gfxSharedImageSurface.h => gfx/thebes/gfxSharedImageSurface.h
rename : gfx/thebes/src/gfxSkipChars.cpp => gfx/thebes/gfxSkipChars.cpp
rename : gfx/thebes/public/gfxSkipChars.h => gfx/thebes/gfxSkipChars.h
rename : gfx/thebes/src/gfxTextRunCache.cpp => gfx/thebes/gfxTextRunCache.cpp
rename : gfx/thebes/public/gfxTextRunCache.h => gfx/thebes/gfxTextRunCache.h
rename : gfx/thebes/src/gfxTextRunWordCache.cpp => gfx/thebes/gfxTextRunWordCache.cpp
rename : gfx/thebes/public/gfxTextRunWordCache.h => gfx/thebes/gfxTextRunWordCache.h
rename : gfx/thebes/public/gfxTypes.h => gfx/thebes/gfxTypes.h
rename : gfx/thebes/src/gfxUnicodeProperties.cpp => gfx/thebes/gfxUnicodeProperties.cpp
rename : gfx/thebes/src/gfxUnicodeProperties.h => gfx/thebes/gfxUnicodeProperties.h
rename : gfx/thebes/src/gfxUnicodePropertyData.cpp => gfx/thebes/gfxUnicodePropertyData.cpp
rename : gfx/thebes/src/gfxUniscribeShaper.cpp => gfx/thebes/gfxUniscribeShaper.cpp
rename : gfx/thebes/src/gfxUniscribeShaper.h => gfx/thebes/gfxUniscribeShaper.h
rename : gfx/thebes/src/gfxUserFontSet.cpp => gfx/thebes/gfxUserFontSet.cpp
rename : gfx/thebes/public/gfxUserFontSet.h => gfx/thebes/gfxUserFontSet.h
rename : gfx/thebes/src/gfxUtils.cpp => gfx/thebes/gfxUtils.cpp
rename : gfx/thebes/public/gfxUtils.h => gfx/thebes/gfxUtils.h
rename : gfx/thebes/src/gfxWindowsNativeDrawing.cpp => gfx/thebes/gfxWindowsNativeDrawing.cpp
rename : gfx/thebes/public/gfxWindowsNativeDrawing.h => gfx/thebes/gfxWindowsNativeDrawing.h
rename : gfx/thebes/src/gfxWindowsPlatform.cpp => gfx/thebes/gfxWindowsPlatform.cpp
rename : gfx/thebes/public/gfxWindowsPlatform.h => gfx/thebes/gfxWindowsPlatform.h
rename : gfx/thebes/src/gfxWindowsSurface.cpp => gfx/thebes/gfxWindowsSurface.cpp
rename : gfx/thebes/public/gfxWindowsSurface.h => gfx/thebes/gfxWindowsSurface.h
rename : gfx/thebes/src/gfxXlibNativeRenderer.cpp => gfx/thebes/gfxXlibNativeRenderer.cpp
rename : gfx/thebes/public/gfxXlibNativeRenderer.h => gfx/thebes/gfxXlibNativeRenderer.h
rename : gfx/thebes/src/gfxXlibSurface.cpp => gfx/thebes/gfxXlibSurface.cpp
rename : gfx/thebes/public/gfxXlibSurface.h => gfx/thebes/gfxXlibSurface.h
rename : gfx/thebes/src/ignorable.x-ccmap => gfx/thebes/ignorable.x-ccmap
rename : gfx/thebes/src/nsUnicodeRange.cpp => gfx/thebes/nsUnicodeRange.cpp
rename : gfx/thebes/src/nsUnicodeRange.h => gfx/thebes/nsUnicodeRange.h
rename : gfx/thebes/src/woff-private.h => gfx/thebes/woff-private.h
rename : gfx/thebes/src/woff.c => gfx/thebes/woff.c
rename : gfx/thebes/src/woff.h => gfx/thebes/woff.h
---
 gfx/thebes/{src => }/GLContext.cpp            |   0
 gfx/thebes/{public => }/GLContext.h           |   0
 gfx/thebes/{public => }/GLContextProvider.h   |   0
 gfx/thebes/{src => }/GLContextProviderCGL.mm  |   0
 gfx/thebes/{src => }/GLContextProviderEGL.cpp |   0
 gfx/thebes/{src => }/GLContextProviderGLX.cpp |   0
 .../{src => }/GLContextProviderNull.cpp       |   0
 .../{src => }/GLContextProviderOSMesa.cpp     |   0
 gfx/thebes/{src => }/GLContextProviderWGL.cpp |   0
 gfx/thebes/{public => }/GLDefs.h              |   0
 gfx/thebes/{public => }/GLXLibrary.h          |   0
 gfx/thebes/Makefile.in                        | 436 +++++++++++++++++-
 gfx/thebes/{public => }/WGLLibrary.h          |   0
 gfx/thebes/{src => }/cairo-gdk-utils.c        |   0
 gfx/thebes/{src => }/cairo-gdk-utils.h        |   0
 gfx/thebes/{src => }/cairo-xlib-utils.c       |   0
 gfx/thebes/{src => }/cairo-xlib-utils.h       |   0
 gfx/thebes/{src => }/genUnicodeScriptData.pl  |   0
 gfx/thebes/{public => }/gfx3DMatrix.h         |   0
 gfx/thebes/{src => }/gfxASurface.cpp          |   0
 gfx/thebes/{public => }/gfxASurface.h         |   0
 gfx/thebes/{src => }/gfxAlphaRecovery.cpp     |   0
 gfx/thebes/{public => }/gfxAlphaRecovery.h    |   0
 gfx/thebes/{src => }/gfxAndroidPlatform.cpp   |   0
 gfx/thebes/{public => }/gfxAndroidPlatform.h  |   0
 gfx/thebes/{src => }/gfxAtomList.h            |   0
 gfx/thebes/{src => }/gfxAtoms.cpp             |   0
 gfx/thebes/{src => }/gfxAtoms.h               |   0
 gfx/thebes/{src => }/gfxBeOSPlatform.cpp      |   0
 gfx/thebes/{public => }/gfxBeOSPlatform.h     |   0
 gfx/thebes/{src => }/gfxBeOSSurface.cpp       |   0
 gfx/thebes/{public => }/gfxBeOSSurface.h      |   0
 gfx/thebes/{public => }/gfxColor.h            |   0
 gfx/thebes/{src => }/gfxContext.cpp           |   0
 gfx/thebes/{public => }/gfxContext.h          |   0
 gfx/thebes/{src => }/gfxCoreTextShaper.cpp    |   0
 gfx/thebes/{src => }/gfxCoreTextShaper.h      |   0
 gfx/thebes/{src => }/gfxD2DSurface.cpp        |   0
 gfx/thebes/{public => }/gfxD2DSurface.h       |   0
 gfx/thebes/{src => }/gfxDDrawSurface.cpp      |   0
 gfx/thebes/{public => }/gfxDDrawSurface.h     |   0
 gfx/thebes/{src => }/gfxDWriteCommon.cpp      |   0
 gfx/thebes/{src => }/gfxDWriteCommon.h        |   0
 gfx/thebes/{src => }/gfxDWriteFontList.cpp    |   0
 gfx/thebes/{src => }/gfxDWriteFontList.h      |   0
 gfx/thebes/{src => }/gfxDWriteFonts.cpp       |   0
 gfx/thebes/{public => }/gfxDWriteFonts.h      |   0
 gfx/thebes/{src => }/gfxDWriteShaper.cpp      |   0
 gfx/thebes/{src => }/gfxDWriteShaper.h        |   0
 .../{src => }/gfxDWriteTextAnalysis.cpp       |   0
 gfx/thebes/{src => }/gfxDWriteTextAnalysis.h  |   0
 gfx/thebes/{src => }/gfxDirectFBSurface.cpp   |   0
 gfx/thebes/{public => }/gfxDirectFBSurface.h  |   0
 gfx/thebes/{src => }/gfxDllDeps.cpp           |   0
 gfx/thebes/{src => }/gfxFT2FontBase.cpp       |   0
 gfx/thebes/{public => }/gfxFT2FontBase.h      |   0
 gfx/thebes/{src => }/gfxFT2FontList.cpp       |   0
 gfx/thebes/{src => }/gfxFT2FontList.h         |   0
 gfx/thebes/{src => }/gfxFT2Fonts.cpp          |   0
 gfx/thebes/{public => }/gfxFT2Fonts.h         |   0
 gfx/thebes/{src => }/gfxFT2Utils.cpp          |   0
 gfx/thebes/{src => }/gfxFT2Utils.h            |   0
 gfx/thebes/{src => }/gfxFont.cpp              |   0
 gfx/thebes/{public => }/gfxFont.h             |   0
 gfx/thebes/{public => }/gfxFontConstants.h    |   0
 gfx/thebes/{src => }/gfxFontMissingGlyphs.cpp |   0
 gfx/thebes/{src => }/gfxFontMissingGlyphs.h   |   0
 gfx/thebes/{src => }/gfxFontTest.cpp          |   0
 gfx/thebes/{public => }/gfxFontTest.h         |   0
 gfx/thebes/{src => }/gfxFontUtils.cpp         |   0
 gfx/thebes/{public => }/gfxFontUtils.h        |   0
 gfx/thebes/{src => }/gfxFontconfigUtils.cpp   |   0
 gfx/thebes/{src => }/gfxFontconfigUtils.h     |   0
 gfx/thebes/{src => }/gfxGDIFont.cpp           |   0
 gfx/thebes/{src => }/gfxGDIFont.h             |   0
 gfx/thebes/{src => }/gfxGDIFontList.cpp       |   0
 gfx/thebes/{src => }/gfxGDIFontList.h         |   0
 gfx/thebes/{src => }/gfxGDIShaper.cpp         |   0
 gfx/thebes/{src => }/gfxGDIShaper.h           |   0
 gfx/thebes/{src => }/gfxGdkNativeRenderer.cpp |   0
 .../{public => }/gfxGdkNativeRenderer.h       |   0
 gfx/thebes/{public => }/gfxGlitzSurface.h     |   0
 gfx/thebes/{src => }/gfxHarfBuzzShaper.cpp    |   0
 gfx/thebes/{src => }/gfxHarfBuzzShaper.h      |   0
 gfx/thebes/{src => }/gfxImageSurface.cpp      |   0
 gfx/thebes/{public => }/gfxImageSurface.h     |   0
 gfx/thebes/{src => }/gfxMacFont.cpp           |   0
 gfx/thebes/{src => }/gfxMacFont.h             |   0
 gfx/thebes/{src => }/gfxMacPlatformFontList.h |   0
 .../{src => }/gfxMacPlatformFontList.mm       |   0
 gfx/thebes/{src => }/gfxMatrix.cpp            |   0
 gfx/thebes/{public => }/gfxMatrix.h           |   0
 gfx/thebes/{src => }/gfxOS2Fonts.cpp          |   0
 gfx/thebes/{public => }/gfxOS2Fonts.h         |   0
 gfx/thebes/{src => }/gfxOS2Platform.cpp       |   0
 gfx/thebes/{public => }/gfxOS2Platform.h      |   0
 gfx/thebes/{src => }/gfxOS2Surface.cpp        |   0
 gfx/thebes/{public => }/gfxOS2Surface.h       |   0
 gfx/thebes/{src => }/gfxPDFSurface.cpp        |   0
 gfx/thebes/{public => }/gfxPDFSurface.h       |   0
 gfx/thebes/{src => }/gfxPSSurface.cpp         |   0
 gfx/thebes/{public => }/gfxPSSurface.h        |   0
 gfx/thebes/{src => }/gfxPangoFonts.cpp        |   0
 gfx/thebes/{public => }/gfxPangoFonts.h       |   0
 gfx/thebes/{src => }/gfxPath.cpp              |   0
 gfx/thebes/{public => }/gfxPath.h             |   0
 gfx/thebes/{src => }/gfxPattern.cpp           |   0
 gfx/thebes/{public => }/gfxPattern.h          |   0
 gfx/thebes/{src => }/gfxPlatform.cpp          |   0
 gfx/thebes/{public => }/gfxPlatform.h         |   0
 gfx/thebes/{src => }/gfxPlatformFontList.cpp  |   0
 gfx/thebes/{src => }/gfxPlatformFontList.h    |   0
 gfx/thebes/{src => }/gfxPlatformGtk.cpp       |   0
 gfx/thebes/{public => }/gfxPlatformGtk.h      |   0
 gfx/thebes/{src => }/gfxPlatformMac.cpp       |   0
 gfx/thebes/{public => }/gfxPlatformMac.h      |   0
 gfx/thebes/{public => }/gfxPoint.h            |   0
 gfx/thebes/{src => }/gfxQPainterSurface.cpp   |   0
 gfx/thebes/{public => }/gfxQPainterSurface.h  |   0
 gfx/thebes/{src => }/gfxQtNativeRenderer.cpp  |   0
 gfx/thebes/{public => }/gfxQtNativeRenderer.h |   0
 gfx/thebes/{src => }/gfxQtPlatform.cpp        |   0
 gfx/thebes/{public => }/gfxQtPlatform.h       |   0
 .../{src => }/gfxQuartzImageSurface.cpp       |   0
 .../{public => }/gfxQuartzImageSurface.h      |   0
 .../{src => }/gfxQuartzNativeDrawing.cpp      |   0
 .../{public => }/gfxQuartzNativeDrawing.h     |   0
 gfx/thebes/{src => }/gfxQuartzPDFSurface.cpp  |   0
 gfx/thebes/{public => }/gfxQuartzPDFSurface.h |   0
 gfx/thebes/{src => }/gfxQuartzSurface.cpp     |   0
 gfx/thebes/{public => }/gfxQuartzSurface.h    |   0
 gfx/thebes/{src => }/gfxRect.cpp              |   0
 gfx/thebes/{public => }/gfxRect.h             |   0
 gfx/thebes/{src => }/gfxScriptItemizer.cpp    |   0
 gfx/thebes/{src => }/gfxScriptItemizer.h      |   0
 .../{src => }/gfxSharedImageSurface.cpp       |   0
 .../{public => }/gfxSharedImageSurface.h      |   0
 gfx/thebes/{src => }/gfxSkipChars.cpp         |   0
 gfx/thebes/{public => }/gfxSkipChars.h        |   0
 gfx/thebes/{src => }/gfxTextRunCache.cpp      |   0
 gfx/thebes/{public => }/gfxTextRunCache.h     |   0
 gfx/thebes/{src => }/gfxTextRunWordCache.cpp  |   0
 gfx/thebes/{public => }/gfxTextRunWordCache.h |   0
 gfx/thebes/{public => }/gfxTypes.h            |   0
 gfx/thebes/{src => }/gfxUnicodeProperties.cpp |   0
 gfx/thebes/{src => }/gfxUnicodeProperties.h   |   0
 .../{src => }/gfxUnicodePropertyData.cpp      |   0
 gfx/thebes/{src => }/gfxUniscribeShaper.cpp   |   0
 gfx/thebes/{src => }/gfxUniscribeShaper.h     |   0
 gfx/thebes/{src => }/gfxUserFontSet.cpp       |   0
 gfx/thebes/{public => }/gfxUserFontSet.h      |   0
 gfx/thebes/{src => }/gfxUtils.cpp             |   0
 gfx/thebes/{public => }/gfxUtils.h            |   0
 .../{src => }/gfxWindowsNativeDrawing.cpp     |   0
 .../{public => }/gfxWindowsNativeDrawing.h    |   0
 gfx/thebes/{src => }/gfxWindowsPlatform.cpp   |   0
 gfx/thebes/{public => }/gfxWindowsPlatform.h  |   0
 gfx/thebes/{src => }/gfxWindowsSurface.cpp    |   0
 gfx/thebes/{public => }/gfxWindowsSurface.h   |   0
 .../{src => }/gfxXlibNativeRenderer.cpp       |   0
 .../{public => }/gfxXlibNativeRenderer.h      |   0
 gfx/thebes/{src => }/gfxXlibSurface.cpp       |   0
 gfx/thebes/{public => }/gfxXlibSurface.h      |   0
 gfx/thebes/{src => }/ignorable.x-ccmap        |   0
 gfx/thebes/{src => }/nsUnicodeRange.cpp       |   0
 gfx/thebes/{src => }/nsUnicodeRange.h         |   0
 gfx/thebes/public/Makefile.in                 | 141 ------
 gfx/thebes/src/Makefile.in                    | 300 ------------
 gfx/thebes/{src => }/woff-private.h           |   0
 gfx/thebes/{src => }/woff.c                   |   0
 gfx/thebes/{src => }/woff.h                   |   0
 171 files changed, 431 insertions(+), 446 deletions(-)
 rename gfx/thebes/{src => }/GLContext.cpp (100%)
 rename gfx/thebes/{public => }/GLContext.h (100%)
 rename gfx/thebes/{public => }/GLContextProvider.h (100%)
 rename gfx/thebes/{src => }/GLContextProviderCGL.mm (100%)
 rename gfx/thebes/{src => }/GLContextProviderEGL.cpp (100%)
 rename gfx/thebes/{src => }/GLContextProviderGLX.cpp (100%)
 rename gfx/thebes/{src => }/GLContextProviderNull.cpp (100%)
 rename gfx/thebes/{src => }/GLContextProviderOSMesa.cpp (100%)
 rename gfx/thebes/{src => }/GLContextProviderWGL.cpp (100%)
 rename gfx/thebes/{public => }/GLDefs.h (100%)
 rename gfx/thebes/{public => }/GLXLibrary.h (100%)
 rename gfx/thebes/{public => }/WGLLibrary.h (100%)
 rename gfx/thebes/{src => }/cairo-gdk-utils.c (100%)
 rename gfx/thebes/{src => }/cairo-gdk-utils.h (100%)
 rename gfx/thebes/{src => }/cairo-xlib-utils.c (100%)
 rename gfx/thebes/{src => }/cairo-xlib-utils.h (100%)
 rename gfx/thebes/{src => }/genUnicodeScriptData.pl (100%)
 rename gfx/thebes/{public => }/gfx3DMatrix.h (100%)
 rename gfx/thebes/{src => }/gfxASurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxASurface.h (100%)
 rename gfx/thebes/{src => }/gfxAlphaRecovery.cpp (100%)
 rename gfx/thebes/{public => }/gfxAlphaRecovery.h (100%)
 rename gfx/thebes/{src => }/gfxAndroidPlatform.cpp (100%)
 rename gfx/thebes/{public => }/gfxAndroidPlatform.h (100%)
 rename gfx/thebes/{src => }/gfxAtomList.h (100%)
 rename gfx/thebes/{src => }/gfxAtoms.cpp (100%)
 rename gfx/thebes/{src => }/gfxAtoms.h (100%)
 rename gfx/thebes/{src => }/gfxBeOSPlatform.cpp (100%)
 rename gfx/thebes/{public => }/gfxBeOSPlatform.h (100%)
 rename gfx/thebes/{src => }/gfxBeOSSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxBeOSSurface.h (100%)
 rename gfx/thebes/{public => }/gfxColor.h (100%)
 rename gfx/thebes/{src => }/gfxContext.cpp (100%)
 rename gfx/thebes/{public => }/gfxContext.h (100%)
 rename gfx/thebes/{src => }/gfxCoreTextShaper.cpp (100%)
 rename gfx/thebes/{src => }/gfxCoreTextShaper.h (100%)
 rename gfx/thebes/{src => }/gfxD2DSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxD2DSurface.h (100%)
 rename gfx/thebes/{src => }/gfxDDrawSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxDDrawSurface.h (100%)
 rename gfx/thebes/{src => }/gfxDWriteCommon.cpp (100%)
 rename gfx/thebes/{src => }/gfxDWriteCommon.h (100%)
 rename gfx/thebes/{src => }/gfxDWriteFontList.cpp (100%)
 rename gfx/thebes/{src => }/gfxDWriteFontList.h (100%)
 rename gfx/thebes/{src => }/gfxDWriteFonts.cpp (100%)
 rename gfx/thebes/{public => }/gfxDWriteFonts.h (100%)
 rename gfx/thebes/{src => }/gfxDWriteShaper.cpp (100%)
 rename gfx/thebes/{src => }/gfxDWriteShaper.h (100%)
 rename gfx/thebes/{src => }/gfxDWriteTextAnalysis.cpp (100%)
 rename gfx/thebes/{src => }/gfxDWriteTextAnalysis.h (100%)
 rename gfx/thebes/{src => }/gfxDirectFBSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxDirectFBSurface.h (100%)
 rename gfx/thebes/{src => }/gfxDllDeps.cpp (100%)
 rename gfx/thebes/{src => }/gfxFT2FontBase.cpp (100%)
 rename gfx/thebes/{public => }/gfxFT2FontBase.h (100%)
 rename gfx/thebes/{src => }/gfxFT2FontList.cpp (100%)
 rename gfx/thebes/{src => }/gfxFT2FontList.h (100%)
 rename gfx/thebes/{src => }/gfxFT2Fonts.cpp (100%)
 rename gfx/thebes/{public => }/gfxFT2Fonts.h (100%)
 rename gfx/thebes/{src => }/gfxFT2Utils.cpp (100%)
 rename gfx/thebes/{src => }/gfxFT2Utils.h (100%)
 rename gfx/thebes/{src => }/gfxFont.cpp (100%)
 rename gfx/thebes/{public => }/gfxFont.h (100%)
 rename gfx/thebes/{public => }/gfxFontConstants.h (100%)
 rename gfx/thebes/{src => }/gfxFontMissingGlyphs.cpp (100%)
 rename gfx/thebes/{src => }/gfxFontMissingGlyphs.h (100%)
 rename gfx/thebes/{src => }/gfxFontTest.cpp (100%)
 rename gfx/thebes/{public => }/gfxFontTest.h (100%)
 rename gfx/thebes/{src => }/gfxFontUtils.cpp (100%)
 rename gfx/thebes/{public => }/gfxFontUtils.h (100%)
 rename gfx/thebes/{src => }/gfxFontconfigUtils.cpp (100%)
 rename gfx/thebes/{src => }/gfxFontconfigUtils.h (100%)
 rename gfx/thebes/{src => }/gfxGDIFont.cpp (100%)
 rename gfx/thebes/{src => }/gfxGDIFont.h (100%)
 rename gfx/thebes/{src => }/gfxGDIFontList.cpp (100%)
 rename gfx/thebes/{src => }/gfxGDIFontList.h (100%)
 rename gfx/thebes/{src => }/gfxGDIShaper.cpp (100%)
 rename gfx/thebes/{src => }/gfxGDIShaper.h (100%)
 rename gfx/thebes/{src => }/gfxGdkNativeRenderer.cpp (100%)
 rename gfx/thebes/{public => }/gfxGdkNativeRenderer.h (100%)
 rename gfx/thebes/{public => }/gfxGlitzSurface.h (100%)
 rename gfx/thebes/{src => }/gfxHarfBuzzShaper.cpp (100%)
 rename gfx/thebes/{src => }/gfxHarfBuzzShaper.h (100%)
 rename gfx/thebes/{src => }/gfxImageSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxImageSurface.h (100%)
 rename gfx/thebes/{src => }/gfxMacFont.cpp (100%)
 rename gfx/thebes/{src => }/gfxMacFont.h (100%)
 rename gfx/thebes/{src => }/gfxMacPlatformFontList.h (100%)
 rename gfx/thebes/{src => }/gfxMacPlatformFontList.mm (100%)
 rename gfx/thebes/{src => }/gfxMatrix.cpp (100%)
 rename gfx/thebes/{public => }/gfxMatrix.h (100%)
 rename gfx/thebes/{src => }/gfxOS2Fonts.cpp (100%)
 rename gfx/thebes/{public => }/gfxOS2Fonts.h (100%)
 rename gfx/thebes/{src => }/gfxOS2Platform.cpp (100%)
 rename gfx/thebes/{public => }/gfxOS2Platform.h (100%)
 rename gfx/thebes/{src => }/gfxOS2Surface.cpp (100%)
 rename gfx/thebes/{public => }/gfxOS2Surface.h (100%)
 rename gfx/thebes/{src => }/gfxPDFSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxPDFSurface.h (100%)
 rename gfx/thebes/{src => }/gfxPSSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxPSSurface.h (100%)
 rename gfx/thebes/{src => }/gfxPangoFonts.cpp (100%)
 rename gfx/thebes/{public => }/gfxPangoFonts.h (100%)
 rename gfx/thebes/{src => }/gfxPath.cpp (100%)
 rename gfx/thebes/{public => }/gfxPath.h (100%)
 rename gfx/thebes/{src => }/gfxPattern.cpp (100%)
 rename gfx/thebes/{public => }/gfxPattern.h (100%)
 rename gfx/thebes/{src => }/gfxPlatform.cpp (100%)
 rename gfx/thebes/{public => }/gfxPlatform.h (100%)
 rename gfx/thebes/{src => }/gfxPlatformFontList.cpp (100%)
 rename gfx/thebes/{src => }/gfxPlatformFontList.h (100%)
 rename gfx/thebes/{src => }/gfxPlatformGtk.cpp (100%)
 rename gfx/thebes/{public => }/gfxPlatformGtk.h (100%)
 rename gfx/thebes/{src => }/gfxPlatformMac.cpp (100%)
 rename gfx/thebes/{public => }/gfxPlatformMac.h (100%)
 rename gfx/thebes/{public => }/gfxPoint.h (100%)
 rename gfx/thebes/{src => }/gfxQPainterSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxQPainterSurface.h (100%)
 rename gfx/thebes/{src => }/gfxQtNativeRenderer.cpp (100%)
 rename gfx/thebes/{public => }/gfxQtNativeRenderer.h (100%)
 rename gfx/thebes/{src => }/gfxQtPlatform.cpp (100%)
 rename gfx/thebes/{public => }/gfxQtPlatform.h (100%)
 rename gfx/thebes/{src => }/gfxQuartzImageSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxQuartzImageSurface.h (100%)
 rename gfx/thebes/{src => }/gfxQuartzNativeDrawing.cpp (100%)
 rename gfx/thebes/{public => }/gfxQuartzNativeDrawing.h (100%)
 rename gfx/thebes/{src => }/gfxQuartzPDFSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxQuartzPDFSurface.h (100%)
 rename gfx/thebes/{src => }/gfxQuartzSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxQuartzSurface.h (100%)
 rename gfx/thebes/{src => }/gfxRect.cpp (100%)
 rename gfx/thebes/{public => }/gfxRect.h (100%)
 rename gfx/thebes/{src => }/gfxScriptItemizer.cpp (100%)
 rename gfx/thebes/{src => }/gfxScriptItemizer.h (100%)
 rename gfx/thebes/{src => }/gfxSharedImageSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxSharedImageSurface.h (100%)
 rename gfx/thebes/{src => }/gfxSkipChars.cpp (100%)
 rename gfx/thebes/{public => }/gfxSkipChars.h (100%)
 rename gfx/thebes/{src => }/gfxTextRunCache.cpp (100%)
 rename gfx/thebes/{public => }/gfxTextRunCache.h (100%)
 rename gfx/thebes/{src => }/gfxTextRunWordCache.cpp (100%)
 rename gfx/thebes/{public => }/gfxTextRunWordCache.h (100%)
 rename gfx/thebes/{public => }/gfxTypes.h (100%)
 rename gfx/thebes/{src => }/gfxUnicodeProperties.cpp (100%)
 rename gfx/thebes/{src => }/gfxUnicodeProperties.h (100%)
 rename gfx/thebes/{src => }/gfxUnicodePropertyData.cpp (100%)
 rename gfx/thebes/{src => }/gfxUniscribeShaper.cpp (100%)
 rename gfx/thebes/{src => }/gfxUniscribeShaper.h (100%)
 rename gfx/thebes/{src => }/gfxUserFontSet.cpp (100%)
 rename gfx/thebes/{public => }/gfxUserFontSet.h (100%)
 rename gfx/thebes/{src => }/gfxUtils.cpp (100%)
 rename gfx/thebes/{public => }/gfxUtils.h (100%)
 rename gfx/thebes/{src => }/gfxWindowsNativeDrawing.cpp (100%)
 rename gfx/thebes/{public => }/gfxWindowsNativeDrawing.h (100%)
 rename gfx/thebes/{src => }/gfxWindowsPlatform.cpp (100%)
 rename gfx/thebes/{public => }/gfxWindowsPlatform.h (100%)
 rename gfx/thebes/{src => }/gfxWindowsSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxWindowsSurface.h (100%)
 rename gfx/thebes/{src => }/gfxXlibNativeRenderer.cpp (100%)
 rename gfx/thebes/{public => }/gfxXlibNativeRenderer.h (100%)
 rename gfx/thebes/{src => }/gfxXlibSurface.cpp (100%)
 rename gfx/thebes/{public => }/gfxXlibSurface.h (100%)
 rename gfx/thebes/{src => }/ignorable.x-ccmap (100%)
 rename gfx/thebes/{src => }/nsUnicodeRange.cpp (100%)
 rename gfx/thebes/{src => }/nsUnicodeRange.h (100%)
 delete mode 100644 gfx/thebes/public/Makefile.in
 delete mode 100644 gfx/thebes/src/Makefile.in
 rename gfx/thebes/{src => }/woff-private.h (100%)
 rename gfx/thebes/{src => }/woff.c (100%)
 rename gfx/thebes/{src => }/woff.h (100%)

diff --git a/gfx/thebes/src/GLContext.cpp b/gfx/thebes/GLContext.cpp
similarity index 100%
rename from gfx/thebes/src/GLContext.cpp
rename to gfx/thebes/GLContext.cpp
diff --git a/gfx/thebes/public/GLContext.h b/gfx/thebes/GLContext.h
similarity index 100%
rename from gfx/thebes/public/GLContext.h
rename to gfx/thebes/GLContext.h
diff --git a/gfx/thebes/public/GLContextProvider.h b/gfx/thebes/GLContextProvider.h
similarity index 100%
rename from gfx/thebes/public/GLContextProvider.h
rename to gfx/thebes/GLContextProvider.h
diff --git a/gfx/thebes/src/GLContextProviderCGL.mm b/gfx/thebes/GLContextProviderCGL.mm
similarity index 100%
rename from gfx/thebes/src/GLContextProviderCGL.mm
rename to gfx/thebes/GLContextProviderCGL.mm
diff --git a/gfx/thebes/src/GLContextProviderEGL.cpp b/gfx/thebes/GLContextProviderEGL.cpp
similarity index 100%
rename from gfx/thebes/src/GLContextProviderEGL.cpp
rename to gfx/thebes/GLContextProviderEGL.cpp
diff --git a/gfx/thebes/src/GLContextProviderGLX.cpp b/gfx/thebes/GLContextProviderGLX.cpp
similarity index 100%
rename from gfx/thebes/src/GLContextProviderGLX.cpp
rename to gfx/thebes/GLContextProviderGLX.cpp
diff --git a/gfx/thebes/src/GLContextProviderNull.cpp b/gfx/thebes/GLContextProviderNull.cpp
similarity index 100%
rename from gfx/thebes/src/GLContextProviderNull.cpp
rename to gfx/thebes/GLContextProviderNull.cpp
diff --git a/gfx/thebes/src/GLContextProviderOSMesa.cpp b/gfx/thebes/GLContextProviderOSMesa.cpp
similarity index 100%
rename from gfx/thebes/src/GLContextProviderOSMesa.cpp
rename to gfx/thebes/GLContextProviderOSMesa.cpp
diff --git a/gfx/thebes/src/GLContextProviderWGL.cpp b/gfx/thebes/GLContextProviderWGL.cpp
similarity index 100%
rename from gfx/thebes/src/GLContextProviderWGL.cpp
rename to gfx/thebes/GLContextProviderWGL.cpp
diff --git a/gfx/thebes/public/GLDefs.h b/gfx/thebes/GLDefs.h
similarity index 100%
rename from gfx/thebes/public/GLDefs.h
rename to gfx/thebes/GLDefs.h
diff --git a/gfx/thebes/public/GLXLibrary.h b/gfx/thebes/GLXLibrary.h
similarity index 100%
rename from gfx/thebes/public/GLXLibrary.h
rename to gfx/thebes/GLXLibrary.h
diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in
index 1adcaa068937..b1dd45746f45 100644
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -6,17 +6,443 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE	= thebes
-
-DIRS	= public src
+MODULE		= thebes
+LIBRARY_NAME	= thebes
+LIBXUL_LIBRARY	= 1
+EXPORT_LIBRARY	= 1
 
 ifdef ENABLE_TESTS
-DIRS	+= mochitest
+DIRS = mochitest
 ifndef MOZ_ENABLE_LIBXUL
 ifndef BUILD_STATIC_LIBS
-TOOL_DIRS  += test
+TOOL_DIRS = test
 endif
 endif
 endif
 
+EXPORTS	= \
+	gfx3DMatrix.h \
+	gfxASurface.h \
+	gfxAlphaRecovery.h \
+	gfxColor.h \
+	gfxContext.h \
+	gfxFont.h \
+	gfxFontConstants.h \
+	gfxFontUtils.h \
+	gfxFontTest.h \
+	gfxImageSurface.h \
+	gfxMatrix.h \
+	gfxPath.h \
+	gfxPattern.h \
+	gfxPlatform.h \
+	gfxPoint.h \
+	gfxRect.h \
+	gfxSkipChars.h \
+	gfxTypes.h \
+	gfxTextRunCache.h \
+	gfxTextRunWordCache.h \
+	gfxUtils.h \
+	gfxUserFontSet.h \
+	GLDefs.h \
+	GLContext.h \
+	GLContextProvider.h \
+	$(NULL)
+
+ifdef MOZ_IPC
+EXPORTS	+= \
+	gfxSharedImageSurface.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+EXPORTS += \
+	gfxAndroidPlatform.h \
+	gfxFT2Fonts.h \
+	gfxFT2FontBase.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+EXPORTS	+= \
+	gfxBeOSPlatform.h \
+	gfxBeOSSurface.h \
+	gfxFT2FontBase.h \
+	gfxPDFSurface.h \
+	gfxPangoFonts.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+EXPORTS += \
+	gfxPlatformMac.h \
+	gfxQuartzSurface.h \
+	gfxQuartzImageSurface.h \
+	gfxQuartzPDFSurface.h \
+	gfxQuartzNativeDrawing.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+EXPORTS += \
+	gfxFT2FontBase.h \
+	gfxGdkNativeRenderer.h \
+	gfxPDFSurface.h \
+	gfxPSSurface.h \
+	gfxPlatformGtk.h \
+	$(NULL)
+
+ifdef MOZ_X11
+EXPORTS += \
+	gfxXlibSurface.h \
+	GLXLibrary.h \
+	$(NULL)
+endif
+
+ifdef MOZ_PANGO
+EXPORTS += gfxPangoFonts.h
+else
+EXPORTS += gfxFT2Fonts.h
+endif
+
+ifdef MOZ_DFB
+EXPORTS += gfxDirectFBSurface.h
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+EXPORTS	+= \
+	gfxOS2Fonts.h \
+	gfxOS2Platform.h \
+	gfxOS2Surface.h \
+	gfxPDFSurface.h \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+EXPORTS += \
+	gfxFT2FontBase.h \
+	gfxQPainterSurface.h \
+	gfxQtNativeRenderer.h \
+	gfxQtPlatform.h \
+	$(NULL)
+
+ifdef MOZ_X11
+EXPORTS += \
+	gfxXlibSurface.h \
+	GLXLibrary.h \
+	$(NULL)
+endif
+
+ifdef MOZ_PANGO
+EXPORTS += gfxPangoFonts.h
+else
+EXPORTS += gfxFT2Fonts.h
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+EXPORTS	+= \
+	gfxPDFSurface.h \
+	gfxWindowsPlatform.h \
+	gfxWindowsSurface.h \
+	gfxWindowsNativeDrawing.h \
+	WGLLibrary.h \
+	$(NULL)
+
+ifdef WINCE
+EXPORTS += \
+	gfxFT2Fonts.h \
+	gfxFT2FontBase.h \
+	gfxDDrawSurface.h \
+	$(NULL)
+else
+EXPORTS += \
+	gfxDWriteFonts.h \
+	gfxD2DSurface.h \
+	$(NULL)
+endif
+endif
+
+CPPSRCS	= \
+	gfxASurface.cpp \
+	gfxAlphaRecovery.cpp \
+	gfxContext.cpp \
+	gfxImageSurface.cpp \
+	gfxFont.cpp \
+	gfxFontMissingGlyphs.cpp \
+	gfxFontTest.cpp \
+	gfxFontUtils.cpp \
+	gfxAtoms.cpp \
+	gfxMatrix.cpp \
+	gfxPath.cpp \
+	gfxPattern.cpp \
+	gfxPlatform.cpp \
+	gfxPlatformFontList.cpp \
+	gfxRect.cpp \
+	gfxSkipChars.cpp \
+	gfxTextRunCache.cpp \
+	gfxTextRunWordCache.cpp \
+	gfxUserFontSet.cpp \
+	gfxUtils.cpp \
+	gfxUnicodeProperties.cpp \
+	gfxScriptItemizer.cpp \
+	gfxHarfBuzzShaper.cpp \
+	GLContext.cpp \
+	GLContextProviderOSMesa.cpp \
+	$(NULL)
+
+ifdef MOZ_IPC
+CPPSRCS += \
+	gfxSharedImageSurface.cpp \
+	$(NULL)
+endif
+
+SHARED_LIBRARY_LIBS += \
+	../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \
+	$(NULL)
+
+
+ifndef MOZ_ENABLE_LIBXUL
+EXTRA_DSO_LIBS	= gkgfx ycbcr
+ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
+CPPSRCS += gfxDllDeps.cpp
+endif
+endif
+
+EXTRA_DSO_LDOPTS += \
+	$(MOZ_CAIRO_LIBS) \
+	$(LIBS_DIR) \
+	$(EXTRA_DSO_LIBS) \
+	$(MOZ_UNICHARUTIL_LIBS) \
+	$(XPCOM_LIBS) \
+	$(NSPR_LIBS) \
+	$(ZLIB_LIBS) \
+	$(QCMS_LIBS) \
+	$(MOZ_HARFBUZZ_LIBS) \
+	$(NULL)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+CPPSRCS	+= 	gfxWindowsPlatform.cpp \
+		gfxWindowsSurface.cpp \
+		gfxWindowsNativeDrawing.cpp \
+		nsUnicodeRange.cpp \
+		$(NULL)
+
+ifdef WINCE
+CPPSRCS	+= gfxFT2Fonts.cpp \
+	   gfxFT2FontBase.cpp \
+	   gfxFT2Utils.cpp \
+	   gfxDDrawSurface.cpp \
+	   gfxFT2FontList.cpp \
+	   $(NULL)
+
+EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+
+OS_LIBS += $(call EXPAND_LIBNAME,ddraw)
+else
+ifdef MOZ_ENABLE_DWRITE_FONT
+CPPSRCS	+= gfxDWriteFonts.cpp \
+	   gfxDWriteShaper.cpp \
+	   gfxDWriteTextAnalysis.cpp \
+	   gfxDWriteCommon.cpp \
+	   gfxD2DSurface.cpp \
+	   gfxDWriteFontList.cpp \
+	   $(NULL)
+endif
+CPPSRCS	+= gfxGDIFont.cpp \
+	   gfxGDIFontList.cpp \
+	   gfxGDIShaper.cpp \
+	   gfxUniscribeShaper.cpp \
+	   $(NULL)
+_OS_LIBS = usp10 msimg32
+endif
+
+CPPSRCS +=	gfxPDFSurface.cpp
+
+ifdef GNU_CXX
+_OS_LIBS	+= uuid
+endif
+OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
+
+ifdef MOZ_ENABLE_D3D9_LAYER
+DEFINES +=	-DMOZ_ENABLE_D3D9_LAYER
+endif
+
+ACDEFINES +=	-UWIN32_LEAN_AND_MEAN
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+CPPSRCS += \
+	gfxAndroidPlatform.cpp \
+	gfxFT2Fonts.cpp \
+	gfxFT2FontBase.cpp \
+	gfxFT2Utils.cpp \
+	nsUnicodeRange.cpp \
+	$(NULL)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CPPSRCS	+=	gfxOS2Fonts.cpp \
+		gfxOS2Platform.cpp \
+		gfxOS2Surface.cpp \
+		nsUnicodeRange.cpp \
+		gfxFontconfigUtils.cpp \
+		$(NULL)
+CPPSRCS +=	gfxPDFSurface.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+
+ifdef MOZ_PANGO
+CPPSRCS += gfxPangoFonts.cpp
+else
+CPPSRCS += gfxFT2Fonts.cpp
+endif
+
+ifdef MOZ_X11
+CPPSRCS += gfxXlibSurface.cpp
+endif
+
+CPPSRCS +=  gfxPlatformGtk.cpp gfxGdkNativeRenderer.cpp
+CPPSRCS +=	gfxPDFSurface.cpp gfxPSSurface.cpp
+CPPSRCS +=	gfxFontconfigUtils.cpp
+CPPSRCS +=	gfxFT2FontBase.cpp
+CPPSRCS +=	gfxFT2Utils.cpp
+CPPSRCS +=	nsUnicodeRange.cpp
+
+ifdef MOZ_X11
+CSRCS = cairo-xlib-utils.c
+endif
+
+ifdef MOZ_DFB
+CSRCS = cairo-gdk-utils.c
+endif
+
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
+endif
+
+ifdef MOZ_DFB
+CPPSRCS += gfxDirectFBSurface.cpp
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp
+CPPSRCS += gfxXlibSurface.cpp gfxQtNativeRenderer.cpp
+ifdef MOZ_PANGO
+CPPSRCS += gfxPangoFonts.cpp
+else
+CPPSRCS += gfxFT2Fonts.cpp
+endif
+CPPSRCS +=	gfxFT2FontBase.cpp
+CPPSRCS +=	gfxFT2Utils.cpp
+CPPSRCS +=	gfxFontconfigUtils.cpp
+CPPSRCS +=	nsUnicodeRange.cpp
+#CSRCS = cairo-xlib-utils.c
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(CAIRO_FT_LIBS) $(XEXT_LIBS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+CPPSRCS	+= 	gfxBeOSSurface.cpp gfxBeOSPlatform.cpp
+CPPSRCS +=	gfxPangoFonts.cpp 
+CPPSRCS +=	gfxFT2FontBase.cpp
+CPPSRCS +=	gfxFT2Utils.cpp
+#CPPSRCS +=	gfxPDFSurface.cpp
+CPPSRCS +=	gfxFontconfigUtils.cpp
+CPPSRCS +=	nsUnicodeRange.cpp
+EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(CAIRO_FT_LIBS) -lfontconfig
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CPPSRCS	+= \
+	gfxQuartzSurface.cpp \
+	gfxQuartzImageSurface.cpp \
+	gfxQuartzPDFSurface.cpp \
+	gfxPlatformMac.cpp \
+	gfxMacFont.cpp \
+	gfxCoreTextShaper.cpp \
+	$(NULL)
+#CPPSRCS +=	gfxPDFSurface.cpp
+CPPSRCS +=      nsUnicodeRange.cpp
+CPPSRCS +=      gfxQuartzNativeDrawing.cpp
+
+CMMSRCS = gfxMacPlatformFontList.mm
+
+# Always link with OpenGL/AGL
+EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit
+endif
+
+CSRCS += woff.c
+
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+
+GL_PROVIDER = Null
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ifndef WINCE
+GL_PROVIDER = WGL
+endif
+endif
+
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+GL_PROVIDER = CGL
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ifdef MOZ_PLATFORM_MAEMO
+GL_PROVIDER = EGL
+else
+GL_PROVIDER = GLX
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+GL_PROVIDER = EGL
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+GL_PROVIDER = EGL
+endif
+
+# Mac is a special snowflake
+ifeq ($(GL_PROVIDER),CGL)
+CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
+else
+CPPSRCS += GLContextProvider$(GL_PROVIDER).cpp
+endif
+
+DEFINES += -DIMPL_THEBES -DWOFF_MOZILLA_CLIENT
+
 include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
+
+DEFINES := $(filter-out -DUNICODE,$(DEFINES))
+
+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+ifdef WINCE
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+CXXFLAGS += $(MOZ_PANGO_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+CXXFLAGS += $(CAIRO_FT_CFLAGS)
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
+CXXFLAGS += $(CAIRO_FT_CFLAGS) $(MOZ_PANGO_CFLAGS)
+endif
diff --git a/gfx/thebes/public/WGLLibrary.h b/gfx/thebes/WGLLibrary.h
similarity index 100%
rename from gfx/thebes/public/WGLLibrary.h
rename to gfx/thebes/WGLLibrary.h
diff --git a/gfx/thebes/src/cairo-gdk-utils.c b/gfx/thebes/cairo-gdk-utils.c
similarity index 100%
rename from gfx/thebes/src/cairo-gdk-utils.c
rename to gfx/thebes/cairo-gdk-utils.c
diff --git a/gfx/thebes/src/cairo-gdk-utils.h b/gfx/thebes/cairo-gdk-utils.h
similarity index 100%
rename from gfx/thebes/src/cairo-gdk-utils.h
rename to gfx/thebes/cairo-gdk-utils.h
diff --git a/gfx/thebes/src/cairo-xlib-utils.c b/gfx/thebes/cairo-xlib-utils.c
similarity index 100%
rename from gfx/thebes/src/cairo-xlib-utils.c
rename to gfx/thebes/cairo-xlib-utils.c
diff --git a/gfx/thebes/src/cairo-xlib-utils.h b/gfx/thebes/cairo-xlib-utils.h
similarity index 100%
rename from gfx/thebes/src/cairo-xlib-utils.h
rename to gfx/thebes/cairo-xlib-utils.h
diff --git a/gfx/thebes/src/genUnicodeScriptData.pl b/gfx/thebes/genUnicodeScriptData.pl
similarity index 100%
rename from gfx/thebes/src/genUnicodeScriptData.pl
rename to gfx/thebes/genUnicodeScriptData.pl
diff --git a/gfx/thebes/public/gfx3DMatrix.h b/gfx/thebes/gfx3DMatrix.h
similarity index 100%
rename from gfx/thebes/public/gfx3DMatrix.h
rename to gfx/thebes/gfx3DMatrix.h
diff --git a/gfx/thebes/src/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxASurface.cpp
rename to gfx/thebes/gfxASurface.cpp
diff --git a/gfx/thebes/public/gfxASurface.h b/gfx/thebes/gfxASurface.h
similarity index 100%
rename from gfx/thebes/public/gfxASurface.h
rename to gfx/thebes/gfxASurface.h
diff --git a/gfx/thebes/src/gfxAlphaRecovery.cpp b/gfx/thebes/gfxAlphaRecovery.cpp
similarity index 100%
rename from gfx/thebes/src/gfxAlphaRecovery.cpp
rename to gfx/thebes/gfxAlphaRecovery.cpp
diff --git a/gfx/thebes/public/gfxAlphaRecovery.h b/gfx/thebes/gfxAlphaRecovery.h
similarity index 100%
rename from gfx/thebes/public/gfxAlphaRecovery.h
rename to gfx/thebes/gfxAlphaRecovery.h
diff --git a/gfx/thebes/src/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp
similarity index 100%
rename from gfx/thebes/src/gfxAndroidPlatform.cpp
rename to gfx/thebes/gfxAndroidPlatform.cpp
diff --git a/gfx/thebes/public/gfxAndroidPlatform.h b/gfx/thebes/gfxAndroidPlatform.h
similarity index 100%
rename from gfx/thebes/public/gfxAndroidPlatform.h
rename to gfx/thebes/gfxAndroidPlatform.h
diff --git a/gfx/thebes/src/gfxAtomList.h b/gfx/thebes/gfxAtomList.h
similarity index 100%
rename from gfx/thebes/src/gfxAtomList.h
rename to gfx/thebes/gfxAtomList.h
diff --git a/gfx/thebes/src/gfxAtoms.cpp b/gfx/thebes/gfxAtoms.cpp
similarity index 100%
rename from gfx/thebes/src/gfxAtoms.cpp
rename to gfx/thebes/gfxAtoms.cpp
diff --git a/gfx/thebes/src/gfxAtoms.h b/gfx/thebes/gfxAtoms.h
similarity index 100%
rename from gfx/thebes/src/gfxAtoms.h
rename to gfx/thebes/gfxAtoms.h
diff --git a/gfx/thebes/src/gfxBeOSPlatform.cpp b/gfx/thebes/gfxBeOSPlatform.cpp
similarity index 100%
rename from gfx/thebes/src/gfxBeOSPlatform.cpp
rename to gfx/thebes/gfxBeOSPlatform.cpp
diff --git a/gfx/thebes/public/gfxBeOSPlatform.h b/gfx/thebes/gfxBeOSPlatform.h
similarity index 100%
rename from gfx/thebes/public/gfxBeOSPlatform.h
rename to gfx/thebes/gfxBeOSPlatform.h
diff --git a/gfx/thebes/src/gfxBeOSSurface.cpp b/gfx/thebes/gfxBeOSSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxBeOSSurface.cpp
rename to gfx/thebes/gfxBeOSSurface.cpp
diff --git a/gfx/thebes/public/gfxBeOSSurface.h b/gfx/thebes/gfxBeOSSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxBeOSSurface.h
rename to gfx/thebes/gfxBeOSSurface.h
diff --git a/gfx/thebes/public/gfxColor.h b/gfx/thebes/gfxColor.h
similarity index 100%
rename from gfx/thebes/public/gfxColor.h
rename to gfx/thebes/gfxColor.h
diff --git a/gfx/thebes/src/gfxContext.cpp b/gfx/thebes/gfxContext.cpp
similarity index 100%
rename from gfx/thebes/src/gfxContext.cpp
rename to gfx/thebes/gfxContext.cpp
diff --git a/gfx/thebes/public/gfxContext.h b/gfx/thebes/gfxContext.h
similarity index 100%
rename from gfx/thebes/public/gfxContext.h
rename to gfx/thebes/gfxContext.h
diff --git a/gfx/thebes/src/gfxCoreTextShaper.cpp b/gfx/thebes/gfxCoreTextShaper.cpp
similarity index 100%
rename from gfx/thebes/src/gfxCoreTextShaper.cpp
rename to gfx/thebes/gfxCoreTextShaper.cpp
diff --git a/gfx/thebes/src/gfxCoreTextShaper.h b/gfx/thebes/gfxCoreTextShaper.h
similarity index 100%
rename from gfx/thebes/src/gfxCoreTextShaper.h
rename to gfx/thebes/gfxCoreTextShaper.h
diff --git a/gfx/thebes/src/gfxD2DSurface.cpp b/gfx/thebes/gfxD2DSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxD2DSurface.cpp
rename to gfx/thebes/gfxD2DSurface.cpp
diff --git a/gfx/thebes/public/gfxD2DSurface.h b/gfx/thebes/gfxD2DSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxD2DSurface.h
rename to gfx/thebes/gfxD2DSurface.h
diff --git a/gfx/thebes/src/gfxDDrawSurface.cpp b/gfx/thebes/gfxDDrawSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxDDrawSurface.cpp
rename to gfx/thebes/gfxDDrawSurface.cpp
diff --git a/gfx/thebes/public/gfxDDrawSurface.h b/gfx/thebes/gfxDDrawSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxDDrawSurface.h
rename to gfx/thebes/gfxDDrawSurface.h
diff --git a/gfx/thebes/src/gfxDWriteCommon.cpp b/gfx/thebes/gfxDWriteCommon.cpp
similarity index 100%
rename from gfx/thebes/src/gfxDWriteCommon.cpp
rename to gfx/thebes/gfxDWriteCommon.cpp
diff --git a/gfx/thebes/src/gfxDWriteCommon.h b/gfx/thebes/gfxDWriteCommon.h
similarity index 100%
rename from gfx/thebes/src/gfxDWriteCommon.h
rename to gfx/thebes/gfxDWriteCommon.h
diff --git a/gfx/thebes/src/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
similarity index 100%
rename from gfx/thebes/src/gfxDWriteFontList.cpp
rename to gfx/thebes/gfxDWriteFontList.cpp
diff --git a/gfx/thebes/src/gfxDWriteFontList.h b/gfx/thebes/gfxDWriteFontList.h
similarity index 100%
rename from gfx/thebes/src/gfxDWriteFontList.h
rename to gfx/thebes/gfxDWriteFontList.h
diff --git a/gfx/thebes/src/gfxDWriteFonts.cpp b/gfx/thebes/gfxDWriteFonts.cpp
similarity index 100%
rename from gfx/thebes/src/gfxDWriteFonts.cpp
rename to gfx/thebes/gfxDWriteFonts.cpp
diff --git a/gfx/thebes/public/gfxDWriteFonts.h b/gfx/thebes/gfxDWriteFonts.h
similarity index 100%
rename from gfx/thebes/public/gfxDWriteFonts.h
rename to gfx/thebes/gfxDWriteFonts.h
diff --git a/gfx/thebes/src/gfxDWriteShaper.cpp b/gfx/thebes/gfxDWriteShaper.cpp
similarity index 100%
rename from gfx/thebes/src/gfxDWriteShaper.cpp
rename to gfx/thebes/gfxDWriteShaper.cpp
diff --git a/gfx/thebes/src/gfxDWriteShaper.h b/gfx/thebes/gfxDWriteShaper.h
similarity index 100%
rename from gfx/thebes/src/gfxDWriteShaper.h
rename to gfx/thebes/gfxDWriteShaper.h
diff --git a/gfx/thebes/src/gfxDWriteTextAnalysis.cpp b/gfx/thebes/gfxDWriteTextAnalysis.cpp
similarity index 100%
rename from gfx/thebes/src/gfxDWriteTextAnalysis.cpp
rename to gfx/thebes/gfxDWriteTextAnalysis.cpp
diff --git a/gfx/thebes/src/gfxDWriteTextAnalysis.h b/gfx/thebes/gfxDWriteTextAnalysis.h
similarity index 100%
rename from gfx/thebes/src/gfxDWriteTextAnalysis.h
rename to gfx/thebes/gfxDWriteTextAnalysis.h
diff --git a/gfx/thebes/src/gfxDirectFBSurface.cpp b/gfx/thebes/gfxDirectFBSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxDirectFBSurface.cpp
rename to gfx/thebes/gfxDirectFBSurface.cpp
diff --git a/gfx/thebes/public/gfxDirectFBSurface.h b/gfx/thebes/gfxDirectFBSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxDirectFBSurface.h
rename to gfx/thebes/gfxDirectFBSurface.h
diff --git a/gfx/thebes/src/gfxDllDeps.cpp b/gfx/thebes/gfxDllDeps.cpp
similarity index 100%
rename from gfx/thebes/src/gfxDllDeps.cpp
rename to gfx/thebes/gfxDllDeps.cpp
diff --git a/gfx/thebes/src/gfxFT2FontBase.cpp b/gfx/thebes/gfxFT2FontBase.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFT2FontBase.cpp
rename to gfx/thebes/gfxFT2FontBase.cpp
diff --git a/gfx/thebes/public/gfxFT2FontBase.h b/gfx/thebes/gfxFT2FontBase.h
similarity index 100%
rename from gfx/thebes/public/gfxFT2FontBase.h
rename to gfx/thebes/gfxFT2FontBase.h
diff --git a/gfx/thebes/src/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFT2FontList.cpp
rename to gfx/thebes/gfxFT2FontList.cpp
diff --git a/gfx/thebes/src/gfxFT2FontList.h b/gfx/thebes/gfxFT2FontList.h
similarity index 100%
rename from gfx/thebes/src/gfxFT2FontList.h
rename to gfx/thebes/gfxFT2FontList.h
diff --git a/gfx/thebes/src/gfxFT2Fonts.cpp b/gfx/thebes/gfxFT2Fonts.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFT2Fonts.cpp
rename to gfx/thebes/gfxFT2Fonts.cpp
diff --git a/gfx/thebes/public/gfxFT2Fonts.h b/gfx/thebes/gfxFT2Fonts.h
similarity index 100%
rename from gfx/thebes/public/gfxFT2Fonts.h
rename to gfx/thebes/gfxFT2Fonts.h
diff --git a/gfx/thebes/src/gfxFT2Utils.cpp b/gfx/thebes/gfxFT2Utils.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFT2Utils.cpp
rename to gfx/thebes/gfxFT2Utils.cpp
diff --git a/gfx/thebes/src/gfxFT2Utils.h b/gfx/thebes/gfxFT2Utils.h
similarity index 100%
rename from gfx/thebes/src/gfxFT2Utils.h
rename to gfx/thebes/gfxFT2Utils.h
diff --git a/gfx/thebes/src/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFont.cpp
rename to gfx/thebes/gfxFont.cpp
diff --git a/gfx/thebes/public/gfxFont.h b/gfx/thebes/gfxFont.h
similarity index 100%
rename from gfx/thebes/public/gfxFont.h
rename to gfx/thebes/gfxFont.h
diff --git a/gfx/thebes/public/gfxFontConstants.h b/gfx/thebes/gfxFontConstants.h
similarity index 100%
rename from gfx/thebes/public/gfxFontConstants.h
rename to gfx/thebes/gfxFontConstants.h
diff --git a/gfx/thebes/src/gfxFontMissingGlyphs.cpp b/gfx/thebes/gfxFontMissingGlyphs.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFontMissingGlyphs.cpp
rename to gfx/thebes/gfxFontMissingGlyphs.cpp
diff --git a/gfx/thebes/src/gfxFontMissingGlyphs.h b/gfx/thebes/gfxFontMissingGlyphs.h
similarity index 100%
rename from gfx/thebes/src/gfxFontMissingGlyphs.h
rename to gfx/thebes/gfxFontMissingGlyphs.h
diff --git a/gfx/thebes/src/gfxFontTest.cpp b/gfx/thebes/gfxFontTest.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFontTest.cpp
rename to gfx/thebes/gfxFontTest.cpp
diff --git a/gfx/thebes/public/gfxFontTest.h b/gfx/thebes/gfxFontTest.h
similarity index 100%
rename from gfx/thebes/public/gfxFontTest.h
rename to gfx/thebes/gfxFontTest.h
diff --git a/gfx/thebes/src/gfxFontUtils.cpp b/gfx/thebes/gfxFontUtils.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFontUtils.cpp
rename to gfx/thebes/gfxFontUtils.cpp
diff --git a/gfx/thebes/public/gfxFontUtils.h b/gfx/thebes/gfxFontUtils.h
similarity index 100%
rename from gfx/thebes/public/gfxFontUtils.h
rename to gfx/thebes/gfxFontUtils.h
diff --git a/gfx/thebes/src/gfxFontconfigUtils.cpp b/gfx/thebes/gfxFontconfigUtils.cpp
similarity index 100%
rename from gfx/thebes/src/gfxFontconfigUtils.cpp
rename to gfx/thebes/gfxFontconfigUtils.cpp
diff --git a/gfx/thebes/src/gfxFontconfigUtils.h b/gfx/thebes/gfxFontconfigUtils.h
similarity index 100%
rename from gfx/thebes/src/gfxFontconfigUtils.h
rename to gfx/thebes/gfxFontconfigUtils.h
diff --git a/gfx/thebes/src/gfxGDIFont.cpp b/gfx/thebes/gfxGDIFont.cpp
similarity index 100%
rename from gfx/thebes/src/gfxGDIFont.cpp
rename to gfx/thebes/gfxGDIFont.cpp
diff --git a/gfx/thebes/src/gfxGDIFont.h b/gfx/thebes/gfxGDIFont.h
similarity index 100%
rename from gfx/thebes/src/gfxGDIFont.h
rename to gfx/thebes/gfxGDIFont.h
diff --git a/gfx/thebes/src/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp
similarity index 100%
rename from gfx/thebes/src/gfxGDIFontList.cpp
rename to gfx/thebes/gfxGDIFontList.cpp
diff --git a/gfx/thebes/src/gfxGDIFontList.h b/gfx/thebes/gfxGDIFontList.h
similarity index 100%
rename from gfx/thebes/src/gfxGDIFontList.h
rename to gfx/thebes/gfxGDIFontList.h
diff --git a/gfx/thebes/src/gfxGDIShaper.cpp b/gfx/thebes/gfxGDIShaper.cpp
similarity index 100%
rename from gfx/thebes/src/gfxGDIShaper.cpp
rename to gfx/thebes/gfxGDIShaper.cpp
diff --git a/gfx/thebes/src/gfxGDIShaper.h b/gfx/thebes/gfxGDIShaper.h
similarity index 100%
rename from gfx/thebes/src/gfxGDIShaper.h
rename to gfx/thebes/gfxGDIShaper.h
diff --git a/gfx/thebes/src/gfxGdkNativeRenderer.cpp b/gfx/thebes/gfxGdkNativeRenderer.cpp
similarity index 100%
rename from gfx/thebes/src/gfxGdkNativeRenderer.cpp
rename to gfx/thebes/gfxGdkNativeRenderer.cpp
diff --git a/gfx/thebes/public/gfxGdkNativeRenderer.h b/gfx/thebes/gfxGdkNativeRenderer.h
similarity index 100%
rename from gfx/thebes/public/gfxGdkNativeRenderer.h
rename to gfx/thebes/gfxGdkNativeRenderer.h
diff --git a/gfx/thebes/public/gfxGlitzSurface.h b/gfx/thebes/gfxGlitzSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxGlitzSurface.h
rename to gfx/thebes/gfxGlitzSurface.h
diff --git a/gfx/thebes/src/gfxHarfBuzzShaper.cpp b/gfx/thebes/gfxHarfBuzzShaper.cpp
similarity index 100%
rename from gfx/thebes/src/gfxHarfBuzzShaper.cpp
rename to gfx/thebes/gfxHarfBuzzShaper.cpp
diff --git a/gfx/thebes/src/gfxHarfBuzzShaper.h b/gfx/thebes/gfxHarfBuzzShaper.h
similarity index 100%
rename from gfx/thebes/src/gfxHarfBuzzShaper.h
rename to gfx/thebes/gfxHarfBuzzShaper.h
diff --git a/gfx/thebes/src/gfxImageSurface.cpp b/gfx/thebes/gfxImageSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxImageSurface.cpp
rename to gfx/thebes/gfxImageSurface.cpp
diff --git a/gfx/thebes/public/gfxImageSurface.h b/gfx/thebes/gfxImageSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxImageSurface.h
rename to gfx/thebes/gfxImageSurface.h
diff --git a/gfx/thebes/src/gfxMacFont.cpp b/gfx/thebes/gfxMacFont.cpp
similarity index 100%
rename from gfx/thebes/src/gfxMacFont.cpp
rename to gfx/thebes/gfxMacFont.cpp
diff --git a/gfx/thebes/src/gfxMacFont.h b/gfx/thebes/gfxMacFont.h
similarity index 100%
rename from gfx/thebes/src/gfxMacFont.h
rename to gfx/thebes/gfxMacFont.h
diff --git a/gfx/thebes/src/gfxMacPlatformFontList.h b/gfx/thebes/gfxMacPlatformFontList.h
similarity index 100%
rename from gfx/thebes/src/gfxMacPlatformFontList.h
rename to gfx/thebes/gfxMacPlatformFontList.h
diff --git a/gfx/thebes/src/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm
similarity index 100%
rename from gfx/thebes/src/gfxMacPlatformFontList.mm
rename to gfx/thebes/gfxMacPlatformFontList.mm
diff --git a/gfx/thebes/src/gfxMatrix.cpp b/gfx/thebes/gfxMatrix.cpp
similarity index 100%
rename from gfx/thebes/src/gfxMatrix.cpp
rename to gfx/thebes/gfxMatrix.cpp
diff --git a/gfx/thebes/public/gfxMatrix.h b/gfx/thebes/gfxMatrix.h
similarity index 100%
rename from gfx/thebes/public/gfxMatrix.h
rename to gfx/thebes/gfxMatrix.h
diff --git a/gfx/thebes/src/gfxOS2Fonts.cpp b/gfx/thebes/gfxOS2Fonts.cpp
similarity index 100%
rename from gfx/thebes/src/gfxOS2Fonts.cpp
rename to gfx/thebes/gfxOS2Fonts.cpp
diff --git a/gfx/thebes/public/gfxOS2Fonts.h b/gfx/thebes/gfxOS2Fonts.h
similarity index 100%
rename from gfx/thebes/public/gfxOS2Fonts.h
rename to gfx/thebes/gfxOS2Fonts.h
diff --git a/gfx/thebes/src/gfxOS2Platform.cpp b/gfx/thebes/gfxOS2Platform.cpp
similarity index 100%
rename from gfx/thebes/src/gfxOS2Platform.cpp
rename to gfx/thebes/gfxOS2Platform.cpp
diff --git a/gfx/thebes/public/gfxOS2Platform.h b/gfx/thebes/gfxOS2Platform.h
similarity index 100%
rename from gfx/thebes/public/gfxOS2Platform.h
rename to gfx/thebes/gfxOS2Platform.h
diff --git a/gfx/thebes/src/gfxOS2Surface.cpp b/gfx/thebes/gfxOS2Surface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxOS2Surface.cpp
rename to gfx/thebes/gfxOS2Surface.cpp
diff --git a/gfx/thebes/public/gfxOS2Surface.h b/gfx/thebes/gfxOS2Surface.h
similarity index 100%
rename from gfx/thebes/public/gfxOS2Surface.h
rename to gfx/thebes/gfxOS2Surface.h
diff --git a/gfx/thebes/src/gfxPDFSurface.cpp b/gfx/thebes/gfxPDFSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPDFSurface.cpp
rename to gfx/thebes/gfxPDFSurface.cpp
diff --git a/gfx/thebes/public/gfxPDFSurface.h b/gfx/thebes/gfxPDFSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxPDFSurface.h
rename to gfx/thebes/gfxPDFSurface.h
diff --git a/gfx/thebes/src/gfxPSSurface.cpp b/gfx/thebes/gfxPSSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPSSurface.cpp
rename to gfx/thebes/gfxPSSurface.cpp
diff --git a/gfx/thebes/public/gfxPSSurface.h b/gfx/thebes/gfxPSSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxPSSurface.h
rename to gfx/thebes/gfxPSSurface.h
diff --git a/gfx/thebes/src/gfxPangoFonts.cpp b/gfx/thebes/gfxPangoFonts.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPangoFonts.cpp
rename to gfx/thebes/gfxPangoFonts.cpp
diff --git a/gfx/thebes/public/gfxPangoFonts.h b/gfx/thebes/gfxPangoFonts.h
similarity index 100%
rename from gfx/thebes/public/gfxPangoFonts.h
rename to gfx/thebes/gfxPangoFonts.h
diff --git a/gfx/thebes/src/gfxPath.cpp b/gfx/thebes/gfxPath.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPath.cpp
rename to gfx/thebes/gfxPath.cpp
diff --git a/gfx/thebes/public/gfxPath.h b/gfx/thebes/gfxPath.h
similarity index 100%
rename from gfx/thebes/public/gfxPath.h
rename to gfx/thebes/gfxPath.h
diff --git a/gfx/thebes/src/gfxPattern.cpp b/gfx/thebes/gfxPattern.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPattern.cpp
rename to gfx/thebes/gfxPattern.cpp
diff --git a/gfx/thebes/public/gfxPattern.h b/gfx/thebes/gfxPattern.h
similarity index 100%
rename from gfx/thebes/public/gfxPattern.h
rename to gfx/thebes/gfxPattern.h
diff --git a/gfx/thebes/src/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPlatform.cpp
rename to gfx/thebes/gfxPlatform.cpp
diff --git a/gfx/thebes/public/gfxPlatform.h b/gfx/thebes/gfxPlatform.h
similarity index 100%
rename from gfx/thebes/public/gfxPlatform.h
rename to gfx/thebes/gfxPlatform.h
diff --git a/gfx/thebes/src/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPlatformFontList.cpp
rename to gfx/thebes/gfxPlatformFontList.cpp
diff --git a/gfx/thebes/src/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h
similarity index 100%
rename from gfx/thebes/src/gfxPlatformFontList.h
rename to gfx/thebes/gfxPlatformFontList.h
diff --git a/gfx/thebes/src/gfxPlatformGtk.cpp b/gfx/thebes/gfxPlatformGtk.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPlatformGtk.cpp
rename to gfx/thebes/gfxPlatformGtk.cpp
diff --git a/gfx/thebes/public/gfxPlatformGtk.h b/gfx/thebes/gfxPlatformGtk.h
similarity index 100%
rename from gfx/thebes/public/gfxPlatformGtk.h
rename to gfx/thebes/gfxPlatformGtk.h
diff --git a/gfx/thebes/src/gfxPlatformMac.cpp b/gfx/thebes/gfxPlatformMac.cpp
similarity index 100%
rename from gfx/thebes/src/gfxPlatformMac.cpp
rename to gfx/thebes/gfxPlatformMac.cpp
diff --git a/gfx/thebes/public/gfxPlatformMac.h b/gfx/thebes/gfxPlatformMac.h
similarity index 100%
rename from gfx/thebes/public/gfxPlatformMac.h
rename to gfx/thebes/gfxPlatformMac.h
diff --git a/gfx/thebes/public/gfxPoint.h b/gfx/thebes/gfxPoint.h
similarity index 100%
rename from gfx/thebes/public/gfxPoint.h
rename to gfx/thebes/gfxPoint.h
diff --git a/gfx/thebes/src/gfxQPainterSurface.cpp b/gfx/thebes/gfxQPainterSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxQPainterSurface.cpp
rename to gfx/thebes/gfxQPainterSurface.cpp
diff --git a/gfx/thebes/public/gfxQPainterSurface.h b/gfx/thebes/gfxQPainterSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxQPainterSurface.h
rename to gfx/thebes/gfxQPainterSurface.h
diff --git a/gfx/thebes/src/gfxQtNativeRenderer.cpp b/gfx/thebes/gfxQtNativeRenderer.cpp
similarity index 100%
rename from gfx/thebes/src/gfxQtNativeRenderer.cpp
rename to gfx/thebes/gfxQtNativeRenderer.cpp
diff --git a/gfx/thebes/public/gfxQtNativeRenderer.h b/gfx/thebes/gfxQtNativeRenderer.h
similarity index 100%
rename from gfx/thebes/public/gfxQtNativeRenderer.h
rename to gfx/thebes/gfxQtNativeRenderer.h
diff --git a/gfx/thebes/src/gfxQtPlatform.cpp b/gfx/thebes/gfxQtPlatform.cpp
similarity index 100%
rename from gfx/thebes/src/gfxQtPlatform.cpp
rename to gfx/thebes/gfxQtPlatform.cpp
diff --git a/gfx/thebes/public/gfxQtPlatform.h b/gfx/thebes/gfxQtPlatform.h
similarity index 100%
rename from gfx/thebes/public/gfxQtPlatform.h
rename to gfx/thebes/gfxQtPlatform.h
diff --git a/gfx/thebes/src/gfxQuartzImageSurface.cpp b/gfx/thebes/gfxQuartzImageSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxQuartzImageSurface.cpp
rename to gfx/thebes/gfxQuartzImageSurface.cpp
diff --git a/gfx/thebes/public/gfxQuartzImageSurface.h b/gfx/thebes/gfxQuartzImageSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxQuartzImageSurface.h
rename to gfx/thebes/gfxQuartzImageSurface.h
diff --git a/gfx/thebes/src/gfxQuartzNativeDrawing.cpp b/gfx/thebes/gfxQuartzNativeDrawing.cpp
similarity index 100%
rename from gfx/thebes/src/gfxQuartzNativeDrawing.cpp
rename to gfx/thebes/gfxQuartzNativeDrawing.cpp
diff --git a/gfx/thebes/public/gfxQuartzNativeDrawing.h b/gfx/thebes/gfxQuartzNativeDrawing.h
similarity index 100%
rename from gfx/thebes/public/gfxQuartzNativeDrawing.h
rename to gfx/thebes/gfxQuartzNativeDrawing.h
diff --git a/gfx/thebes/src/gfxQuartzPDFSurface.cpp b/gfx/thebes/gfxQuartzPDFSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxQuartzPDFSurface.cpp
rename to gfx/thebes/gfxQuartzPDFSurface.cpp
diff --git a/gfx/thebes/public/gfxQuartzPDFSurface.h b/gfx/thebes/gfxQuartzPDFSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxQuartzPDFSurface.h
rename to gfx/thebes/gfxQuartzPDFSurface.h
diff --git a/gfx/thebes/src/gfxQuartzSurface.cpp b/gfx/thebes/gfxQuartzSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxQuartzSurface.cpp
rename to gfx/thebes/gfxQuartzSurface.cpp
diff --git a/gfx/thebes/public/gfxQuartzSurface.h b/gfx/thebes/gfxQuartzSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxQuartzSurface.h
rename to gfx/thebes/gfxQuartzSurface.h
diff --git a/gfx/thebes/src/gfxRect.cpp b/gfx/thebes/gfxRect.cpp
similarity index 100%
rename from gfx/thebes/src/gfxRect.cpp
rename to gfx/thebes/gfxRect.cpp
diff --git a/gfx/thebes/public/gfxRect.h b/gfx/thebes/gfxRect.h
similarity index 100%
rename from gfx/thebes/public/gfxRect.h
rename to gfx/thebes/gfxRect.h
diff --git a/gfx/thebes/src/gfxScriptItemizer.cpp b/gfx/thebes/gfxScriptItemizer.cpp
similarity index 100%
rename from gfx/thebes/src/gfxScriptItemizer.cpp
rename to gfx/thebes/gfxScriptItemizer.cpp
diff --git a/gfx/thebes/src/gfxScriptItemizer.h b/gfx/thebes/gfxScriptItemizer.h
similarity index 100%
rename from gfx/thebes/src/gfxScriptItemizer.h
rename to gfx/thebes/gfxScriptItemizer.h
diff --git a/gfx/thebes/src/gfxSharedImageSurface.cpp b/gfx/thebes/gfxSharedImageSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxSharedImageSurface.cpp
rename to gfx/thebes/gfxSharedImageSurface.cpp
diff --git a/gfx/thebes/public/gfxSharedImageSurface.h b/gfx/thebes/gfxSharedImageSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxSharedImageSurface.h
rename to gfx/thebes/gfxSharedImageSurface.h
diff --git a/gfx/thebes/src/gfxSkipChars.cpp b/gfx/thebes/gfxSkipChars.cpp
similarity index 100%
rename from gfx/thebes/src/gfxSkipChars.cpp
rename to gfx/thebes/gfxSkipChars.cpp
diff --git a/gfx/thebes/public/gfxSkipChars.h b/gfx/thebes/gfxSkipChars.h
similarity index 100%
rename from gfx/thebes/public/gfxSkipChars.h
rename to gfx/thebes/gfxSkipChars.h
diff --git a/gfx/thebes/src/gfxTextRunCache.cpp b/gfx/thebes/gfxTextRunCache.cpp
similarity index 100%
rename from gfx/thebes/src/gfxTextRunCache.cpp
rename to gfx/thebes/gfxTextRunCache.cpp
diff --git a/gfx/thebes/public/gfxTextRunCache.h b/gfx/thebes/gfxTextRunCache.h
similarity index 100%
rename from gfx/thebes/public/gfxTextRunCache.h
rename to gfx/thebes/gfxTextRunCache.h
diff --git a/gfx/thebes/src/gfxTextRunWordCache.cpp b/gfx/thebes/gfxTextRunWordCache.cpp
similarity index 100%
rename from gfx/thebes/src/gfxTextRunWordCache.cpp
rename to gfx/thebes/gfxTextRunWordCache.cpp
diff --git a/gfx/thebes/public/gfxTextRunWordCache.h b/gfx/thebes/gfxTextRunWordCache.h
similarity index 100%
rename from gfx/thebes/public/gfxTextRunWordCache.h
rename to gfx/thebes/gfxTextRunWordCache.h
diff --git a/gfx/thebes/public/gfxTypes.h b/gfx/thebes/gfxTypes.h
similarity index 100%
rename from gfx/thebes/public/gfxTypes.h
rename to gfx/thebes/gfxTypes.h
diff --git a/gfx/thebes/src/gfxUnicodeProperties.cpp b/gfx/thebes/gfxUnicodeProperties.cpp
similarity index 100%
rename from gfx/thebes/src/gfxUnicodeProperties.cpp
rename to gfx/thebes/gfxUnicodeProperties.cpp
diff --git a/gfx/thebes/src/gfxUnicodeProperties.h b/gfx/thebes/gfxUnicodeProperties.h
similarity index 100%
rename from gfx/thebes/src/gfxUnicodeProperties.h
rename to gfx/thebes/gfxUnicodeProperties.h
diff --git a/gfx/thebes/src/gfxUnicodePropertyData.cpp b/gfx/thebes/gfxUnicodePropertyData.cpp
similarity index 100%
rename from gfx/thebes/src/gfxUnicodePropertyData.cpp
rename to gfx/thebes/gfxUnicodePropertyData.cpp
diff --git a/gfx/thebes/src/gfxUniscribeShaper.cpp b/gfx/thebes/gfxUniscribeShaper.cpp
similarity index 100%
rename from gfx/thebes/src/gfxUniscribeShaper.cpp
rename to gfx/thebes/gfxUniscribeShaper.cpp
diff --git a/gfx/thebes/src/gfxUniscribeShaper.h b/gfx/thebes/gfxUniscribeShaper.h
similarity index 100%
rename from gfx/thebes/src/gfxUniscribeShaper.h
rename to gfx/thebes/gfxUniscribeShaper.h
diff --git a/gfx/thebes/src/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp
similarity index 100%
rename from gfx/thebes/src/gfxUserFontSet.cpp
rename to gfx/thebes/gfxUserFontSet.cpp
diff --git a/gfx/thebes/public/gfxUserFontSet.h b/gfx/thebes/gfxUserFontSet.h
similarity index 100%
rename from gfx/thebes/public/gfxUserFontSet.h
rename to gfx/thebes/gfxUserFontSet.h
diff --git a/gfx/thebes/src/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp
similarity index 100%
rename from gfx/thebes/src/gfxUtils.cpp
rename to gfx/thebes/gfxUtils.cpp
diff --git a/gfx/thebes/public/gfxUtils.h b/gfx/thebes/gfxUtils.h
similarity index 100%
rename from gfx/thebes/public/gfxUtils.h
rename to gfx/thebes/gfxUtils.h
diff --git a/gfx/thebes/src/gfxWindowsNativeDrawing.cpp b/gfx/thebes/gfxWindowsNativeDrawing.cpp
similarity index 100%
rename from gfx/thebes/src/gfxWindowsNativeDrawing.cpp
rename to gfx/thebes/gfxWindowsNativeDrawing.cpp
diff --git a/gfx/thebes/public/gfxWindowsNativeDrawing.h b/gfx/thebes/gfxWindowsNativeDrawing.h
similarity index 100%
rename from gfx/thebes/public/gfxWindowsNativeDrawing.h
rename to gfx/thebes/gfxWindowsNativeDrawing.h
diff --git a/gfx/thebes/src/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
similarity index 100%
rename from gfx/thebes/src/gfxWindowsPlatform.cpp
rename to gfx/thebes/gfxWindowsPlatform.cpp
diff --git a/gfx/thebes/public/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
similarity index 100%
rename from gfx/thebes/public/gfxWindowsPlatform.h
rename to gfx/thebes/gfxWindowsPlatform.h
diff --git a/gfx/thebes/src/gfxWindowsSurface.cpp b/gfx/thebes/gfxWindowsSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxWindowsSurface.cpp
rename to gfx/thebes/gfxWindowsSurface.cpp
diff --git a/gfx/thebes/public/gfxWindowsSurface.h b/gfx/thebes/gfxWindowsSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxWindowsSurface.h
rename to gfx/thebes/gfxWindowsSurface.h
diff --git a/gfx/thebes/src/gfxXlibNativeRenderer.cpp b/gfx/thebes/gfxXlibNativeRenderer.cpp
similarity index 100%
rename from gfx/thebes/src/gfxXlibNativeRenderer.cpp
rename to gfx/thebes/gfxXlibNativeRenderer.cpp
diff --git a/gfx/thebes/public/gfxXlibNativeRenderer.h b/gfx/thebes/gfxXlibNativeRenderer.h
similarity index 100%
rename from gfx/thebes/public/gfxXlibNativeRenderer.h
rename to gfx/thebes/gfxXlibNativeRenderer.h
diff --git a/gfx/thebes/src/gfxXlibSurface.cpp b/gfx/thebes/gfxXlibSurface.cpp
similarity index 100%
rename from gfx/thebes/src/gfxXlibSurface.cpp
rename to gfx/thebes/gfxXlibSurface.cpp
diff --git a/gfx/thebes/public/gfxXlibSurface.h b/gfx/thebes/gfxXlibSurface.h
similarity index 100%
rename from gfx/thebes/public/gfxXlibSurface.h
rename to gfx/thebes/gfxXlibSurface.h
diff --git a/gfx/thebes/src/ignorable.x-ccmap b/gfx/thebes/ignorable.x-ccmap
similarity index 100%
rename from gfx/thebes/src/ignorable.x-ccmap
rename to gfx/thebes/ignorable.x-ccmap
diff --git a/gfx/thebes/src/nsUnicodeRange.cpp b/gfx/thebes/nsUnicodeRange.cpp
similarity index 100%
rename from gfx/thebes/src/nsUnicodeRange.cpp
rename to gfx/thebes/nsUnicodeRange.cpp
diff --git a/gfx/thebes/src/nsUnicodeRange.h b/gfx/thebes/nsUnicodeRange.h
similarity index 100%
rename from gfx/thebes/src/nsUnicodeRange.h
rename to gfx/thebes/nsUnicodeRange.h
diff --git a/gfx/thebes/public/Makefile.in b/gfx/thebes/public/Makefile.in
deleted file mode 100644
index a11896789546..000000000000
--- a/gfx/thebes/public/Makefile.in
+++ /dev/null
@@ -1,141 +0,0 @@
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= thebes
-
-
-EXPORTS		= 	gfx3DMatrix.h \
-			gfxASurface.h \
-			gfxAlphaRecovery.h \
-			gfxColor.h \
-			gfxContext.h \
-			gfxFont.h \
-			gfxFontConstants.h \
-			gfxFontUtils.h \
-			gfxImageSurface.h \
-			gfxMatrix.h \
-			gfxPath.h \
-			gfxPattern.h \
-			gfxPlatform.h \
-			gfxPoint.h \
-			gfxRect.h \
-			gfxSkipChars.h \
-			gfxTypes.h \
-			gfxTextRunCache.h \
-			gfxTextRunWordCache.h \
-			gfxUtils.h \
-			gfxUserFontSet.h \
-			GLDefs.h \
-			GLContext.h \
-			GLContextProvider.h \
-			$(NULL)
-
-ifdef MOZ_IPC
-EXPORTS		+= \
-			gfxSharedImageSurface.h \
-			$(NULL)
-endif
-
-EXPORTS += gfxFontTest.h
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-EXPORTS	+=	gfxWindowsPlatform.h \
-		gfxWindowsSurface.h \
-		gfxWindowsNativeDrawing.h \
-		WGLLibrary.h \
-		$(NULL)
-EXPORTS +=	gfxPDFSurface.h
-
-ifdef WINCE
-EXPORTS +=	gfxFT2Fonts.h \
-		gfxFT2FontBase.h \
-		gfxDDrawSurface.h \
-		$(NULL)
-else
-EXPORTS +=  gfxDWriteFonts.h
-EXPORTS +=  gfxD2DSurface.h
-endif
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-EXPORTS += \
-	gfxAndroidPlatform.h \
-	gfxFT2Fonts.h \
-	gfxFT2FontBase.h \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-
-ifdef MOZ_X11
-EXPORTS += gfxXlibSurface.h \
-           GLXLibrary.h \
-           $(NULL)
-endif
-
-ifdef MOZ_PANGO 
-EXPORTS += gfxPangoFonts.h
-else
-EXPORTS += gfxFT2Fonts.h
-endif
-
-ifdef MOZ_DFB
-EXPORTS += gfxDirectFBSurface.h
-endif
-
-EXPORTS += gfxPlatformGtk.h gfxGdkNativeRenderer.h
-EXPORTS += gfxPDFSurface.h gfxPSSurface.h
-EXPORTS += gfxFT2FontBase.h
-
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-
-ifdef MOZ_X11
-EXPORTS += gfxXlibSurface.h \
-           GLXLibrary.h \
-           $(NULL)
-endif
-
-ifdef MOZ_PANGO
-EXPORTS += gfxPangoFonts.h
-else
-EXPORTS += gfxFT2Fonts.h
-endif
-EXPORTS += gfxQtPlatform.h gfxQPainterSurface.h
-EXPORTS += gfxXlibSurface.h gfxQtNativeRenderer.h
-EXPORTS += gfxFT2FontBase.h
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-EXPORTS	+=	gfxOS2Surface.h \
-		gfxOS2Platform.h \
-		gfxOS2Fonts.h \
-		$(NULL)
-EXPORTS +=	gfxPDFSurface.h
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-EXPORTS	+=	gfxBeOSSurface.h gfxBeOSPlatform.h
-EXPORTS +=	gfxPangoFonts.h
-EXPORTS +=	gfxFT2FontBase.h
-EXPORTS +=	gfxPDFSurface.h
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXPORTS +=	gfxPlatformMac.h \
-		gfxQuartzSurface.h \
-		gfxQuartzImageSurface.h \
-		gfxQuartzPDFSurface.h \
-		gfxQuartzNativeDrawing.h \
-		$(NULL)
-
-endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/gfx/thebes/src/Makefile.in b/gfx/thebes/src/Makefile.in
deleted file mode 100644
index 331bc0464995..000000000000
--- a/gfx/thebes/src/Makefile.in
+++ /dev/null
@@ -1,300 +0,0 @@
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= thebes
-LIBRARY_NAME	= thebes
-LIBXUL_LIBRARY	= 1
-EXPORT_LIBRARY	= 1
-
-
-CPPSRCS	= \
-	gfxASurface.cpp \
-	gfxAlphaRecovery.cpp \
-	gfxContext.cpp \
-	gfxImageSurface.cpp \
-	gfxFont.cpp \
-	gfxFontMissingGlyphs.cpp \
-	gfxFontTest.cpp \
-	gfxFontUtils.cpp \
-	gfxAtoms.cpp \
-	gfxMatrix.cpp \
-	gfxPath.cpp \
-	gfxPattern.cpp \
-	gfxPlatform.cpp \
-	gfxPlatformFontList.cpp \
-	gfxRect.cpp \
-	gfxSkipChars.cpp \
-	gfxTextRunCache.cpp \
-	gfxTextRunWordCache.cpp \
-	gfxUserFontSet.cpp \
-	gfxUtils.cpp \
-	gfxUnicodeProperties.cpp \
-	gfxScriptItemizer.cpp \
-	gfxHarfBuzzShaper.cpp \
-	GLContext.cpp \
-	GLContextProviderOSMesa.cpp \
-	$(NULL)
-
-ifdef MOZ_IPC
-CPPSRCS += \
-	gfxSharedImageSurface.cpp \
-	$(NULL)
-endif
-
-SHARED_LIBRARY_LIBS += \
-	../../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \
-	$(NULL)
-
-
-ifndef MOZ_ENABLE_LIBXUL
-EXTRA_DSO_LIBS	= gkgfx ycbcr
-ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
-CPPSRCS += gfxDllDeps.cpp
-endif
-endif
-
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_CAIRO_LIBS) \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(XPCOM_LIBS) \
-	$(NSPR_LIBS) \
-	$(ZLIB_LIBS) \
-	$(QCMS_LIBS) \
-	$(MOZ_HARFBUZZ_LIBS) \
-	$(NULL)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-CPPSRCS	+= 	gfxWindowsPlatform.cpp \
-		gfxWindowsSurface.cpp \
-		gfxWindowsNativeDrawing.cpp \
-		nsUnicodeRange.cpp \
-		$(NULL)
-
-ifdef WINCE
-CPPSRCS	+= gfxFT2Fonts.cpp \
-	   gfxFT2FontBase.cpp \
-	   gfxFT2Utils.cpp \
-	   gfxDDrawSurface.cpp \
-	   gfxFT2FontList.cpp \
-	   $(NULL)
-
-EXTRA_DSO_LDOPTS += $(FT2_LIBS)
-
-OS_LIBS += $(call EXPAND_LIBNAME,ddraw)
-else
-ifdef MOZ_ENABLE_DWRITE_FONT
-CPPSRCS	+= gfxDWriteFonts.cpp \
-	   gfxDWriteShaper.cpp \
-	   gfxDWriteTextAnalysis.cpp \
-	   gfxDWriteCommon.cpp \
-	   gfxD2DSurface.cpp \
-	   gfxDWriteFontList.cpp \
-	   $(NULL)
-endif
-CPPSRCS	+= gfxGDIFont.cpp \
-	   gfxGDIFontList.cpp \
-	   gfxGDIShaper.cpp \
-	   gfxUniscribeShaper.cpp \
-	   $(NULL)
-_OS_LIBS = usp10 msimg32
-endif
-
-CPPSRCS +=	gfxPDFSurface.cpp
-
-ifdef GNU_CXX
-_OS_LIBS	+= uuid
-endif
-OS_LIBS		+= $(call EXPAND_LIBNAME,$(_OS_LIBS))
-
-ifdef MOZ_ENABLE_D3D9_LAYER
-DEFINES +=	-DMOZ_ENABLE_D3D9_LAYER
-endif
-
-ACDEFINES +=	-UWIN32_LEAN_AND_MEAN
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-CPPSRCS += \
-	gfxAndroidPlatform.cpp \
-	gfxFT2Fonts.cpp \
-	gfxFT2FontBase.cpp \
-	gfxFT2Utils.cpp \
-	nsUnicodeRange.cpp \
-	$(NULL)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CPPSRCS	+=	gfxOS2Fonts.cpp \
-		gfxOS2Platform.cpp \
-		gfxOS2Surface.cpp \
-		nsUnicodeRange.cpp \
-		gfxFontconfigUtils.cpp \
-		$(NULL)
-CPPSRCS +=	gfxPDFSurface.cpp
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-
-ifdef MOZ_PANGO
-CPPSRCS += gfxPangoFonts.cpp
-else
-CPPSRCS += gfxFT2Fonts.cpp
-endif
-
-ifdef MOZ_X11
-CPPSRCS += gfxXlibSurface.cpp
-endif
-
-CPPSRCS +=  gfxPlatformGtk.cpp gfxGdkNativeRenderer.cpp
-CPPSRCS +=	gfxPDFSurface.cpp gfxPSSurface.cpp
-CPPSRCS +=	gfxFontconfigUtils.cpp
-CPPSRCS +=	gfxFT2FontBase.cpp
-CPPSRCS +=	gfxFT2Utils.cpp
-CPPSRCS +=	nsUnicodeRange.cpp
-
-ifdef MOZ_X11
-CSRCS = cairo-xlib-utils.c
-endif
-
-ifdef MOZ_DFB
-CSRCS = cairo-gdk-utils.c
-endif
-
-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
-endif
-
-ifdef MOZ_DFB
-CPPSRCS += gfxDirectFBSurface.cpp
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-CPPSRCS += gfxQtPlatform.cpp gfxQPainterSurface.cpp
-CPPSRCS += gfxXlibSurface.cpp gfxQtNativeRenderer.cpp
-ifdef MOZ_PANGO
-CPPSRCS += gfxPangoFonts.cpp
-else
-CPPSRCS += gfxFT2Fonts.cpp
-endif
-CPPSRCS +=	gfxFT2FontBase.cpp
-CPPSRCS +=	gfxFT2Utils.cpp
-CPPSRCS +=	gfxFontconfigUtils.cpp
-CPPSRCS +=	nsUnicodeRange.cpp
-#CSRCS = cairo-xlib-utils.c
-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(ZLIB_LIBS) $(XLDFLAGS) $(XLIBS) $(CAIRO_FT_LIBS) $(XEXT_LIBS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-CPPSRCS	+= 	gfxBeOSSurface.cpp gfxBeOSPlatform.cpp
-CPPSRCS +=	gfxPangoFonts.cpp 
-CPPSRCS +=	gfxFT2FontBase.cpp
-CPPSRCS +=	gfxFT2Utils.cpp
-#CPPSRCS +=	gfxPDFSurface.cpp
-CPPSRCS +=	gfxFontconfigUtils.cpp
-CPPSRCS +=	nsUnicodeRange.cpp
-EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) $(CAIRO_FT_LIBS) -lfontconfig
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CPPSRCS	+= \
-	gfxQuartzSurface.cpp \
-	gfxQuartzImageSurface.cpp \
-	gfxQuartzPDFSurface.cpp \
-	gfxPlatformMac.cpp \
-	gfxMacFont.cpp \
-	gfxCoreTextShaper.cpp \
-	$(NULL)
-#CPPSRCS +=	gfxPDFSurface.cpp
-CPPSRCS +=      nsUnicodeRange.cpp
-CPPSRCS +=      gfxQuartzNativeDrawing.cpp
-
-CMMSRCS = gfxMacPlatformFontList.mm
-
-# Always link with OpenGL/AGL
-EXTRA_DSO_LDOPTS += -framework OpenGL -framework AGL -framework QuickTime -framework AppKit
-endif
-
-CSRCS += woff.c
-
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-
-GL_PROVIDER = Null
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-ifndef WINCE
-GL_PROVIDER = WGL
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-ifndef MOZ_PLATFORM_MAEMO
-GL_PROVIDER = GLX
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-GL_PROVIDER = CGL
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-ifdef MOZ_PLATFORM_MAEMO
-GL_PROVIDER = EGL
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-GL_PROVIDER = EGL
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-GL_PROVIDER = EGL
-endif
-
-# Mac is a special snowflake
-ifeq ($(GL_PROVIDER),CGL)
-CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
-else
-CPPSRCS += GLContextProvider$(GL_PROVIDER).cpp
-endif
-
-DEFINES += -DIMPL_THEBES -DWOFF_MOZILLA_CLIENT
-
-include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-
-DEFINES := $(filter-out -DUNICODE,$(DEFINES))
-
-CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
-CFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-ifdef WINCE
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-CXXFLAGS += $(MOZ_PANGO_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CXXFLAGS += $(CAIRO_FT_CFLAGS)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-CXXFLAGS += $(CAIRO_FT_CFLAGS) $(MOZ_PANGO_CFLAGS)
-endif
diff --git a/gfx/thebes/src/woff-private.h b/gfx/thebes/woff-private.h
similarity index 100%
rename from gfx/thebes/src/woff-private.h
rename to gfx/thebes/woff-private.h
diff --git a/gfx/thebes/src/woff.c b/gfx/thebes/woff.c
similarity index 100%
rename from gfx/thebes/src/woff.c
rename to gfx/thebes/woff.c
diff --git a/gfx/thebes/src/woff.h b/gfx/thebes/woff.h
similarity index 100%
rename from gfx/thebes/src/woff.h
rename to gfx/thebes/woff.h

From 741c67288895c51f68a6996aa76513b4f80baab3 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 4 Jun 2010 17:03:50 -0400
Subject: [PATCH 144/172] Bug 519928 - IFRAME inside designMode disables
 JavaScript, breaking current clickjacking defenses; r=Olli.Pettay

---
 caps/src/nsScriptSecurityManager.cpp          | 28 +-----
 content/html/document/test/Makefile.in        |  1 -
 .../html/document/test/test_bug386495.html    | 42 --------
 docshell/base/nsDocShell.cpp                  | 94 ++++++++++++++++++
 docshell/base/nsIDocShell.idl                 | 12 ++-
 editor/composer/public/nsIEditingSession.idl  |  7 +-
 editor/composer/src/nsEditingSession.cpp      |  8 ++
 editor/composer/test/Makefile.in              |  1 +
 editor/composer/test/test_bug519928.html      | 96 +++++++++++++++++++
 9 files changed, 219 insertions(+), 70 deletions(-)
 delete mode 100644 content/html/document/test/test_bug386495.html
 create mode 100644 editor/composer/test/test_bug519928.html

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index 9ecc293a211d..b4acf1c837e3 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -1778,31 +1778,9 @@ nsScriptSecurityManager::CanExecuteScripts(JSContext* cx,
         docshell = window->GetDocShell();
     }
 
-    nsCOMPtr<nsIDocShellTreeItem> globalObjTreeItem =
-        do_QueryInterface(docshell);
-
-    if (globalObjTreeItem) 
-    {
-        nsCOMPtr<nsIDocShellTreeItem> treeItem(globalObjTreeItem);
-        nsCOMPtr<nsIDocShellTreeItem> parentItem;
-
-        // Walk up the docshell tree to see if any containing docshell disallows scripts
-        do
-        {
-            rv = docshell->GetAllowJavascript(result);
-            if (NS_FAILED(rv)) return rv;
-            if (!*result)
-                return NS_OK; // Do not run scripts
-            treeItem->GetParent(getter_AddRefs(parentItem));
-            treeItem.swap(parentItem);
-            docshell = do_QueryInterface(treeItem);
-#ifdef DEBUG
-            if (treeItem && !docshell) {
-              NS_ERROR("cannot get a docshell from a treeItem!");
-            }
-#endif // DEBUG
-        } while (treeItem && docshell);
-    }
+    rv = docshell->GetCanExecuteScripts(result);
+    if (NS_FAILED(rv)) return rv;
+    if (!*result) return NS_OK;
 
     // OK, the docshell doesn't have script execution explicitly disabled.
     // Check whether our URI is an "about:" URI that allows scripts.  If it is,
diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in
index 9706620aaf89..c20474612681 100644
--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -65,7 +65,6 @@ _TEST_FILES = 	test_bug1682.html \
 		test_bug369370.html \
 		bug369370-popup.png \
 		test_bug380383.html \
-		test_bug386495.html \
 		test_bug391777.html \
 		test_bug402680.html \
 		test_bug403868.html \
diff --git a/content/html/document/test/test_bug386495.html b/content/html/document/test/test_bug386495.html
deleted file mode 100644
index a700c9322f8a..000000000000
--- a/content/html/document/test/test_bug386495.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=386495
--->
-<head>
-  <title>Test for Bug 386495</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=386495">Mozilla Bug 386495</a>
-<p id="display"></p>
-<div id="content">
-  <iframe id="testIframe"></iframe>
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 386495 **/
-
-function finishTest() {
-  is(document.getElementById("testIframe").contentWindow.timeoutFired, false, "Timeout shouldn't fire.");
-  SimpleTest.finish();
-}
-
-function testContentEditable() {
-  document.getElementById('testIframe').style.display = 'block';
-  document.getElementById('testIframe').contentWindow.timeoutFired = false;
-  document.getElementById('testIframe').contentWindow.setTimeout("window.timeoutFired = true", 50);
-  document.getElementById('testIframe').contentDocument.designMode = 'on';
-  setTimeout(finishTest, 100);
-}
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(testContentEditable);
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 7391ee959082..bc105e2c5012 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11166,3 +11166,97 @@ nsDocShell::GetPrintPreview(nsIWebBrowserPrint** aPrintPreview)
 #ifdef DEBUG
 unsigned long nsDocShell::gNumberOfDocShells = 0;
 #endif
+
+NS_IMETHODIMP
+nsDocShell::GetCanExecuteScripts(PRBool *aResult, PRBool *aContinueLooking)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = PR_FALSE; // disallow by default
+
+  nsCOMPtr<nsIDocShell> docshell = this;
+  nsCOMPtr<nsIDocShellTreeItem> globalObjTreeItem =
+      do_QueryInterface(docshell);
+
+  if (globalObjTreeItem)
+  {
+      nsCOMPtr<nsIDocShellTreeItem> treeItem(globalObjTreeItem);
+      nsCOMPtr<nsIDocShellTreeItem> parentItem;
+      PRBool firstPass = PR_TRUE;
+      PRBool lookForParents = PR_FALSE;
+
+      // Walk up the docshell tree to see if any containing docshell disallows scripts
+      do
+      {
+          nsresult rv = docshell->GetAllowJavascript(aResult);
+          if (NS_FAILED(rv)) return rv;
+          if (!*aResult) {
+              nsDocShell* realDocshell = static_cast<nsDocShell*>(docshell.get());
+              if (realDocshell->mContentViewer) {
+                  nsIDocument* doc = realDocshell->mContentViewer->GetDocument();
+                  if (doc && doc->HasFlag(NODE_IS_EDITABLE) &&
+                      realDocshell->mEditorData) {
+                      nsCOMPtr<nsIEditingSession> editSession;
+                      realDocshell->mEditorData->GetEditingSession(getter_AddRefs(editSession));
+                      PRBool jsDisabled = PR_FALSE;
+                      if (editSession &&
+                          NS_SUCCEEDED(rv = editSession->GetJsAndPluginsDisabled(&jsDisabled))) {
+                          if (firstPass) {
+                              if (jsDisabled) {
+                                  // We have a docshell which has been explicitly set
+                                  // to design mode, so we disallow scripts.
+                                  return NS_OK;
+                              }
+                              // The docshell was not explicitly set to design mode,
+                              // so it must be so because a parent was explicitly
+                              // set to design mode.  We don't need to look at higher
+                              // docshells.
+                              *aResult = PR_TRUE;
+                              break;
+                          } else if (lookForParents && jsDisabled) {
+                              // If a parent was explicitly set to design mode,
+                              // we should allow script execution on the child.
+                              *aResult = PR_TRUE;
+                              break;
+                          }
+                          // If the child docshell allows scripting, and the
+                          // parent is inside design mode, we don't need to look
+                          // further.
+                          *aResult = PR_TRUE;
+                          return NS_OK;
+                      }
+                      NS_WARNING("The editing session does not work?");
+                      return NS_FAILED(rv) ? rv : NS_ERROR_FAILURE;
+                  }
+                  if (firstPass) {
+                      // Don't be too hard on docshells on the first pass.
+                      // There may be a parent docshell which has been set
+                      // to design mode, so look for it.
+                      lookForParents = PR_TRUE;
+                  } else {
+                      // We have a docshell which disallows scripts
+                      // and is not editable, so we shouldn't allow
+                      // scripts at all.
+                      return NS_OK;
+                  }
+              }
+          } else if (lookForParents) {
+              // The parent docshell was not explicitly set to design
+              // mode, so js on the child docshell was disabled for
+              // another reason.  Therefore, we need to disable js.
+              return NS_OK;
+          }
+          firstPass = PR_FALSE;
+
+          treeItem->GetParent(getter_AddRefs(parentItem));
+          treeItem.swap(parentItem);
+          docshell = do_QueryInterface(treeItem);
+#ifdef DEBUG
+          if (treeItem && !docshell) {
+            NS_ERROR("cannot get a docshell from a treeItem!");
+          }
+#endif // DEBUG
+      } while (treeItem && docshell);
+  }
+
+  return NS_OK;
+}
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index 26c82da554ce..ab652596c469 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -71,7 +71,7 @@ interface nsIPrincipal;
 interface nsIWebBrowserPrint;
 interface nsIVariant;
 
-[scriptable, uuid(3adde256-05a9-43a7-a190-f8fe75eecfd6)]
+[scriptable, uuid(8ac6b880-776a-44d4-b271-a7e64ae3debd)]
 interface nsIDocShell : nsISupports
 {
   /**
@@ -511,4 +511,14 @@ interface nsIDocShell : nsISupports
    * is loaded.
    */
   readonly attribute nsIWebBrowserPrint printPreview;
+
+  /**
+   * Whether this docshell can execute scripts based on its hierarchy.
+   * The rule of thumb here is that we disable js if this docshell or any
+   * of its parents disallow scripting, unless the only reason for js being
+   * disabled in this docshell is a parent docshell having a document that
+   * is in design mode.  In that case, we explicitly allow scripting on the
+   * current docshell.
+   */
+  readonly attribute boolean canExecuteScripts;
 };
diff --git a/editor/composer/public/nsIEditingSession.idl b/editor/composer/public/nsIEditingSession.idl
index d27715b851e4..97866dac8ad2 100644
--- a/editor/composer/public/nsIEditingSession.idl
+++ b/editor/composer/public/nsIEditingSession.idl
@@ -43,7 +43,7 @@
 
 interface nsIEditor;
 
-[scriptable, uuid(274cd32e-3675-47e1-9d8a-fc6504ded9ce)]
+[scriptable, uuid(24f3f4da-18a4-448d-876d-7360fefac029)]
 
 interface nsIEditingSession : nsISupports
 {
@@ -128,5 +128,10 @@ interface nsIEditingSession : nsISupports
    * to the window.
    */
   void reattachToWindow(in nsIDOMWindow aWindow);
+
+  /**
+   * Whether this session has disabled JS and plugins.
+   */
+  readonly attribute boolean jsAndPluginsDisabled;
 };
 
diff --git a/editor/composer/src/nsEditingSession.cpp b/editor/composer/src/nsEditingSession.cpp
index 2d172ee2e2f0..8b758446102e 100644
--- a/editor/composer/src/nsEditingSession.cpp
+++ b/editor/composer/src/nsEditingSession.cpp
@@ -261,6 +261,14 @@ nsEditingSession::RestoreJSAndPlugins(nsIDOMWindow *aWindow)
   return docShell->SetAllowPlugins(mPluginsEnabled);
 }
 
+NS_IMETHODIMP
+nsEditingSession::GetJsAndPluginsDisabled(PRBool *aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+  *aResult = mDisabledJSAndPlugins;
+  return NS_OK;
+}
+
 /*---------------------------------------------------------------------------
 
   WindowIsEditable
diff --git a/editor/composer/test/Makefile.in b/editor/composer/test/Makefile.in
index 9b7488c513ca..ab969629cd35 100644
--- a/editor/composer/test/Makefile.in
+++ b/editor/composer/test/Makefile.in
@@ -48,6 +48,7 @@ _TEST_FILES = \
 		test_bug348497.html \
 		test_bug384147.html \
 		test_bug389350.html \
+		test_bug519928.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/editor/composer/test/test_bug519928.html b/editor/composer/test/test_bug519928.html
new file mode 100644
index 000000000000..a6986b286b0d
--- /dev/null
+++ b/editor/composer/test/test_bug519928.html
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=519928
+-->
+<head>
+  <title>Test for Bug 519928</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=519928">Mozilla Bug 519928</a>
+<p id="display"></p>
+<div id="content">
+<iframe id="load-frame"></iframe>  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+var iframe = document.getElementById("load-frame");
+
+function enableJS() allowJS(true);
+function disableJS() allowJS(false);
+function allowJS(allow) {
+  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+  iframe.contentWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+                      .getInterface(Components.interfaces.nsIWebNavigation)
+                      .QueryInterface(Components.interfaces.nsIDocShell)
+                      .allowJavascript = allow;
+}
+function expectJSAllowed(allowed, testCondition, callback) {
+  window.ICanRunMyJS = false;
+  var self_ = window;
+  testCondition();
+
+  var doc = iframe.contentDocument;
+  doc.body.innerHTML = "<iframe></iframe>";
+  var innerFrame = doc.querySelector("iframe");
+  innerFrame.addEventListener("load", function() {
+    innerFrame.removeEventListener("load", arguments.callee, false);
+
+    var msg = "The inner iframe should" + (allowed ? "" : " not") + " be able to run Javascript";
+    is(self_.ICanRunMyJS, allowed, msg);
+    callback();
+  }, false);
+  var iframeSrc = "data:text/html,<script>parent.parent.ICanRunMyJS = true;</scr" + "ipt>";
+  innerFrame.src = iframeSrc;
+}
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+  var enterDesignMode = function() document.designMode = "on";
+  var leaveDesignMode = function() document.designMode = "off";
+  expectJSAllowed(false, disableJS, function() {
+    expectJSAllowed(true, enableJS, function() {
+      expectJSAllowed(true, enterDesignMode, function() {
+        expectJSAllowed(true, leaveDesignMode, function() {
+          expectJSAllowed(false, disableJS, function() {
+            expectJSAllowed(false, enterDesignMode, function() {
+              expectJSAllowed(false, leaveDesignMode, function() {
+                expectJSAllowed(true, enableJS, function() {
+                  enterDesignMode = function() iframe.contentDocument.designMode = "on";
+                  leaveDesignMode = function() iframe.contentDocument.designMode = "off";
+                  expectJSAllowed(false, disableJS, function() {
+                    expectJSAllowed(true, enableJS, function() {
+                      expectJSAllowed(true, enterDesignMode, function() {
+                        expectJSAllowed(true, leaveDesignMode, function() {
+                          expectJSAllowed(false, disableJS, function() {
+                            expectJSAllowed(true, enterDesignMode, function() {
+                              expectJSAllowed(false, leaveDesignMode, function() {
+                                expectJSAllowed(true, enableJS, function() {
+                                  SimpleTest.finish();
+                                });
+                              });
+                            });
+                          });
+                        });
+                      });
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+    });
+  });
+});
+
+</script>
+</pre>
+</body>
+</html>
+

From 464f08a611b8f2ab11930f88004e7157f11d6e61 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 28 Jun 2010 14:04:37 -0400
Subject: [PATCH 145/172] Bug 574558 - Part 1: Pass the correct content to
 ContentChanged; r=roc

---
 content/html/content/src/nsHTMLTextAreaElement.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp
index 3fe0a7da7b84..3807085ce0bb 100644
--- a/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -960,7 +960,7 @@ nsHTMLTextAreaElement::ContentAppended(nsIDocument* aDocument,
                                        nsIContent* aFirstNewContent,
                                        PRInt32 /* unused */)
 {
-  ContentChanged(aContainer);
+  ContentChanged(aFirstNewContent);
 }
 
 void

From 5ae8a4993eab8a3f3363ae38c934fa982280dbb9 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 28 Jun 2010 14:04:37 -0400
Subject: [PATCH 146/172] Bug 574558 - Part 2: Don't fail if we can't get the
 selection to adjust it after removing elements; r=roc

---
 editor/libeditor/base/DeleteRangeTxn.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/editor/libeditor/base/DeleteRangeTxn.cpp b/editor/libeditor/base/DeleteRangeTxn.cpp
index 5caa0927b3b4..58a5e8eb57ab 100644
--- a/editor/libeditor/base/DeleteRangeTxn.cpp
+++ b/editor/libeditor/base/DeleteRangeTxn.cpp
@@ -204,7 +204,11 @@ NS_IMETHODIMP DeleteRangeTxn::DoTransaction(void)
   {
     nsCOMPtr<nsISelection> selection;
     result = mEditor->GetSelection(getter_AddRefs(selection));
-    NS_ENSURE_SUCCESS(result, result);
+    // At this point, it is possible that the frame for our root element
+    // might have been destroyed, in which case, the above call returns
+    // an error.  We eat that error here intentionally.  See bug 574558
+    // for a sample case where this happens.
+    NS_ENSURE_SUCCESS(result, NS_OK);
     NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
     result = selection->Collapse(mStartParent, mStartOffset);
   }

From 5dd75da7138d87f9a7ccfe1fd70a0e49b6ea9342 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 28 Jun 2010 14:04:37 -0400
Subject: [PATCH 147/172] Bug 574558 - Part 3: Handle frame reconstruction
 duirng nsTextEditorState::SetValue gracefully; r=roc

---
 content/html/content/src/nsTextEditorState.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/content/html/content/src/nsTextEditorState.cpp b/content/html/content/src/nsTextEditorState.cpp
index b1a81b0aed36..2ddc001b0b19 100644
--- a/content/html/content/src/nsTextEditorState.cpp
+++ b/content/html/content/src/nsTextEditorState.cpp
@@ -1726,8 +1726,14 @@ nsTextEditorState::SetValue(const nsAString& aValue, PRBool aUserInput)
           plaintextEditor->InsertText(insertValue);
         }
         if (!weakFrame.IsAlive()) {
-          NS_ASSERTION(!mBoundFrame, "The frame should have been unbounded");
-          SetValue(newValue, PR_FALSE);
+          // If the frame was destroyed because of a flush somewhere inside
+          // InsertText, mBoundFrame here will be false.  But it's also possible
+          // for the frame to go away because of another reason (such as deleting
+          // the existing selection -- see bug 574558), in which case we don't
+          // need to reset the value here.
+          if (!mBoundFrame) {
+            SetValue(newValue, PR_FALSE);
+          }
           valueSetter.Cancel();
           return;
         }

From 64b13b0d856485acb3aa2dcfb728ef1efb0f64c1 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 28 Jun 2010 14:04:37 -0400
Subject: [PATCH 148/172] Bug 574558 - Part 4: test case; r=roc

---
 editor/libeditor/html/crashtests/574558-1.xhtml  | 15 +++++++++++++++
 editor/libeditor/html/crashtests/crashtests.list |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 editor/libeditor/html/crashtests/574558-1.xhtml

diff --git a/editor/libeditor/html/crashtests/574558-1.xhtml b/editor/libeditor/html/crashtests/574558-1.xhtml
new file mode 100644
index 000000000000..6aac47072f6a
--- /dev/null
+++ b/editor/libeditor/html/crashtests/574558-1.xhtml
@@ -0,0 +1,15 @@
+<html xmlns="http://www.w3.org/1999/xhtml"><head><script>
+<![CDATA[
+
+function boom()
+{
+  document.execCommand("selectAll", false, null);
+  document.execCommand("selectAll", false, null);
+  document.execCommand("inserthtml", false, "<span><div>");
+  var textarea = document.getElementById("textarea");
+  var span = document.createElementNS("http://www.w3.org/1999/xhtml", "span");
+  textarea.appendChild(span);
+}
+
+]]>
+</script></head><div contenteditable="true"></div><body onload="boom();"><textarea id="textarea">f</textarea></body></html>
diff --git a/editor/libeditor/html/crashtests/crashtests.list b/editor/libeditor/html/crashtests/crashtests.list
index d697e0002ded..52a814e43632 100644
--- a/editor/libeditor/html/crashtests/crashtests.list
+++ b/editor/libeditor/html/crashtests/crashtests.list
@@ -15,3 +15,4 @@ asserts(1) load 467647-1.html # bug 382210
 load 503709-1.xhtml
 load 513375-1.xhtml
 load 535632-1.xhtml
+load 574558-1.xhtml

From 6a92641501ddb14806aa5b0df7950de6e21b2b35 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 28 Jun 2010 14:04:37 -0400
Subject: [PATCH 149/172] Bug 574898 - "ASSERTION: called
 nsGenericElement::SetText" with spellcheck; r=roc

---
 layout/forms/nsTextControlFrame.cpp  |  3 ++-
 layout/reftests/bugs/574898-1.html   | 18 ++++++++++++++++++
 layout/reftests/bugs/574898-ref.html |  6 ++++++
 layout/reftests/bugs/reftest.list    |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 layout/reftests/bugs/574898-1.html
 create mode 100644 layout/reftests/bugs/574898-ref.html

diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index cb1bd93b9330..91e607f8bf06 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -1216,7 +1216,8 @@ nsTextControlFrame::AttributeChanged(PRInt32         aNameSpaceID,
   nsISelectionController* selCon = txtCtrl->GetSelectionController();
   const PRBool needEditor = nsGkAtoms::maxlength == aAttribute ||
                             nsGkAtoms::readonly == aAttribute ||
-                            nsGkAtoms::disabled == aAttribute;
+                            nsGkAtoms::disabled == aAttribute ||
+                            nsGkAtoms::spellcheck == aAttribute;
   nsCOMPtr<nsIEditor> editor;
   if (needEditor) {
     GetEditor(getter_AddRefs(editor));
diff --git a/layout/reftests/bugs/574898-1.html b/layout/reftests/bugs/574898-1.html
new file mode 100644
index 000000000000..df15ae58668d
--- /dev/null
+++ b/layout/reftests/bugs/574898-1.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+<script>
+
+function boom()
+{
+  var q = document.getElementById("q");
+  q.spellcheck = true;
+  q.setAttribute("value", "x");
+  document.documentElement.className = "";
+}
+
+</script>
+</head>
+
+<body onload="boom();"><input id="q"></body>
+</html>
diff --git a/layout/reftests/bugs/574898-ref.html b/layout/reftests/bugs/574898-ref.html
new file mode 100644
index 000000000000..cb23ab3c35a6
--- /dev/null
+++ b/layout/reftests/bugs/574898-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body><input value="x"></body>
+</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index d328e45143fd..b5a08282b754 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1448,3 +1448,4 @@ random-if(!haveTestPlugin) == 546071-1.html 546071-1-ref.html
 == 571281-1b.html 571281-1-ref.html
 == 571281-1c.html 571281-1-ref.html
 == 572598-1.html 572598-ref.html
+== 574898-1.html 574898-ref.html

From 0c837d8334e5cd9474b466e8cb3070509555d5ff Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 28 Jun 2010 14:45:50 -0400
Subject: [PATCH 150/172] Bug 519928 - bustage fix

---
 docshell/base/nsDocShell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index bc105e2c5012..511d6680d730 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11168,7 +11168,7 @@ unsigned long nsDocShell::gNumberOfDocShells = 0;
 #endif
 
 NS_IMETHODIMP
-nsDocShell::GetCanExecuteScripts(PRBool *aResult, PRBool *aContinueLooking)
+nsDocShell::GetCanExecuteScripts(PRBool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = PR_FALSE; // disallow by default

From c4b3932911296db799bfa887008f252349573149 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Mon, 28 Jun 2010 11:51:06 -0700
Subject: [PATCH 151/172] Bug 574811 - Rename IDBObjectStoreRequest to
 IDBObjectStore Updating interface names per recent specification changes.
 r=bent

--HG--
rename : dom/indexedDB/IDBObjectStoreRequest.cpp => dom/indexedDB/IDBObjectStore.cpp
rename : dom/indexedDB/IDBObjectStoreRequest.h => dom/indexedDB/IDBObjectStore.h
---
 dom/base/nsDOMClassInfo.cpp                   |   7 +-
 dom/base/nsDOMClassInfoClasses.h              |   2 +-
 dom/indexedDB/DatabaseInfo.h                  |   2 +-
 dom/indexedDB/IDBCursorRequest.cpp            |  18 +-
 dom/indexedDB/IDBCursorRequest.h              |   8 +-
 dom/indexedDB/IDBDatabase.cpp                 |   6 +-
 dom/indexedDB/IDBEvents.h                     |   2 +-
 dom/indexedDB/IDBIndexRequest.cpp             |  20 +--
 dom/indexedDB/IDBIndexRequest.h               |   8 +-
 ...ectStoreRequest.cpp => IDBObjectStore.cpp} | 166 +++++++++---------
 ...BObjectStoreRequest.h => IDBObjectStore.h} |  19 +-
 dom/indexedDB/IDBTransaction.cpp              |   8 +-
 dom/indexedDB/Makefile.in                     |   5 +-
 dom/indexedDB/nsIIDBDatabase.idl              |   4 +-
 dom/indexedDB/nsIIDBObjectStore.idl           |  63 ++++++-
 dom/indexedDB/nsIIDBObjectStoreRequest.idl    | 105 -----------
 dom/indexedDB/nsIIDBTransaction.idl           |   4 +-
 js/src/xpconnect/src/dom_quickstubs.qsconf    |   7 +-
 18 files changed, 199 insertions(+), 255 deletions(-)
 rename dom/indexedDB/{IDBObjectStoreRequest.cpp => IDBObjectStore.cpp} (92%)
 rename dom/indexedDB/{IDBObjectStoreRequest.h => IDBObjectStore.h} (93%)
 delete mode 100644 dom/indexedDB/nsIIDBObjectStoreRequest.idl

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 6c494ff3368d..077487ae503e 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -483,7 +483,7 @@ using namespace mozilla::dom;
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 #include "mozilla/dom/indexedDB/IDBDatabase.h"
 #include "mozilla/dom/indexedDB/IDBEvents.h"
-#include "mozilla/dom/indexedDB/IDBObjectStoreRequest.h"
+#include "mozilla/dom/indexedDB/IDBObjectStore.h"
 #include "mozilla/dom/indexedDB/IDBTransaction.h"
 #include "mozilla/dom/indexedDB/IDBCursorRequest.h"
 #include "mozilla/dom/indexedDB/IDBKeyRange.h"
@@ -1430,7 +1430,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBTransactionEvent, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(IDBObjectStoreRequest, nsDOMGenericSH,
+  NS_DEFINE_CLASSINFO_DATA(IDBObjectStore, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBTransaction, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -3956,8 +3956,7 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEvent)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(IDBObjectStoreRequest, nsIIDBObjectStoreRequest)
-    DOM_CLASSINFO_MAP_ENTRY(nsIIDBObjectStoreRequest)
+  DOM_CLASSINFO_MAP_BEGIN(IDBObjectStore, nsIIDBObjectStore)
     DOM_CLASSINFO_MAP_ENTRY(nsIIDBObjectStore)
   DOM_CLASSINFO_MAP_END
 
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index cb00f452820e..be9f8545f678 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -486,7 +486,7 @@ DOMCI_CLASS(IDBDatabase)
 DOMCI_CLASS(IDBErrorEvent)
 DOMCI_CLASS(IDBSuccessEvent)
 DOMCI_CLASS(IDBTransactionEvent)
-DOMCI_CLASS(IDBObjectStoreRequest)
+DOMCI_CLASS(IDBObjectStore)
 DOMCI_CLASS(IDBTransaction)
 DOMCI_CLASS(IDBCursorRequest)
 DOMCI_CLASS(IDBKeyRange)
diff --git a/dom/indexedDB/DatabaseInfo.h b/dom/indexedDB/DatabaseInfo.h
index 5d6c7a40430d..99ab9206d6c1 100644
--- a/dom/indexedDB/DatabaseInfo.h
+++ b/dom/indexedDB/DatabaseInfo.h
@@ -43,7 +43,7 @@
 // Only meant to be included in IndexedDB source files, not exported.
 #include "IndexedDatabase.h"
 
-#include "IDBObjectStoreRequest.h"
+#include "IDBObjectStore.h"
 
 BEGIN_INDEXEDDB_NAMESPACE
 
diff --git a/dom/indexedDB/IDBCursorRequest.cpp b/dom/indexedDB/IDBCursorRequest.cpp
index 480519640829..fc34b17d5b8b 100644
--- a/dom/indexedDB/IDBCursorRequest.cpp
+++ b/dom/indexedDB/IDBCursorRequest.cpp
@@ -58,7 +58,7 @@
 #include "DatabaseInfo.h"
 #include "IDBEvents.h"
 #include "IDBIndexRequest.h"
-#include "IDBObjectStoreRequest.h"
+#include "IDBObjectStore.h"
 #include "IDBTransaction.h"
 #include "Savepoint.h"
 #include "TransactionThreadPool.h"
@@ -143,7 +143,7 @@ END_INDEXEDDB_NAMESPACE
 already_AddRefed<IDBCursorRequest>
 IDBCursorRequest::Create(IDBRequest* aRequest,
                          IDBTransaction* aTransaction,
-                         IDBObjectStoreRequest* aObjectStore,
+                         IDBObjectStore* aObjectStore,
                          PRUint16 aDirection,
                          nsTArray<KeyValuePair>& aData)
 {
@@ -420,7 +420,7 @@ IDBCursorRequest::Continue(nsIVariant* aKey,
   }
 
   Key key;
-  nsresult rv = IDBObjectStoreRequest::GetKeyFromVariant(aKey, key);
+  nsresult rv = IDBObjectStore::GetKeyFromVariant(aKey, key);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (key.IsNull()) {
@@ -571,9 +571,9 @@ IDBCursorRequest::Update(nsIVariant* aValue,
   }
 
   nsTArray<IndexUpdateInfo> indexUpdateInfo;
-  rv = IDBObjectStoreRequest::GetIndexUpdateInfo(mObjectStore->GetObjectStoreInfo(),
-                                                 cx, clone.value(),
-                                                 indexUpdateInfo);
+  rv = IDBObjectStore::GetIndexUpdateInfo(mObjectStore->GetObjectStoreInfo(),
+                                          cx, clone.value(),
+                                          indexUpdateInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIJSON> json(new nsJSON());
@@ -671,9 +671,9 @@ UpdateHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
   // Update our indexes if needed.
   if (!mIndexUpdateInfo.IsEmpty()) {
     PRInt64 objectDataId = mAutoIncrement ? mKey.IntValue() : LL_MININT;
-    rv = IDBObjectStoreRequest::UpdateIndexes(mTransaction, mOSID, mKey,
-                                              mAutoIncrement, true,
-                                              objectDataId, mIndexUpdateInfo);
+    rv = IDBObjectStore::UpdateIndexes(mTransaction, mOSID, mKey,
+                                       mAutoIncrement, true,
+                                       objectDataId, mIndexUpdateInfo);
     if (rv == NS_ERROR_STORAGE_CONSTRAINT) {
       return nsIIDBDatabaseException::CONSTRAINT_ERR;
     }
diff --git a/dom/indexedDB/IDBCursorRequest.h b/dom/indexedDB/IDBCursorRequest.h
index a99c36e6eb68..bc6de86dc437 100644
--- a/dom/indexedDB/IDBCursorRequest.h
+++ b/dom/indexedDB/IDBCursorRequest.h
@@ -40,7 +40,7 @@
 #ifndef mozilla_dom_indexeddb_idbcursorrequest_h__
 #define mozilla_dom_indexeddb_idbcursorrequest_h__
 
-#include "mozilla/dom/indexedDB/IDBObjectStoreRequest.h"
+#include "mozilla/dom/indexedDB/IDBObjectStore.h"
 #include "nsIIDBCursorRequest.h"
 
 #include "jsapi.h"
@@ -51,7 +51,7 @@ BEGIN_INDEXEDDB_NAMESPACE
 
 class IDBIndexRequest;
 class IDBRequest;
-class IDBObjectStoreRequest;
+class IDBObjectStore;
 class IDBTransaction;
 
 struct KeyValuePair
@@ -82,7 +82,7 @@ public:
   already_AddRefed<IDBCursorRequest>
   Create(IDBRequest* aRequest,
          IDBTransaction* aTransaction,
-         IDBObjectStoreRequest* aObjectStore,
+         IDBObjectStore* aObjectStore,
          PRUint16 aDirection,
          nsTArray<KeyValuePair>& aData);
 
@@ -121,7 +121,7 @@ protected:
 
   nsRefPtr<IDBRequest> mRequest;
   nsRefPtr<IDBTransaction> mTransaction;
-  nsRefPtr<IDBObjectStoreRequest> mObjectStore;
+  nsRefPtr<IDBObjectStore> mObjectStore;
   nsRefPtr<IDBIndexRequest> mIndex;
 
   PRUint16 mDirection;
diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp
index 649739845d8b..39f84e26b672 100644
--- a/dom/indexedDB/IDBDatabase.cpp
+++ b/dom/indexedDB/IDBDatabase.cpp
@@ -49,7 +49,7 @@
 #include "AsyncConnectionHelper.h"
 #include "DatabaseInfo.h"
 #include "IDBEvents.h"
-#include "IDBObjectStoreRequest.h"
+#include "IDBObjectStore.h"
 #include "IDBTransaction.h"
 #include "IDBFactory.h"
 #include "LazyIdleThread.h"
@@ -625,7 +625,7 @@ NS_IMETHODIMP
 IDBDatabase::ObjectStore(const nsAString& aName,
                          PRUint16 aMode,
                          PRUint8 aOptionalArgCount,
-                         nsIIDBObjectStoreRequest** _retval)
+                         nsIIDBObjectStore** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -767,7 +767,7 @@ CreateObjectStoreHelper::GetSuccessResult(nsIWritableVariant* aResult)
   }
   info.forget();
 
-  nsCOMPtr<nsIIDBObjectStoreRequest> result;
+  nsCOMPtr<nsIIDBObjectStore> result;
   nsresult rv = mTransaction->ObjectStore(mName, getter_AddRefs(result));
   NS_ENSURE_SUCCESS(rv, nsIIDBDatabaseException::UNKNOWN_ERR);
 
diff --git a/dom/indexedDB/IDBEvents.h b/dom/indexedDB/IDBEvents.h
index 1e3a2a11cc1a..571197adc4b0 100644
--- a/dom/indexedDB/IDBEvents.h
+++ b/dom/indexedDB/IDBEvents.h
@@ -53,7 +53,7 @@
 #include "jsapi.h"
 #include "nsDOMEvent.h"
 
-#include "mozilla/dom/indexedDB/IDBObjectStoreRequest.h"
+#include "mozilla/dom/indexedDB/IDBObjectStore.h"
 
 #define SUCCESS_EVT_STR "success"
 #define ERROR_EVT_STR "error"
diff --git a/dom/indexedDB/IDBIndexRequest.cpp b/dom/indexedDB/IDBIndexRequest.cpp
index e1ab2dfc1400..100037c853d1 100644
--- a/dom/indexedDB/IDBIndexRequest.cpp
+++ b/dom/indexedDB/IDBIndexRequest.cpp
@@ -50,7 +50,7 @@
 #include "AsyncConnectionHelper.h"
 #include "IDBCursorRequest.h"
 #include "IDBEvents.h"
-#include "IDBObjectStoreRequest.h"
+#include "IDBObjectStore.h"
 #include "IDBTransaction.h"
 #include "DatabaseInfo.h"
 
@@ -227,7 +227,7 @@ private:
 
 // static
 already_AddRefed<IDBIndexRequest>
-IDBIndexRequest::Create(IDBObjectStoreRequest* aObjectStore,
+IDBIndexRequest::Create(IDBObjectStore* aObjectStore,
                         const IndexInfo* aIndexInfo)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
@@ -315,7 +315,7 @@ IDBIndexRequest::Get(nsIVariant* aKey,
   NS_WARNING("Using a slow path for Get! Fix this now!");
 
   Key key;
-  nsresult rv = IDBObjectStoreRequest::GetKeyFromVariant(aKey, key);
+  nsresult rv = IDBObjectStore::GetKeyFromVariant(aKey, key);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (key.IsUnset() || key.IsNull()) {
@@ -344,7 +344,7 @@ IDBIndexRequest::GetObject(nsIVariant* aKey,
   NS_WARNING("Using a slow path for Get! Fix this now!");
 
   Key key;
-  nsresult rv = IDBObjectStoreRequest::GetKeyFromVariant(aKey, key);
+  nsresult rv = IDBObjectStore::GetKeyFromVariant(aKey, key);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (key.IsUnset() || key.IsNull()) {
@@ -373,7 +373,7 @@ IDBIndexRequest::GetAll(nsIVariant* aKey,
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
   Key key;
-  nsresult rv = IDBObjectStoreRequest::GetKeyFromVariant(aKey, key);
+  nsresult rv = IDBObjectStore::GetKeyFromVariant(aKey, key);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (key.IsNull()) {
@@ -406,7 +406,7 @@ IDBIndexRequest::GetAllObjects(nsIVariant* aKey,
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
   Key key;
-  nsresult rv = IDBObjectStoreRequest::GetKeyFromVariant(aKey, key);
+  nsresult rv = IDBObjectStore::GetKeyFromVariant(aKey, key);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (key.IsNull()) {
@@ -455,13 +455,13 @@ IDBIndexRequest::OpenCursor(nsIIDBKeyRange* aKeyRange,
     rv = aKeyRange->GetLeft(getter_AddRefs(variant));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = IDBObjectStoreRequest::GetKeyFromVariant(variant, leftKey);
+    rv = IDBObjectStore::GetKeyFromVariant(variant, leftKey);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = aKeyRange->GetRight(getter_AddRefs(variant));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = IDBObjectStoreRequest::GetKeyFromVariant(variant, rightKey);
+    rv = IDBObjectStore::GetKeyFromVariant(variant, rightKey);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
@@ -522,13 +522,13 @@ IDBIndexRequest::OpenObjectCursor(nsIIDBKeyRange* aKeyRange,
     rv = aKeyRange->GetLeft(getter_AddRefs(variant));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = IDBObjectStoreRequest::GetKeyFromVariant(variant, leftKey);
+    rv = IDBObjectStore::GetKeyFromVariant(variant, leftKey);
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = aKeyRange->GetRight(getter_AddRefs(variant));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = IDBObjectStoreRequest::GetKeyFromVariant(variant, rightKey);
+    rv = IDBObjectStore::GetKeyFromVariant(variant, rightKey);
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
diff --git a/dom/indexedDB/IDBIndexRequest.h b/dom/indexedDB/IDBIndexRequest.h
index 8f13671d5095..623b7d4b2d11 100644
--- a/dom/indexedDB/IDBIndexRequest.h
+++ b/dom/indexedDB/IDBIndexRequest.h
@@ -46,7 +46,7 @@
 
 BEGIN_INDEXEDDB_NAMESPACE
 
-class IDBObjectStoreRequest;
+class IDBObjectStore;
 struct IndexInfo;
 
 class IDBIndexRequest : public IDBRequest::Generator,
@@ -58,10 +58,10 @@ public:
   NS_DECL_NSIIDBINDEXREQUEST
 
   static already_AddRefed<IDBIndexRequest>
-  Create(IDBObjectStoreRequest* aObjectStore,
+  Create(IDBObjectStore* aObjectStore,
          const IndexInfo* aIndexInfo);
 
-  IDBObjectStoreRequest* ObjectStore()
+  IDBObjectStore* ObjectStore()
   {
     return mObjectStore;
   }
@@ -71,7 +71,7 @@ protected:
   ~IDBIndexRequest();
 
 private:
-  nsRefPtr<IDBObjectStoreRequest> mObjectStore;
+  nsRefPtr<IDBObjectStore> mObjectStore;
 
   PRInt64 mId;
   nsString mName;
diff --git a/dom/indexedDB/IDBObjectStoreRequest.cpp b/dom/indexedDB/IDBObjectStore.cpp
similarity index 92%
rename from dom/indexedDB/IDBObjectStoreRequest.cpp
rename to dom/indexedDB/IDBObjectStore.cpp
index d49f3bf977cf..479e71c8bd40 100644
--- a/dom/indexedDB/IDBObjectStoreRequest.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -44,7 +44,7 @@
 #include "nsJSON.h"
 #include "IDBEvents.h"
 
-#include "IDBObjectStoreRequest.h"
+#include "IDBObjectStore.h"
 #include "IDBIndexRequest.h"
 
 #include "nsIIDBDatabaseException.h"
@@ -160,7 +160,7 @@ class OpenCursorHelper : public AsyncConnectionHelper
 public:
   OpenCursorHelper(IDBTransaction* aTransaction,
                    IDBRequest* aRequest,
-                   IDBObjectStoreRequest* aObjectStore,
+                   IDBObjectStore* aObjectStore,
                    const Key& aLeftKey,
                    const Key& aRightKey,
                    PRUint16 aKeyRangeFlags,
@@ -176,7 +176,7 @@ public:
 
 private:
   // In-params.
-  nsRefPtr<IDBObjectStoreRequest> mObjectStore;
+  nsRefPtr<IDBObjectStore> mObjectStore;
   const Key mLeftKey;
   const Key mRightKey;
   const PRUint16 mKeyRangeFlags;
@@ -196,7 +196,7 @@ public:
                     const nsAString& aKeyPath,
                     bool aUnique,
                     bool aAutoIncrement,
-                    IDBObjectStoreRequest* aObjectStore)
+                    IDBObjectStore* aObjectStore)
   : AsyncConnectionHelper(aTransaction, aRequest), mName(aName),
     mKeyPath(aKeyPath), mUnique(aUnique), mAutoIncrement(aAutoIncrement),
     mObjectStore(aObjectStore), mId(LL_MININT)
@@ -213,7 +213,7 @@ private:
   nsString mKeyPath;
   const bool mUnique;
   const bool mAutoIncrement;
-  nsRefPtr<IDBObjectStoreRequest> mObjectStore;
+  nsRefPtr<IDBObjectStore> mObjectStore;
 
   // Out-params.
   PRInt64 mId;
@@ -225,7 +225,7 @@ public:
   RemoveIndexHelper(IDBTransaction* aDatabase,
                     IDBRequest* aRequest,
                     const nsAString& aName,
-                    IDBObjectStoreRequest* aObjectStore)
+                    IDBObjectStore* aObjectStore)
   : AsyncConnectionHelper(aDatabase, aRequest), mName(aName),
     mObjectStore(aObjectStore)
   { }
@@ -236,7 +236,7 @@ public:
 private:
   // In-params
   nsString mName;
-  nsRefPtr<IDBObjectStoreRequest> mObjectStore;
+  nsRefPtr<IDBObjectStore> mObjectStore;
 };
 
 class GetAllHelper : public AsyncConnectionHelper
@@ -321,15 +321,15 @@ GetKeyFromObject(JSContext* aCx,
 } // anonymous namespace
 
 // static
-already_AddRefed<IDBObjectStoreRequest>
-IDBObjectStoreRequest::Create(IDBDatabase* aDatabase,
-                              IDBTransaction* aTransaction,
-                              const ObjectStoreInfo* aStoreInfo,
-                              PRUint16 aMode)
+already_AddRefed<IDBObjectStore>
+IDBObjectStore::Create(IDBDatabase* aDatabase,
+                       IDBTransaction* aTransaction,
+                       const ObjectStoreInfo* aStoreInfo,
+                       PRUint16 aMode)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
-  nsRefPtr<IDBObjectStoreRequest> objectStore = new IDBObjectStoreRequest();
+  nsRefPtr<IDBObjectStore> objectStore = new IDBObjectStore();
 
   objectStore->mDatabase = aDatabase;
   objectStore->mTransaction = aTransaction;
@@ -345,8 +345,8 @@ IDBObjectStoreRequest::Create(IDBDatabase* aDatabase,
 
 // static
 nsresult
-IDBObjectStoreRequest::GetKeyFromVariant(nsIVariant* aKeyVariant,
-                                         Key& aKey)
+IDBObjectStore::GetKeyFromVariant(nsIVariant* aKeyVariant,
+                                  Key& aKey)
 {
   if (!aKeyVariant) {
     aKey = Key::UNSETKEY;
@@ -387,8 +387,8 @@ IDBObjectStoreRequest::GetKeyFromVariant(nsIVariant* aKeyVariant,
 
 // static
 nsresult
-IDBObjectStoreRequest::GetJSONFromArg0(/* jsval arg0, */
-                                       nsAString& aJSON)
+IDBObjectStore::GetJSONFromArg0(/* jsval arg0, */
+                                nsAString& aJSON)
 {
   nsIXPConnect* xpc = nsContentUtils::XPConnect();
   NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
@@ -432,10 +432,10 @@ IDBObjectStoreRequest::GetJSONFromArg0(/* jsval arg0, */
 
 // static
 nsresult
-IDBObjectStoreRequest::GetKeyPathValueFromJSON(const nsAString& aJSON,
-                                               const nsAString& aKeyPath,
-                                               JSContext** aCx,
-                                               Key& aValue)
+IDBObjectStore::GetKeyPathValueFromJSON(const nsAString& aJSON,
+                                        const nsAString& aKeyPath,
+                                        JSContext** aCx,
+                                        Key& aValue)
 {
   NS_ASSERTION(!aJSON.IsEmpty(), "Empty JSON!");
   NS_ASSERTION(!aKeyPath.IsEmpty(), "Empty keyPath!");
@@ -492,10 +492,10 @@ IDBObjectStoreRequest::GetKeyPathValueFromJSON(const nsAString& aJSON,
 
 /* static */
 nsresult
-IDBObjectStoreRequest::GetIndexUpdateInfo(ObjectStoreInfo* aObjectStoreInfo,
-                                          JSContext* aCx,
-                                          jsval aObject,
-                                          nsTArray<IndexUpdateInfo>& aUpdateInfoArray)
+IDBObjectStore::GetIndexUpdateInfo(ObjectStoreInfo* aObjectStoreInfo,
+                                   JSContext* aCx,
+                                   jsval aObject,
+                                   nsTArray<IndexUpdateInfo>& aUpdateInfoArray)
 {
   JSObject* cloneObj = nsnull;
 
@@ -559,13 +559,13 @@ IDBObjectStoreRequest::GetIndexUpdateInfo(ObjectStoreInfo* aObjectStoreInfo,
 
 /* static */
 nsresult
-IDBObjectStoreRequest::UpdateIndexes(IDBTransaction* aTransaction,
-                                     PRInt64 aObjectStoreId,
-                                     const Key& aObjectStoreKey,
-                                     bool aAutoIncrement,
-                                     bool aOverwrite,
-                                     PRInt64 aObjectDataId,
-                                     const nsTArray<IndexUpdateInfo>& aUpdateInfoArray)
+IDBObjectStore::UpdateIndexes(IDBTransaction* aTransaction,
+                              PRInt64 aObjectStoreId,
+                              const Key& aObjectStoreKey,
+                              bool aAutoIncrement,
+                              bool aOverwrite,
+                              PRInt64 aObjectDataId,
+                              const nsTArray<IndexUpdateInfo>& aUpdateInfoArray)
 {
 #ifdef DEBUG
   if (aAutoIncrement) {
@@ -682,7 +682,7 @@ IDBObjectStoreRequest::UpdateIndexes(IDBTransaction* aTransaction,
 }
 
 ObjectStoreInfo*
-IDBObjectStoreRequest::GetObjectStoreInfo()
+IDBObjectStore::GetObjectStoreInfo()
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -694,7 +694,7 @@ IDBObjectStoreRequest::GetObjectStoreInfo()
   return info;
 }
 
-IDBObjectStoreRequest::IDBObjectStoreRequest()
+IDBObjectStore::IDBObjectStore()
 : mId(LL_MININT),
   mAutoIncrement(PR_FALSE),
   mMode(nsIIDBTransaction::READ_WRITE)
@@ -702,17 +702,17 @@ IDBObjectStoreRequest::IDBObjectStoreRequest()
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 }
 
-IDBObjectStoreRequest::~IDBObjectStoreRequest()
+IDBObjectStore::~IDBObjectStore()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 }
 
 nsresult
-IDBObjectStoreRequest::GetAddInfo(/* jsval aValue, */
-                                  nsIVariant* aKeyVariant,
-                                  nsString& aJSON,
-                                  Key& aKey,
-                                  nsTArray<IndexUpdateInfo>& aUpdateInfoArray)
+IDBObjectStore::GetAddInfo(/* jsval aValue, */
+                           nsIVariant* aKeyVariant,
+                           nsString& aJSON,
+                           Key& aKey,
+                           nsTArray<IndexUpdateInfo>& aUpdateInfoArray)
 {
   // This is the slow path, need to do this better once XPIDL can have raw
   // jsvals as arguments.
@@ -795,20 +795,19 @@ IDBObjectStoreRequest::GetAddInfo(/* jsval aValue, */
   return NS_OK;
 }
 
-NS_IMPL_ADDREF(IDBObjectStoreRequest)
-NS_IMPL_RELEASE(IDBObjectStoreRequest)
+NS_IMPL_ADDREF(IDBObjectStore)
+NS_IMPL_RELEASE(IDBObjectStore)
 
-NS_INTERFACE_MAP_BEGIN(IDBObjectStoreRequest)
+NS_INTERFACE_MAP_BEGIN(IDBObjectStore)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, IDBRequest::Generator)
-  NS_INTERFACE_MAP_ENTRY(nsIIDBObjectStoreRequest)
   NS_INTERFACE_MAP_ENTRY(nsIIDBObjectStore)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBObjectStoreRequest)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBObjectStore)
 NS_INTERFACE_MAP_END
 
-DOMCI_DATA(IDBObjectStoreRequest, IDBObjectStoreRequest)
+DOMCI_DATA(IDBObjectStore, IDBObjectStore)
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::GetName(nsAString& aName)
+IDBObjectStore::GetName(nsAString& aName)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -817,7 +816,7 @@ IDBObjectStoreRequest::GetName(nsAString& aName)
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::GetKeyPath(nsAString& aKeyPath)
+IDBObjectStore::GetKeyPath(nsAString& aKeyPath)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -826,7 +825,7 @@ IDBObjectStoreRequest::GetKeyPath(nsAString& aKeyPath)
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::GetIndexNames(nsIDOMDOMStringList** aIndexNames)
+IDBObjectStore::GetIndexNames(nsIDOMDOMStringList** aIndexNames)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -846,8 +845,8 @@ IDBObjectStoreRequest::GetIndexNames(nsIDOMDOMStringList** aIndexNames)
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::Get(nsIVariant* aKey,
-                           nsIIDBRequest** _retval)
+IDBObjectStore::Get(nsIVariant* aKey,
+                    nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -876,10 +875,10 @@ IDBObjectStoreRequest::Get(nsIVariant* aKey,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::GetAll(nsIIDBKeyRange* aKeyRange,
-                              PRUint32 aLimit,
-                              PRUint8 aOptionalArgCount,
-                              nsIIDBRequest** _retval)
+IDBObjectStore::GetAll(nsIIDBKeyRange* aKeyRange,
+                       PRUint32 aLimit,
+                       PRUint8 aOptionalArgCount,
+                       nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -928,9 +927,9 @@ IDBObjectStoreRequest::GetAll(nsIIDBKeyRange* aKeyRange,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::Add(nsIVariant* /* aValue */,
-                           nsIVariant* aKey,
-                           nsIIDBRequest** _retval)
+IDBObjectStore::Add(nsIVariant* /* aValue */,
+                    nsIVariant* aKey,
+                    nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -969,9 +968,9 @@ IDBObjectStoreRequest::Add(nsIVariant* /* aValue */,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::Modify(nsIVariant* /* aValue */,
-                              nsIVariant* aKey,
-                              nsIIDBRequest** _retval)
+IDBObjectStore::Modify(nsIVariant* /* aValue */,
+                       nsIVariant* aKey,
+                       nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -1010,9 +1009,9 @@ IDBObjectStoreRequest::Modify(nsIVariant* /* aValue */,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::AddOrModify(nsIVariant* /* aValue */,
-                                   nsIVariant* aKey,
-                                   nsIIDBRequest** _retval)
+IDBObjectStore::AddOrModify(nsIVariant* /* aValue */,
+                            nsIVariant* aKey,
+                            nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -1051,8 +1050,8 @@ IDBObjectStoreRequest::AddOrModify(nsIVariant* /* aValue */,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::Remove(nsIVariant* aKey,
-                              nsIIDBRequest** _retval)
+IDBObjectStore::Remove(nsIVariant* aKey,
+                       nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -1087,11 +1086,11 @@ IDBObjectStoreRequest::Remove(nsIVariant* aKey,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::OpenCursor(nsIIDBKeyRange* aKeyRange,
-                                  PRUint16 aDirection,
-                                  PRBool aPreload,
-                                  PRUint8 aOptionalArgCount,
-                                  nsIIDBRequest** _retval)
+IDBObjectStore::OpenCursor(nsIIDBKeyRange* aKeyRange,
+                           PRUint16 aDirection,
+                           PRBool aPreload,
+                           PRUint8 aOptionalArgCount,
+                           nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -1154,10 +1153,10 @@ IDBObjectStoreRequest::OpenCursor(nsIIDBKeyRange* aKeyRange,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::CreateIndex(const nsAString& aName,
-                                   const nsAString& aKeyPath,
-                                   PRBool aUnique,
-                                   nsIIDBRequest** _retval)
+IDBObjectStore::CreateIndex(const nsAString& aName,
+                            const nsAString& aKeyPath,
+                            PRBool aUnique,
+                            nsIIDBRequest** _retval)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -1204,8 +1203,8 @@ IDBObjectStoreRequest::CreateIndex(const nsAString& aName,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::Index(const nsAString& aName,
-                             nsIIDBIndexRequest** _retval)
+IDBObjectStore::Index(const nsAString& aName,
+                      nsIIDBIndexRequest** _retval)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -1241,8 +1240,8 @@ IDBObjectStoreRequest::Index(const nsAString& aName,
 }
 
 NS_IMETHODIMP
-IDBObjectStoreRequest::RemoveIndex(const nsAString& aName,
-                                   nsIIDBRequest** _retval)
+IDBObjectStore::RemoveIndex(const nsAString& aName,
+                            nsIIDBRequest** _retval)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -1435,9 +1434,9 @@ AddHelper::DoDatabaseWork(mozIStorageConnection* aConnection)
   // Update our indexes if needed.
   if (!mIndexUpdateInfo.IsEmpty()) {
     PRInt64 objectDataId = mAutoIncrement ? mKey.IntValue() : LL_MININT;
-    rv = IDBObjectStoreRequest::UpdateIndexes(mTransaction, mOSID, mKey,
-                                              mAutoIncrement, mOverwrite,
-                                              objectDataId, mIndexUpdateInfo);
+    rv = IDBObjectStore::UpdateIndexes(mTransaction, mOSID, mKey,
+                                       mAutoIncrement, mOverwrite,
+                                       objectDataId, mIndexUpdateInfo);
     if (rv == NS_ERROR_STORAGE_CONSTRAINT) {
       return nsIIDBDatabaseException::CONSTRAINT_ERR;
     }
@@ -1906,8 +1905,7 @@ CreateIndexHelper::InsertDataFromObjectStore(mozIStorageConnection* aConnection)
 
     Key key;
     JSContext* cx = nsnull;
-    rv = IDBObjectStoreRequest::GetKeyPathValueFromJSON(json, mKeyPath, &cx,
-                                                        key);
+    rv = IDBObjectStore::GetKeyPathValueFromJSON(json, mKeyPath, &cx, key);
     // XXX this should be a constraint error maybe?
     NS_ENSURE_SUCCESS(rv, nsIIDBDatabaseException::UNKNOWN_ERR);
 
diff --git a/dom/indexedDB/IDBObjectStoreRequest.h b/dom/indexedDB/IDBObjectStore.h
similarity index 93%
rename from dom/indexedDB/IDBObjectStoreRequest.h
rename to dom/indexedDB/IDBObjectStore.h
index 42b212adc716..25f425c93cc2 100644
--- a/dom/indexedDB/IDBObjectStoreRequest.h
+++ b/dom/indexedDB/IDBObjectStore.h
@@ -37,14 +37,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef mozilla_dom_indexeddb_idbobjectstorerequest_h__
-#define mozilla_dom_indexeddb_idbobjectstorerequest_h__
+#ifndef mozilla_dom_indexeddb_idbobjectstore_h__
+#define mozilla_dom_indexeddb_idbobjectstore_h__
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 #include "mozilla/dom/indexedDB/IDBDatabase.h"
 #include "mozilla/dom/indexedDB/IDBTransaction.h"
 
-#include "nsIIDBObjectStoreRequest.h"
+#include "nsIIDBObjectStore.h"
 
 struct JSContext;
 
@@ -205,15 +205,14 @@ private:
   PRInt64 mInt;
 };
 
-class IDBObjectStoreRequest : public IDBRequest::Generator,
-                              public nsIIDBObjectStoreRequest
+class IDBObjectStore : public IDBRequest::Generator,
+                       public nsIIDBObjectStore
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIIDBOBJECTSTORE
-  NS_DECL_NSIIDBOBJECTSTOREREQUEST
 
-  static already_AddRefed<IDBObjectStoreRequest>
+  static already_AddRefed<IDBObjectStore>
   Create(IDBDatabase* aDatabase,
          IDBTransaction* aTransaction,
          const ObjectStoreInfo* aInfo,
@@ -282,8 +281,8 @@ public:
   ObjectStoreInfo* GetObjectStoreInfo();
 
 protected:
-  IDBObjectStoreRequest();
-  ~IDBObjectStoreRequest();
+  IDBObjectStore();
+  ~IDBObjectStore();
 
   nsresult GetAddInfo(/* jsval aValue, */
                       nsIVariant* aKeyVariant,
@@ -305,4 +304,4 @@ private:
 
 END_INDEXEDDB_NAMESPACE
 
-#endif // mozilla_dom_indexeddb_idbobjectstorerequest_h__
+#endif // mozilla_dom_indexeddb_idbobjectstore_h__
diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp
index 9f638f636e07..302384cfe744 100644
--- a/dom/indexedDB/IDBTransaction.cpp
+++ b/dom/indexedDB/IDBTransaction.cpp
@@ -46,7 +46,7 @@
 
 #include "IDBEvents.h"
 #include "IDBCursorRequest.h"
-#include "IDBObjectStoreRequest.h"
+#include "IDBObjectStore.h"
 #include "IDBFactory.h"
 #include "DatabaseInfo.h"
 #include "TransactionThreadPool.h"
@@ -621,7 +621,7 @@ IDBTransaction::GetObjectStoreNames(nsIDOMDOMStringList** aObjectStores)
 
 NS_IMETHODIMP
 IDBTransaction::ObjectStore(const nsAString& aName,
-                            nsIIDBObjectStoreRequest** _retval)
+                            nsIIDBObjectStore** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -646,8 +646,8 @@ IDBTransaction::ObjectStore(const nsAString& aName,
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  nsRefPtr<IDBObjectStoreRequest> objectStore =
-    IDBObjectStoreRequest::Create(mDatabase, this, info, mMode);
+  nsRefPtr<IDBObjectStore> objectStore =
+    IDBObjectStore::Create(mDatabase, this, info, mMode);
   NS_ENSURE_TRUE(objectStore, NS_ERROR_FAILURE);
 
   objectStore.forget(_retval);
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index 7295661039c7..8dabfcb28fcd 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -59,7 +59,7 @@ CPPSRCS = \
   IDBEvents.cpp \
   IDBIndexRequest.cpp \
   IDBKeyRange.cpp \
-  IDBObjectStoreRequest.cpp \
+  IDBObjectStore.cpp \
   IDBRequest.cpp \
   IDBTransaction.cpp \
   IDBFactory.cpp \
@@ -73,7 +73,7 @@ EXPORTS_mozilla/dom/indexedDB = \
   IDBEvents.h \
   IDBIndexRequest.h \
   IDBKeyRange.h \
-  IDBObjectStoreRequest.h \
+  IDBObjectStore.h \
   IDBRequest.h \
   IDBTransaction.h \
   IndexedDatabase.h \
@@ -102,7 +102,6 @@ XPIDLSRCS = \
   nsIIDBIndexRequest.idl \
   nsIIDBKeyRange.idl \
   nsIIDBObjectStore.idl \
-  nsIIDBObjectStoreRequest.idl \
   nsIIDBRequest.idl \
   nsIIDBSuccessEvent.idl \
   nsIIDBTransaction.idl \
diff --git a/dom/indexedDB/nsIIDBDatabase.idl b/dom/indexedDB/nsIIDBDatabase.idl
index b8150a453f72..61aaf93975b6 100644
--- a/dom/indexedDB/nsIIDBDatabase.idl
+++ b/dom/indexedDB/nsIIDBDatabase.idl
@@ -40,7 +40,7 @@
 #include "nsISupports.idl"
 
 interface nsIVariant;
-interface nsIIDBObjectStoreRequest;
+interface nsIIDBObjectStore;
 interface nsIIDBRequest;
 interface nsIIDBTransaction;
 interface nsIDOMDOMStringList;
@@ -79,7 +79,7 @@ interface nsIIDBDatabase : nsISupports
               [optional /* 5000ms */] in unsigned long timeout);
 
   [optional_argc]
-  nsIIDBObjectStoreRequest
+  nsIIDBObjectStore
   objectStore(in AString name,
               [optional /* READ_ONLY */] in unsigned short mode);
 };
diff --git a/dom/indexedDB/nsIIDBObjectStore.idl b/dom/indexedDB/nsIIDBObjectStore.idl
index 8cae78523a2b..9de7bb4c0b35 100644
--- a/dom/indexedDB/nsIIDBObjectStore.idl
+++ b/dom/indexedDB/nsIIDBObjectStore.idl
@@ -39,14 +39,18 @@
 
 #include "nsISupports.idl"
 
+interface nsIIDBIndexRequest;
+interface nsIIDBKeyRange;
+interface nsIIDBRequest;
+interface nsIVariant;
 interface nsIDOMDOMStringList;
 
 /**
- * IDBObjectStore interface.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBObjectStore for more
- * information.
+ * nsIIDBObjectStore interface.  See
+ * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-nsIIDBObjectStore
+ * for more information.
  */
-[scriptable, uuid(783a49b0-c5f0-4d97-9349-532f4ec1f7ce)]
+[scriptable, uuid(1168fc42-ac08-4720-822c-da820f00e15e)]
 interface nsIIDBObjectStore : nsISupports
 {
   readonly attribute DOMString name;
@@ -54,4 +58,55 @@ interface nsIIDBObjectStore : nsISupports
   readonly attribute DOMString keyPath;
 
   readonly attribute nsIDOMDOMStringList indexNames;
+
+  // Success fires IDBTransactionEvent, result == value for key
+  nsIIDBRequest
+  get(in nsIVariant key);
+
+  // Success fires IDBTransactionEvent, result == array of values for given keys
+  [optional_argc]
+  nsIIDBRequest
+  getAll([optional /* null */] in nsIIDBKeyRange key,
+         [optional /* unlimited */] in unsigned long limit);
+
+  // Success fires IDBTransactionEvent, result == key
+  nsIIDBRequest
+  add(in nsIVariant value,
+      [optional /* null */] in nsIVariant key);
+
+  // Success fires IDBTransactionEvent, result == key
+  nsIIDBRequest
+  modify(in nsIVariant value,
+         [optional /* null */] in nsIVariant key);
+
+  // Success fires IDBTransactionEvent, result == key
+  nsIIDBRequest
+  addOrModify(in nsIVariant value,
+              [optional /* null */] in nsIVariant key);
+
+  // Success fires IDBTransactionEvent, result == null
+  nsIIDBRequest
+  remove(in nsIVariant key);
+
+  // Success fires IDBTransactionEvent, result == IDBCursorRequest or
+  // IDBCursorPreloadedRequest if preload == true. result == null if no match.
+  [optional_argc]
+  nsIIDBRequest
+  openCursor([optional /* null */] in nsIIDBKeyRange range,
+             [optional /* NEXT */] in unsigned short direction,
+             [optional /* false */] in boolean preload);
+
+  // Success fires IDBTransactionEvent, result == IDBIndexRequest
+  nsIIDBRequest
+  createIndex(in AString name,
+              in AString keyPath,
+              [optional /* false */] in boolean unique);
+
+  // Returns object immediately
+  nsIIDBIndexRequest
+  index(in AString name);
+
+  // Success fires IDBTransactionEvent, result == null
+  nsIIDBRequest
+  removeIndex(in AString name);
 };
diff --git a/dom/indexedDB/nsIIDBObjectStoreRequest.idl b/dom/indexedDB/nsIIDBObjectStoreRequest.idl
deleted file mode 100644
index 3cf5bd26c887..000000000000
--- a/dom/indexedDB/nsIIDBObjectStoreRequest.idl
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* ***** 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 Indexed Database.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ben Turner <bent.mozilla@gmail.com>
- *
- * 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 "nsIIDBObjectStore.idl"
-
-interface nsIIDBIndexRequest;
-interface nsIIDBKeyRange;
-interface nsIIDBRequest;
-interface nsIVariant;
-
-/**
- * nsIIDBObjectStoreRequest interface.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-nsIIDBObjectStoreRequest
- * for more information.
- */
-[scriptable, uuid(ce65fbc2-06a0-4f1c-89e4-0d9a636179c7)]
-interface nsIIDBObjectStoreRequest : nsIIDBObjectStore
-{
-  // Success fires IDBTransactionEvent, result == value for key
-  nsIIDBRequest
-  get(in nsIVariant key);
-
-  // Success fires IDBTransactionEvent, result == array of values for given keys
-  [optional_argc]
-  nsIIDBRequest
-  getAll([optional /* null */] in nsIIDBKeyRange key,
-         [optional /* unlimited */] in unsigned long limit);
-
-  // Success fires IDBTransactionEvent, result == key
-  nsIIDBRequest
-  add(in nsIVariant value,
-      [optional /* null */] in nsIVariant key);
-
-  // Success fires IDBTransactionEvent, result == key
-  nsIIDBRequest
-  modify(in nsIVariant value,
-         [optional /* null */] in nsIVariant key);
-
-  // Success fires IDBTransactionEvent, result == key
-  nsIIDBRequest
-  addOrModify(in nsIVariant value,
-              [optional /* null */] in nsIVariant key);
-
-  // Success fires IDBTransactionEvent, result == null
-  nsIIDBRequest
-  remove(in nsIVariant key);
-
-  // Success fires IDBTransactionEvent, result == IDBCursorRequest or
-  // IDBCursorPreloadedRequest if preload == true. result == null if no match.
-  [optional_argc]
-  nsIIDBRequest
-  openCursor([optional /* null */] in nsIIDBKeyRange range,
-             [optional /* NEXT */] in unsigned short direction,
-             [optional /* false */] in boolean preload);
-
-  // Success fires IDBTransactionEvent, result == IDBIndexRequest
-  nsIIDBRequest
-  createIndex(in AString name,
-              in AString keyPath,
-              [optional /* false */] in boolean unique);
-
-  // Returns object immediately
-  nsIIDBIndexRequest
-  index(in AString name);
-
-  // Success fires IDBTransactionEvent, result == null
-  nsIIDBRequest
-  removeIndex(in AString name);
-};
diff --git a/dom/indexedDB/nsIIDBTransaction.idl b/dom/indexedDB/nsIIDBTransaction.idl
index ead9dcf15300..84cc0629c050 100644
--- a/dom/indexedDB/nsIIDBTransaction.idl
+++ b/dom/indexedDB/nsIIDBTransaction.idl
@@ -40,7 +40,7 @@
 #include "nsISupports.idl"
 
 interface nsIDOMEventListener;
-interface nsIIDBObjectStoreRequest;
+interface nsIIDBObjectStore;
 interface nsIIDBRequest;
 interface nsIIDBDatabase;
 interface nsIDOMDOMStringList;
@@ -67,7 +67,7 @@ interface nsIIDBTransaction : nsISupports
 
   readonly attribute nsIDOMDOMStringList objectStoreNames;
 
-  nsIIDBObjectStoreRequest
+  nsIIDBObjectStore
   objectStore(in AString name);
 
   // Don't commit the transaction.
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index 6c22d954ab1d..febd230192aa 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -470,7 +470,6 @@ members = [
     'nsIIDBIndexRequest.*',
     'nsIIDBKeyRange.*',
     'nsIIDBObjectStore.*',
-    'nsIIDBObjectStoreRequest.*',
     'nsIIDBRequest.*',
 # Remove once XPIDL can handle jsvals
 #    'nsIIDBSuccessEvent.*',
@@ -478,9 +477,9 @@ members = [
     'nsIIDBTransactionEvent.*',
     'nsIIDBFactory.*',
 # Remove once XPIDL can handle jsvals
-    '-nsIIDBObjectStoreRequest.add',
-    '-nsIIDBObjectStoreRequest.modify',
-    '-nsIIDBObjectStoreRequest.addOrModify',
+    '-nsIIDBObjectStore.add',
+    '-nsIIDBObjectStore.modify',
+    '-nsIIDBObjectStore.addOrModify',
     '-nsIIDBCursorRequest.continue',
     '-nsIIDBCursorRequest.value',
     '-nsIIDBCursorRequest.update',

From 3d5256df47c686d760060f354a198d46b7e63ae0 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Mon, 28 Jun 2010 11:51:06 -0700
Subject: [PATCH 152/172] Bug 574811 - Rename IDBIndexRequest to IDBIndex
 Updating interface names per recent specification changes. r=bent

--HG--
rename : dom/indexedDB/IDBIndexRequest.cpp => dom/indexedDB/IDBIndex.cpp
rename : dom/indexedDB/IDBIndexRequest.h => dom/indexedDB/IDBIndex.h
---
 dom/base/nsDOMClassInfo.cpp                   |  7 +-
 dom/base/nsDOMClassInfoClasses.h              |  2 +-
 dom/indexedDB/IDBCursorRequest.cpp            |  6 +-
 dom/indexedDB/IDBCursorRequest.h              |  8 +-
 .../{IDBIndexRequest.cpp => IDBIndex.cpp}     | 85 +++++++++----------
 .../{IDBIndexRequest.h => IDBIndex.h}         | 19 ++---
 dom/indexedDB/IDBObjectStore.cpp              |  9 +-
 dom/indexedDB/Makefile.in                     |  5 +-
 dom/indexedDB/nsIIDBIndex.idl                 | 35 +++++++-
 dom/indexedDB/nsIIDBIndexRequest.idl          | 82 ------------------
 dom/indexedDB/nsIIDBObjectStore.idl           |  8 +-
 js/src/xpconnect/src/dom_quickstubs.qsconf    |  5 +-
 12 files changed, 108 insertions(+), 163 deletions(-)
 rename dom/indexedDB/{IDBIndexRequest.cpp => IDBIndex.cpp} (95%)
 rename dom/indexedDB/{IDBIndexRequest.h => IDBIndex.h} (85%)
 delete mode 100644 dom/indexedDB/nsIIDBIndexRequest.idl

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 077487ae503e..5aff37074a74 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -487,7 +487,7 @@ using namespace mozilla::dom;
 #include "mozilla/dom/indexedDB/IDBTransaction.h"
 #include "mozilla/dom/indexedDB/IDBCursorRequest.h"
 #include "mozilla/dom/indexedDB/IDBKeyRange.h"
-#include "mozilla/dom/indexedDB/IDBIndexRequest.h"
+#include "mozilla/dom/indexedDB/IDBIndex.h"
 
 static NS_DEFINE_CID(kDOMSOF_CID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
 
@@ -1438,7 +1438,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBKeyRange, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(IDBIndexRequest, nsDOMGenericSH,
+  NS_DEFINE_CLASSINFO_DATA(IDBIndex, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 };
 
@@ -3975,8 +3975,7 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIIDBKeyRange)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(IDBIndexRequest, nsIIDBIndexRequest)
-    DOM_CLASSINFO_MAP_ENTRY(nsIIDBIndexRequest)
+  DOM_CLASSINFO_MAP_BEGIN(IDBIndex, nsIIDBIndex)
     DOM_CLASSINFO_MAP_ENTRY(nsIIDBIndex)
   DOM_CLASSINFO_MAP_END
 
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index be9f8545f678..3f1a37496cb2 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -490,4 +490,4 @@ DOMCI_CLASS(IDBObjectStore)
 DOMCI_CLASS(IDBTransaction)
 DOMCI_CLASS(IDBCursorRequest)
 DOMCI_CLASS(IDBKeyRange)
-DOMCI_CLASS(IDBIndexRequest)
+DOMCI_CLASS(IDBIndex)
diff --git a/dom/indexedDB/IDBCursorRequest.cpp b/dom/indexedDB/IDBCursorRequest.cpp
index fc34b17d5b8b..dd3a48dd5d8b 100644
--- a/dom/indexedDB/IDBCursorRequest.cpp
+++ b/dom/indexedDB/IDBCursorRequest.cpp
@@ -57,7 +57,7 @@
 #include "AsyncConnectionHelper.h"
 #include "DatabaseInfo.h"
 #include "IDBEvents.h"
-#include "IDBIndexRequest.h"
+#include "IDBIndex.h"
 #include "IDBObjectStore.h"
 #include "IDBTransaction.h"
 #include "Savepoint.h"
@@ -170,7 +170,7 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
 already_AddRefed<IDBCursorRequest>
 IDBCursorRequest::Create(IDBRequest* aRequest,
                          IDBTransaction* aTransaction,
-                         IDBIndexRequest* aIndex,
+                         IDBIndex* aIndex,
                          PRUint16 aDirection,
                          nsTArray<KeyKeyPair>& aData)
 {
@@ -198,7 +198,7 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
 already_AddRefed<IDBCursorRequest>
 IDBCursorRequest::Create(IDBRequest* aRequest,
                          IDBTransaction* aTransaction,
-                         IDBIndexRequest* aIndex,
+                         IDBIndex* aIndex,
                          PRUint16 aDirection,
                          nsTArray<KeyValuePair>& aData)
 {
diff --git a/dom/indexedDB/IDBCursorRequest.h b/dom/indexedDB/IDBCursorRequest.h
index bc6de86dc437..7b368d41dd07 100644
--- a/dom/indexedDB/IDBCursorRequest.h
+++ b/dom/indexedDB/IDBCursorRequest.h
@@ -49,7 +49,7 @@ class nsIRunnable;
 
 BEGIN_INDEXEDDB_NAMESPACE
 
-class IDBIndexRequest;
+class IDBIndex;
 class IDBRequest;
 class IDBObjectStore;
 class IDBTransaction;
@@ -90,7 +90,7 @@ public:
   already_AddRefed<IDBCursorRequest>
   Create(IDBRequest* aRequest,
          IDBTransaction* aTransaction,
-         IDBIndexRequest* aIndex,
+         IDBIndex* aIndex,
          PRUint16 aDirection,
          nsTArray<KeyKeyPair>& aData);
 
@@ -98,7 +98,7 @@ public:
   already_AddRefed<IDBCursorRequest>
   Create(IDBRequest* aRequest,
          IDBTransaction* aTransaction,
-         IDBIndexRequest* aIndex,
+         IDBIndex* aIndex,
          PRUint16 aDirection,
          nsTArray<KeyValuePair>& aData);
 
@@ -122,7 +122,7 @@ protected:
   nsRefPtr<IDBRequest> mRequest;
   nsRefPtr<IDBTransaction> mTransaction;
   nsRefPtr<IDBObjectStore> mObjectStore;
-  nsRefPtr<IDBIndexRequest> mIndex;
+  nsRefPtr<IDBIndex> mIndex;
 
   PRUint16 mDirection;
 
diff --git a/dom/indexedDB/IDBIndexRequest.cpp b/dom/indexedDB/IDBIndex.cpp
similarity index 95%
rename from dom/indexedDB/IDBIndexRequest.cpp
rename to dom/indexedDB/IDBIndex.cpp
index 100037c853d1..304a20797f36 100644
--- a/dom/indexedDB/IDBIndexRequest.cpp
+++ b/dom/indexedDB/IDBIndex.cpp
@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 
-#include "IDBIndexRequest.h"
+#include "IDBIndex.h"
 
 #include "nsIIDBDatabaseException.h"
 #include "nsIIDBKeyRange.h"
@@ -150,7 +150,7 @@ class OpenCursorHelper : public AsyncConnectionHelper
 public:
   OpenCursorHelper(IDBTransaction* aTransaction,
                    IDBRequest* aRequest,
-                   IDBIndexRequest* aIndex,
+                   IDBIndex* aIndex,
                    PRInt64 aId,
                    bool aUnique,
                    bool aAutoIncrement,
@@ -170,7 +170,7 @@ public:
 
 private:
   // In-params.
-  nsRefPtr<IDBIndexRequest> mIndex;
+  nsRefPtr<IDBIndex> mIndex;
   const PRInt64 mId;
   const bool mUnique;
   const bool mAutoIncrement;
@@ -189,7 +189,7 @@ class OpenObjectCursorHelper : public AsyncConnectionHelper
 public:
   OpenObjectCursorHelper(IDBTransaction* aTransaction,
                          IDBRequest* aRequest,
-                         IDBIndexRequest* aIndex,
+                         IDBIndex* aIndex,
                          PRInt64 aId,
                          bool aUnique,
                          bool aAutoIncrement,
@@ -209,7 +209,7 @@ public:
 
 private:
   // In-params.
-  nsRefPtr<IDBIndexRequest> mIndex;
+  nsRefPtr<IDBIndex> mIndex;
   const PRInt64 mId;
   const bool mUnique;
   const bool mAutoIncrement;
@@ -226,15 +226,15 @@ private:
 } // anonymous namespace
 
 // static
-already_AddRefed<IDBIndexRequest>
-IDBIndexRequest::Create(IDBObjectStore* aObjectStore,
-                        const IndexInfo* aIndexInfo)
+already_AddRefed<IDBIndex>
+IDBIndex::Create(IDBObjectStore* aObjectStore,
+                 const IndexInfo* aIndexInfo)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(aObjectStore, "Null pointer!");
   NS_ASSERTION(aIndexInfo, "Null pointer!");
 
-  nsRefPtr<IDBIndexRequest> index = new IDBIndexRequest();
+  nsRefPtr<IDBIndex> index = new IDBIndex();
 
   index->mObjectStore = aObjectStore;
   index->mId = aIndexInfo->id;
@@ -246,7 +246,7 @@ IDBIndexRequest::Create(IDBObjectStore* aObjectStore,
   return index.forget();
 }
 
-IDBIndexRequest::IDBIndexRequest()
+IDBIndex::IDBIndex()
 : mId(LL_MININT),
   mUnique(false),
   mAutoIncrement(false)
@@ -254,25 +254,24 @@ IDBIndexRequest::IDBIndexRequest()
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 }
 
-IDBIndexRequest::~IDBIndexRequest()
+IDBIndex::~IDBIndex()
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 }
 
-NS_IMPL_ADDREF(IDBIndexRequest)
-NS_IMPL_RELEASE(IDBIndexRequest)
+NS_IMPL_ADDREF(IDBIndex)
+NS_IMPL_RELEASE(IDBIndex)
 
-NS_INTERFACE_MAP_BEGIN(IDBIndexRequest)
+NS_INTERFACE_MAP_BEGIN(IDBIndex)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, IDBRequest::Generator)
-  NS_INTERFACE_MAP_ENTRY(nsIIDBIndexRequest)
   NS_INTERFACE_MAP_ENTRY(nsIIDBIndex)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBIndexRequest)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBIndex)
 NS_INTERFACE_MAP_END
 
-DOMCI_DATA(IDBIndexRequest, IDBIndexRequest)
+DOMCI_DATA(IDBIndex, IDBIndex)
 
 NS_IMETHODIMP
-IDBIndexRequest::GetName(nsAString& aName)
+IDBIndex::GetName(nsAString& aName)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -281,7 +280,7 @@ IDBIndexRequest::GetName(nsAString& aName)
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::GetStoreName(nsAString& aStoreName)
+IDBIndex::GetStoreName(nsAString& aStoreName)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -289,7 +288,7 @@ IDBIndexRequest::GetStoreName(nsAString& aStoreName)
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::GetKeyPath(nsAString& aKeyPath)
+IDBIndex::GetKeyPath(nsAString& aKeyPath)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -298,7 +297,7 @@ IDBIndexRequest::GetKeyPath(nsAString& aKeyPath)
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::GetUnique(PRBool* aUnique)
+IDBIndex::GetUnique(PRBool* aUnique)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -307,8 +306,8 @@ IDBIndexRequest::GetUnique(PRBool* aUnique)
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::Get(nsIVariant* aKey,
-                     nsIIDBRequest** _retval)
+IDBIndex::Get(nsIVariant* aKey,
+              nsIIDBRequest** _retval)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -336,8 +335,8 @@ IDBIndexRequest::Get(nsIVariant* aKey,
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::GetObject(nsIVariant* aKey,
-                           nsIIDBRequest** _retval)
+IDBIndex::GetObject(nsIVariant* aKey,
+                    nsIIDBRequest** _retval)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -365,10 +364,10 @@ IDBIndexRequest::GetObject(nsIVariant* aKey,
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::GetAll(nsIVariant* aKey,
-                        PRUint32 aLimit,
-                        PRUint8 aOptionalArgCount,
-                        nsIIDBRequest** _retval)
+IDBIndex::GetAll(nsIVariant* aKey,
+                 PRUint32 aLimit,
+                 PRUint8 aOptionalArgCount,
+                 nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -398,10 +397,10 @@ IDBIndexRequest::GetAll(nsIVariant* aKey,
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::GetAllObjects(nsIVariant* aKey,
-                               PRUint32 aLimit,
-                               PRUint8 aOptionalArgCount,
-                               nsIIDBRequest** _retval)
+IDBIndex::GetAllObjects(nsIVariant* aKey,
+                        PRUint32 aLimit,
+                        PRUint8 aOptionalArgCount,
+                        nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -431,11 +430,11 @@ IDBIndexRequest::GetAllObjects(nsIVariant* aKey,
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::OpenCursor(nsIIDBKeyRange* aKeyRange,
-                            PRUint16 aDirection,
-                            PRBool aPreload,
-                            PRUint8 aOptionalArgCount,
-                            nsIIDBRequest** _retval)
+IDBIndex::OpenCursor(nsIIDBKeyRange* aKeyRange,
+                     PRUint16 aDirection,
+                     PRBool aPreload,
+                     PRUint8 aOptionalArgCount,
+                     nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -498,11 +497,11 @@ IDBIndexRequest::OpenCursor(nsIIDBKeyRange* aKeyRange,
 }
 
 NS_IMETHODIMP
-IDBIndexRequest::OpenObjectCursor(nsIIDBKeyRange* aKeyRange,
-                                  PRUint16 aDirection,
-                                  PRBool aPreload,
-                                  PRUint8 aOptionalArgCount,
-                                  nsIIDBRequest** _retval)
+IDBIndex::OpenObjectCursor(nsIIDBKeyRange* aKeyRange,
+                           PRUint16 aDirection,
+                           PRBool aPreload,
+                           PRUint8 aOptionalArgCount,
+                           nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
diff --git a/dom/indexedDB/IDBIndexRequest.h b/dom/indexedDB/IDBIndex.h
similarity index 85%
rename from dom/indexedDB/IDBIndexRequest.h
rename to dom/indexedDB/IDBIndex.h
index 623b7d4b2d11..bb66178c4dd1 100644
--- a/dom/indexedDB/IDBIndexRequest.h
+++ b/dom/indexedDB/IDBIndex.h
@@ -37,27 +37,26 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef mozilla_dom_indexeddb_idbindexrequest_h__
-#define mozilla_dom_indexeddb_idbindexrequest_h__
+#ifndef mozilla_dom_indexeddb_idbindex_h__
+#define mozilla_dom_indexeddb_idbindex_h__
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 
-#include "nsIIDBIndexRequest.h"
+#include "nsIIDBIndex.h"
 
 BEGIN_INDEXEDDB_NAMESPACE
 
 class IDBObjectStore;
 struct IndexInfo;
 
-class IDBIndexRequest : public IDBRequest::Generator,
-                        public nsIIDBIndexRequest
+class IDBIndex : public IDBRequest::Generator,
+                 public nsIIDBIndex
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIIDBINDEX
-  NS_DECL_NSIIDBINDEXREQUEST
 
-  static already_AddRefed<IDBIndexRequest>
+  static already_AddRefed<IDBIndex>
   Create(IDBObjectStore* aObjectStore,
          const IndexInfo* aIndexInfo);
 
@@ -67,8 +66,8 @@ public:
   }
 
 protected:
-  IDBIndexRequest();
-  ~IDBIndexRequest();
+  IDBIndex();
+  ~IDBIndex();
 
 private:
   nsRefPtr<IDBObjectStore> mObjectStore;
@@ -82,4 +81,4 @@ private:
 
 END_INDEXEDDB_NAMESPACE
 
-#endif // mozilla_dom_indexeddb_idbindexrequest_h__
+#endif // mozilla_dom_indexeddb_idbindex_h__
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index 479e71c8bd40..6f99b3dda902 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -45,7 +45,7 @@
 #include "IDBEvents.h"
 
 #include "IDBObjectStore.h"
-#include "IDBIndexRequest.h"
+#include "IDBIndex.h"
 
 #include "nsIIDBDatabaseException.h"
 #include "nsIJSContextStack.h"
@@ -1204,7 +1204,7 @@ IDBObjectStore::CreateIndex(const nsAString& aName,
 
 NS_IMETHODIMP
 IDBObjectStore::Index(const nsAString& aName,
-                      nsIIDBIndexRequest** _retval)
+                      nsIIDBIndex** _retval)
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
@@ -1232,8 +1232,7 @@ IDBObjectStore::Index(const nsAString& aName,
     return NS_ERROR_NOT_AVAILABLE;
   }
 
-  nsRefPtr<IDBIndexRequest> request =
-    IDBIndexRequest::Create(this, indexInfo);
+  nsRefPtr<IDBIndex> request = IDBIndex::Create(this, indexInfo);
 
   request.forget(_retval);
   return NS_OK;
@@ -1970,7 +1969,7 @@ CreateIndexHelper::GetSuccessResult(nsIWritableVariant* aResult)
   newInfo->unique = mUnique;
   newInfo->autoIncrement = mAutoIncrement;
 
-  nsCOMPtr<nsIIDBIndexRequest> result;
+  nsCOMPtr<nsIIDBIndex> result;
   nsresult rv = mObjectStore->Index(mName, getter_AddRefs(result));
   NS_ENSURE_SUCCESS(rv, nsIIDBDatabaseException::UNKNOWN_ERR);
 
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index 8dabfcb28fcd..001dbb6dbbdd 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -57,7 +57,7 @@ CPPSRCS = \
   IDBCursorRequest.cpp \
   IDBDatabase.cpp \
   IDBEvents.cpp \
-  IDBIndexRequest.cpp \
+  IDBIndex.cpp \
   IDBKeyRange.cpp \
   IDBObjectStore.cpp \
   IDBRequest.cpp \
@@ -71,7 +71,7 @@ EXPORTS_mozilla/dom/indexedDB = \
   IDBCursorRequest.h \
   IDBDatabase.h \
   IDBEvents.h \
-  IDBIndexRequest.h \
+  IDBIndex.h \
   IDBKeyRange.h \
   IDBObjectStore.h \
   IDBRequest.h \
@@ -99,7 +99,6 @@ XPIDLSRCS = \
   nsIIDBEvent.idl \
   nsIIDBErrorEvent.idl \
   nsIIDBIndex.idl \
-  nsIIDBIndexRequest.idl \
   nsIIDBKeyRange.idl \
   nsIIDBObjectStore.idl \
   nsIIDBRequest.idl \
diff --git a/dom/indexedDB/nsIIDBIndex.idl b/dom/indexedDB/nsIIDBIndex.idl
index db8015e4bf6f..709ff4aa55f2 100644
--- a/dom/indexedDB/nsIIDBIndex.idl
+++ b/dom/indexedDB/nsIIDBIndex.idl
@@ -39,12 +39,16 @@
 
 #include "nsISupports.idl"
 
+interface nsIIDBKeyRange;
+interface nsIIDBRequest;
+interface nsIVariant;
+
 /**
  * IDBIndex interface.  See
  * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBIndex for more
  * information.
  */
-[scriptable, uuid(7df8a6cc-d11a-48c9-9cd4-6d18a9df3c09)]
+[scriptable, uuid(2451a60c-349a-4b7c-bab4-93ba8f52abec)]
 interface nsIIDBIndex : nsISupports
 {
   readonly attribute DOMString name;
@@ -54,4 +58,33 @@ interface nsIIDBIndex : nsISupports
   readonly attribute DOMString keyPath;
 
   readonly attribute boolean unique;
+
+  nsIIDBRequest
+  get(in nsIVariant key);
+
+  nsIIDBRequest
+  getObject(in nsIVariant key);
+
+  [optional_argc]
+  nsIIDBRequest
+  getAll([optional /* null */] in nsIVariant key,
+         [optional /* unlimited */] in unsigned long limit);
+
+  [optional_argc]
+  nsIIDBRequest
+  getAllObjects([optional /* null */] in nsIVariant key,
+                [optional /* unlimited */] in unsigned long limit);
+
+  [optional_argc]
+  nsIIDBRequest
+  openCursor([optional /* null */] in nsIIDBKeyRange range,
+             [optional /* nsIIDBCursor::NEXT */] in unsigned short direction,
+             [optional /* false */] in boolean preload);
+
+  [optional_argc]
+  nsIIDBRequest
+  openObjectCursor([optional /* null */] in nsIIDBKeyRange range,
+                   [optional /* nsIIDBCursor::NEXT */]
+                   in unsigned short direction,
+                   [optional /* false */] in boolean preload);
 };
diff --git a/dom/indexedDB/nsIIDBIndexRequest.idl b/dom/indexedDB/nsIIDBIndexRequest.idl
deleted file mode 100644
index 90bc77d565aa..000000000000
--- a/dom/indexedDB/nsIIDBIndexRequest.idl
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* ***** 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 Indexed Database.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ben Turner <bent.mozilla@gmail.com>
- *
- * 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 "nsIIDBIndex.idl"
-
-interface nsIIDBKeyRange;
-interface nsIIDBRequest;
-interface nsIVariant;
-
-/**
- * IDBIndexRequest interface.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBIndexRequest for more
- * information.
- */
-[scriptable, uuid(8c21dfc3-62fa-470e-bc92-7d115b0fac97)]
-interface nsIIDBIndexRequest : nsIIDBIndex
-{
-  nsIIDBRequest
-  get(in nsIVariant key);
-
-  nsIIDBRequest
-  getObject(in nsIVariant key);
-
-  [optional_argc]
-  nsIIDBRequest
-  getAll([optional /* null */] in nsIVariant key,
-         [optional /* unlimited */] in unsigned long limit);
-
-  [optional_argc]
-  nsIIDBRequest
-  getAllObjects([optional /* null */] in nsIVariant key,
-                [optional /* unlimited */] in unsigned long limit);
-
-  [optional_argc]
-  nsIIDBRequest
-  openCursor([optional /* null */] in nsIIDBKeyRange range,
-             [optional /* nsIIDBCursor::NEXT */] in unsigned short direction,
-             [optional /* false */] in boolean preload);
-
-  [optional_argc]
-  nsIIDBRequest
-  openObjectCursor([optional /* null */] in nsIIDBKeyRange range,
-                   [optional /* nsIIDBCursor::NEXT */]
-                   in unsigned short direction,
-                   [optional /* false */] in boolean preload);
-};
diff --git a/dom/indexedDB/nsIIDBObjectStore.idl b/dom/indexedDB/nsIIDBObjectStore.idl
index 9de7bb4c0b35..760f41e7ac57 100644
--- a/dom/indexedDB/nsIIDBObjectStore.idl
+++ b/dom/indexedDB/nsIIDBObjectStore.idl
@@ -39,7 +39,7 @@
 
 #include "nsISupports.idl"
 
-interface nsIIDBIndexRequest;
+interface nsIIDBIndex;
 interface nsIIDBKeyRange;
 interface nsIIDBRequest;
 interface nsIVariant;
@@ -50,7 +50,7 @@ interface nsIDOMDOMStringList;
  * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-nsIIDBObjectStore
  * for more information.
  */
-[scriptable, uuid(1168fc42-ac08-4720-822c-da820f00e15e)]
+[scriptable, uuid(9cb63602-a52f-4d21-b802-e7165143f83d)]
 interface nsIIDBObjectStore : nsISupports
 {
   readonly attribute DOMString name;
@@ -96,14 +96,14 @@ interface nsIIDBObjectStore : nsISupports
              [optional /* NEXT */] in unsigned short direction,
              [optional /* false */] in boolean preload);
 
-  // Success fires IDBTransactionEvent, result == IDBIndexRequest
+  // Success fires IDBTransactionEvent, result == IDBIndex
   nsIIDBRequest
   createIndex(in AString name,
               in AString keyPath,
               [optional /* false */] in boolean unique);
 
   // Returns object immediately
-  nsIIDBIndexRequest
+  nsIIDBIndex
   index(in AString name);
 
   // Success fires IDBTransactionEvent, result == null
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index febd230192aa..d473af0f84be 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -467,7 +467,6 @@ members = [
     'nsIIDBEvent.*',
     'nsIIDBErrorEvent.*',
     'nsIIDBIndex.*',
-    'nsIIDBIndexRequest.*',
     'nsIIDBKeyRange.*',
     'nsIIDBObjectStore.*',
     'nsIIDBRequest.*',
@@ -483,8 +482,8 @@ members = [
     '-nsIIDBCursorRequest.continue',
     '-nsIIDBCursorRequest.value',
     '-nsIIDBCursorRequest.update',
-    '-nsIIDBIndexRequest.openCursor',
-    '-nsIIDBIndexRequest.openObjectCursor'
+    '-nsIIDBIndex.openCursor',
+    '-nsIIDBIndex.openObjectCursor'
     ]
 
 # Most interfaces can be found by searching the includePath; to find

From f871937b41e93fd3d73862018ed8b05907ab39f9 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Mon, 28 Jun 2010 11:51:06 -0700
Subject: [PATCH 153/172] Bug 574811 - Rename IDBCursorRequest to IDBCursor
 Updating interface names per recent specification changes. r=bent

--HG--
rename : dom/indexedDB/IDBCursorRequest.cpp => dom/indexedDB/IDBCursor.cpp
rename : dom/indexedDB/IDBCursorRequest.h => dom/indexedDB/IDBCursor.h
---
 dom/base/nsDOMClassInfo.cpp                   |   7 +-
 dom/base/nsDOMClassInfoClasses.h              |   2 +-
 .../{IDBCursorRequest.cpp => IDBCursor.cpp}   | 105 +++++++++---------
 .../{IDBCursorRequest.h => IDBCursor.h}       |  25 ++---
 dom/indexedDB/IDBIndex.cpp                    |  12 +-
 dom/indexedDB/IDBObjectStore.cpp              |   7 +-
 dom/indexedDB/IDBTransaction.cpp              |   2 +-
 dom/indexedDB/Makefile.in                     |   5 +-
 dom/indexedDB/nsIIDBCursor.idl                |  25 ++++-
 dom/indexedDB/nsIIDBCursorRequest.idl         |  72 ------------
 dom/indexedDB/nsIIDBObjectStore.idl           |   2 +-
 js/src/xpconnect/src/dom_quickstubs.qsconf    |   7 +-
 12 files changed, 107 insertions(+), 164 deletions(-)
 rename dom/indexedDB/{IDBCursorRequest.cpp => IDBCursor.cpp} (89%)
 rename dom/indexedDB/{IDBCursorRequest.h => IDBCursor.h} (86%)
 delete mode 100644 dom/indexedDB/nsIIDBCursorRequest.idl

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 5aff37074a74..d2425ea5b7a3 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -485,7 +485,7 @@ using namespace mozilla::dom;
 #include "mozilla/dom/indexedDB/IDBEvents.h"
 #include "mozilla/dom/indexedDB/IDBObjectStore.h"
 #include "mozilla/dom/indexedDB/IDBTransaction.h"
-#include "mozilla/dom/indexedDB/IDBCursorRequest.h"
+#include "mozilla/dom/indexedDB/IDBCursor.h"
 #include "mozilla/dom/indexedDB/IDBKeyRange.h"
 #include "mozilla/dom/indexedDB/IDBIndex.h"
 
@@ -1434,7 +1434,7 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBTransaction, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(IDBCursorRequest, nsDOMGenericSH,
+  NS_DEFINE_CLASSINFO_DATA(IDBCursor, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(IDBKeyRange, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -3966,8 +3966,7 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN(IDBCursorRequest, nsIIDBCursorRequest)
-    DOM_CLASSINFO_MAP_ENTRY(nsIIDBCursorRequest)
+  DOM_CLASSINFO_MAP_BEGIN(IDBCursor, nsIIDBCursor)
     DOM_CLASSINFO_MAP_ENTRY(nsIIDBCursor)
   DOM_CLASSINFO_MAP_END
 
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 3f1a37496cb2..5cc1a55af78f 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -488,6 +488,6 @@ DOMCI_CLASS(IDBSuccessEvent)
 DOMCI_CLASS(IDBTransactionEvent)
 DOMCI_CLASS(IDBObjectStore)
 DOMCI_CLASS(IDBTransaction)
-DOMCI_CLASS(IDBCursorRequest)
+DOMCI_CLASS(IDBCursor)
 DOMCI_CLASS(IDBKeyRange)
 DOMCI_CLASS(IDBIndex)
diff --git a/dom/indexedDB/IDBCursorRequest.cpp b/dom/indexedDB/IDBCursor.cpp
similarity index 89%
rename from dom/indexedDB/IDBCursorRequest.cpp
rename to dom/indexedDB/IDBCursor.cpp
index dd3a48dd5d8b..e23d63abd1f2 100644
--- a/dom/indexedDB/IDBCursorRequest.cpp
+++ b/dom/indexedDB/IDBCursor.cpp
@@ -41,7 +41,7 @@
 #include "jscntxt.h"
 #include "jsapi.h"
 
-#include "IDBCursorRequest.h"
+#include "IDBCursor.h"
 
 #include "nsIIDBDatabaseException.h"
 #include "nsIVariant.h"
@@ -127,30 +127,30 @@ class ContinueRunnable : public nsRunnable
 public:
   NS_DECL_NSIRUNNABLE
 
-  ContinueRunnable(IDBCursorRequest* aCursor,
+  ContinueRunnable(IDBCursor* aCursor,
                    const Key& aKey)
   : mCursor(aCursor), mKey(aKey)
   { }
 
 private:
-  nsRefPtr<IDBCursorRequest> mCursor;
+  nsRefPtr<IDBCursor> mCursor;
   const Key mKey;
 };
 
 END_INDEXEDDB_NAMESPACE
 
 // static
-already_AddRefed<IDBCursorRequest>
-IDBCursorRequest::Create(IDBRequest* aRequest,
-                         IDBTransaction* aTransaction,
-                         IDBObjectStore* aObjectStore,
-                         PRUint16 aDirection,
-                         nsTArray<KeyValuePair>& aData)
+already_AddRefed<IDBCursor>
+IDBCursor::Create(IDBRequest* aRequest,
+                  IDBTransaction* aTransaction,
+                  IDBObjectStore* aObjectStore,
+                  PRUint16 aDirection,
+                  nsTArray<KeyValuePair>& aData)
 {
   NS_ASSERTION(aObjectStore, "Null pointer!");
 
-  nsRefPtr<IDBCursorRequest> cursor =
-    IDBCursorRequest::CreateCommon(aRequest, aTransaction, aDirection);
+  nsRefPtr<IDBCursor> cursor =
+    IDBCursor::CreateCommon(aRequest, aTransaction, aDirection);
 
   cursor->mObjectStore = aObjectStore;
 
@@ -167,17 +167,17 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
 }
 
 // static
-already_AddRefed<IDBCursorRequest>
-IDBCursorRequest::Create(IDBRequest* aRequest,
-                         IDBTransaction* aTransaction,
-                         IDBIndex* aIndex,
-                         PRUint16 aDirection,
-                         nsTArray<KeyKeyPair>& aData)
+already_AddRefed<IDBCursor>
+IDBCursor::Create(IDBRequest* aRequest,
+                  IDBTransaction* aTransaction,
+                  IDBIndex* aIndex,
+                  PRUint16 aDirection,
+                  nsTArray<KeyKeyPair>& aData)
 {
   NS_ASSERTION(aIndex, "Null pointer!");
 
-  nsRefPtr<IDBCursorRequest> cursor =
-    IDBCursorRequest::CreateCommon(aRequest, aTransaction, aDirection);
+  nsRefPtr<IDBCursor> cursor =
+    IDBCursor::CreateCommon(aRequest, aTransaction, aDirection);
 
   cursor->mObjectStore = aIndex->ObjectStore();
   cursor->mIndex = aIndex;
@@ -195,17 +195,17 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
 }
 
 // static
-already_AddRefed<IDBCursorRequest>
-IDBCursorRequest::Create(IDBRequest* aRequest,
-                         IDBTransaction* aTransaction,
-                         IDBIndex* aIndex,
-                         PRUint16 aDirection,
-                         nsTArray<KeyValuePair>& aData)
+already_AddRefed<IDBCursor>
+IDBCursor::Create(IDBRequest* aRequest,
+                  IDBTransaction* aTransaction,
+                  IDBIndex* aIndex,
+                  PRUint16 aDirection,
+                  nsTArray<KeyValuePair>& aData)
 {
   NS_ASSERTION(aIndex, "Null pointer!");
 
-  nsRefPtr<IDBCursorRequest> cursor =
-    IDBCursorRequest::CreateCommon(aRequest, aTransaction, aDirection);
+  nsRefPtr<IDBCursor> cursor =
+    IDBCursor::CreateCommon(aRequest, aTransaction, aDirection);
 
   cursor->mObjectStore = aIndex->ObjectStore();
   cursor->mIndex = aIndex;
@@ -223,16 +223,16 @@ IDBCursorRequest::Create(IDBRequest* aRequest,
 }
 
 // static
-already_AddRefed<IDBCursorRequest>
-IDBCursorRequest::CreateCommon(IDBRequest* aRequest,
-                               IDBTransaction* aTransaction,
-                               PRUint16 aDirection)
+already_AddRefed<IDBCursor>
+IDBCursor::CreateCommon(IDBRequest* aRequest,
+                        IDBTransaction* aTransaction,
+                        PRUint16 aDirection)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(aRequest, "Null pointer!");
   NS_ASSERTION(aTransaction, "Null pointer!");
 
-  nsRefPtr<IDBCursorRequest> cursor(new IDBCursorRequest());
+  nsRefPtr<IDBCursor> cursor(new IDBCursor());
   cursor->mRequest = aRequest;
   cursor->mTransaction = aTransaction;
   cursor->mDirection = aDirection;
@@ -240,7 +240,7 @@ IDBCursorRequest::CreateCommon(IDBRequest* aRequest,
   return cursor.forget();
 }
 
-IDBCursorRequest::IDBCursorRequest()
+IDBCursor::IDBCursor()
 : mDirection(nsIIDBCursor::NEXT),
   mCachedValue(JSVAL_VOID),
   mHaveCachedValue(false),
@@ -252,7 +252,7 @@ IDBCursorRequest::IDBCursorRequest()
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 }
 
-IDBCursorRequest::~IDBCursorRequest()
+IDBCursor::~IDBCursor()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -261,20 +261,19 @@ IDBCursorRequest::~IDBCursorRequest()
   }
 }
 
-NS_IMPL_ADDREF(IDBCursorRequest)
-NS_IMPL_RELEASE(IDBCursorRequest)
+NS_IMPL_ADDREF(IDBCursor)
+NS_IMPL_RELEASE(IDBCursor)
 
-NS_INTERFACE_MAP_BEGIN(IDBCursorRequest)
+NS_INTERFACE_MAP_BEGIN(IDBCursor)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, IDBRequest::Generator)
-  NS_INTERFACE_MAP_ENTRY(nsIIDBCursorRequest)
   NS_INTERFACE_MAP_ENTRY(nsIIDBCursor)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBCursorRequest)
+  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(IDBCursor)
 NS_INTERFACE_MAP_END
 
-DOMCI_DATA(IDBCursorRequest, IDBCursorRequest)
+DOMCI_DATA(IDBCursor, IDBCursor)
 
 NS_IMETHODIMP
-IDBCursorRequest::GetDirection(PRUint16* aDirection)
+IDBCursor::GetDirection(PRUint16* aDirection)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -283,7 +282,7 @@ IDBCursorRequest::GetDirection(PRUint16* aDirection)
 }
 
 NS_IMETHODIMP
-IDBCursorRequest::GetKey(nsIVariant** aKey)
+IDBCursor::GetKey(nsIVariant** aKey)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -325,7 +324,7 @@ IDBCursorRequest::GetKey(nsIVariant** aKey)
 }
 
 NS_IMETHODIMP
-IDBCursorRequest::GetValue(nsIVariant** aValue)
+IDBCursor::GetValue(nsIVariant** aValue)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -386,7 +385,7 @@ IDBCursorRequest::GetValue(nsIVariant** aValue)
       JSRuntime* rt = JS_GetRuntime(cx);
 
       JSBool ok = JS_AddNamedRootRT(rt, &mCachedValue,
-                                   "IDBCursorRequest::mCachedValue");
+                                   "IDBCursor::mCachedValue");
       NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
 
       mJSRuntime = rt;
@@ -405,9 +404,9 @@ IDBCursorRequest::GetValue(nsIVariant** aValue)
 }
 
 NS_IMETHODIMP
-IDBCursorRequest::Continue(nsIVariant* aKey,
-                           PRUint8 aOptionalArgCount,
-                           PRBool* _retval)
+IDBCursor::Continue(nsIVariant* aKey,
+                    PRUint8 aOptionalArgCount,
+                    PRBool* _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -449,8 +448,8 @@ IDBCursorRequest::Continue(nsIVariant* aKey,
 }
 
 NS_IMETHODIMP
-IDBCursorRequest::Update(nsIVariant* aValue,
-                         nsIIDBRequest** _retval)
+IDBCursor::Update(nsIVariant* aValue,
+                  nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -596,7 +595,7 @@ IDBCursorRequest::Update(nsIVariant* aValue,
 }
 
 NS_IMETHODIMP
-IDBCursorRequest::Remove(nsIIDBRequest** _retval)
+IDBCursor::Remove(nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
@@ -771,7 +770,7 @@ ContinueRunnable::Run()
   mCursor->mHaveCachedValue = false;
   mCursor->mContinueCalled = false;
 
-  if (mCursor->mType == IDBCursorRequest::INDEX) {
+  if (mCursor->mType == IDBCursor::INDEX) {
     mCursor->mKeyData.RemoveElementAt(mCursor->mDataIndex);
   }
   else {
@@ -788,7 +787,7 @@ ContinueRunnable::Run()
     return NS_ERROR_FAILURE;
   }
 
-  PRBool empty = mCursor->mType == IDBCursorRequest::INDEX ?
+  PRBool empty = mCursor->mType == IDBCursor::INDEX ?
                  mCursor->mKeyData.IsEmpty() :
                  mCursor->mData.IsEmpty();
 
@@ -806,7 +805,7 @@ ContinueRunnable::Run()
       // Skip ahead to our next key match.
       PRInt32 index = PRInt32(mCursor->mDataIndex);
 
-      if (mCursor->mType == IDBCursorRequest::INDEX) {
+      if (mCursor->mType == IDBCursor::INDEX) {
         while (index >= 0) {
           const Key& key = mCursor->mKeyData[index].key;
           if (mKey == key) {
diff --git a/dom/indexedDB/IDBCursorRequest.h b/dom/indexedDB/IDBCursor.h
similarity index 86%
rename from dom/indexedDB/IDBCursorRequest.h
rename to dom/indexedDB/IDBCursor.h
index 7b368d41dd07..9a877f5811cf 100644
--- a/dom/indexedDB/IDBCursorRequest.h
+++ b/dom/indexedDB/IDBCursor.h
@@ -37,11 +37,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef mozilla_dom_indexeddb_idbcursorrequest_h__
-#define mozilla_dom_indexeddb_idbcursorrequest_h__
+#ifndef mozilla_dom_indexeddb_idbcursor_h__
+#define mozilla_dom_indexeddb_idbcursor_h__
 
 #include "mozilla/dom/indexedDB/IDBObjectStore.h"
-#include "nsIIDBCursorRequest.h"
+#include "nsIIDBCursor.h"
 
 #include "jsapi.h"
 
@@ -68,18 +68,17 @@ struct KeyKeyPair
 
 class ContinueRunnable;
 
-class IDBCursorRequest : public IDBRequest::Generator,
-                         public nsIIDBCursorRequest
+class IDBCursor : public IDBRequest::Generator,
+                  public nsIIDBCursor
 {
   friend class ContinueRunnable;
 
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIIDBCURSOR
-  NS_DECL_NSIIDBCURSORREQUEST
 
   static
-  already_AddRefed<IDBCursorRequest>
+  already_AddRefed<IDBCursor>
   Create(IDBRequest* aRequest,
          IDBTransaction* aTransaction,
          IDBObjectStore* aObjectStore,
@@ -87,7 +86,7 @@ public:
          nsTArray<KeyValuePair>& aData);
 
   static
-  already_AddRefed<IDBCursorRequest>
+  already_AddRefed<IDBCursor>
   Create(IDBRequest* aRequest,
          IDBTransaction* aTransaction,
          IDBIndex* aIndex,
@@ -95,7 +94,7 @@ public:
          nsTArray<KeyKeyPair>& aData);
 
   static
-  already_AddRefed<IDBCursorRequest>
+  already_AddRefed<IDBCursor>
   Create(IDBRequest* aRequest,
          IDBTransaction* aTransaction,
          IDBIndex* aIndex,
@@ -110,11 +109,11 @@ public:
   };
 
 protected:
-  IDBCursorRequest();
-  ~IDBCursorRequest();
+  IDBCursor();
+  ~IDBCursor();
 
   static
-  already_AddRefed<IDBCursorRequest>
+  already_AddRefed<IDBCursor>
   CreateCommon(IDBRequest* aRequest,
                IDBTransaction* aTransaction,
                PRUint16 aDirection);
@@ -141,4 +140,4 @@ protected:
 
 END_INDEXEDDB_NAMESPACE
 
-#endif // mozilla_dom_indexeddb_idbcursorrequest_h__
+#endif // mozilla_dom_indexeddb_idbcursor_h__
diff --git a/dom/indexedDB/IDBIndex.cpp b/dom/indexedDB/IDBIndex.cpp
index 304a20797f36..c6d9f6c38b52 100644
--- a/dom/indexedDB/IDBIndex.cpp
+++ b/dom/indexedDB/IDBIndex.cpp
@@ -48,7 +48,7 @@
 #include "mozilla/storage.h"
 
 #include "AsyncConnectionHelper.h"
-#include "IDBCursorRequest.h"
+#include "IDBCursor.h"
 #include "IDBEvents.h"
 #include "IDBObjectStore.h"
 #include "IDBTransaction.h"
@@ -1139,9 +1139,8 @@ OpenCursorHelper::GetSuccessResult(nsIWritableVariant* aResult)
     return OK;
   }
 
-  nsRefPtr<IDBCursorRequest> cursor =
-    IDBCursorRequest::Create(mRequest, mTransaction, mIndex, mDirection,
-                             mData);
+  nsRefPtr<IDBCursor> cursor =
+    IDBCursor::Create(mRequest, mTransaction, mIndex, mDirection, mData);
   NS_ENSURE_TRUE(cursor, nsIIDBDatabaseException::UNKNOWN_ERR);
 
   aResult->SetAsISupports(static_cast<IDBRequest::Generator*>(cursor));
@@ -1341,9 +1340,8 @@ OpenObjectCursorHelper::GetSuccessResult(nsIWritableVariant* aResult)
     return OK;
   }
 
-  nsRefPtr<IDBCursorRequest> cursor =
-    IDBCursorRequest::Create(mRequest, mTransaction, mIndex, mDirection,
-                             mData);
+  nsRefPtr<IDBCursor> cursor =
+    IDBCursor::Create(mRequest, mTransaction, mIndex, mDirection, mData);
   NS_ENSURE_TRUE(cursor, nsIIDBDatabaseException::UNKNOWN_ERR);
 
   aResult->SetAsISupports(static_cast<IDBRequest::Generator*>(cursor));
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index 6f99b3dda902..7216d023c02f 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -59,7 +59,7 @@
 #include "mozilla/storage.h"
 
 #include "AsyncConnectionHelper.h"
-#include "IDBCursorRequest.h"
+#include "IDBCursor.h"
 #include "IDBKeyRange.h"
 #include "IDBTransaction.h"
 #include "DatabaseInfo.h"
@@ -1784,9 +1784,8 @@ OpenCursorHelper::GetSuccessResult(nsIWritableVariant* aResult)
     return OK;
   }
 
-  nsRefPtr<IDBCursorRequest> cursor =
-    IDBCursorRequest::Create(mRequest, mTransaction, mObjectStore, mDirection,
-                             mData);
+  nsRefPtr<IDBCursor> cursor =
+    IDBCursor::Create(mRequest, mTransaction, mObjectStore, mDirection, mData);
   NS_ENSURE_TRUE(cursor, nsIIDBDatabaseException::UNKNOWN_ERR);
 
   aResult->SetAsISupports(static_cast<IDBRequest::Generator*>(cursor));
diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp
index 302384cfe744..5b278408e1a4 100644
--- a/dom/indexedDB/IDBTransaction.cpp
+++ b/dom/indexedDB/IDBTransaction.cpp
@@ -45,7 +45,7 @@
 #include "nsThreadUtils.h"
 
 #include "IDBEvents.h"
-#include "IDBCursorRequest.h"
+#include "IDBCursor.h"
 #include "IDBObjectStore.h"
 #include "IDBFactory.h"
 #include "DatabaseInfo.h"
diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in
index 001dbb6dbbdd..815e9435b34a 100644
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -54,7 +54,7 @@ EXPORTS_NAMESPACES = mozilla/dom/indexedDB
 CPPSRCS = \
   AsyncConnectionHelper.cpp \
   DatabaseInfo.cpp \
-  IDBCursorRequest.cpp \
+  IDBCursor.cpp \
   IDBDatabase.cpp \
   IDBEvents.cpp \
   IDBIndex.cpp \
@@ -68,7 +68,7 @@ CPPSRCS = \
   $(NULL)
 
 EXPORTS_mozilla/dom/indexedDB = \
-  IDBCursorRequest.h \
+  IDBCursor.h \
   IDBDatabase.h \
   IDBEvents.h \
   IDBIndex.h \
@@ -93,7 +93,6 @@ DEFINES += -D_IMPL_NS_LAYOUT
 # js/src/xpconnect/src/dom_quickstubs.qsconf.
 XPIDLSRCS = \
   nsIIDBCursor.idl \
-  nsIIDBCursorRequest.idl \
   nsIIDBDatabase.idl \
   nsIIDBDatabaseException.idl \
   nsIIDBEvent.idl \
diff --git a/dom/indexedDB/nsIIDBCursor.idl b/dom/indexedDB/nsIIDBCursor.idl
index d8894b1b0bdc..7a77666ab51a 100644
--- a/dom/indexedDB/nsIIDBCursor.idl
+++ b/dom/indexedDB/nsIIDBCursor.idl
@@ -39,12 +39,15 @@
 
 #include "nsISupports.idl"
 
+interface nsIIDBRequest;
+interface nsIVariant;
+
 /**
  * IDBCursor interface.  See
  * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBCursor for more
  * information.
  */
-[scriptable, uuid(06b5980f-e5e1-433c-9df4-5ecef0238715)]
+[scriptable, uuid(f0954b7d-b639-49ac-ad4b-b5e072fd0cc5)]
 interface nsIIDBCursor : nsISupports
 {
   const unsigned short NEXT = 0;
@@ -52,4 +55,24 @@ interface nsIIDBCursor : nsISupports
   const unsigned short PREV = 2;
   const unsigned short PREV_NO_DUPLICATE = 3;
   readonly attribute unsigned short direction;
+
+  readonly attribute nsIVariant key;
+
+  readonly attribute nsIVariant value;
+
+  // Returns true always for non-preloaded cursors. Calling continue means that
+  // the same onsuccess function will be called again with the new key/value
+  // (or null if no more matches).
+  //
+  // For preloaded cursors returns true if key/value have been set to new
+  // values. If false then no more matches are available and getting the key,
+  // value property will throw, as will calling update() and remove().
+  [optional_argc]
+  boolean continue([optional /* null */] in nsIVariant key);
+
+  // Success fires IDBTransactionEvent, result == key
+  nsIIDBRequest update(in nsIVariant value);
+
+  // Success fires IDBTransactionEvent, result == null
+  nsIIDBRequest remove();
 };
diff --git a/dom/indexedDB/nsIIDBCursorRequest.idl b/dom/indexedDB/nsIIDBCursorRequest.idl
deleted file mode 100644
index 14aeddc35ed0..000000000000
--- a/dom/indexedDB/nsIIDBCursorRequest.idl
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* ***** 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 Indexed Database.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ben Turner <bent.mozilla@gmail.com>
- *
- * 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 "nsIIDBCursor.idl"
-
-interface nsIIDBRequest;
-interface nsIVariant;
-
-/**
- * IDBCursorRequest interface.  See
- * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBCursorRequest for more
- * information.
- */
-[scriptable, uuid(12ba5905-de6b-40f9-8c97-aec5f9dc706c)]
-interface nsIIDBCursorRequest : nsIIDBCursor
-{
-  readonly attribute nsIVariant key;
-
-  readonly attribute nsIVariant value;
-
-  // Returns true always for non-preloaded cursors. Calling continue means that
-  // the same onsuccess function will be called again with the new key/value
-  // (or null if no more matches).
-  //
-  // For preloaded cursors returns true if key/value have been set to new
-  // values. If false then no more matches are available and getting the key,
-  // value property will throw, as will calling update() and remove().
-  [optional_argc]
-  boolean continue([optional /* null */] in nsIVariant key);
-
-  // Success fires IDBTransactionEvent, result == key
-  nsIIDBRequest update(in nsIVariant value);
-
-  // Success fires IDBTransactionEvent, result == null
-  nsIIDBRequest remove();
-};
diff --git a/dom/indexedDB/nsIIDBObjectStore.idl b/dom/indexedDB/nsIIDBObjectStore.idl
index 760f41e7ac57..c56a59260890 100644
--- a/dom/indexedDB/nsIIDBObjectStore.idl
+++ b/dom/indexedDB/nsIIDBObjectStore.idl
@@ -88,7 +88,7 @@ interface nsIIDBObjectStore : nsISupports
   nsIIDBRequest
   remove(in nsIVariant key);
 
-  // Success fires IDBTransactionEvent, result == IDBCursorRequest or
+  // Success fires IDBTransactionEvent, result == IDBCursor or
   // IDBCursorPreloadedRequest if preload == true. result == null if no match.
   [optional_argc]
   nsIIDBRequest
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index d473af0f84be..b9a9e4773134 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -461,7 +461,6 @@ members = [
 
     # dom/indexedDB
     'nsIIDBCursor.*',
-    'nsIIDBCursorRequest.*',
     'nsIIDBDatabase.*',
     'nsIIDBDatabaseException.*',
     'nsIIDBEvent.*',
@@ -479,9 +478,9 @@ members = [
     '-nsIIDBObjectStore.add',
     '-nsIIDBObjectStore.modify',
     '-nsIIDBObjectStore.addOrModify',
-    '-nsIIDBCursorRequest.continue',
-    '-nsIIDBCursorRequest.value',
-    '-nsIIDBCursorRequest.update',
+    '-nsIIDBCursor.continue',
+    '-nsIIDBCursor.value',
+    '-nsIIDBCursor.update',
     '-nsIIDBIndex.openCursor',
     '-nsIIDBIndex.openObjectCursor'
     ]

From e3768a07c3d30627432ed856b91d1bceff4b921c Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 28 Jun 2010 15:28:45 -0400
Subject: [PATCH 154/172] Backed out changeset c9b9f32a152b to fix oranges

---
 docshell/base/nsDocShell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 511d6680d730..bc105e2c5012 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11168,7 +11168,7 @@ unsigned long nsDocShell::gNumberOfDocShells = 0;
 #endif
 
 NS_IMETHODIMP
-nsDocShell::GetCanExecuteScripts(PRBool *aResult)
+nsDocShell::GetCanExecuteScripts(PRBool *aResult, PRBool *aContinueLooking)
 {
   NS_ENSURE_ARG_POINTER(aResult);
   *aResult = PR_FALSE; // disallow by default

From c06468921a6ca6e17fbe8bd9ff3c9e8bedb87763 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 28 Jun 2010 15:29:30 -0400
Subject: [PATCH 155/172] Backed out changeset d1cbe16de6bf to fix oranges

---
 caps/src/nsScriptSecurityManager.cpp          | 28 +++++-
 content/html/document/test/Makefile.in        |  1 +
 .../html/document/test/test_bug386495.html    | 42 ++++++++
 docshell/base/nsDocShell.cpp                  | 94 ------------------
 docshell/base/nsIDocShell.idl                 | 12 +--
 editor/composer/public/nsIEditingSession.idl  |  7 +-
 editor/composer/src/nsEditingSession.cpp      |  8 --
 editor/composer/test/Makefile.in              |  1 -
 editor/composer/test/test_bug519928.html      | 96 -------------------
 9 files changed, 70 insertions(+), 219 deletions(-)
 create mode 100644 content/html/document/test/test_bug386495.html
 delete mode 100644 editor/composer/test/test_bug519928.html

diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp
index b4acf1c837e3..9ecc293a211d 100644
--- a/caps/src/nsScriptSecurityManager.cpp
+++ b/caps/src/nsScriptSecurityManager.cpp
@@ -1778,9 +1778,31 @@ nsScriptSecurityManager::CanExecuteScripts(JSContext* cx,
         docshell = window->GetDocShell();
     }
 
-    rv = docshell->GetCanExecuteScripts(result);
-    if (NS_FAILED(rv)) return rv;
-    if (!*result) return NS_OK;
+    nsCOMPtr<nsIDocShellTreeItem> globalObjTreeItem =
+        do_QueryInterface(docshell);
+
+    if (globalObjTreeItem) 
+    {
+        nsCOMPtr<nsIDocShellTreeItem> treeItem(globalObjTreeItem);
+        nsCOMPtr<nsIDocShellTreeItem> parentItem;
+
+        // Walk up the docshell tree to see if any containing docshell disallows scripts
+        do
+        {
+            rv = docshell->GetAllowJavascript(result);
+            if (NS_FAILED(rv)) return rv;
+            if (!*result)
+                return NS_OK; // Do not run scripts
+            treeItem->GetParent(getter_AddRefs(parentItem));
+            treeItem.swap(parentItem);
+            docshell = do_QueryInterface(treeItem);
+#ifdef DEBUG
+            if (treeItem && !docshell) {
+              NS_ERROR("cannot get a docshell from a treeItem!");
+            }
+#endif // DEBUG
+        } while (treeItem && docshell);
+    }
 
     // OK, the docshell doesn't have script execution explicitly disabled.
     // Check whether our URI is an "about:" URI that allows scripts.  If it is,
diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in
index c20474612681..9706620aaf89 100644
--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -65,6 +65,7 @@ _TEST_FILES = 	test_bug1682.html \
 		test_bug369370.html \
 		bug369370-popup.png \
 		test_bug380383.html \
+		test_bug386495.html \
 		test_bug391777.html \
 		test_bug402680.html \
 		test_bug403868.html \
diff --git a/content/html/document/test/test_bug386495.html b/content/html/document/test/test_bug386495.html
new file mode 100644
index 000000000000..a700c9322f8a
--- /dev/null
+++ b/content/html/document/test/test_bug386495.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=386495
+-->
+<head>
+  <title>Test for Bug 386495</title>
+  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=386495">Mozilla Bug 386495</a>
+<p id="display"></p>
+<div id="content">
+  <iframe id="testIframe"></iframe>
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+/** Test for Bug 386495 **/
+
+function finishTest() {
+  is(document.getElementById("testIframe").contentWindow.timeoutFired, false, "Timeout shouldn't fire.");
+  SimpleTest.finish();
+}
+
+function testContentEditable() {
+  document.getElementById('testIframe').style.display = 'block';
+  document.getElementById('testIframe').contentWindow.timeoutFired = false;
+  document.getElementById('testIframe').contentWindow.setTimeout("window.timeoutFired = true", 50);
+  document.getElementById('testIframe').contentDocument.designMode = 'on';
+  setTimeout(finishTest, 100);
+}
+
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(testContentEditable);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index bc105e2c5012..7391ee959082 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11166,97 +11166,3 @@ nsDocShell::GetPrintPreview(nsIWebBrowserPrint** aPrintPreview)
 #ifdef DEBUG
 unsigned long nsDocShell::gNumberOfDocShells = 0;
 #endif
-
-NS_IMETHODIMP
-nsDocShell::GetCanExecuteScripts(PRBool *aResult, PRBool *aContinueLooking)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = PR_FALSE; // disallow by default
-
-  nsCOMPtr<nsIDocShell> docshell = this;
-  nsCOMPtr<nsIDocShellTreeItem> globalObjTreeItem =
-      do_QueryInterface(docshell);
-
-  if (globalObjTreeItem)
-  {
-      nsCOMPtr<nsIDocShellTreeItem> treeItem(globalObjTreeItem);
-      nsCOMPtr<nsIDocShellTreeItem> parentItem;
-      PRBool firstPass = PR_TRUE;
-      PRBool lookForParents = PR_FALSE;
-
-      // Walk up the docshell tree to see if any containing docshell disallows scripts
-      do
-      {
-          nsresult rv = docshell->GetAllowJavascript(aResult);
-          if (NS_FAILED(rv)) return rv;
-          if (!*aResult) {
-              nsDocShell* realDocshell = static_cast<nsDocShell*>(docshell.get());
-              if (realDocshell->mContentViewer) {
-                  nsIDocument* doc = realDocshell->mContentViewer->GetDocument();
-                  if (doc && doc->HasFlag(NODE_IS_EDITABLE) &&
-                      realDocshell->mEditorData) {
-                      nsCOMPtr<nsIEditingSession> editSession;
-                      realDocshell->mEditorData->GetEditingSession(getter_AddRefs(editSession));
-                      PRBool jsDisabled = PR_FALSE;
-                      if (editSession &&
-                          NS_SUCCEEDED(rv = editSession->GetJsAndPluginsDisabled(&jsDisabled))) {
-                          if (firstPass) {
-                              if (jsDisabled) {
-                                  // We have a docshell which has been explicitly set
-                                  // to design mode, so we disallow scripts.
-                                  return NS_OK;
-                              }
-                              // The docshell was not explicitly set to design mode,
-                              // so it must be so because a parent was explicitly
-                              // set to design mode.  We don't need to look at higher
-                              // docshells.
-                              *aResult = PR_TRUE;
-                              break;
-                          } else if (lookForParents && jsDisabled) {
-                              // If a parent was explicitly set to design mode,
-                              // we should allow script execution on the child.
-                              *aResult = PR_TRUE;
-                              break;
-                          }
-                          // If the child docshell allows scripting, and the
-                          // parent is inside design mode, we don't need to look
-                          // further.
-                          *aResult = PR_TRUE;
-                          return NS_OK;
-                      }
-                      NS_WARNING("The editing session does not work?");
-                      return NS_FAILED(rv) ? rv : NS_ERROR_FAILURE;
-                  }
-                  if (firstPass) {
-                      // Don't be too hard on docshells on the first pass.
-                      // There may be a parent docshell which has been set
-                      // to design mode, so look for it.
-                      lookForParents = PR_TRUE;
-                  } else {
-                      // We have a docshell which disallows scripts
-                      // and is not editable, so we shouldn't allow
-                      // scripts at all.
-                      return NS_OK;
-                  }
-              }
-          } else if (lookForParents) {
-              // The parent docshell was not explicitly set to design
-              // mode, so js on the child docshell was disabled for
-              // another reason.  Therefore, we need to disable js.
-              return NS_OK;
-          }
-          firstPass = PR_FALSE;
-
-          treeItem->GetParent(getter_AddRefs(parentItem));
-          treeItem.swap(parentItem);
-          docshell = do_QueryInterface(treeItem);
-#ifdef DEBUG
-          if (treeItem && !docshell) {
-            NS_ERROR("cannot get a docshell from a treeItem!");
-          }
-#endif // DEBUG
-      } while (treeItem && docshell);
-  }
-
-  return NS_OK;
-}
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index ab652596c469..26c82da554ce 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -71,7 +71,7 @@ interface nsIPrincipal;
 interface nsIWebBrowserPrint;
 interface nsIVariant;
 
-[scriptable, uuid(8ac6b880-776a-44d4-b271-a7e64ae3debd)]
+[scriptable, uuid(3adde256-05a9-43a7-a190-f8fe75eecfd6)]
 interface nsIDocShell : nsISupports
 {
   /**
@@ -511,14 +511,4 @@ interface nsIDocShell : nsISupports
    * is loaded.
    */
   readonly attribute nsIWebBrowserPrint printPreview;
-
-  /**
-   * Whether this docshell can execute scripts based on its hierarchy.
-   * The rule of thumb here is that we disable js if this docshell or any
-   * of its parents disallow scripting, unless the only reason for js being
-   * disabled in this docshell is a parent docshell having a document that
-   * is in design mode.  In that case, we explicitly allow scripting on the
-   * current docshell.
-   */
-  readonly attribute boolean canExecuteScripts;
 };
diff --git a/editor/composer/public/nsIEditingSession.idl b/editor/composer/public/nsIEditingSession.idl
index 97866dac8ad2..d27715b851e4 100644
--- a/editor/composer/public/nsIEditingSession.idl
+++ b/editor/composer/public/nsIEditingSession.idl
@@ -43,7 +43,7 @@
 
 interface nsIEditor;
 
-[scriptable, uuid(24f3f4da-18a4-448d-876d-7360fefac029)]
+[scriptable, uuid(274cd32e-3675-47e1-9d8a-fc6504ded9ce)]
 
 interface nsIEditingSession : nsISupports
 {
@@ -128,10 +128,5 @@ interface nsIEditingSession : nsISupports
    * to the window.
    */
   void reattachToWindow(in nsIDOMWindow aWindow);
-
-  /**
-   * Whether this session has disabled JS and plugins.
-   */
-  readonly attribute boolean jsAndPluginsDisabled;
 };
 
diff --git a/editor/composer/src/nsEditingSession.cpp b/editor/composer/src/nsEditingSession.cpp
index 8b758446102e..2d172ee2e2f0 100644
--- a/editor/composer/src/nsEditingSession.cpp
+++ b/editor/composer/src/nsEditingSession.cpp
@@ -261,14 +261,6 @@ nsEditingSession::RestoreJSAndPlugins(nsIDOMWindow *aWindow)
   return docShell->SetAllowPlugins(mPluginsEnabled);
 }
 
-NS_IMETHODIMP
-nsEditingSession::GetJsAndPluginsDisabled(PRBool *aResult)
-{
-  NS_ENSURE_ARG_POINTER(aResult);
-  *aResult = mDisabledJSAndPlugins;
-  return NS_OK;
-}
-
 /*---------------------------------------------------------------------------
 
   WindowIsEditable
diff --git a/editor/composer/test/Makefile.in b/editor/composer/test/Makefile.in
index ab969629cd35..9b7488c513ca 100644
--- a/editor/composer/test/Makefile.in
+++ b/editor/composer/test/Makefile.in
@@ -48,7 +48,6 @@ _TEST_FILES = \
 		test_bug348497.html \
 		test_bug384147.html \
 		test_bug389350.html \
-		test_bug519928.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/editor/composer/test/test_bug519928.html b/editor/composer/test/test_bug519928.html
deleted file mode 100644
index a6986b286b0d..000000000000
--- a/editor/composer/test/test_bug519928.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=519928
--->
-<head>
-  <title>Test for Bug 519928</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=519928">Mozilla Bug 519928</a>
-<p id="display"></p>
-<div id="content">
-<iframe id="load-frame"></iframe>  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-var iframe = document.getElementById("load-frame");
-
-function enableJS() allowJS(true);
-function disableJS() allowJS(false);
-function allowJS(allow) {
-  netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-  iframe.contentWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-                      .getInterface(Components.interfaces.nsIWebNavigation)
-                      .QueryInterface(Components.interfaces.nsIDocShell)
-                      .allowJavascript = allow;
-}
-function expectJSAllowed(allowed, testCondition, callback) {
-  window.ICanRunMyJS = false;
-  var self_ = window;
-  testCondition();
-
-  var doc = iframe.contentDocument;
-  doc.body.innerHTML = "<iframe></iframe>";
-  var innerFrame = doc.querySelector("iframe");
-  innerFrame.addEventListener("load", function() {
-    innerFrame.removeEventListener("load", arguments.callee, false);
-
-    var msg = "The inner iframe should" + (allowed ? "" : " not") + " be able to run Javascript";
-    is(self_.ICanRunMyJS, allowed, msg);
-    callback();
-  }, false);
-  var iframeSrc = "data:text/html,<script>parent.parent.ICanRunMyJS = true;</scr" + "ipt>";
-  innerFrame.src = iframeSrc;
-}
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function() {
-  var enterDesignMode = function() document.designMode = "on";
-  var leaveDesignMode = function() document.designMode = "off";
-  expectJSAllowed(false, disableJS, function() {
-    expectJSAllowed(true, enableJS, function() {
-      expectJSAllowed(true, enterDesignMode, function() {
-        expectJSAllowed(true, leaveDesignMode, function() {
-          expectJSAllowed(false, disableJS, function() {
-            expectJSAllowed(false, enterDesignMode, function() {
-              expectJSAllowed(false, leaveDesignMode, function() {
-                expectJSAllowed(true, enableJS, function() {
-                  enterDesignMode = function() iframe.contentDocument.designMode = "on";
-                  leaveDesignMode = function() iframe.contentDocument.designMode = "off";
-                  expectJSAllowed(false, disableJS, function() {
-                    expectJSAllowed(true, enableJS, function() {
-                      expectJSAllowed(true, enterDesignMode, function() {
-                        expectJSAllowed(true, leaveDesignMode, function() {
-                          expectJSAllowed(false, disableJS, function() {
-                            expectJSAllowed(true, enterDesignMode, function() {
-                              expectJSAllowed(false, leaveDesignMode, function() {
-                                expectJSAllowed(true, enableJS, function() {
-                                  SimpleTest.finish();
-                                });
-                              });
-                            });
-                          });
-                        });
-                      });
-                    });
-                  });
-                });
-              });
-            });
-          });
-        });
-      });
-    });
-  });
-});
-
-</script>
-</pre>
-</body>
-</html>
-

From fd7fbe0890f43732b81a6155d1d5d2872ab4524b Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Mon, 28 Jun 2010 12:43:39 -0700
Subject: [PATCH 156/172] Bug 567131: Make ratings display only. r=Unfocused

---
 .../locales/en-US/chrome/mozapps/extensions/extensions.dtd    | 2 +-
 toolkit/mozapps/extensions/content/extensions.xml             | 4 ++--
 toolkit/mozapps/extensions/content/extensions.xul             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
index 83ebe633fd42..800c1a7808b1 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -69,7 +69,7 @@
 
 
 <!-- ratings -->
-<!ENTITY rating.yourRating.label              "Your rating:">
+<!ENTITY rating.label                         "Rating:">
 
 <!-- download/install progress -->
 <!ENTITY progress.pause.tooltip               "Pause">
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 2f28317d9013..5005776b9afa 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -700,8 +700,8 @@
             <xul:label anonid="incompatible-warning"/>
           </xul:hbox>
           <xul:hbox>
-            <xul:label value="&rating.yourRating.label;"/>
-            <xul:label class="meta-rating" userrating="-1" showrating="user"/>
+            <xul:label value="&rating.label;"/>
+            <xul:label class="meta-rating" userrating="-1" showrating="average"/>
           </xul:hbox>
           <xul:label anonid="date-updated" unknown="&addon.unknownDate;"/>
           <xul:vbox anonid="extra-details" class="extra-details">
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index 4fd3f53afe17..9039fa5aa87b 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -253,9 +253,9 @@
                 <description flex="1" id="detail-desc" class="fade"/>
                 <hbox>
                 <!-- XXXunf placeholder - bug 553463 -->
-                  <label value="&rating.yourRating.label;"/>
+                  <label value="&rating.label;"/>
                   <label class="meta-value meta-rating" userrating="3"
-                         showrating="user"/>
+                         showrating="average"/>
                   <spacer flex="1"/>
                   <label id="detail-homepage" class="text-link" value="&addon.homepage;"/>
                 </hbox>

From c5621e3b1287b8bdeb1654e69641417e16900180 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Mon, 28 Jun 2010 12:43:53 -0700
Subject: [PATCH 157/172] Bug 562052: The version number should be shown in the
 list view for all types of add-ons. r=Unfocused

---
 toolkit/mozapps/extensions/content/extensions.xml           | 6 ++++++
 .../themes/gnomestripe/mozapps/extensions/extensions.css    | 3 ++-
 toolkit/themes/pinstripe/mozapps/extensions/extensions.css  | 3 ++-
 toolkit/themes/winstripe/mozapps/extensions/extensions.css  | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 5005776b9afa..80a9f8b4c50d 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -687,6 +687,7 @@
       <xul:vbox flex="1" class="fade">
         <xul:hbox class="name-container">
           <xul:label anonid="name" class="name" xbl:inherits="value=name"/>
+          <xul:label anonid="version" class="version"/>
           <xul:label class="disabled-postfix" value="&addon.disabled.postfix;"/>
         </xul:hbox>
         <xul:label anonid="creator" class="creator"/>
@@ -783,6 +784,8 @@
         if (iconURL)
           this._icon.src = iconURL;
 
+        this._version.value = this.mAddon.version;
+
         var creator = this.mAddon.creator;
         var creatorURL = this.mAddon.creatorURL;
         // XXxunf api
@@ -824,6 +827,9 @@
         document.getAnonymousElementByAttribute(this, "anonid",
                                                 "homepage");
       </field>
+      <field name="_version">
+        document.getAnonymousElementByAttribute(this, "anonid", "version");
+      </field>
       <field name="_icon">
         document.getAnonymousElementByAttribute(this, "anonid", "icon");
       </field>
diff --git a/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css b/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
index 2b4605d29a12..e334de74d472 100644
--- a/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/gnomestripe/mozapps/extensions/extensions.css
@@ -332,7 +332,8 @@
   -moz-box-align: end;
 }
 
-.addon .name {
+.addon .name,
+.addon .version {
   font-size: 150%;
   margin-bottom: 0px;
 }
diff --git a/toolkit/themes/pinstripe/mozapps/extensions/extensions.css b/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
index 2b4605d29a12..e334de74d472 100644
--- a/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/pinstripe/mozapps/extensions/extensions.css
@@ -332,7 +332,8 @@
   -moz-box-align: end;
 }
 
-.addon .name {
+.addon .name,
+.addon .version {
   font-size: 150%;
   margin-bottom: 0px;
 }
diff --git a/toolkit/themes/winstripe/mozapps/extensions/extensions.css b/toolkit/themes/winstripe/mozapps/extensions/extensions.css
index 2b4605d29a12..e334de74d472 100644
--- a/toolkit/themes/winstripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/winstripe/mozapps/extensions/extensions.css
@@ -332,7 +332,8 @@
   -moz-box-align: end;
 }
 
-.addon .name {
+.addon .name,
+.addon .version {
   font-size: 150%;
   margin-bottom: 0px;
 }

From b6b9d51e5c3c4ec1bfef1991cf4cebbdb01ac9b3 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 28 Jun 2010 13:47:39 -0700
Subject: [PATCH 158/172] Make unconstrained width assertions into warnings
 because we can hit them when we clamp really large widths.  (Bug 525100) 
 r=roc

---
 gfx/src/thebes/crashtests/crashtests.list | 2 +-
 layout/base/nsLayoutUtils.cpp             | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gfx/src/thebes/crashtests/crashtests.list b/gfx/src/thebes/crashtests/crashtests.list
index 8048f699b153..b32021eec9ab 100644
--- a/gfx/src/thebes/crashtests/crashtests.list
+++ b/gfx/src/thebes/crashtests/crashtests.list
@@ -1,4 +1,4 @@
 load 306902-1.xml
 load 383872-1.svg
-asserts(8) load 423110-1.xhtml
+load 423110-1.xhtml
 load 445711.html
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index c092795532fb..36beac6095c2 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -2191,8 +2191,10 @@ nsLayoutUtils::ComputeWidthDependentValue(
                  nscoord              aContainingBlockWidth,
                  const nsStyleCoord&  aCoord)
 {
-  NS_PRECONDITION(aContainingBlockWidth != NS_UNCONSTRAINEDSIZE,
-                  "unconstrained widths no longer supported");
+  NS_WARN_IF_FALSE(aContainingBlockWidth != NS_UNCONSTRAINEDSIZE,
+                   "have unconstrained width; this should only result from "
+                   "very large sizes, not attempts at intrinsic width "
+                   "calculation");
 
   if (eStyleUnit_Coord == aCoord.GetUnit()) {
     return aCoord.GetCoordValue();

From 27b814a539cc078aca9949f234a095e96f26c9d5 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 28 Jun 2010 13:47:39 -0700
Subject: [PATCH 159/172] Add some basic reftests for dynamic changes of
 -moz-box-ordinal-group.  (Bug 555987)

---
 .../dynamic-1-add-to-one-grouped.xul            | 17 +++++++++++++++++
 .../dynamic-1-add-to-two-grouped-1.xul          | 17 +++++++++++++++++
 .../dynamic-1-add-to-two-grouped-2.xul          | 17 +++++++++++++++++
 layout/reftests/box-ordinal/dynamic-1-ref.xul   |  7 +++++++
 .../dynamic-1-remove-to-none-grouped.xul        | 17 +++++++++++++++++
 .../dynamic-1-remove-to-one-grouped-1.xul       | 17 +++++++++++++++++
 .../dynamic-1-remove-to-one-grouped-2.xul       | 17 +++++++++++++++++
 layout/reftests/box-ordinal/reftest.list        |  6 ++++++
 layout/reftests/reftest.list                    |  3 +++
 9 files changed, 118 insertions(+)
 create mode 100644 layout/reftests/box-ordinal/dynamic-1-add-to-one-grouped.xul
 create mode 100644 layout/reftests/box-ordinal/dynamic-1-add-to-two-grouped-1.xul
 create mode 100644 layout/reftests/box-ordinal/dynamic-1-add-to-two-grouped-2.xul
 create mode 100644 layout/reftests/box-ordinal/dynamic-1-ref.xul
 create mode 100644 layout/reftests/box-ordinal/dynamic-1-remove-to-none-grouped.xul
 create mode 100644 layout/reftests/box-ordinal/dynamic-1-remove-to-one-grouped-1.xul
 create mode 100644 layout/reftests/box-ordinal/dynamic-1-remove-to-one-grouped-2.xul
 create mode 100644 layout/reftests/box-ordinal/reftest.list

diff --git a/layout/reftests/box-ordinal/dynamic-1-add-to-one-grouped.xul b/layout/reftests/box-ordinal/dynamic-1-add-to-one-grouped.xul
new file mode 100644
index 000000000000..a7f0408f3759
--- /dev/null
+++ b/layout/reftests/box-ordinal/dynamic-1-add-to-one-grouped.xul
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="reftest-wait" onload="run()">
+  <script type="application/javascript"><![CDATA[
+
+  function run() {
+    var c = document.getElementById("C");
+    getComputedStyle(c, "").width; // flush
+    c.style.MozBoxOrdinalGroup = "2";
+    document.documentElement.removeAttribute("class");
+  }
+
+  ]]></script>
+  <label id="A" value="A" />
+  <label id="C" value="C" />
+  <label id="B" value="B" />
+</window>
diff --git a/layout/reftests/box-ordinal/dynamic-1-add-to-two-grouped-1.xul b/layout/reftests/box-ordinal/dynamic-1-add-to-two-grouped-1.xul
new file mode 100644
index 000000000000..6ef73bc2723d
--- /dev/null
+++ b/layout/reftests/box-ordinal/dynamic-1-add-to-two-grouped-1.xul
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="reftest-wait" onload="run()">
+  <script type="application/javascript"><![CDATA[
+
+  function run() {
+    var c = document.getElementById("C");
+    getComputedStyle(c, "").width; // flush
+    c.style.MozBoxOrdinalGroup = "2";
+    document.documentElement.removeAttribute("class");
+  }
+
+  ]]></script>
+  <label id="B" value="B" style="-moz-box-ordinal-group: 2" />
+  <label id="C" value="C" />
+  <label id="A" value="A" />
+</window>
diff --git a/layout/reftests/box-ordinal/dynamic-1-add-to-two-grouped-2.xul b/layout/reftests/box-ordinal/dynamic-1-add-to-two-grouped-2.xul
new file mode 100644
index 000000000000..3c04293df840
--- /dev/null
+++ b/layout/reftests/box-ordinal/dynamic-1-add-to-two-grouped-2.xul
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="reftest-wait" onload="run()">
+  <script type="application/javascript"><![CDATA[
+
+  function run() {
+    var b = document.getElementById("B");
+    getComputedStyle(b, "").width; // flush
+    b.style.MozBoxOrdinalGroup = "2";
+    document.documentElement.removeAttribute("class");
+  }
+
+  ]]></script>
+  <label id="B" value="B" />
+  <label id="C" value="C" style="-moz-box-ordinal-group: 2" />
+  <label id="A" value="A" />
+</window>
diff --git a/layout/reftests/box-ordinal/dynamic-1-ref.xul b/layout/reftests/box-ordinal/dynamic-1-ref.xul
new file mode 100644
index 000000000000..66052d38dda4
--- /dev/null
+++ b/layout/reftests/box-ordinal/dynamic-1-ref.xul
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <label id="A" value="A" />
+  <label id="B" value="B" />
+  <label id="C" value="C" />
+</window>
diff --git a/layout/reftests/box-ordinal/dynamic-1-remove-to-none-grouped.xul b/layout/reftests/box-ordinal/dynamic-1-remove-to-none-grouped.xul
new file mode 100644
index 000000000000..d3c444291dab
--- /dev/null
+++ b/layout/reftests/box-ordinal/dynamic-1-remove-to-none-grouped.xul
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="reftest-wait" onload="run()">
+  <script type="application/javascript"><![CDATA[
+
+  function run() {
+    var b = document.getElementById("B");
+    getComputedStyle(b, "").width; // flush
+    b.style.MozBoxOrdinalGroup = "";
+    document.documentElement.removeAttribute("class");
+  }
+
+  ]]></script>
+  <label id="A" value="A" />
+  <label id="B" value="B" style="-moz-box-ordinal-group: 2" />
+  <label id="C" value="C" />
+</window>
diff --git a/layout/reftests/box-ordinal/dynamic-1-remove-to-one-grouped-1.xul b/layout/reftests/box-ordinal/dynamic-1-remove-to-one-grouped-1.xul
new file mode 100644
index 000000000000..f2f285734251
--- /dev/null
+++ b/layout/reftests/box-ordinal/dynamic-1-remove-to-one-grouped-1.xul
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="reftest-wait" onload="run()">
+  <script type="application/javascript"><![CDATA[
+
+  function run() {
+    var b = document.getElementById("B");
+    getComputedStyle(b, "").width; // flush
+    b.style.MozBoxOrdinalGroup = "";
+    document.documentElement.removeAttribute("class");
+  }
+
+  ]]></script>
+  <label id="C" value="C" style="-moz-box-ordinal-group: 2" />
+  <label id="A" value="A" />
+  <label id="B" value="B" style="-moz-box-ordinal-group: 2" />
+</window>
diff --git a/layout/reftests/box-ordinal/dynamic-1-remove-to-one-grouped-2.xul b/layout/reftests/box-ordinal/dynamic-1-remove-to-one-grouped-2.xul
new file mode 100644
index 000000000000..1fb09c05be04
--- /dev/null
+++ b/layout/reftests/box-ordinal/dynamic-1-remove-to-one-grouped-2.xul
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE window>
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" class="reftest-wait" onload="run()">
+  <script type="application/javascript"><![CDATA[
+
+  function run() {
+    var a = document.getElementById("A");
+    getComputedStyle(a, "").width; // flush
+    a.style.MozBoxOrdinalGroup = "";
+    document.documentElement.removeAttribute("class");
+  }
+
+  ]]></script>
+  <label id="C" value="C" style="-moz-box-ordinal-group: 2" />
+  <label id="A" value="A" style="-moz-box-ordinal-group: 2" />
+  <label id="B" value="B" />
+</window>
diff --git a/layout/reftests/box-ordinal/reftest.list b/layout/reftests/box-ordinal/reftest.list
new file mode 100644
index 000000000000..198b4efa3a57
--- /dev/null
+++ b/layout/reftests/box-ordinal/reftest.list
@@ -0,0 +1,6 @@
+== dynamic-1-remove-to-none-grouped.xul dynamic-1-ref.xul
+fails == dynamic-1-add-to-one-grouped.xul dynamic-1-ref.xul
+== dynamic-1-remove-to-one-grouped-1.xul dynamic-1-ref.xul
+fails == dynamic-1-remove-to-one-grouped-2.xul dynamic-1-ref.xul
+== dynamic-1-add-to-two-grouped-1.xul dynamic-1-ref.xul
+fails == dynamic-1-add-to-two-grouped-2.xul dynamic-1-ref.xul
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index ab87b368b484..066cc942c2c7 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -26,6 +26,9 @@ include border-image/reftest.list
 # border-radius/
 include border-radius/reftest.list
 
+# box-ordinal/
+include box-ordinal/reftest.list
+
 # box-properties/
 include box-properties/reftest.list
 

From c61cf3a82e1d13d6a92083a9f5fe006bc5de3b04 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Mon, 28 Jun 2010 13:47:58 -0700
Subject: [PATCH 160/172] Make the simple cases of dynamic changes of
 -moz-box-ordinal-group work correctly.  (Bug 555987)  r=dbaron

---
 layout/reftests/box-ordinal/reftest.list |  4 ++--
 layout/xul/base/src/nsBoxFrame.cpp       | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/layout/reftests/box-ordinal/reftest.list b/layout/reftests/box-ordinal/reftest.list
index 198b4efa3a57..31d642d951b0 100644
--- a/layout/reftests/box-ordinal/reftest.list
+++ b/layout/reftests/box-ordinal/reftest.list
@@ -1,6 +1,6 @@
 == dynamic-1-remove-to-none-grouped.xul dynamic-1-ref.xul
-fails == dynamic-1-add-to-one-grouped.xul dynamic-1-ref.xul
+== dynamic-1-add-to-one-grouped.xul dynamic-1-ref.xul
 == dynamic-1-remove-to-one-grouped-1.xul dynamic-1-ref.xul
 fails == dynamic-1-remove-to-one-grouped-2.xul dynamic-1-ref.xul
 == dynamic-1-add-to-two-grouped-1.xul dynamic-1-ref.xul
-fails == dynamic-1-add-to-two-grouped-2.xul dynamic-1-ref.xul
+== dynamic-1-add-to-two-grouped-2.xul dynamic-1-ref.xul
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index aebcf59cfc6a..157575ecb70d 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -1054,6 +1054,12 @@ nsBoxFrame::InsertFrames(nsIAtom*        aListName,
    if (mLayoutManager)
      mLayoutManager->ChildrenInserted(this, state, aPrevFrame, newFrames);
 
+   // Make sure to check box order _after_ notifying the layout
+   // manager; otherwise the slice we give the layout manager will
+   // just be bogus.  If the layout manager cares about the order, we
+   // just lose.
+   CheckBoxOrder(state);
+
 #ifdef DEBUG_LAYOUT
    // if we are in debug make sure our children are in debug as well.
    if (mState & NS_STATE_CURRENTLY_IN_DEBUG)
@@ -1081,6 +1087,12 @@ nsBoxFrame::AppendFrames(nsIAtom*        aListName,
    if (mLayoutManager)
      mLayoutManager->ChildrenAppended(this, state, newFrames);
 
+   // Make sure to check box order _after_ notifying the layout
+   // manager; otherwise the slice we give the layout manager will
+   // just be bogus.  If the layout manager cares about the order, we
+   // just lose.
+   CheckBoxOrder(state);
+
 #ifdef DEBUG_LAYOUT
    // if we are in debug make sure our children are in debug as well.
    if (mState & NS_STATE_CURRENTLY_IN_DEBUG)

From d3355fd55dc01ac3166240025159f26629515031 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Mon, 28 Jun 2010 16:57:49 -0400
Subject: [PATCH 161/172] Remove bogus workaround for bug 555987 now that it's
 fixed

---
 browser/base/content/browser.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 6af20431b2be..cfcf0d80ed00 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4638,10 +4638,6 @@ var TabsOnTop = {
     gNavToolbox.setAttribute("tabsontop", !!val);
     this.syncCommand();
 
-    //XXX: Trigger reframe. This is a workaround for bug 555987 and needs to be
-    //     removed once that bug is fixed.
-    gNavToolbox.style.MozBoxOrdinalGroup = val ? 2 : 3;
-
     return val;
   }
 }

From 9f5a9753602cef9a9f5e2de80f90d030924be1e1 Mon Sep 17 00:00:00 2001
From: Taras Glek <tglek@mozilla.com>
Date: Mon, 28 Jun 2010 12:13:26 -0700
Subject: [PATCH 162/172] Bug 416330 - Suboptimal SQLite page size r=sdwilsh

--HG--
extra : rebase_source : 053c7b1d975304ed7d402bb619874c889c71425c
---
 db/sqlite3/src/Makefile.in                    |  4 ++
 storage/src/mozStorageConnection.cpp          |  9 +++-
 storage/test/unit/test_page_size_is_32k.js    | 28 ++++++++++++
 .../components/places/src/nsNavHistory.cpp    | 44 +++++--------------
 .../src/nsUrlClassifierDBService.cpp          | 21 +++++----
 5 files changed, 65 insertions(+), 41 deletions(-)
 create mode 100644 storage/test/unit/test_page_size_is_32k.js

diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in
index 104a8925f88e..1d27cadd267c 100644
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -100,6 +100,8 @@ CSRCS = \
 # don't have to vacuum to make sure the data is not visible in the file.
 # -DSQLITE_ENABLE_FTS3=1 enables the full-text index module.
 # -DSQLITE_CORE=1 statically links that module into the SQLite library.
+# -DSQLITE_DEFAULT_PAGE_SIZE=32768 and SQLITE_MAX_DEFAULT_PAGE_SIZE=32768
+# increases the page size from 1k, see bug 416330.
 # Note: Be sure to update the configure.in checks when these change!
 DEFINES = \
   -DSQLITE_SECURE_DELETE=1 \
@@ -107,6 +109,8 @@ DEFINES = \
   -DSQLITE_CORE=1 \
   -DSQLITE_ENABLE_FTS3=1 \
   -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
+  -DSQLITE_DEFAULT_PAGE_SIZE=32768 \
+  -DSQLITE_MAX_DEFAULT_PAGE_SIZE=32768 \
   $(NULL)
 
 # -DSQLITE_ENABLE_LOCKING_STYLE=1 to help with AFP folders
diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp
index 59b7a8e39dbb..4b8874946180 100644
--- a/storage/src/mozStorageConnection.cpp
+++ b/storage/src/mozStorageConnection.cpp
@@ -393,6 +393,14 @@ Connection::initialize(nsIFile *aDatabaseFile)
   PR_LOG(gStorageLog, PR_LOG_NOTICE, ("Opening connection to '%s' (%p)",
                                       leafName.get(), this));
 #endif
+  // Switch db to preferred page size in case the user vacuums.
+  sqlite3_stmt *stmt;
+  srv = prepareStmt(mDBConn, NS_LITERAL_CSTRING("PRAGMA page_size = 32768"),
+                    &stmt);
+  if (srv == SQLITE_OK) {
+    (void)stepStmt(stmt);
+    (void)::sqlite3_finalize(stmt);
+  }
 
   // Register our built-in SQL functions.
   srv = registerFunctions(mDBConn);
@@ -412,7 +420,6 @@ Connection::initialize(nsIFile *aDatabaseFile)
 
   // Execute a dummy statement to force the db open, and to verify if it is
   // valid or not.
-  sqlite3_stmt *stmt;
   srv = prepareStmt(mDBConn, NS_LITERAL_CSTRING("SELECT * FROM sqlite_master"),
                     &stmt);
   if (srv == SQLITE_OK) {
diff --git a/storage/test/unit/test_page_size_is_32k.js b/storage/test/unit/test_page_size_is_32k.js
new file mode 100644
index 000000000000..b40aa3cd13a9
--- /dev/null
+++ b/storage/test/unit/test_page_size_is_32k.js
@@ -0,0 +1,28 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// This file tests that dbs are using 32k pagesize
+
+function check_size(db)
+{
+  var stmt = db.createStatement("PRAGMA page_size");
+  stmt.executeStep();
+  const expected_block_size = 32768; // 32K
+  do_check_eq(stmt.getInt32(0), expected_block_size);
+  stmt.finalize();
+}
+
+function new_file(name)
+{
+  var file = dirSvc.get("ProfD", Ci.nsIFile);
+  file.append(name + ".sqlite");
+  do_check_false(file.exists());
+}
+
+function run_test()
+{
+  check_size(getDatabase(new_file("shared32k.sqlite")));
+  check_size(getService().openUnsharedDatabase(new_file("unshared32k.sqlite")));
+}
+
diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp
index e3d4b9f0dd55..6a925132d93c 100644
--- a/toolkit/components/places/src/nsNavHistory.cpp
+++ b/toolkit/components/places/src/nsNavHistory.cpp
@@ -140,13 +140,6 @@ using namespace mozilla::places;
 // corresponding migrateVxx method below.
 #define DATABASE_SCHEMA_VERSION 10
 
-// We set the default database page size to be larger. sqlite's default is 1K.
-// This gives good performance when many small parts of the file have to be
-// loaded for each statement. Because we try to keep large chunks of the file
-// in memory, a larger page size should give better I/O performance. 32K is
-// sqlite's default max page size.
-#define DATABASE_PAGE_SIZE 4096
-
 // Filename of the database.
 #define DATABASE_FILENAME NS_LITERAL_STRING("places.sqlite")
 
@@ -634,37 +627,23 @@ nsNavHistory::InitDBFile(PRBool aForceInit)
 nsresult
 nsNavHistory::InitDB()
 {
-  PRInt32 pageSize = DATABASE_PAGE_SIZE;
-
   // Get the database schema version.
   PRInt32 currentSchemaVersion = 0;
   nsresult rv = mDBConn->GetSchemaVersion(&currentSchemaVersion);
   NS_ENSURE_SUCCESS(rv, rv);
-  bool databaseInitialized = (currentSchemaVersion > 0);
 
-  if (!databaseInitialized) {
-    // First of all we must set page_size since it will only have effect on
-    // empty files.  For existing databases we could get a different page size,
-    // trying to change it would be uneffective.
-    // See bug 401985 for details.
-    nsCAutoString pageSizePragma("PRAGMA page_size = ");
-    pageSizePragma.AppendInt(pageSize);
-    rv = mDBConn->ExecuteSimpleSQL(pageSizePragma);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-  else {
-    // Get the page size.  This may be different than the default if the
-    // database file already existed with a different page size.
-    nsCOMPtr<mozIStorageStatement> statement;
-    rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("PRAGMA page_size"),
-                                  getter_AddRefs(statement));
-    NS_ENSURE_SUCCESS(rv, rv);
+  // Get the page size.  This may be different than the default if the
+  // database file already existed with a different page size.
+  nsCOMPtr<mozIStorageStatement> statement;
+  rv = mDBConn->CreateStatement(NS_LITERAL_CSTRING("PRAGMA page_size"),
+                                getter_AddRefs(statement));
+  NS_ENSURE_SUCCESS(rv, rv);
 
-    PRBool hasResult;
-    rv = statement->ExecuteStep(&hasResult);
-    NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && hasResult, NS_ERROR_FAILURE);
-    pageSize = statement->AsInt32(0);
-  }
+  PRBool hasResult;
+  mozStorageStatementScoper scoper(statement);
+  rv = statement->ExecuteStep(&hasResult);
+  NS_ENSURE_TRUE(NS_SUCCEEDED(rv) && hasResult, NS_ERROR_FAILURE);
+  PRInt32 pageSize = statement->AsInt32(0);
 
   // Ensure that temp tables are held in memory, not on disk.  We use temp
   // tables mainly for fsync and I/O reduction.
@@ -726,6 +705,7 @@ nsNavHistory::InitDB()
   rv = nsAnnotationService::InitTables(mDBConn);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  bool databaseInitialized = (currentSchemaVersion > 0);
   if (!databaseInitialized) {
     // This is the first run, so we set schema version to the latest one, since
     // we don't need to migrate anything.  We will create tables from scratch.
diff --git a/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
index 593ab7c9c5e7..4b70dcb0ad95 100644
--- a/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
@@ -173,8 +173,6 @@ static const PRLogModuleInfo *gUrlClassifierDbServiceLog = nsnull;
 #define UPDATE_DELAY_TIME           "urlclassifier.updatetime"
 #define UPDATE_DELAY_TIME_DEFAULT   60
 
-#define PAGE_SIZE 4096
-
 class nsUrlClassifierDBServiceWorker;
 
 // Singleton instance.
@@ -1223,6 +1221,7 @@ private:
   nsCOMPtr<mozIStorageStatement> mGetTableIdStatement;
   nsCOMPtr<mozIStorageStatement> mGetTableNameStatement;
   nsCOMPtr<mozIStorageStatement> mInsertTableIdStatement;
+  nsCOMPtr<mozIStorageStatement> mGetPageSizeStatement;
 
   // Stores the last time a given table was updated.
   nsDataHashtable<nsCStringHashKey, PRInt64> mTableFreshness;
@@ -3164,7 +3163,13 @@ nsUrlClassifierDBServiceWorker::SetupUpdate()
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (gUpdateCacheSize > 0) {
-    PRUint32 cachePages = gUpdateCacheSize / PAGE_SIZE;
+    PRBool hasResult;
+    rv = mGetPageSizeStatement->ExecuteStep(&hasResult);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    NS_ASSERTION(hasResult, "Should always be able to get page size from sqlite");
+    PRUint32 pageSize = mGetTableIdStatement->AsInt32(0);
+    PRUint32 cachePages = gUpdateCacheSize / pageSize;
     nsCAutoString cacheSizePragma("PRAGMA cache_size=");
     cacheSizePragma.AppendInt(cachePages);
     rv = mConnection->ExecuteSimpleSQL(cacheSizePragma);
@@ -3413,11 +3418,6 @@ nsUrlClassifierDBServiceWorker::OpenDb()
     }
   }
 
-  nsCAutoString cacheSizePragma("PRAGMA page_size=");
-  cacheSizePragma.AppendInt(PAGE_SIZE);
-  rv = connection->ExecuteSimpleSQL(cacheSizePragma);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   rv = connection->ExecuteSimpleSQL(NS_LITERAL_CSTRING("PRAGMA synchronous=OFF"));
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -3475,6 +3475,11 @@ nsUrlClassifierDBServiceWorker::OpenDb()
      getter_AddRefs(mInsertTableIdStatement));
   NS_ENSURE_SUCCESS(rv, rv);
 
+  rv = connection->CreateStatement
+    (NS_LITERAL_CSTRING("PRAGMA page_size"),
+     getter_AddRefs(mGetPageSizeStatement));
+  NS_ENSURE_SUCCESS(rv, rv);
+
   mConnection = connection;
 
   mCryptoHash = do_CreateInstance(NS_CRYPTO_HASH_CONTRACTID, &rv);

From ac10e35b64e39ffee4e4851817a451cca2b84d49 Mon Sep 17 00:00:00 2001
From: Jesse Ruderman <jruderman@gmail.com>
Date: Mon, 28 Jun 2010 14:58:58 -0700
Subject: [PATCH 163/172] Add crashtest for bug 540771

---
 layout/base/crashtests/540771-1.xhtml  | 18 ++++++++++++++++++
 layout/base/crashtests/crashtests.list |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 layout/base/crashtests/540771-1.xhtml

diff --git a/layout/base/crashtests/540771-1.xhtml b/layout/base/crashtests/540771-1.xhtml
new file mode 100644
index 000000000000..3830e148d664
--- /dev/null
+++ b/layout/base/crashtests/540771-1.xhtml
@@ -0,0 +1,18 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<xul:deck id="d"/>
+
+<xul:menuitem><span /><xul:menupopup id="p"/></xul:menuitem>
+
+<script>
+function boom()
+{
+  var p = document.getElementById("p");
+  var d = document.getElementById("d");
+  p.parentNode.removeChild(p);
+  d.appendChild(document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "box"));
+}
+window.addEventListener("load", boom, false);
+</script>
+
+</html>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index ea4e2fa2c0b2..c1408d50eb4e 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -295,6 +295,7 @@ load 538082-1.xul
 load 538207-1.xhtml
 load 538210-1.html
 load 540760.xul
+load 540771-1.xhtml
 load 541869-1.xhtml
 load 541869-2.html
 load 560441-1.xhtml

From 9fb2d7417b71a58ccb78dd79cac38dafc187f685 Mon Sep 17 00:00:00 2001
From: Dan Witte <dwitte@mozilla.com>
Date: Mon, 28 Jun 2010 15:00:56 -0700
Subject: [PATCH 164/172] Fix typo.

---
 netwerk/cookie/nsCookieService.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/netwerk/cookie/nsCookieService.cpp b/netwerk/cookie/nsCookieService.cpp
index eb9afe397bbf..9266e752920b 100644
--- a/netwerk/cookie/nsCookieService.cpp
+++ b/netwerk/cookie/nsCookieService.cpp
@@ -585,8 +585,8 @@ nsCookieService::Init()
   }
 
   mInsertListener = new InsertCookieDBListener;
-  mUpdateListener = new InsertCookieDBListener;
-  mRemoveListener = new InsertCookieDBListener;
+  mUpdateListener = new UpdateCookieDBListener;
+  mRemoveListener = new RemoveCookieDBListener;
   mCloseListener = new CloseCookieDBListener;
 
   return NS_OK;

From 4b06493be25b95ef3f6f2913fa683c6fceda5879 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Tue, 29 Jun 2010 00:03:52 +0200
Subject: [PATCH 165/172] Bug 575162 - Bookmarks menu button doesn't retain
 depressed appearance when hovered. r=dao

---
 browser/themes/winstripe/browser/browser.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index b9ef434fd977..9c2c396efb0f 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -376,7 +376,7 @@ toolbar[iconsize="small"][mode="icons"] toolbarbutton[type="menu-button"] {
 
 .toolbarbutton-menubutton-button:not([disabled="true"]):not(:active):hover,
 toolbarbutton[type="menu-button"]:not([open="true"]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
-.toolbarbutton-1:not([disabled="true"]):not([checked="true"]):not(:active):hover {
+.toolbarbutton-1:not([disabled="true"]):not([checked="true"]):not([open="true"]):not(:active):hover {
   background-color: hsla(190,60%,70%,.5);
   border-color: hsla(190,50%,65%,.8) hsla(190,50%,50%,.8) hsla(190,50%,40%,.8);
   -moz-box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset,

From feccc09037775ca3446e658a6dcdf716dddbabf5 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Tue, 29 Jun 2010 00:03:56 +0200
Subject: [PATCH 166/172] Bug 575194 - Bookmark button misbehaves when
 personal-bookmark widget is moved to menu bar. r=gavin

---
 browser/base/content/browser.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 36d849fd5c73..8ac857a5aa79 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -201,7 +201,8 @@ toolbarbutton.bookmark-item {
 
 %ifdef MENUBAR_CAN_AUTOHIDE
 #toolbar-menubar:not([autohide="true"]) ~ #nav-bar > #bookmarks-menu-button-container,
-#toolbar-menubar:not([autohide="true"]) ~ toolbar > #personal-bookmarks > #bookmarks-menu-button {
+#toolbar-menubar:not([autohide="true"]) ~ toolbar > #personal-bookmarks > #bookmarks-menu-button,
+#toolbar-menubar:not([autohide="true"]) > #personal-bookmarks > #bookmarks-menu-button {
   display: none;
 }
 %endif

From 01ffce2c991ba27a39075941e8ef8fccde3d2361 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Tue, 29 Jun 2010 00:04:01 +0200
Subject: [PATCH 167/172] Bug 575218 - More robust check for personal-bookmarks
 visibility. r=gavin

---
 browser/base/content/browser-places.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 705a24ac15f3..3bff65ab6e7d 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1162,7 +1162,7 @@ let BookmarksMenuButton = {
     this._popupNeedsUpdating = true;
 
     let bookmarksToolbarItem = this.bookmarksToolbarItem;
-    if (isElementVisible(bookmarksToolbarItem)) {
+    if (bookmarksToolbarItem && !bookmarksToolbarItem.parentNode.collapsed) {
       if (this.button.parentNode != bookmarksToolbarItem) {
         this.resetView();
         bookmarksToolbarItem.appendChild(this.button);

From c48442e154631c0aed7f84ada3029fc45b9697c4 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Tue, 29 Jun 2010 00:04:07 +0200
Subject: [PATCH 168/172] Bug 571288 - A tooltip of bookmark located in the
 Chevron is not displayed. r=dietrich

---
 browser/base/content/browser.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index aac4ba9d7a88..4be9738dfa8b 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -787,7 +787,7 @@
                                                    ._placesView._onChevronPopupShowing(event);">
               <menupopup id="PlacesChevronPopup"
                          placespopup="true"
-                         popupsinherittooltip="true"
+                         tooltip="bhTooltip" popupsinherittooltip="true"
                          context="placesContext"/>
             </toolbarbutton>
           </hbox>

From 41bf7c2d61225f90b801a42a94653fff59cac80b Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Tue, 29 Jun 2010 00:04:13 +0200
Subject: [PATCH 169/172] Bug 572274 - Canvas memory usage in about:memory is
 incorrect. r=robarnold

---
 content/canvas/src/nsCanvasRenderingContext2D.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 944e57167e1e..b4ed4a65a8ba 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -757,7 +757,9 @@ nsCanvasRenderingContext2D::~nsCanvasRenderingContext2D()
 void
 nsCanvasRenderingContext2D::Destroy()
 {
-    if (mValid)
+    // only do this for non-docshell created contexts,
+    // since those are the ones that we created a surface for
+    if (mValid && !mDocShell)
         gCanvasMemoryUsed -= mWidth * mHeight * 4;
 
     mSurface = nsnull;

From 24407948aff7da983b7ad842884b9581fb2156ad Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Mon, 28 Jun 2010 15:22:39 -0700
Subject: [PATCH 170/172] Bug 574872 - 'Allow XPConnect to pass the JSContext
 through XPIDL when requested'. r=jst

---
 js/src/xpconnect/src/qsgen.py             |  9 ++++++--
 js/src/xpconnect/src/xpcwrappednative.cpp | 28 ++++++++++++++++++++++-
 xpcom/idl-parser/xpidl.py                 |  6 +++++
 xpcom/reflect/xptinfo/public/xptinfo.h    |  1 +
 xpcom/typelib/xpidl/xpidl_header.c        | 20 ++++++++++++++++
 xpcom/typelib/xpidl/xpidl_typelib.c       | 15 +++++++++---
 xpcom/typelib/xpt/public/xpt_struct.h     |  4 +++-
 xpcom/typelib/xpt/tools/xpt_dump.c        | 15 ++++++++----
 8 files changed, 87 insertions(+), 11 deletions(-)

diff --git a/js/src/xpconnect/src/qsgen.py b/js/src/xpconnect/src/qsgen.py
index 014a51db94a7..8c6ce42515d6 100644
--- a/js/src/xpconnect/src/qsgen.py
+++ b/js/src/xpconnect/src/qsgen.py
@@ -202,7 +202,7 @@ def removeStubMember(memberId, member):
 
 def addStubMember(memberId, member, traceable):
     mayTrace = False
-    if member.kind == 'method':
+    if member.kind == 'method' and not member.implicit_jscontext:
         # This code MUST match writeTraceableQuickStub
         haveCallee = memberNeedsCallee(member)
         # Traceable natives support up to MAX_TRACEABLE_NATIVE_ARGS
@@ -255,7 +255,8 @@ def checkStubMember(member, isCustom):
 
     # Check for unknown properties.
     for attrname, value in vars(member).items():
-        if value is True and attrname not in ('readonly','optional_argc','traceable'):
+        if value is True and attrname not in ('readonly','optional_argc',
+                                              'traceable','implicit_jscontext'):
             raise UserError("%s %s: unrecognized property %r"
                             % (member.kind.capitalize(), memberId,
                                attrname))
@@ -940,6 +941,8 @@ def writeQuickStub(f, customMethodCalls, member, stubName, isSetter=False):
         if isMethod:
             comName = header.methodNativeName(member)
             argv = ['arg' + str(i) for i, p in enumerate(member.params)]
+            if member.implicit_jscontext:
+                argv.append('cx')
             if member.optional_argc:
                 argv.append('argc - %d' % requiredArgs)
             if not isVoidType(member.realtype):
@@ -951,6 +954,8 @@ def writeQuickStub(f, customMethodCalls, member, stubName, isSetter=False):
                 args = outParamForm(resultname, member.realtype)
             else:
                 args = "arg0"
+            if member.implicit_jscontext:
+                args = "cx, " + args
 
         f.write("    ")
         if canFail or debugGetter:
diff --git a/js/src/xpconnect/src/xpcwrappednative.cpp b/js/src/xpconnect/src/xpcwrappednative.cpp
index 56e15e2cfab9..44d0ccc38c5e 100644
--- a/js/src/xpconnect/src/xpcwrappednative.cpp
+++ b/js/src/xpconnect/src/xpcwrappednative.cpp
@@ -2120,6 +2120,7 @@ class CallMethodHelper
     const jsid mIdxValueId;
 
     nsAutoTArray<nsXPTCVariant, 8> mDispatchParams;
+    uint8 mJSContextIndex; // TODO make const
     uint8 mOptArgcIndex; // TODO make const
 
     // Reserve space for one nsAutoString. We don't want the string itself
@@ -2169,6 +2170,8 @@ class CallMethodHelper
     nsXPTCVariant*
     GetDispatchParam(uint8 paramIndex)
     {
+        if (paramIndex >= mJSContextIndex)
+            paramIndex += 1;
         if (paramIndex >= mOptArgcIndex)
             paramIndex += 1;
         return &mDispatchParams[paramIndex];
@@ -2195,6 +2198,7 @@ public:
         , mCallee(ccx.GetTearOff()->GetNative())
         , mVTableIndex(ccx.GetMethodIndex())
         , mIdxValueId(ccx.GetRuntime()->GetStringID(XPCJSRuntime::IDX_VALUE))
+        , mJSContextIndex(PR_UINT8_MAX)
         , mOptArgcIndex(PR_UINT8_MAX)
         , mArgv(ccx.GetArgv())
         , mArgc(ccx.GetArgc())
@@ -2656,12 +2660,17 @@ JSBool
 CallMethodHelper::InitializeDispatchParams()
 {
     const uint8 wantsOptArgc = mMethodInfo->WantsOptArgc() ? 1 : 0;
+    const uint8 wantsJSContext = mMethodInfo->WantsContext() ? 1 : 0;
     const uint8 paramCount = mMethodInfo->GetParamCount();
     uint8 requiredArgs = paramCount;
+    uint8 hasRetval = 0;
 
     // XXX ASSUMES that retval is last arg. The xpidl compiler ensures this.
     if(paramCount && mMethodInfo->GetParam(paramCount-1).IsRetval())
+    {
+        hasRetval = 1;
         requiredArgs--;
+    }
 
     if(mArgc < requiredArgs || wantsOptArgc)
     {
@@ -2678,14 +2687,31 @@ CallMethodHelper::InitializeDispatchParams()
         }
     }
 
+    if(wantsJSContext)
+    {
+        if(wantsOptArgc)
+            // Need to bump mOptArgcIndex up one here.
+            mJSContextIndex = mOptArgcIndex++;
+        else
+            mJSContextIndex = paramCount - hasRetval;
+    }
+
     // iterate through the params to clear flags (for safe cleanup later)
-    for(uint8 i = 0; i < paramCount + wantsOptArgc; i++)
+    for(uint8 i = 0; i < paramCount + wantsJSContext + wantsOptArgc; i++)
     {
         nsXPTCVariant* dp = mDispatchParams.AppendElement();
         dp->ClearFlags();
         dp->val.p = nsnull;
     }
 
+    // Fill in the JSContext argument
+    if(wantsJSContext)
+    {
+        nsXPTCVariant* dp = &mDispatchParams[mJSContextIndex];
+        dp->type = nsXPTType::T_VOID;
+        dp->val.p = mCallContext;
+    }
+
     // Fill in the optional_argc argument
     if(wantsOptArgc)
     {
diff --git a/xpcom/idl-parser/xpidl.py b/xpcom/idl-parser/xpidl.py
index a6591338c0f0..91add09c31f3 100644
--- a/xpcom/idl-parser/xpidl.py
+++ b/xpcom/idl-parser/xpidl.py
@@ -640,6 +640,7 @@ class Attribute(object):
     noscript = False
     notxpcom = False
     readonly = False
+    implicit_jscontext = False
     binaryname = None
     null = None
     undefined = None
@@ -689,6 +690,8 @@ class Attribute(object):
                     self.noscript = True
                 elif name == 'notxpcom':
                     self.notxpcom = True
+                elif name == 'implicit_jscontext':
+                    self.implicit_jscontext = True
                 else:
                     raise IDLError("Unexpected attribute '%s'", aloc)
 
@@ -722,6 +725,7 @@ class Method(object):
     noscript = False
     notxpcom = False
     binaryname = None
+    implicit_jscontext = False
     optional_argc = False
 
     def __init__(self, type, name, attlist, paramlist, location, doccomments, raises):
@@ -749,6 +753,8 @@ class Method(object):
                 self.noscript = True
             elif name == 'notxpcom':
                 self.notxpcom = True
+            elif name == 'implicit_jscontext':
+                self.implicit_jscontext = True
             elif name == 'optional_argc':
                 self.optional_argc = True
             else:
diff --git a/xpcom/reflect/xptinfo/public/xptinfo.h b/xpcom/reflect/xptinfo/public/xptinfo.h
index 93f6cb93718b..e77cdb46966c 100644
--- a/xpcom/reflect/xptinfo/public/xptinfo.h
+++ b/xpcom/reflect/xptinfo/public/xptinfo.h
@@ -183,6 +183,7 @@ public:
     PRBool IsConstructor() const {return 0 != (XPT_MD_IS_CTOR(flags)   );}
     PRBool IsHidden()      const {return 0 != (XPT_MD_IS_HIDDEN(flags) );}
     PRBool WantsOptArgc()  const {return 0 != (XPT_MD_WANTS_OPT_ARGC(flags));}
+    PRBool WantsContext()  const {return 0 != (XPT_MD_WANTS_CONTEXT(flags));}
     const char* GetName()  const {return name;}
     PRUint8 GetParamCount()  const {return num_args;}
     /* idx was index before I got _sick_ of the warnings on Unix, sorry jband */
diff --git a/xpcom/typelib/xpidl/xpidl_header.c b/xpcom/typelib/xpidl/xpidl_header.c
index 1d08da4c0a18..f808cf9b4803 100644
--- a/xpcom/typelib/xpidl/xpidl_header.c
+++ b/xpcom/typelib/xpidl/xpidl_header.c
@@ -778,6 +778,11 @@ write_attr_accessor(IDL_tree attr_tree, FILE * outfile,
                 toupper(*attrname),
                 attrname + 1);
     }
+    if (IDL_tree_property_get(ident, "implicit_jscontext")) {
+        if (mode == AS_DECL || mode == AS_IMPL)
+            fputs("JSContext *", outfile);
+        fputs("cx, ", outfile);
+    }
     if (mode == AS_DECL || mode == AS_IMPL) {
         /* Setters for string, wstring, nsid, domstring, utf8string, 
          * cstring and astring get const. 
@@ -1041,6 +1046,8 @@ write_method_signature(IDL_tree method_tree, FILE *outfile, int mode,
         (IDL_tree_property_get(op->ident, "notxpcom") != NULL);
     gboolean op_opt_argc =
         (IDL_tree_property_get(op->ident, "optional_argc") != NULL);
+    gboolean op_context =
+        (IDL_tree_property_get(op->ident, "implicit_jscontext") != NULL);
     const char *name;
     const char *binaryname;
     IDL_tree iter;
@@ -1097,6 +1104,19 @@ write_method_signature(IDL_tree method_tree, FILE *outfile, int mode,
         no_generated_args = FALSE;
     }
 
+    if (op_context) {
+        if ((op_notxpcom || !op->op_type_spec) && !op->f_varargs)
+            fputs(", ", outfile);
+
+        if (mode == AS_DECL || mode == AS_IMPL)
+            fputs("JSContext *", outfile);
+
+        fputs("cx", outfile);
+
+        if ((!op_notxpcom && op->op_type_spec) || op->f_varargs)
+            fputs(", ", outfile);
+    }
+
     if (op_opt_argc) {
         if ((op_notxpcom || !op->op_type_spec) && !op->f_varargs)
             fputs(", ", outfile);
diff --git a/xpcom/typelib/xpidl/xpidl_typelib.c b/xpcom/typelib/xpidl/xpidl_typelib.c
index f2a69be7775c..c8a04b8fe925 100644
--- a/xpcom/typelib/xpidl/xpidl_typelib.c
+++ b/xpcom/typelib/xpidl/xpidl_typelib.c
@@ -1017,13 +1017,14 @@ fill_pd_as_nsresult(XPTParamDescriptor *pd)
 
 static gboolean
 typelib_attr_accessor(TreeState *state, XPTMethodDescriptor *meth,
-                      gboolean getter, gboolean hidden)
+                      gboolean getter, gboolean hidden, gboolean wantsJSContext)
 {
     uint8 methflags = 0;
     uint8 pdflags = 0;
 
     methflags |= getter ? XPT_MD_GETTER : XPT_MD_SETTER;
     methflags |= hidden ? XPT_MD_HIDDEN : 0;
+    methflags |= wantsJSContext ? XPT_MD_CONTEXT : 0;
     if (!XPT_FillMethodDescriptor(ARENA(state), meth, methflags,
                                   ATTR_IDENT(state->tree).str, 1))
         return FALSE;
@@ -1061,6 +1062,9 @@ typelib_attr_dcl(TreeState *state)
     /* If it's marked [noscript], mark it as hidden in the typelib. */
     gboolean hidden = (IDL_tree_property_get(ident, "noscript") != NULL);
 
+    gboolean wantsJSContext =
+        (IDL_tree_property_get(ident, "implicit_jscontext") != NULL);
+
     if (!verify_attribute_declaration(state->tree))
         return FALSE;
 
@@ -1070,8 +1074,9 @@ typelib_attr_dcl(TreeState *state)
 
     meth = &id->method_descriptors[NEXT_METH(state)];
 
-    return typelib_attr_accessor(state, meth, TRUE, hidden) &&
-        (read_only || typelib_attr_accessor(state, meth + 1, FALSE, hidden));
+    return typelib_attr_accessor(state, meth, TRUE, hidden, wantsJSContext) &&
+        (read_only ||
+         typelib_attr_accessor(state, meth + 1, FALSE, hidden, wantsJSContext));
 }
 
 static gboolean
@@ -1087,6 +1092,8 @@ typelib_op_dcl(TreeState *state)
                             != NULL);
     gboolean op_noscript = (IDL_tree_property_get(op->ident, "noscript")
                             != NULL);
+    gboolean op_context = (IDL_tree_property_get(op->ident,
+                                                 "implicit_jscontext") != NULL);
     gboolean op_opt_argc = (IDL_tree_property_get(op->ident, "optional_argc")
                             != NULL);
 
@@ -1109,6 +1116,8 @@ typelib_op_dcl(TreeState *state)
         op_flags |= XPT_MD_NOTXPCOM;
     if (op_opt_argc)
         op_flags |= XPT_MD_OPT_ARGC;
+    if (op_context)
+        op_flags |= XPT_MD_CONTEXT;
 
     /* XXXshaver constructor? */
 
diff --git a/xpcom/typelib/xpt/public/xpt_struct.h b/xpcom/typelib/xpt/public/xpt_struct.h
index 69b883b52feb..7b67c2f21445 100644
--- a/xpcom/typelib/xpt/public/xpt_struct.h
+++ b/xpcom/typelib/xpt/public/xpt_struct.h
@@ -487,7 +487,8 @@ struct XPTMethodDescriptor {
 #define XPT_MD_CTOR     0x10
 #define XPT_MD_HIDDEN   0x08
 #define XPT_MD_OPT_ARGC 0x04
-#define XPT_MD_FLAGMASK 0xfc
+#define XPT_MD_CONTEXT  0x02
+#define XPT_MD_FLAGMASK 0xfe
 
 #define XPT_MD_IS_GETTER(flags)      (flags & XPT_MD_GETTER)
 #define XPT_MD_IS_SETTER(flags)      (flags & XPT_MD_SETTER)
@@ -495,6 +496,7 @@ struct XPTMethodDescriptor {
 #define XPT_MD_IS_CTOR(flags)        (flags & XPT_MD_CTOR)
 #define XPT_MD_IS_HIDDEN(flags)      (flags & XPT_MD_HIDDEN)
 #define XPT_MD_WANTS_OPT_ARGC(flags) (flags & XPT_MD_OPT_ARGC)
+#define XPT_MD_WANTS_CONTEXT(flags)  (flags & XPT_MD_CONTEXT)
 
 extern XPT_PUBLIC_API(PRBool)
 XPT_FillMethodDescriptor(XPTArena *arena, 
diff --git a/xpcom/typelib/xpt/tools/xpt_dump.c b/xpcom/typelib/xpt/tools/xpt_dump.c
index da083114b928..6beed51e0a2f 100644
--- a/xpcom/typelib/xpt/tools/xpt_dump.c
+++ b/xpcom/typelib/xpt/tools/xpt_dump.c
@@ -63,7 +63,7 @@ static char *type_array[32] =
              "wchar_t",     "void",        "reserved",    "reserved",
              "reserved",    "reserved",    "reserved",    "reserved",
              "reserved",    "reserved",    "reserved",    "reserved",
-             "reserved",    "reserved",    "reserved",    "reserved",
+             "reserved",    "reserved",    "jsval",       "reserved",
              "reserved",    "reserved",    "reserved",    "reserved"};
 
 static char *ptype_array[32] = 
@@ -73,7 +73,7 @@ static char *ptype_array[32] =
              "wchar_t *",   "void *",      "nsIID *",     "DOMString *",
              "string",      "wstring",     "Interface *", "InterfaceIs *",
              "array",       "string_s",    "wstring_s",   "UTF8String *",
-             "CString *",   "AString *",    "reserved",    "reserved",
+             "CString *",   "AString *",   "jsval *",     "reserved",
              "reserved",    "reserved",    "reserved",    "reserved"};
 
 static char *rtype_array[32] = 
@@ -83,7 +83,7 @@ static char *rtype_array[32] =
              "wchar_t &",   "void &",      "nsIID &",     "DOMString &",
              "string &",    "wstring &",   "Interface &", "InterfaceIs &",
              "array &",     "string_s &",  "wstring_s &", "UTF8String &",
-             "CString &",   "AString &",    "reserved",    "reserved",
+             "CString &",   "AString &",   "jsval &",     "reserved",
              "reserved",    "reserved",    "reserved",    "reserved"};
 
 PRBool param_problems = PR_FALSE;
@@ -579,6 +579,12 @@ XPT_DumpMethodDescriptor(XPTHeader *header, XPTMethodDescriptor *md,
         else 
             fprintf(stdout, "FALSE\n");
 
+        fprintf(stdout, "%*sWants JSContext?        ", indent, " ");
+        if (XPT_MD_WANTS_CONTEXT(md->flags))
+            fprintf(stdout, "TRUE\n");
+        else 
+            fprintf(stdout, "FALSE\n");
+
         fprintf(stdout, "%*s# of arguments:   %d\n", indent, " ", md->num_args);
         fprintf(stdout, "%*sParameter Descriptors:\n", indent, " ");
         
@@ -602,13 +608,14 @@ XPT_DumpMethodDescriptor(XPTHeader *header, XPTMethodDescriptor *md,
         if (!XPT_GetStringForType(header, &md->result->type, id, &param_type)) {
             return PR_FALSE;
         }
-        fprintf(stdout, "%*s%c%c%c%c%c%c %s %s(", indent - 6, " ",
+        fprintf(stdout, "%*s%c%c%c%c%c%c%c %s %s(", indent - 6, " ",
                 XPT_MD_IS_GETTER(md->flags) ? 'G' : ' ',
                 XPT_MD_IS_SETTER(md->flags) ? 'S' : ' ',
                 XPT_MD_IS_HIDDEN(md->flags) ? 'H' : ' ',
                 XPT_MD_IS_NOTXPCOM(md->flags) ? 'N' : ' ',
                 XPT_MD_IS_CTOR(md->flags) ? 'C' : ' ',
                 XPT_MD_WANTS_OPT_ARGC(md->flags) ? 'O' : ' ',
+                XPT_MD_WANTS_CONTEXT(md->flags) ? 'J' : ' ',
                 param_type, md->name);
         for (i=0; i<md->num_args; i++) {
             if (i!=0) {

From d4a7c32a219ae96bc2e8e538a964e7e9d8bf0c97 Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Mon, 28 Jun 2010 15:22:41 -0700
Subject: [PATCH 171/172] Bug 575399 - 'IndexedDB: Remove XPConnect slow paths
 from some IndexedDB methods'. r=sdwilsh

---
 dom/indexedDB/IDBCursor.cpp                | 158 +++----------
 dom/indexedDB/IDBCursor.h                  |   2 -
 dom/indexedDB/IDBEvents.cpp                | 165 +++++---------
 dom/indexedDB/IDBEvents.h                  |  10 +-
 dom/indexedDB/IDBIndex.cpp                 |   4 -
 dom/indexedDB/IDBObjectStore.cpp           | 245 ++++++++++-----------
 dom/indexedDB/IDBObjectStore.h             |  19 +-
 dom/indexedDB/nsIIDBCursor.idl             |  14 +-
 dom/indexedDB/nsIIDBObjectStore.idl        |  19 +-
 dom/indexedDB/nsIIDBSuccessEvent.idl       |   7 +-
 js/src/xpconnect/src/dom_quickstubs.qsconf |  12 +-
 11 files changed, 254 insertions(+), 401 deletions(-)

diff --git a/dom/indexedDB/IDBCursor.cpp b/dom/indexedDB/IDBCursor.cpp
index e23d63abd1f2..b6aab3da5a0c 100644
--- a/dom/indexedDB/IDBCursor.cpp
+++ b/dom/indexedDB/IDBCursor.cpp
@@ -324,65 +324,28 @@ IDBCursor::GetKey(nsIVariant** aKey)
 }
 
 NS_IMETHODIMP
-IDBCursor::GetValue(nsIVariant** aValue)
+IDBCursor::GetValue(JSContext* aCx,
+                    jsval* aValue)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
   nsresult rv;
 
   if (mType == INDEX) {
-    nsCOMPtr<nsIWritableVariant> variant =
-      do_CreateInstance(NS_VARIANT_CONTRACTID);
-    if (!variant) {
-      NS_ERROR("Couldn't create variant!");
-      return NS_ERROR_FAILURE;
-    }
-
     const Key& value = mKeyData[mDataIndex].value;
     NS_ASSERTION(!value.IsUnset() && !value.IsNull(), "Bad key!");
-    if (value.IsInt()) {
-      rv = variant->SetAsInt64(value.IntValue());
-    }
-    else if (value.IsString()) {
-      rv = variant->SetAsAString(value.StringValue());
-    }
-    else {
-      NS_NOTREACHED("Bad key type!");
-    }
+
+    rv = IDBObjectStore::GetJSValFromKey(value, aCx, aValue);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = variant->SetWritable(PR_FALSE);;
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsIWritableVariant* result;
-    variant.forget(&result);
-    *aValue = result;
     return NS_OK;
   }
 
-  NS_WARNING("Using a slow path for GetValue! Fix this now!");
-
-  nsIXPConnect* xpc = nsContentUtils::XPConnect();
-  NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
-
-  nsAXPCNativeCallContext* cc;
-  rv = xpc->GetCurrentNativeCallContext(&cc);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(cc, NS_ERROR_UNEXPECTED);
-
-  jsval* retval;
-  rv = cc->GetRetValPtr(&retval);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   if (!mHaveCachedValue) {
-    JSContext* cx;
-    rv = cc->GetJSContext(&cx);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    JSAutoRequest ar(cx);
+    JSAutoRequest ar(aCx);
 
     if (!mJSRuntime) {
-      JSRuntime* rt = JS_GetRuntime(cx);
+      JSRuntime* rt = JS_GetRuntime(aCx);
 
       JSBool ok = JS_AddNamedRootRT(rt, &mCachedValue,
                                    "IDBCursor::mCachedValue");
@@ -392,19 +355,19 @@ IDBCursor::GetValue(nsIVariant** aValue)
     }
 
     nsCOMPtr<nsIJSON> json(new nsJSON());
-    rv = json->DecodeToJSVal(mData[mDataIndex].value, cx, &mCachedValue);
+    rv = json->DecodeToJSVal(mData[mDataIndex].value, aCx, &mCachedValue);
     NS_ENSURE_SUCCESS(rv, rv);
 
     mHaveCachedValue = true;
   }
 
-  *retval = mCachedValue;
-  cc->SetReturnValueWasSet(PR_TRUE);
+  *aValue = mCachedValue;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-IDBCursor::Continue(nsIVariant* aKey,
+IDBCursor::Continue(jsval aKey,
+                    JSContext* aCx,
                     PRUint8 aOptionalArgCount,
                     PRBool* _retval)
 {
@@ -419,7 +382,7 @@ IDBCursor::Continue(nsIVariant* aKey,
   }
 
   Key key;
-  nsresult rv = IDBObjectStore::GetKeyFromVariant(aKey, key);
+  nsresult rv = IDBObjectStore::GetKeyFromJSVal(aKey, key);
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (key.IsNull()) {
@@ -448,7 +411,8 @@ IDBCursor::Continue(nsIVariant* aKey,
 }
 
 NS_IMETHODIMP
-IDBCursor::Update(nsIVariant* aValue,
+IDBCursor::Update(jsval aValue,
+                  JSContext* aCx,
                   nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@@ -469,38 +433,11 @@ IDBCursor::Update(nsIVariant* aValue,
   const Key& key = mData[mDataIndex].key;
   NS_ASSERTION(!key.IsUnset() && !key.IsNull(), "Bad key!");
 
-  // This is the slow path, need to do this better once XPIDL can have raw
-  // jsvals as arguments.
-  NS_WARNING("Using a slow path for Update! Fix this now!");
+  JSAutoRequest ar(aCx);
 
-  nsIXPConnect* xpc = nsContentUtils::XPConnect();
-  NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
-
-  nsAXPCNativeCallContext* cc;
-  nsresult rv = xpc->GetCurrentNativeCallContext(&cc);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(cc, NS_ERROR_UNEXPECTED);
-
-  PRUint32 argc;
-  rv = cc->GetArgc(&argc);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (argc < 1) {
-    return NS_ERROR_XPC_NOT_ENOUGH_ARGS;
-  }
-
-  jsval* argv;
-  rv = cc->GetArgvPtr(&argv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  JSContext* cx;
-  rv = cc->GetJSContext(&cx);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  JSAutoRequest ar(cx);
-
-  js::AutoValueRooter clone(cx);
-  rv = nsContentUtils::CreateStructuredClone(cx, argv[0], clone.addr());
+  js::AutoValueRooter clone(aCx);
+  nsresult rv = nsContentUtils::CreateStructuredClone(aCx, aValue,
+                                                      clone.addr());
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -512,58 +449,26 @@ IDBCursor::Update(nsIVariant* aValue,
     const jschar* keyPathChars = reinterpret_cast<const jschar*>(keyPath.get());
     const size_t keyPathLen = keyPath.Length();
 
-    js::AutoValueRooter prop(cx);
-    JSBool ok = JS_GetUCProperty(cx, JSVAL_TO_OBJECT(clone.value()),
+    js::AutoValueRooter prop(aCx);
+    JSBool ok = JS_GetUCProperty(aCx, JSVAL_TO_OBJECT(clone.value()),
                                  keyPathChars, keyPathLen, prop.addr());
     NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
 
     if (JSVAL_IS_VOID(prop.value())) {
-      if (key.IsInt()) {
-        ok = JS_NewNumberValue(cx, key.IntValue(), prop.addr());
-        NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
-      }
-      else if (key.IsString()) {
-        const nsString& keyString = key.StringValue();
-        JSString* str =
-          JS_NewUCStringCopyN(cx,
-                              reinterpret_cast<const jschar*>(keyString.get()),
-                              keyString.Length());
-        NS_ENSURE_TRUE(str, NS_ERROR_FAILURE);
+      rv = IDBObjectStore::GetJSValFromKey(key, aCx, prop.addr());
+      NS_ENSURE_SUCCESS(rv, rv);
 
-        prop.set(STRING_TO_JSVAL(str));
-      }
-      else {
-        NS_NOTREACHED("Bad key!");
-      }
-
-      ok = JS_DefineUCProperty(cx, JSVAL_TO_OBJECT(clone.value()), keyPathChars,
-                               keyPathLen, prop.value(), nsnull, nsnull,
-                               JSPROP_ENUMERATE);
+      ok = JS_DefineUCProperty(aCx, JSVAL_TO_OBJECT(clone.value()),
+                               keyPathChars, keyPathLen, prop.value(), nsnull,
+                               nsnull, JSPROP_ENUMERATE);
       NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
     }
+    else {
+      Key newKey;
+      rv = IDBObjectStore::GetKeyFromJSVal(prop.value(), newKey);
+      NS_ENSURE_SUCCESS(rv, rv);
 
-    if (JSVAL_IS_NULL(prop.value())) {
-      return NS_ERROR_INVALID_ARG;
-    }
-
-    if (JSVAL_IS_INT(prop.value())) {
-      if (!key.IsInt() || JSVAL_TO_INT(prop.value()) != key.IntValue()) {
-        return NS_ERROR_INVALID_ARG;
-      }
-    }
-
-    if (JSVAL_IS_DOUBLE(prop.value())) {
-      if (!key.IsInt() || *JSVAL_TO_DOUBLE(prop.value()) != key.IntValue()) {
-        return NS_ERROR_INVALID_ARG;
-      }
-    }
-
-    if (JSVAL_IS_STRING(prop.value())) {
-      if (!key.IsString()) {
-        return NS_ERROR_INVALID_ARG;
-      }
-
-      if (key.StringValue() != nsDependentJSString(prop.value())) {
+      if (newKey.IsUnset() || newKey.IsNull() || newKey != key) {
         return NS_ERROR_INVALID_ARG;
       }
     }
@@ -571,14 +476,13 @@ IDBCursor::Update(nsIVariant* aValue,
 
   nsTArray<IndexUpdateInfo> indexUpdateInfo;
   rv = IDBObjectStore::GetIndexUpdateInfo(mObjectStore->GetObjectStoreInfo(),
-                                          cx, clone.value(),
-                                          indexUpdateInfo);
+                                          aCx, clone.value(), indexUpdateInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIJSON> json(new nsJSON());
 
   nsString jsonValue;
-  rv = json->EncodeFromJSVal(clone.addr(), cx, jsonValue);
+  rv = json->EncodeFromJSVal(clone.addr(), aCx, jsonValue);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsRefPtr<IDBRequest> request = GenerateWriteRequest();
diff --git a/dom/indexedDB/IDBCursor.h b/dom/indexedDB/IDBCursor.h
index 9a877f5811cf..abdd2d62689e 100644
--- a/dom/indexedDB/IDBCursor.h
+++ b/dom/indexedDB/IDBCursor.h
@@ -43,8 +43,6 @@
 #include "mozilla/dom/indexedDB/IDBObjectStore.h"
 #include "nsIIDBCursor.h"
 
-#include "jsapi.h"
-
 class nsIRunnable;
 
 BEGIN_INDEXEDDB_NAMESPACE
diff --git a/dom/indexedDB/IDBEvents.cpp b/dom/indexedDB/IDBEvents.cpp
index d7707e38dd36..2e8cfadba92e 100644
--- a/dom/indexedDB/IDBEvents.cpp
+++ b/dom/indexedDB/IDBEvents.cpp
@@ -343,10 +343,24 @@ DOMCI_DATA(IDBSuccessEvent, IDBSuccessEvent)
 DOMCI_DATA(IDBTransactionEvent, IDBSuccessEvent)
 
 NS_IMETHODIMP
-IDBSuccessEvent::GetResult(nsIVariant** aResult)
+IDBSuccessEvent::GetResult(JSContext* aCx,
+                           jsval* aResult)
 {
-  nsCOMPtr<nsIVariant> result(mResult);
-  result.forget(aResult);
+  if (!mResult) {
+    *aResult = JSVAL_VOID;
+    return NS_OK;
+  }
+
+  nsIXPConnect* xpc = nsContentUtils::XPConnect();
+  NS_ENSURE_STATE(xpc);
+
+  JSAutoRequest ar(aCx);
+  JSObject* scope = JS_GetGlobalObject(aCx);
+  NS_ENSURE_STATE(scope);
+
+  nsresult rv = xpc->VariantToJS(aCx, scope, mResult, aResult);
+  NS_ENSURE_SUCCESS(rv, rv);
+
   return NS_OK;
 }
 
@@ -376,26 +390,11 @@ GetSuccessEvent::Init(IDBRequest* aRequest,
 }
 
 NS_IMETHODIMP
-GetSuccessEvent::GetResult(nsIVariant** /* aResult */)
+GetSuccessEvent::GetResult(JSContext* aCx,
+                           jsval* aResult)
 {
-  // This is the slow path, need to do this better once XPIDL can pass raw
-  // jsvals.
-  NS_WARNING("Using a slow path for GetResult! Fix this now!");
-
-  nsIXPConnect* xpc = nsContentUtils::XPConnect();
-  NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
-
-  nsAXPCNativeCallContext* cc;
-  nsresult rv = xpc->GetCurrentNativeCallContext(&cc);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(cc, NS_ERROR_UNEXPECTED);
-
-  jsval* retval;
-  rv = cc->GetRetValPtr(&retval);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   if (mValue.IsVoid()) {
-    *retval = JSVAL_VOID;
+    *aResult = JSVAL_VOID;
     return NS_OK;
   }
 
@@ -403,13 +402,9 @@ GetSuccessEvent::GetResult(nsIVariant** /* aResult */)
     nsString jsonValue = mValue;
     mValue.Truncate();
 
-    JSContext* cx;
-    rv = cc->GetJSContext(&cx);
-    NS_ENSURE_SUCCESS(rv, rv);
+    JSAutoRequest ar(aCx);
 
-    JSAutoRequest ar(cx);
-
-    JSRuntime* rt = JS_GetRuntime(cx);
+    JSRuntime* rt = JS_GetRuntime(aCx);
 
     JSBool ok = JS_AddNamedRootRT(rt, &mCachedValue,
                                   "GetSuccessEvent::mCachedValue");
@@ -418,7 +413,7 @@ GetSuccessEvent::GetResult(nsIVariant** /* aResult */)
     mJSRuntime = rt;
 
     nsCOMPtr<nsIJSON> json(new nsJSON());
-    rv = json->DecodeToJSVal(jsonValue, cx, &mCachedValue);
+    nsresult rv = json->DecodeToJSVal(jsonValue, aCx, &mCachedValue);
     if (NS_FAILED(rv)) {
       mCachedValue = JSVAL_VOID;
 
@@ -427,38 +422,18 @@ GetSuccessEvent::GetResult(nsIVariant** /* aResult */)
     }
   }
 
-  *retval = mCachedValue;
-  cc->SetReturnValueWasSet(PR_TRUE);
+  *aResult = mCachedValue;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GetAllSuccessEvent::GetResult(nsIVariant** /* aResult */)
+GetAllSuccessEvent::GetResult(JSContext* aCx,
+                              jsval* aResult)
 {
-  // This is the slow path, need to do this better once XPIDL can pass raw
-  // jsvals.
-  NS_WARNING("Using a slow path for GetResult! Fix this now!");
-
-  nsIXPConnect* xpc = nsContentUtils::XPConnect();
-  NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
-
-  nsAXPCNativeCallContext* cc;
-  nsresult rv = xpc->GetCurrentNativeCallContext(&cc);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(cc, NS_ERROR_UNEXPECTED);
-
-  jsval* retval;
-  rv = cc->GetRetValPtr(&retval);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   if (!mJSRuntime) {
-    JSContext* cx;
-    rv = cc->GetJSContext(&cx);
-    NS_ENSURE_SUCCESS(rv, rv);
+    JSAutoRequest ar(aCx);
 
-    JSAutoRequest ar(cx);
-
-    JSRuntime* rt = JS_GetRuntime(cx);
+    JSRuntime* rt = JS_GetRuntime(aCx);
 
     JSBool ok = JS_AddNamedRootRT(rt, &mCachedValue,
                                   "GetSuccessEvent::mCachedValue");
@@ -474,7 +449,7 @@ GetAllSuccessEvent::GetResult(nsIVariant** /* aResult */)
       return NS_ERROR_FAILURE;
     }
 
-    JSObject* array = JS_NewArrayObject(cx, 0, NULL);
+    JSObject* array = JS_NewArrayObject(aCx, 0, NULL);
     if (!array) {
       NS_ERROR("Failed to make array!");
       return NS_ERROR_FAILURE;
@@ -483,14 +458,14 @@ GetAllSuccessEvent::GetResult(nsIVariant** /* aResult */)
     mCachedValue = OBJECT_TO_JSVAL(array);
 
     if (!values.IsEmpty()) {
-      if (!JS_SetArrayLength(cx, array, jsuint(values.Length()))) {
+      if (!JS_SetArrayLength(aCx, array, jsuint(values.Length()))) {
         mCachedValue = JSVAL_VOID;
         NS_ERROR("Failed to set array length!");
         return NS_ERROR_FAILURE;
       }
 
       nsCOMPtr<nsIJSON> json(new nsJSON());
-      js::AutoValueRooter value(cx);
+      js::AutoValueRooter value(aCx);
 
       jsint count = jsint(values.Length());
 
@@ -498,14 +473,14 @@ GetAllSuccessEvent::GetResult(nsIVariant** /* aResult */)
         nsString jsonValue = values[index];
         values[index].Truncate();
 
-        rv = json->DecodeToJSVal(jsonValue, cx, value.addr());
+        nsresult rv = json->DecodeToJSVal(jsonValue, aCx, value.addr());
         if (NS_FAILED(rv)) {
           mCachedValue = JSVAL_VOID;
           NS_ERROR("Failed to decode!");
           return rv;
         }
 
-        if (!JS_SetElement(cx, array, index, value.addr())) {
+        if (!JS_SetElement(aCx, array, index, value.addr())) {
           mCachedValue = JSVAL_VOID;
           NS_ERROR("Failed to set array element!");
           return NS_ERROR_FAILURE;
@@ -514,38 +489,18 @@ GetAllSuccessEvent::GetResult(nsIVariant** /* aResult */)
     }
   }
 
-  *retval = mCachedValue;
-  cc->SetReturnValueWasSet(PR_TRUE);
+  *aResult = mCachedValue;
   return NS_OK;
 }
 
 NS_IMETHODIMP
-GetAllKeySuccessEvent::GetResult(nsIVariant** /* aResult */)
+GetAllKeySuccessEvent::GetResult(JSContext* aCx,
+                                 jsval* aResult)
 {
-  // This is the slow path, need to do this better once XPIDL can pass raw
-  // jsvals.
-  NS_WARNING("Using a slow path for GetResult! Fix this now!");
-
-  nsIXPConnect* xpc = nsContentUtils::XPConnect();
-  NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
-
-  nsAXPCNativeCallContext* cc;
-  nsresult rv = xpc->GetCurrentNativeCallContext(&cc);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(cc, NS_ERROR_UNEXPECTED);
-
-  jsval* retval;
-  rv = cc->GetRetValPtr(&retval);
-  NS_ENSURE_SUCCESS(rv, rv);
-
   if (!mJSRuntime) {
-    JSContext* cx;
-    rv = cc->GetJSContext(&cx);
-    NS_ENSURE_SUCCESS(rv, rv);
+    JSAutoRequest ar(aCx);
 
-    JSAutoRequest ar(cx);
-
-    JSRuntime* rt = JS_GetRuntime(cx);
+    JSRuntime* rt = JS_GetRuntime(aCx);
 
     JSBool ok = JS_AddNamedRootRT(rt, &mCachedValue,
                                   "GetSuccessEvent::mCachedValue");
@@ -561,7 +516,7 @@ GetAllKeySuccessEvent::GetResult(nsIVariant** /* aResult */)
       return NS_ERROR_FAILURE;
     }
 
-    JSObject* array = JS_NewArrayObject(cx, 0, NULL);
+    JSObject* array = JS_NewArrayObject(aCx, 0, NULL);
     if (!array) {
       NS_ERROR("Failed to make array!");
       return NS_ERROR_FAILURE;
@@ -570,13 +525,13 @@ GetAllKeySuccessEvent::GetResult(nsIVariant** /* aResult */)
     mCachedValue = OBJECT_TO_JSVAL(array);
 
     if (!keys.IsEmpty()) {
-      if (!JS_SetArrayLength(cx, array, jsuint(keys.Length()))) {
+      if (!JS_SetArrayLength(aCx, array, jsuint(keys.Length()))) {
         mCachedValue = JSVAL_VOID;
         NS_ERROR("Failed to set array length!");
         return NS_ERROR_FAILURE;
       }
 
-      js::AutoValueRooter value(cx);
+      js::AutoValueRooter value(aCx);
 
       jsint count = jsint(keys.Length());
 
@@ -584,40 +539,22 @@ GetAllKeySuccessEvent::GetResult(nsIVariant** /* aResult */)
         const Key& key = keys[index];
         NS_ASSERTION(!key.IsUnset() && !key.IsNull(), "Bad key!");
 
-        if (key.IsInt()) {
-          if (!JS_NewNumberValue(cx, key.IntValue(), value.addr())) {
-            mCachedValue = JSVAL_VOID;
-            NS_ERROR("Failed to make number value!");
-            return NS_ERROR_FAILURE;
-          }
-        }
-        else if (key.IsString()) {
-          const nsString& keyString = key.StringValue();
-          JSString* str = JS_NewUCStringCopyN(cx,
-                            reinterpret_cast<const jschar*>(keyString.get()),
-                            keyString.Length());
-          if (!str) {
-            mCachedValue = JSVAL_VOID;
-            NS_ERROR("Failed to make new string value!");
-            return NS_ERROR_FAILURE;
-          }
-
-          value.set(STRING_TO_JSVAL(str));
-        }
-        else {
-          NS_NOTREACHED("Bad key!");
-        }
-
-        if (!JS_SetElement(cx, array, index, value.addr())) {
+        nsresult rv = IDBObjectStore::GetJSValFromKey(key, aCx, value.addr());
+        if (NS_FAILED(rv)) {
           mCachedValue = JSVAL_VOID;
-          NS_ERROR("Failed to set array element!");
+          NS_WARNING("Failed to get jsval for key!");
+          return rv;
+        }
+
+        if (!JS_SetElement(aCx, array, index, value.addr())) {
+          mCachedValue = JSVAL_VOID;
+          NS_WARNING("Failed to set array element!");
           return NS_ERROR_FAILURE;
         }
       }
     }
   }
 
-  *retval = mCachedValue;
-  cc->SetReturnValueWasSet(PR_TRUE);
+  *aResult = mCachedValue;
   return NS_OK;
 }
diff --git a/dom/indexedDB/IDBEvents.h b/dom/indexedDB/IDBEvents.h
index 571197adc4b0..ce5ee4ef6d40 100644
--- a/dom/indexedDB/IDBEvents.h
+++ b/dom/indexedDB/IDBEvents.h
@@ -50,7 +50,6 @@
 #include "nsIRunnable.h"
 #include "nsIVariant.h"
 
-#include "jsapi.h"
 #include "nsDOMEvent.h"
 
 #include "mozilla/dom/indexedDB/IDBObjectStore.h"
@@ -155,7 +154,8 @@ public:
     }
   }
 
-  NS_IMETHOD GetResult(nsIVariant** aResult);
+  NS_IMETHOD GetResult(JSContext* aCx,
+                       jsval* aResult);
 
   nsresult Init(IDBRequest* aRequest,
                 IDBTransaction* aTransaction);
@@ -179,7 +179,8 @@ public:
     }
   }
 
-  NS_IMETHOD GetResult(nsIVariant** aResult);
+  NS_IMETHOD GetResult(JSContext* aCx,
+                       jsval* aResult);
 
 private:
   nsTArray<nsString> mValues;
@@ -196,7 +197,8 @@ public:
     }
   }
 
-  NS_IMETHOD GetResult(nsIVariant** aResult);
+  NS_IMETHOD GetResult(JSContext* aCx,
+                       jsval* aResult);
 
 private:
   nsTArray<Key> mKeys;
diff --git a/dom/indexedDB/IDBIndex.cpp b/dom/indexedDB/IDBIndex.cpp
index c6d9f6c38b52..d4c532215367 100644
--- a/dom/indexedDB/IDBIndex.cpp
+++ b/dom/indexedDB/IDBIndex.cpp
@@ -311,8 +311,6 @@ IDBIndex::Get(nsIVariant* aKey,
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
-  NS_WARNING("Using a slow path for Get! Fix this now!");
-
   Key key;
   nsresult rv = IDBObjectStore::GetKeyFromVariant(aKey, key);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -340,8 +338,6 @@ IDBIndex::GetObject(nsIVariant* aKey,
 {
   NS_PRECONDITION(NS_IsMainThread(), "Wrong thread!");
 
-  NS_WARNING("Using a slow path for Get! Fix this now!");
-
   Key key;
   nsresult rv = IDBObjectStore::GetKeyFromVariant(aKey, key);
   NS_ENSURE_SUCCESS(rv, rv);
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index 7216d023c02f..88f056ba748d 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -37,29 +37,26 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-// XXX remove once we can get jsvals out of XPIDL
-#include "jscntxt.h"
-#include "jsapi.h"
-#include "nsContentUtils.h"
-#include "nsJSON.h"
-#include "IDBEvents.h"
-
 #include "IDBObjectStore.h"
-#include "IDBIndex.h"
 
 #include "nsIIDBDatabaseException.h"
 #include "nsIJSContextStack.h"
 #include "nsIUUIDGenerator.h"
 #include "nsIVariant.h"
 
+#include "jscntxt.h"
+#include "mozilla/storage.h"
+#include "nsContentUtils.h"
 #include "nsDOMClassInfo.h"
+#include "nsJSON.h"
 #include "nsJSUtils.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
-#include "mozilla/storage.h"
 
 #include "AsyncConnectionHelper.h"
 #include "IDBCursor.h"
+#include "IDBEvents.h"
+#include "IDBIndex.h"
 #include "IDBKeyRange.h"
 #include "IDBTransaction.h"
 #include "DatabaseInfo.h"
@@ -67,10 +64,6 @@
 
 USING_INDEXEDDB_NAMESPACE
 
-BEGIN_INDEXEDDB_NAMESPACE
-
-END_INDEXEDDB_NAMESPACE
-
 namespace {
 
 class AddHelper : public AsyncConnectionHelper
@@ -289,33 +282,10 @@ GetKeyFromObject(JSContext* aCx,
   JSBool ok = JS_GetUCProperty(aCx, aObj, keyPathChars, keyPathLen, &key);
   NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
 
-  if (JSVAL_IS_VOID(key)) {
-    aKey = Key::UNSETKEY;
-    return NS_OK;
-  }
+  nsresult rv = IDBObjectStore::GetKeyFromJSVal(key, aKey);
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  if (JSVAL_IS_NULL(key)) {
-    aKey = Key::NULLKEY;
-    return NS_OK;
-  }
-
-  if (JSVAL_IS_INT(key)) {
-    aKey = JSVAL_TO_INT(key);
-    return NS_OK;
-  }
-
-  if (JSVAL_IS_DOUBLE(key)) {
-    aKey = *JSVAL_TO_DOUBLE(key);
-    return NS_OK;
-  }
-
-  if (JSVAL_IS_STRING(key)) {
-    aKey = nsDependentJSString(key);
-    return NS_OK;
-  }
-
-  // We only support those types.
-  return NS_ERROR_INVALID_ARG;
+  return NS_OK;
 }
 
 } // anonymous namespace
@@ -385,6 +355,71 @@ IDBObjectStore::GetKeyFromVariant(nsIVariant* aKeyVariant,
   return NS_OK;
 }
 
+// static
+nsresult
+IDBObjectStore::GetKeyFromJSVal(jsval aKeyVal,
+                                Key& aKey)
+{
+  if (JSVAL_IS_VOID(aKeyVal)) {
+    aKey = Key::UNSETKEY;
+  }
+  else if (JSVAL_IS_NULL(aKeyVal)) {
+    aKey = Key::NULLKEY;
+  }
+  else if (JSVAL_IS_STRING(aKeyVal)) {
+    aKey = nsDependentJSString(aKeyVal);
+  }
+  else if (JSVAL_IS_INT(aKeyVal)) {
+    aKey = JSVAL_TO_INT(aKeyVal);
+  }
+  else if (JSVAL_IS_DOUBLE(aKeyVal)) {
+    aKey = *JSVAL_TO_DOUBLE(aKeyVal);
+  }
+  else {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  return NS_OK;
+}
+
+// static
+nsresult
+IDBObjectStore::GetJSValFromKey(const Key& aKey,
+                                JSContext* aCx,
+                                jsval* aKeyVal)
+{
+  if (aKey.IsUnset()) {
+    *aKeyVal = JSVAL_VOID;
+    return NS_OK;
+  }
+
+  if (aKey.IsNull()) {
+    *aKeyVal = JSVAL_NULL;
+    return NS_OK;
+  }
+
+  if (aKey.IsInt()) {
+    JSBool ok = JS_NewNumberValue(aCx, aKey.IntValue(), aKeyVal);
+    NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
+    return NS_OK;
+  }
+
+  if (aKey.IsString()) {
+    const nsString& keyString = aKey.StringValue();
+    JSString* str =
+      JS_NewUCStringCopyN(aCx,
+                          reinterpret_cast<const jschar*>(keyString.get()),
+                          keyString.Length());
+    NS_ENSURE_TRUE(str, NS_ERROR_FAILURE);
+
+    *aKeyVal = STRING_TO_JSVAL(str);
+    return NS_OK;
+  }
+
+  NS_NOTREACHED("Unknown key type!");
+  return NS_ERROR_INVALID_ARG;
+}
+
 // static
 nsresult
 IDBObjectStore::GetJSONFromArg0(/* jsval arg0, */
@@ -473,17 +508,10 @@ IDBObjectStore::GetKeyPathValueFromJSON(const nsAString& aJSON,
                                value.addr());
   NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
 
-  if (JSVAL_IS_INT(value.value())) {
-    aValue = JSVAL_TO_INT(value.value());
-  }
-  else if (JSVAL_IS_DOUBLE(value.value())) {
-    aValue = *JSVAL_TO_DOUBLE(value.value());
-  }
-  else if (JSVAL_IS_STRING(value.value())) {
-    aValue = nsDependentJSString(value.value());
-  }
-  else {
-    // If the object doesn't have a value for our index then we leave it unset.
+  rv = GetKeyFromJSVal(value.value(), aValue);
+  if (NS_FAILED(rv) || aValue.IsNull()) {
+    // If the object doesn't have a value that we can use for our index then we
+    // leave it unset.
     aValue = Key::UNSETKEY;
   }
 
@@ -521,26 +549,8 @@ IDBObjectStore::GetIndexUpdateInfo(ObjectStoreInfo* aObjectStoreInfo,
       NS_ENSURE_TRUE(ok, NS_ERROR_FAILURE);
 
       Key value;
-
-      if (JSVAL_IS_INT(keyPathValue)) {
-        value = JSVAL_TO_INT(keyPathValue);
-      }
-      else if (JSVAL_IS_DOUBLE(keyPathValue)) {
-        value = *JSVAL_TO_DOUBLE(keyPathValue);
-      }
-      else if (JSVAL_IS_STRING(keyPathValue)) {
-        JSString* str = JSVAL_TO_STRING(keyPathValue);
-        size_t len = JS_GetStringLength(str);
-        if (len) {
-          const PRUnichar* chars =
-            reinterpret_cast<PRUnichar*>(JS_GetStringChars(str));
-          value = nsDependentString(chars, len);
-        }
-        else {
-          value = EmptyString();
-        }
-      }
-      else {
+      nsresult rv = GetKeyFromJSVal(keyPathValue, value);
+      if (NS_FAILED(rv) || value.IsUnset() || value.IsNull()) {
         // Not a value we can do anything with, ignore it.
         continue;
       }
@@ -708,58 +718,25 @@ IDBObjectStore::~IDBObjectStore()
 }
 
 nsresult
-IDBObjectStore::GetAddInfo(/* jsval aValue, */
-                           nsIVariant* aKeyVariant,
+IDBObjectStore::GetAddInfo(JSContext* aCx,
+                           jsval aValue,
+                           jsval aKeyVal,
                            nsString& aJSON,
                            Key& aKey,
                            nsTArray<IndexUpdateInfo>& aUpdateInfoArray)
 {
-  // This is the slow path, need to do this better once XPIDL can have raw
-  // jsvals as arguments.
-  NS_WARNING("Using a slow path for Add! Fix this now!");
+  JSAutoRequest ar(aCx);
 
-  nsIXPConnect* xpc = nsContentUtils::XPConnect();
-  NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
-
-  nsAXPCNativeCallContext* cc;
-  nsresult rv = xpc->GetCurrentNativeCallContext(&cc);
-  NS_ENSURE_SUCCESS(rv, rv);
-  NS_ENSURE_TRUE(cc, NS_ERROR_UNEXPECTED);
-
-  PRUint32 argc;
-  rv = cc->GetArgc(&argc);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (argc < 1) {
-    return NS_ERROR_XPC_NOT_ENOUGH_ARGS;
-  }
-
-  jsval* argv;
-  rv = cc->GetArgvPtr(&argv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  JSContext* cx;
-  rv = cc->GetJSContext(&cx);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  JSAutoRequest ar(cx);
-
-  js::AutoValueRooter clone(cx);
-  rv = nsContentUtils::CreateStructuredClone(cx, argv[0], clone.addr());
+  js::AutoValueRooter clone(aCx);
+  nsresult rv = nsContentUtils::CreateStructuredClone(aCx, aValue,
+                                                      clone.addr());
   if (NS_FAILED(rv)) {
     return rv;
   }
 
   if (mKeyPath.IsEmpty()) {
-    // Key was passed in.
-    if (argc < 2) {
-      // Actually, nothing was passed in, and we can skip this.
-      aKey = Key::UNSETKEY;
-    }
-    else {
-      rv = GetKeyFromVariant(aKeyVariant, aKey);
-      NS_ENSURE_SUCCESS(rv, rv);
-    }
+    rv = GetKeyFromJSVal(aKeyVal, aKey);
+    NS_ENSURE_SUCCESS(rv, rv);
   }
   else {
     // Inline keys live on the object. Make sure it is an object.
@@ -767,12 +744,12 @@ IDBObjectStore::GetAddInfo(/* jsval aValue, */
       return NS_ERROR_INVALID_ARG;
     }
 
-    rv = GetKeyFromObject(cx, JSVAL_TO_OBJECT(clone.value()), mKeyPath, aKey);
+    rv = GetKeyFromObject(aCx, JSVAL_TO_OBJECT(clone.value()), mKeyPath, aKey);
     NS_ENSURE_SUCCESS(rv, rv);
 
     // Except if null was passed, in which case we're supposed to generate the
     // key.
-    if (aKey.IsUnset() && argc >= 2 && JSVAL_IS_NULL(argv[1])) {
+    if (aKey.IsUnset() && JSVAL_IS_NULL(aKeyVal)) {
       aKey = Key::NULLKEY;
     }
   }
@@ -785,11 +762,11 @@ IDBObjectStore::GetAddInfo(/* jsval aValue, */
   ObjectStoreInfo* objectStoreInfo = GetObjectStoreInfo();
   NS_ENSURE_TRUE(objectStoreInfo, NS_ERROR_FAILURE);
 
-  rv = GetIndexUpdateInfo(objectStoreInfo, cx, clone.value(), aUpdateInfoArray);
+  rv = GetIndexUpdateInfo(objectStoreInfo, aCx, clone.value(), aUpdateInfoArray);
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIJSON> json(new nsJSON());
-  rv = json->EncodeFromJSVal(clone.addr(), cx, aJSON);
+  rv = json->EncodeFromJSVal(clone.addr(), aCx, aJSON);
   NS_ENSURE_SUCCESS(rv, rv);
 
   return NS_OK;
@@ -927,8 +904,10 @@ IDBObjectStore::GetAll(nsIIDBKeyRange* aKeyRange,
 }
 
 NS_IMETHODIMP
-IDBObjectStore::Add(nsIVariant* /* aValue */,
-                    nsIVariant* aKey,
+IDBObjectStore::Add(jsval aValue,
+                    jsval aKey,
+                    JSContext* aCx,
+                    PRUint8 aOptionalArgCount,
                     nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@@ -941,11 +920,15 @@ IDBObjectStore::Add(nsIVariant* /* aValue */,
     return NS_ERROR_OBJECT_IS_IMMUTABLE;
   }
 
+  if (aOptionalArgCount < 1) {
+    aKey = JSVAL_VOID;
+  }
+
   nsString jsonValue;
   Key key;
   nsTArray<IndexUpdateInfo> updateInfo;
 
-  nsresult rv = GetAddInfo(aKey, jsonValue, key, updateInfo);
+  nsresult rv = GetAddInfo(aCx, aValue, aKey, jsonValue, key, updateInfo);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -968,8 +951,10 @@ IDBObjectStore::Add(nsIVariant* /* aValue */,
 }
 
 NS_IMETHODIMP
-IDBObjectStore::Modify(nsIVariant* /* aValue */,
-                       nsIVariant* aKey,
+IDBObjectStore::Modify(jsval aValue,
+                       jsval aKey,
+                       JSContext* aCx,
+                       PRUint8 aOptionalArgCount,
                        nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@@ -982,11 +967,15 @@ IDBObjectStore::Modify(nsIVariant* /* aValue */,
     return NS_ERROR_OBJECT_IS_IMMUTABLE;
   }
 
+  if (aOptionalArgCount < 1) {
+    aKey = JSVAL_VOID;
+  }
+
   nsString jsonValue;
   Key key;
   nsTArray<IndexUpdateInfo> updateInfo;
 
-  nsresult rv = GetAddInfo(aKey, jsonValue, key, updateInfo);
+  nsresult rv = GetAddInfo(aCx, aValue, aKey, jsonValue, key, updateInfo);
   if (NS_FAILED(rv)) {
     return rv;
   }
@@ -1009,8 +998,10 @@ IDBObjectStore::Modify(nsIVariant* /* aValue */,
 }
 
 NS_IMETHODIMP
-IDBObjectStore::AddOrModify(nsIVariant* /* aValue */,
-                            nsIVariant* aKey,
+IDBObjectStore::AddOrModify(jsval aValue,
+                            jsval aKey,
+                            JSContext* aCx,
+                            PRUint8 aOptionalArgCount,
                             nsIIDBRequest** _retval)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
@@ -1023,11 +1014,15 @@ IDBObjectStore::AddOrModify(nsIVariant* /* aValue */,
     return NS_ERROR_OBJECT_IS_IMMUTABLE;
   }
 
+  if (aOptionalArgCount < 1) {
+    aKey = JSVAL_VOID;
+  }
+
   nsString jsonValue;
   Key key;
   nsTArray<IndexUpdateInfo> updateInfo;
 
-  nsresult rv = GetAddInfo(aKey, jsonValue, key, updateInfo);
+  nsresult rv = GetAddInfo(aCx, aValue, aKey, jsonValue, key, updateInfo);
   if (NS_FAILED(rv)) {
     return rv;
   }
diff --git a/dom/indexedDB/IDBObjectStore.h b/dom/indexedDB/IDBObjectStore.h
index 25f425c93cc2..2f508136c667 100644
--- a/dom/indexedDB/IDBObjectStore.h
+++ b/dom/indexedDB/IDBObjectStore.h
@@ -125,6 +125,11 @@ public:
     return false;
   }
 
+  bool operator!=(const Key& aOther) const
+  {
+    return !(*this == aOther);
+  }
+
   bool operator<(const Key& aOther) const
   {
     switch (mType) {
@@ -222,6 +227,15 @@ public:
   GetKeyFromVariant(nsIVariant* aKeyVariant,
                     Key& aKey);
 
+  static nsresult
+  GetKeyFromJSVal(jsval aKeyVal,
+                  Key& aKey);
+
+  static nsresult
+  GetJSValFromKey(const Key& aKey,
+                  JSContext* aCx,
+                  jsval* aKeyVal);
+
   static nsresult
   GetJSONFromArg0(/* jsval arg0, */
                   nsAString& aJSON);
@@ -284,8 +298,9 @@ protected:
   IDBObjectStore();
   ~IDBObjectStore();
 
-  nsresult GetAddInfo(/* jsval aValue, */
-                      nsIVariant* aKeyVariant,
+  nsresult GetAddInfo(JSContext* aCx,
+                      jsval aValue,
+                      jsval aKeyVal,
                       nsString& aJSON,
                       Key& aKey,
                       nsTArray<IndexUpdateInfo>& aUpdateInfoArray);
diff --git a/dom/indexedDB/nsIIDBCursor.idl b/dom/indexedDB/nsIIDBCursor.idl
index 7a77666ab51a..d104f071871b 100644
--- a/dom/indexedDB/nsIIDBCursor.idl
+++ b/dom/indexedDB/nsIIDBCursor.idl
@@ -42,6 +42,10 @@
 interface nsIIDBRequest;
 interface nsIVariant;
 
+%{C++
+#include "jsapi.h"
+%}
+
 /**
  * IDBCursor interface.  See
  * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-IDBCursor for more
@@ -58,7 +62,8 @@ interface nsIIDBCursor : nsISupports
 
   readonly attribute nsIVariant key;
 
-  readonly attribute nsIVariant value;
+  [implicit_jscontext]
+  readonly attribute jsval value;
 
   // Returns true always for non-preloaded cursors. Calling continue means that
   // the same onsuccess function will be called again with the new key/value
@@ -67,11 +72,12 @@ interface nsIIDBCursor : nsISupports
   // For preloaded cursors returns true if key/value have been set to new
   // values. If false then no more matches are available and getting the key,
   // value property will throw, as will calling update() and remove().
-  [optional_argc]
-  boolean continue([optional /* null */] in nsIVariant key);
+  [implicit_jscontext, optional_argc]
+  boolean continue([optional /* undefined */] in jsval key);
 
   // Success fires IDBTransactionEvent, result == key
-  nsIIDBRequest update(in nsIVariant value);
+  [implicit_jscontext]
+  nsIIDBRequest update(in jsval value);
 
   // Success fires IDBTransactionEvent, result == null
   nsIIDBRequest remove();
diff --git a/dom/indexedDB/nsIIDBObjectStore.idl b/dom/indexedDB/nsIIDBObjectStore.idl
index c56a59260890..e089f6c0ca7d 100644
--- a/dom/indexedDB/nsIIDBObjectStore.idl
+++ b/dom/indexedDB/nsIIDBObjectStore.idl
@@ -45,6 +45,10 @@ interface nsIIDBRequest;
 interface nsIVariant;
 interface nsIDOMDOMStringList;
 
+%{C++
+#include "jsapi.h"
+%}
+
 /**
  * nsIIDBObjectStore interface.  See
  * http://dev.w3.org/2006/webapi/WebSimpleDB/#idl-def-nsIIDBObjectStore
@@ -70,19 +74,22 @@ interface nsIIDBObjectStore : nsISupports
          [optional /* unlimited */] in unsigned long limit);
 
   // Success fires IDBTransactionEvent, result == key
+  [implicit_jscontext, optional_argc]
   nsIIDBRequest
-  add(in nsIVariant value,
-      [optional /* null */] in nsIVariant key);
+  add(in jsval value,
+      [optional /* undefined */] in jsval key);
 
   // Success fires IDBTransactionEvent, result == key
+  [implicit_jscontext, optional_argc]
   nsIIDBRequest
-  modify(in nsIVariant value,
-         [optional /* null */] in nsIVariant key);
+  modify(in jsval value,
+         [optional /* undefined */] in jsval key);
 
   // Success fires IDBTransactionEvent, result == key
+  [implicit_jscontext, optional_argc]
   nsIIDBRequest
-  addOrModify(in nsIVariant value,
-              [optional /* null */] in nsIVariant key);
+  addOrModify(in jsval value,
+              [optional /* undefined */] in jsval key);
 
   // Success fires IDBTransactionEvent, result == null
   nsIIDBRequest
diff --git a/dom/indexedDB/nsIIDBSuccessEvent.idl b/dom/indexedDB/nsIIDBSuccessEvent.idl
index af41f6002836..6ca2a3616d80 100644
--- a/dom/indexedDB/nsIIDBSuccessEvent.idl
+++ b/dom/indexedDB/nsIIDBSuccessEvent.idl
@@ -39,10 +39,13 @@
 
 #include "nsIIDBEvent.idl"
 
-interface nsIVariant;
+%{C++
+#include "jsapi.h"
+%}
 
 [scriptable, uuid(9275d34f-54e1-4ab0-b4ca-f8d4359eec9c)]
 interface nsIIDBSuccessEvent : nsIIDBEvent
 {
-  readonly attribute nsIVariant result;
+  [implicit_jscontext]
+  readonly attribute jsval result;
 };
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index b9a9e4773134..8f0a978f3115 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -469,20 +469,10 @@ members = [
     'nsIIDBKeyRange.*',
     'nsIIDBObjectStore.*',
     'nsIIDBRequest.*',
-# Remove once XPIDL can handle jsvals
-#    'nsIIDBSuccessEvent.*',
+    'nsIIDBSuccessEvent.*',
     'nsIIDBTransaction.*',
     'nsIIDBTransactionEvent.*',
     'nsIIDBFactory.*',
-# Remove once XPIDL can handle jsvals
-    '-nsIIDBObjectStore.add',
-    '-nsIIDBObjectStore.modify',
-    '-nsIIDBObjectStore.addOrModify',
-    '-nsIIDBCursor.continue',
-    '-nsIIDBCursor.value',
-    '-nsIIDBCursor.update',
-    '-nsIIDBIndex.openCursor',
-    '-nsIIDBIndex.openObjectCursor'
     ]
 
 # Most interfaces can be found by searching the includePath; to find

From 75a2c8a1a018328624944ad21e060f0835f9846d Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Mon, 28 Jun 2010 16:04:15 -0700
Subject: [PATCH 172/172] Bug 416330 - fix oranges.  CLOSED TREE. a=zpao
 r=sdwilsh

---
 .../url-classifier/src/nsUrlClassifierDBService.cpp           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
index 4b70dcb0ad95..863028875632 100644
--- a/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
@@ -579,8 +579,8 @@ nsUrlClassifierStore::Close()
   mPartialEntriesAfterStatement = nsnull;
   mPartialEntriesBeforeStatement = nsnull;
   mLastPartialEntriesStatement = nsnull;
-
   mRandomStatement = nsnull;
+  mGetPageSizeStatement = nsnull;
 
   mConnection = nsnull;
 }
@@ -3168,7 +3168,7 @@ nsUrlClassifierDBServiceWorker::SetupUpdate()
     NS_ENSURE_SUCCESS(rv, rv);
 
     NS_ASSERTION(hasResult, "Should always be able to get page size from sqlite");
-    PRUint32 pageSize = mGetTableIdStatement->AsInt32(0);
+    PRUint32 pageSize = mGetPageSizeStatement->AsInt32(0);
     PRUint32 cachePages = gUpdateCacheSize / pageSize;
     nsCAutoString cacheSizePragma("PRAGMA cache_size=");
     cacheSizePragma.AppendInt(cachePages);