Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 126224, "NY Times web sites creates pop-up windows even if that feature is disabled"

Browse Source 
sr=jst, r=mstoltz, a=asa
Add "dom.disable_open_click_delay" pref to control how soon a window.open() call has to happen after a mouse button event in order for it to succeed.  Calls to window.open() that happen after this time has passed are denied.  Units are time in milliseconds.


git-svn-id: svn://10.0.0.236/trunk@116191 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rginda%netscape.com
2002-03-08 21:48:28 +00:00
parent 5b43746f49
commit 2f97bf3140
2 changed files with 51 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
mozilla/dom/src/base/nsGlobalWindow.cpp
View File

@@ -175,8 +175,9 @@ GlobalWindowImpl::GlobalWindowImpl() :
mScrollbars(nsnull), mTimeouts(nsnull), mTimeoutInsertionPoint(&mTimeouts),
mRunningTimeout(nsnull), mTimeoutPublicIdCounter(1), mTimeoutFiringDepth(0),
mTimeoutsWereCleared(PR_FALSE), mFirstDocumentLoad(PR_TRUE),
mIsScopeClear(PR_TRUE), mIsDocumentLoaded(PR_FALSE),
mFullScreen(PR_FALSE), mOriginalPos(nsnull), mOriginalSize(nsnull),
mIsScopeClear(PR_TRUE), mIsDocumentLoaded(PR_FALSE),
mLastMouseButtonAction(LL_ZERO), mFullScreen(PR_FALSE),
mOriginalPos(nsnull), mOriginalSize(nsnull),
mGlobalObjectOwner(nsnull),
mDocShell(nsnull), mMutationBits(0), mChromeEventHandler(nsnull)
{
@@ -662,6 +663,11 @@ GlobalWindowImpl::HandleDOMEvent(nsIPresContext* aPresContext,
if (aEvent->message == NS_PAGE_UNLOAD) {
mIsDocumentLoaded = PR_FALSE;
} else if ((aEvent->message >= NS_MOUSE_LEFT_BUTTON_UP &&
aEvent->message <= NS_MOUSE_RIGHT_BUTTON_DOWN) ||
(aEvent->message >= NS_MOUSE_LEFT_DOUBLECLICK &&
aEvent->message <= NS_MOUSE_RIGHT_CLICK)) {
mLastMouseButtonAction = PR_Now();
}
// Capturing stage
@@ -2467,18 +2473,47 @@ GlobalWindowImpl::DisableExternalCapture()
PRBool
GlobalWindowImpl::CheckForAbusePoint ()
{
nsCOMPtr<nsIDocShellTreeItem> item(do_QueryInterface(mDocShell));
if (item) {
PRInt32 type = nsIDocShellTreeItem::typeChrome;
item->GetItemType(&type);
if (type != nsIDocShellTreeItem::typeContent)
return PR_FALSE;
}
nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID));
if (!prefs)
return PR_FALSE;
if (!mIsDocumentLoaded || mRunningTimeout) {
nsCOMPtr<nsIDocShellTreeItem> item(do_QueryInterface(mDocShell));
if (item) {
PRInt32 type = nsIDocShellTreeItem::typeChrome;
item->GetItemType(&type);
if (type == nsIDocShellTreeItem::typeContent) {
PRBool blockOpenOnLoad = PR_FALSE;
prefs->GetBoolPref("dom.disable_open_during_load", &blockOpenOnLoad);
if (blockOpenOnLoad) {
#ifdef DEBUG
printf ("*** Scripts executed during (un)load or as a result of "
"setTimeout() are potential javascript abuse points.\n");
printf ("*** Scripts executed during (un)load or as a result of "
"setTimeout() are potential javascript abuse points.\n");
#endif
return PR_TRUE;
}
} else {
PRInt32 clickDelay = 0;
prefs->GetIntPref("dom.disable_open_click_delay", &clickDelay);
if (clickDelay) {
PRTime now, ll_delta;
PRInt32 delta;
now = PR_Now();
LL_SUB(ll_delta, now, mLastMouseButtonAction);
LL_L2I(delta, ll_delta);
delta /= 1000;
if (delta > clickDelay)
{
#ifdef DEBUG
printf ("*** Scripts executed more than %ims after a mouse button "
"action are potential javascript abuse points (%i.)\n",
clickDelay, delta);
#endif
return PR_TRUE;
}
@@ -2508,20 +2543,11 @@ GlobalWindowImpl::Open(nsIDOMWindow **_retval)
* or onload/onunload), and the preference is enabled, block the window.open().
*/
if (CheckForAbusePoint()) {
nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID));
if (prefs) {
PRBool blockOpenOnLoad = PR_FALSE;
prefs->GetBoolPref("dom.disable_open_during_load", &blockOpenOnLoad);
if (blockOpenOnLoad) {
#ifdef DEBUG
printf ("*** Blocking window.open.\n");
printf ("*** Blocking window.open.\n");
#endif
*_retval = nsnull;
return NS_OK;
}
}
*_retval = nsnull;
return NS_OK;
}
nsCOMPtr<nsIXPCNativeCallContext> ncc;

1
mozilla/dom/src/base/nsGlobalWindow.h
View File

@@ -283,6 +283,7 @@ protected:
PRPackedBool mFirstDocumentLoad;
PRPackedBool mIsScopeClear;
PRPackedBool mIsDocumentLoaded; // true between onload and onunload events
PRTime mLastMouseButtonAction;
PRPackedBool mFullScreen;
nsString mStatus;
nsString mDefaultStatus;