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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 749d83e9e609eab1accd6eac888d17bdfcb251ee
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 20:08:11 2010 +0000

    2010-09-14  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] V8 port: Get inspector up and running
            https://bugs.webkit.org/show_bug.cgi?id=45771
    
            * WebCoreSupport/InspectorClientQt.cpp:
            (WebCore::ensureDebuggerScriptLoaded): Added, loads DebuggerScript.js into ScriptDebugServer.
            (WebCore::InspectorClientQt::openInspectorFrontend): Ensure that DebuggerScript.js is loaded
            before opening an inspector.
    2010-09-14  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] V8 port: Get inspector up and running
            https://bugs.webkit.org/show_bug.cgi?id=45771
    
            * inspector/front-end/WebKit.qrc: Add DebuggerScript.js
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67488 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 69ec47b..aa0695d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-14  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] V8 port: Get inspector up and running
+        https://bugs.webkit.org/show_bug.cgi?id=45771
+
+        * inspector/front-end/WebKit.qrc: Add DebuggerScript.js
+
 2010-09-14  Oliver Hunt  <oliver at apple.com>
 
         PPC Build fix.
diff --git a/WebCore/inspector/front-end/WebKit.qrc b/WebCore/inspector/front-end/WebKit.qrc
index f90a9fe..c222f0e 100644
--- a/WebCore/inspector/front-end/WebKit.qrc
+++ b/WebCore/inspector/front-end/WebKit.qrc
@@ -266,5 +266,6 @@
     <file>Images/warningOrangeDot.png</file>
     <file>Images/warningsErrors.png</file>
     <file>Images/whiteConnectorPoint.png</file>
+    <file alias="DebuggerScript.js">../../bindings/v8/DebuggerScript.js</file>
 </qresource>
 </RCC>
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 02b73fe..deab06d 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-14  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] V8 port: Get inspector up and running
+        https://bugs.webkit.org/show_bug.cgi?id=45771
+
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::ensureDebuggerScriptLoaded): Added, loads DebuggerScript.js into ScriptDebugServer.
+        (WebCore::InspectorClientQt::openInspectorFrontend): Ensure that DebuggerScript.js is loaded
+        before opening an inspector.
+
 2010-09-14  Enrico Ros  <eros at codeaurora.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index 55aca7f..e6e6fde 100644
--- a/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -37,12 +37,14 @@
 #include "Page.h"
 #include "PlatformString.h"
 #include "ScriptController.h"
+#include "ScriptDebugServer.h"
 #include "qwebinspector.h"
 #include "qwebinspector_p.h"
 #include "qwebpage.h"
 #include "qwebpage_p.h"
 #include "qwebview.h"
 #include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
 #include <QtCore/QSettings>
 #include <QtCore/QVariant>
 
@@ -93,6 +95,22 @@ public slots:
     }
 };
 
+#if USE(V8)
+static void ensureDebuggerScriptLoaded()
+{
+    static bool scriptLoaded = false;
+    if (scriptLoaded)
+        return;
+
+    QFile debuggerScriptFile(":/webkit/inspector/DebuggerScript.js");
+    if (debuggerScriptFile.open(QIODevice::ReadOnly)) {
+        QByteArray ba = debuggerScriptFile.readAll();
+        ScriptDebugServer::shared().setDebuggerScriptSource(String(ba.constData(), ba.length()));
+        scriptLoaded = true;
+    }
+}
+#endif
+
 InspectorClientQt::InspectorClientQt(QWebPage* page)
     : m_inspectedWebPage(page)
     , m_frontendWebPage(0)
@@ -109,6 +127,10 @@ void InspectorClientQt::inspectorDestroyed()
     
 void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController*)
 {
+#if USE(V8)
+    ensureDebuggerScriptLoaded();
+#endif
+
     QWebView* inspectorView = new QWebView;
     InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView);
     inspectorView->setPage(inspectorPage);

-- 
WebKit Debian packaging