<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179175] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179175">179175</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-27 00:19:53 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove remaining PLUGIN_ARCHITECTURE(WIN) code blocks from WebKit2.
https://bugs.webkit.org/show_bug.cgi?id=140912
Patch by Sungmann Cho <sungmann.cho@navercorp.com> 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapeNetscapePluginModulecpp">trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginQuirksh">trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179174 => 179175)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-27 Sungmann Cho <sungmann.cho@navercorp.com>
+
+ 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:
+
</ins><span class="cx"> 2015-01-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Fix possible crash when -[WKWebView evaluateJavaScript:completionHandler:] was called then the WKWebView is destroyed
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapeNetscapePluginModulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (179174 => 179175)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -263,9 +263,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return result;
</span><del>-#elif PLUGIN_ARCHITECTURE(WIN)
- if (getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR || initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR)
- return false;
</del><span class="cx"> #elif PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> if (initializeFuncPtr(netscapeBrowserFuncs(), &m_pluginFuncs) != NPERR_NO_ERROR)
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginQuirksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h (179174 => 179175)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -94,13 +94,6 @@
</span><span class="cx">
</span><span class="cx"> // Flash crashes when NPP_GetValue is called for NPPVpluginCancelSrcStream in windowed mode.
</span><span class="cx"> DoNotCancelSrcStreamInWindowedMode,
</span><del>-
- // 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,
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // This isn't really a quirk as much as the opposite of a quirk. By default, we don't send wheel events
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (179174 => 179175)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -147,13 +147,6 @@
</span><span class="cx">
</span><span class="cx"> const char* NetscapePlugin::userAgent()
</span><span class="cx"> {
</span><del>-#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
-
</del><span class="cx"> if (m_userAgent.isNull()) {
</span><span class="cx"> String userAgent = controller()->userAgent();
</span><span class="cx"> ASSERT(!userAgent.isNull());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (179174 => 179175)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -266,11 +266,6 @@
</span><span class="cx">
</span><span class="cx"> void updateNPNPrivateMode();
</span><span class="cx">
</span><del>-#if PLUGIN_ARCHITECTURE(WIN)
- static BOOL WINAPI hookedTrackPopupMenu(HMENU, UINT uFlags, int x, int y, int nReserved, HWND, const RECT*);
- void scheduleWindowedGeometryUpdate();
-#endif
-
</del><span class="cx"> #if PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> bool platformPostInitializeWindowed(bool needsXEmbed, uint64_t windowID);
</span><span class="cx"> bool platformPostInitializeWindowless();
</span><span class="lines">@@ -385,9 +380,6 @@
</span><span class="cx"> RunLoop::Timer<NetscapePlugin> m_nullEventTimer;
</span><span class="cx"> NP_CGContext m_npCGContext;
</span><span class="cx"> #endif
</span><del>-#elif PLUGIN_ARCHITECTURE(WIN)
- HWND m_window;
- HWND m_contextMenuOwnerWindow;
</del><span class="cx"> #elif PLUGIN_ARCHITECTURE(X11)
</span><span class="cx"> Pixmap m_drawable;
</span><span class="cx"> Display* m_pluginDisplay;
</span></span></pre>
</div>
</div>
</body>
</html>