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

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

Issue 2392443009: reflow comments in core/paint (Closed)
Patch Set: Created 4 years, 2 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/PaintInvalidator.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
index 574c15651048ff64c0c10eb0ce5ce1bc13cba06e..ea53d0f3d2be5f51ed6b6161b3c55e4500a51efc 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
@@ -215,9 +215,11 @@ void PaintInvalidator::updatePaintingLayer(const LayoutObject& object,
namespace {
-// This is temporary to workaround paint invalidation issues in non-rootLayerScrolls mode.
-// It undos FrameView's content clip and scroll for paint invalidation of frame
-// scroll controls and the LayoutView to which the content clip and scroll don't apply.
+// This is temporary to workaround paint invalidation issues in
+// non-rootLayerScrolls mode.
+// It undoes FrameView's content clip and scroll for paint invalidation of frame
+// scroll controls and the LayoutView to which the content clip and scroll don't
+// apply.
class ScopedUndoFrameViewContentClipAndScroll {
public:
ScopedUndoFrameViewContentClipAndScroll(const FrameView& frameView,
@@ -258,22 +260,25 @@ void PaintInvalidator::updateContext(const LayoutObject& object,
context.paintInvalidationContainerForStackedContents =
toLayoutBoxModelObject(&object);
} else if (object.isLayoutView()) {
- // paintInvalidationContainerForStackedContents is only for stacked descendants in its own frame,
- // because it doesn't establish stacking context for stacked contents in sub-frames.
- // Contents stacked in the root stacking context in this frame should use this frame's paintInvalidationContainer.
+ // paintInvalidationContainerForStackedContents is only for stacked
+ // descendants in its own frame, because it doesn't establish stacking
+ // context for stacked contents in sub-frames.
+ // Contents stacked in the root stacking context in this frame should use
+ // this frame's paintInvalidationContainer.
context.paintInvalidationContainerForStackedContents =
context.paintInvalidationContainer;
if (!RuntimeEnabledFeatures::rootLayerScrollingEnabled())
undoFrameViewContentClipAndScroll.emplace(
*toLayoutView(object).frameView(), context);
- } else if (
- object.styleRef().isStacked()
- // This is to exclude some objects (e.g. LayoutText) inheriting stacked style from parent but aren't actually stacked.
- && object.hasLayer() &&
- context.paintInvalidationContainer !=
- context.paintInvalidationContainerForStackedContents) {
- // The current object is stacked, so we should use m_paintInvalidationContainerForStackedContents as its
- // paint invalidation container on which the current object is painted.
+ } else if (object.styleRef().isStacked() &&
+ // This is to exclude some objects (e.g. LayoutText) inheriting
+ // stacked style from parent but aren't actually stacked.
+ object.hasLayer() &&
+ context.paintInvalidationContainer !=
+ context.paintInvalidationContainerForStackedContents) {
+ // The current object is stacked, so we should use
+ // m_paintInvalidationContainerForStackedContents as its paint invalidation
+ // container on which the current object is painted.
context.paintInvalidationContainer =
context.paintInvalidationContainerForStackedContents;
if (context.forcedSubtreeInvalidationFlags &
@@ -289,8 +294,9 @@ void PaintInvalidator::updateContext(const LayoutObject& object,
// descending into a different invalidation container. (For instance if
// our parents were moved, the entire container will just move.)
if (object != context.paintInvalidationContainerForStackedContents) {
- // However, we need to keep the ForcedSubtreeFullInvalidationForStackedContents flag
- // if the current object isn't the paint invalidation container of stacked contents.
+ // However, we need to keep the
+ // ForcedSubtreeFullInvalidationForStackedContents flag if the current
+ // object isn't the paint invalidation container of stacked contents.
context.forcedSubtreeInvalidationFlags &= PaintInvalidatorContext::
ForcedSubtreeFullInvalidationForStackedContents;
} else {
@@ -306,7 +312,8 @@ void PaintInvalidator::updateContext(const LayoutObject& object,
context.forcedSubtreeInvalidationFlags |=
PaintInvalidatorContext::ForcedSubtreeInvalidationChecking;
- // TODO(crbug.com/637313): This is temporary before we support filters in paint property tree.
+ // TODO(crbug.com/637313): This is temporary before we support filters in
+ // paint property tree.
// TODO(crbug.com/648274): This is a workaround for multi-column contents.
if (object.hasFilterInducingProperty() || object.isLayoutFlowThread())
context.forcedSubtreeInvalidationFlags |=
@@ -393,7 +400,8 @@ void PaintInvalidator::invalidatePaintIfNeeded(
.shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() &&
context.forcedSubtreeInvalidationFlags ==
PaintInvalidatorContext::ForcedSubtreeInvalidationRectUpdate) {
- // We are done updating the paint invalidation rect. No other paint invalidation work to do for this object.
+ // We are done updating the paint invalidation rect. No other paint
+ // invalidation work to do for this object.
return;
}
@@ -420,17 +428,19 @@ void PaintInvalidator::invalidatePaintIfNeeded(
context.forcedSubtreeInvalidationFlags |=
PaintInvalidatorContext::ForcedSubtreeInvalidationChecking;
- // TODO(crbug.com/533277): This is a workaround for the bug. Remove when we detect paint offset change.
+ // TODO(crbug.com/533277): This is a workaround for the bug. Remove when we
+ // detect paint offset change.
if (reason != PaintInvalidationNone &&
hasPercentageTransform(object.styleRef()))
context.forcedSubtreeInvalidationFlags |=
PaintInvalidatorContext::ForcedSubtreeInvalidationChecking;
- // TODO(crbug.com/490725): This is a workaround for the bug, to force descendant to update paint invalidation
- // rects on clipping change.
+ // TODO(crbug.com/490725): This is a workaround for the bug, to force
+ // descendant to update paint invalidation rects on clipping change.
if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
context.oldBounds != context.newBounds
- // Note that isLayoutView() below becomes unnecessary after the launch of root layer scrolling.
+ // Note that isLayoutView() below becomes unnecessary after the launch of
+ // root layer scrolling.
&& (object.hasOverflowClip() || object.isLayoutView()) &&
!toLayoutBox(object).usesCompositedScrolling())
context.forcedSubtreeInvalidationFlags |=
« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintInvalidator.h ('k') | third_party/WebKit/Source/core/paint/PaintLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698