Changeset 21322 in webkit

Timestamp:

May 8, 2007 9:09:24 PM (17 years ago)

Author:

bdash

Message:

2007-05-08 Bruce Q Hammond <​bruceq@apple.com>

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=13578
Bug 13578: When QD plugins draw to an offscreen bitmap the origin is not correct

Now we have correct handling of the origin when QD plugins draw to
offscreen bitmaps.
Also the clipping code for this path was doing unnecessary work which
caused incorrect results; it has been removed.

This change should not affect Safari and in general will only affect
plugins (e.g. Flash) drawing to a CGBitmapContext.

• Plugins/WebBaseNetscapePluginView.mm: (-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]):

Location:

trunk/WebKit

Files:

• ChangeLog (modified) (2 diffs)
• Plugins/WebBaseNetscapePluginView.mm (modified) (4 diffs)

trunk/WebKit/ChangeLog

@@ +1 @@
+2007-05-08  Bruce Q Hammond  <bruceq@apple.com>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=13578
+        Bug 13578: When QD plugins draw to an offscreen bitmap the origin is not correct
+
+        Now we have correct handling of the origin when QD plugins draw to
+        offscreen bitmaps.
+        Also the clipping code for this path was doing unnecessary work which
+        caused incorrect results; it has been removed.
+        
+        This change should not affect Safari and in general will only affect
+        plugins (e.g. Flash) drawing to a CGBitmapContext.
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView saveAndSetNewPortStateForUpdate:]):
+
 2007-05-08  Steve Falkenburg  <sfalken@apple.com>
 
@@ -1918 +1936 @@
         (HIWebViewEventHandler): Don't leak the NSEvent.
 
-2007-03-08  Bruce Q Hammond  <bruceq@apple.om>
+2007-03-08  Bruce Q Hammond  <bruceq@apple.com>
 
         Reviewed by Darin.

trunk/WebKit/Plugins/WebBaseNetscapePluginView.mm

@@ -445 +445 @@
                         nPort.qdPort.port = port;
                         boundsInWindow = [self bounds];
-                        nPort.qdPort.portx = (int32)-boundsInWindow.origin.x;
-                        nPort.qdPort.porty = (int32)-boundsInWindow.origin.y;
+                        
+                        // Generate a QD origin based on the current affine transform for currentContext.
+                        CGAffineTransform offscreenMatrix = CGContextGetCTM(currentContext);
+                        CGPoint origin = {0,0};
+                        CGPoint axisFlip = {1,1};
+                        origin = CGPointApplyAffineTransform(origin, offscreenMatrix);
+                        axisFlip = CGPointApplyAffineTransform(axisFlip, offscreenMatrix);
+                        
+                        // Quartz bitmaps have origins at the bottom left, but the axes may be inverted, so handle that.
+                        origin.x = offscreenBounds.left - origin.x * (axisFlip.x - origin.x);
+                        origin.y = offscreenBounds.bottom + origin.y * (axisFlip.y - origin.y);
+                        
+                        nPort.qdPort.portx = (int32)-boundsInWindow.origin.x + origin.x;
+                        nPort.qdPort.porty = (int32)-boundsInWindow.origin.y + origin.y;                        
                         window.x = 0;
                         window.y = 0;
@@ -464 +476 @@
             // Clip to dirty region so plug-in does not draw over already-drawn regions of the window that are
             // not going to be redrawn this update.  This forces plug-ins to play nice with z-index ordering.
-            Rect clipBounds;
             if (forUpdate) {
                 RgnHandle viewClipRegion = NewRgn();
@@ -492 +503 @@
                 SectRgn(clipRegion, viewClipRegion, clipRegion);
                 DisposeRgn(viewClipRegion);
-                if (port == offscreenGWorld) {
-                    GetRegionBounds(clipRegion, &clipBounds);
-                    OffsetRgn(clipRegion, -clipBounds.left, -clipBounds.top);
-                }
             }
 
@@ -511 +518 @@
                 // We reset the port's visible region to counteract what BeginUpdate did.
                 SetPortVisibleRegion(nPort.qdPort.port, clipRegion);
-
-                // Some plugins do their own BeginUpdate/EndUpdate.
-                // For those, we must make sure that the update region contains the area we want to draw.
-                if (port == offscreenGWorld)
-                    OffsetRgn(clipRegion, clipBounds.left, clipBounds.top);
                 InvalWindowRgn(windowRef, clipRegion);
             }