Title: [105056] trunk/Source/WebCore
- Revision
- 105056
- Author
- [email protected]
- Date
- 2012-01-16 05:00:39 -0800 (Mon, 16 Jan 2012)
Log Message
CSSCanvasValue can't be renamed, enforce this at compile-time.
<http://webkit.org/b/76352>
Reviewed by Antti Koivisto.
Have the CSSCanvasValue constructor take the name as an argument instead of
having a setName() that's only called from one place in CSSParser.
* css/CSSCanvasValue.h:
(WebCore::CSSCanvasValue::create):
(WebCore::CSSCanvasValue::CSSCanvasValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseCanvas):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105055 => 105056)
--- trunk/Source/WebCore/ChangeLog 2012-01-16 12:57:00 UTC (rev 105055)
+++ trunk/Source/WebCore/ChangeLog 2012-01-16 13:00:39 UTC (rev 105056)
@@ -1,3 +1,19 @@
+2012-01-15 Andreas Kling <[email protected]>
+
+ CSSCanvasValue can't be renamed, enforce this at compile-time.
+ <http://webkit.org/b/76352>
+
+ Reviewed by Antti Koivisto.
+
+ Have the CSSCanvasValue constructor take the name as an argument instead of
+ having a setName() that's only called from one place in CSSParser.
+
+ * css/CSSCanvasValue.h:
+ (WebCore::CSSCanvasValue::create):
+ (WebCore::CSSCanvasValue::CSSCanvasValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseCanvas):
+
2012-01-16 Andreas Kling <[email protected]>
CSSStyleSelector: Dodge parser when creating default LTR/RTL declarations.
Modified: trunk/Source/WebCore/css/CSSCanvasValue.h (105055 => 105056)
--- trunk/Source/WebCore/css/CSSCanvasValue.h 2012-01-16 12:57:00 UTC (rev 105055)
+++ trunk/Source/WebCore/css/CSSCanvasValue.h 2012-01-16 13:00:39 UTC (rev 105056)
@@ -35,7 +35,7 @@
class CSSCanvasValue : public CSSImageGeneratorValue {
public:
- static PassRefPtr<CSSCanvasValue> create() { return adoptRef(new CSSCanvasValue); }
+ static PassRefPtr<CSSCanvasValue> create(const String& name) { return adoptRef(new CSSCanvasValue(name)); }
~CSSCanvasValue();
String customCssText() const;
@@ -47,12 +47,11 @@
bool isPending() const { return false; }
void loadSubimages(CachedResourceLoader*) { }
- void setName(const String& name) { m_name = name; }
-
private:
- CSSCanvasValue()
+ CSSCanvasValue(const String& name)
: CSSImageGeneratorValue(CanvasClass)
, m_canvasObserver(this)
+ , m_name(name)
, m_element(0)
{
}
Modified: trunk/Source/WebCore/css/CSSParser.cpp (105055 => 105056)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-01-16 12:57:00 UTC (rev 105055)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-01-16 13:00:39 UTC (rev 105056)
@@ -6444,19 +6444,17 @@
bool CSSParser::parseCanvas(CSSParserValueList* valueList, RefPtr<CSSValue>& canvas)
{
- RefPtr<CSSCanvasValue> result = CSSCanvasValue::create();
-
// Walk the arguments.
CSSParserValueList* args = valueList->current()->function->args.get();
if (!args || args->size() != 1)
return false;
// The first argument is the canvas name. It is an identifier.
- CSSParserValue* a = args->current();
- if (!a || a->unit != CSSPrimitiveValue::CSS_IDENT)
+ CSSParserValue* value = args->current();
+ if (!value || value->unit != CSSPrimitiveValue::CSS_IDENT)
return false;
- result->setName(a->string);
- canvas = result;
+
+ canvas = CSSCanvasValue::create(value->string);
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
