[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 81a398862bf1272b7765cfa67e01be5c155705f3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 21 19:18:49 2009 +0000

    2009-10-21  Shu Chang  <Chang.Shu at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] Added dummy implementation for keepWebHistory()
            https://bugs.webkit.org/show_bug.cgi?id=30592
    
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::keepWebHistory):
            * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49915 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 00575c1..1a0d34e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-21  Shu Chang  <Chang.Shu at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Added dummy implementation for keepWebHistory()
+        https://bugs.webkit.org/show_bug.cgi?id=30592
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::keepWebHistory):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2009-10-21  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index b99a89d..daa8fcf 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -108,6 +108,11 @@ void LayoutTestController::waitUntilDone()
     m_timeoutTimer.start(11000, this);
 }
 
+void LayoutTestController::keepWebHistory()
+{
+    // FIXME: implement
+}
+
 void LayoutTestController::notifyDone()
 {
     qDebug() << ">>>>notifyDone";
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 98f364a..278ba27 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -83,6 +83,7 @@ public slots:
     void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
     void setCanOpenWindows() { m_canOpenWindows = true; }
     void waitUntilDone();
+    void keepWebHistory();
     void notifyDone();
     void dumpBackForwardList() { m_dumpBackForwardList = true; }
     void dumpEditingCallbacks();

-- 
WebKit Debian packaging