Bug 781360 patch 3: Rename {nsIFrame,nsStyleContext,nsComputedDOMStyle}::GetStyle* to Style*, since they can never return null. r=dholbert
Except for the changes in: layout/generic/nsIFrame.h (part) layout/style/nsComputedDOMStyle.h (all) layout/style/nsRuleNode.cpp (part) layout/style/nsStyleContext.cpp (part) layout/style/nsStyleContext.h (part) (see patch 3b in the bug), this patch was written with the sed script: s/\<GetStyle\(Font\|Color\|List\|Text\|Visibility\|Quotes\|UserInterface\|TableBorder\|SVG\|Background\|Position\|TextReset\|Display\|Content\|UIReset\|Table\|Margin\|Padding\|Border\|Outline\|XUL\|SVGReset\|Column\)\>/Style\1/g
This commit is contained in:
@@ -204,7 +204,7 @@ nsGfxButtonControlFrame::GetLabel(nsXPIDLString& aLabel)
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
// Compress whitespace out of label if needed.
|
||||
if (!GetStyleText()->WhiteSpaceIsSignificant()) {
|
||||
if (!StyleText()->WhiteSpaceIsSignificant()) {
|
||||
aLabel.CompressWhitespace();
|
||||
} else if (aLabel.Length() > 2 && aLabel.First() == ' ' &&
|
||||
aLabel.CharAt(aLabel.Length() - 1) == ' ') {
|
||||
@@ -278,7 +278,7 @@ nsGfxButtonControlFrame::HandleEvent(nsPresContext* aPresContext,
|
||||
// to be selected (Drawn with an XOR rectangle over the label)
|
||||
|
||||
// do we have user-input style?
|
||||
const nsStyleUserInterface* uiStyle = GetStyleUserInterface();
|
||||
const nsStyleUserInterface* uiStyle = StyleUserInterface();
|
||||
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