Skip to content

GitLab

T
tangled
Commit 1a2af5c4 authored by chrishtr@chromium.org's avatar chrishtr@chromium.org
Browse files
Options

Clean up GraphicsLayerPaintInfo to remove unused or unnecessary fields. 

BUG=

Review URL: https://codereview.chromium.org/412353004

git-svn-id: svn://svn.chromium.org/blink/trunk@178949 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent c6925b4d
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 51 deletions
third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.cpp
View file @ 1a2af5c4
......@@ -1978,7 +1978,7 @@ IntRect CompositedLayerMapping::localClipRectForSquashedLayer(const RenderLayer&
return parentClipRect;
}
void CompositedLayerMapping::doPaintTask(GraphicsLayerPaintInfo& paintInfo, GraphicsContext* context,
void CompositedLayerMapping::doPaintTask(const GraphicsLayerPaintInfo& paintInfo, const PaintLayerFlags& paintLayerFlags, GraphicsContext* context,
const IntRect& clip) // In the coords of rootLayer.
{
if (paintsIntoCompositedAncestor()) {
......@@ -1988,25 +1988,6 @@ void CompositedLayerMapping::doPaintTask(GraphicsLayerPaintInfo& paintInfo, Grap
FontCachePurgePreventer fontCachePurgePreventer;
PaintLayerFlags paintFlags = 0;
if (paintInfo.paintingPhase & GraphicsLayerPaintBackground)
paintFlags |= PaintLayerPaintingCompositingBackgroundPhase;
if (paintInfo.paintingPhase & GraphicsLayerPaintForeground)
paintFlags |= PaintLayerPaintingCompositingForegroundPhase;
if (paintInfo.paintingPhase & GraphicsLayerPaintMask)
paintFlags |= PaintLayerPaintingCompositingMaskPhase;
if (paintInfo.paintingPhase & GraphicsLayerPaintChildClippingMask)
paintFlags |= PaintLayerPaintingChildClippingMaskPhase;
if (paintInfo.paintingPhase & GraphicsLayerPaintOverflowContents)
paintFlags |= PaintLayerPaintingOverflowContents;
if (paintInfo.paintingPhase & GraphicsLayerPaintCompositedScroll)
paintFlags |= PaintLayerPaintingCompositingScrollingPhase;
if (paintInfo.isBackgroundLayer)
paintFlags |= (PaintLayerPaintingRootBackgroundOnly | PaintLayerPaintingCompositingForegroundPhase); // Need PaintLayerPaintingCompositingForegroundPhase to walk child layers.
else if (compositor()->fixedRootBackgroundLayer())
paintFlags |= PaintLayerPaintingSkipRootBackground;
// Note carefully: in theory it is appropriate to invoke context->save() here
// and restore the context after painting. For efficiency, we are assuming that
// it is equivalent to manually undo this offset translation, which means we are
......@@ -2020,7 +2001,7 @@ void CompositedLayerMapping::doPaintTask(GraphicsLayerPaintInfo& paintInfo, Grap
IntRect dirtyRect(clip);
dirtyRect.move(offset);
if (!(paintInfo.paintingPhase & GraphicsLayerPaintOverflowContents)) {
if (!(paintLayerFlags & PaintLayerPaintingOverflowContents)) {
LayoutRect bounds = paintInfo.compositedBounds;
bounds.move(paintInfo.renderLayer->subpixelAccumulation());
dirtyRect.intersect(pixelSnappedIntRect(bounds));
......@@ -2035,12 +2016,10 @@ void CompositedLayerMapping::doPaintTask(GraphicsLayerPaintInfo& paintInfo, Grap
if (paintInfo.renderLayer->compositingState() != PaintsIntoGroupedBacking) {
// FIXME: GraphicsLayers need a way to split for RenderRegions.
LayerPaintingInfo paintingInfo(paintInfo.renderLayer, dirtyRect, PaintBehaviorNormal, paintInfo.renderLayer->subpixelAccumulation());
paintInfo.renderLayer->paintLayerContents(context, paintingInfo, paintFlags);
ASSERT(!paintInfo.isBackgroundLayer || paintFlags & PaintLayerPaintingRootBackgroundOnly);
paintInfo.renderLayer->paintLayerContents(context, paintingInfo, paintLayerFlags);
if (paintInfo.renderLayer->containsDirtyOverlayScrollbars())
paintInfo.renderLayer->paintLayerContents(context, paintingInfo, paintFlags | PaintLayerPaintingOverlayScrollbars);
paintInfo.renderLayer->paintLayerContents(context, paintingInfo, paintLayerFlags | PaintLayerPaintingOverlayScrollbars);
} else {
ASSERT(compositor()->layerSquashingEnabled());
LayerPaintingInfo paintingInfo(paintInfo.renderLayer, dirtyRect, PaintBehaviorNormal, paintInfo.renderLayer->subpixelAccumulation());
......@@ -2051,7 +2030,7 @@ void CompositedLayerMapping::doPaintTask(GraphicsLayerPaintInfo& paintInfo, Grap
context->save();
dirtyRect.intersect(paintInfo.localClipRectForSquashedLayer);
context->clip(dirtyRect);
paintInfo.renderLayer->paintLayer(context, paintingInfo, paintFlags);
paintInfo.renderLayer->paintLayer(context, paintingInfo, paintLayerFlags);
context->restore();
}
......@@ -2076,7 +2055,7 @@ static void paintScrollbar(Scrollbar* scrollbar, GraphicsContext& context, const
}
// Up-call from compositing layer drawing callback.
void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase paintingPhase, const IntRect& clip)
void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, GraphicsContext& context, GraphicsLayerPaintingPhase graphicsLayerPaintingPhase, const IntRect& clip)
{
// https://code.google.com/p/chromium/issues/detail?id=343772
DisableCompositingQueryAsserts disabler;
......@@ -2090,6 +2069,25 @@ void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G
// FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
InspectorInstrumentation::willPaint(m_owningLayer.renderer(), graphicsLayer);
PaintLayerFlags paintLayerFlags = 0;
if (graphicsLayerPaintingPhase & GraphicsLayerPaintBackground)
paintLayerFlags |= PaintLayerPaintingCompositingBackgroundPhase;
if (graphicsLayerPaintingPhase & GraphicsLayerPaintForeground)
paintLayerFlags |= PaintLayerPaintingCompositingForegroundPhase;
if (graphicsLayerPaintingPhase & GraphicsLayerPaintMask)
paintLayerFlags |= PaintLayerPaintingCompositingMaskPhase;
if (graphicsLayerPaintingPhase & GraphicsLayerPaintChildClippingMask)
paintLayerFlags |= PaintLayerPaintingChildClippingMaskPhase;
if (graphicsLayerPaintingPhase & GraphicsLayerPaintOverflowContents)
paintLayerFlags |= PaintLayerPaintingOverflowContents;
if (graphicsLayerPaintingPhase & GraphicsLayerPaintCompositedScroll)
paintLayerFlags |= PaintLayerPaintingCompositingScrollingPhase;
if (graphicsLayer == m_backgroundLayer)
paintLayerFlags |= (PaintLayerPaintingRootBackgroundOnly | PaintLayerPaintingCompositingForegroundPhase); // Need PaintLayerPaintingCompositingForegroundPhase to walk child layers.
else if (compositor()->fixedRootBackgroundLayer())
paintLayerFlags |= PaintLayerPaintingSkipRootBackground;
if (graphicsLayer == m_graphicsLayer.get()
|| graphicsLayer == m_foregroundLayer.get()
|| graphicsLayer == m_backgroundLayer.get()
......@@ -2102,15 +2100,13 @@ void CompositedLayerMapping::paintContents(const GraphicsLayer* graphicsLayer, G
paintInfo.renderLayer = &m_owningLayer;
paintInfo.compositedBounds = compositedBounds();
paintInfo.offsetFromRenderer = graphicsLayer->offsetFromRenderer();
paintInfo.paintingPhase = paintingPhase;
paintInfo.isBackgroundLayer = (graphicsLayer == m_backgroundLayer);
// We have to use the same root as for hit testing, because both methods can compute and cache clipRects.
doPaintTask(paintInfo, &context, clip);
doPaintTask(paintInfo, paintLayerFlags, &context, clip);
} else if (graphicsLayer == m_squashingLayer.get()) {
ASSERT(compositor()->layerSquashingEnabled());
for (size_t i = 0; i < m_squashedLayers.size(); ++i)
doPaintTask(m_squashedLayers[i], &context, clip);
doPaintTask(m_squashedLayers[i], paintLayerFlags, &context, clip);
} else if (graphicsLayer == layerForHorizontalScrollbar()) {
paintScrollbar(m_owningLayer.scrollableArea()->horizontalScrollbar(), context, clip);
} else if (graphicsLayer == layerForVerticalScrollbar()) {
......@@ -2165,14 +2161,12 @@ bool CompositedLayerMapping::updateSquashingLayerAssignment(RenderLayer* squashe
paintInfo.renderLayer = squashedLayer;
// NOTE: composited bounds are updated elsewhere
// NOTE: offsetFromRenderer is updated elsewhere
paintInfo.paintingPhase = GraphicsLayerPaintAllWithOverflowClip;
paintInfo.isBackgroundLayer = false;
// Change tracking on squashing layers: at the first sign of something changed, just invalidate the layer.
// FIXME: Perhaps we can find a tighter more clever mechanism later.
bool updatedAssignment = false;
if (nextSquashedLayerIndex < m_squashedLayers.size()) {
if (!paintInfo.isEquivalentForSquashing(m_squashedLayers[nextSquashedLayerIndex])) {
if (paintInfo.renderLayer != m_squashedLayers[nextSquashedLayerIndex].renderLayer) {
compositor()->repaintOnCompositingChange(squashedLayer);
updatedAssignment = true;
m_squashedLayers[nextSquashedLayerIndex] = paintInfo;
......
third_party/WebKit/Source/core/rendering/compositing/CompositedLayerMapping.h
View file @ 1a2af5c4
......@@ -50,22 +50,7 @@ struct GraphicsLayerPaintInfo {
IntSize offsetFromRenderer;
bool offsetFromRendererSet;
LayoutSize subpixelAccumulation;
GraphicsLayerPaintingPhase paintingPhase;
bool isBackgroundLayer;
GraphicsLayerPaintInfo() : renderLayer(0), offsetFromRendererSet(false), isBackgroundLayer(false) { }
bool isEquivalentForSquashing(const GraphicsLayerPaintInfo& other)
{
// FIXME: offsetFromRenderer and compositedBounds should not be checked here, because
// they are not yet fixed at the time this function is used.
return renderLayer == other.renderLayer
&& paintingPhase == other.paintingPhase
&& isBackgroundLayer == other.isBackgroundLayer;
}
GraphicsLayerPaintInfo() : renderLayer(0), offsetFromRendererSet(false) { }
};
enum GraphicsLayerUpdateScope {
......@@ -300,7 +285,7 @@ private:
static bool hasVisibleNonCompositingDescendant(RenderLayer* parent);
void doPaintTask(GraphicsLayerPaintInfo&, GraphicsContext*, const IntRect& clip);
void doPaintTask(const GraphicsLayerPaintInfo&, const PaintLayerFlags&, GraphicsContext*, const IntRect& clip);
// Computes the background clip rect for the given squashed layer, up to any containing layer that is squashed into the
// same squashing layer and contains this squashed layer's clipping ancestor.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment