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

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

Issue 2351433002: Switch LocalBorderBoxProperties to store raw pointers (Closed)
Patch Set: Created 4 years, 3 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/PaintPropertyTreeBuilder.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
index 051eac477996558eea600be5ff4714efb73cbe8d..85024e9e94c1ba0c2c4c69867ea87b47aef9e351 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
@@ -296,17 +296,11 @@ void PaintPropertyTreeBuilder::updateLocalBorderBoxContext(const LayoutObject& o
std::unique_ptr<ObjectPaintProperties::LocalBorderBoxProperties> borderBoxContext =
wrapUnique(new ObjectPaintProperties::LocalBorderBoxProperties);
borderBoxContext->paintOffset = context.current.paintOffset;
- borderBoxContext->geometryPropertyTreeState = GeometryPropertyTreeState(context.current.transform, context.current.clip, context.currentEffect);
+ borderBoxContext->transform = context.current.transform;
+ borderBoxContext->clip = context.current.clip;
+ borderBoxContext->effect = context.currentEffect;
borderBoxContext->scroll = context.current.scroll;
- if (!context.current.clip) {
- DCHECK(object.isLayoutView());
- DCHECK(toLayoutView(object).frameView()->frame().isMainFrame());
- DCHECK(RuntimeEnabledFeatures::rootLayerScrollingEnabled());
- borderBoxContext->geometryPropertyTreeState.clip = ClipPaintPropertyNode::create(nullptr, context.current.transform, FloatRoundedRect(LayoutRect::infiniteIntRect()));
- context.current.clip = borderBoxContext->geometryPropertyTreeState.clip.get();
- }
-
object.getMutableForPainting().ensureObjectPaintProperties().setLocalBorderBoxProperties(std::move(borderBoxContext));
}

Powered by Google App Engine
This is Rietveld 408576698