Bug 194551 – [WPE][GTK] Merge WebProcessPoolWPE.cpp and WebProcessPoolGtk.cpp

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Michael Catanzaro]

Merge WebProcessPoolWPE and WebProcessPoolGtk since the files are almost entirely duplicated.

[Michael Catanzaro]

Created attachment 361820 [details]
Patch

[Carlos Garcia Campos]

Comment on attachment 361820 [details]
Patch

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

> Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:43
> +#include "APIProcessPoolConfiguration.h"
> +#include "Logging.h"
> +#include "WebCookieManagerProxy.h"
> +#include "WebMemoryPressureHandler.h"
> +#include "WebProcessCreationParameters.h"
> +#include "WebProcessMessages.h"
> +#include <JavaScriptCore/RemoteInspectorServer.h>
> +#include <WebCore/GStreamerCommon.h>
> +#include <WebCore/NotImplemented.h>
> +#include <WebCore/SchemeRegistry.h>
> +#include <wtf/FileSystem.h>
> +#include <wtf/glib/GUniquePtr.h>
> +#include <wtf/text/CString.h>

This is a good opportunity to clean up the include headers, I'm sure we can remove some of them.

> Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:101
> +    // This is misnamed. It can only be used to disable complex text.
> +    parameters.shouldAlwaysUseComplexTextCodePath = true;
> +    const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT");
> +    if (forceComplexText && !strcmp(forceComplexText, "0"))

It's only for debugging, so we can just rename it. There isn't any script currently using it (WKTR used it to disable complex text in layout tests). I think we can use it in wpe too (in that case to force complex text).

[Michael Catanzaro]

(In reply to Carlos Garcia Campos from comment #2)
> This is a good opportunity to clean up the include headers, I'm sure we can
> remove some of them.

You're right, half of them are stale. I got it down to:

#include "WebMemoryPressureHandler.h"
#include "WebProcessCreationParameters.h"
#include <JavaScriptCore/RemoteInspectorServer.h>
#include <WebCore/GStreamerCommon.h>
#include <wtf/glib/GUniquePtr.h>

Though we're probably missing some we ought to have, thanks to unified build.

> > Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:101
> > +    // This is misnamed. It can only be used to disable complex text.
> > +    parameters.shouldAlwaysUseComplexTextCodePath = true;
> > +    const char* forceComplexText = getenv("WEBKIT_FORCE_COMPLEX_TEXT");
> > +    if (forceComplexText && !strcmp(forceComplexText, "0"))
> 
> It's only for debugging, so we can just rename it. There isn't any script
> currently using it (WKTR used it to disable complex text in layout tests). I
> think we can use it in wpe too (in that case to force complex text).

I'll do a follow-up.

[Michael Catanzaro]

Committed r241474: <https://trac.webkit.org/changeset/241474>

[Michael Catanzaro]

(In reply to Michael Catanzaro from comment #3)
> I'll do a follow-up.

Bug #194614