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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit de7c91faa93eeff5a3554c59f4300677340d8f30
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 11:24:15 2010 +0000

    [Qt] need an API to suspend and resume active Javascript DOM objects.
    https://bugs.webkit.org/show_bug.cgi?id=31673
    
    Patch by Yongjun Zhang  <yongjun.zhang at nokia.com>, Laszlo Gombos <laszlo.1.gombos at nokia.com> on 2010-01-07
    Reviewed by Simon Hausmann.
    
    Add suspend and resume DOM objects private API to QWebFrame.
    
    * Api/qwebframe.cpp:
    (qt_suspendActiveDOMObjects):
    (qt_resumeActiveDOMObjects):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52914 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 1a3bf7f..7f3c53e 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -220,6 +220,22 @@ QString QWEBKIT_EXPORT qt_drt_counterValueForElementById(QWebFrame* qFrame, cons
     return QString();
 }
 
+// Suspend active DOM objects in this frame.
+void QWEBKIT_EXPORT qt_suspendActiveDOMObjects(QWebFrame* qFrame)
+{
+    Frame* frame = QWebFramePrivate::core(qFrame);
+    if (frame->document())
+        frame->document()->suspendActiveDOMObjects();
+}
+            
+// Resume active DOM objects in this frame.
+void QWEBKIT_EXPORT qt_resumeActiveDOMObjects(QWebFrame* qFrame)
+{
+    Frame* frame = QWebFramePrivate::core(qFrame);
+    if (frame->document())
+        frame->document()->resumeActiveDOMObjects();
+}                        
+
 QWebFrameData::QWebFrameData(WebCore::Page* parentPage, WebCore::Frame* parentFrame,
                              WebCore::HTMLFrameOwnerElement* ownerFrameElement,
                              const WebCore::String& frameName)
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 8e8739e..90cdd4e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-07  Yongjun Zhang  <yongjun.zhang at nokia.com>, Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] need an API to suspend and resume active Javascript DOM objects.
+        https://bugs.webkit.org/show_bug.cgi?id=31673
+
+        Add suspend and resume DOM objects private API to QWebFrame.
+
+        * Api/qwebframe.cpp:
+        (qt_suspendActiveDOMObjects):
+        (qt_resumeActiveDOMObjects):
+
 2010-01-06  Andreas Kling  <andreas.kling at nokia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging