Changeset 83888 in webkit

Timestamp:

Apr 14, 2011 1:31:43 PM (13 years ago)

Author:

mdelaney@apple.com

Message:

2011-04-14 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Simon Fraser.

Have canvas drawImageFromRect just redirect to use drawImage
​https://bugs.webkit.org/show_bug.cgi?id=58516

Test: fast/canvas/drawImageFromRect_withToDataURLAsSource.html

• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::drawImage): (WebCore::CanvasRenderingContext2D::drawImageFromRect):
• html/canvas/CanvasRenderingContext2D.h:

2011-04-14 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Simon Fraser.

Have canvas drawImageFromRect just redirect to use drawImage
​https://bugs.webkit.org/show_bug.cgi?id=58516

• fast/canvas/drawImageFromRect_withToDataURLAsSource-expected.txt: Added.
• fast/canvas/drawImageFromRect_withToDataURLAsSource.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/drawImageFromRect_withToDataURLAsSource-expected.txt (added)
• LayoutTests/fast/canvas/drawImageFromRect_withToDataURLAsSource.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (4 diffs)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-14  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Have canvas drawImageFromRect just redirect to use drawImage
+        https://bugs.webkit.org/show_bug.cgi?id=58516
+
+        * fast/canvas/drawImageFromRect_withToDataURLAsSource-expected.txt: Added.
+        * fast/canvas/drawImageFromRect_withToDataURLAsSource.html: Added.
+
 2011-04-14  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Have canvas drawImageFromRect just redirect to use drawImage
+        https://bugs.webkit.org/show_bug.cgi?id=58516
+
+        Test: fast/canvas/drawImageFromRect_withToDataURLAsSource.html
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::drawImage):
+        (WebCore::CanvasRenderingContext2D::drawImageFromRect):
+        * html/canvas/CanvasRenderingContext2D.h:
+
 2011-04-14  James Robinson  <jamesr@chromium.org>
 

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

@@ -1238 +1238 @@
 }
 
-void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRect& srcRect, const FloatRect& dstRect,
-    ExceptionCode& ec)
+void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRect& srcRect, const FloatRect& dstRect, ExceptionCode& ec)
+{
+    drawImage(image, srcRect, dstRect, state().m_globalComposite, ec);
+}
+
+void CanvasRenderingContext2D::drawImage(HTMLImageElement* image, const FloatRect& srcRect, const FloatRect& dstRect, const CompositeOperator& op, ExceptionCode& ec)
 {
     if (!image) {
@@ -1281 +1285 @@
     FloatRect sourceRect = c->roundToDevicePixels(normalizedSrcRect);
     FloatRect destRect = c->roundToDevicePixels(normalizedDstRect);
-    c->drawImage(cachedImage->image(), ColorSpaceDeviceRGB, destRect, sourceRect, state().m_globalComposite);
+    c->drawImage(cachedImage->image(), ColorSpaceDeviceRGB, destRect, sourceRect, op);
     didDraw(destRect);
 }
@@ -1440 +1444 @@
 #endif
 
-// FIXME: Why isn't this just another overload of drawImage? Why have a different name?
 void CanvasRenderingContext2D::drawImageFromRect(HTMLImageElement* image,
     float sx, float sy, float sw, float sh,
@@ -1446 +1449 @@
     const String& compositeOperation)
 {
-    if (!image)
-        return;
-
-    CachedImage* cachedImage = image->cachedImage();
-    if (!cachedImage)
-        return;
-
-    checkOrigin(image);
-
-    GraphicsContext* c = drawingContext();
-    if (!c)
-        return;
-    if (!state().m_invertibleCTM)
-        return;
-
     CompositeOperator op;
     if (!parseCompositeOperator(compositeOperation, op))
         op = CompositeSourceOver;
 
-    FloatRect destRect = FloatRect(dx, dy, dw, dh);
-    c->drawImage(cachedImage->image(), ColorSpaceDeviceRGB, destRect, FloatRect(sx, sy, sw, sh), op);
-    didDraw(destRect);
+    ExceptionCode ec;
+    drawImage(image, FloatRect(sx, sy, sw, sh), FloatRect(dx, dy, dw, dh), op, ec);
 }
 

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

@@ -176 +176 @@
     void drawImage(HTMLCanvasElement*, float sx, float sy, float sw, float sh, float dx, float dy, float dw, float dh, ExceptionCode&);
     void drawImage(HTMLCanvasElement*, const FloatRect& srcRect, const FloatRect& dstRect, ExceptionCode&);
+    void drawImage(HTMLImageElement*, const FloatRect& srcRect, const FloatRect& dstRect, const CompositeOperator&, ExceptionCode&);
 #if ENABLE(VIDEO)
     void drawImage(HTMLVideoElement*, float x, float y, ExceptionCode&);