Title: [226337] trunk/Source/WebKit
- Revision
- 226337
- Author
- [email protected]
- Date
- 2018-01-02 14:45:39 -0800 (Tue, 02 Jan 2018)
Log Message
REGRESSION(r226327): [GTK] Plugin process is broken
https://bugs.webkit.org/show_bug.cgi?id=181187
Unreviewed, fix PluginProcessMainUnix after r226327.
* PluginProcess/unix/PluginProcessMainUnix.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (226336 => 226337)
--- trunk/Source/WebKit/ChangeLog 2018-01-02 22:42:16 UTC (rev 226336)
+++ trunk/Source/WebKit/ChangeLog 2018-01-02 22:45:39 UTC (rev 226337)
@@ -1,3 +1,12 @@
+2018-01-02 Michael Catanzaro <[email protected]>
+
+ REGRESSION(r226327): [GTK] Plugin process is broken
+ https://bugs.webkit.org/show_bug.cgi?id=181187
+
+ Unreviewed, fix PluginProcessMainUnix after r226327.
+
+ * PluginProcess/unix/PluginProcessMainUnix.cpp:
+
2018-01-02 Tim Horton <[email protected]>
Fix the build on platforms where UICurrentUserInterfaceIdiomIsPad is defined to false
Modified: trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp (226336 => 226337)
--- trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp 2018-01-02 22:42:16 UTC (rev 226336)
+++ trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp 2018-01-02 22:45:39 UTC (rev 226337)
@@ -65,13 +65,13 @@
bool parseCommandLine(int argc, char** argv) override
{
- ASSERT(argc == 3);
- if (argc != 3)
+ ASSERT(argc == 4);
+ if (argc != 4)
return false;
- if (!strcmp(argv[1], "-scanPlugin"))
+ if (!strcmp(argv[2], "-scanPlugin"))
#if PLUGIN_ARCHITECTURE(UNIX)
- exit(NetscapePluginModule::scanPlugin(argv[2]) ? EXIT_SUCCESS : EXIT_FAILURE);
+ exit(NetscapePluginModule::scanPlugin(argv[3]) ? EXIT_SUCCESS : EXIT_FAILURE);
#else
exit(EXIT_FAILURE);
#endif
@@ -83,7 +83,7 @@
}
#endif
- m_parameters.extraInitializationData.add("plugin-path", argv[2]);
+ m_parameters.extraInitializationData.add("plugin-path", argv[3]);
return ChildProcessMainBase::parseCommandLine(argc, argv);
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
