Changeset 62016 in webkit

Timestamp:

Jun 28, 2010 10:00:39 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-28 Robin Cao <​robin.cao@torchmobile.com.cn>

Reviewed by Dan Bernstein.

canvas fillText with @font-face crashes
​https://bugs.webkit.org/show_bug.cgi?id=35486

The font object in CanvasRenderingContext2D may become invalid at some point.
Override recalcStyle() in HTMLCanvasElement, and update the font object from there if needed.

A test already exists: canvas/philip/tests/2d.text.draw.fontface.repeat.html

• html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::recalcStyle):
• html/HTMLCanvasElement.h:
• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::updateFont):
• html/canvas/CanvasRenderingContext2D.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLCanvasElement.cpp (modified) (2 diffs)
• html/HTMLCanvasElement.h (modified) (2 diffs)
• html/canvas/CanvasRenderingContext2D.cpp (modified) (2 diffs)
• html/canvas/CanvasRenderingContext2D.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-28  Robin Cao  <robin.cao@torchmobile.com.cn>
+
+        Reviewed by Dan Bernstein.
+
+        canvas fillText with @font-face crashes
+        https://bugs.webkit.org/show_bug.cgi?id=35486
+
+        The font object in CanvasRenderingContext2D may become invalid at some point.
+        Override recalcStyle() in HTMLCanvasElement, and update the font object from there if needed.
+
+        A test already exists: canvas/philip/tests/2d.text.draw.fontface.repeat.html
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::recalcStyle):
+        * html/HTMLCanvasElement.h:
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::updateFont):
+        * html/canvas/CanvasRenderingContext2D.h:
+
 2010-06-28  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
 

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -2 +2 @@
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
+ * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -279 +280 @@
 #endif
 
-}
+void HTMLCanvasElement::recalcStyle(StyleChange change)
+{
+    HTMLElement::recalcStyle(change);
+
+    // Update font if needed.
+    if (change == Force && m_context && m_context->is2d()) {
+        CanvasRenderingContext2D* ctx = static_cast<CanvasRenderingContext2D*>(m_context.get());
+        ctx->updateFont();
+    }
+}
+
+}

trunk/WebCore/html/HTMLCanvasElement.h

@@ -2 +2 @@
  * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
+ * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -102 +103 @@
     virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
 
+    virtual void recalcStyle(StyleChange);
+
     void reset();
 

trunk/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -5 +5 @@
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
+ * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1502 +1503 @@
     state().m_realizedFont = true;
 }
-        
+
+void CanvasRenderingContext2D::updateFont()
+{
+    if (!state().m_realizedFont)
+        return;
+
+    const Font& font = state().m_font;
+    font.update(font.fontSelector());
+}
+
 String CanvasRenderingContext2D::textAlign() const
 {

trunk/WebCore/html/canvas/CanvasRenderingContext2D.h

@@ -194 +194 @@
         String font() const;
         void setFont(const String&);
+        void updateFont();
         
         String textAlign() const;