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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2844993004: Don't skip logic in in UpdateLifecyclePhasesInternal for kCompositingInputsClean (Closed)
Patch Set: Additional comment fix Created 3 years, 8 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositorTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 2cfd1d97e78a89a94c185f8208f98788d830eb23..905bacdfb4c0344658f01c4c5227881270a7129a 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -3107,17 +3107,13 @@ void FrameView::UpdateLifecyclePhasesInternal(
});
}
- if (target_state == DocumentLifecycle::kCompositingInputsClean) {
- DCHECK_EQ(Lifecycle().GetState(),
- DocumentLifecycle::kCompositingInputsClean);
- return;
- }
-
- ScrollContentsIfNeededRecursive();
- DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() ||
- Lifecycle().GetState() >= DocumentLifecycle::kCompositingClean);
+ if (target_state >= DocumentLifecycle::kCompositingClean) {
+ ScrollContentsIfNeededRecursive();
- frame_->GetPage()->GlobalRootScrollerController().DidUpdateCompositing();
+ frame_->GetPage()
+ ->GlobalRootScrollerController()
+ .DidUpdateCompositing();
+ }
if (target_state >= DocumentLifecycle::kPrePaintClean) {
if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
@@ -3139,12 +3135,11 @@ void FrameView::UpdateLifecyclePhasesInternal(
.UpdateEventRectsForSubframeIfNecessary(local_frame);
}
UpdateCompositedSelectionIfNeeded();
- }
- // TODO(pdr): prePaint should be under the "Paint" devtools timeline step
- // for slimming paint v2.
- if (target_state >= DocumentLifecycle::kPrePaintClean)
+ // TODO(pdr): prePaint should be under the "Paint" devtools timeline
+ // step for slimming paint v2.
PrePaint();
+ }
}
if (target_state == DocumentLifecycle::kPaintClean) {
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositorTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698