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

Fixing bug 51096 - crash after changing mousewheel prefs twice. Also remove some assertions and fix a longstanding inconsistency/bug with mousewheel text zoom and history navigation. r=ben.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@78653 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%uiuc.edu 2000-09-10 05:35:36 +00:00
parent bb456102e3
commit 42df5a5b22
2 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mozilla/content/events/src/nsEventStateManager.cpp
View File

@ -773,45 +773,49 @@ nsEventStateManager :: GenerateDragGesture ( nsIPresContext* aPresContext, nsGUI
nsresult
nsEventStateManager::ChangeTextSize(PRInt32 change)
{
if(!gLastFocusedDocument) return NS_ERROR_FAILURE;
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
gLastFocusedDocument->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
if(!ourGlobal) return NS_ERROR_FAILURE;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
NS_ENSURE_TRUE(ourWindow, NS_ERROR_FAILURE);
if(!ourWindow) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE);
if(!rootWindow) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindowInternal> windowContent;
rootWindow->Get_content(getter_AddRefs(windowContent));
NS_ENSURE_TRUE(windowContent, NS_ERROR_FAILURE);
if(!windowContent) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMDocument> domDoc;
windowContent->GetDocument(getter_AddRefs(domDoc));
NS_ENSURE_TRUE(domDoc, NS_ERROR_FAILURE);
if(!domDoc) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
if(!doc) return NS_ERROR_FAILURE;
nsCOMPtr<nsIPresShell> presShell = getter_AddRefs(doc->GetShellAt(0));
NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
if(!presShell) return NS_ERROR_FAILURE;
nsCOMPtr<nsIPresContext> presContext;
presShell->GetPresContext(getter_AddRefs(presContext));
NS_ENSURE_TRUE(presContext, NS_ERROR_FAILURE);
if(!presContext) return NS_ERROR_FAILURE;
nsCOMPtr<nsISupports> pcContainer;
presContext->GetContainer(getter_AddRefs(pcContainer));
NS_ENSURE_TRUE(pcContainer, NS_ERROR_FAILURE);
if(!pcContainer) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocShell> docshell(do_QueryInterface(pcContainer));
NS_ENSURE_TRUE(docshell, NS_ERROR_FAILURE);
if(!docshell) return NS_ERROR_FAILURE;
nsCOMPtr<nsIContentViewer> cv;
docshell->GetContentViewer(getter_AddRefs(cv));
NS_ENSURE_TRUE(cv, NS_ERROR_FAILURE);
if(!cv) return NS_ERROR_FAILURE;
nsCOMPtr<nsIMarkupDocumentViewer> mv(do_QueryInterface(cv));
NS_ENSURE_TRUE(mv, NS_ERROR_FAILURE);
if(!mv) return NS_ERROR_FAILURE;
float textzoom;
mv->GetTextZoom(&textzoom);
@ -1040,7 +1044,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext* aPresContext,
if (pcContainer) {
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(pcContainer));
if (webNav) {
if (numLines > 0)
if (msEvent->deltaLines > 0)
webNav->GoBack();
else
webNav->GoForward();
@ -1050,7 +1054,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext* aPresContext,
break;
case MOUSE_SCROLL_TEXTSIZE:
ChangeTextSize((numLines > 0) ? 1 : -1);
ChangeTextSize((msEvent->deltaLines > 0) ? 1 : -1);
break;
}
*aStatus = nsEventStatus_eConsumeNoDefault;

32
mozilla/layout/events/src/nsEventStateManager.cpp
View File

@ -773,45 +773,49 @@ nsEventStateManager :: GenerateDragGesture ( nsIPresContext* aPresContext, nsGUI
nsresult
nsEventStateManager::ChangeTextSize(PRInt32 change)
{
if(!gLastFocusedDocument) return NS_ERROR_FAILURE;
nsCOMPtr<nsIScriptGlobalObject> ourGlobal;
gLastFocusedDocument->GetScriptGlobalObject(getter_AddRefs(ourGlobal));
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
if(!ourGlobal) return NS_ERROR_FAILURE;
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(ourGlobal);
NS_ENSURE_TRUE(ourWindow, NS_ERROR_FAILURE);
if(!ourWindow) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindowInternal> rootWindow;
ourWindow->GetPrivateRoot(getter_AddRefs(rootWindow));
NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE);
if(!rootWindow) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMWindowInternal> windowContent;
rootWindow->Get_content(getter_AddRefs(windowContent));
NS_ENSURE_TRUE(windowContent, NS_ERROR_FAILURE);
if(!windowContent) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMDocument> domDoc;
windowContent->GetDocument(getter_AddRefs(domDoc));
NS_ENSURE_TRUE(domDoc, NS_ERROR_FAILURE);
if(!domDoc) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
if(!doc) return NS_ERROR_FAILURE;
nsCOMPtr<nsIPresShell> presShell = getter_AddRefs(doc->GetShellAt(0));
NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
if(!presShell) return NS_ERROR_FAILURE;
nsCOMPtr<nsIPresContext> presContext;
presShell->GetPresContext(getter_AddRefs(presContext));
NS_ENSURE_TRUE(presContext, NS_ERROR_FAILURE);
if(!presContext) return NS_ERROR_FAILURE;
nsCOMPtr<nsISupports> pcContainer;
presContext->GetContainer(getter_AddRefs(pcContainer));
NS_ENSURE_TRUE(pcContainer, NS_ERROR_FAILURE);
if(!pcContainer) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocShell> docshell(do_QueryInterface(pcContainer));
NS_ENSURE_TRUE(docshell, NS_ERROR_FAILURE);
if(!docshell) return NS_ERROR_FAILURE;
nsCOMPtr<nsIContentViewer> cv;
docshell->GetContentViewer(getter_AddRefs(cv));
NS_ENSURE_TRUE(cv, NS_ERROR_FAILURE);
if(!cv) return NS_ERROR_FAILURE;
nsCOMPtr<nsIMarkupDocumentViewer> mv(do_QueryInterface(cv));
NS_ENSURE_TRUE(mv, NS_ERROR_FAILURE);
if(!mv) return NS_ERROR_FAILURE;
float textzoom;
mv->GetTextZoom(&textzoom);
@ -1040,7 +1044,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext* aPresContext,
if (pcContainer) {
nsCOMPtr<nsIWebNavigation> webNav(do_QueryInterface(pcContainer));
if (webNav) {
if (numLines > 0)
if (msEvent->deltaLines > 0)
webNav->GoBack();
else
webNav->GoForward();
@ -1050,7 +1054,7 @@ nsEventStateManager::PostHandleEvent(nsIPresContext* aPresContext,
break;
case MOUSE_SCROLL_TEXTSIZE:
ChangeTextSize((numLines > 0) ? 1 : -1);
ChangeTextSize((msEvent->deltaLines > 0) ? 1 : -1);
break;
}
*aStatus = nsEventStatus_eConsumeNoDefault;