[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 873a0f8a290014e41f8091719b16864e144aac26
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 29 20:49:34 2004 +0000

            Reviewed by Dave.
    
            - some tweaks on image
    
            * khtml/html/html_imageimpl.h: Remove unused noref bit and unneeded override of isURLAttribute.
            * khtml/html/html_imageimpl.cpp:
            (HTMLAreaElementImpl::HTMLAreaElementImpl): Remove unused noref bit.
            (HTMLAreaElementImpl::parseHTMLAttribute): Remove parsing of noref; no need to store the
            bit since it has no meaning.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6520 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c871960..386bcf1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-04-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - some tweaks on image
+
+        * khtml/html/html_imageimpl.h: Remove unused noref bit and unneeded override of isURLAttribute.
+        * khtml/html/html_imageimpl.cpp:
+        (HTMLAreaElementImpl::HTMLAreaElementImpl): Remove unused noref bit.
+        (HTMLAreaElementImpl::parseHTMLAttribute): Remove parsing of noref; no need to store the
+        bit since it has no meaning.
+
 2004-04-29  David Hyatt  <hyatt at apple.com>
 
 	1. Change the role of links from AXButton to AXLink.
diff --git a/WebCore/khtml/html/html_imageimpl.cpp b/WebCore/khtml/html/html_imageimpl.cpp
index 1a4863f..8424f96 100644
--- a/WebCore/khtml/html/html_imageimpl.cpp
+++ b/WebCore/khtml/html/html_imageimpl.cpp
@@ -391,7 +391,6 @@ HTMLAreaElementImpl::HTMLAreaElementImpl(DocumentPtr *doc)
 {
     m_coords=0;
     m_coordsLen = 0;
-    nohref = false;
     shape = Unknown;
     lasth = lastw = -1;
 }
@@ -424,9 +423,6 @@ void HTMLAreaElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
         if (m_coords) delete [] m_coords;
         m_coords = attr->value().toLengthArray(m_coordsLen);
         break;
-    case ATTR_NOHREF:
-        nohref = !attr->isNull();
-        break;
     case ATTR_TARGET:
         m_hasTarget = !attr->isNull();
         break;
@@ -509,9 +505,3 @@ QRegion HTMLAreaElementImpl::getRegion(int width_, int height_) const
 
     return region;
 }
-
-bool HTMLAreaElementImpl::isURLAttribute(AttributeImpl *attr) const
-{
-    return attr->id() == ATTR_HREF;
-}
-
diff --git a/WebCore/khtml/html/html_imageimpl.h b/WebCore/khtml/html/html_imageimpl.h
index 7bf961b..4eb0d4b 100644
--- a/WebCore/khtml/html/html_imageimpl.h
+++ b/WebCore/khtml/html/html_imageimpl.h
@@ -98,8 +98,6 @@ public:
                        khtml::RenderObject::NodeInfo& info);
 
     virtual QRect getRect() const;
-    
-    virtual bool isURLAttribute(AttributeImpl *attr) const;
 
 protected:
     QRegion getRegion(int width_, int height) const;
@@ -107,8 +105,7 @@ protected:
     khtml::Length* m_coords;
     int m_coordsLen;
     int lastw, lasth;
-    Shape shape  : 3;
-    bool nohref  : 1;
+    Shape shape;
 };
 
 

-- 
WebKit Debian packaging