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 12002e126b39 (bug 769298)

Browse Source
This commit is contained in:
Josh Matthews 2012-10-18 17:27:23 -04:00
parent 9b0476d15a
commit 17184e0206
5 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/xpconnect/idl/nsIScriptError.idl
View File

@ -11,7 +11,7 @@
#include "nsISupports.idl"
#include "nsIConsoleMessage.idl"
[scriptable, uuid(ec640482-be5f-49a0-a9cb-c87eacce9291)]
[scriptable, uuid(ddc19b34-e22e-46d5-9f7f-c7768a7dc50a)]
interface nsIScriptError : nsIConsoleMessage
{
/** pseudo-flag for default case */
@ -66,8 +66,6 @@ interface nsIScriptError : nsIConsoleMessage
returned if init() was used instead of initWithWindowID(). */
readonly attribute unsigned long long innerWindowID;
readonly attribute boolean isFromPrivateWindow;
void init(in AString message,
in AString sourceName,
in AString sourceLine,

16
js/xpconnect/src/nsScriptError.cpp
View File

@ -11,8 +11,6 @@
#include "xpcprivate.h"
#include "nsGlobalWindow.h"
#include "nsPIDOMWindow.h"
#include "nsILoadContext.h"
#include "nsIDocShell.h"
NS_IMPL_THREADSAFE_ISUPPORTS2(nsScriptError, nsIConsoleMessage, nsIScriptError)
@ -26,8 +24,7 @@ nsScriptError::nsScriptError()
mCategory(),
mOuterWindowID(0),
mInnerWindowID(0),
mTimeStamp(0),
mIsFromPrivateWindow(false)
mTimeStamp(0)
{
}
@ -133,10 +130,6 @@ nsScriptError::InitWithWindowID(const nsAString& message,
nsPIDOMWindow* outer = window->GetOuterWindow();
if (outer)
mOuterWindowID = outer->WindowID();
nsIDocShell* docShell = window->GetDocShell();
nsCOMPtr<nsILoadContext> loadContext = do_QueryInterface(docShell);
mIsFromPrivateWindow = loadContext->UsePrivateBrowsing();
}
}
@ -224,10 +217,3 @@ nsScriptError::GetTimeStamp(int64_t *aTimeStamp)
*aTimeStamp = mTimeStamp;
return NS_OK;
}
NS_IMETHODIMP
nsScriptError::GetIsFromPrivateWindow(bool *aIsFromPrivateWindow)
{
*aIsFromPrivateWindow = mIsFromPrivateWindow;
return NS_OK;
}

1
js/xpconnect/src/xpcprivate.h
View File

@ -3870,7 +3870,6 @@ private:
uint64_t mOuterWindowID;
uint64_t mInnerWindowID;
int64_t mTimeStamp;
bool mIsFromPrivateWindow;
};
/******************************************************************************

9
toolkit/components/console/content/consoleBindings.xml
View File

@ -162,13 +162,7 @@
// filter chrome urls
if (!this.showChromeErrors && scriptError.sourceName.substr(0, 9) == "chrome://")
return;
#ifdef MOZ_PER_WINDOW_PRIVATE_BROWSING
// filter private windows
if (scriptError.isFromPrivateWindow)
return;
#endif
this.appendError(scriptError);
} catch (ex) {
try {
@ -517,3 +511,4 @@
</binding>
</bindings>

2
toolkit/components/console/jar.mn
View File

@ -6,4 +6,4 @@ toolkit.jar:
content/global/console.js (content/console.js)
content/global/console.xul (content/console.xul)
content/global/console.css (content/console.css)
* content/global/consoleBindings.xml (content/consoleBindings.xml)
content/global/consoleBindings.xml (content/consoleBindings.xml)