[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 c935e41af8c246033fc2da5c7c1a2c3d71cb9138
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 12 01:17:36 2003 +0000

            Reviewed by Dave.
    
    	- fixed 3136944 -- mouseover feedback over non-mapped part of image map claims
    	link to current page
    
            * kwq/WebCoreBridge.mm: (-[WebCoreBridge elementAtPoint:]):
    	Change code so we won't call completeURL and complete a null ATTR_HREF (which is distinct
    	from an empty ATTR_HREF). Did a similar cleanup on the image code.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3301 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 57a47a2..c2ddee7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-01-11  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3136944 -- mouseover feedback over non-mapped part of image map claims
+	link to current page
+
+        * kwq/WebCoreBridge.mm: (-[WebCoreBridge elementAtPoint:]):
+	Change code so we won't call completeURL and complete a null ATTR_HREF (which is distinct
+	from an empty ATTR_HREF). Did a similar cleanup on the image code.
+
 2003-01-09  Darin Adler  <darin at apple.com>
 
         * WebCore.pbproj/project.pbxproj: Add the year 2003, remove CFBundleIconFile,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 57a47a2..c2ddee7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-01-11  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3136944 -- mouseover feedback over non-mapped part of image map claims
+	link to current page
+
+        * kwq/WebCoreBridge.mm: (-[WebCoreBridge elementAtPoint:]):
+	Change code so we won't call completeURL and complete a null ATTR_HREF (which is distinct
+	from an empty ATTR_HREF). Did a similar cleanup on the image code.
+
 2003-01-09  Darin Adler  <darin at apple.com>
 
         * WebCore.pbproj/project.pbxproj: Add the year 2003, remove CFBundleIconFile,
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 226287f..59e16df 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -438,15 +438,15 @@ static bool initializedObjectCacheSize = FALSE;
     
     NodeImpl *URLNode = nodeInfo.URLElement();
     if (URLNode) {
-        ElementImpl* e = static_cast<ElementImpl*>(URLNode);
-        NSString *title = e->getAttribute(ATTR_TITLE).string().getNSString();
-        if(title){
-            [element setObject:title forKey:WebCoreElementLinkTitleKey];
-        }
+        ElementImpl *e = static_cast<ElementImpl *>(URLNode);
         
-        NSString *URLString = _part->xmlDocImpl()->completeURL(e->getAttribute(ATTR_HREF).string()).getNSString();
+        DOMString title = e->getAttribute(ATTR_TITLE);
+        if (!title.isEmpty()) {
+            [element setObject:title.string().getNSString() forKey:WebCoreElementLinkTitleKey];
+        }
         
-        if (URLString) {
+        DOMString link = e->getAttribute(ATTR_HREF);
+        if (!link.isNull()) {
             // Look for the first #text node to use as a label.
             NodeImpl *labelParent = e;
             while (labelParent->hasChildNodes()){
@@ -462,7 +462,7 @@ static bool initializedObjectCacheSize = FALSE;
                 }
                 labelParent = childNode;
             }
-            [element setObject:URLString forKey:WebCoreElementLinkURLKey];
+            [element setObject:_part->xmlDocImpl()->completeURL(link.string()).getNSString() forKey:WebCoreElementLinkURLKey];
         }
         
         DOMString target = e->getAttribute(ATTR_TARGET);
@@ -476,32 +476,30 @@ static bool initializedObjectCacheSize = FALSE;
 
     NodeImpl *node = nodeInfo.innerNonSharedNode();
     if (node && isImage(node)){
-
-        ElementImpl* i =  static_cast<ElementImpl*>(node);
+        ElementImpl *i = static_cast<ElementImpl*>(node);
         DOMString attr = i->getAttribute(ATTR_SRC);
-        if(attr.isEmpty()){
+        if (attr.isEmpty()) {
             // Look for the URL in the DATA attribute of the OBJECT tag.
             attr = i->getAttribute(ATTR_DATA);
         }
 
-        NSString *URLString = _part->xmlDocImpl()->completeURL(attr.string()).getNSString();        
-        if (URLString) {
-            [element setObject:URLString forKey:WebCoreElementImageURLKey];
-            
-            NSString *altString = i->getAttribute(ATTR_ALT).string().getNSString();
-            if(altString){
-                [element setObject:altString forKey:WebCoreElementImageAltStringKey];
-            }
-            
-            RenderImage *r = (RenderImage *)node->renderer();
-            id <WebCoreImageRenderer> image = r->pixmap().image();
-            if (image) {
-                [element setObject:image forKey:WebCoreElementImageKey];
-                int x, y;
-                if(r->absolutePosition(x, y)){
-                    [element setObject:[NSValue valueWithPoint:NSMakePoint(x,y)] forKey:WebCoreElementImageLocationKey];
-                }
-            }
+        if (!attr.isEmpty()) {
+            [element setObject:_part->xmlDocImpl()->completeURL(attr.string()).getNSString() forKey:WebCoreElementImageURLKey];
+        }
+        
+        DOMString alt = i->getAttribute(ATTR_ALT);
+        if (!alt.isNull()) {
+            [element setObject:alt.string().getNSString() forKey:WebCoreElementImageAltStringKey];
+        }
+        
+        RenderImage *r = (RenderImage *)node->renderer();
+        id <WebCoreImageRenderer> image = r->pixmap().image();
+        if (image) {
+            [element setObject:image forKey:WebCoreElementImageKey];
+        }
+        int x, y;
+        if (r->absolutePosition(x, y)) {
+            [element setObject:[NSValue valueWithPoint:NSMakePoint(x,y)] forKey:WebCoreElementImageLocationKey];
         }
     }
 

-- 
WebKit Debian packaging