From b1d36a593b8d5aa7cb11c3ad052a6de27ee6bc9e Mon Sep 17 00:00:00 2001
From: Jose Cortes <escozzia@gmail.com>
Date: Tue, 2 Apr 2013 16:22:12 -0700
Subject: [PATCH] Bug 842186 - Replace use of jsval with JS::Value in h and cpp
 files in the dom/ipc/ dom/icc/ directories. r=jwalden

--HG--
extra : rebase_source : 0b853fadf33606b78f753064ea676354943e6063
---
 dom/icc/src/StkCommandEvent.cpp  | 2 +-
 dom/ipc/StructuredCloneUtils.cpp | 4 ++--
 dom/ipc/TabChild.cpp             | 2 +-
 dom/ipc/TabChild.h               | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dom/icc/src/StkCommandEvent.cpp b/dom/icc/src/StkCommandEvent.cpp
index 2db9e720971f..bfe719dcaf26 100644
--- a/dom/icc/src/StkCommandEvent.cpp
+++ b/dom/icc/src/StkCommandEvent.cpp
@@ -36,7 +36,7 @@ NS_INTERFACE_MAP_BEGIN(StkCommandEvent)
 NS_INTERFACE_MAP_END_INHERITING(nsDOMEvent)
 
 NS_IMETHODIMP
-StkCommandEvent::GetCommand(JSContext* aCx, jsval* aCommand)
+StkCommandEvent::GetCommand(JSContext* aCx, JS::Value* aCommand)
 
 {
   nsCOMPtr<nsIJSON> json(new nsJSON());
diff --git a/dom/ipc/StructuredCloneUtils.cpp b/dom/ipc/StructuredCloneUtils.cpp
index 3322e01cb4d8..cd6e688ccd06 100644
--- a/dom/ipc/StructuredCloneUtils.cpp
+++ b/dom/ipc/StructuredCloneUtils.cpp
@@ -57,7 +57,7 @@ Read(JSContext* aCx, JSStructuredCloneReader* aReader, uint32_t aTag,
     }
 #endif
 
-    jsval wrappedFile;
+    JS::Value wrappedFile;
     nsresult rv =
       nsContentUtils::WrapNative(aCx, JS_GetGlobalForScopeChain(aCx), file,
                                   &NS_GET_IID(nsIDOMFile), &wrappedFile);
@@ -89,7 +89,7 @@ Read(JSContext* aCx, JSStructuredCloneReader* aReader, uint32_t aTag,
     }
 #endif
 
-    jsval wrappedBlob;
+    JS::Value wrappedBlob;
     nsresult rv =
       nsContentUtils::WrapNative(aCx, JS_GetGlobalForScopeChain(aCx), blob,
                                   &NS_GET_IID(nsIDOMBlob), &wrappedBlob);
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 17e210f3bafc..9ec4a1f46318 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -1401,7 +1401,7 @@ TabChild::DispatchMessageManagerMessage(const nsAString& aMessageName,
                                         const nsACString& aJSONData)
 {
     JSAutoRequest ar(mCx);
-    jsval json = JSVAL_NULL;
+    JS::Value json = JSVAL_NULL;
     StructuredCloneData cloneData;
     JSAutoStructuredCloneBuffer buffer;
     if (JS_ParseJSON(mCx,
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index cb388f6c3a03..ef80a1d72a64 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -80,10 +80,10 @@ public:
   NS_FORWARD_SAFE_NSIMESSAGELISTENERMANAGER(mMessageManager)
   NS_FORWARD_SAFE_NSIMESSAGESENDER(mMessageManager)
   NS_IMETHOD SendSyncMessage(const nsAString& aMessageName,
-                             const jsval& aObject,
+                             const JS::Value& aObject,
                              JSContext* aCx,
                              uint8_t aArgc,
-                             jsval* aRetval)
+                             JS::Value* aRetval)
   {
     return mMessageManager
       ? mMessageManager->SendSyncMessage(aMessageName, aObject, aCx, aArgc, aRetval)