[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 057ebd64a9e923aca3f2edb0cd1ce10f851633b7
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 8 15:26:57 2010 +0000

    2010-10-08  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [Qt] TestController needs its platform dependent methods
            https://bugs.webkit.org/show_bug.cgi?id=47413
    
            * WebKitTestRunner/qt/TestControllerQt.cpp:
            (WTR::TestController::initializeInjectedBundlePath):
            If the WTR_INJECTEDBUNDLE_PATH environmental variable is
            set then use that otherwise use the path where the bundle
            lives in a normal trunk build.
            (WTR::TestController::initializeTestPluginDirectory):
            Set the bundle's value. It is not used currently.
            (WTR::TestController::platformInitializeContext):
            * WebKitTestRunner/qt/WebKitTestRunner.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69401 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 116ffc3..d1f427b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-08  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] TestController needs its platform dependent methods
+        https://bugs.webkit.org/show_bug.cgi?id=47413
+
+        * WebKitTestRunner/qt/TestControllerQt.cpp:
+        (WTR::TestController::initializeInjectedBundlePath):
+        If the WTR_INJECTEDBUNDLE_PATH environmental variable is
+        set then use that otherwise use the path where the bundle
+        lives in a normal trunk build.
+        (WTR::TestController::initializeTestPluginDirectory):
+        Set the bundle's value. It is not used currently.
+        (WTR::TestController::platformInitializeContext):
+        * WebKitTestRunner/qt/WebKitTestRunner.pro:
+
 2010-10-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
index 54eb0a5..956a1c8 100644
--- a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
+++ b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
@@ -26,10 +26,14 @@
 
 #include "TestController.h"
 
-#include "NotImplemented.h"
+#include <cstdlib>
 #include <QCoreApplication>
 #include <QEventLoop>
+#include <QFileInfo>
+#include <QLibrary>
 #include <QObject>
+#include <QtGlobal>
+#include <wtf/text/WTFString.h>
 
 namespace WTR {
 
@@ -82,17 +86,24 @@ void TestController::runUntil(bool& done)
 
 void TestController::initializeInjectedBundlePath()
 {
-    notImplemented();
+    QString path = QLatin1String(getenv("WTR_INJECTEDBUNDLE_PATH"));
+    if (path.isEmpty())
+        path = QFileInfo(QCoreApplication::applicationDirPath() + "/../lib/libWTRInjectedBundle").absoluteFilePath();
+
+    if (QLibrary::isLibrary(QLibrary(path).fileName()))
+        qFatal("Cannot find the injected bundle at %s\n", qPrintable(path));
+
+    m_injectedBundlePath = WKStringCreateWithQString(path);
 }
 
 void TestController::initializeTestPluginDirectory()
 {
-    notImplemented();
+    // This is called after initializeInjectedBundlePath.
+    m_testPluginDirectory = m_injectedBundlePath;
 }
 
 void TestController::platformInitializeContext()
 {
-    notImplemented();
 }
 
 #include "TestControllerQt.moc"
diff --git a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
index b1ac70e..a638e65 100644
--- a/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
+++ b/WebKitTools/WebKitTestRunner/qt/WebKitTestRunner.pro
@@ -20,6 +20,7 @@ INCLUDEPATH += \
     $$BASEDIR/../../WebKit2 \
     $$BASEDIR/../../WebKit2/Shared \
     $$BASEDIR/../../WebKit2/UIProcess/API/qt \
+    $$BASEDIR/../../WebKit2/UIProcess/API/cpp/qt \
 
 INCLUDEPATH += \
     $$OUTPUT_DIR/include \

-- 
WebKit Debian packaging