| Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| index 3c32b5c272fd8d38efcb70be9a9f2e88c2d3b8a0..7e5ef86a073dd8e7fb24a054bfacb2e3ec5dba71 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| @@ -926,8 +926,9 @@ LayoutBlock* LayoutObject::containingBlock(AncestorSkipInfo* skipInfo) const {
|
| if (isColumnSpanAll()) {
|
| object = spannerPlaceholder()->containingBlock();
|
| } else {
|
| - while (object && ((object->isInline() && !object->isAtomicInlineLevel()) ||
|
| - !object->isLayoutBlock())) {
|
| + while (object &&
|
| + ((object->isInline() && !object->isAtomicInlineLevel()) ||
|
| + !object->isLayoutBlock())) {
|
| if (skipInfo)
|
| skipInfo->update(*object);
|
| object = object->parent();
|
| @@ -1463,10 +1464,11 @@ StyleDifference LayoutObject::adjustStyleDifference(
|
| if (diff.transformChanged()) {
|
| // Text nodes share style with their parents but transforms don't apply to
|
| // them, hence the !isText() check.
|
| - if (!isText() && (!hasLayer() ||
|
| - !toLayoutBoxModelObject(this)
|
| - ->layer()
|
| - ->hasStyleDeterminedDirectCompositingReasons()))
|
| + if (!isText() &&
|
| + (!hasLayer() ||
|
| + !toLayoutBoxModelObject(this)
|
| + ->layer()
|
| + ->hasStyleDeterminedDirectCompositingReasons()))
|
| diff.setNeedsPaintInvalidationSubtree();
|
| }
|
|
|
| @@ -1474,10 +1476,11 @@ StyleDifference LayoutObject::adjustStyleDifference(
|
| // separate backing, then we need to invalidate paints (also
|
| // ignoring text nodes).
|
| if (diff.opacityChanged() || diff.zIndexChanged()) {
|
| - if (!isText() && (!hasLayer() ||
|
| - !toLayoutBoxModelObject(this)
|
| - ->layer()
|
| - ->hasStyleDeterminedDirectCompositingReasons()))
|
| + if (!isText() &&
|
| + (!hasLayer() ||
|
| + !toLayoutBoxModelObject(this)
|
| + ->layer()
|
| + ->hasStyleDeterminedDirectCompositingReasons()))
|
| diff.setNeedsPaintInvalidationSubtree();
|
| }
|
|
|
| @@ -1821,8 +1824,9 @@ static bool areNonIdenticalCursorListsEqual(const ComputedStyle* a,
|
|
|
| static inline bool areCursorsEqual(const ComputedStyle* a,
|
| const ComputedStyle* b) {
|
| - return a->cursor() == b->cursor() && (a->cursors() == b->cursors() ||
|
| - areNonIdenticalCursorListsEqual(a, b));
|
| + return a->cursor() == b->cursor() &&
|
| + (a->cursors() == b->cursors() ||
|
| + areNonIdenticalCursorListsEqual(a, b));
|
| }
|
|
|
| void LayoutObject::setScrollAnchorDisablingStyleChangedOnAncestor() {
|
| @@ -2091,9 +2095,10 @@ void LayoutObject::mapLocalToAncestor(const LayoutBoxModelObject* ancestor,
|
| if (mode & UseTransforms && shouldUseTransformFromContainer(container)) {
|
| TransformationMatrix t;
|
| getTransformFromContainer(container, containerOffset, t);
|
| - transformState.applyTransform(t, preserve3D
|
| - ? TransformState::AccumulateTransform
|
| - : TransformState::FlattenTransform);
|
| + transformState.applyTransform(t,
|
| + preserve3D
|
| + ? TransformState::AccumulateTransform
|
| + : TransformState::FlattenTransform);
|
| } else {
|
| transformState.move(containerOffset.width(), containerOffset.height(),
|
| preserve3D ? TransformState::AccumulateTransform
|
| @@ -2161,9 +2166,10 @@ void LayoutObject::mapAncestorToLocal(const LayoutBoxModelObject* ancestor,
|
| if (mode & UseTransforms && shouldUseTransformFromContainer(container)) {
|
| TransformationMatrix t;
|
| getTransformFromContainer(container, containerOffset, t);
|
| - transformState.applyTransform(t, preserve3D
|
| - ? TransformState::AccumulateTransform
|
| - : TransformState::FlattenTransform);
|
| + transformState.applyTransform(t,
|
| + preserve3D
|
| + ? TransformState::AccumulateTransform
|
| + : TransformState::FlattenTransform);
|
| } else {
|
| transformState.move(containerOffset.width(), containerOffset.height(),
|
| preserve3D ? TransformState::AccumulateTransform
|
|
|