[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 00c4d0c6c5d856b315fbac90904ed2fa6365e486
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 15 22:08:31 2010 +0000

    ASSERTION (r72003): Assertion failure when running layout tests
    https://bugs.webkit.org/show_bug.cgi?id=49561
    
    Reviewed by Dimitri Glazkov.
    
    r72003 added the 'formaction' URL attribute to HTMLButtonElement and HTMLInputElement,
    but did not add the attribute to the isURLAttribute which lead to assertion failures
    when running the layout tests with a debug build.
    
    * html/HTMLButtonElement.cpp:
    (WebCore::HTMLButtonElement::isURLAttribute):
    * html/HTMLButtonElement.h:
    * html/HTMLInputElement.cpp:
    (WebCore::HTMLInputElement::isURLAttribute):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72038 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a202214..e8a8a78 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-15  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        ASSERTION (r72003): Assertion failure when running layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=49561
+
+        r72003 added the 'formaction' URL attribute to HTMLButtonElement and HTMLInputElement,
+        but did not add the attribute to the isURLAttribute which lead to assertion failures
+        when running the layout tests with a debug build.
+
+        * html/HTMLButtonElement.cpp:
+        (WebCore::HTMLButtonElement::isURLAttribute):
+        * html/HTMLButtonElement.h:
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::isURLAttribute):
+
 2010-11-15  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/html/HTMLButtonElement.cpp b/WebCore/html/HTMLButtonElement.cpp
index b4c8ec0..92fdde5 100644
--- a/WebCore/html/HTMLButtonElement.cpp
+++ b/WebCore/html/HTMLButtonElement.cpp
@@ -170,6 +170,11 @@ void HTMLButtonElement::accessKeyAction(bool sendToAnyElement)
     dispatchSimulatedClick(0, sendToAnyElement);
 }
 
+bool HTMLButtonElement::isURLAttribute(Attribute* attr) const
+{
+    return attr->name() == formactionAttr;
+}
+
 String HTMLButtonElement::value() const
 {
     return getAttribute(valueAttr);
diff --git a/WebCore/html/HTMLButtonElement.h b/WebCore/html/HTMLButtonElement.h
index 888c0a8..97a0204 100644
--- a/WebCore/html/HTMLButtonElement.h
+++ b/WebCore/html/HTMLButtonElement.h
@@ -54,6 +54,7 @@ private:
     virtual void setActivatedSubmit(bool flag);
 
     virtual void accessKeyAction(bool sendToAnyElement);
+    virtual bool isURLAttribute(Attribute*) const;
 
     virtual bool canStartSelection() const { return false; }
 
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp
index 0284ab5..b5fc023 100644
--- a/WebCore/html/HTMLInputElement.cpp
+++ b/WebCore/html/HTMLInputElement.cpp
@@ -1689,7 +1689,7 @@ PassRefPtr<HTMLFormElement> HTMLInputElement::createTemporaryFormForIsIndex()
 
 bool HTMLInputElement::isURLAttribute(Attribute *attr) const
 {
-    return (attr->name() == srcAttr);
+    return (attr->name() == srcAttr || attr->name() == formactionAttr);
 }
 
 String HTMLInputElement::defaultValue() const

-- 
WebKit Debian packaging