Title: [108396] trunk/Source/WebCore
- Revision
- 108396
- Author
- [email protected]
- Date
- 2012-02-21 14:05:28 -0800 (Tue, 21 Feb 2012)
Log Message
Make WebKitCSSShaderValue inherit directly from CSSValue.
<http://webkit.org/b/79144>
Reviewed by Antti Koivisto.
WebKitCSSShaderValue was inheriting from CSSPrimitiveValue but only used
it for storing the shader URL. Moved that to a String member instead.
WebKitCSSShaderValues didn't even return true for isPrimitiveValue() so
there should be no behavior change whatsoever here.
* css/WebKitCSSShaderValue.cpp:
(WebCore::WebKitCSSShaderValue::WebKitCSSShaderValue):
(WebCore::WebKitCSSShaderValue::cachedShader):
(WebCore::WebKitCSSShaderValue::customCssText):
* css/WebKitCSSShaderValue.h:
(WebKitCSSShaderValue):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108395 => 108396)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 21:57:06 UTC (rev 108395)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 22:05:28 UTC (rev 108396)
@@ -1,3 +1,23 @@
+2012-02-21 Andreas Kling <[email protected]>
+
+ Make WebKitCSSShaderValue inherit directly from CSSValue.
+ <http://webkit.org/b/79144>
+
+ Reviewed by Antti Koivisto.
+
+ WebKitCSSShaderValue was inheriting from CSSPrimitiveValue but only used
+ it for storing the shader URL. Moved that to a String member instead.
+
+ WebKitCSSShaderValues didn't even return true for isPrimitiveValue() so
+ there should be no behavior change whatsoever here.
+
+ * css/WebKitCSSShaderValue.cpp:
+ (WebCore::WebKitCSSShaderValue::WebKitCSSShaderValue):
+ (WebCore::WebKitCSSShaderValue::cachedShader):
+ (WebCore::WebKitCSSShaderValue::customCssText):
+ * css/WebKitCSSShaderValue.h:
+ (WebKitCSSShaderValue):
+
2012-02-21 James Robinson <[email protected]>
Unreviewed windows build fix - avoid return statement after return if USE(ACCELERATED_COMPOSITING) is set.
Modified: trunk/Source/WebCore/css/WebKitCSSShaderValue.cpp (108395 => 108396)
--- trunk/Source/WebCore/css/WebKitCSSShaderValue.cpp 2012-02-21 21:57:06 UTC (rev 108395)
+++ trunk/Source/WebCore/css/WebKitCSSShaderValue.cpp 2012-02-21 22:05:28 UTC (rev 108396)
@@ -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 @@
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 @@
return m_shader.get();
}
+String WebKitCSSShaderValue::customCssText() const
+{
+ return "url(" + quoteCSSURLIfNeeded(m_url) + ")";
+}
} // namespace WebCore
Modified: trunk/Source/WebCore/css/WebKitCSSShaderValue.h (108395 => 108396)
--- trunk/Source/WebCore/css/WebKitCSSShaderValue.h 2012-02-21 21:57:06 UTC (rev 108395)
+++ trunk/Source/WebCore/css/WebKitCSSShaderValue.h 2012-02-21 22:05:28 UTC (rev 108396)
@@ -32,8 +32,7 @@
#if ENABLE(CSS_SHADERS)
-#include "CachedResourceHandle.h"
-#include "CSSPrimitiveValue.h"
+#include "CSSValue.h"
namespace WebCore {
@@ -41,17 +40,20 @@
class StyleCachedShader;
class StyleShader;
-class WebKitCSSShaderValue : public CSSPrimitiveValue {
+class WebKitCSSShaderValue : public CSSValue {
public:
static PassRefPtr<WebKitCSSShaderValue> create(const String& url) { return adoptRef(new WebKitCSSShaderValue(url)); }
~WebKitCSSShaderValue();
StyleCachedShader* cachedShader(CachedResourceLoader*);
StyleShader* cachedOrPendingShader();
-
+
+ String customCssText() const;
+
private:
WebKitCSSShaderValue(const String& url);
-
+
+ String m_url;
RefPtr<StyleShader> m_shader;
bool m_accessedShader;
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
