Rename LayoutStyle to papayawhip

Source/core/layout/svg/SVGResourcesCache.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. 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 18 matching lines @@
 namespace blink {
 
 SVGResourcesCache::SVGResourcesCache()
 {
 }
 
 SVGResourcesCache::~SVGResourcesCache()
 {
 }
 
-void SVGResourcesCache::addResourcesFromLayoutObject(LayoutObject* object, const LayoutStyle& style)
+void SVGResourcesCache::addResourcesFromLayoutObject(LayoutObject* object, const ComputedStyle& style)
 {
     ASSERT(object);
     ASSERT(!m_cache.contains(object));
 
-    const SVGLayoutStyle& svgStyle = style.svgStyle();
+    const SVGComputedStyle& svgStyle = style.svgStyle();
 
     // Build a list of all resources associated with the passed LayoutObject
     OwnPtr<SVGResources> newResources = SVGResources::buildResources(object, svgStyle);
     if (!newResources)
         return;
 
     // Put object in cache.
     SVGResources* resources = m_cache.set(object, newResources.release()).storedValue->value.get();
 
     // Run cycle-detection _afterwards_, so self-references can be caught as well.
@@ skipping 50 matching lines @@
     if (object->selfNeedsLayout() || resources->filter())
         resources->removeClientFromCache(object);
 }
 
 static inline bool layoutObjectCanHaveResources(LayoutObject* layoutObject)
 {
     ASSERT(layoutObject);
     return layoutObject->node() && layoutObject->node()->isSVGElement() && !layoutObject->isSVGInlineText();
 }
 
-void SVGResourcesCache::clientStyleChanged(LayoutObject* layoutObject, StyleDifference diff, const LayoutStyle& newStyle)
+void SVGResourcesCache::clientStyleChanged(LayoutObject* layoutObject, StyleDifference diff, const ComputedStyle& newStyle)
 {
     ASSERT(layoutObject);
     ASSERT(layoutObject->node());
     ASSERT(layoutObject->node()->isSVGElement());
 
     if (!diff.hasDifference() || !layoutObject->parent())
         return;
 
     // In this case the proper SVGFE*Element will decide whether the modified CSS properties require a relayout or paintInvalidation.
     if (layoutObject->isSVGResourceFilterPrimitive() && !diff.needsLayout())
         return;
 
     // Dynamic changes of CSS properties like 'clip-path' may require us to recompute the associated resources for a layoutObject.
     // FIXME: Avoid passing in a useless StyleDifference, but instead compare oldStyle/newStyle to see which resources changed
     // to be able to selectively rebuild individual resources, instead of all of them.
     if (layoutObjectCanHaveResources(layoutObject)) {
         SVGResourcesCache* cache = resourcesCacheFromLayoutObject(layoutObject);
         cache->removeResourcesFromLayoutObject(layoutObject);
         cache->addResourcesFromLayoutObject(layoutObject, newStyle);
     }
 
     LayoutSVGResourceContainer::markForLayoutAndParentResourceInvalidation(layoutObject, false);
 }
 
-void SVGResourcesCache::clientWasAddedToTree(LayoutObject* layoutObject, const LayoutStyle& newStyle)
+void SVGResourcesCache::clientWasAddedToTree(LayoutObject* layoutObject, const ComputedStyle& newStyle)
 {
     if (!layoutObject->node())
         return;
     LayoutSVGResourceContainer::markForLayoutAndParentResourceInvalidation(layoutObject, false);
 
     if (!layoutObjectCanHaveResources(layoutObject))
         return;
     SVGResourcesCache* cache = resourcesCacheFromLayoutObject(layoutObject);
     cache->addResourcesFromLayoutObject(layoutObject, newStyle);
 }
@@ skipping 36 matching lines @@
         // Mark users of destroyed resources as pending resolution based on the id of the old resource.
         Element* resourceElement = resource->element();
         Element* clientElement = toElement(objectResources.key->node());
         SVGDocumentExtensions& extensions = clientElement->document().accessSVGExtensions();
 
         extensions.addPendingResource(resourceElement->fastGetAttribute(HTMLNames::idAttr), clientElement);
     }
 }
 
 }