Rename LayoutStyle to papayawhip

Source/core/dom/Text.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
  *
@@ skipping 10 matching lines @@
 
 #include "config.h"
 #include "core/dom/Text.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/SVGNames.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/LayoutTreeBuilder.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
 #include "core/dom/NodeRenderingTraversal.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/events/ScopedEventQueue.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/LayoutTextCombine.h"
 #include "core/layout/svg/LayoutSVGInlineText.h"
 #include "core/svg/SVGForeignObjectElement.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringBuilder.h"
@@ skipping 240 matching lines @@
         || parent.isLayoutTableCol() || parent.isFrameSet()
         || parent.isFlexibleBox() || parent.isLayoutGrid()
         || parent.isSVGRoot()
         || parent.isSVGContainer()
         || parent.isSVGImage()
         || parent.isSVGShape())
         return false;
     return true;
 }
 
-bool Text::textRendererIsNeeded(const LayoutStyle& style, const LayoutObject& parent)
+bool Text::textRendererIsNeeded(const ComputedStyle& style, const LayoutObject& parent)
 {
     if (!parent.canHaveChildren())
         return false;
 
     if (isEditingText())
         return true;
 
     if (!length())
         return false;
 
@@ skipping 40 matching lines @@
     return true;
 }
 
 static bool isSVGText(Text* text)
 {
     Node* parentOrShadowHostNode = text->parentOrShadowHostNode();
     ASSERT(parentOrShadowHostNode);
     return parentOrShadowHostNode->isSVGElement() && !isSVGForeignObjectElement(*parentOrShadowHostNode);
 }
 
-LayoutText* Text::createTextRenderer(const LayoutStyle& style)
+LayoutText* Text::createTextRenderer(const ComputedStyle& style)
 {
     if (isSVGText(this))
         return new LayoutSVGInlineText(this, dataImpl());
 
     if (style.hasTextCombine())
         return new LayoutTextCombine(this, dataImpl());
 
     return new LayoutText(this, dataImpl());
 }
 
@@ skipping 47 matching lines @@
         if (this->layoutObject())
             reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
     }
 }
 
 // If a whitespace node had no renderer and goes through a recalcStyle it may
 // need to create one if the parent style now has white-space: pre.
 bool Text::needsWhitespaceRenderer()
 {
     ASSERT(!layoutObject());
-    if (const LayoutStyle* style = parentLayoutStyle())
+    if (const ComputedStyle* style = parentComputedStyle())
         return style->preserveNewline();
     return false;
 }
 
 void Text::updateTextRenderer(unsigned offsetOfReplacedData, unsigned lengthOfReplacedData, RecalcStyleBehavior recalcStyleBehavior)
 {
     if (!inActiveDocument())
         return;
     LayoutText* textRenderer = layoutObject();
     if (!textRenderer || !textRendererIsNeeded(*textRenderer->style(), *textRenderer->parent())) {
@@ skipping 33 matching lines @@
             result.appendLiteral("; ");
         result.appendLiteral("value=");
         result.append(s);
     }
 
     strncpy(buffer, result.toString().utf8().data(), length - 1);
 }
 #endif
 
 } // namespace blink