[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andreas.kling at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit cb6e41333f450caa8f9fd2c0481c5258046f5038
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 31 21:05:07 2011 +0000

    2011-01-31  Andreas Kling  <kling at webkit.org>
    
            Unbreak Qt build after r77151.
    
            * bridge/qt/qt_instance.cpp:
            (JSC::Bindings::QtInstance::removeCachedMethod):
            (JSC::Bindings::QtInstance::markAggregate):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 4a5031c..1e2f703 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-31  Andreas Kling  <kling at webkit.org>
+
+        Unbreak Qt build after r77151.
+
+        * bridge/qt/qt_instance.cpp:
+        (JSC::Bindings::QtInstance::removeCachedMethod):
+        (JSC::Bindings::QtInstance::markAggregate):
+
 2011-01-31  takano takumi  <takano at apple.com>
 
         Reviewed by Dave Hyatt.
diff --git a/Source/WebCore/bridge/qt/qt_instance.cpp b/Source/WebCore/bridge/qt/qt_instance.cpp
index da0dd71..dd454c3 100644
--- a/Source/WebCore/bridge/qt/qt_instance.cpp
+++ b/Source/WebCore/bridge/qt/qt_instance.cpp
@@ -147,12 +147,12 @@ void QtInstance::put(JSObject* object, ExecState* exec, const Identifier& proper
 
 void QtInstance::removeCachedMethod(JSObject* method)
 {
-    if (m_defaultMethod == method)
+    if (m_defaultMethod.get() == method)
         m_defaultMethod.clear();
 
-    for (QHash<QByteArray, JSObject*>::Iterator it = m_methods.begin(),
+    for (QHash<QByteArray, DeprecatedPtr<JSObject> >::Iterator it = m_methods.begin(),
         end = m_methods.end(); it != end; ++it)
-        if (it.value() == method) {
+        if (it.value().get() == method) {
             m_methods.erase(it);
             return;
         }
@@ -188,7 +188,7 @@ void QtInstance::markAggregate(MarkStack& markStack)
 {
     if (m_defaultMethod)
         markStack.append(&m_defaultMethod);
-    foreach (DeprecatedPtr<JSObject>& val, m_methods.values()) {
+    foreach (DeprecatedPtr<JSObject> val, m_methods.values()) {
         if (val)
             markStack.append(&val);
     }

-- 
WebKit Debian packaging