wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 2335c842c06c due to test failures.

Browse Source
This commit is contained in:
Kyle Huey 2010-07-27 11:49:33 -07:00
parent 7ca8a2dc81
commit ccab7ad794
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/base/nsGlobalWindow.cpp
View File

@ -103,9 +103,7 @@
#include "nsIHTMLDocument.h"
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMHTMLElement.h"
#ifndef MOZ_IPC
#include "nsIDOMCrypto.h"
#endif
#include "nsIDOMDocument.h"
#include "nsIDOM3Document.h"
#include "nsIDOMNSDocument.h"
@ -390,10 +388,10 @@ static PRBool gDOMWindowDumpEnabled = PR_FALSE;
static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID);
static const char sJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1";
#ifndef MOZ_IPC
static const char kCryptoContractID[] = NS_CRYPTO_CONTRACTID;
static const char kPkcs11ContractID[] = NS_PKCS11_CONTRACTID;
#endif
static const char sPopStatePrefStr[] = "browser.history.allowPopState";
static PRBool
@ -1642,12 +1640,12 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
NS_ENSURE_TRUE(scx, NS_ERROR_NOT_INITIALIZED);
JSContext *cx = (JSContext *)scx->GetNativeContext();
#ifndef MOZ_IPC
// clear smartcard events, our document has gone away.
if (mCrypto) {
mCrypto->SetEnableSmartCardEvents(PR_FALSE);
}
#endif
if (!mDocument) {
// First document load.
@ -2946,10 +2944,6 @@ nsGlobalWindow::GetApplicationCache(nsIDOMOfflineResourceList **aApplicationCach
NS_IMETHODIMP
nsGlobalWindow::GetCrypto(nsIDOMCrypto** aCrypto)
{
#ifdef MOZ_IPC
return NS_ERROR_NOT_IMPLEMENTED;
#else
FORWARD_TO_OUTER(GetCrypto, (aCrypto), NS_ERROR_NOT_INITIALIZED);
if (!mCrypto) {
@ -2959,7 +2953,6 @@ nsGlobalWindow::GetCrypto(nsIDOMCrypto** aCrypto)
NS_IF_ADDREF(*aCrypto = mCrypto);
return NS_OK;
#endif
}
NS_IMETHODIMP

10
dom/base/nsGlobalWindow.h
View File

@ -83,9 +83,7 @@
#include "nsIScriptSecurityManager.h"
#include "nsIEventListenerManager.h"
#include "nsIDOMDocument.h"
#ifndef MOZ_IPC
#include "nsIDOMCrypto.h"
#endif
#include "nsIPrincipal.h"
#include "nsPluginArray.h"
#include "nsMimeTypeArray.h"
@ -133,10 +131,6 @@ class nsRunnable;
class nsDOMOfflineResourceList;
class nsGeolocation;
#ifdef MOZ_IPC
class nsIDOMCrypto;
#endif
extern nsresult
NS_CreateJSTimeoutHandler(nsGlobalWindow *aWindow,
PRBool *aIsInterval,
@ -795,9 +789,9 @@ protected:
nsString mDefaultStatus;
// index 0->language_id 1, so index MAX-1 == language_id MAX
nsGlobalWindowObserver* mObserver;
#ifndef MOZ_IPC
nsCOMPtr<nsIDOMCrypto> mCrypto;
#endif
nsCOMPtr<nsIDOMStorage> mLocalStorage;
nsCOMPtr<nsIDOMStorage> mSessionStorage;