diff --git a/engine/core/css/CSSCrossfadeValue.cpp b/engine/core/css/CSSCrossfadeValue.cpp index 61a4bf94753..b7ee4834291 100644 --- a/engine/core/css/CSSCrossfadeValue.cpp +++ b/engine/core/css/CSSCrossfadeValue.cpp @@ -202,15 +202,6 @@ void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(ImageResour m_ownerValue->crossfadeChanged(*rect); } -bool CSSCrossfadeValue::hasFailedOrCanceledSubresources() const -{ - if (m_cachedFromImage && m_cachedFromImage->loadFailedOrCanceled()) - return true; - if (m_cachedToImage && m_cachedToImage->loadFailedOrCanceled()) - return true; - return false; -} - bool CSSCrossfadeValue::equals(const CSSCrossfadeValue& other) const { return compareCSSValuePtr(m_fromValue, other.m_fromValue) diff --git a/engine/core/css/CSSCrossfadeValue.h b/engine/core/css/CSSCrossfadeValue.h index 6a1ea58164c..18b9c53f803 100644 --- a/engine/core/css/CSSCrossfadeValue.h +++ b/engine/core/css/CSSCrossfadeValue.h @@ -63,8 +63,6 @@ public: void setPercentage(PassRefPtr percentageValue) { m_percentageValue = percentageValue; } - bool hasFailedOrCanceledSubresources() const; - bool equals(const CSSCrossfadeValue&) const; private: diff --git a/engine/core/css/CSSFontFaceSrcValue.cpp b/engine/core/css/CSSFontFaceSrcValue.cpp index 407c12d4a1b..adc66005881 100644 --- a/engine/core/css/CSSFontFaceSrcValue.cpp +++ b/engine/core/css/CSSFontFaceSrcValue.cpp @@ -75,13 +75,6 @@ String CSSFontFaceSrcValue::customCSSText() const return result.toString(); } -bool CSSFontFaceSrcValue::hasFailedOrCanceledSubresources() const -{ - if (!m_fetched) - return false; - return m_fetched->loadFailedOrCanceled(); -} - FontResource* CSSFontFaceSrcValue::fetch(Document* document) { if (!m_fetched) { diff --git a/engine/core/css/CSSFontFaceSrcValue.h b/engine/core/css/CSSFontFaceSrcValue.h index ab842029a62..a45cc19a9af 100644 --- a/engine/core/css/CSSFontFaceSrcValue.h +++ b/engine/core/css/CSSFontFaceSrcValue.h @@ -60,8 +60,6 @@ public: String customCSSText() const; - bool hasFailedOrCanceledSubresources() const; - FontResource* fetch(Document*); bool equals(const CSSFontFaceSrcValue&) const; diff --git a/engine/core/css/CSSImageSetValue.cpp b/engine/core/css/CSSImageSetValue.cpp index a578279bce7..27e9c491179 100644 --- a/engine/core/css/CSSImageSetValue.cpp +++ b/engine/core/css/CSSImageSetValue.cpp @@ -164,15 +164,6 @@ String CSSImageSetValue::customCSSText() const return result.toString(); } -bool CSSImageSetValue::hasFailedOrCanceledSubresources() const -{ - if (!m_imageSet || !m_imageSet->isImageResourceSet()) - return false; - if (Resource* cachedResource = toStyleFetchedImageSet(m_imageSet)->cachedImage()) - return cachedResource->loadFailedOrCanceled(); - return true; -} - CSSImageSetValue::CSSImageSetValue(const CSSImageSetValue& cloneFrom) : CSSValueList(cloneFrom) , m_accessedBestFitImage(false) diff --git a/engine/core/css/CSSImageSetValue.h b/engine/core/css/CSSImageSetValue.h index 7351562adc4..452ffe5b713 100644 --- a/engine/core/css/CSSImageSetValue.h +++ b/engine/core/css/CSSImageSetValue.h @@ -61,8 +61,6 @@ public: float scaleFactor; }; - bool hasFailedOrCanceledSubresources() const; - PassRefPtr cloneForCSSOM() const; protected: diff --git a/engine/core/css/CSSImageValue.cpp b/engine/core/css/CSSImageValue.cpp index bc87bd028c4..94d94010b28 100644 --- a/engine/core/css/CSSImageValue.cpp +++ b/engine/core/css/CSSImageValue.cpp @@ -85,15 +85,6 @@ void CSSImageValue::restoreCachedResourceIfNeeded(Document& document) document.fetcher()->requestLoadStarted(resource, request, ResourceFetcher::ResourceLoadingFromCache); } -bool CSSImageValue::hasFailedOrCanceledSubresources() const -{ - if (!m_image || !m_image->isImageResource()) - return false; - if (Resource* cachedResource = toStyleFetchedImage(m_image)->cachedImage()) - return cachedResource->loadFailedOrCanceled(); - return true; -} - bool CSSImageValue::equals(const CSSImageValue& other) const { return m_absoluteURL == other.m_absoluteURL; diff --git a/engine/core/css/CSSImageValue.h b/engine/core/css/CSSImageValue.h index 60038e50290..d33943951a6 100644 --- a/engine/core/css/CSSImageValue.h +++ b/engine/core/css/CSSImageValue.h @@ -63,8 +63,6 @@ public: PassRefPtr cloneForCSSOM() const; - bool hasFailedOrCanceledSubresources() const; - bool equals(const CSSImageValue&) const; bool knownToBeOpaque(const RenderObject*) const; diff --git a/engine/core/css/CSSValue.cpp b/engine/core/css/CSSValue.cpp index 3a9f9fe8fe4..73919ee1208 100644 --- a/engine/core/css/CSSValue.cpp +++ b/engine/core/css/CSSValue.cpp @@ -100,25 +100,6 @@ CSSValue::Type CSSValue::cssValueType() const return CSS_CUSTOM; } -bool CSSValue::hasFailedOrCanceledSubresources() const -{ - // This should get called for internal instances only. - ASSERT(!isCSSOMSafe()); - - if (isValueList()) - return toCSSValueList(this)->hasFailedOrCanceledSubresources(); - if (classType() == FontFaceSrcClass) - return toCSSFontFaceSrcValue(this)->hasFailedOrCanceledSubresources(); - if (classType() == ImageClass) - return toCSSImageValue(this)->hasFailedOrCanceledSubresources(); - if (classType() == CrossfadeClass) - return toCSSCrossfadeValue(this)->hasFailedOrCanceledSubresources(); - if (classType() == ImageSetClass) - return toCSSImageSetValue(this)->hasFailedOrCanceledSubresources(); - - return false; -} - template inline static bool compareCSSValues(const CSSValue& first, const CSSValue& second) { diff --git a/engine/core/css/CSSValue.h b/engine/core/css/CSSValue.h index aa0003ee2dd..2bb8c593393 100644 --- a/engine/core/css/CSSValue.h +++ b/engine/core/css/CSSValue.h @@ -111,8 +111,6 @@ public: PassRefPtr cloneForCSSOM() const; - bool hasFailedOrCanceledSubresources() const; - bool equals(const CSSValue&) const; protected: diff --git a/engine/core/css/CSSValueList.cpp b/engine/core/css/CSSValueList.cpp index 1e05bdc13df..5612605e3aa 100644 --- a/engine/core/css/CSSValueList.cpp +++ b/engine/core/css/CSSValueList.cpp @@ -128,15 +128,6 @@ bool CSSValueList::equals(const CSSValue& other) const return value && value->equals(other); } -bool CSSValueList::hasFailedOrCanceledSubresources() const -{ - for (unsigned i = 0; i < m_values.size(); ++i) { - if (m_values[i]->hasFailedOrCanceledSubresources()) - return true; - } - return false; -} - CSSValueList::CSSValueList(const CSSValueList& cloneFrom) : CSSValue(cloneFrom.classType(), /* isCSSOMSafe */ true) { diff --git a/engine/core/css/CSSValueList.h b/engine/core/css/CSSValueList.h index 9ed6e315c94..5d88debc5b5 100644 --- a/engine/core/css/CSSValueList.h +++ b/engine/core/css/CSSValueList.h @@ -57,8 +57,6 @@ public: bool equals(const CSSValueList&) const; bool equals(const CSSValue&) const; - bool hasFailedOrCanceledSubresources() const; - PassRefPtr cloneForCSSOM() const; protected: diff --git a/engine/core/css/StylePropertySet.cpp b/engine/core/css/StylePropertySet.cpp index d08ea5738fc..dc3adfd980d 100644 --- a/engine/core/css/StylePropertySet.cpp +++ b/engine/core/css/StylePropertySet.cpp @@ -297,16 +297,6 @@ String StylePropertySet::asText() const return StylePropertySerializer(*this).asText(); } -bool StylePropertySet::hasFailedOrCanceledSubresources() const -{ - unsigned size = propertyCount(); - for (unsigned i = 0; i < size; ++i) { - if (propertyAt(i).value()->hasFailedOrCanceledSubresources()) - return true; - } - return false; -} - // This is the list of properties we want to copy in the copyBlockProperties() function. // It is the list of CSS properties that apply specially to block-level elements. static const CSSPropertyID staticBlockProperties[] = { diff --git a/engine/core/css/StylePropertySet.h b/engine/core/css/StylePropertySet.h index afbbfbd04fd..6ad87585fc7 100644 --- a/engine/core/css/StylePropertySet.h +++ b/engine/core/css/StylePropertySet.h @@ -108,8 +108,6 @@ public: bool isMutable() const { return m_isMutable; } - bool hasFailedOrCanceledSubresources() const; - static unsigned averageSizeInBytes(); #ifndef NDEBUG diff --git a/engine/core/css/StyleSheetContents.cpp b/engine/core/css/StyleSheetContents.cpp index ef8923fbc8b..f4d0d1df107 100644 --- a/engine/core/css/StyleSheetContents.cpp +++ b/engine/core/css/StyleSheetContents.cpp @@ -142,40 +142,6 @@ KURL StyleSheetContents::completeURL(const String& url) const return m_parserContext.completeURL(url); } -static bool childRulesHaveFailedOrCanceledSubresources(const Vector >& rules) -{ - for (unsigned i = 0; i < rules.size(); ++i) { - const StyleRuleBase* rule = rules[i].get(); - switch (rule->type()) { - case StyleRuleBase::Style: - if (toStyleRule(rule)->properties().hasFailedOrCanceledSubresources()) - return true; - break; - case StyleRuleBase::FontFace: - if (toStyleRuleFontFace(rule)->properties().hasFailedOrCanceledSubresources()) - return true; - break; - case StyleRuleBase::Media: - if (childRulesHaveFailedOrCanceledSubresources(toStyleRuleMedia(rule)->childRules())) - return true; - break; - case StyleRuleBase::Keyframes: - case StyleRuleBase::Unknown: - case StyleRuleBase::Keyframe: - case StyleRuleBase::Supports: - case StyleRuleBase::Filter: - break; - } - } - return false; -} - -bool StyleSheetContents::hasFailedOrCanceledSubresources() const -{ - ASSERT(isCacheable()); - return childRulesHaveFailedOrCanceledSubresources(m_childRules); -} - Document* StyleSheetContents::clientSingleOwnerDocument() const { if (!m_hasSingleOwnerDocument || clientSize() <= 0) diff --git a/engine/core/css/StyleSheetContents.h b/engine/core/css/StyleSheetContents.h index 375fd73105f..b41e3ea922c 100644 --- a/engine/core/css/StyleSheetContents.h +++ b/engine/core/css/StyleSheetContents.h @@ -65,8 +65,6 @@ public: Node* singleOwnerNode() const; Document* singleOwnerDocument() const; - bool hasFailedOrCanceledSubresources() const; - KURL completeURL(const String& url) const; void setHasSyntacticallyValidCSSHeader(bool isValidCss);