Break StyleImage dependency on LayoutObject

third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 89 matching lines @@
 }
 
 bool StyleFetchedImageSet::ImageHasRelativeSize() const {
   return best_fit_image_->ImageHasRelativeSize();
 }
 
 bool StyleFetchedImageSet::UsesImageContainerSize() const {
   return best_fit_image_->UsesImageContainerSize();
 }
 
-void StyleFetchedImageSet::AddClient(LayoutObject* layout_object) {
-  best_fit_image_->AddObserver(layout_object);
+void StyleFetchedImageSet::AddClient(ImageResourceObserver* observer) {
+  best_fit_image_->AddObserver(observer);
 }
 
-void StyleFetchedImageSet::RemoveClient(LayoutObject* layout_object) {
-  best_fit_image_->RemoveObserver(layout_object);
+void StyleFetchedImageSet::RemoveClient(ImageResourceObserver* observer) {
+  best_fit_image_->RemoveObserver(observer);
 }
 
 PassRefPtr<Image> StyleFetchedImageSet::GetImage(
-    const LayoutObject& obj,
+    const ImageResourceObserver&,
+    const Document&,
+    const ComputedStyle& style,
     const IntSize& container_size) const {
   if (!best_fit_image_->GetImage()->IsSVGImage())
     return best_fit_image_->GetImage();
 
   return SVGImageForContainer::Create(ToSVGImage(best_fit_image_->GetImage()),
-                                      container_size,
-                                      obj.StyleRef().EffectiveZoom(), url_);
+                                      container_size, style.EffectiveZoom(),
+                                      url_);
 }
 
 bool StyleFetchedImageSet::KnownToBeOpaque(const Document&,
                                            const ComputedStyle&) const {
   return best_fit_image_->GetImage()->CurrentFrameKnownToBeOpaque(
       Image::kPreCacheMetadata);
 }
 
 DEFINE_TRACE(StyleFetchedImageSet) {
   visitor->Trace(best_fit_image_);
   visitor->Trace(image_set_value_);
   StyleImage::Trace(visitor);
 }
 
 }  // namespace blink