Bug 993047 - Fix some style nits from f6b0e518f6d2.

--HG--
extra : rebase_source : 9cb1f3c793b066aed1836c08cce786554d61cfd2
This commit is contained in:
Peter Van der Beken 2014-04-08 20:39:38 +02:00
parent 27b28b1c13
commit 8d80d59d7f
2 changed files with 4 additions and 4 deletions

View File

@ -1942,11 +1942,11 @@ nsGlobalWindow::TraceGlobalJSObject(JSTracer* aTrc)
/* static */ /* static */
JSObject* JSObject*
nsGlobalWindow::OuterObject(JSContext* aCx, JS::HandleObject aObj) nsGlobalWindow::OuterObject(JSContext* aCx, JS::Handle<JSObject*> aObj)
{ {
nsGlobalWindow *origWin; nsGlobalWindow* origWin;
UNWRAP_OBJECT(Window, aObj, origWin); UNWRAP_OBJECT(Window, aObj, origWin);
nsGlobalWindow *win = origWin->GetOuterWindowInternal(); nsGlobalWindow* win = origWin->GetOuterWindowInternal();
if (!win) { if (!win) {
// If we no longer have an outer window. No code should ever be // If we no longer have an outer window. No code should ever be

View File

@ -372,7 +372,7 @@ public:
virtual bool IsBlackForCC(bool aTracingNeeded = true); virtual bool IsBlackForCC(bool aTracingNeeded = true);
static JSObject* OuterObject(JSContext* aCx, JS::HandleObject aObj); static JSObject* OuterObject(JSContext* aCx, JS::Handle<JSObject*> aObj);
// nsIScriptObjectPrincipal // nsIScriptObjectPrincipal
virtual nsIPrincipal* GetPrincipal(); virtual nsIPrincipal* GetPrincipal();