| Index: third_party/WebKit/Source/core/layout/ng/ng_floating_object.h
|
| diff --git a/third_party/WebKit/Source/core/layout/ng/ng_floating_object.h b/third_party/WebKit/Source/core/layout/ng/ng_floating_object.h
|
| index d55ea63a5c39cc3752c48407d4914b470623cdc5..0792952776aee501b38b18676a6f1c659ff26bf1 100644
|
| --- a/third_party/WebKit/Source/core/layout/ng/ng_floating_object.h
|
| +++ b/third_party/WebKit/Source/core/layout/ng/ng_floating_object.h
|
| @@ -27,7 +27,7 @@ struct CORE_EXPORT NGFloatingObject
|
| const NGBoxStrut& margins)
|
| : fragment(fragment),
|
| space(space),
|
| - parent_space(parent_space),
|
| + original_parent_space(parent_space),
|
| node(node),
|
| margins(margins) {
|
| exclusion_type = NGExclusion::kFloatLeft;
|
| @@ -42,7 +42,7 @@ struct CORE_EXPORT NGFloatingObject
|
|
|
| // Parent space is used so we can calculate the inline offset relative to
|
| // the original parent of this float.
|
| - Member<const NGConstraintSpace> parent_space;
|
| + Member<const NGConstraintSpace> original_parent_space;
|
| Member<NGBlockNode> node;
|
| NGExclusion::Type exclusion_type;
|
| EClear clear_type;
|
| @@ -59,7 +59,7 @@ struct CORE_EXPORT NGFloatingObject
|
|
|
| DEFINE_INLINE_TRACE() {
|
| visitor->trace(space);
|
| - visitor->trace(parent_space);
|
| + visitor->trace(original_parent_space);
|
| visitor->trace(node);
|
| }
|
| };
|
|
|