Diff
Modified: trunk/Source/WebKit/ChangeLog (221609 => 221610)
--- trunk/Source/WebKit/ChangeLog 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/ChangeLog 2017-09-05 07:39:44 UTC (rev 221610)
@@ -1,5 +1,39 @@
2017-09-05 Carlos Garcia Campos <[email protected]>
+ [GTK] Rename PLUGIN_ARCHITECTURE(X11) as PLUGIN_ARCHITECTURE(UNIX)
+ https://bugs.webkit.org/show_bug.cgi?id=176330
+
+ Reviewed by Michael Catanzaro.
+
+ It's no longer X11 specific since it's also used in Wayland when the X11 target is enabled. It should be renamed
+ as UNIX and make it available when building the wayland target even if the X11 on is disabled.
+
+ * PlatformGTK.cmake:
+ * PlatformWPE.cmake:
+ * PluginProcess/unix/PluginProcessMainUnix.cpp:
+ * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+ (WebKit::NetscapePluginModule::tryLoad):
+ * Shared/Plugins/Netscape/NetscapePluginModule.h:
+ * Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp: Renamed from Source/WebKit/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp.
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ * UIProcess/Plugins/gtk/PluginInfoCache.cpp:
+ (WebKit::PluginInfoCache::getPluginInfo):
+ (WebKit::PluginInfoCache::updatePluginInfo):
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::scanPlugin):
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::NPN_InvalidateRect):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::initialize):
+ (WebKit::NetscapePlugin::destroy):
+ (WebKit::NetscapePlugin::geometryDidChange):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+ * WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp:
+ * WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.h:
+ * config.h:
+
+2017-09-05 Carlos Garcia Campos <[email protected]>
+
[GTK] Wrong use of PLUGIN_ARCHITECTURE(X11) in several places
https://bugs.webkit.org/show_bug.cgi?id=176329
Modified: trunk/Source/WebKit/PlatformGTK.cmake (221609 => 221610)
--- trunk/Source/WebKit/PlatformGTK.cmake 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2017-09-05 07:39:44 UTC (rev 221610)
@@ -72,7 +72,7 @@
Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp
Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
- Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
+ Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp
Shared/Plugins/unix/PluginSearchPath.cpp
@@ -997,7 +997,7 @@
Shared/Plugins/Netscape/NetscapePluginModule.cpp
Shared/Plugins/Netscape/NetscapePluginModuleNone.cpp
- Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
+ Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp
Shared/cairo/ShareableBitmapCairo.cpp
Modified: trunk/Source/WebKit/PlatformWPE.cmake (221609 => 221610)
--- trunk/Source/WebKit/PlatformWPE.cmake 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/PlatformWPE.cmake 2017-09-05 07:39:44 UTC (rev 221610)
@@ -99,7 +99,7 @@
Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp
- Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
+ Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp
Shared/cairo/ShareableBitmapCairo.cpp
Modified: trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp (221609 => 221610)
--- trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp 2017-09-05 07:39:44 UTC (rev 221610)
@@ -70,7 +70,7 @@
return false;
if (!strcmp(argv[1], "-scanPlugin"))
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
exit(NetscapePluginModule::scanPlugin(argv[2]) ? EXIT_SUCCESS : EXIT_FAILURE);
#else
exit(EXIT_FAILURE);
Modified: trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.cpp (221609 => 221610)
--- trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2017-09-05 07:39:44 UTC (rev 221610)
@@ -223,7 +223,7 @@
if (!initializeFuncPtr)
return false;
-#if !PLUGIN_ARCHITECTURE(X11)
+#if !PLUGIN_ARCHITECTURE(UNIX)
NP_GetEntryPointsFuncPtr getEntryPointsFuncPtr = m_module->functionPointer<NP_GetEntryPointsFuncPtr>("NP_GetEntryPoints");
if (!getEntryPointsFuncPtr)
return false;
@@ -263,7 +263,7 @@
#endif
return result;
-#elif PLUGIN_ARCHITECTURE(X11)
+#elif PLUGIN_ARCHITECTURE(UNIX)
if (initializeFuncPtr(netscapeBrowserFuncs(), &m_pluginFuncs) != NPERR_NO_ERROR)
return false;
#endif
Modified: trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.h (221609 => 221610)
--- trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.h 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/Shared/Plugins/Netscape/NetscapePluginModule.h 2017-09-05 07:39:44 UTC (rev 221610)
@@ -65,7 +65,7 @@
Module* module() const { return m_module.get(); }
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
static bool scanPlugin(const String& pluginPath);
static void parseMIMEDescription(const String& mimeDescription, Vector<WebCore::MimeClassInfo>& result);
static String buildMIMEDescription(const Vector<WebCore::MimeClassInfo>&);
@@ -76,7 +76,7 @@
void determineQuirks();
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
bool getPluginInfoForLoadedPlugin(RawPluginMetaData&);
#endif
Copied: trunk/Source/WebKit/Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp (from rev 221609, trunk/Source/WebKit/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp) (0 => 221610)
--- trunk/Source/WebKit/Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp (rev 0)
+++ trunk/Source/WebKit/Shared/Plugins/Netscape/unix/NetscapePluginModuleUnix.cpp 2017-09-05 07:39:44 UTC (rev 221610)
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetscapePluginModule.h"
+
+#if PLUGIN_ARCHITECTURE(UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
+
+#include "NetscapeBrowserFuncs.h"
+#include "PluginProcessProxy.h"
+#include <WebCore/FileSystem.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <wtf/text/StringBuilder.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+class StdoutDevNullRedirector {
+public:
+ StdoutDevNullRedirector();
+ ~StdoutDevNullRedirector();
+
+private:
+ int m_savedStdout;
+};
+
+StdoutDevNullRedirector::StdoutDevNullRedirector()
+ : m_savedStdout(-1)
+{
+ int newStdout = open("/dev/null", O_WRONLY);
+ if (newStdout == -1)
+ return;
+ m_savedStdout = dup(STDOUT_FILENO);
+ dup2(newStdout, STDOUT_FILENO);
+ close(newStdout);
+}
+
+StdoutDevNullRedirector::~StdoutDevNullRedirector()
+{
+ if (m_savedStdout != -1) {
+ dup2(m_savedStdout, STDOUT_FILENO);
+ close(m_savedStdout);
+ }
+}
+
+
+void NetscapePluginModule::parseMIMEDescription(const String& mimeDescription, Vector<MimeClassInfo>& result)
+{
+ ASSERT_ARG(result, result.isEmpty());
+
+ Vector<String> types;
+ mimeDescription.convertToASCIILowercase().split(UChar(';'), false, types);
+ result.reserveInitialCapacity(types.size());
+
+ size_t mimeInfoCount = 0;
+ for (size_t i = 0; i < types.size(); ++i) {
+ Vector<String> mimeTypeParts;
+ types[i].split(UChar(':'), true, mimeTypeParts);
+ if (mimeTypeParts.size() <= 0)
+ continue;
+
+ result.uncheckedAppend(MimeClassInfo());
+ MimeClassInfo& mimeInfo = result[mimeInfoCount++];
+ mimeInfo.type = mimeTypeParts[0];
+
+ if (mimeTypeParts.size() > 1)
+ mimeTypeParts[1].split(UChar(','), false, mimeInfo.extensions);
+
+ if (mimeTypeParts.size() > 2)
+ mimeInfo.desc = mimeTypeParts[2];
+ }
+}
+
+String NetscapePluginModule::buildMIMEDescription(const Vector<MimeClassInfo>& mimeDescription)
+{
+ StringBuilder builder;
+
+ size_t mimeInfoCount = mimeDescription.size();
+ for (size_t i = 0; i < mimeInfoCount; ++i) {
+ const MimeClassInfo& mimeInfo = mimeDescription[i];
+ builder.append(mimeInfo.type);
+ builder.append(':');
+
+ size_t extensionsCount = mimeInfo.extensions.size();
+ for (size_t j = 0; j < extensionsCount; ++j) {
+ builder.append(mimeInfo.extensions[j]);
+ if (j != extensionsCount - 1)
+ builder.append(',');
+ }
+ builder.append(':');
+
+ builder.append(mimeInfo.desc);
+ if (i != mimeInfoCount - 1)
+ builder.append(';');
+ }
+
+ return builder.toString();
+}
+
+bool NetscapePluginModule::getPluginInfoForLoadedPlugin(RawPluginMetaData& metaData)
+{
+ ASSERT(m_isInitialized);
+
+ Module* module = m_module.get();
+ NPP_GetValueProcPtr NPP_GetValue = module->functionPointer<NPP_GetValueProcPtr>("NP_GetValue");
+ if (!NPP_GetValue)
+ return false;
+
+ NP_GetMIMEDescriptionFuncPtr NP_GetMIMEDescription = module->functionPointer<NP_GetMIMEDescriptionFuncPtr>("NP_GetMIMEDescription");
+ if (!NP_GetMIMEDescription)
+ return false;
+
+ char* buffer;
+ NPError error = NPP_GetValue(0, NPPVpluginNameString, &buffer);
+ if (error == NPERR_NO_ERROR)
+ metaData.name = String::fromUTF8(buffer);
+
+ error = NPP_GetValue(0, NPPVpluginDescriptionString, &buffer);
+ if (error == NPERR_NO_ERROR)
+ metaData.description = String::fromUTF8(buffer);
+
+ String mimeDescription = String::fromUTF8(NP_GetMIMEDescription());
+ if (mimeDescription.isNull())
+ return false;
+
+ metaData.mimeDescription = mimeDescription;
+
+ return true;
+}
+
+bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
+{
+ RawPluginMetaData metaData;
+ if (!PluginProcessProxy::scanPlugin(pluginPath, metaData))
+ return false;
+
+ plugin.path = pluginPath;
+ plugin.info.file = pathGetFileName(pluginPath);
+ plugin.info.name = metaData.name;
+ plugin.info.desc = metaData.description;
+ parseMIMEDescription(metaData.mimeDescription, plugin.info.mimes);
+#if PLATFORM(GTK)
+ plugin.requiresGtk2 = metaData.requiresGtk2;
+#endif
+
+ return true;
+}
+
+void NetscapePluginModule::determineQuirks()
+{
+ RawPluginMetaData metaData;
+ if (!getPluginInfoForLoadedPlugin(metaData))
+ return;
+
+ Vector<MimeClassInfo> mimeTypes;
+ parseMIMEDescription(metaData.mimeDescription, mimeTypes);
+
+#if PLATFORM(X11)
+ for (size_t i = 0; i < mimeTypes.size(); ++i) {
+ if (mimeTypes[i].type == "application/x-shockwave-flash") {
+#if CPU(X86_64)
+ m_pluginQuirks.add(PluginQuirks::IgnoreRightClickInWindowlessMode);
+#endif
+ m_pluginQuirks.add(PluginQuirks::DoNotCancelSrcStreamInWindowedMode);
+ break;
+ }
+ }
+#endif // PLATFORM(X11)
+}
+
+static void writeCharacter(char byte)
+{
+ int result;
+ while ((result = fputc(byte, stdout)) == EOF && errno == EINTR) { }
+ ASSERT(result != EOF);
+}
+
+static void writeLine(const String& line)
+{
+ CString utf8String = line.utf8();
+ const char* utf8Data = utf8String.data();
+
+ for (unsigned i = 0; i < utf8String.length(); i++) {
+ char character = utf8Data[i];
+ if (character != '\n')
+ writeCharacter(character);
+ }
+ writeCharacter('\n');
+}
+
+bool NetscapePluginModule::scanPlugin(const String& pluginPath)
+{
+ RawPluginMetaData metaData;
+
+ {
+ // Don't allow the plugin to pollute the standard output.
+ StdoutDevNullRedirector stdOutRedirector;
+
+ // We are loading the plugin here since it does not seem to be a standardized way to
+ // get the needed informations from a UNIX plugin without loading it.
+ RefPtr<NetscapePluginModule> pluginModule = NetscapePluginModule::getOrCreate(pluginPath);
+ if (!pluginModule)
+ return false;
+
+ pluginModule->incrementLoadCount();
+ bool success = pluginModule->getPluginInfoForLoadedPlugin(metaData);
+ pluginModule->decrementLoadCount();
+
+ if (!success)
+ return false;
+ }
+
+ // Write data to standard output for the UI process.
+ writeLine(metaData.name);
+ writeLine(metaData.description);
+ writeLine(metaData.mimeDescription);
+
+ fflush(stdout);
+
+ return true;
+}
+
+} // namespace WebKit
+
+#endif // PLUGIN_ARCHITECTURE(UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h (221609 => 221610)
--- trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/UIProcess/Plugins/PluginProcessProxy.h 2017-09-05 07:39:44 UTC (rev 221610)
@@ -49,7 +49,7 @@
class WebProcessProxy;
struct PluginProcessCreationParameters;
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
struct RawPluginMetaData {
String name;
String description;
@@ -89,7 +89,7 @@
#endif
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
static bool scanPlugin(const String& pluginPath, RawPluginMetaData& result);
#endif
Modified: trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.cpp (221609 => 221610)
--- trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/UIProcess/Plugins/gtk/PluginInfoCache.cpp 2017-09-05 07:39:44 UTC (rev 221610)
@@ -128,7 +128,7 @@
stringValue.reset(g_key_file_get_string(m_cacheFile.get(), pluginGroup.data(), "description", nullptr));
plugin.info.desc = String::fromUTF8(stringValue.get());
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
stringValue.reset(g_key_file_get_string(m_cacheFile.get(), pluginGroup.data(), "mime-description", nullptr));
NetscapePluginModule::parseMIMEDescription(String::fromUTF8(stringValue.get()), plugin.info.mimes);
#endif
@@ -149,7 +149,7 @@
g_key_file_set_string(m_cacheFile.get(), pluginGroup.data(), "name", plugin.info.name.utf8().data());
g_key_file_set_string(m_cacheFile.get(), pluginGroup.data(), "description", plugin.info.desc.utf8().data());
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
String mimeDescription = NetscapePluginModule::buildMIMEDescription(plugin.info.mimes);
g_key_file_set_string(m_cacheFile.get(), pluginGroup.data(), "mime-description", mimeDescription.utf8().data());
#endif
Modified: trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (221609 => 221610)
--- trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2017-09-05 07:39:44 UTC (rev 221610)
@@ -76,17 +76,18 @@
}
#endif
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData& result)
{
-#if PLATFORM(GTK)
String pluginProcessPath = executablePathOfPluginProcess();
#if PLATFORM(GTK)
bool requiresGtk2 = pluginRequiresGtk2(pluginPath);
if (requiresGtk2) {
- if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
+#if PLATFORM(WAYLAND)
+ if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland)
return false;
+#endif
#if ENABLE(PLUGIN_PROCESS_GTK2)
pluginProcessPath.append('2');
if (!fileExists(pluginProcessPath))
@@ -152,11 +153,8 @@
result.requiresGtk2 = requiresGtk2;
#endif
return !result.mimeDescription.isEmpty();
-#else // PLATFORM(GTK)
- return false;
-#endif // PLATFORM(GTK)
}
-#endif // PLUGIN_ARCHITECTURE(X11)
+#endif // PLUGIN_ARCHITECTURE(UNIX)
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (221609 => 221610)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2017-09-05 07:39:44 UTC (rev 221610)
@@ -586,7 +586,7 @@
static void NPN_InvalidateRect(NPP npp, NPRect* invalidRect)
{
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
// NSPluginWrapper, a plugin wrapper binary that allows running 32-bit plugins
// on 64-bit architectures typically used in X11, will sometimes give us a null NPP here.
if (!npp)
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (221609 => 221610)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2017-09-05 07:39:44 UTC (rev 221610)
@@ -42,7 +42,7 @@
#include <utility>
#include <wtf/text/CString.h>
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
#include "NetscapePluginUnix.h"
#endif
@@ -656,11 +656,13 @@
paramNames.append("wmode");
paramValues.append("opaque");
}
- } else if (equalLettersIgnoringASCIICase(parameters.mimeType, "application/x-webkit-test-netscape")) {
+ }
+#endif
+
+ if (equalLettersIgnoringASCIICase(parameters.mimeType, "application/x-webkit-test-netscape")) {
paramNames.append("windowedPlugin");
paramValues.append("false");
}
-#endif
// The strings that these pointers point to are kept alive by paramNames and paramValues.
Vector<const char*> names;
@@ -723,7 +725,7 @@
// Stop all streams.
stopAllStreams();
-#if !PLUGIN_ARCHITECTURE(MAC) && !PLUGIN_ARCHITECTURE(X11)
+#if !PLUGIN_ARCHITECTURE(MAC) && !PLUGIN_ARCHITECTURE(UNIX)
m_npWindow.window = 0;
callSetWindow();
#endif
@@ -795,7 +797,7 @@
m_clipRect = clipRect;
m_pluginToRootViewTransform = pluginToRootViewTransform;
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
IntPoint frameRectLocationInWindowCoordinates = m_pluginToRootViewTransform.mapPoint(IntPoint());
m_frameRectInWindowCoordinates = IntRect(frameRectLocationInWindowCoordinates, m_pluginSize);
#endif
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.h (221609 => 221610)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.h 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/NetscapePlugin.h 2017-09-05 07:39:44 UTC (rev 221610)
@@ -87,7 +87,7 @@
#endif
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
const WebCore::IntRect& frameRectInWindowCoordinates() const { return m_frameRectInWindowCoordinates; }
#endif
const WebCore::IntRect& clipRect() const { return m_clipRect; }
@@ -298,7 +298,7 @@
// A transform that can be used to convert from root view coordinates to plug-in coordinates.
WebCore::AffineTransform m_pluginToRootViewTransform;
-#if PLUGIN_ARCHITECTURE(X11)
+#if PLUGIN_ARCHITECTURE(UNIX)
WebCore::IntRect m_frameRectInWindowCoordinates;
#endif
@@ -386,7 +386,7 @@
RunLoop::Timer<NetscapePlugin> m_nullEventTimer;
NP_CGContext m_npCGContext;
#endif
-#elif PLUGIN_ARCHITECTURE(X11)
+#elif PLUGIN_ARCHITECTURE(UNIX)
std::unique_ptr<NetscapePluginUnix> m_impl;
#endif
};
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp (221609 => 221610)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp 2017-09-05 07:39:44 UTC (rev 221610)
@@ -26,7 +26,7 @@
#include "config.h"
#include "NetscapePluginUnix.h"
-#if PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLUGIN_ARCHITECTURE(UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
#include "NetscapePlugin.h"
#include "WebEvent.h"
@@ -170,4 +170,4 @@
} // namespace WebKit
-#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // PLUGIN_ARCHITECTURE(UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.h (221609 => 221610)
--- trunk/Source/WebKit/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.h 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.h 2017-09-05 07:39:44 UTC (rev 221610)
@@ -26,7 +26,7 @@
#ifndef NetscapePluginUnix_h
#define NetscapePluginUnix_h
-#if PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLUGIN_ARCHITECTURE(UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
#include <WebCore/npruntime_internal.h>
@@ -60,6 +60,6 @@
} // namespace WebKit
-#endif // PLUGIN_ARCHITECTURE(X11) && ENABLE(NETSCAPE_PLUGIN_API)
+#endif // PLUGIN_ARCHITECTURE(UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
#endif // NetscapePluginUnix_h
Modified: trunk/Source/WebKit/config.h (221609 => 221610)
--- trunk/Source/WebKit/config.h 2017-09-05 07:16:51 UTC (rev 221609)
+++ trunk/Source/WebKit/config.h 2017-09-05 07:39:44 UTC (rev 221610)
@@ -46,8 +46,8 @@
#ifndef PLUGIN_ARCHITECTURE_UNSUPPORTED
#if PLATFORM(MAC)
#define PLUGIN_ARCHITECTURE_MAC 1
-#elif PLATFORM(GTK) && PLATFORM(X11) && OS(UNIX) && !OS(MAC_OS_X)
-#define PLUGIN_ARCHITECTURE_X11 1
+#elif PLATFORM(GTK) && OS(UNIX) && !OS(MAC_OS_X)
+#define PLUGIN_ARCHITECTURE_UNIX 1
#else
#define PLUGIN_ARCHITECTURE_UNSUPPORTED 1
#endif
