diff options
Diffstat (limited to 'Source/WebCore/css')
| -rw-r--r-- | Source/WebCore/css/CSSFontSelector.cpp | 3 | ||||
| -rw-r--r-- | Source/WebCore/css/CSSImageValue.cpp | 4 | ||||
| -rw-r--r-- | Source/WebCore/css/CSSImportRule.cpp | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebCore/css/CSSFontSelector.cpp b/Source/WebCore/css/CSSFontSelector.cpp index 0f70664..c460857 100644 --- a/Source/WebCore/css/CSSFontSelector.cpp +++ b/Source/WebCore/css/CSSFontSelector.cpp @@ -245,7 +245,8 @@ void CSSFontSelector::addFontFaceRule(const CSSFontFaceRule* fontFaceRule) Settings* settings = m_document ? m_document->frame() ? m_document->frame()->settings() : 0 : 0; bool allowDownloading = foundSVGFont || (settings && settings->downloadableBinaryFontsEnabled()); if (allowDownloading && item->isSupportedFormat() && m_document) { - CachedFont* cachedFont = m_document->cachedResourceLoader()->requestFont(item->resource()); + ResourceRequest request(m_document->completeURL(item->resource())); + CachedFont* cachedFont = m_document->cachedResourceLoader()->requestFont(request); if (cachedFont) { source = new CSSFontFaceSource(item->resource(), cachedFont); #if ENABLE(SVG_FONTS) diff --git a/Source/WebCore/css/CSSImageValue.cpp b/Source/WebCore/css/CSSImageValue.cpp index a9038b9..ffc6763 100644 --- a/Source/WebCore/css/CSSImageValue.cpp +++ b/Source/WebCore/css/CSSImageValue.cpp @@ -22,6 +22,7 @@ #include "CSSImageValue.h" #include "CSSValueKeywords.h" +#include "Document.h" #include "MemoryCache.h" #include "CachedImage.h" #include "CachedResourceLoader.h" @@ -71,7 +72,8 @@ StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader, const if (!m_accessedImage) { m_accessedImage = true; - if (CachedImage* cachedImage = loader->requestImage(url)) { + ResourceRequest request(loader->document()->completeURL(url)); + if (CachedImage* cachedImage = loader->requestImage(request)) { cachedImage->addClient(this); m_image = StyleCachedImage::create(cachedImage); } diff --git a/Source/WebCore/css/CSSImportRule.cpp b/Source/WebCore/css/CSSImportRule.cpp index 81ade39..82b4981 100644 --- a/Source/WebCore/css/CSSImportRule.cpp +++ b/Source/WebCore/css/CSSImportRule.cpp @@ -134,10 +134,11 @@ void CSSImportRule::insertedIntoParent() root = curr; } + ResourceRequest request(parentSheet->document()->completeURL(absHref)); if (parentSheet->isUserStyleSheet()) - m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(absHref, parentSheet->charset()); + m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(request, parentSheet->charset()); else - m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(absHref, parentSheet->charset()); + m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(request, parentSheet->charset()); if (m_cachedSheet) { // if the import rule is issued dynamically, the sheet may be // removed from the pending sheet count, so let the doc know |