Rename LayoutStyle to papayawhip

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 29 matching lines @@
     , m_progressionIsInline(true)
     , m_isBeingEvacuated(false)
 {
     setFlowThreadState(InsideInFlowThread);
 }
 
 LayoutMultiColumnFlowThread::~LayoutMultiColumnFlowThread()
 {
 }
 
-LayoutMultiColumnFlowThread* LayoutMultiColumnFlowThread::createAnonymous(Document& document, const LayoutStyle& parentStyle)
+LayoutMultiColumnFlowThread* LayoutMultiColumnFlowThread::createAnonymous(Document& document, const ComputedStyle& parentStyle)
 {
     LayoutMultiColumnFlowThread* renderer = new LayoutMultiColumnFlowThread();
     renderer->setDocumentForAnonymous(&document);
-    renderer->setStyle(LayoutStyle::createAnonymousStyleWithDisplay(parentStyle, BLOCK));
+    renderer->setStyle(ComputedStyle::createAnonymousStyleWithDisplay(parentStyle, BLOCK));
     return renderer;
 }
 
 LayoutMultiColumnSet* LayoutMultiColumnFlowThread::firstMultiColumnSet() const
 {
     for (LayoutObject* sibling = nextSibling(); sibling; sibling = sibling->nextSibling()) {
         if (sibling->isLayoutMultiColumnSet())
             return toLayoutMultiColumnSet(sibling);
     }
     return 0;
@@ skipping 242 matching lines @@
 
 void LayoutMultiColumnFlowThread::columnRuleStyleDidChange()
 {
     for (LayoutMultiColumnSet* columnSet = firstMultiColumnSet(); columnSet; columnSet = columnSet->nextSiblingMultiColumnSet())
         columnSet->setShouldDoFullPaintInvalidation(PaintInvalidationStyleChange);
 }
 
 void LayoutMultiColumnFlowThread::calculateColumnCountAndWidth(LayoutUnit& width, unsigned& count) const
 {
     LayoutBlock* columnBlock = multiColumnBlockFlow();
-    const LayoutStyle* columnStyle = columnBlock->style();
+    const ComputedStyle* columnStyle = columnBlock->style();
     LayoutUnit availableWidth = columnBlock->contentLogicalWidth();
     LayoutUnit columnGap = columnBlock->columnGap();
     LayoutUnit computedColumnWidth = max<LayoutUnit>(1, LayoutUnit(columnStyle->columnWidth()));
     unsigned computedColumnCount = max<int>(1, columnStyle->columnCount());
 
     ASSERT(!columnStyle->hasAutoColumnCount() || !columnStyle->hasAutoColumnWidth());
     if (columnStyle->hasAutoColumnWidth() && !columnStyle->hasAutoColumnCount()) {
         count = computedColumnCount;
         width = std::max<LayoutUnit>(0, (availableWidth - ((count - 1) * columnGap)) / count);
     } else if (!columnStyle->hasAutoColumnWidth() && columnStyle->hasAutoColumnCount()) {
@@ skipping 260 matching lines @@
 }
 
 void LayoutMultiColumnFlowThread::computePreferredLogicalWidths()
 {
     LayoutFlowThread::computePreferredLogicalWidths();
 
     // The min/max intrinsic widths calculated really tell how much space elements need when
     // laid out inside the columns. In order to eventually end up with the desired column width,
     // we need to convert them to values pertaining to the multicol container.
     const LayoutBlockFlow* multicolContainer = multiColumnBlockFlow();
-    const LayoutStyle* multicolStyle = multicolContainer->style();
+    const ComputedStyle* multicolStyle = multicolContainer->style();
     int columnCount = multicolStyle->hasAutoColumnCount() ? 1 : multicolStyle->columnCount();
     LayoutUnit columnWidth;
     LayoutUnit gapExtra = (columnCount - 1) * multicolContainer->columnGap();
     if (multicolStyle->hasAutoColumnWidth()) {
         m_minPreferredLogicalWidth = m_minPreferredLogicalWidth * columnCount + gapExtra;
     } else {
         columnWidth = multicolStyle->columnWidth();
         m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, columnWidth);
     }
     // Note that if column-count is auto here, we should resolve it to calculate the maximum
@@ skipping 66 matching lines @@
 }
 
 bool LayoutMultiColumnFlowThread::isPageLogicalHeightKnown() const
 {
     if (LayoutMultiColumnSet* columnSet = lastMultiColumnSet())
         return columnSet->pageLogicalHeight();
     return false;
 }
 
 }