Layout: Make enum item names of LayoutObjectType consistent

- 'Layout' in some items were redundant

- Remove unused kLayoutObjectLayoutInline and
  kLayoutObjectLayoutEmbeddedContent

- kLayoutObjectTextArea and kLayoutObjectTextField were not matched
  to C++ class names.

This CL has no behavior changes.

Change-Id: Iff8c84234cd264340074d474ba069f605b3e657a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2444670
Commit-Queue: Kent Tamura <tkent@chromium.org>
Commit-Queue: Ian Kilpatrick <ikilpatrick@chromium.org>
Auto-Submit: Kent Tamura <tkent@chromium.org>
Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813064}

third_party/blink/renderer/core/layout/layout_button.h

@@ -42,8 +42,7 @@ class LayoutButton final : public LayoutFlexibleBox {
   }
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutButton ||
-           LayoutFlexibleBox::IsOfType(type);
+    return type == kLayoutObjectButton || LayoutFlexibleBox::IsOfType(type);
   }
 
   void AddChild(LayoutObject* new_child,

third_party/blink/renderer/core/layout/layout_custom_scrollbar_part.h

@@ -71,7 +71,7 @@ class CORE_EXPORT LayoutCustomScrollbarPart final : public LayoutReplaced {
 
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutCustomScrollbarPart ||
+    return type == kLayoutObjectCustomScrollbarPart ||
            LayoutReplaced::IsOfType(type);
   }
   ScrollableArea* GetScrollableArea() const {

third_party/blink/renderer/core/layout/layout_grid.h

@@ -146,7 +146,7 @@ class LayoutGrid final : public LayoutBlock {
  private:
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutGrid || LayoutBlock::IsOfType(type);
+    return type == kLayoutObjectGrid || LayoutBlock::IsOfType(type);
   }
   MinMaxSizes ComputeIntrinsicLogicalWidths() const override;
 

third_party/blink/renderer/core/layout/layout_iframe.h

@@ -47,8 +47,7 @@ class LayoutIFrame final : public LayoutEmbeddedContent {
 
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutIFrame ||
-           LayoutEmbeddedContent::IsOfType(type);
+    return type == kLayoutObjectIFrame || LayoutEmbeddedContent::IsOfType(type);
   }
 
   PaintLayerType LayerTypeRequired() const override;

third_party/blink/renderer/core/layout/layout_image.h

@@ -117,7 +117,7 @@ class CORE_EXPORT LayoutImage : public LayoutReplaced {
 
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutImage || LayoutReplaced::IsOfType(type);
+    return type == kLayoutObjectImage || LayoutReplaced::IsOfType(type);
   }
 
   void WillBeDestroyed() override;

third_party/blink/renderer/core/layout/layout_multi_column_set.h

@@ -102,7 +102,7 @@ class CORE_EXPORT LayoutMultiColumnSet final : public LayoutBlockFlow {
 
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutMultiColumnSet ||
+    return type == kLayoutObjectMultiColumnSet ||
            LayoutBlockFlow::IsOfType(type);
   }
   bool CanHaveChildren() const final {

third_party/blink/renderer/core/layout/layout_multi_column_spanner_placeholder.h

@@ -19,7 +19,7 @@ class LayoutMultiColumnSpannerPlaceholder final : public LayoutBox {
  public:
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutMultiColumnSpannerPlaceholder ||
+    return type == kLayoutObjectMultiColumnSpannerPlaceholder ||
            LayoutBox::IsOfType(type);
   }
 

third_party/blink/renderer/core/layout/layout_object.h

@@ -838,11 +838,11 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   }
   bool IsLayoutTableCol() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutTableCol);
+    return IsOfType(kLayoutObjectTableCol);
   }
   bool IsLayoutNGTableCol() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutNGTableCol);
+    return IsOfType(kLayoutObjectNGTableCol);
   }
   bool IsListItem() const {
     NOT_DESTROYED();
@@ -882,8 +882,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   }
   bool IsButtonIncludingNG() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutButton) ||
