Skip to content
  • kov@webkit.org's avatar
    [GTK] Move to the new web inspector · 86b826a5
    kov@webkit.org authored
    https://bugs.webkit.org/show_bug.cgi?id=120647
    
    Patch by Gustavo Noronha Silva <gustavo.noronha@collabora.com> on 2013-09-13
    Reviewed by Carlos Garcia Campos.
    
    .:
    
    * GNUmakefile.am: include the new WebInspectorUI GNUmakefile.am.
    
    Source/WebCore:
    
    No tests for the new inspector UI as of yet.
    
    * GNUmakefile.am: no longer install the deprecated inspector UI files.
    * WebCore.exp.in: add SchemeRegistry symbol that is now used.
    
    Source/WebInspectorUI:
    
    * GNUmakefile.am: Added. Generate the GResource source and link it into libWebCore.
    
    Source/WebKit/gtk:
    
    * WebCoreSupport/InspectorClientGtk.cpp:
    (WebKit::InspectorClient::openInspectorFrontend): update paths to the internal resource ones.
    (WebKit::InspectorClient::inspectorFilesPath): ditto.
    * tests/testwebinspector.c:
    (consoleMessageCallback): the new inspector currently emits an error when loading, so add it to
    the list of messages which are not considered failures.
    * webkit/webkitglobals.cpp:
    (webkitInit): register resource as a local scheme; currently used by the inspector.
    
    Source/WebKit2:
    
    * GNUmakefile.am: bundle the remote inspector page list HTML into libwebkit2gtk as a GResource.
    * UIProcess/API/gtk/tests/GNUmakefile.am: no need to set WEBKIT_INSPECTOR_PATH anymore.
    * UIProcess/API/gtk/tests/InspectorTestServer.cpp:
    (main): ditto.
    * UIProcess/API/gtk/tests/TestInspector.cpp:
    (beforeAll): ditto.
    * UIProcess/API/gtk/tests/TestInspectorServer.cpp:
    (testInspectorServerPageList): update paths to the internal resource ones.
    * UIProcess/InspectorServer/WebInspectorServer.h:
    * UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
    (WebKit::WebInspectorServer::platformResourceForPath): ditto.
    (WebKit::WebInspectorServer::buildPageList): ditto.
    * UIProcess/WebInspectorProxy.cpp:
    (WebKit::isMainInspectorPage): factor out checking for the inspector main resource, to make
    the code more readable.
    (WebKit::decidePolicyForNavigationAction): use SchemeRegistry to figure out whether the
    request is for a local resource instead of KURL::isLocalFile() to allow using schemes
    other than file:// for the inspector resources.
    * UIProcess/gtk/WebInspectorProxyGtk.cpp:
    (WebKit::WebInspectorProxy::inspectorPageURL): use the new internal resource URL; since it's now
    static we no longer need to generate and store the string.
    (WebKit::WebInspectorProxy::inspectorBaseURL): ditto.
    * WebProcess/WebPage/gtk/WebInspectorGtk.cpp:
    (WebKit::WebInspector::localizedStringsURL): use the new internal resource URL.
    * UIProcess/gtk/WebContextGtk.cpp:
    (WebKit::WebContext::platformInitializeWebProcess): register resource as a local scheme.
    
    Tools:
    
    * GtkLauncher/main.c:
    (main): no longer set WEBKIT_INSPECTOR_PATH.
    * MiniBrowser/gtk/main.c:
    (main): ditto.
    * Scripts/old-run-webkit-tests:
    (openDumpTool): ditto.
    * Scripts/run-gtk-tests: ditto.
    * Scripts/webkitpy/port/gtk.py:
    (GtkPort.setup_environ_for_server): ditto.
    
    LayoutTests:
    
    * platform/gtk/TestExpectations: the new inspector UI does not support the current
    inspector testing harness so keep it skipped, a new one will eventually be landed.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155714 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    86b826a5