Changeset 140444 in webkit

Timestamp:

Jan 22, 2013, 11:24:50 AM (14 years ago)

Author:

senorblanco@chromium.org

Message:

Merge 140057

imageSmoothingEnabled frequent, unpredictable crashes
​https://bugs.webkit.org/show_bug.cgi?id=107161

Patch by Alexis Hetu <​sugoi@chromium.org> on 2013-01-17
Reviewed by Stephen White.

Source/WebCore:

Added a NULL pointer check to fix a crash.

Test: fast/canvas/canvas-imageSmoothingEnabled-zero-size.html

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::setWebkitImageSmoothingEnabled):

LayoutTests:

Added a layout test for setting image smoothing enabled on a 0 sized
canvas.

• fast/canvas/canvas-imageSmoothingEnabled-zero-size-expected.txt: Added.
• fast/canvas/canvas-imageSmoothingEnabled-zero-size.html: Added.

TBR=​commit-queue@webkit.org
Review URL: ​https://codereview.chromium.org/12039021

Location:

branches/chromium/1364

Files:

• LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size-expected.txt (copied) (copied from trunk/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size-expected.txt )
• LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size.html (copied) (copied from trunk/LayoutTests/fast/canvas/canvas-imageSmoothingEnabled-zero-size.html )
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)

branches/chromium/1364/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -2403 +2403 @@
     realizeSaves();
     modifiableState().m_imageSmoothingEnabled = enabled;
-    drawingContext()->setImageInterpolationQuality(enabled ? DefaultInterpolationQuality : InterpolationNone);
+    GraphicsContext* c = drawingContext();
+    if (c)
+        c->setImageInterpolationQuality(enabled ? DefaultInterpolationQuality : InterpolationNone);
 }