| Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h
|
| index 88219c07e0ad3c123b77e27d5f373ca3dda82d4d..5ab77f578257e1cfa1cd2c42b59496b6f022f541 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h
|
| +++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h
|
| @@ -19,16 +19,16 @@ class LayoutObject;
|
| class ObjectPaintProperties;
|
|
|
| // The context for PaintPropertyTreeBuilder.
|
| -// It's responsible for bookkeeping tree state in other order, for example, the most recent
|
| -// position container seen.
|
| +// It's responsible for bookkeeping tree state in other order, for example, the
|
| +// most recent position container seen.
|
| struct PaintPropertyTreeBuilderContext {
|
| // State that propagates on the containing block chain (and so is adjusted
|
| // when an absolute or fixed position object is encountered).
|
| struct ContainingBlockContext {
|
| // The combination of a transform and paint offset describes a linear space.
|
| - // When a layout object recur to its children, the main context is expected to refer
|
| - // the object's border box, then the callee will derive its own border box by translating
|
| - // the space with its own layout location.
|
| + // When a layout object recur to its children, the main context is expected
|
| + // to refer the object's border box, then the callee will derive its own
|
| + // border box by translating the space with its own layout location.
|
| const TransformPaintPropertyNode* transform = nullptr;
|
| LayoutPoint paintOffset;
|
| // Whether newly created children should flatten their inherited transform
|
| @@ -39,41 +39,45 @@ struct PaintPropertyTreeBuilderContext {
|
| // Rendering context for 3D sorting. See
|
| // TransformPaintPropertyNode::renderingContextID.
|
| unsigned renderingContextID = 0;
|
| - // The clip node describes the accumulated raster clip for the current subtree.
|
| - // Note that the computed raster region in canvas space for a clip node is independent from
|
| - // the transform and paint offset above. Also the actual raster region may be affected
|
| - // by layerization and occlusion tracking.
|
| + // The clip node describes the accumulated raster clip for the current
|
| + // subtree. Note that the computed raster region in canvas space for a clip
|
| + // node is independent from the transform and paint offset above. Also the
|
| + // actual raster region may be affected by layerization and occlusion
|
| + // tracking.
|
| const ClipPaintPropertyNode* clip = nullptr;
|
| - // The scroll node contains information for scrolling such as the parent scroll space, the
|
| - // extent that can be scrolled, etc. Because scroll nodes reference a scroll offset
|
| - // transform, scroll nodes should be updated if the transform tree changes.
|
| + // The scroll node contains information for scrolling such as the parent
|
| + // scroll space, the extent that can be scrolled, etc. Because scroll nodes
|
| + // reference a scroll offset transform, scroll nodes should be updated if
|
| + // the transform tree changes.
|
| ScrollPaintPropertyNode* scroll = nullptr;
|
| };
|
|
|
| ContainingBlockContext current;
|
|
|
| - // Separate context for out-of-flow positioned and fixed positioned elements are needed
|
| - // because they don't use DOM parent as their containing block.
|
| - // These additional contexts normally pass through untouched, and are only copied from
|
| - // the main context when the current element serves as the containing block of corresponding
|
| - // positioned descendants.
|
| - // Overflow clips are also inherited by containing block tree instead of DOM tree, thus they
|
| + // Separate context for out-of-flow positioned and fixed positioned elements
|
| + // are needed because they don't use DOM parent as their containing block.
|
| + // These additional contexts normally pass through untouched, and are only
|
| + // copied from the main context when the current element serves as the
|
| + // containing block of corresponding positioned descendants. Overflow clips
|
| + // are also inherited by containing block tree instead of DOM tree, thus they
|
| // are included in the additional context too.
|
| ContainingBlockContext absolutePosition;
|
| const LayoutObject* containerForAbsolutePosition = nullptr;
|
|
|
| ContainingBlockContext fixedPosition;
|
|
|
| - // The effect hierarchy is applied by the stacking context tree. It is guaranteed that every
|
| - // DOM descendant is also a stacking context descendant. Therefore, we don't need extra
|
| - // bookkeeping for effect nodes and can generate the effect tree from a DOM-order traversal.
|
| + // The effect hierarchy is applied by the stacking context tree. It is
|
| + // guaranteed that every DOM descendant is also a stacking context descendant.
|
| + // Therefore, we don't need extra bookkeeping for effect nodes and can
|
| + // generate the effect tree from a DOM-order traversal.
|
| const EffectPaintPropertyNode* currentEffect = nullptr;
|
| };
|
|
|
| // Creates paint property tree nodes for special things in the layout tree.
|
| -// Special things include but not limit to: overflow clip, transform, fixed-pos, animation,
|
| -// mask, filter, ... etc.
|
| -// It expects to be invoked for each layout tree node in DOM order during InPrePaint phase.
|
| +// Special things include but not limit to: overflow clip, transform, fixed-pos,
|
| +// animation, mask, filter, ... etc.
|
| +// It expects to be invoked for each layout tree node in DOM order during
|
| +// InPrePaint phase.
|
| class PaintPropertyTreeBuilder {
|
| public:
|
| PaintPropertyTreeBuilderContext setupInitialContext();
|
|
|