Changeset 155668 in webkit for trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp

Timestamp:

Sep 12, 2013, 10:11:18 PM (12 years ago)

Author:

[email protected]

Message:

[CTTE] RenderHTMLCanvas's element is always a HTMLCanvasElement.
<​https://webkit.org/b/121272>

Reviewed by Anders Carlsson.

Add RenderHTMLCanvas::canvasElement(), hiding element().
This function also returns a reference since this renderer cannot be anonymous.

File:

• trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp (modified) (3 diffs)

trunk/Source/WebCore/rendering/RenderHTMLCanvas.cpp

@@ -42 +42 @@
 using namespace HTMLNames;
 
-RenderHTMLCanvas::RenderHTMLCanvas(HTMLCanvasElement* element)
-    : RenderReplaced(element, element->size())
+RenderHTMLCanvas::RenderHTMLCanvas(HTMLCanvasElement& element)
+    : RenderReplaced(&element, element.size())
 {
     // Actual size is not known yet, report the default intrinsic size.
     view().frameView().incrementVisuallyNonEmptyPixelCount(roundedIntSize(intrinsicSize()));
+}
+
+HTMLCanvasElement& RenderHTMLCanvas::canvasElement() const
+{
+    ASSERT(RenderObject::node());
+    return toHTMLCanvasElement(*RenderObject::node());
 }
 
@@ -53 +59 @@
     if (RenderReplaced::requiresLayer())
         return true;
-    
-    HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(element());
-    return canvas && canvas->renderingContext() && canvas->renderingContext()->isAccelerated();
+
+    if (CanvasRenderingContext* context = canvasElement().renderingContext())
+        return context->isAccelerated();
+
+    return false;
 }
 
@@ -79 +87 @@
 
     bool useLowQualityScale = style()->imageRendering() == ImageRenderingCrispEdges || style()->imageRendering() == ImageRenderingOptimizeSpeed;
-    static_cast<HTMLCanvasElement*>(element())->paint(context, paintRect, useLowQualityScale);
+    canvasElement().paint(context, paintRect, useLowQualityScale);
 }
 
 void RenderHTMLCanvas::canvasSizeChanged()
 {
-    IntSize canvasSize = static_cast<HTMLCanvasElement*>(element())->size();
+    IntSize canvasSize = canvasElement().size();
     LayoutSize zoomedSize(canvasSize.width() * style()->effectiveZoom(), canvasSize.height() * style()->effectiveZoom());