diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/css/WebKitCSSShaderValue.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/css/WebKitCSSShaderValue.cpp')
| -rw-r--r-- | Source/WebCore/css/WebKitCSSShaderValue.cpp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Source/WebCore/css/WebKitCSSShaderValue.cpp b/Source/WebCore/css/WebKitCSSShaderValue.cpp index 91bdde298..7c9a8eda8 100644 --- a/Source/WebCore/css/WebKitCSSShaderValue.cpp +++ b/Source/WebCore/css/WebKitCSSShaderValue.cpp @@ -37,9 +37,10 @@ #include "CachedResourceRequest.h" #include "CachedResourceRequestInitiators.h" #include "Document.h" +#include "KURL.h" #include "StyleCachedShader.h" #include "StylePendingShader.h" -#include "WebCoreMemoryInstrumentation.h" +#include <wtf/text/StringBuilder.h> namespace WebCore { @@ -54,6 +55,11 @@ WebKitCSSShaderValue::~WebKitCSSShaderValue() { } +KURL WebKitCSSShaderValue::completeURL(CachedResourceLoader* loader) const +{ + return loader->document()->completeURL(m_url); +} + StyleCachedShader* WebKitCSSShaderValue::cachedShader(CachedResourceLoader* loader) { ASSERT(loader); @@ -61,7 +67,7 @@ StyleCachedShader* WebKitCSSShaderValue::cachedShader(CachedResourceLoader* load if (!m_accessedShader) { m_accessedShader = true; - CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url))); + CachedResourceRequest request(ResourceRequest(completeURL(loader))); request.setInitiator(cachedResourceRequestInitiators().css); if (CachedResourceHandle<CachedShader> cachedShader = loader->requestShader(request)) m_shader = StyleCachedShader::create(cachedShader.get()); @@ -80,13 +86,21 @@ StyleShader* WebKitCSSShaderValue::cachedOrPendingShader() String WebKitCSSShaderValue::customCssText() const { - return "url(" + quoteCSSURLIfNeeded(m_url) + ")"; + StringBuilder result; + result.appendLiteral("url("); + result.append(quoteCSSURLIfNeeded(m_url)); + result.append(')'); + if (!m_format.isEmpty()) { + result.appendLiteral(" format('"); + result.append(m_format); + result.appendLiteral("')"); + } + return result.toString(); } -void WebKitCSSShaderValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const +bool WebKitCSSShaderValue::equals(const WebKitCSSShaderValue& other) const { - MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); - info.addMember(m_url); + return m_url == other.m_url; } } // namespace WebCore |