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

third_party/WebKit/Source/core/layout/LayoutObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 2026 matching lines @@
         s_affectsParentBlock = false;
     }
 
     // Elements with non-auto touch-action will send a SetTouchAction message
     // on touchstart in EventHandler::handleTouchEvent, and so effectively have
     // a touchstart handler that must be reported.
     //
     // Since a CSS property cannot be applied directly to a text node, a
     // handler will have already been added for its parent so ignore it.
     // TODO: Remove this blocking event handler; crbug.com/318381
-    TouchAction oldTouchAction = m_style ? m_style->touchAction() : TouchActionAuto;
-    if (node() && !node()->isTextNode() && (oldTouchAction == TouchActionAuto) != (newStyle.touchAction() == TouchActionAuto)) {
+    TouchAction oldTouchAction = m_style ? m_style->getTouchAction() : TouchActionAuto;
+    if (node() && !node()->isTextNode() && (oldTouchAction == TouchActionAuto) != (newStyle.getTouchAction() == TouchActionAuto)) {
         EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry();
-        if (newStyle.touchAction() != TouchActionAuto)
+        if (newStyle.getTouchAction() != TouchActionAuto)
             registry.didAddEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking);
         else
             registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking);
     }
 }
 
 static bool areNonIdenticalCursorListsEqual(const ComputedStyle* a, const ComputedStyle* b)
 {
     ASSERT(a->cursors() != b->cursors());
     return a->cursors() && b->cursors() && *a->cursors() == *b->cursors();
@@ skipping 68 matching lines @@
 
         updateAnonymousChildStyle(*child, *newStyle);
 
         child->setStyle(newStyle.release());
     }
 }
 
 void LayoutObject::setStyleWithWritingModeOfParent(PassRefPtr<ComputedStyle> style)
 {
     if (parent())
-        style->setWritingMode(parent()->styleRef().writingMode());
+        style->setWritingMode(parent()->styleRef().getWritingMode());
     setStyle(style);
 }
 
 void LayoutObject::addChildWithWritingModeOfParent(LayoutObject* newChild, LayoutObject* beforeChild)
 {
-    if (newChild->mutableStyleRef().setWritingMode(styleRef().writingMode())
+    if (newChild->mutableStyleRef().setWritingMode(styleRef().getWritingMode())
         && newChild->isBoxModelObject()) {
         newChild->setHorizontalWritingMode(isHorizontalWritingMode());
     }
     addChild(newChild, beforeChild);
 }
 
 void LayoutObject::updateFillImages(const FillLayer* oldLayers, const FillLayer& newLayers)
 {
     // Optimize the common case
     if (FillLayer::imagesIdentical(oldLayers, &newLayers))
@@ skipping 502 matching lines @@
     // reevaluation. This apparently redundant check is here for the case when
     // this layoutObject had no parent at the time remove() was called.
 
     if (hasCounterNodeMap())
         LayoutCounter::destroyCounterNodes(*this);
 
     // Remove the handler if node had touch-action set. Handlers are not added
     // for text nodes so don't try removing for one too. Need to check if
     // m_style is null in cases of partial construction. Any handler we added
     // previously may have already been removed by the Document independently.
-    if (node() && !node()->isTextNode() && m_style && m_style->touchAction() != TouchActionAuto) {
+    if (node() && !node()->isTextNode() && m_style && m_style->getTouchAction() != TouchActionAuto) {
         EventHandlerRegistry& registry = document().frameHost()->eventHandlerRegistry();
         if (registry.eventHandlerTargets(EventHandlerRegistry::TouchEventBlocking)->contains(node()))
             registry.didRemoveEventHandler(*node(), EventHandlerRegistry::TouchEventBlocking);
     }
 
     setAncestorLineBoxDirty(false);
 
     if (selectionPaintInvalidationMap)
         selectionPaintInvalidationMap->remove(this);
 
@@ skipping 428 matching lines @@
 
 void LayoutObject::getTextDecorations(unsigned decorations, AppliedTextDecoration& underline, AppliedTextDecoration& overline, AppliedTextDecoration& linethrough, bool quirksMode, bool firstlineStyle)
 {
     LayoutObject* curr = this;
     const ComputedStyle* styleToUse = nullptr;
     unsigned currDecs = TextDecorationNone;
     Color resultColor;
     TextDecorationStyle resultStyle;
     do {
         styleToUse = curr->style(firstlineStyle);
-        currDecs = styleToUse->textDecoration();
+        currDecs = styleToUse->getTextDecoration();
         currDecs &= decorations;
         resultColor = styleToUse->visitedDependentColor(CSSPropertyTextDecorationColor);
-        resultStyle = styleToUse->textDecorationStyle();
+        resultStyle = styleToUse->getTextDecorationStyle();
         // Parameter 'decorations' is cast as an int to enable the bitwise operations below.
         if (currDecs) {
             if (currDecs & TextDecorationUnderline) {
                 decorations &= ~TextDecorationUnderline;
                 underline.color = resultColor;
                 underline.style = resultStyle;
             }
             if (currDecs & TextDecorationOverline) {
                 decorations &= ~TextDecorationOverline;
                 overline.color = resultColor;
@@ skipping 581 matching lines @@
         const blink::LayoutObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
     } else {
         fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
     }
 }
 
 #endif