1
Index: mozilla/dom/base/nsGlobalWindow.cpp
2
===================================================================
3
--- mozilla.orig/dom/base/nsGlobalWindow.cpp 2009-09-29 14:11:50.000000000 -0400
4
+++ mozilla/dom/base/nsGlobalWindow.cpp 2009-09-29 14:13:23.000000000 -0400
10
-nsGlobalWindow::GetGlobalStorage(nsIDOMStorageList ** aGlobalStorage)
12
- NS_ENSURE_ARG_POINTER(aGlobalStorage);
15
- if (!sGlobalStorageList) {
16
- nsresult rv = NS_NewDOMStorageList(&sGlobalStorageList);
17
- NS_ENSURE_SUCCESS(rv, rv);
20
- *aGlobalStorage = sGlobalStorageList;
21
- NS_IF_ADDREF(*aGlobalStorage);
25
- return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
30
-nsGlobalWindow::GetLocalStorage(nsIDOMStorage ** aLocalStorage)
32
- FORWARD_TO_INNER(GetLocalStorage, (aLocalStorage), NS_ERROR_UNEXPECTED);
34
- NS_ENSURE_ARG(aLocalStorage);
36
- if (!mLocalStorage) {
37
- *aLocalStorage = nsnull;
41
- PRPackedBool unused;
42
- if (!nsDOMStorage::CanUseStorage(&unused))
43
- return NS_ERROR_DOM_SECURITY_ERR;
45
- nsIPrincipal *principal = GetPrincipal();
49
- nsCOMPtr<nsIDOMStorageManager> storageManager =
50
- do_GetService("@mozilla.org/dom/storagemanager;1", &rv);
51
- NS_ENSURE_SUCCESS(rv, rv);
53
- rv = storageManager->GetLocalStorageForPrincipal(principal, getter_AddRefs(mLocalStorage));
54
- NS_ENSURE_SUCCESS(rv, rv);
57
- NS_ADDREF(*aLocalStorage = mLocalStorage);
61
//*****************************************************************************
62
// nsGlobalWindow::nsIInterfaceRequestor
63
//*****************************************************************************
64
Index: mozilla/dom/interfaces/storage/nsIDOMStorageWindow.idl
65
===================================================================
66
--- mozilla.orig/dom/interfaces/storage/nsIDOMStorageWindow.idl 2009-09-29 14:12:06.000000000 -0400
67
+++ mozilla/dom/interfaces/storage/nsIDOMStorageWindow.idl 2009-09-29 14:13:23.000000000 -0400
69
* Session storage for the current browsing context.
71
readonly attribute nsIDOMStorage sessionStorage;
74
- * Global storage, accessible by domain.
76
- readonly attribute nsIDOMStorageList globalStorage;
79
- * Local storage for the current browsing context.
81
- readonly attribute nsIDOMStorage localStorage;
83
Index: mozilla/js/src/xpconnect/src/dom_quickstubs.qsconf
84
===================================================================
85
--- mozilla.orig/js/src/xpconnect/src/dom_quickstubs.qsconf 2009-09-29 14:12:16.000000000 -0400
86
+++ mozilla/js/src/xpconnect/src/dom_quickstubs.qsconf 2009-09-29 14:13:23.000000000 -0400
88
'nsIDOMStorage.clear',
89
'nsIDOMStorageItem.value',
90
'nsIDOMStorageWindow.sessionStorage',
91
- 'nsIDOMStorageWindow.globalStorage',
93
# dom/public/idl/stylesheets - None.