Commit 9746f972 authored by Mounir Lamouri's avatar Mounir Lamouri
Browse files

Bug 670986 - Create nsLocation.h to declare nsLocation instead of doing that... 

Bug 670986 - Create nsLocation.h to declare nsLocation instead of doing that in nsGlobalWindow.h. r=jst
parent 7b1d1d6c

dom/base/nsDOMClassInfo.cpp

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#include "nsDOMWindowUtils.h"

#include "nsIDOMGlobalPropertyInitializer.h"

#include "mozilla/Preferences.h"

#include "nsLocation.h"



// Window scriptable helper includes

#include "nsIDocShell.h"

dom/base/nsGlobalWindow.cpp

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ 
#include "mozAutoDocUpdate.h"



#include "mozilla/Telemetry.h"

#include "nsLocation.h"



#ifdef PR_LOGGING

static PRLogModuleInfo* gDOMLeakPRLog;

dom/base/nsGlobalWindow.h

+0 −42
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
#include "nsIDOMNavigator.h"

#include "nsIDOMNavigatorGeolocation.h"

#include "nsIDOMNavigatorDesktopNotification.h"

#include "nsIDOMLocation.h"

#include "nsIInterfaceRequestor.h"

#include "nsIInterfaceRequestorUtils.h"

#include "nsIDOMJSWindow.h"
@@ -1090,47 +1089,6 @@ nsresult NS_GetNavigatorPlatform(nsAString& aPlatform); 
nsresult NS_GetNavigatorAppVersion(nsAString& aAppVersion);

nsresult NS_GetNavigatorAppName(nsAString& aAppName);



class nsIURI;



//*****************************************************************************

// nsLocation: Script "location" object

//*****************************************************************************



class nsLocation : public nsIDOMLocation

{

public:

  nsLocation(nsIDocShell *aDocShell);

  virtual ~nsLocation();



  NS_DECL_ISUPPORTS



  void SetDocShell(nsIDocShell *aDocShell);

  nsIDocShell *GetDocShell();



  // nsIDOMLocation

  NS_DECL_NSIDOMLOCATION



protected:

  // In the case of jar: uris, we sometimes want the place the jar was

  // fetched from as the URI instead of the jar: uri itself.  Pass in

  // PR_TRUE for aGetInnermostURI when that's the case.

  nsresult GetURI(nsIURI** aURL, PRBool aGetInnermostURI = PR_FALSE);

  nsresult GetWritableURI(nsIURI** aURL);

  nsresult SetURI(nsIURI* aURL, PRBool aReplace = PR_FALSE);

  nsresult SetHrefWithBase(const nsAString& aHref, nsIURI* aBase,

                           PRBool aReplace);

  nsresult SetHrefWithContext(JSContext* cx, const nsAString& aHref,

                              PRBool aReplace);



  nsresult GetSourceBaseURL(JSContext* cx, nsIURI** sourceURL);

  nsresult GetSourceDocument(JSContext* cx, nsIDocument** aDocument);



  nsresult CheckURL(nsIURI *url, nsIDocShellLoadInfo** aLoadInfo);



  nsString mCachedHash;

  nsWeakPtr mDocShell;

};



/* factory function */

nsresult

NS_NewScriptGlobalObject(PRBool aIsChrome, PRBool aIsModalContentWindow,

dom/base/nsLocation.cpp

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
 *

 * ***** END LICENSE BLOCK ***** */



#include "nsGlobalWindow.h"

#include "nsLocation.h"

#include "nsIScriptSecurityManager.h"

#include "nsIScriptContext.h"

#include "nsIDocShell.h"
@@ -56,7 +56,6 @@ 
#include "prmem.h"

#include "nsCOMPtr.h"

#include "nsEscape.h"

#include "nsJSUtils.h"

#include "nsIDOMWindow.h"

#include "nsIDOMDocument.h"

#include "nsIDocument.h"
@@ -72,6 +71,7 @@ 
#include "nsITextToSubURI.h"

#include "nsContentUtils.h"

#include "nsJSUtils.h"

#include "jsdbgapi.h"



static nsresult

GetContextFromStack(nsIJSContextStack *aStack, JSContext **aContext)

dom/base/nsLocation.h

0 → 100644
+97 −0
Original line number Diff line number Diff line 
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

/* vim: set ts=2 sw=2 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

 * Netscape Communications Corporation.

 * Portions created by the Initial Developer are Copyright (C) 1998

 * the Initial Developer. All Rights Reserved.

 *

 * Contributor(s):

 *   Travis Bogard <travis@netscape.com>

 *   Dan Rosen <dr@netscape.com>

 *   Vidur Apparao <vidur@netscape.com>

 *   Johnny Stenback <jst@netscape.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 nsLocation_h__

#define nsLocation_h__



#include "nsIDOMLocation.h"

#include "nsString.h"

#include "nsWeakReference.h"





class nsIURI;

class nsIDocShell;

struct JSContext;

class nsIDocument;

class nsIDocShellLoadInfo;



//*****************************************************************************

// nsLocation: Script "location" object

//*****************************************************************************



class nsLocation : public nsIDOMLocation

{

public:

  nsLocation(nsIDocShell *aDocShell);

  virtual ~nsLocation();



  NS_DECL_ISUPPORTS



  void SetDocShell(nsIDocShell *aDocShell);

  nsIDocShell *GetDocShell();



  // nsIDOMLocation

  NS_DECL_NSIDOMLOCATION



protected:

  // In the case of jar: uris, we sometimes want the place the jar was

  // fetched from as the URI instead of the jar: uri itself.  Pass in

  // PR_TRUE for aGetInnermostURI when that's the case.

  nsresult GetURI(nsIURI** aURL, PRBool aGetInnermostURI = PR_FALSE);

  nsresult GetWritableURI(nsIURI** aURL);

  nsresult SetURI(nsIURI* aURL, PRBool aReplace = PR_FALSE);

  nsresult SetHrefWithBase(const nsAString& aHref, nsIURI* aBase,

                           PRBool aReplace);

  nsresult SetHrefWithContext(JSContext* cx, const nsAString& aHref,

                              PRBool aReplace);



  nsresult GetSourceBaseURL(JSContext* cx, nsIURI** sourceURL);

  nsresult GetSourceDocument(JSContext* cx, nsIDocument** aDocument);



  nsresult CheckURL(nsIURI *url, nsIDocShellLoadInfo** aLoadInfo);



  nsString mCachedHash;

  nsWeakPtr mDocShell;

};



#endif // nsLocation_h__