Commit 352b5b2d authored by Ms2ger's avatar Ms2ger
Browse files

Backout bug 675075 for bustage

parent 9f85d335

docshell/base/nsDocShell.cpp

+10 −10
Original line number Diff line number Diff line
@@ -215,14 +215,6 @@ 


#include "nsPluginError.h"

#include "nsContentUtils.h"

#include "nsContentErrors.h"

#include "nsIChannelPolicy.h"

#include "nsIContentSecurityPolicy.h"



#include "nsXULAppAPI.h"



#include "nsDOMNavigationTiming.h"

#include "nsITimedChannel.h"



static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,

                     NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
@@ -233,6 +225,15 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); 
#define DEBUG_PAGE_CACHE

#endif



#include "nsContentErrors.h"

#include "nsIChannelPolicy.h"

#include "nsIContentSecurityPolicy.h"



#include "nsXULAppAPI.h"



#include "nsDOMNavigationTiming.h"

#include "nsITimedChannel.h"



using namespace mozilla;



// Number of documents currently loading
@@ -921,8 +922,7 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID & aIID, void **aSink) 
        *aSink = mScriptGlobal;

    }

    else if ((aIID.Equals(NS_GET_IID(nsPIDOMWindow)) ||

              aIID.Equals(NS_GET_IID(nsIDOMWindow)) ||

              aIID.Equals(NS_GET_IID(nsIDOMWindowInternal))) &&

              aIID.Equals(NS_GET_IID(nsIDOMWindow))) &&

             NS_SUCCEEDED(EnsureScriptEnvironment())) {

        return mScriptGlobal->QueryInterface(aIID, aSink);

    }

dom/base/nsGlobalWindow.cpp

+2 −13
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ using mozilla::TimeDuration; 


nsIDOMStorageList *nsGlobalWindow::sGlobalStorageList  = nsnull;

nsGlobalWindow::WindowByIdTable *nsGlobalWindow::sWindowsById = nsnull;

bool nsGlobalWindow::sWarnedAboutWindowInternal = false;



static nsIEntropyCollector *gEntropyCollector          = nsnull;

static PRInt32              gRefCnt                    = 0;
@@ -1349,17 +1348,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow) 
  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIScriptGlobalObject)

  NS_INTERFACE_MAP_ENTRY(nsIDOMWindow)

  NS_INTERFACE_MAP_ENTRY(nsIDOMJSWindow)

  if (aIID.Equals(NS_GET_IID(nsIDOMWindowInternal))) {

    foundInterface = static_cast<nsIDOMWindowInternal*>(this);

    if (!sWarnedAboutWindowInternal) {

      sWarnedAboutWindowInternal = true;

      nsContentUtils::ReportToConsole(nsContentUtils::eDOM_PROPERTIES,

                                      "nsIDOMWindowInternalWarning",

                                      nsnull, 0, nsnull, EmptyString(), 0, 0,

                                      nsIScriptError::warningFlag,

                                      "Extensions", mWindowID);

    }

  } else

  NS_INTERFACE_MAP_ENTRY(nsIScriptGlobalObject)

  NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal)

  NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget)
@@ -4938,7 +4926,8 @@ nsGlobalWindow::Focus() 
    return NS_OK;

  }



  nsIDOMWindow *caller = nsContentUtils::GetWindowFromCaller();

  nsIDOMWindow *caller =

    static_cast<nsIDOMWindow*>(nsContentUtils::GetWindowFromCaller());

  nsCOMPtr<nsIDOMWindow> opener;

  GetOpener(getter_AddRefs(opener));

dom/base/nsGlobalWindow.h

+0 −1
Original line number Diff line number Diff line
@@ -967,7 +967,6 @@ protected: 
  static nsIDOMStorageList* sGlobalStorageList;



  static WindowByIdTable* sWindowsById;

  static bool sWarnedAboutWindowInternal;

};



/*

dom/base/nsPIDOMWindow.h

+3 −3
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ class nsIArray; 
class nsPIWindowRoot;



#define NS_PIDOMWINDOW_IID \

{ 0xeee816d2, 0x2f08, 0x4b34, \

  { 0x97, 0x47, 0x5e, 0x5a, 0xcd, 0xc3, 0x56, 0xfa } }

{ 0x1bfacc26, 0xad77, 0x42bb, \

  { 0xb9, 0xbb, 0xa0, 0x19, 0xc8, 0x27, 0x5c, 0x0e } }



class nsPIDOMWindow : public nsIDOMWindowInternal

class nsPIDOMWindow : public nsIDOMWindow

{

public:

  NS_DECLARE_STATIC_IID_ACCESSOR(NS_PIDOMWINDOW_IID)

dom/interfaces/base/nsIDOMWindow.idl

+0 −7
Original line number Diff line number Diff line
@@ -444,10 +444,3 @@ interface nsIDOMWindowPerformance : nsISupports 
   */

  readonly attribute nsIDOMPerformance performance;

};
 


/**

 * Empty interface for compatibility with older versions.

 * @deprecated Use nsIDOMWindow instead

 */

[scriptable, uuid(8614bdb7-5b07-4d00-a7ba-4d44697a343d)]

interface nsIDOMWindowInternal : nsIDOMWindow {};