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

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

Issue 2782343002: Store local border box property cache outside ObjectPaintProperties (Closed)
Patch Set: Rebase Created 3 years, 9 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/PaintLayerPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
index e32ca9f3705cfe02bfffd34581ac81b75da623f1..8715670307da5dedb817704c7c1bf136d18ba51e 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
@@ -266,14 +266,12 @@ PaintResult PaintLayerPainter::paintLayerContents(
if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
m_paintLayer.layoutObject().isLayoutView()) {
- const auto* objectPaintProperties =
- m_paintLayer.layoutObject().paintProperties();
- DCHECK(objectPaintProperties &&
- objectPaintProperties->localBorderBoxProperties());
+ const auto* localBorderBoxProperties =
+ m_paintLayer.layoutObject().localBorderBoxProperties();
+ DCHECK(localBorderBoxProperties);
PaintChunkProperties properties(
context.getPaintController().currentPaintChunkProperties());
- properties.propertyTreeState =
- *objectPaintProperties->localBorderBoxProperties();
+ properties.propertyTreeState = *localBorderBoxProperties;
properties.backfaceHidden = m_paintLayer.layoutObject().hasHiddenBackface();
scopedPaintChunkProperties.emplace(context.getPaintController(),
m_paintLayer, properties);
@@ -495,14 +493,12 @@ PaintResult PaintLayerPainter::paintLayerContents(
// the top of this method, in scopedPaintChunkProperties.
DCHECK(!(RuntimeEnabledFeatures::rootLayerScrollingEnabled() &&
m_paintLayer.layoutObject().isLayoutView()));
- const auto* objectPaintProperties =
- m_paintLayer.layoutObject().paintProperties();
- DCHECK(objectPaintProperties &&
- objectPaintProperties->localBorderBoxProperties());
+ const auto* localBorderBoxProperties =
+ m_paintLayer.layoutObject().localBorderBoxProperties();
+ DCHECK(localBorderBoxProperties);
PaintChunkProperties properties(
context.getPaintController().currentPaintChunkProperties());
- properties.propertyTreeState =
- *objectPaintProperties->localBorderBoxProperties();
+ properties.propertyTreeState = *localBorderBoxProperties;
properties.backfaceHidden = m_paintLayer.layoutObject().hasHiddenBackface();
contentScopedPaintChunkProperties.emplace(context.getPaintController(),
m_paintLayer, properties);

Powered by Google App Engine
This is Rietveld 408576698