[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[mitz at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit ebce2f6d9b492cbb924cb35a107b931e6cd05ed0
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 23:21:03 2010 +0000

    Fixed a regression introduced in r44243, which made the assertion in checkListItems()
    ineffective.
    
    Reviewed by Alexey Proskuryakov.
    
    * dom/SelectElement.cpp:
    (WebCore::SelectElementData::checkListItems): Copy the items vector before recomputing it,
    then assert that the newly-computed vector is equal to the copy.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55261 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2f6a51d..1f2bb29 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-25  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fixed a regression introduced in r44243, which made the assertion in checkListItems()
+        ineffective.
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElementData::checkListItems): Copy the items vector before recomputing it,
+        then assert that the newly-computed vector is equal to the copy.
+
 2010-02-25  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/dom/SelectElement.cpp b/WebCore/dom/SelectElement.cpp
index 866b6ca..8b8a8ef 100644
--- a/WebCore/dom/SelectElement.cpp
+++ b/WebCore/dom/SelectElement.cpp
@@ -954,7 +954,7 @@ SelectElementData::SelectElementData()
 void SelectElementData::checkListItems(const Element* element) const
 {
 #if !ASSERT_DISABLED
-    const Vector<Element*>& items = m_listItems;
+    Vector<Element*> items = m_listItems;
     SelectElement::recalcListItems(*const_cast<SelectElementData*>(this), element, false);
     ASSERT(items == m_listItems);
 #else

-- 
WebKit Debian packaging