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

third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.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 253 matching lines @@
 {
     LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread();
     if (!flowThread->isLayoutPagedFlowThread()) {
         // If support for the column-fill property isn't enabled, we want to behave as if
         // column-fill were auto, so that multicol containers with specified height don't get their
         // columns balanced (auto-height multicol containers will still get their columns balanced,
         // even if column-fill isn't 'balance' - in accordance with the spec). Pretending that
         // column-fill is auto also matches the old multicol implementation, which has no support
         // for this property.
         if (RuntimeEnabledFeatures::columnFillEnabled()) {
-            if (multiColumnBlockFlow()->style()->columnFill() == ColumnFillBalance)
+            if (multiColumnBlockFlow()->style()->getColumnFill() == ColumnFillBalance)
                 return true;
         }
         if (LayoutBox* next = nextSiblingBox()) {
             if (next->isLayoutMultiColumnSpannerPlaceholder()) {
                 // If we're followed by a spanner, we need to balance.
                 return true;
             }
         }
     }
     return !flowThread->columnHeightAvailable();
@@ skipping 167 matching lines @@
 
 LayoutRect LayoutMultiColumnSet::flowThreadPortionRect() const
 {
     LayoutRect portionRect(LayoutUnit(), logicalTopInFlowThread(), pageLogicalWidth(), logicalHeightInFlowThread());
     if (!isHorizontalWritingMode())
         return portionRect.transposedRect();
     return portionRect;
 }
 
 } // namespace blink