-           IsOfType(kLayoutObjectNGButton);
+    return IsOfType(kLayoutObjectButton) || IsOfType(kLayoutObjectNGButton);
   }
   bool IsLayoutNGButton() const {
     NOT_DESTROYED();
@@ -891,39 +890,39 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   }
   bool IsLayoutNGCustom() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutNGCustom);
+    return IsOfType(kLayoutObjectNGCustom);
   }
   bool IsLayoutGrid() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutGrid);
+    return IsOfType(kLayoutObjectGrid);
   }
   bool IsLayoutIFrame() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutIFrame);
+    return IsOfType(kLayoutObjectIFrame);
   }
   bool IsLayoutImage() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutImage);
+    return IsOfType(kLayoutObjectImage);
   }
   bool IsLayoutMultiColumnSet() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutMultiColumnSet);
+    return IsOfType(kLayoutObjectMultiColumnSet);
   }
   bool IsLayoutMultiColumnSpannerPlaceholder() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutMultiColumnSpannerPlaceholder);
+    return IsOfType(kLayoutObjectMultiColumnSpannerPlaceholder);
   }
   bool IsLayoutReplaced() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutReplaced);
+    return IsOfType(kLayoutObjectReplaced);
   }
   bool IsLayoutCustomScrollbarPart() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutCustomScrollbarPart);
+    return IsOfType(kLayoutObjectCustomScrollbarPart);
   }
   bool IsLayoutView() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectLayoutView);
+    return IsOfType(kLayoutObjectView);
   }
   bool IsRuby() const {
     NOT_DESTROYED();
@@ -967,7 +966,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   }
   bool IsTextAreaIncludingNG() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectTextArea) ||
+    return IsOfType(kLayoutObjectTextControlMultiLine) ||
            IsOfType(kLayoutObjectNGTextControlMultiLine);
   }
   bool IsTextControlIncludingNG() const {
@@ -978,7 +977,7 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   }
   bool IsTextFieldIncludingNG() const {
     NOT_DESTROYED();
-    return IsOfType(kLayoutObjectTextField) ||
+    return IsOfType(kLayoutObjectTextControlSingleLine) ||
            IsOfType(kLayoutObjectNGTextControlSingleLine);
   }
   bool IsVideo() const {
@@ -3273,6 +3272,8 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
   }
 
  protected:
