+2012-02-07 Matthew Delaney <mdelaney@apple.com>
+
+ Remove redundant checks in CanvasRenderingContext2D.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=78000
+
+ Reviewed by Dan Bernstein.
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::setShadowColor):
+ (WebCore::CanvasRenderingContext2D::setShadow):
+ (WebCore::CanvasRenderingContext2D::drawImage):
+
2012-02-07 Abhishek Arya <inferno@chromium.org>
Crash in ContainerNode functions due to mutation events.
{
if (!parseColorOrCurrentColor(state().m_shadowColor, color, canvas()))
return;
-
applyShadow();
}
state().m_shadowOffset = FloatSize(width, height);
state().m_shadowBlur = blur;
state().m_shadowColor = makeRGBA32FromFloats(grayLevel, grayLevel, grayLevel, 1.0f);
-
- GraphicsContext* c = drawingContext();
- if (!c)
- return;
-
applyShadow();
}
state().m_shadowColor = colorWithOverrideAlpha(rgba, alpha);
state().m_shadowOffset = FloatSize(width, height);
state().m_shadowBlur = blur;
-
- GraphicsContext* c = drawingContext();
- if (!c)
- return;
-
applyShadow();
}
state().m_shadowOffset = FloatSize(width, height);
state().m_shadowBlur = blur;
state().m_shadowColor = makeRGBA32FromFloats(grayLevel, grayLevel, grayLevel, alpha);
-
- GraphicsContext* c = drawingContext();
- if (!c)
- return;
-
applyShadow();
}
state().m_shadowOffset = FloatSize(width, height);
state().m_shadowBlur = blur;
state().m_shadowColor = makeRGBA32FromFloats(r, g, b, a);
-
- GraphicsContext* c = drawingContext();
- if (!c)
- return;
-
applyShadow();
}
float sx, float sy, float sw, float sh,
float dx, float dy, float dw, float dh, ExceptionCode& ec)
{
- if (!image) {
- ec = TYPE_MISMATCH_ERR;
- return;
- }
drawImage(image, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), ec);
}
void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas, float x, float y, ExceptionCode& ec)
{
- if (!sourceCanvas) {
- ec = TYPE_MISMATCH_ERR;
- return;
- }
-
drawImage(sourceCanvas, 0, 0, sourceCanvas->width(), sourceCanvas->height(), x, y, sourceCanvas->width(), sourceCanvas->height(), ec);
}
void CanvasRenderingContext2D::drawImage(HTMLCanvasElement* sourceCanvas,
float x, float y, float width, float height, ExceptionCode& ec)
{
- if (!sourceCanvas) {
- ec = TYPE_MISMATCH_ERR;
- return;
- }
drawImage(sourceCanvas, FloatRect(0, 0, sourceCanvas->width(), sourceCanvas->height()), FloatRect(x, y, width, height), ec);
}