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

Side by Side Diff: third_party/WebKit/Source/core/paint/ObjectPaintProperties.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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/paint/ObjectPaintProperties.h" 5 #include "core/paint/ObjectPaintProperties.h"
6 6
7 namespace blink { 7 namespace blink {
8 8
9 void ObjectPaintProperties::getContentsProperties(GeometryPropertyTreeState& pro perties) const 9 GeometryPropertyTreeState ObjectPaintProperties::getContentsProperties() const
10 { 10 {
11 properties = localBorderBoxProperties()->geometryPropertyTreeState; 11 const LocalBorderBoxProperties* localBorderBox = localBorderBoxProperties();
12 GeometryPropertyTreeState geometryPropertyTreeState(
13 localBorderBox->transform,
14 localBorderBox->clip,
15 localBorderBox->effect);
16
12 if (scrollTranslation()) 17 if (scrollTranslation())
13 properties.transform = scrollTranslation(); 18 geometryPropertyTreeState.transform = scrollTranslation();
14 else if (svgLocalToBorderBoxTransform()) 19 else if (svgLocalToBorderBoxTransform())
15 properties.transform = svgLocalToBorderBoxTransform(); 20 geometryPropertyTreeState.transform = svgLocalToBorderBoxTransform();
16 21
17 if (overflowClip()) 22 if (overflowClip())
18 properties.clip = overflowClip(); 23 geometryPropertyTreeState.clip = overflowClip();
19 else if (cssClip()) 24 else if (cssClip())
20 properties.clip = cssClip(); 25 geometryPropertyTreeState.clip = cssClip();
26
21 // TODO(chrishtr): cssClipFixedPosition needs to be handled somehow. 27 // TODO(chrishtr): cssClipFixedPosition needs to be handled somehow.
28
29 return geometryPropertyTreeState;
22 } 30 }
23 31
24 } // namespace blink 32 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698