Rename LayoutStyle to papayawhip

Source/core/css/resolver/StyleResourceLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google 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 14 matching lines @@
 
 #include "core/CSSPropertyNames.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/resolver/ElementStyleResources.h"
 #include "core/dom/Document.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/layout/style/ContentData.h"
 #include "core/layout/style/FillLayer.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
 #include "core/layout/style/StyleFetchedImage.h"
 #include "core/layout/style/StyleFetchedImageSet.h"
 #include "core/layout/style/StyleGeneratedImage.h"
 #include "core/layout/style/StylePendingImage.h"
 #include "core/layout/svg/ReferenceFilterBuilder.h"
 
 namespace blink {
 
 StyleResourceLoader::StyleResourceLoader(Document* document)
     : m_document(document)
 {
 }
 
 DEFINE_TRACE(StyleResourceLoader)
 {
     visitor->trace(m_document);
 }
 
-void StyleResourceLoader::loadPendingSVGDocuments(LayoutStyle* layoutStyle, ElementStyleResources& elementStyleResources)
+void StyleResourceLoader::loadPendingSVGDocuments(ComputedStyle* computedStyle, ElementStyleResources& elementStyleResources)
 {
-    if (!layoutStyle->hasFilter() || elementStyleResources.pendingSVGDocuments().isEmpty())
+    if (!computedStyle->hasFilter() || elementStyleResources.pendingSVGDocuments().isEmpty())
         return;
 
-    FilterOperations::FilterOperationVector& filterOperations = layoutStyle->mutableFilter().operations();
+    FilterOperations::FilterOperationVector& filterOperations = computedStyle->mutableFilter().operations();
     for (unsigned i = 0; i < filterOperations.size(); ++i) {
         RefPtrWillBeRawPtr<FilterOperation> filterOperation = filterOperations.at(i);
         if (filterOperation->type() == FilterOperation::REFERENCE) {
             ReferenceFilterOperation* referenceFilter = toReferenceFilterOperation(filterOperation.get());
 
             CSSSVGDocumentValue* value = elementStyleResources.pendingSVGDocuments().get(referenceFilter);
             if (!value)
                 continue;
             DocumentResource* resource = value->load(m_document);
             if (!resource)
@@ skipping 26 matching lines @@
         return imageSetValue->cachedImageSet(document, deviceScaleFactor, options);
 
     return nullptr;
 }
 
 PassRefPtr<StyleImage> StyleResourceLoader::loadPendingImage(StylePendingImage* pendingImage, float deviceScaleFactor)
 {
     return doLoadPendingImage(m_document, pendingImage, deviceScaleFactor, ResourceFetcher::defaultResourceOptions());
 }
 
-void StyleResourceLoader::loadPendingShapeImage(LayoutStyle* layoutStyle, ShapeValue* shapeValue, float deviceScaleFactor)
+void StyleResourceLoader::loadPendingShapeImage(ComputedStyle* computedStyle, ShapeValue* shapeValue, float deviceScaleFactor)
 {
     if (!shapeValue)
         return;
 
     StyleImage* image = shapeValue->image();
     if (!image || !image->isPendingImage())
         return;
 
     ResourceLoaderOptions options = ResourceFetcher::defaultResourceOptions();
     options.allowCredentials = DoNotAllowStoredCredentials;
     options.credentialsRequested  = ClientDidNotRequestCredentials;
     options.corsEnabled = IsCORSEnabled;
 
     shapeValue->setImage(doLoadPendingImage(m_document, toStylePendingImage(image), deviceScaleFactor, options));
 }
 
-void StyleResourceLoader::loadPendingImages(LayoutStyle* style, ElementStyleResources& elementStyleResources)
+void StyleResourceLoader::loadPendingImages(ComputedStyle* style, ElementStyleResources& elementStyleResources)
 {
     if (elementStyleResources.pendingImageProperties().isEmpty())
         return;
 
     PendingImagePropertyMap::const_iterator::Keys end = elementStyleResources.pendingImageProperties().end().keys();
     for (PendingImagePropertyMap::const_iterator::Keys it = elementStyleResources.pendingImageProperties().begin().keys(); it != end; ++it) {
         CSSPropertyID currentProperty = *it;
 
         switch (currentProperty) {
         case CSSPropertyBackgroundImage: {
@@ skipping 64 matching lines @@
             loadPendingShapeImage(style, style->shapeOutside(), elementStyleResources.deviceScaleFactor());
             break;
         default:
             ASSERT_NOT_REACHED();
         }
     }
 
     elementStyleResources.clearPendingImageProperties();
 }
 
-void StyleResourceLoader::loadPendingResources(LayoutStyle* layoutStyle, ElementStyleResources& elementStyleResources)
+void StyleResourceLoader::loadPendingResources(ComputedStyle* computedStyle, ElementStyleResources& elementStyleResources)
 {
     // Start loading images referenced by this style.
-    loadPendingImages(layoutStyle, elementStyleResources);
+    loadPendingImages(computedStyle, elementStyleResources);
 
     // Start loading the SVG Documents referenced by this style.
-    loadPendingSVGDocuments(layoutStyle, elementStyleResources);
+    loadPendingSVGDocuments(computedStyle, elementStyleResources);
 }
 
 }