Remove CSS clients of ImageResource

sky/engine/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 14 matching lines @@
 
 #include "sky/engine/core/dom/Element.h"
 
 #include "gen/sky/core/CSSValueKeywords.h"
 #include "gen/sky/core/HTMLNames.h"
 #include "gen/sky/platform/RuntimeEnabledFeatures.h"
 #include "sky/engine/bindings/exception_messages.h"
 #include "sky/engine/bindings/exception_state.h"
 #include "sky/engine/core/animation/AnimationTimeline.h"
 #include "sky/engine/core/animation/css/CSSAnimations.h"
-#include "sky/engine/core/css/CSSImageValue.h"
 #include "sky/engine/core/css/CSSStyleSheet.h"
 #include "sky/engine/core/css/CSSValuePool.h"
 #include "sky/engine/core/css/PropertySetCSSStyleDeclaration.h"
 #include "sky/engine/core/css/StylePropertySet.h"
 #include "sky/engine/core/css/parser/BisonCSSParser.h"
 #include "sky/engine/core/css/resolver/StyleResolver.h"
 #include "sky/engine/core/dom/Attr.h"
 #include "sky/engine/core/dom/ClientRect.h"
 #include "sky/engine/core/dom/ClientRectList.h"
 #include "sky/engine/core/dom/DOMTokenList.h"
@@ skipping 1377 matching lines @@
     if (inActiveDocument() && styleChangeType() < SubtreeStyleChange && affectedByAttributeSelector(name.localName()))
         setNeedsStyleRecalc(LocalStyleChange);
 
     if (isUpgradedCustomElement())
         CustomElement::AttributeDidChange(this, name.localName(), oldValue, newValue);
 
     if (OwnPtr<MutationObserverInterestGroup> recipients = MutationObserverInterestGroup::createForAttributesMutation(*this, name))
         recipients->enqueueMutationRecord(MutationRecord::createAttributes(this, name, oldValue));
 }
 
-static bool needsURLResolutionForInlineStyle(const Element& element, const Document& oldDocument, const Document& newDocument)
-{
-    if (oldDocument == newDocument)
-        return false;
-    if (oldDocument.baseURL() == newDocument.baseURL())
-        return false;
-    const StylePropertySet* style = element.inlineStyle();
-    if (!style)
-        return false;
-    for (unsigned i = 0; i < style->propertyCount(); ++i) {
-        // FIXME: Should handle all URL-based properties: CSSImageSetValue, CSSCursorImageValue, etc.
-        if (style->propertyAt(i).value()->isImageValue())
-            return true;
-    }
-    return false;
-}
-
-static void reResolveURLsInInlineStyle(const Document& document, MutableStylePropertySet& style)
-{
-    for (unsigned i = 0; i < style.propertyCount(); ++i) {
-        StylePropertySet::PropertyReference property = style.propertyAt(i);
-        // FIXME: Should handle all URL-based properties: CSSImageSetValue, CSSCursorImageValue, etc.
-        if (property.value()->isImageValue())
-            toCSSImageValue(property.value())->reResolveURL(document);
-    }
-}
-
 void Element::didMoveToNewDocument(Document& oldDocument)
 {
     Node::didMoveToNewDocument(oldDocument);
-
-    if (needsURLResolutionForInlineStyle(*this, oldDocument, document()))
-        reResolveURLsInInlineStyle(document(), ensureMutableInlineStyle());
 }
 
 void Element::cloneAttributesFromElement(const Element& other)
 {
     other.synchronizeAllAttributes();
     if (!other.m_elementData) {
         m_elementData.clear();
         return;
     }
 
     const AtomicString& oldID = getIdAttribute();
     const AtomicString& newID = other.getIdAttribute();
 
     if (!oldID.isNull() || !newID.isNull())
         updateId(oldID, newID);
 
     // If 'other' has a mutable ElementData, convert it to an immutable one so we can share it between both elements.
     // We can only do this if there are no presentation attributes and sharing the data won't result in different case sensitivity of class or id.
     if (other.m_elementData->isUnique())
         const_cast<Element&>(other).m_elementData = toUniqueElementData(other.m_elementData)->makeShareableCopy();
 
-    if (!other.m_elementData->isUnique() && !needsURLResolutionForInlineStyle(other, other.document(), document()))
+    if (!other.m_elementData->isUnique())
         m_elementData = other.m_elementData;
     else
         m_elementData = other.m_elementData->makeUniqueCopy();
 
     AttributeCollection attributes = m_elementData->attributes();
     AttributeCollection::iterator end = attributes.end();
     for (AttributeCollection::iterator it = attributes.begin(); it != end; ++it)
         attributeChangedFromParserOrByCloning(it->name(), it->value(), ModifiedByCloning);
 }
 
@@ skipping 204 matching lines @@
     GraphicsContext context(canvas->skCanvas());
 
     // Very simplified painting to allow painting an arbitrary (layer-less) subtree.
     Vector<RenderBox*> layers;
     PaintInfo paintInfo(&context, box->absoluteBoundingBoxRect(), box);
     box->paint(paintInfo, LayoutPoint(), layers);
     // Note we're ignoring any layers encountered.
 }
 
 } // namespace blink