Bug 137150 – REGRESSION(r173929): Web inspector doesn't work after r173929 when INSPECTOR_SERVER is enabled

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Carlos Garcia Campos]

The inspector doesn't show anything because it's sending messages to a remote frontend that it's not running.

[Carlos Garcia Campos]

Created attachment 238725 [details]
Patch

[Timothy Hatcher]

Comment on attachment 238725 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=238725&action=review

> Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:67
> +    , m_remoteFrontendConnected(false)

This should get a ENABLE(INSPECTOR_SERVER) guard.

> Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:224
>  #if !ENABLE(INSPECTOR_SERVER)
>      m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);
>  #else
> -    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
> +    if (m_remoteFrontendConnected)
> +        WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
> +    else
> +        m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);
>  #endif

This can be simplified as:

#if ENABLE(INSPECTOR_SERVER)
    if (m_remoteFrontendConnected)
        WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
    else
#endif
        m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);

> Source/WebKit2/WebProcess/WebPage/WebInspector.h:107
> +    bool m_remoteFrontendConnected;

This should also get a ENABLE(INSPECTOR_SERVER) guard.

[Carlos Garcia Campos]

(In reply to comment #2)
> (From update of attachment 238725 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=238725&action=review
> 
> > Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:67
> > +    , m_remoteFrontendConnected(false)
> 
> This should get a ENABLE(INSPECTOR_SERVER) guard.

Right, it's only used and needed inside ENABLE(INSPECTOR_SERVER) blocks.

> > Source/WebKit2/WebProcess/WebPage/WebInspector.cpp:224
> >  #if !ENABLE(INSPECTOR_SERVER)
> >      m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);
> >  #else
> > -    WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
> > +    if (m_remoteFrontendConnected)
> > +        WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
> > +    else
> > +        m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);
> >  #endif
> 
> This can be simplified as:
> 
> #if ENABLE(INSPECTOR_SERVER)
>     if (m_remoteFrontendConnected)
>         WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProxy::SendMessageToRemoteFrontend(message), m_page->pageID());
>     else
> #endif
>         m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(message), 0);

Ok.

> > Source/WebKit2/WebProcess/WebPage/WebInspector.h:107
> > +    bool m_remoteFrontendConnected;
> 
> This should also get a ENABLE(INSPECTOR_SERVER) guard.

[Carlos Garcia Campos]

Committed r174013: <http://trac.webkit.org/changeset/174013>