Rename LayoutStyle to papayawhip

Source/core/layout/LayoutCounter.cpp

 /**
  * Copyright (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 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,
@@ skipping 12 matching lines @@
 #include "core/layout/LayoutCounter.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/Element.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/html/HTMLOListElement.h"
 #include "core/layout/CounterNode.h"
 #include "core/layout/LayoutListItem.h"
 #include "core/layout/LayoutListMarker.h"
 #include "core/layout/LayoutView.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
 #include "wtf/StdLibExtras.h"
 
 #ifndef NDEBUG
 #include <stdio.h>
 #endif
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 60 matching lines @@
 static bool planCounter(LayoutObject& object, const AtomicString& identifier, bool& isReset, int& value)
 {
     // Real text nodes don't have their own style so they can't have counters.
     // We can't even look at their styles or we'll see extra resets and increments!
     if (object.isText() && !object.isBR())
         return false;
     Node* generatingNode = object.generatingNode();
     // We must have a generating node or else we cannot have a counter.
     if (!generatingNode)
         return false;
-    const LayoutStyle& style = object.styleRef();
+    const ComputedStyle& style = object.styleRef();
 
     switch (style.styleType()) {
     case NOPSEUDO:
         // Sometimes nodes have more then one renderer. Only the first one gets the counter
         // LayoutTests/http/tests/css/counter-crash.html
         if (generatingNode->layoutObject() != &object)
             return false;
         break;
     case BEFORE:
     case AFTER:
@@ skipping 409 matching lines @@
     if (node)
         node = node->parentNode();
     else
         node = renderer->generatingNode();
     if (node && node->needsAttach())
         return; // No need to update if the parent is not attached yet
     for (LayoutObject* descendant = renderer; descendant; descendant = descendant->nextInPreOrder(renderer))
         updateCounters(*descendant);
 }
 
-void LayoutCounter::rendererStyleChanged(LayoutObject& renderer, const LayoutStyle* oldStyle, const LayoutStyle& newStyle)
+void LayoutCounter::rendererStyleChanged(LayoutObject& renderer, const ComputedStyle* oldStyle, const ComputedStyle& newStyle)
 {
     Node* node = renderer.generatingNode();
     if (!node || node->needsAttach())
         return; // cannot have generated content or if it can have, it will be handled during attaching
     const CounterDirectiveMap* oldCounterDirectives = oldStyle ? oldStyle->counterDirectives() : 0;
     const CounterDirectiveMap* newCounterDirectives = newStyle.counterDirectives();
     if (oldCounterDirectives) {
         if (newCounterDirectives) {
             CounterDirectiveMap::const_iterator newMapEnd = newCounterDirectives->end();
             CounterDirectiveMap::const_iterator oldMapEnd = oldCounterDirectives->end();
@@ skipping 48 matching lines @@
             fprintf(stderr, "    ");
         fprintf(stderr, "%p N:%p P:%p PS:%p NS:%p C:%p\n",
             current, current->node(), current->parent(), current->previousSibling(),
             current->nextSibling(), current->hasCounterNodeMap() ?
             counterName ? blink::counterMaps().get(current)->get(identifier) : (blink::CounterNode*)1 : (blink::CounterNode*)0);
     }
     fflush(stderr);
 }
 
 #endif // NDEBUG