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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. 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
@@ skipping 34 matching lines @@
 
     // Note that Type uses bits so you can use FloatLeftRight as a mask to query for both left and right.
     enum Type { FloatLeft = 1, FloatRight = 2, FloatLeftRight = 3 };
 
     static PassOwnPtr<FloatingObject> create(LayoutBox*);
 
     PassOwnPtr<FloatingObject> copyToNewContainer(LayoutSize, bool shouldPaint = false, bool isDescendant = false) const;
 
     PassOwnPtr<FloatingObject> unsafeClone() const;
 
-    Type type() const { return static_cast<Type>(m_type); }
+    Type getType() const { return static_cast<Type>(m_type); }
     LayoutBox* layoutObject() const { return m_layoutObject; }
 
     bool isPlaced() const { return m_isPlaced; }
     void setIsPlaced(bool placed = true) { m_isPlaced = placed; }
 
     LayoutUnit x() const { ASSERT(isPlaced()); return m_frameRect.x(); }
     LayoutUnit maxX() const { ASSERT(isPlaced()); return m_frameRect.maxX(); }
     LayoutUnit y() const { ASSERT(isPlaced()); return m_frameRect.y(); }
     LayoutUnit maxY() const { ASSERT(isPlaced()); return m_frameRect.maxY(); }
     LayoutUnit width() const { return m_frameRect.width(); }
@@ skipping 138 matching lines @@
     static String toString(const LayoutUnit value);
 };
 template<> struct ValueToString<FloatingObject*> {
     static String toString(const FloatingObject*);
 };
 #endif
 
 } // namespace blink
 
 #endif // FloatingObjects_h