Changeset 153044 in webkit


Ignore:
Timestamp:
Jul 23, 2013 4:30:47 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

WebSocket initialization to use remote inspector
​https://bugs.webkit.org/show_bug.cgi?id=118678

Patch by Roland Takacs <​rtakacs@inf.u-szeged.hu> on 2013-07-23
Reviewed by Timothy Hatcher.

Add WebSocket initialization and define a 'connect-src' directive in the
Content-Security-Policy HTTP header to enable the connection.

  • UserInterface/InspectorFrontendHostStub.js:

(.WebInspector.InspectorFrontendHostStub.prototype.sendMessageToBackend):

  • UserInterface/Main.html:
  • UserInterface/Main.js:

(WebInspector.loaded):
(WebInspector._initializeWebSocketIfNeeded.createSocket.WebInspector):
(WebInspector._initializeWebSocketIfNeeded.createSocket):
(WebInspector._initializeWebSocketIfNeeded):

Location:
trunk/Source/WebInspectorUI
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r152979 r153044  
     12013-07-23  Roland Takacs  <rtakacs@inf.u-szeged.hu>
     2
     3        WebSocket initialization to use remote inspector
     4        https://bugs.webkit.org/show_bug.cgi?id=118678
     5
     6        Reviewed by Timothy Hatcher.
     7
     8        Add WebSocket initialization and define a 'connect-src' directive in the
     9        Content-Security-Policy HTTP header to enable the connection.
     10
     11        * UserInterface/InspectorFrontendHostStub.js:
     12        (.WebInspector.InspectorFrontendHostStub.prototype.sendMessageToBackend):
     13        * UserInterface/Main.html:
     14        * UserInterface/Main.js:
     15        (WebInspector.loaded):
     16        (WebInspector._initializeWebSocketIfNeeded.createSocket.WebInspector):
     17        (WebInspector._initializeWebSocketIfNeeded.createSocket):
     18        (WebInspector._initializeWebSocketIfNeeded):
     19
    1202013-07-22  Diego Pino Garcia  <dpino@igalia.com>
    221

  • trunk/Source/WebInspectorUI/UserInterface/InspectorFrontendHostStub.js

    r152956 r153044  
    102102        sendMessageToBackend: function(message)
    103103        {
     104            if (WebInspector.socket)
     105                WebInspector.socket.send(message);
    104106        },
    105107

  • trunk/Source/WebInspectorUI/UserInterface/Main.html

    r152749 r153044  
    2727<head>
    2828    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    29     <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src *; media-src *; font-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
     29    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src *; connect-src *; media-src *; font-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
    3030
    3131    <link rel="stylesheet" href="External/CodeMirror/codemirror.css">

  • trunk/Source/WebInspectorUI/UserInterface/Main.js

    r152830 r153044  
    3333    InspectorFrontendHost.loaded();
    3434
     35    // Initialize WebSocket to communication
     36    this._initializeWebSocketIfNeeded();
     37
    3538    // Register observers for events from the InspectorBackend.
    3639    InspectorBackend.registerInspectorDispatcher(new WebInspector.InspectorObserver);
    … …  
    10861089}
    10871090
     1091WebInspector._initializeWebSocketIfNeeded = function()
     1092{
     1093    var ws;
     1094    var queryParams = parseLocationQueryParameters();
     1095
     1096    if ("ws" in queryParams)
     1097        ws = "ws://" + queryParams.ws;
     1098    else if ("page" in queryParams) {
     1099        var page = queryParams.page;
     1100        var host = "host" in queryParams ? queryParams.host : window.location.host;
     1101        ws = "ws://" + host + "/devtools/page/" + page;
     1102    }
     1103
     1104    if (!ws)
     1105        return;
     1106
     1107    var socket = new WebSocket(ws);
     1108    socket.addEventListener("open", createSocket);
     1109
     1110    function createSocket()
     1111    {
     1112        WebInspector.socket = socket;
     1113        WebInspector.socket.addEventListener("message", function(message) { InspectorBackend.dispatch(message.data); });
     1114        WebInspector.socket.addEventListener("error", function(error) { console.error(error); });
     1115    }
     1116}
     1117
    10881118WebInspector._updateSplitConsoleHeight = function(height)
    10891119{
Note: See TracChangeset for help on using the changeset viewer.