Changeset 86085 in webkit

Timestamp:

May 9, 2011 1:22:56 PM (13 years ago)

Author:

mdelaney@apple.com

Message:

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

Reviewed by Simon Fraser.

Remove canvas usage of roundToDevicePixels
​https://bugs.webkit.org/show_bug.cgi?id=60331

No new tests. This could only affect canvases at non-integral scale factors. Our tests only run in 1.0x.

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/CanvasRenderingContext2D.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-05  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Remove canvas usage of roundToDevicePixels
+        https://bugs.webkit.org/show_bug.cgi?id=60331
+
+        No new tests. This could only affect canvases at non-integral scale factors. Our tests only run in 1.0x.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::drawImage):
+
 2011-05-09  Alexis Menard  <alexis.menard@openbossa.org>
 

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

@@ -1314 +1314 @@
     checkOrigin(image);
 
-    FloatRect sourceRect = c->roundToDevicePixels(normalizedSrcRect);
-    FloatRect destRect = c->roundToDevicePixels(normalizedDstRect);
-    c->drawImage(cachedImage->image(), ColorSpaceDeviceRGB, destRect, sourceRect, op);
-    didDraw(destRect);
+    c->drawImage(cachedImage->image(), ColorSpaceDeviceRGB, normalizedDstRect, normalizedSrcRect, op);
+    didDraw(normalizedDstRect);
 }
 
@@ -1376 +1374 @@
     if (!state().m_invertibleCTM)
         return;
-
-    FloatRect sourceRect = c->roundToDevicePixels(srcRect);
-    FloatRect destRect = c->roundToDevicePixels(dstRect);
 
     // FIXME: Do this through platform-independent GraphicsContext API.
@@ -1398 +1393 @@
 #endif
 
-    c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, destRect, sourceRect, state().m_globalComposite);
-    didDraw(destRect);
+    c->drawImageBuffer(buffer, ColorSpaceDeviceRGB, dstRect, srcRect, state().m_globalComposite);
+    didDraw(dstRect);
 }
 
@@ -1461 +1456 @@
     checkOrigin(video);
 
-    FloatRect sourceRect = c->roundToDevicePixels(srcRect);
-    FloatRect destRect = c->roundToDevicePixels(dstRect);
-
     GraphicsContextStateSaver stateSaver(*c);
-    c->clip(destRect);
-    c->translate(destRect.x(), destRect.y());
-    c->scale(FloatSize(destRect.width() / sourceRect.width(), destRect.height() / sourceRect.height()));
-    c->translate(-sourceRect.x(), -sourceRect.y());
+    c->clip(dstRect);
+    c->translate(dstRect.x(), dstRect.y());
+    c->scale(FloatSize(dstRect.width() / srcRect.width(), dstRect.height() / srcRect.height()));
+    c->translate(-srcRect.x(), -srcRect.y());
     video->paintCurrentFrameInContext(c, IntRect(IntPoint(), size(video)));
     stateSaver.restore();
-    didDraw(destRect);
+    didDraw(dstRect);
 }
 #endif