Rename LayoutStyle to papayawhip

Source/core/layout/LayoutTextCombine.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 19 matching lines @@
 
 LayoutTextCombine::LayoutTextCombine(Node* node, PassRefPtr<StringImpl> string)
     : LayoutText(node, string)
     , m_combinedTextWidth(0)
     , m_scaleX(1.0f)
     , m_isCombined(false)
     , m_needsFontUpdate(false)
 {
 }
 
-void LayoutTextCombine::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
+void LayoutTextCombine::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
-    setStyleInternal(LayoutStyle::clone(styleRef()));
+    setStyleInternal(ComputedStyle::clone(styleRef()));
     LayoutText::styleDidChange(diff, oldStyle);
 
     updateIsCombined();
 }
 
 void LayoutTextCombine::setTextInternal(PassRefPtr<StringImpl> text)
 {
     LayoutText::setTextInternal(text);
 
     updateIsCombined();
@@ skipping 101 matching lines @@
         } else {
             m_scaleX = 1.0f;
         }
     }
 
     if (shouldUpdateFont)
         style()->font().update(fontSelector);
 }
 
 } // namespace blink