Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removing unused variables (bloat) and using nsLayoutAtoms::optionSelectedPseudo instead of

Browse Source 
using a string and creating and deleting it each time.
r=kmcclusk
This commit is contained in:
rods%netscape.com 1999-12-06 22:59:43 +00:00
parent 85da5d9cdf
commit 1788de88fc
6 changed files with 16 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
layout/forms/nsListControlFrame.cpp
View File

@ -51,6 +51,7 @@
#include "nsISupportsPrimitives.h"
#include "nsIComponentManager.h"
#include "nsILookAndFeel.h"
#include "nsLayoutAtoms.h"
#include "nsISelectElement.h"
@ -72,7 +73,8 @@ const PRInt32 kNoSizeSpecified = -1;
//XXX: This is temporary. It simulates psuedo states by using a attribute selector on
// -moz-option-selected in the ua.css style sheet. This will not be needed when
//The event state manager is functional. KMM
const char * kMozSelected = "-moz-option-selected";
//const char * kMozSelected = "-moz-option-selected";
// it is now using "nsLayoutAtoms::optionSelectedPseudo"
//---------------------------------------------------------
nsresult
@ -93,18 +95,15 @@ NS_NewListControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
//---------------------------------------------------------
nsListControlFrame::nsListControlFrame()
{
mHitFrame = nsnull;
mSelectedIndex = kNothingSelected;
mComboboxFrame = nsnull;
mFormFrame = nsnull;
mButtonDown = PR_FALSE;
mLastFrame = nsnull;
mMaxWidth = 0;
mMaxHeight = 0;
mPresContext = nsnull;
mEndExtendedIndex = kNothingSelected;
mStartExtendedIndex = kNothingSelected;
mIgnoreMouseUp = PR_FALSE;
mIsCapturingMouseEvents = PR_FALSE;
mSelectionCache = nsnull;
mSelectionCacheLength = -1;
@ -429,8 +428,6 @@ nsListControlFrame::Reflow(nsIPresContext* aPresContext,
padding.SizeTo(0, 0, 0, 0);
}
mBorderOffsetY = border.top;
scrolledAreaWidth -= (border.left + border.right + padding.left + padding.right);
scrolledAreaHeight -= (border.top + border.bottom);
@ -672,14 +669,12 @@ nsListControlFrame::DisplaySelected(nsIContent* aContent)
// -moz-option-selected in the ua.css style sheet. This will not be needed when
// The event state manager supports selected states. KMM
nsIAtom * selectedAtom = NS_NewAtom(kMozSelected);
if (PR_TRUE == mIsAllFramesHere) {
aContent->SetAttribute(kNameSpaceID_None, selectedAtom, "", PR_TRUE);
aContent->SetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, "", PR_TRUE);
//ForceRedraw();
} else {
aContent->SetAttribute(kNameSpaceID_None, selectedAtom, "", PR_FALSE);
aContent->SetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, "", PR_FALSE);
}
NS_RELEASE(selectedAtom);
}
//---------------------------------------------------------
@ -689,15 +684,12 @@ nsListControlFrame::DisplayDeselected(nsIContent* aContent)
//XXX: This is temporary. It simulates psuedo states by using a attribute selector on
// -moz-option-selected in the ua.css style sheet. This will not be needed when
// The event state manager is functional. KMM
nsIAtom * selectedAtom = NS_NewAtom(kMozSelected);
if (PR_TRUE == mIsAllFramesHere) {
aContent->UnsetAttribute(kNameSpaceID_None, selectedAtom, PR_TRUE);
aContent->UnsetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, PR_TRUE);
//ForceRedraw();
} else {
aContent->UnsetAttribute(kNameSpaceID_None, selectedAtom, PR_FALSE);
aContent->UnsetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, PR_FALSE);
}
NS_RELEASE(selectedAtom);
}
@ -1095,7 +1087,6 @@ nsListControlFrame::SetInitialChildList(nsIPresContext* aPresContext,
mHasBeenInitialized = PR_FALSE;
}
}
mContentFrame = aChildList;
nsresult rv = nsScrollFrame::SetInitialChildList(aPresContext, aListName, aChildList);
// If all the content is here now check
@ -1365,10 +1356,8 @@ PRBool
nsListControlFrame::IsContentSelected(nsIContent* aContent)
{
nsString value;
nsIAtom * selectedAtom = NS_NewAtom(kMozSelected);
//nsIAtom * selectedAtom = NS_NewAtom("selected");
nsresult result = aContent->GetAttribute(kNameSpaceID_None, selectedAtom, value);
NS_RELEASE(selectedAtom);
nsresult result = aContent->GetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, value);
return (NS_CONTENT_ATTR_NOT_THERE == result ? PR_FALSE : PR_TRUE);
}

7
layout/forms/nsListControlFrame.h
View File

