OLD | NEW |
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 ObjectPaintProperties::PropertyTreeStateWithOffset | 9 ObjectPaintProperties::PropertyTreeStateWithOffset |
10 ObjectPaintProperties::contentsProperties() const { | 10 ObjectPaintProperties::contentsProperties() const { |
11 ObjectPaintProperties::PropertyTreeStateWithOffset propertiesWithOffset = | 11 ObjectPaintProperties::PropertyTreeStateWithOffset propertiesWithOffset = |
12 *localBorderBoxProperties(); | 12 *localBorderBoxProperties(); |
13 | 13 |
14 if (scrollTranslation()) | 14 if (scrollTranslation()) |
15 propertiesWithOffset.propertyTreeState.setTransform(scrollTranslation()); | 15 propertiesWithOffset.propertyTreeState.setTransform(scrollTranslation()); |
16 | 16 |
| 17 if (scroll()) |
| 18 propertiesWithOffset.propertyTreeState.setScroll(scroll()); |
| 19 |
17 if (overflowClip()) | 20 if (overflowClip()) |
18 propertiesWithOffset.propertyTreeState.setClip(overflowClip()); | 21 propertiesWithOffset.propertyTreeState.setClip(overflowClip()); |
19 else if (cssClip()) | 22 else if (cssClip()) |
20 propertiesWithOffset.propertyTreeState.setClip(cssClip()); | 23 propertiesWithOffset.propertyTreeState.setClip(cssClip()); |
21 | 24 |
22 // TODO(chrishtr): cssClipFixedPosition needs to be handled somehow. | 25 // TODO(chrishtr): cssClipFixedPosition needs to be handled somehow. |
23 | 26 |
24 return propertiesWithOffset; | 27 return propertiesWithOffset; |
25 } | 28 } |
26 | 29 |
27 } // namespace blink | 30 } // namespace blink |
OLD | NEW |