[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 32cf0b798d8f8987b655c155b9d094258a71ccf6
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 11 21:01:53 2004 +0000

            Reviewed by Dave.
    
            - fixed <rdar://problem/3645846>: (REGRESSION: Stuck "Loading" when logging into Google's Gmail on newer versions of Safari)
    
            * khtml/html/html_baseimpl.cpp: (HTMLFrameElementImpl::parseHTMLAttribute):
            Call through to base class for ATTR_ID so the "has ID" bit gets set.
            * khtml/html/html_imageimpl.cpp:
            (HTMLImageElementImpl::parseHTMLAttribute): Move ATTR_COMPOSITE code up and out of the way so
            it doesn't screw up ATTR_ID parsing.
            (HTMLMapElementImpl::parseHTMLAttribute): Call through to base class for ATTR_ID
            so the "has ID" bit gets set.
            * khtml/html/html_objectimpl.cpp:
            (HTMLAppletElementImpl::parseHTMLAttribute): Remove ATTR_ID case; not needed.
            (HTMLParamElementImpl::parseHTMLAttribute): Call through to base class for ATTR_ID
            so the "has ID" bit gets set.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6819 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b9fa011..4bc6759 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2004-06-11  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed <rdar://problem/3645846>: (REGRESSION: Stuck "Loading" when logging into Google's Gmail on newer versions of Safari)
+
+        * khtml/html/html_baseimpl.cpp: (HTMLFrameElementImpl::parseHTMLAttribute):
+        Call through to base class for ATTR_ID so the "has ID" bit gets set.
+        * khtml/html/html_imageimpl.cpp:
+        (HTMLImageElementImpl::parseHTMLAttribute): Move ATTR_COMPOSITE code up and out of the way so
+        it doesn't screw up ATTR_ID parsing.
+        (HTMLMapElementImpl::parseHTMLAttribute): Call through to base class for ATTR_ID
+        so the "has ID" bit gets set.
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLAppletElementImpl::parseHTMLAttribute): Remove ATTR_ID case; not needed.
+        (HTMLParamElementImpl::parseHTMLAttribute): Call through to base class for ATTR_ID
+        so the "has ID" bit gets set.
+
 2004-06-11  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/html/html_baseimpl.cpp b/WebCore/khtml/html/html_baseimpl.cpp
index 58999e2..acee156 100644
--- a/WebCore/khtml/html/html_baseimpl.cpp
+++ b/WebCore/khtml/html/html_baseimpl.cpp
@@ -339,6 +339,9 @@ void HTMLFrameElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
         setLocation(khtml::parseURL(attr->value()));
         break;
     case ATTR_ID:
+        // Important to call through to base for ATTR_ID so the hasID bit gets set.
+        HTMLElementImpl::parseHTMLAttribute(attr);
+        // fall through
     case ATTR_NAME:
         name = attr->value();
         // FIXME: If we are already attached, this doesn't actually change the frame's name.
@@ -346,12 +349,10 @@ void HTMLFrameElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
         // conflicts and generate a unique frame name.
         break;
     case ATTR_FRAMEBORDER:
-    {
         frameBorder = attr->value().toInt();
         frameBorderSet = !attr->isNull();
         // FIXME: If we are already attached, this has no effect.
-    }
-    break;
+        break;
     case ATTR_MARGINWIDTH:
         marginWidth = attr->value().toInt();
         // FIXME: If we are already attached, this has no effect.
diff --git a/WebCore/khtml/html/html_imageimpl.cpp b/WebCore/khtml/html/html_imageimpl.cpp
index 6ff2711..06fea1c 100644
--- a/WebCore/khtml/html/html_imageimpl.cpp
+++ b/WebCore/khtml/html/html_imageimpl.cpp
@@ -225,6 +225,11 @@ void HTMLImageElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
         break;
     case ATTR_NOSAVE:
 	break;
+#if APPLE_CHANGES
+    case ATTR_COMPOSITE:
+        _compositeOperator = attr->value().string();
+        break;
+#endif
     case ATTR_NAME:
 	{
 	    QString newNameAttr = attr->value().string();
@@ -246,10 +251,6 @@ void HTMLImageElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
 	    }
 	    oldIdAttr = newIdAttr;
 	}
-#if APPLE_CHANGES
-    case ATTR_COMPOSITE:
-	    _compositeOperator = attr->value().string();
-#endif
 	// fall through
     default:
         HTMLElementImpl::parseHTMLAttribute(attr);
@@ -434,6 +435,8 @@ void HTMLMapElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
     switch (attr->id())
     {
     case ATTR_ID:
+        // Must call base class so that hasID bit gets set.
+        HTMLElementImpl::parseHTMLAttribute(attr);
         if (getDocument()->htmlMode() != DocumentImpl::XHtml) break;
         // fall through
     case ATTR_NAME:
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index c7e9568..96282dd 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -95,7 +95,6 @@ void HTMLAppletElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
     case ATTR_ARCHIVE:
     case ATTR_CODE:
     case ATTR_CODEBASE:
-    case ATTR_ID:
     case ATTR_MAYSCRIPT:
     case ATTR_NAME:
     case ATTR_OBJECT:
@@ -533,6 +532,8 @@ void HTMLParamElementImpl::parseHTMLAttribute(HTMLAttributeImpl *attr)
     switch( attr->id() )
     {
     case ATTR_ID:
+        // Must call base class so that hasID bit gets set.
+        HTMLElementImpl::parseHTMLAttribute(attr);
         if (getDocument()->htmlMode() != DocumentImpl::XHtml) break;
         // fall through
     case ATTR_NAME:

-- 
WebKit Debian packaging