Changeset 128287 in webkit


Ignore:
Timestamp:
Sep 12, 2012 3:15:53 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: InspectorBackend.loadFromJSONIfNeeded should take the JSON url as argument
​https://bugs.webkit.org/show_bug.cgi?id=96472

Patch by Vivek Galatage <​vivekgalatage@gmail.com> on 2012-09-12
Reviewed by Yury Semikhatsky.

The method loadFromJSONIfNeeded need to take the jsonUrl as argument
as this will be called from the Inspector Protocol Test Harness
residing in a different location.

No new tests as code refactoring done.

  • inspector/front-end/InspectorBackend.js:

(InspectorBackendClass.prototype.loadFromJSONIfNeeded):

  • inspector/front-end/inspector.js:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r128285 r128287  
     12012-09-12  Vivek Galatage  <vivekgalatage@gmail.com>
     2
     3        Web Inspector: InspectorBackend.loadFromJSONIfNeeded should take the JSON url as argument
     4        https://bugs.webkit.org/show_bug.cgi?id=96472
     5
     6        Reviewed by Yury Semikhatsky.
     7
     8        The method loadFromJSONIfNeeded need to take the jsonUrl as argument
     9        as this will be called from the Inspector Protocol Test Harness
     10        residing in a different location.
     11
     12        No new tests as code refactoring done.
     13
     14        * inspector/front-end/InspectorBackend.js:
     15        (InspectorBackendClass.prototype.loadFromJSONIfNeeded):
     16        * inspector/front-end/inspector.js:
     17
    1182012-09-12  Vsevolod Vlasov  <vsevik@chromium.org>
    219

  • trunk/Source/WebCore/inspector/front-end/InspectorBackend.js

    r113711 r128287  
    257257    },
    258258
    259     loadFromJSONIfNeeded: function()
     259    loadFromJSONIfNeeded: function(jsonUrl)
    260260    {
    261261        if (this._initialized)
    … …  
    263263
    264264        var xhr = new XMLHttpRequest();
    265         xhr.open("GET", "../Inspector.json", false);
     265        xhr.open("GET", jsonUrl, false);
    266266        xhr.send(null);
    267267   

  • trunk/Source/WebCore/inspector/front-end/inspector.js

    r127705 r128287  
    407407WebInspector.loaded = function()
    408408{
    409     InspectorBackend.loadFromJSONIfNeeded();
     409    InspectorBackend.loadFromJSONIfNeeded("../Inspector.json");
    410410
    411411    if (WebInspector.WorkerManager.isDedicatedWorkerFrontend()) {
Note: See TracChangeset for help on using the changeset viewer.