diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
| commit | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (patch) | |
| tree | b34b0daceb7c8e7fdde4b4ec43650ab7caadb0a9 /Source/WebCore/css/WebKitCSSShaderValue.cpp | |
| parent | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (diff) | |
| download | qtwebkit-ad0d549d4cc13433f77c1ac8f0ab379c83d93f28.tar.gz | |
Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)
Diffstat (limited to 'Source/WebCore/css/WebKitCSSShaderValue.cpp')
| -rw-r--r-- | Source/WebCore/css/WebKitCSSShaderValue.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebCore/css/WebKitCSSShaderValue.cpp b/Source/WebCore/css/WebKitCSSShaderValue.cpp index 51cf8a30f..ea930304b 100644 --- a/Source/WebCore/css/WebKitCSSShaderValue.cpp +++ b/Source/WebCore/css/WebKitCSSShaderValue.cpp @@ -33,6 +33,7 @@ #include "WebKitCSSShaderValue.h" #include "CachedResourceLoader.h" +#include "CSSParser.h" #include "Document.h" #include "StyleCachedShader.h" #include "StylePendingShader.h" @@ -40,7 +41,8 @@ namespace WebCore { WebKitCSSShaderValue::WebKitCSSShaderValue(const String& url) - : CSSPrimitiveValue(WebKitCSSShaderClass, url, CSS_URI) + : CSSValue(WebKitCSSShaderClass) + , m_url(url) , m_accessedShader(false) { } @@ -56,7 +58,7 @@ StyleCachedShader* WebKitCSSShaderValue::cachedShader(CachedResourceLoader* load if (!m_accessedShader) { m_accessedShader = true; - ResourceRequest request(loader->document()->completeURL(getStringValue())); + ResourceRequest request(loader->document()->completeURL(m_url)); if (CachedShader* cachedShader = loader->requestShader(request)) m_shader = StyleCachedShader::create(cachedShader); } @@ -72,6 +74,10 @@ StyleShader* WebKitCSSShaderValue::cachedOrPendingShader() return m_shader.get(); } +String WebKitCSSShaderValue::customCssText() const +{ + return "url(" + quoteCSSURLIfNeeded(m_url) + ")"; +} } // namespace WebCore |