Changeset 128076 in webkit

Timestamp:

Sep 10, 2012 10:20:54 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Font value should be parsed as a individual property
​https://bugs.webkit.org/show_bug.cgi?id=96271

Patch by Thiago Marcos P. Santos <​thiago.santos@intel.com> on 2012-09-10
Reviewed by Eric Seidel.

Source/WebCore:

Parsing the font value as an individual CSS property instead of a style
body should make it significantly more effective and will not
validate something like ctx.font = "25px serif; background: green".

Updated canvas/philip/tests/2d.text.font.parse.invalid.html to cover
this use case.

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::setFont):

LayoutTests:

Updated test to the latest W3C approved version. It adds a test
that verifies this fix.

• canvas/philip/tests/2d.text.font.parse.invalid.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/canvas/philip/tests/2d.text.font.parse.invalid.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-10  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        Font value should be parsed as a individual property
+        https://bugs.webkit.org/show_bug.cgi?id=96271
+
+        Reviewed by Eric Seidel.
+
+        Updated test to the latest W3C approved version. It adds a test
+        that verifies this fix.
+
+        * canvas/philip/tests/2d.text.font.parse.invalid.html:
+
 2012-09-10  Silvia Pfeiffer  <silviapf@chromium.org>
 

trunk/LayoutTests/canvas/philip/tests/2d.text.font.parse.invalid.html

@@ -40 +40 @@
 _assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
 
+ctx.font = '20px serif';
+ctx.font = '1em serif; background: green; margin: 10px';
+_assertSame(ctx.font, '20px serif', "ctx.font", "'20px serif'");
 
 });

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-10  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        Font value should be parsed as a individual property
+        https://bugs.webkit.org/show_bug.cgi?id=96271
+
+        Reviewed by Eric Seidel.
+
+        Parsing the font value as an individual CSS property instead of a style
+        body should make it significantly more effective and will not
+        validate something like ctx.font = "25px serif; background: green".
+
+        Updated canvas/philip/tests/2d.text.font.parse.invalid.html to cover
+        this use case.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::setFont):
+
 2012-09-10  Silvia Pfeiffer  <silviapf@chromium.org>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -2027 +2027 @@
 {
     RefPtr<StylePropertySet> parsedStyle = StylePropertySet::create();
-    CSSParser(strictToCSSParserMode(!m_usesCSSCompatibilityParseMode)).parseDeclaration(parsedStyle.get(), "font:" + newFont, 0, 0);
+    CSSParser::parseValue(parsedStyle.get(), CSSPropertyFont, newFont, true, strictToCSSParserMode(!m_usesCSSCompatibilityParseMode), 0);
     if (parsedStyle->isEmpty())
         return;