[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[trey]

The following commit has been merged in the debian/unstable branch:
commit a500cd7a0ec0c29faff19ea1db88919b9e1fe051
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jun 15 07:23:22 2004 +0000

    	Fix ASSERT/crash we get sometimes when dragging link images.  Turns
    	out there was an uninitialized variable for the image size,
    	so at random we would try to create huge images that could not
    	be focused.
    
            Reviewed by Maciej and Darin.
    
            * WebView.subproj/WebHTMLView.m:
            (-[WebHTMLView _dragImageForLinkElement:]):  Trivial fix to
    	not use += with uninited variable.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6844 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9e96545..e318e55 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-06-15  Trey Matteson  <trey at apple.com>
+
+	Fix ASSERT/crash we get sometimes when dragging link images.  Turns
+	out there was an uninitialized variable for the image size,
+	so at random we would try to create huge images that could not
+	be focused.
+	
+        Reviewed by Maciej and Darin.
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView _dragImageForLinkElement:]):  Trivial fix to
+	not use += with uninited variable.
+
 2004-06-14  Darin Adler  <darin at apple.com>
 
         Reviewed by me, code changes by Patrick Beard.
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 70b2d58..7629e5d 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -729,8 +729,8 @@ static WebHTMLView *lastHitView = nil;
     }
     
     NSSize imageSize, urlStringSize;
-    imageSize.width += labelSize.width + DRAG_LABEL_BORDER_X * 2;
-    imageSize.height += labelSize.height + DRAG_LABEL_BORDER_Y * 2;
+    imageSize.width = labelSize.width + DRAG_LABEL_BORDER_X * 2;
+    imageSize.height = labelSize.height + DRAG_LABEL_BORDER_Y * 2;
     if (drawURLString) {
         urlStringSize.width = [urlString _web_widthWithFont: urlFont];
         urlStringSize.height = [urlFont ascender] - [urlFont descender];

-- 
WebKit Debian packaging