Clean up API (and its callers) for getting style data: remove unneeded null checks and switch to new inline member functions (one for each struct) that return values. b=197205 r+sr=roc a=brendan
This commit is contained in:
@@ -499,9 +499,9 @@ nsFormControlFrame::DidReflow(nsIPresContext* aPresContext,
|
||||
nsIView* view = nsnull;
|
||||
GetView(aPresContext, &view);
|
||||
if (view) {
|
||||
const nsStyleVisibility* vis;
|
||||
GetStyleData(eStyleStruct_Visibility, ((const nsStyleStruct *&)vis));
|
||||
nsViewVisibility newVis = vis->IsVisible() ? nsViewVisibility_kShow : nsViewVisibility_kHide;
|
||||
nsViewVisibility newVis = GetStyleVisibility()->IsVisible()
|
||||
? nsViewVisibility_kShow
|
||||
: nsViewVisibility_kHide;
|
||||
nsViewVisibility oldVis;
|
||||
// only change if different.
|
||||
view->GetVisibility(oldVis);
|
||||
@@ -734,8 +734,7 @@ nsFormControlFrame::HandleEvent(nsIPresContext* aPresContext,
|
||||
}
|
||||
|
||||
// Check for user-input:none style
|
||||
const nsStyleUserInterface* uiStyle;
|
||||
GetStyleData(eStyleStruct_UserInterface, (const nsStyleStruct *&)uiStyle);
|
||||
const nsStyleUserInterface* uiStyle = GetStyleUserInterface();
|
||||
if (uiStyle->mUserInput == NS_STYLE_USER_INPUT_NONE || uiStyle->mUserInput == NS_STYLE_USER_INPUT_DISABLED)
|
||||
return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user