@ -221,23 +221,18 @@ protected:
nsresult SelectionChanged(nsIContent* aContent);
// Data Members
nscoord mBorderOffsetY;
nsFormFrame* mFormFrame;
PRInt32 mSelectedIndex;
PRInt32 mOldSelectedIndex;
PRInt32 mSelectedIndexWhenPoppedDown;
PRInt32 mStartExtendedIndex;
PRInt32 mEndExtendedIndex;
nsIFrame* mHitFrame;
PRBool mIsInitializedFromContent;
nsIFrame* mContentFrame;
nsIComboboxControlFrame *mComboboxFrame;
PRBool mButtonDown;
nsIFrame* mLastFrame;
nscoord mMaxWidth;
nscoord mMaxHeight;
PRBool mIsCapturingMouseEvents;
PRBool mIgnoreMouseUp;
PRBool* mSelectionCache;
PRInt32 mSelectionCacheLength;
@ -245,8 +240,6 @@ protected:
PRBool mIsAllFramesHere;
PRBool mHasBeenInitialized;
nsIFrame * mMainChild;
nsIPresContext* mPresContext; // XXX: Remove the need to cache the pres context.
// XXX temprary only until full system mouse capture works

7
layout/html/forms/src/nsGfxListControlFrame.cpp
View File

@ -95,18 +95,15 @@ NS_NewGfxListControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
//---------------------------------------------------------
nsGfxListControlFrame::nsGfxListControlFrame()
{
mHitFrame = nsnull;
mSelectedIndex = kNothingSelected;
mComboboxFrame = nsnull;
mFormFrame = nsnull;
mButtonDown = PR_FALSE;
mLastFrame = nsnull;
mMaxWidth = 0;
mMaxHeight = 0;
mPresContext = nsnull;
mEndExtendedIndex = kNothingSelected;
mStartExtendedIndex = kNothingSelected;
mIgnoreMouseUp = PR_FALSE;
mIsCapturingMouseEvents = PR_FALSE;
mSelectionCache = nsnull;
mSelectionCacheLength = -1;
@ -448,9 +445,6 @@ nsGfxListControlFrame::Reflow(nsIPresContext* aPresContext,
padding.SizeTo(0, 0, 0, 0);
}
mBorderOffsetY = border.top;
// Now the scrolledAreaWidth and scrolledAreaHeight are exactly
// wide and high enough to enclose their contents
@ -1121,7 +1115,6 @@ nsGfxListControlFrame::SetInitialChildList(nsIPresContext* aPresContext,
}
}
mContentFrame = aChildList;
nsresult rv = nsHTMLContainerFrame::SetInitialChildList(aPresContext, aListName, aChildList);
// If all the content is here now check

7
layout/html/forms/src/nsGfxListControlFrame.h
View File

@ -222,23 +222,18 @@ protected:
nsresult SelectionChanged(nsIContent* aContent);
// Data Members
nscoord mBorderOffsetY;
nsFormFrame* mFormFrame;
PRInt32 mSelectedIndex;
PRInt32 mOldSelectedIndex;
PRInt32 mSelectedIndexWhenPoppedDown;
PRInt32 mStartExtendedIndex;
PRInt32 mEndExtendedIndex;
nsIFrame* mHitFrame;
PRBool mIsInitializedFromContent;
nsIFrame* mContentFrame;
nsIComboboxControlFrame *mComboboxFrame;
PRBool mButtonDown;
nsIFrame* mLastFrame;
nscoord mMaxWidth;
nscoord mMaxHeight;
PRBool mIsCapturingMouseEvents;
PRBool mIgnoreMouseUp;
PRBool* mSelectionCache;
PRInt32 mSelectionCacheLength;
@ -246,8 +241,6 @@ protected:
PRBool mIsAllFramesHere;
PRBool mHasBeenInitialized;
nsIFrame * mMainChild;
nsIPresContext* mPresContext; // XXX: Remove the need to cache the pres context.
// XXX temprary only until full system mouse capture works

27
layout/html/forms/src/nsListControlFrame.cpp
View File

