Reviewed by Darin

        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView drawRect:]): Work around for this bug:
        <rdar://problem/3908282> REGRESSION (Mail): No drag image dragging selected text in Blot and Mail
        The reason for the workaround is that this method is called explicitly from the code
        to generate a drag image, and at that time, getRectsBeingDrawn:count: will return a zero count.
        This code change uses the passed-in rect when the count is zero.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 42cb01d431308366b4ff568b73974728b97c9db3..d7b86d24e747d832ed964b7a87ed216aae9d4a8d 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-08  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by Darin
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView drawRect:]): Work around for this bug:
+        <rdar://problem/3908282> REGRESSION (Mail): No drag image dragging selected text in Blot and Mail
+        The reason for the workaround is that this method is called explicitly from the code
+        to generate a drag image, and at that time, getRectsBeingDrawn:count: will return a zero count.
+        This code change uses the passed-in rect when the count is zero.
+
 2004-12-07  Administrator  <cblu@apple.com>
 
        Support for fix for:

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 5191923c5a7e84c93c320c75ed132f75452a55db..fccc33ab2fd9d9d6b5fa1bbb87190131c9afd235 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -1990,20 +1990,27 @@ static WebHTMLView *lastHitView = nil;
 - (void)drawRect:(NSRect)rect
 {
     LOG(View, "%@ drawing", self);
-    
+
     // Work around AppKit bug <rdar://problem/3875305> rect passed to drawRect: is too large.
     // Ignore the passed-in rect and instead union in the rectangles from getRectsBeingDrawn.
     // This does a better job of clipping out rects that are entirely outside the visible area.
     const NSRect *rects;
     int count;
     [self getRectsBeingDrawn:&rects count:&count];
-    rect = NSZeroRect;
-    int i;
-    for (i = 0; i < count; ++i) {
-        rect = NSUnionRect(rect, rects[i]);
-    }
-    if (rect.size.height == 0 || rect.size.width == 0) {
-        return;
+
+    // If count == 0 here, use the rect passed in for drawing. This is a workaround for:
+    // <rdar://problem/3908282> REGRESSION (Mail): No drag image dragging selected text in Blot and Mail
+    // The reason for the workaround is that this method is called explicitly from the code
+    // to generate a drag image, and at that time, getRectsBeingDrawn:count: will return a zero count.
+    if (count > 0) {
+        rect = NSZeroRect;
+        int i;
+        for (i = 0; i < count; ++i) {
+            rect = NSUnionRect(rect, rects[i]);
+        }
+        if (rect.size.height == 0 || rect.size.width == 0) {
+            return;
+        }
     }
 
     BOOL subviewsWereSetAside = _private->subviewsSetAside;