| 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 #ifndef FindPropertiesNeedingUpdate_h | 5 #ifndef FindPropertiesNeedingUpdate_h |
| 6 #define FindPropertiesNeedingUpdate_h | 6 #define FindPropertiesNeedingUpdate_h |
| 7 | 7 |
| 8 #if DCHECK_IS_ON() | 8 #if DCHECK_IS_ON() |
| 9 | 9 |
| 10 #include "core/frame/FrameView.h" | 10 #include "core/frame/FrameView.h" |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 200 original_local_border_box_properties_->Clip(), | 200 original_local_border_box_properties_->Clip(), |
| 201 object_border_box->Clip()); | 201 object_border_box->Clip()); |
| 202 DCHECK_OBJECT_PROPERTY_EQ(object_, | 202 DCHECK_OBJECT_PROPERTY_EQ(object_, |
| 203 original_local_border_box_properties_->Effect(), | 203 original_local_border_box_properties_->Effect(), |
| 204 object_border_box->Effect()); | 204 object_border_box->Effect()); |
| 205 } else { | 205 } else { |
| 206 DCHECK_EQ(!!original_local_border_box_properties_, !!object_border_box) | 206 DCHECK_EQ(!!original_local_border_box_properties_, !!object_border_box) |
| 207 << " Object: " << object_.DebugName(); | 207 << " Object: " << object_.DebugName(); |
| 208 } | 208 } |
| 209 | 209 |
| 210 // Instead of checking that the contents properties are unchanged here, | |
| 211 // we check them on every access in LayoutObject::contentsProperties. | |
| 212 | |
| 213 // Restore original clean bit. | 210 // Restore original clean bit. |
| 214 object_.GetMutableForPainting().ClearNeedsPaintPropertyUpdateForTesting(); | 211 object_.GetMutableForPainting().ClearNeedsPaintPropertyUpdateForTesting(); |
| 215 } | 212 } |
| 216 | 213 |
| 217 private: | 214 private: |
| 218 const LayoutObject& object_; | 215 const LayoutObject& object_; |
| 219 bool needed_paint_property_update_; | 216 bool needed_paint_property_update_; |
| 220 bool needed_forced_subtree_update_; | 217 bool needed_forced_subtree_update_; |
| 221 LayoutPoint original_paint_offset_; | 218 LayoutPoint original_paint_offset_; |
| 222 std::unique_ptr<const ObjectPaintProperties> original_properties_; | 219 std::unique_ptr<const ObjectPaintProperties> original_properties_; |
| 223 std::unique_ptr<const PropertyTreeState> | 220 std::unique_ptr<const PropertyTreeState> |
| 224 original_local_border_box_properties_; | 221 original_local_border_box_properties_; |
| 225 }; | 222 }; |
| 226 | 223 |
| 227 } // namespace blink | 224 } // namespace blink |
| 228 #endif // DCHECK_IS_ON() | 225 #endif // DCHECK_IS_ON() |
| 229 | 226 |
| 230 #endif // FindPropertiesNeedingUpdate_h | 227 #endif // FindPropertiesNeedingUpdate_h |
| OLD | NEW |