Rename enums/functions that collide in chromium style in core/style/

third_party/WebKit/Source/core/layout/LayoutReplaced.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 50 matching lines @@
     bool needsPreferredWidthsRecalculation() const override;
 
     // These values are specified to be 300 and 150 pixels in the CSS 2.1 spec.
     // http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width
     static const int defaultWidth;
     static const int defaultHeight;
     bool canHaveChildren() const override { return false; }
     virtual void paintReplaced(const PaintInfo&, const LayoutPoint&) const { }
     LayoutRect localSelectionRect() const; // This is in local coordinates, but it's a physical rect (so the top left corner is physical top left).
 
-    bool hasObjectFit() const { return style()->objectFit() != ComputedStyle::initialObjectFit(); }
+    bool hasObjectFit() const { return style()->getObjectFit() != ComputedStyle::initialObjectFit(); }
 
     void paint(const PaintInfo&, const LayoutPoint&) const override;
 
 protected:
     void willBeDestroyed() override;
 
     void layout() override;
 
     LayoutSize intrinsicSize() const final { return m_intrinsicSize; }
     void computeIntrinsicSizingInfo(IntrinsicSizingInfo&) const override;
@@ skipping 32 matching lines @@
     LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const final;
     void computeIntrinsicSizingInfoForLayoutBox(LayoutBox*, IntrinsicSizingInfo&) const;
     FloatSize constrainIntrinsicSizeToMinMax(const IntrinsicSizingInfo&) const;
 
     mutable LayoutSize m_intrinsicSize;
 };
 
 } // namespace blink
 
 #endif