[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

pfeldman at chromium.org pfeldman at chromium.org
Mon Feb 21 00:09:31 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit e6609c3132412721091a8b3ba97ff2174f8bdbca
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 16:56:37 2011 +0000

    2011-01-28  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: allow remote debugging with front-end
            served from the cloud.
            https://bugs.webkit.org/show_bug.cgi?id=53303
    
            * inspector/front-end/inspector.js:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e3d4560..1f500e2 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-28  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: allow remote debugging with front-end
+        served from the cloud.
+        https://bugs.webkit.org/show_bug.cgi?id=53303
+
+        * inspector/front-end/inspector.js:
+
 2011-01-28  Aparna Nandyal  <aparna.nand at wipro.com>
 
         Reviewed by Andreas Kling.
diff --git a/Source/WebCore/inspector/front-end/inspector.js b/Source/WebCore/inspector/front-end/inspector.js
index c02fd6e..14437be 100644
--- a/Source/WebCore/inspector/front-end/inspector.js
+++ b/Source/WebCore/inspector/front-end/inspector.js
@@ -475,7 +475,9 @@ WebInspector.PlatformFlavor = {
 WebInspector.loaded = function()
 {
     if ("page" in WebInspector.queryParamsObject) {
-        WebInspector.socket = new WebSocket("ws://" + window.location.host + "/devtools/page/" + WebInspector.queryParamsObject.page);
+        var page = WebInspector.queryParamsObject.page;
+        var host = "host" in WebInspector.queryParamsObject ? WebInspector.queryParamsObject.host : window.location.host;
+        WebInspector.socket = new WebSocket("ws://" + host + "/devtools/page/" + page);
         WebInspector.socket.onmessage = function(message) { InspectorBackend.dispatch(message.data); }
         WebInspector.socket.onerror = function(error) { console.error(error); }
         WebInspector.socket.onopen = function() {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list