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

third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

 /*
 * Copyright (C) 2008 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 933 matching lines @@
 
     const ComputedStyle* style = m_layoutObject->style();
     if (!style)
         return AXNodeObject::textStyle();
 
     unsigned textStyle = TextStyleNone;
     if (style->fontWeight() == FontWeightBold)
         textStyle |= TextStyleBold;
     if (style->fontDescription().style() == FontStyleItalic)
         textStyle |= TextStyleItalic;
-    if (style->textDecoration() == TextDecorationUnderline)
+    if (style->getTextDecoration() == TextDecorationUnderline)
         textStyle |= TextStyleUnderline;
-    if (style->textDecoration() == TextDecorationLineThrough)
+    if (style->getTextDecoration() == TextDecorationLineThrough)
         textStyle |= TextStyleLineThrough;
 
     return static_cast<TextStyle>(textStyle);
 }
 
 KURL AXLayoutObject::url() const
 {
     if (isAnchor() && isHTMLAnchorElement(m_layoutObject->node())) {
         if (HTMLAnchorElement* anchor = toHTMLAnchorElement(anchorElement()))
             return anchor->href();
@@ skipping 1579 matching lines @@
         if (label && label->layoutObject()) {
             LayoutRect labelRect = axObjectCache().getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink