[GTK] Wrong use of PLUGIN_ARCHITECTURE(X11) in several places
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Sep 2017 07:16:51 +0000 (07:16 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Sep 2017 07:16:51 +0000 (07:16 +0000)
commit3771a0bcf96674f39f9ea7178fff4786af86929b
tree960c7dfd172e7b45a75c7255274515d0b8c4c5dc
parenta6def4b614e1d97187f42ccb56391f465b48ea72
[GTK] Wrong use of PLUGIN_ARCHITECTURE(X11) in several places
https://bugs.webkit.org/show_bug.cgi?id=176329

Reviewed by Michael Catanzaro.

.:

Only define MOZ_X11 if X11 target is enabled and always define XP_UNIX if NETSCAPE_PLUGIN_API is enabled.

* Source/cmake/OptionsGTK.cmake:

Source/WebKit:

We are using PLUGIN_ARCHITECTURE(X11) in several places where we should actually be using PLATFORM(X11). This is
confusing because PLUGIN_ARCHITECTURE(X11) is no longer specific to X11, it will be renamed as UNIX in a follow
up patch. Because of this we only support plugins in Wayland when building with both X11 and Wayland targets
enabled.

* PluginProcess/PluginControllerProxy.cpp:
* PluginProcess/PluginControllerProxy.h:
* PluginProcess/unix/PluginProcessMainUnix.cpp:
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::NetscapePluginModule::determineQuirks):
* Shared/Plugins/PluginQuirks.h:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/gtk/WebPageProxyGtk.cpp:
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::NPN_GetValue):
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::shouldLoadSrcURL):
(WebKit::NetscapePlugin::initialize):
* WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp:
(WebKit::NetscapePlugin::platformHandleMouseEvent):
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
* WebProcess/Plugins/Netscape/x11/NetscapePluginX11.h:
* WebProcess/Plugins/PluginController.h:
* WebProcess/Plugins/PluginProxy.cpp:
* WebProcess/Plugins/PluginProxy.h:
* WebProcess/Plugins/PluginProxy.messages.in:
* WebProcess/Plugins/PluginView.cpp:
* WebProcess/Plugins/PluginView.h:

Tools:

* CMakeLists.txt: Build TestNetscapePlugIn when NETSCAPE_PLUGIN_API is enabled and only link to X11 libraries
when building the X11 target.
* DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
* DumpRenderTree/TestNetscapePlugIn/Tests/unix/CallInvalidateRectWithNullNPPArgument.cpp: Renamed from Tools/DumpRenderTree/TestNetscapePlugIn/Tests/x11/CallInvalidateRectWithNullNPPArgument.cpp.
* DumpRenderTree/TestNetscapePlugIn/main.cpp:
(NP_Initialize):
(NPP_HandleEvent):
(NPP_GetValue):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@221609 268f45cc-cd09-0410-ab3c-d52691b4dbfc
27 files changed:
ChangeLog
Source/WebKit/ChangeLog
Source/WebKit/PluginProcess/PluginControllerProxy.cpp
Source/WebKit/PluginProcess/PluginControllerProxy.h
Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp
Source/WebKit/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
Source/WebKit/Shared/Plugins/PluginQuirks.h
Source/WebKit/UIProcess/WebPageProxy.h
Source/WebKit/UIProcess/WebPageProxy.messages.in
Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp
Source/WebKit/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
Source/WebKit/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
Source/WebKit/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.h
Source/WebKit/WebProcess/Plugins/PluginController.h
Source/WebKit/WebProcess/Plugins/PluginProxy.cpp
Source/WebKit/WebProcess/Plugins/PluginProxy.h
Source/WebKit/WebProcess/Plugins/PluginProxy.messages.in
Source/WebKit/WebProcess/Plugins/PluginView.cpp
Source/WebKit/WebProcess/Plugins/PluginView.h
Source/cmake/OptionsGTK.cmake
Tools/CMakeLists.txt
Tools/ChangeLog
Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
Tools/DumpRenderTree/TestNetscapePlugIn/Tests/unix/CallInvalidateRectWithNullNPPArgument.cpp [moved from Tools/DumpRenderTree/TestNetscapePlugIn/Tests/x11/CallInvalidateRectWithNullNPPArgument.cpp with 100% similarity]
Tools/DumpRenderTree/TestNetscapePlugIn/main.cpp