Changeset 134466 in webkit for trunk/Source/WebCore/css/CSSImageSetValue.cpp

Timestamp:

Nov 13, 2012, 12:36:47 PM (13 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r134442.
​http://trac.webkit.org/changeset/134442
​https://bugs.webkit.org/show_bug.cgi?id=102111

Does not compile on apple-mac (Requested by abarth on
#webkit).

Patch by Sheriff Bot <​[email protected]> on 2012-11-13

• CMakeLists.txt:
• GNUmakefile.list.am:
• Target.pri:
• WebCore.gypi:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::cachedImage):

• css/CSSFontFaceSrcValue.cpp:

(WebCore::CSSFontFaceSrcValue::cachedFont):

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::cachedImageSet):

• css/CSSImageValue.cpp:

(WebCore::CSSImageValue::cachedImage):

• css/CSSImageValue.h:

(WebCore):
(CSSImageValue):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::loadPendingImage):

• css/StyleRuleImport.cpp:

(WebCore::StyleRuleImport::requestStyleSheet):

• css/WebKitCSSSVGDocumentValue.cpp:

(WebCore::WebKitCSSSVGDocumentValue::load):

• css/WebKitCSSShaderValue.cpp:

(WebCore::WebKitCSSShaderValue::cachedShader):

• dom/ScriptElement.cpp:

(WebCore::ScriptElement::requestScript):

• html/HTMLLinkElement.cpp:

(WebCore::HTMLLinkElement::process):

• html/parser/CSSPreloadScanner.cpp:

(WebCore::CSSPreloadScanner::emitRule):

• html/parser/CSSPreloadScanner.h:

(CSSPreloadScanner):

• html/parser/HTMLPreloadScanner.cpp:

(WebCore::PreloadTask::preload):

• loader/ImageLoader.cpp:

(WebCore::ImageLoader::updateFromElement):

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestImage):
(WebCore::CachedResourceLoader::requestResource):
(WebCore::CachedResourceLoader::determineRevalidationPolicy):
(WebCore):
(WebCore::CachedResourceLoader::preload):

• loader/cache/CachedResourceLoader.h:

(WebCore):
(CachedResourceLoader):

• loader/cache/CachedResourceRequest.cpp:

(WebCore::CachedResourceRequest::CachedResourceRequest):

• loader/cache/CachedResourceRequest.h:

(CachedResourceRequest):
(WebCore::CachedResourceRequest::defer):
(WebCore::CachedResourceRequest::setDefer):

• loader/cache/CachedResourceRequestInitiators.cpp: Removed.
• loader/cache/CachedResourceRequestInitiators.h: Removed.
• loader/icon/IconLoader.cpp:

(WebCore::IconLoader::startLoading):

• platform/ThreadGlobalData.cpp:

(WebCore::ThreadGlobalData::ThreadGlobalData):

• platform/ThreadGlobalData.h:

(ThreadGlobalData):

• svg/SVGFEImageElement.cpp:

(WebCore::SVGFEImageElement::requestImageResource):

• svg/SVGFontFaceUriElement.cpp:

(WebCore::SVGFontFaceUriElement::loadFont):

• svg/SVGUseElement.cpp:

(WebCore::SVGUseElement::svgAttributeChanged):

File:

• trunk/Source/WebCore/css/CSSImageSetValue.cpp (modified) (2 diffs)

trunk/Source/WebCore/css/CSSImageSetValue.cpp

@@ -34 +34 @@
 #include "CachedResourceLoader.h"
 #include "CachedResourceRequest.h"
-#include "CachedResourceRequestInitiators.h"
 #include "Document.h"
 #include "Page.h"
@@ -112 +111 @@
         ImageWithScale image = bestImageForScaleFactor();
         CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(image.imageURL)));
-        request.setInitiator(cachedResourceRequestInitiators().css, document);
         if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request)) {
             m_imageSet = StyleCachedImageSet::create(cachedImage.get(), image.scaleFactor, this);