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

[darin]

The following commit has been merged in the debian/unstable branch:
commit a5ff5dae13e5c515bb764971f65247933c1222b3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 5 15:27:27 2002 +0000

    	- fixed 3068323 -- nil object inserted in dictionary exception on mouse move
    
            * WebView.subproj/WebHTMLViewPrivate.m: (-[WebHTMLView _elementAtPoint:]):
    	Add some assertions in the hope of finding if my assumptions about this are
    	wrong, and use the version of the dictionary setter that does nothing if it's
    	passed nil when putting in the frame found by name.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8ac4895..efad513 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-05  Darin Adler  <darin at apple.com>
+
+	- fixed 3068323 -- nil object inserted in dictionary exception on mouse move
+
+        * WebView.subproj/WebHTMLViewPrivate.m: (-[WebHTMLView _elementAtPoint:]):
+	Add some assertions in the hope of finding if my assumptions about this are
+	wrong, and use the version of the dictionary setter that does nothing if it's
+	passed nil when putting in the frame found by name.
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Add a localization
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8ac4895..efad513 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-10-05  Darin Adler  <darin at apple.com>
+
+	- fixed 3068323 -- nil object inserted in dictionary exception on mouse move
+
+        * WebView.subproj/WebHTMLViewPrivate.m: (-[WebHTMLView _elementAtPoint:]):
+	Add some assertions in the hope of finding if my assumptions about this are
+	wrong, and use the version of the dictionary setter that does nothing if it's
+	passed nil when putting in the frame found by name.
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Add a localization
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index b24eab4..894e155 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -139,13 +139,15 @@ BOOL _modifierTrackingEnabled = FALSE;
     [elementInfo _web_setObjectIfNotNil:[elementInfoWC objectForKey:WebCoreElementImageLocation] forKey:WebElementImageLocationKey];
     
     WebView *webView = [self _web_parentWebView];
+    ASSERT(webView);
     WebFrame *webFrame = [[webView controller] frameForView:webView];
+    ASSERT(webFrame);
 
     NSString *frameName = [elementInfoWC objectForKey:WebCoreElementLinkTarget];
     if ([frameName length] == 0) {
         [elementInfo setObject:webFrame forKey:WebElementLinkTargetFrameKey];
     } else if (![frameName isEqualToString:@"_blank"]) {
-        [elementInfo setObject:[webFrame frameNamed:frameName] forKey:WebElementLinkTargetFrameKey];
+        [elementInfo _web_setObjectIfNotNil:[webFrame frameNamed:frameName] forKey:WebElementLinkTargetFrameKey];
     }
 
     [elementInfo setObject:webFrame forKey:WebElementFrameKey];

-- 
WebKit Debian packaging