+  // Identifiers for each of LayoutObject subclasses.
+  // The identifier name for blink::LayoutFoo should be kLayoutObjectFoo.
   enum LayoutObjectType {
     kLayoutObjectBr,
     kLayoutObjectCanvas,
@@ -3284,8 +3285,8 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
     kLayoutObjectFrame,
     kLayoutObjectFrameSet,
     kLayoutObjectInsideListMarker,
-    kLayoutObjectLayoutTableCol,
-    kLayoutObjectLayoutNGTableCol,
+    kLayoutObjectTableCol,
+    kLayoutObjectNGTableCol,
     kLayoutObjectListItem,
     kLayoutObjectListMarker,
     kLayoutObjectListMarkerImage,
@@ -3308,19 +3309,16 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
     kLayoutObjectOutsideListMarker,
     kLayoutObjectProgress,
     kLayoutObjectQuote,
-    kLayoutObjectLayoutButton,
-    kLayoutObjectLayoutNGCustom,
-    kLayoutObjectLayoutFlowThread,
-    kLayoutObjectLayoutGrid,
-    kLayoutObjectLayoutIFrame,
-    kLayoutObjectLayoutImage,
-    kLayoutObjectLayoutInline,
-    kLayoutObjectLayoutMultiColumnSet,
-    kLayoutObjectLayoutMultiColumnSpannerPlaceholder,
-    kLayoutObjectLayoutEmbeddedContent,
-    kLayoutObjectLayoutReplaced,
-    kLayoutObjectLayoutCustomScrollbarPart,
-    kLayoutObjectLayoutView,
+    kLayoutObjectButton,
+    kLayoutObjectNGCustom,
+    kLayoutObjectGrid,
+    kLayoutObjectIFrame,
+    kLayoutObjectImage,
+    kLayoutObjectMultiColumnSet,
+    kLayoutObjectMultiColumnSpannerPlaceholder,
+    kLayoutObjectReplaced,
+    kLayoutObjectCustomScrollbarPart,
+    kLayoutObjectView,
     kLayoutObjectRuby,
     kLayoutObjectRubyBase,
     kLayoutObjectRubyRun,
@@ -3331,9 +3329,9 @@ class CORE_EXPORT LayoutObject : public ImageResourceObserver,
     kLayoutObjectTableCellLegacy,
     kLayoutObjectTableRow,
     kLayoutObjectTableSection,
-    kLayoutObjectTextArea,
+    kLayoutObjectTextControlMultiLine,
     kLayoutObjectTextControl,
-    kLayoutObjectTextField,
+    kLayoutObjectTextControlSingleLine,
     kLayoutObjectVideo,
     kLayoutObjectWidget,
 

third_party/blink/renderer/core/layout/layout_replaced.h

@@ -169,7 +169,7 @@ class CORE_EXPORT LayoutReplaced : public LayoutBox {
 
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutReplaced || LayoutBox::IsOfType(type);
+    return type == kLayoutObjectReplaced || LayoutBox::IsOfType(type);
   }
 
  private:

third_party/blink/renderer/core/layout/layout_table_col.h

@@ -95,7 +95,7 @@ class LayoutTableCol final : public LayoutTableBoxComponent {
  private:
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutTableCol || LayoutBox::IsOfType(type);
+    return type == kLayoutObjectTableCol || LayoutBox::IsOfType(type);
   }
   void UpdateFromElement() override;
 

third_party/blink/renderer/core/layout/layout_text_control_multi_line.h

@@ -35,7 +35,8 @@ class LayoutTextControlMultiLine final : public LayoutTextControl {
  private:
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectTextArea || LayoutTextControl::IsOfType(type);
+    return type == kLayoutObjectTextControlMultiLine ||
+           LayoutTextControl::IsOfType(type);
   }
 
   bool NodeAtPoint(HitTestResult&,

third_party/blink/renderer/core/layout/layout_text_control_single_line.h

@@ -47,7 +47,8 @@ class LayoutTextControlSingleLine : public LayoutTextControl {
  private:
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectTextField || LayoutTextControl::IsOfType(type);
+    return type == kLayoutObjectTextControlSingleLine ||
+           LayoutTextControl::IsOfType(type);
   }
 
   void Paint(const PaintInfo&) const override;

third_party/blink/renderer/core/layout/layout_view.h

@@ -94,7 +94,7 @@ class CORE_EXPORT LayoutView final : public LayoutBlockFlow {
 
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutView || LayoutBlockFlow::IsOfType(type);
+    return type == kLayoutObjectView || LayoutBlockFlow::IsOfType(type);
   }
 
   PaintLayerType LayerTypeRequired() const override {

third_party/blink/renderer/core/layout/ng/custom/layout_ng_custom.h

@@ -37,8 +37,7 @@ class LayoutNGCustom final : public LayoutNGBlockFlow {
 
  private:
   bool IsOfType(LayoutObjectType type) const override {
-    return type == kLayoutObjectLayoutNGCustom ||
-           LayoutNGBlockFlow::IsOfType(type);
+    return type == kLayoutObjectNGCustom || LayoutNGBlockFlow::IsOfType(type);
   }
 
   LayoutNGCustomState state_;

third_party/blink/renderer/core/layout/ng/table/layout_ng_table_column.h

@@ -67,7 +67,7 @@ class CORE_EXPORT LayoutNGTableColumn : public LayoutBox {
 
   bool IsOfType(LayoutObjectType type) const override {
     NOT_DESTROYED();
-    return type == kLayoutObjectLayoutTableCol || LayoutBox::IsOfType(type);
+    return type == kLayoutObjectTableCol || LayoutBox::IsOfType(type);
   }
 
  private: