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

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

 /*
  * Copyright (C) 2012 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 593 matching lines @@
     // This method needs to behave correctly in the following situations:
     // - When the descendant doesn't have a spanner placeholder but should have one (return true)
     // - When the descendant doesn't have a spanner placeholder and still should not have one (return false)
     // - When the descendant has a spanner placeholder but should no longer have one (return false)
     // - When the descendant has a spanner placeholder and should still have one (return true)
 
     // We assume that we're inside the flow thread. This function is not to be called otherwise.
     ASSERT(descendant->isDescendantOf(this));
 
     // The spec says that column-span only applies to in-flow block-level elements.
-    if (descendant->style()->columnSpan() != ColumnSpanAll || !descendant->isBox() || descendant->isInline() || descendant->isFloatingOrOutOfFlowPositioned())
+    if (descendant->style()->getColumnSpan() != ColumnSpanAll || !descendant->isBox() || descendant->isInline() || descendant->isFloatingOrOutOfFlowPositioned())
         return false;
 
     if (!descendant->containingBlock()->isLayoutBlockFlow()) {
         // Needs to be in a block-flow container, and not e.g. a table.
         return false;
     }
 
     // This looks like a spanner, but if we're inside something unbreakable or something that
     // establishes a new formatting context, it's not to be treated as one.
     for (LayoutBox* ancestor = toLayoutBox(descendant)->parentBox(); ancestor; ancestor = ancestor->containingBlock()) {
@@ skipping 350 matching lines @@
         }
         if (canContainSpannerInParentFragmentationContext(*object))
             next = object->nextInPreOrder(&root);
         else
             next = object->nextInPreOrderAfterChildren(&root);
     }
     return true;
 }
 
 } // namespace blink