Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(491)

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayer.cpp

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
index beb5ed0b414ec45f52556a88643f2be2dc7d8991..1624e327dacf4fe490ecca8da17351cbf5cff468 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -757,8 +757,9 @@ void PaintLayer::update3DTransformedDescendantStatus() {
bool childHas3D = false;
// If the child lives in a 3d hierarchy, then the layer at the root of
// that hierarchy needs the m_has3DTransformedDescendant set.
- if (childLayer.preserves3D() && (childLayer.has3DTransform() ||
- childLayer.has3DTransformedDescendant()))
+ if (childLayer.preserves3D() &&
+ (childLayer.has3DTransform() ||
+ childLayer.has3DTransformedDescendant()))
childHas3D = true;
else if (childLayer.has3DTransform())
childHas3D = true;
@@ -1512,9 +1513,10 @@ void PaintLayer::updateScrollableArea() {
}
bool PaintLayer::hasOverflowControls() const {
- return m_scrollableArea && (m_scrollableArea->hasScrollbar() ||
- m_scrollableArea->scrollCorner() ||
- layoutObject()->style()->resize() != RESIZE_NONE);
+ return m_scrollableArea &&
+ (m_scrollableArea->hasScrollbar() ||
+ m_scrollableArea->scrollCorner() ||
+ layoutObject()->style()->resize() != RESIZE_NONE);
}
void PaintLayer::appendSingleFragmentIgnoringPagination(
@@ -1732,8 +1734,9 @@ bool PaintLayer::hitTest(HitTestResult& result) {
}
if (fallback) {
layoutObject()->updateHitTestResult(
- result, toLayoutView(layoutObject())
- ->flipForWritingMode(hitTestLocation.point()));
+ result,
+ toLayoutView(layoutObject())
+ ->flipForWritingMode(hitTestLocation.point()));
insideLayer = this;
// Don't cache this result since it really wasn't a true hit.
@@ -2212,8 +2215,9 @@ bool PaintLayer::hitTestContents(HitTestResult& result,
hitTestFilter)) {
// It's wrong to set innerNode, but then claim that you didn't hit anything,
// unless it is a rect-based test.
- DCHECK(!result.innerNode() || (result.hitTestRequest().listBased() &&
- result.listBasedTestResult().size()));
+ DCHECK(!result.innerNode() ||
+ (result.hitTestRequest().listBased() &&
+ result.listBasedTestResult().size()));
return false;
}
@@ -2289,8 +2293,9 @@ PaintLayer* PaintLayer::hitTestChildren(
FloatRect PaintLayer::boxForFilterOrMask() const {
return FloatRect(physicalBoundingBoxIncludingStackingChildren(
- LayoutPoint(), PaintLayer::CalculateBoundsOptions::
- IncludeTransformsAndCompositedChildLayers));
+ LayoutPoint(),
+ PaintLayer::CalculateBoundsOptions::
+ IncludeTransformsAndCompositedChildLayers));
}
LayoutRect PaintLayer::boxForClipPath() const {
@@ -2457,8 +2462,9 @@ void PaintLayer::expandRectForStackingChildren(
// for this Layer. For example, the bounds of squashed Layers
// will be included in the computation of the appropriate squashing
// GraphicsLayer.
- if (options != PaintLayer::CalculateBoundsOptions::
- IncludeTransformsAndCompositedChildLayers &&
+ if (options !=
+ PaintLayer::CalculateBoundsOptions::
+ IncludeTransformsAndCompositedChildLayers &&
node->layer()->compositingState() != NotComposited)
continue;
result.unite(node->layer()->boundingBoxForCompositingInternal(
@@ -2532,10 +2538,11 @@ LayoutRect PaintLayer::boundingBoxForCompositingInternal(
if (paintsWithFilters())
result = mapLayoutRectForFilter(result);
- if (transform() && (options == IncludeTransformsAndCompositedChildLayers ||
- ((paintsWithTransform(GlobalPaintNormalPhase) &&
- (this != &compositedLayer ||
- options == MaybeIncludeTransformForAncestorLayer)))))
+ if (transform() &&
+ (options == IncludeTransformsAndCompositedChildLayers ||
+ ((paintsWithTransform(GlobalPaintNormalPhase) &&
+ (this != &compositedLayer ||
+ options == MaybeIncludeTransformForAncestorLayer)))))
result = transform()->mapRect(result);
if (shouldFragmentCompositedBounds(&compositedLayer)) {
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintInvalidator.cpp ('k') | third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698