[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 85be1b37aa287f0eccdd450c981f35c3b431ea8d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 3 22:08:18 2009 +0000

    2009-12-03  Shu Chang  <Chang.Shu at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] After revision 32643, sender() is of type QWebPage instead of QWebFrame.
    
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::maybeDump):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 13142e9..4c899fa 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-03  Shu Chang  <Chang.Shu at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] After revision 32643, sender() is of type QWebPage instead of QWebFrame.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::maybeDump):
+
 2009-12-03  Yuzo Fujishima  <yuzo at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 12ba1b3..be54220 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -85,7 +85,7 @@ void LayoutTestController::processWork()
 // Called on loadFinished on mainFrame.
 void LayoutTestController::maybeDump(bool success)
 {
-    Q_ASSERT(sender() == m_topLoadingFrame);
+    Q_ASSERT(sender() == m_topLoadingFrame->page());
 
     // as the function is called on loadFinished, the test might
     // already have dumped and thus no longer be active, thus

-- 
WebKit Debian packaging