summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/layout/layout_object_child_list.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/layout/layout_object_child_list.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/layout/layout_object_child_list.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/third_party/blink/renderer/core/layout/layout_object_child_list.cc b/chromium/third_party/blink/renderer/core/layout/layout_object_child_list.cc
index 6dd333bebe7..a520da71068 100644
--- a/chromium/third_party/blink/renderer/core/layout/layout_object_child_list.cc
+++ b/chromium/third_party/blink/renderer/core/layout/layout_object_child_list.cc
@@ -31,7 +31,6 @@
#include "third_party/blink/renderer/core/layout/layout_inline.h"
#include "third_party/blink/renderer/core/layout/layout_object.h"
#include "third_party/blink/renderer/core/layout/layout_view.h"
-#include "third_party/blink/renderer/core/layout/ng/inline/layout_ng_text.h"
#include "third_party/blink/renderer/core/paint/object_paint_invalidator.h"
namespace blink {
@@ -45,8 +44,8 @@ namespace {
void InvalidateInlineItems(LayoutObject* object) {
if (object->IsInLayoutNGInlineFormattingContext())
object->SetFirstInlineFragment(nullptr);
- if (object->IsLayoutNGText()) {
- ToLayoutNGText(object)->InvalidateInlineItems();
+ if (object->IsText()) {
+ ToLayoutText(object)->InvalidateInlineItems();
} else if (object->IsLayoutInline()) {
// When moving without |notify_layout_object|, only top-level objects are
// moved. Ensure to invalidate all LayoutNGText in this inline formatting
@@ -92,9 +91,10 @@ LayoutObject* LayoutObjectChildList::RemoveChildNode(
// flow child got yanked or that a positioned child got yanked). We also
// issue paint invalidations, so that the area exposed when the child
// disappears gets paint invalidated properly.
- if (notify_layout_object && old_child->EverHadLayout())
+ if (notify_layout_object && old_child->EverHadLayout()) {
old_child->SetNeedsLayoutAndPrefWidthsRecalc(
- LayoutInvalidationReason::kRemovedFromLayout);
+ layout_invalidation_reason::kRemovedFromLayout);
+ }
InvalidatePaintOnRemoval(*old_child);
}
@@ -212,7 +212,7 @@ void LayoutObjectChildList::InsertChildNode(LayoutObject* owner,
new_child->ClearNeedsCollectInlines();
new_child->SetNeedsLayoutAndPrefWidthsRecalc(
- LayoutInvalidationReason::kAddedToLayout);
+ layout_invalidation_reason::kAddedToLayout);
new_child->SetShouldDoFullPaintInvalidation(
PaintInvalidationReason::kAppeared);
new_child->AddSubtreePaintPropertyUpdateReason(