[webkit-reviews] review granted: [Bug 137150] REGRESSION(r173929): Web inspector doesn't work after r173929 when INSPECTOR_SERVER is enabled : [Attachment 238725] Patch

[bugzilla-daemon at webkit.org]

Timothy Hatcher <timothy at apple.com> has granted Carlos Garcia Campos
<cgarcia at igalia.com>'s request for review:
Bug 137150: REGRESSION(r173929): Web inspector doesn't work after r173929 when
INSPECTOR_SERVER is enabled
https://bugs.webkit.org/show_bug.cgi?id=137150

Attachment 238725: Patch
https://bugs.webkit.org/attachment.cgi?id=238725&action=review

------- Additional Comments from Timothy Hatcher <timothy at apple.com>
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(mess
age), 0);
>  #else
> -   
WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProx
y::SendMessageToRemoteFrontend(message), m_page->pageID());
> +    if (m_remoteFrontendConnected)
> +	  
WebProcess::shared().parentProcessConnection()->send(Messages::WebInspectorProx
y::SendMessageToRemoteFrontend(message), m_page->pageID());
> +    else
> +	  
m_frontendConnection->send(Messages::WebInspectorUI::SendMessageToFrontend(mess
age), 0);
>  #endif

This can be simplified as:

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

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

This should also get a ENABLE(INSPECTOR_SERVER) guard.