Backed out changeset 3d1ce85e6348 (bug 1088760) for bustage, at least on Android at layout/generic/nsPluginFrame.cpp:1612. r=backout

This commit is contained in:
Sebastian Hengst
2017-06-13 00:30:03 +02:00
parent 53fab784f3
commit 1b1d14e565
182 changed files with 1020 additions and 919 deletions

View File

@@ -5,7 +5,6 @@
#include "nsTableCellFrame.h"
#include "gfxContext.h"
#include "gfxUtils.h"
#include "mozilla/gfx/2D.h"
#include "mozilla/gfx/Helpers.h"
@@ -16,6 +15,7 @@
#include "nsStyleContext.h"
#include "nsStyleConsts.h"
#include "nsPresContext.h"
#include "nsRenderingContext.h"
#include "nsCSSRendering.h"
#include "nsIContent.h"
#include "nsGenericHTMLElement.h"
@@ -372,7 +372,7 @@ nsTableCellFrame::DecorateForSelection(DrawTarget* aDrawTarget, nsPoint aPt)
}
DrawResult
nsTableCellFrame::PaintBackground(gfxContext& aRenderingContext,
nsTableCellFrame::PaintBackground(nsRenderingContext& aRenderingContext,
const nsRect& aDirtyRect,
nsPoint aPt,
uint32_t aFlags)
@@ -422,14 +422,14 @@ public:
aOutFrames->AppendElement(mFrame);
}
virtual void Paint(nsDisplayListBuilder* aBuilder,
gfxContext* aCtx) override;
nsRenderingContext* aCtx) override;
virtual nsRect GetBounds(nsDisplayListBuilder* aBuilder,
bool* aSnap) override;
NS_DISPLAY_DECL_NAME("TableCellBackground", TYPE_TABLE_CELL_BACKGROUND)
};
void nsDisplayTableCellBackground::Paint(nsDisplayListBuilder* aBuilder,
gfxContext* aCtx)
nsRenderingContext* aCtx)
{
DrawResult result = static_cast<nsTableCellFrame*>(mFrame)->
PaintBackground(*aCtx, mVisibleRect, ToReferenceFrame(),
@@ -744,7 +744,7 @@ int32_t nsTableCellFrame::GetColSpan()
}
/* virtual */ nscoord
nsTableCellFrame::GetMinISize(gfxContext *aRenderingContext)
nsTableCellFrame::GetMinISize(nsRenderingContext *aRenderingContext)
{
nscoord result = 0;
DISPLAY_MIN_WIDTH(this, result);
@@ -756,7 +756,7 @@ nsTableCellFrame::GetMinISize(gfxContext *aRenderingContext)
}
/* virtual */ nscoord
nsTableCellFrame::GetPrefISize(gfxContext *aRenderingContext)
nsTableCellFrame::GetPrefISize(nsRenderingContext *aRenderingContext)
{
nscoord result = 0;
DISPLAY_PREF_WIDTH(this, result);
@@ -1180,7 +1180,7 @@ nsBCTableCellFrame::GetBorderOverflow()
}
DrawResult
nsBCTableCellFrame::PaintBackground(gfxContext& aRenderingContext,
nsBCTableCellFrame::PaintBackground(nsRenderingContext& aRenderingContext,
const nsRect& aDirtyRect,
nsPoint aPt,
uint32_t aFlags)