Changeset 199541 in webkit


Ignore:
Timestamp:
Apr 14, 2016, 10:44:20 AM (9 years ago)
Author:
commit-queue@webkit.org
Message:

REGRESSION: Web Inspector: Remote inspector doesn't work
​https://bugs.webkit.org/show_bug.cgi?id=156543

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2016-04-14
Reviewed by Timothy Hatcher.

WebSocket connection is blocked by CSP, but needed by the remote web inspector to work, so allow connect to ws
URLs from the web inspector. Also add stubs for zoomFactor and setZoomFactor to InspectorFrontendHostStub,
required after r199396.

  • UserInterface/Base/InspectorFrontendHostStub.js:

(window.InspectorFrontendHost.WebInspector.InspectorFrontendHostStub.prototype.setZoomFactor):
(window.InspectorFrontendHost.WebInspector.InspectorFrontendHostStub.prototype.zoomFactor):

  • UserInterface/Main.html:
Location:
trunk/Source/WebInspectorUI
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebInspectorUI/ChangeLog

    r199396 r199541  
     12016-04-14  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        REGRESSION: Web Inspector: Remote inspector doesn't work
     4        https://bugs.webkit.org/show_bug.cgi?id=156543
     5
     6        Reviewed by Timothy Hatcher.
     7
     8        WebSocket connection is blocked by CSP, but needed by the remote web inspector to work, so allow connect to ws
     9        URLs from the web inspector. Also add stubs for zoomFactor and setZoomFactor to InspectorFrontendHostStub,
     10        required after r199396.
     11
     12        * UserInterface/Base/InspectorFrontendHostStub.js:
     13        (window.InspectorFrontendHost.WebInspector.InspectorFrontendHostStub.prototype.setZoomFactor):
     14        (window.InspectorFrontendHost.WebInspector.InspectorFrontendHostStub.prototype.zoomFactor):
     15        * UserInterface/Main.html:
     16
    1172016-04-12  Brian Burg  <bburg@apple.com>
    218

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

    r197824 r199541  
    169169        },
    170170
     171        setZoomFactor: function(zoom)
     172        {
     173        },
     174
     175        zoomFactor: function()
     176        {
     177            return 1;
     178        },
     179
    171180        // Private
    172181

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

    r199379 r199541  
    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 * file: blob: resource:; connect-src *; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
     29    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * file: blob: resource:; connect-src * ws:; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'">
    3030
    3131    <link rel="stylesheet" href="External/CodeMirror/codemirror.css">
Note: See TracChangeset for help on using the changeset viewer.