corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 781360 patch 3: Rename {nsIFrame,nsStyleContext,nsComputedDOMStyle}::GetStyle* to Style*, since they can never return null. r=dholbert

Browse Source 
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:
L. David Baron
2013-02-16 13:51:02 -08:00
parent aac304acbb
commit ca6c366dc6
156 changed files with 1186 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
layout/tables/nsTableCellFrame.cpp
View File

@@ -310,7 +310,7 @@ nsTableCellFrame::DecorateForSelection(nsRenderingContext& aRenderingContext,
{
//compare bordercolor to ((nsStyleColor *)myColor)->mBackgroundColor)
bordercolor = EnsureDifferentColors(bordercolor,
GetStyleBackground()->mBackgroundColor);
StyleBackground()->mBackgroundColor);
nsRenderingContext::AutoPushTranslation
translate(&aRenderingContext, aPt);
nscoord onePixel = nsPresContext::CSSPixelsToAppUnits(1);
@@ -350,7 +350,7 @@ nsTableCellFrame::PaintCellBackground(nsRenderingContext& aRenderingContext,
const nsRect& aDirtyRect, nsPoint aPt,
uint32_t aFlags)
{
if (!GetStyleVisibility()->IsVisible())
if (!StyleVisibility()->IsVisible())
return;
PaintBackground(aRenderingContext, aDirtyRect, aPt, aFlags);
@@ -428,10 +428,10 @@ nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
if (IsVisibleInSelection(aBuilder)) {
nsTableFrame* tableFrame = nsTableFrame::GetTableFrame(this);
int32_t emptyCellStyle = GetContentEmpty() && !tableFrame->IsBorderCollapse() ?
GetStyleTableBorder()->mEmptyCells
StyleTableBorder()->mEmptyCells
: NS_STYLE_TABLE_EMPTY_CELLS_SHOW;
// take account of 'empty-cells'
if (GetStyleVisibility()->IsVisible() &&
if (StyleVisibility()->IsVisible() &&
(NS_STYLE_TABLE_EMPTY_CELLS_HIDE != emptyCellStyle)) {
@@ -444,7 +444,7 @@ nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
// display outset box-shadows if we need to.
const nsStyleBorder* borderStyle = GetStyleBorder();
const nsStyleBorder* borderStyle = StyleBorder();
bool hasBoxShadow = !!borderStyle->mBoxShadow;
if (hasBoxShadow) {
aLists.BorderBackground()->AppendNewToTop(
@@ -454,7 +454,7 @@ nsTableCellFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
// display background if we need to.
if (aBuilder->IsForEventDelivery() ||
(((!tableFrame->IsBorderCollapse() || isRoot) &&
(!GetStyleBackground()->IsTransparent() || GetStyleDisplay()->mAppearance)))) {
(!StyleBackground()->IsTransparent() || StyleDisplay()->mAppearance)))) {
// The cell background was not painted by the nsTablePainter,
// so we need to do it. We have special background processing here
// so we need to duplicate some code from nsFrame::DisplayBorderBackgroundOutline
@@ -618,7 +618,7 @@ nsTableCellFrame::UpdateOverflow()
uint8_t
nsTableCellFrame::GetVerticalAlign() const
{
const nsStyleCoord& verticalAlign = GetStyleTextReset()->mVerticalAlign;
const nsStyleCoord& verticalAlign = StyleTextReset()->mVerticalAlign;
if (verticalAlign.GetUnit() == eStyleUnit_Enumerated) {
uint8_t value = verticalAlign.GetIntValue();
if (value == NS_STYLE_VERTICAL_ALIGN_TOP ||
@@ -1015,7 +1015,7 @@ NS_IMPL_FRAMEARENA_HELPERS(nsBCTableCellFrame)
nsMargin*
nsTableCellFrame::GetBorderWidth(nsMargin& aBorder) const
{
aBorder = GetStyleBorder()->GetComputedBorder();
aBorder = StyleBorder()->GetComputedBorder();
return &aBorder;
}
@@ -1145,11 +1145,11 @@ nsBCTableCellFrame::PaintBackground(nsRenderingContext& aRenderingContext,
nsMargin borderWidth;
GetBorderWidth(borderWidth);
nsStyleBorder myBorder(*GetStyleBorder());
nsStyleBorder myBorder(*StyleBorder());
// We're making an ephemeral stack copy here, so just copy this debug-only
// member to prevent assertions.
#ifdef DEBUG
myBorder.mImageTracked = GetStyleBorder()->mImageTracked;
myBorder.mImageTracked = StyleBorder()->mImageTracked;
#endif
NS_FOR_CSS_SIDES(side) {