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

Helping to fix 19114 by making a strong ref weak. Potential fix for 19268 by making scrollbars not steal focus. r=hyatt a=chofmann

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@55832 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
saari%netscape.com 1999-12-10 00:51:50 +00:00
parent 5399053fa1
commit 072f9f11f5
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,6 @@ static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID);
nsIFrame * gCurrentlyFocusedTargetFrame = 0;
nsIContent * gCurrentlyFocusedContent = 0; // Weak because it mirrors the strong mCurrentFocus
nsIPresContext * gCurrentlyFocusedPresContext = 0; // Strong
nsIContent * gLastFocusedContent = 0; // Strong reference
nsIDocument * gLastFocusedDocument = 0; // Strong reference
@ -127,8 +126,6 @@ nsEventStateManager::~nsEventStateManager()
if(mInstanceCount == 0) {
NS_IF_RELEASE(gLastFocusedContent);
NS_IF_RELEASE(gLastFocusedDocument);
NS_IF_RELEASE(gCurrentlyFocusedPresContext);
}
}
@ -1710,10 +1707,10 @@ nsEventStateManager::GetEventTarget(nsIFrame **aFrame)
NS_IMETHODIMP
nsEventStateManager::GetFocusedEventTarget(nsIFrame **aFrame)
{
if (!gCurrentlyFocusedTargetFrame && gCurrentlyFocusedContent && gCurrentlyFocusedPresContext) {
if (!gCurrentlyFocusedTargetFrame && gCurrentlyFocusedContent && gLastFocusedPresContext) {
nsCOMPtr<nsIPresShell> shell;
if (gCurrentlyFocusedPresContext) {
nsresult rv = gCurrentlyFocusedPresContext->GetShell(getter_AddRefs(shell));
if (gLastFocusedPresContext) {
nsresult rv = gLastFocusedPresContext->GetShell(getter_AddRefs(shell));
if (NS_SUCCEEDED(rv) && shell){
shell->GetPrimaryFrameFor(gCurrentlyFocusedContent, &gCurrentlyFocusedTargetFrame);
}
@ -1823,10 +1820,6 @@ nsEventStateManager::SetContentState(nsIContent *aContent, PRInt32 aState)
NS_IF_ADDREF(mCurrentFocus);
gCurrentlyFocusedContent = mCurrentFocus;
NS_IF_RELEASE(gCurrentlyFocusedPresContext);
gCurrentlyFocusedPresContext = mPresContext;
NS_IF_ADDREF(gCurrentlyFocusedPresContext);
}
}

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

@ -65,7 +65,6 @@ static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID);
nsIFrame * gCurrentlyFocusedTargetFrame = 0;
nsIContent * gCurrentlyFocusedContent = 0; // Weak because it mirrors the strong mCurrentFocus
nsIPresContext * gCurrentlyFocusedPresContext = 0; // Strong
nsIContent * gLastFocusedContent = 0; // Strong reference
nsIDocument * gLastFocusedDocument = 0; // Strong reference
@ -127,8 +126,6 @@ nsEventStateManager::~nsEventStateManager()
if(mInstanceCount == 0) {
NS_IF_RELEASE(gLastFocusedContent);
NS_IF_RELEASE(gLastFocusedDocument);
NS_IF_RELEASE(gCurrentlyFocusedPresContext);
}
}
@ -1710,10 +1707,10 @@ nsEventStateManager::GetEventTarget(nsIFrame **aFrame)
NS_IMETHODIMP
nsEventStateManager::GetFocusedEventTarget(nsIFrame **aFrame)
{
if (!gCurrentlyFocusedTargetFrame && gCurrentlyFocusedContent && gCurrentlyFocusedPresContext) {
if (!gCurrentlyFocusedTargetFrame && gCurrentlyFocusedContent && gLastFocusedPresContext) {
nsCOMPtr<nsIPresShell> shell;
if (gCurrentlyFocusedPresContext) {
nsresult rv = gCurrentlyFocusedPresContext->GetShell(getter_AddRefs(shell));
if (gLastFocusedPresContext) {
nsresult rv = gLastFocusedPresContext->GetShell(getter_AddRefs(shell));
if (NS_SUCCEEDED(rv) && shell){
shell->GetPrimaryFrameFor(gCurrentlyFocusedContent, &gCurrentlyFocusedTargetFrame);
}
@ -1823,10 +1820,6 @@ nsEventStateManager::SetContentState(nsIContent *aContent, PRInt32 aState)
NS_IF_ADDREF(mCurrentFocus);
gCurrentlyFocusedContent = mCurrentFocus;
NS_IF_RELEASE(gCurrentlyFocusedPresContext);
gCurrentlyFocusedPresContext = mPresContext;
NS_IF_ADDREF(gCurrentlyFocusedPresContext);
}
}

7
mozilla/xpfe/global/resources/skin/global.css
View File

@ -96,6 +96,11 @@ window.dialog {
}
*/
/******* Scrollbar *******/
scrollbar {
user-focus:ignore;
}
/******* ToolBox & ToolBar *******/
@ -1006,6 +1011,7 @@ treeitem > treerow > treecell > .tree-icon > .twisty {
margin: 0px;
width: 16px;
list-style-image: url("chrome://global/skin/closedtwisty.gif");
user-focus:ignore;
}
.twisty:hover {
@ -1301,3 +1307,4 @@ html|input[type=checkbox]:focus {
}