@ -51,6 +51,7 @@
#include "nsISupportsPrimitives.h"
#include "nsIComponentManager.h"
#include "nsILookAndFeel.h"
#include "nsLayoutAtoms.h"
#include "nsISelectElement.h"
@ -72,7 +73,8 @@ const PRInt32 kNoSizeSpecified = -1;
//XXX: This is temporary. It simulates psuedo states by using a attribute selector on
// -moz-option-selected in the ua.css style sheet. This will not be needed when
//The event state manager is functional. KMM
const char * kMozSelected = "-moz-option-selected";
//const char * kMozSelected = "-moz-option-selected";
// it is now using "nsLayoutAtoms::optionSelectedPseudo"
//---------------------------------------------------------
nsresult
@ -93,18 +95,15 @@ NS_NewListControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
//---------------------------------------------------------
nsListControlFrame::nsListControlFrame()
{
mHitFrame = nsnull;
mSelectedIndex = kNothingSelected;
mComboboxFrame = nsnull;
mFormFrame = nsnull;
mButtonDown = PR_FALSE;
mLastFrame = nsnull;
mMaxWidth = 0;
mMaxHeight = 0;
mPresContext = nsnull;
mEndExtendedIndex = kNothingSelected;
mStartExtendedIndex = kNothingSelected;
mIgnoreMouseUp = PR_FALSE;
mIsCapturingMouseEvents = PR_FALSE;
mSelectionCache = nsnull;
mSelectionCacheLength = -1;
@ -429,8 +428,6 @@ nsListControlFrame::Reflow(nsIPresContext* aPresContext,
padding.SizeTo(0, 0, 0, 0);
}
mBorderOffsetY = border.top;
scrolledAreaWidth -= (border.left + border.right + padding.left + padding.right);
scrolledAreaHeight -= (border.top + border.bottom);
@ -672,14 +669,12 @@ nsListControlFrame::DisplaySelected(nsIContent* aContent)
// -moz-option-selected in the ua.css style sheet. This will not be needed when
// The event state manager supports selected states. KMM
nsIAtom * selectedAtom = NS_NewAtom(kMozSelected);
if (PR_TRUE == mIsAllFramesHere) {
aContent->SetAttribute(kNameSpaceID_None, selectedAtom, "", PR_TRUE);
aContent->SetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, "", PR_TRUE);
//ForceRedraw();
} else {
aContent->SetAttribute(kNameSpaceID_None, selectedAtom, "", PR_FALSE);
aContent->SetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, "", PR_FALSE);
}
NS_RELEASE(selectedAtom);
}
//---------------------------------------------------------
@ -689,15 +684,12 @@ nsListControlFrame::DisplayDeselected(nsIContent* aContent)
//XXX: This is temporary. It simulates psuedo states by using a attribute selector on
// -moz-option-selected in the ua.css style sheet. This will not be needed when
// The event state manager is functional. KMM
nsIAtom * selectedAtom = NS_NewAtom(kMozSelected);
if (PR_TRUE == mIsAllFramesHere) {
aContent->UnsetAttribute(kNameSpaceID_None, selectedAtom, PR_TRUE);
aContent->UnsetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, PR_TRUE);
//ForceRedraw();
} else {
aContent->UnsetAttribute(kNameSpaceID_None, selectedAtom, PR_FALSE);
aContent->UnsetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, PR_FALSE);
}
NS_RELEASE(selectedAtom);
}
@ -1095,7 +1087,6 @@ nsListControlFrame::SetInitialChildList(nsIPresContext* aPresContext,
mHasBeenInitialized = PR_FALSE;
}
}
mContentFrame = aChildList;
nsresult rv = nsScrollFrame::SetInitialChildList(aPresContext, aListName, aChildList);
// If all the content is here now check
@ -1365,10 +1356,8 @@ PRBool
nsListControlFrame::IsContentSelected(nsIContent* aContent)
{
nsString value;
nsIAtom * selectedAtom = NS_NewAtom(kMozSelected);
//nsIAtom * selectedAtom = NS_NewAtom("selected");
nsresult result = aContent->GetAttribute(kNameSpaceID_None, selectedAtom, value);
NS_RELEASE(selectedAtom);
nsresult result = aContent->GetAttribute(kNameSpaceID_None, nsLayoutAtoms::optionSelectedPseudo, value);
return (NS_CONTENT_ATTR_NOT_THERE == result ? PR_FALSE : PR_TRUE);
}

7
layout/html/forms/src/nsListControlFrame.h
View File

@ -221,23 +221,18 @@ protected:
nsresult SelectionChanged(nsIContent* aContent);
// Data Members
nscoord mBorderOffsetY;
nsFormFrame* mFormFrame;
PRInt32 mSelectedIndex;
PRInt32 mOldSelectedIndex;
PRInt32 mSelectedIndexWhenPoppedDown;
PRInt32 mStartExtendedIndex;
PRInt32 mEndExtendedIndex;
nsIFrame* mHitFrame;
PRBool mIsInitializedFromContent;
nsIFrame* mContentFrame;
nsIComboboxControlFrame *mComboboxFrame;
PRBool mButtonDown;
nsIFrame* mLastFrame;
nscoord mMaxWidth;
nscoord mMaxHeight;
PRBool mIsCapturingMouseEvents;
PRBool mIgnoreMouseUp;
PRBool* mSelectionCache;
PRInt32 mSelectionCacheLength;
@ -245,8 +240,6 @@ protected:
PRBool mIsAllFramesHere;
PRBool mHasBeenInitialized;
nsIFrame * mMainChild;
nsIPresContext* mPresContext; // XXX: Remove the need to cache the pres context.
// XXX temprary only until full system mouse capture works