[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 472cac118063e900a4587fd7471ba6fd6c3f1372
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 03:23:16 2010 +0000

    2010-01-06  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
    
            Reviewed by Darin Adler.
    
            Adjust incorrect comments after r40534.
    
            * bindings/js/JSDOMBinding.cpp:
            (WebCore::markActiveObjectsForContext):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52895 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d725eaf..3567c09 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-06  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
+
+        Reviewed by Darin Adler.
+
+        Adjust incorrect comments after r40534.
+
+        * bindings/js/JSDOMBinding.cpp:
+        (WebCore::markActiveObjectsForContext):
+
 2010-01-06  Fumitoshi Ukai  <ukai at chromium.org>
 
         Unreviewed build fix for chromium.
diff --git a/WebCore/bindings/js/JSDOMBinding.cpp b/WebCore/bindings/js/JSDOMBinding.cpp
index ffa1d43..24f891e 100644
--- a/WebCore/bindings/js/JSDOMBinding.cpp
+++ b/WebCore/bindings/js/JSDOMBinding.cpp
@@ -448,8 +448,7 @@ void markActiveObjectsForContext(MarkStack& markStack, JSGlobalData& globalData,
     for (HashMap<ActiveDOMObject*, void*>::const_iterator iter = activeObjects.begin(); iter != activeObjectsEnd; ++iter) {
         if (iter->first->hasPendingActivity()) {
             // Generally, an active object with pending activity must have a wrapper to mark its listeners.
-            // However, some ActiveDOMObjects don't have JS wrappers (timers created by setTimeout is one example).
-            // FIXME: perhaps need to make sure even timers have a markable 'wrapper'.
+            // However, some ActiveDOMObjects don't have JS wrappers.
             markDOMObjectWrapper(markStack, globalData, iter->second);
         }
     }

-- 
WebKit Debian packaging