Title: [179175] trunk/Source/WebKit2
- Revision
- 179175
- Author
- [email protected]
- Date
- 2015-01-27 00:19:53 -0800 (Tue, 27 Jan 2015)
Log Message
Remove remaining PLUGIN_ARCHITECTURE(WIN) code blocks from WebKit2.
https://bugs.webkit.org/show_bug.cgi?id=140912
Patch by Sungmann Cho <[email protected]> on 2015-01-27
Reviewed by Anders Carlsson.
* Shared/Plugins/Netscape/NetscapePluginModule.cpp:
(WebKit::NetscapePluginModule::tryLoad):
* Shared/Plugins/PluginQuirks.h:
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::userAgent):
* WebProcess/Plugins/Netscape/NetscapePlugin.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179174 => 179175)
--- trunk/Source/WebKit2/ChangeLog 2015-01-27 07:40:39 UTC (rev 179174)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-27 08:19:53 UTC (rev 179175)
@@ -1,3 +1,17 @@
+2015-01-27 Sungmann Cho <[email protected]>
+
+ Remove remaining PLUGIN_ARCHITECTURE(WIN) code blocks from WebKit2.
+ https://bugs.webkit.org/show_bug.cgi?id=140912
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+ (WebKit::NetscapePluginModule::tryLoad):
+ * Shared/Plugins/PluginQuirks.h:
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::userAgent):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+
2015-01-26 Simon Fraser <[email protected]>
[iOS WK2] Fix possible crash when -[WKWebView evaluateJavaScript:completionHandler:] was called then the WKWebView is destroyed
Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (179174 => 179175)
--- trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2015-01-27 07:40:39 UTC (rev 179174)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp 2015-01-27 08:19:53 UTC (rev 179175)
@@ -263,9 +263,6 @@
#endif
return result;
-#elif PLUGIN_ARCHITECTURE(WIN)
- if (getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR || initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR)
- return false;
#elif PLUGIN_ARCHITECTURE(X11)
if (initializeFuncPtr(netscapeBrowserFuncs(), &m_pluginFuncs) != NPERR_NO_ERROR)
return false;
Modified: trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h (179174 => 179175)
--- trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h 2015-01-27 07:40:39 UTC (rev 179174)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h 2015-01-27 08:19:53 UTC (rev 179175)
@@ -94,13 +94,6 @@
// Flash crashes when NPP_GetValue is called for NPPVpluginCancelSrcStream in windowed mode.
DoNotCancelSrcStreamInWindowedMode,
-
- // Windows specific quirks:
-#elif PLUGIN_ARCHITECTURE(WIN)
- // Whether NPN_UserAgent should always return a Mozilla user agent.
- // Flash on Windows prior to version 10 only requests windowless plugins
- // if we return a Mozilla user agent.
- WantsMozillaUserAgent,
#endif
// This isn't really a quirk as much as the opposite of a quirk. By default, we don't send wheel events
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (179174 => 179175)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2015-01-27 07:40:39 UTC (rev 179174)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2015-01-27 08:19:53 UTC (rev 179175)
@@ -147,13 +147,6 @@
const char* NetscapePlugin::userAgent()
{
-#if PLUGIN_ARCHITECTURE(WIN)
- static const char* MozillaUserAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0";
-
- if (quirks().contains(PluginQuirks::WantsMozillaUserAgent))
- return MozillaUserAgent;
-#endif
-
if (m_userAgent.isNull()) {
String userAgent = controller()->userAgent();
ASSERT(!userAgent.isNull());
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (179174 => 179175)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2015-01-27 07:40:39 UTC (rev 179174)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h 2015-01-27 08:19:53 UTC (rev 179175)
@@ -266,11 +266,6 @@
void updateNPNPrivateMode();
-#if PLUGIN_ARCHITECTURE(WIN)
- static BOOL WINAPI hookedTrackPopupMenu(HMENU, UINT uFlags, int x, int y, int nReserved, HWND, const RECT*);
- void scheduleWindowedGeometryUpdate();
-#endif
-
#if PLUGIN_ARCHITECTURE(X11)
bool platformPostInitializeWindowed(bool needsXEmbed, uint64_t windowID);
bool platformPostInitializeWindowless();
@@ -385,9 +380,6 @@
RunLoop::Timer<NetscapePlugin> m_nullEventTimer;
NP_CGContext m_npCGContext;
#endif
-#elif PLUGIN_ARCHITECTURE(WIN)
- HWND m_window;
- HWND m_contextMenuOwnerWindow;
#elif PLUGIN_ARCHITECTURE(X11)
Pixmap m_drawable;
Display* m_pluginDisplay;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
