<!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>[178719] trunk/Source</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/178719">178719</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-20 09:34:15 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove non-Windows cruft from WebKit/win/Plugins
https://bugs.webkit.org/show_bug.cgi?id=140675
Reviewed by Anders Carlsson.
Source/WebKit/win:
* Plugins/PluginDatabase.cpp:
(WebCore::PluginDatabase::defaultPluginDirectories):
(WebCore::PluginDatabase::isPreferredPluginDirectory):
(WebCore::PluginDatabase::getPluginPathsInDirectories):
* Plugins/PluginDebug.cpp:
(WebCore::prettyNameForNPNVariable):
(WebCore::prettyNameForNPPVariable):
(WebCore::prettyNameForDrawingModel): Deleted.
(WebCore::prettyNameForEventModel): Deleted.
* Plugins/PluginDebug.h:
* Plugins/PluginPackage.cpp:
(WebCore::PluginPackage::compareFileVersion):
(WebCore::PluginPackage::determineQuirks): Deleted.
(WebCore::PluginPackage::determineModuleVersionFromDescription): Deleted.
(WebCore::PluginPackage::hash): Deleted.
(WebCore::PluginPackage::equal): Deleted.
* Plugins/PluginView.cpp:
(WebCore::PluginView::setFrameRect):
(WebCore::PluginView::handleEvent):
(WebCore::PluginView::stop):
(WebCore::PluginView::setValue):
(WebCore::PluginView::PluginView):
* Plugins/PluginView.h:
(WebCore::PluginView::platformPluginWidget): Deleted.
(WebCore::PluginView::setPlatformPluginWidget): Deleted.
* Plugins/PluginViewWin.cpp:
(windowHandleForPageClient):
(WebCore::PluginView::hookedBeginPaint):
(WebCore::PluginView::hookedEndPaint):
(WebCore::hook):
(WebCore::registerPluginView):
(WebCore::PluginView::paint):
(WebCore::PluginView::handleMouseEvent):
(WebCore::PluginView::setNPWindowRect):
(WebCore::PluginView::platformStart):
(WebCore::PluginView::snapshot):
* Plugins/npapi.cpp:
(NPN_InvalidateRect):
Source/WTF:
* wtf/FeatureDefines.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginDatabasecpp">trunk/Source/WebKit/win/Plugins/PluginDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginDebugcpp">trunk/Source/WebKit/win/Plugins/PluginDebug.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginDebugh">trunk/Source/WebKit/win/Plugins/PluginDebug.h</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginPackagecpp">trunk/Source/WebKit/win/Plugins/PluginPackage.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewcpp">trunk/Source/WebKit/win/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewh">trunk/Source/WebKit/win/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginViewWincpp">trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsnpapicpp">trunk/Source/WebKit/win/Plugins/npapi.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WTF/ChangeLog 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-01-20 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove non-Windows cruft from WebKit/win/Plugins
+ https://bugs.webkit.org/show_bug.cgi?id=140675
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2015-01-16 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> WeakPtr functions crash when created with default constructor
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -288,22 +288,10 @@
</span><span class="cx">
</span><span class="cx"> /* --------- EFL port (Unix) --------- */
</span><span class="cx"> #if PLATFORM(EFL)
</span><del>-
-#if !defined(ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH)
-#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
-#endif
-
</del><span class="cx"> #endif /* PLATFORM(EFL) */
</span><span class="cx">
</span><span class="cx"> /* --------- Gtk port (Unix, Windows, Mac) --------- */
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-
-#if OS(UNIX)
-#if !defined(ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH)
-#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
-#endif
-#endif
-
</del><span class="cx"> #endif /* PLATFORM(GTK) */
</span><span class="cx">
</span><span class="cx"> /* ENABLE macro defaults for WebCore */
</span><span class="lines">@@ -613,10 +601,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH)
-#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_POINTER_LOCK)
</span><span class="cx"> #define ENABLE_POINTER_LOCK 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2015-01-20 Csaba Osztrogonác <ossy@webkit.org>
+
+ Remove non-Windows cruft from WebKit/win/Plugins
+ https://bugs.webkit.org/show_bug.cgi?id=140675
+
+ Reviewed by Anders Carlsson.
+
+ * Plugins/PluginDatabase.cpp:
+ (WebCore::PluginDatabase::defaultPluginDirectories):
+ (WebCore::PluginDatabase::isPreferredPluginDirectory):
+ (WebCore::PluginDatabase::getPluginPathsInDirectories):
+ * Plugins/PluginDebug.cpp:
+ (WebCore::prettyNameForNPNVariable):
+ (WebCore::prettyNameForNPPVariable):
+ (WebCore::prettyNameForDrawingModel): Deleted.
+ (WebCore::prettyNameForEventModel): Deleted.
+ * Plugins/PluginDebug.h:
+ * Plugins/PluginPackage.cpp:
+ (WebCore::PluginPackage::compareFileVersion):
+ (WebCore::PluginPackage::determineQuirks): Deleted.
+ (WebCore::PluginPackage::determineModuleVersionFromDescription): Deleted.
+ (WebCore::PluginPackage::hash): Deleted.
+ (WebCore::PluginPackage::equal): Deleted.
+ * Plugins/PluginView.cpp:
+ (WebCore::PluginView::setFrameRect):
+ (WebCore::PluginView::handleEvent):
+ (WebCore::PluginView::stop):
+ (WebCore::PluginView::setValue):
+ (WebCore::PluginView::PluginView):
+ * Plugins/PluginView.h:
+ (WebCore::PluginView::platformPluginWidget): Deleted.
+ (WebCore::PluginView::setPlatformPluginWidget): Deleted.
+ * Plugins/PluginViewWin.cpp:
+ (windowHandleForPageClient):
+ (WebCore::PluginView::hookedBeginPaint):
+ (WebCore::PluginView::hookedEndPaint):
+ (WebCore::hook):
+ (WebCore::registerPluginView):
+ (WebCore::PluginView::paint):
+ (WebCore::PluginView::handleMouseEvent):
+ (WebCore::PluginView::setNPWindowRect):
+ (WebCore::PluginView::platformStart):
+ (WebCore::PluginView::snapshot):
+ * Plugins/npapi.cpp:
+ (NPN_InvalidateRect):
+
</ins><span class="cx"> 2015-01-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Periodic failure in DumpRenderTree related to WebActionPropertyBag::Read
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginDatabase.cpp (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginDatabase.cpp 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/Plugins/PluginDatabase.cpp 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> return m_disabledPluginFiles.add(fileName).isNewEntry;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if (!OS(WINDOWS) || !ENABLE(NETSCAPE_PLUGIN_API))
</del><ins>+#if !ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> // For Safari/Win the following three methods are implemented
</span><span class="cx"> // in PluginDatabaseWin.cpp, but if we can use WebCore constructs
</span><span class="cx"> // for the logic we should perhaps move it here under XP_WIN?
</span><span class="lines">@@ -384,53 +384,9 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<String> paths;
</span><span class="cx">
</span><del>- // Add paths specific to each platform
-#if defined(XP_UNIX)
</del><span class="cx"> String userPluginPath = homeDirectoryPath();
</span><del>- userPluginPath.append(String("/.mozilla/plugins"));
- paths.append(userPluginPath);
-
- userPluginPath = homeDirectoryPath();
- userPluginPath.append(String("/.netscape/plugins"));
- paths.append(userPluginPath);
-
- paths.append("/usr/lib/browser/plugins");
- paths.append("/usr/local/lib/mozilla/plugins");
- paths.append("/usr/lib/firefox/plugins");
- paths.append("/usr/lib64/browser-plugins");
- paths.append("/usr/lib/browser-plugins");
- paths.append("/usr/lib/mozilla/plugins");
- paths.append("/usr/local/netscape/plugins");
- paths.append("/opt/mozilla/plugins");
- paths.append("/opt/mozilla/lib/plugins");
- paths.append("/opt/netscape/plugins");
- paths.append("/opt/netscape/communicator/plugins");
- paths.append("/usr/lib/netscape/plugins");
- paths.append("/usr/lib/netscape/plugins-libc5");
- paths.append("/usr/lib/netscape/plugins-libc6");
- paths.append("/usr/lib64/netscape/plugins");
- paths.append("/usr/lib64/mozilla/plugins");
- paths.append("/usr/lib/nsbrowser/plugins");
- paths.append("/usr/lib64/nsbrowser/plugins");
-
- String mozHome(getenv("MOZILLA_HOME"));
- mozHome.append("/plugins");
- paths.append(mozHome);
-
- Vector<String> mozPaths;
- String mozPath(getenv("MOZ_PLUGIN_PATH"));
- mozPath.split(UChar(':'), /* allowEmptyEntries */ false, mozPaths);
- paths.appendVector(mozPaths);
-#elif defined(XP_MACOSX)
- String userPluginPath = homeDirectoryPath();
- userPluginPath.append(String("/Library/Internet Plug-Ins"));
- paths.append(userPluginPath);
- paths.append("/Library/Internet Plug-Ins");
-#elif defined(XP_WIN)
- String userPluginPath = homeDirectoryPath();
</del><span class="cx"> userPluginPath.append(String("\\Application Data\\Mozilla\\plugins"));
</span><span class="cx"> paths.append(userPluginPath);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return paths;
</span><span class="cx"> }
</span><span class="lines">@@ -439,13 +395,7 @@
</span><span class="cx"> {
</span><span class="cx"> String preferredPath = homeDirectoryPath();
</span><span class="cx">
</span><del>-#if defined(XP_UNIX)
- preferredPath.append(String("/.mozilla/plugins"));
-#elif defined(XP_MACOSX)
- preferredPath.append(String("/Library/Internet Plug-Ins"));
-#elif defined(XP_WIN)
</del><span class="cx"> preferredPath.append(String("\\Application Data\\Mozilla\\plugins"));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // TODO: We should normalize the path before doing a comparison.
</span><span class="cx"> return path == preferredPath;
</span><span class="lines">@@ -456,11 +406,7 @@
</span><span class="cx"> // FIXME: This should be a case insensitive set.
</span><span class="cx"> HashSet<String> uniqueFilenames;
</span><span class="cx">
</span><del>-#if defined(XP_UNIX)
- String fileNameFilter("*.so");
-#else
</del><span class="cx"> String fileNameFilter("");
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> Vector<String>::const_iterator dirsEnd = m_pluginDirectories.end();
</span><span class="cx"> for (Vector<String>::const_iterator dIt = m_pluginDirectories.begin(); dIt != dirsEnd; ++dIt) {
</span><span class="lines">@@ -475,7 +421,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !OS(WINDOWS)
</del><ins>+#endif // !ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_METADATA_CACHE)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginDebugcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginDebug.cpp (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginDebug.cpp 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/Plugins/PluginDebug.cpp 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -51,37 +51,11 @@
</span><span class="cx"> "Unknown error code"
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#ifdef XP_MACOSX
-static const char* const drawingModels[] = {
- "NPDrawingModelQuickDraw",
- "NPDrawingModelCoreGraphics",
- "NPDrawingModelOpenGL",
- "NPDrawingModelCoreAnimation"
-};
-
-static const char* const eventModels[] = {
- "NPEventModelCarbon",
- "NPEventModelCocoa"
-};
-#endif //XP_MACOSX
-
</del><span class="cx"> const char* prettyNameForNPError(NPError error)
</span><span class="cx"> {
</span><span class="cx"> return errorStrings[error];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifdef XP_MACOSX
-const char* prettyNameForDrawingModel(NPDrawingModel drawingModel)
-{
- return drawingModels[drawingModel];
-}
-
-const char* prettyNameForEventModel(NPEventModel eventModel)
-{
- return eventModels[eventModel];
-}
-#endif //XP_MACOSX
-
</del><span class="cx"> CString prettyNameForNPNVariable(NPNVariable variable)
</span><span class="cx"> {
</span><span class="cx"> switch (variable) {
</span><span class="lines">@@ -103,25 +77,11 @@
</span><span class="cx"> case NPNVSupportsWindowless: return "NPNVSupportsWindowless";
</span><span class="cx"> case NPNVprivateModeBool: return "NPNVprivateModeBool";
</span><span class="cx">
</span><del>-#ifdef XP_MACOSX
- case NPNVpluginDrawingModel: return "NPNVpluginDrawingModel";
-#ifndef NP_NO_QUICKDRAW
- case NPNVsupportsQuickDrawBool: return "NPNVsupportsQuickDrawBool";
-#endif
- case NPNVsupportsCoreGraphicsBool: return "NPNVsupportsCoreGraphicsBool";
- case NPNVsupportsOpenGLBool: return "NPNVsupportsOpenGLBool";
- case NPNVsupportsCoreAnimationBool: return "NPNVsupportsCoreAnimationBool";
-#ifndef NP_NO_CARBON
- case NPNVsupportsCarbonBool: return "NPNVsupportsCarbonBool";
-#endif
- case NPNVsupportsCocoaBool: return "NPNVsupportsCocoaBool";
-#endif
-
</del><span class="cx"> default: return "Unknown variable";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CString prettyNameForNPPVariable(NPPVariable variable, void* value)
</del><ins>+CString prettyNameForNPPVariable(NPPVariable variable, void*)
</ins><span class="cx"> {
</span><span class="cx"> switch (variable) {
</span><span class="cx"> case NPPVpluginNameString: return "NPPVpluginNameString";
</span><span class="lines">@@ -146,22 +106,6 @@
</span><span class="cx"> case NPPVpluginWantsAllNetworkStreams: return "NPPVpluginWantsAllNetworkStreams";
</span><span class="cx"> case NPPVpluginCancelSrcStream: return "NPPVpluginCancelSrcStream";
</span><span class="cx">
</span><del>-#ifdef XP_MACOSX
- case NPPVpluginDrawingModel: {
- String result("NPPVpluginDrawingModel, ");
- result.append(prettyNameForDrawingModel(NPDrawingModel(uintptr_t(value))));
- return result.latin1();
- }
- case NPPVpluginEventModel: {
- String result("NPPVpluginEventModel, ");
- result.append(prettyNameForEventModel(NPEventModel(uintptr_t(value))));
- return result.latin1();
- }
- case NPPVpluginCoreAnimationLayer: return "NPPVpluginCoreAnimationLayer";
-#else
- UNUSED_PARAM(value);
-#endif
-
</del><span class="cx"> default: return "Unknown variable";
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginDebugh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginDebug.h (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginDebug.h 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/Plugins/PluginDebug.h 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -43,11 +43,6 @@
</span><span class="cx"> CString prettyNameForNPPVariable(NPPVariable variable, void* value);
</span><span class="cx"> CString prettyNameForNPNURLVariable(NPNURLVariable variable);
</span><span class="cx">
</span><del>-#ifdef XP_MACOSX
-const char* prettyNameForDrawingModel(NPDrawingModel drawingModel);
-const char* prettyNameForEventModel(NPEventModel eventModel);
-#endif
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // !LOG_DISABLED
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginPackagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginPackage.cpp (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginPackage.cpp 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/Plugins/PluginPackage.cpp 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -185,94 +185,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(XP_UNIX)
-void PluginPackage::determineQuirks(const String& mimeType)
-{
- if (MIMETypeRegistry::isJavaAppletMIMEType(mimeType)) {
- // Because a single process cannot create multiple VMs, and we cannot reliably unload a
- // Java VM, we cannot unload the Java plugin, or we'll lose reference to our only VM
- m_quirks.add(PluginQuirkDontUnloadPlugin);
-
- // Setting the window region to an empty region causes bad scrolling repaint problems
- // with the Java plug-in.
- m_quirks.add(PluginQuirkDontClipToZeroRectWhenScrolling);
- return;
- }
-
- if (mimeType == "application/x-shockwave-flash") {
- static const PlatformModuleVersion flashTenVersion(0x0a000000);
-
- if (compareFileVersion(flashTenVersion) >= 0) {
- // Flash 10.0 b218 doesn't like having a NULL window handle
- m_quirks.add(PluginQuirkDontSetNullWindowHandleOnDestroy);
- } else {
- // Flash 9 and older requests windowless plugins if we return a mozilla user agent
- m_quirks.add(PluginQuirkWantsMozillaUserAgent);
- }
-
-#if CPU(X86_64)
- // 64-bit Flash freezes if right-click is sent in windowless mode
- m_quirks.add(PluginQuirkIgnoreRightClickInWindowlessMode);
-#endif
-
- m_quirks.add(PluginQuirkRequiresDefaultScreenDepth);
- m_quirks.add(PluginQuirkThrottleInvalidate);
- m_quirks.add(PluginQuirkThrottleWMUserPlusOneMessages);
- m_quirks.add(PluginQuirkFlashURLNotifyBug);
- }
-}
-#endif
-
-#if !OS(WINDOWS)
-void PluginPackage::determineModuleVersionFromDescription()
-{
- // It's a bit lame to detect the plugin version by parsing it
- // from the plugin description string, but it doesn't seem that
- // version information is available in any standardized way at
- // the module level, like in Windows
-
- if (m_description.isEmpty())
- return;
-
- if (m_description.startsWith("Shockwave Flash") && m_description.length() >= 19) {
- // The flash version as a PlatformModuleVersion differs on Unix from Windows
- // since the revision can be larger than a 8 bits, so we allow it 16 here and
- // push the major/minor up 8 bits. Thus on Unix, Flash's version may be
- // 0x0a000000 instead of 0x000a0000.
-
- Vector<String> versionParts;
- m_description.substring(16).split(' ', /*allowEmptyEntries =*/ false, versionParts);
- if (versionParts.isEmpty())
- return;
-
- if (versionParts.size() >= 1) {
- Vector<String> majorMinorParts;
- versionParts[0].split('.', majorMinorParts);
- if (majorMinorParts.size() >= 1) {
- bool converted = false;
- unsigned major = majorMinorParts[0].toUInt(&converted);
- if (converted)
- m_moduleVersion = (major & 0xff) << 24;
- }
- if (majorMinorParts.size() == 2) {
- bool converted = false;
- unsigned minor = majorMinorParts[1].toUInt(&converted);
- if (converted)
- m_moduleVersion |= (minor & 0xff) << 16;
- }
- }
-
- if (versionParts.size() >= 2) {
- String revision = versionParts[1];
- if (revision.length() > 1 && (revision[0] == 'r' || revision[0] == 'b')) {
- revision.remove(0, 1);
- m_moduleVersion |= revision.toInt() & 0xffff;
- }
- }
- }
-}
-#endif
-
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> static void getListFromVariantArgs(JSC::ExecState* exec, const NPVariant* args, unsigned argCount, JSC::Bindings::RootObject* rootObject, JSC::MarkedArgumentBuffer& aList)
</span><span class="cx"> {
</span><span class="lines">@@ -421,40 +333,15 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PACKAGE_SIMPLE_HASH)
-unsigned PluginPackage::hash() const
-{
- struct HashCodes {
- unsigned hash;
- time_t modifiedDate;
- } hashCodes;
-
- hashCodes.hash = m_path.impl()->hash();
- hashCodes.modifiedDate = m_lastModified;
-
- return StringHasher::hashMemory<sizeof(hashCodes)>(&hashCodes);
-}
-
-bool PluginPackage::equal(const PluginPackage& a, const PluginPackage& b)
-{
- return a.m_description == b.m_description;
-}
-#endif
-
</del><span class="cx"> int PluginPackage::compareFileVersion(const PlatformModuleVersion& compareVersion) const
</span><span class="cx"> {
</span><span class="cx"> // return -1, 0, or 1 if plug-in version is less than, equal to, or greater than
</span><span class="cx"> // the passed version
</span><span class="cx">
</span><del>-#if OS(WINDOWS)
</del><span class="cx"> if (m_moduleVersion.mostSig != compareVersion.mostSig)
</span><span class="cx"> return m_moduleVersion.mostSig > compareVersion.mostSig ? 1 : -1;
</span><span class="cx"> if (m_moduleVersion.leastSig != compareVersion.leastSig)
</span><span class="cx"> return m_moduleVersion.leastSig > compareVersion.leastSig ? 1 : -1;
</span><del>-#else
- if (m_moduleVersion != compareVersion)
- return m_moduleVersion > compareVersion ? 1 : -1;
-#endif
</del><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.cpp (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.cpp 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/Plugins/PluginView.cpp 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> #include <wtf/ASCIICType.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> #include "PluginMessageThrottlerWin.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -142,14 +142,8 @@
</span><span class="cx">
</span><span class="cx"> updatePluginWidget();
</span><span class="cx">
</span><del>-#if OS(WINDOWS)
</del><span class="cx"> // On Windows always call plugin to change geometry.
</span><span class="cx"> setNPWindowRect(rect);
</span><del>-#elif defined(XP_UNIX)
- // On Unix, multiple calls to setNPWindow() in windowed mode causes Flash to crash
- if (m_mode == NP_FULL || !m_isWindowed)
- setNPWindowRect(rect);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::frameRectsChanged()
</span><span class="lines">@@ -174,18 +168,8 @@
</span><span class="cx"> handleMouseEvent(static_cast<MouseEvent*>(event));
</span><span class="cx"> else if (event->isKeyboardEvent())
</span><span class="cx"> handleKeyboardEvent(static_cast<KeyboardEvent*>(event));
</span><del>-#if defined(XP_MACOSX)
- else if (event->type() == eventNames().wheelEvent || event->type() == eventNames().mousewheelEvent)
- handleWheelEvent(static_cast<WheelEvent*>(event));
-#endif
</del><span class="cx"> else if (event->type() == eventNames().contextmenuEvent)
</span><span class="cx"> event->setDefaultHandled(); // We don't know if the plug-in has handled mousedown event by displaying a context menu, so we never want WebKit to show a default one.
</span><del>-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
- else if (event->type() == eventNames().focusoutEvent)
- handleFocusOutEvent();
- else if (event->type() == eventNames().focusinEvent)
- handleFocusInEvent();
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::init()
</span><span class="lines">@@ -337,7 +321,6 @@
</span><span class="cx"> JSC::JSLock::DropAllLocks dropAllLocks(JSDOMWindowBase::commonVM());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>-#if defined(XP_WIN) && !PLATFORM(GTK)
</del><span class="cx"> // Unsubclass the window
</span><span class="cx"> if (m_isWindowed) {
</span><span class="cx"> WNDPROC currentWndProc = (WNDPROC)GetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC);
</span><span class="lines">@@ -345,10 +328,8 @@
</span><span class="cx"> if (currentWndProc == PluginViewWndProc)
</span><span class="cx"> SetWindowLongPtr(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)m_pluginWndProc);
</span><span class="cx"> }
</span><del>-#endif // !defined(XP_WIN) || PLATFORM(GTK)
</del><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><del>-#if !defined(XP_MACOSX)
</del><span class="cx"> // Clear the window
</span><span class="cx"> m_npWindow.window = 0;
</span><span class="cx">
</span><span class="lines">@@ -360,13 +341,6 @@
</span><span class="cx"> PluginView::setCurrentPluginView(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifdef XP_UNIX
- delete static_cast<NPSetWindowCallbackStruct*>(m_npWindow.ws_info);
- m_npWindow.ws_info = 0;
-#endif
-
-#endif // !defined(XP_MACOSX)
-
</del><span class="cx"> PluginMainThreadScheduler::scheduler().unregisterPlugin(m_instance);
</span><span class="cx">
</span><span class="cx"> NPSavedData* savedData = 0;
</span><span class="lines">@@ -622,41 +596,6 @@
</span><span class="cx"> case NPPVpluginTransparentBool:
</span><span class="cx"> m_isTransparent = value;
</span><span class="cx"> return NPERR_NO_ERROR;
</span><del>-#if defined(XP_MACOSX)
- case NPPVpluginDrawingModel: {
- // Can only set drawing model inside NPP_New()
- if (this != currentPluginView())
- return NPERR_GENERIC_ERROR;
-
- NPDrawingModel newDrawingModel = NPDrawingModel(uintptr_t(value));
- switch (newDrawingModel) {
- case NPDrawingModelCoreGraphics:
- return NPERR_NO_ERROR;
- case NPDrawingModelCoreAnimation:
- default:
- LOG(Plugins, "Plugin asked for unsupported drawing model: %s",
- prettyNameForDrawingModel(newDrawingModel));
- return NPERR_GENERIC_ERROR;
- }
- }
-
- case NPPVpluginEventModel: {
- // Can only set event model inside NPP_New()
- if (this != currentPluginView())
- return NPERR_GENERIC_ERROR;
-
- NPEventModel newEventModel = NPEventModel(uintptr_t(value));
- switch (newEventModel) {
- case NPEventModelCocoa:
- return NPERR_NO_ERROR;
- default:
- LOG(Plugins, "Plugin asked for unsupported event model: %s",
- prettyNameForEventModel(newEventModel));
- return NPERR_GENERIC_ERROR;
- }
- }
-#endif // defined(XP_MACOSX)
-
</del><span class="cx"> default:
</span><span class="cx"> notImplemented();
</span><span class="cx"> return NPERR_GENERIC_ERROR;
</span><span class="lines">@@ -805,40 +744,17 @@
</span><span class="cx"> , m_paramValues(0)
</span><span class="cx"> , m_mimeType(mimeType)
</span><span class="cx"> , m_instance(0)
</span><del>-#if defined(XP_MACOSX)
- , m_isWindowed(false)
- , m_updatedCocoaTextInputRequested(false)
- , m_keyDownSent(false)
- , m_disregardKeyUpCounter(0)
-#else
</del><span class="cx"> , m_isWindowed(true)
</span><del>-#endif
</del><span class="cx"> , m_isTransparent(false)
</span><span class="cx"> , m_haveInitialized(false)
</span><span class="cx"> , m_isWaitingToStart(false)
</span><del>-#if defined(XP_UNIX)
- , m_needsXEmbed(false)
-#endif
-#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> , m_pluginWndProc(0)
</span><span class="cx"> , m_lastMessage(0)
</span><span class="cx"> , m_isCallingPluginWndProc(false)
</span><span class="cx"> , m_wmPrintHDC(0)
</span><span class="cx"> , m_haveUpdatedPluginWidget(false)
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(EFL)
- , m_window(0)
-#endif
-#if defined(XP_MACOSX)
- , m_contextRef(0)
-#endif
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
- , m_hasPendingGeometryChange(true)
- , m_drawable(0)
- , m_visual(0)
- , m_colormap(0)
- , m_pluginDisplay(0)
-#endif
</del><span class="cx"> , m_loadManually(loadManually)
</span><span class="cx"> , m_manualStream(0)
</span><span class="cx"> , m_isJavaScriptPaused(false)
</span><span class="lines">@@ -858,9 +774,6 @@
</span><span class="cx"> setParameters(paramNames, paramValues);
</span><span class="cx">
</span><span class="cx"> memset(&m_npWindow, 0, sizeof(m_npWindow));
</span><del>-#if defined(XP_MACOSX)
- memset(&m_npCgContext, 0, sizeof(m_npCgContext));
-#endif
</del><span class="cx">
</span><span class="cx"> resize(size);
</span><span class="cx"> }
</span><span class="lines">@@ -1212,33 +1125,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const char* MozillaUserAgent = "Mozilla/5.0 ("
</span><del>-#if defined(XP_MACOSX)
- "Macintosh; U; Intel Mac OS X;"
-#elif defined(XP_WIN)
</del><span class="cx"> "Windows; U; Windows NT 5.1;"
</span><del>-#elif defined(XP_UNIX)
-// The Gtk port uses X11 plugins in Mac.
-#if OS(DARWIN) && PLATFORM(GTK)
- "X11; U; Intel Mac OS X;"
-#else
- "X11; U; Linux i686;"
-#endif
-#endif
</del><span class="cx"> " en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0";
</span><span class="cx">
</span><span class="cx"> static const char* const ChromeUserAgent = "Mozilla/5.0 ("
</span><del>-#if defined(XP_MACOSX)
- "Macintosh; U; Intel Mac OS X;"
-#elif defined(XP_WIN)
</del><span class="cx"> "Windows; U; Windows NT 5.1;"
</span><del>-#elif defined(XP_UNIX)
- // The Gtk port uses X11 plugins in Mac.
-#if OS(DARWIN) && PLATFORM(GTK)
- "X11; U; Intel Mac OS X;"
-#else
- "X11; U; Linux i686;"
-#endif
-#endif
</del><span class="cx"> " AppleWebKit/534.34 (KHTML, like Gecko) Chrome/19.0.1055.1 Safari/534.34";
</span><span class="cx">
</span><span class="cx"> const char* PluginView::userAgent()
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginView.h (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginView.h 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/Plugins/PluginView.h 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -47,21 +47,8 @@
</span><span class="cx"> #include "npruntime_internal.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if OS(WINDOWS) && PLATFORM(GTK)
-typedef struct HWND__* HWND;
-typedef HWND PlatformPluginWidget;
-#else
</del><span class="cx"> typedef PlatformWidget PlatformPluginWidget;
</span><del>-#endif
-#if PLATFORM(GTK)
-typedef struct _GtkSocket GtkSocket;
-#endif
</del><span class="cx">
</span><del>-#if PLATFORM(X11)
-typedef unsigned long Window;
-typedef struct _XDisplay Display;
-#endif
-
</del><span class="cx"> namespace JSC {
</span><span class="cx"> namespace Bindings {
</span><span class="cx"> class Instance;
</span><span class="lines">@@ -76,7 +63,7 @@
</span><span class="cx"> class KeyboardEvent;
</span><span class="cx"> class MouseEvent;
</span><span class="cx"> class URL;
</span><del>-#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> class PluginMessageThrottlerWin;
</span><span class="cx"> #endif
</span><span class="cx"> class PluginPackage;
</span><span class="lines">@@ -215,11 +202,7 @@
</span><span class="cx"> const String& mimeType() const { return m_mimeType; }
</span><span class="cx"> const URL& url() const { return m_url; }
</span><span class="cx">
</span><del>-#if defined(XP_MACOSX) && ENABLE(NETSCAPE_PLUGIN_API)
- bool popUpContextMenu(NPMenu*);
-#endif
-
-#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static LRESULT CALLBACK PluginViewWndProc(HWND, UINT, WPARAM, LPARAM);
</span><span class="cx"> LRESULT wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
</span><span class="cx"> WNDPROC pluginWndProc() const { return m_pluginWndProc; }
</span><span class="lines">@@ -267,7 +250,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void mediaCanStart();
</span><span class="cx">
</span><del>-#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> void paintWindowedPluginIntoContext(GraphicsContext*, const IntRect&);
</span><span class="cx"> static HDC WINAPI hookedBeginPaint(HWND, PAINTSTRUCT*);
</span><span class="cx"> static BOOL WINAPI hookedEndPaint(HWND, const PAINTSTRUCT*);
</span><span class="lines">@@ -302,30 +285,15 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> bool dispatchNPEvent(NPEvent&);
</span><span class="cx"> #endif
</span><del>-#if defined(XP_MACOSX) && ENABLE(NETSCAPE_PLUGIN_API)
- int16_t dispatchNPCocoaEvent(NPCocoaEvent&);
- bool m_updatedCocoaTextInputRequested;
- bool m_keyDownSent;
- uint16_t m_disregardKeyUpCounter;
-#endif
</del><span class="cx">
</span><del>-#if defined(XP_MACOSX)
- void handleWheelEvent(WheelEvent*);
-#endif
</del><span class="cx"> void updatePluginWidget();
</span><span class="cx"> void paintMissingPluginIcon(GraphicsContext*, const IntRect&);
</span><span class="cx">
</span><span class="cx"> void handleKeyboardEvent(KeyboardEvent*);
</span><span class="cx"> void handleMouseEvent(MouseEvent*);
</span><del>-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
- void handleFocusInEvent();
- void handleFocusOutEvent();
-#endif
</del><span class="cx">
</span><del>-#if OS(WINDOWS)
</del><span class="cx"> void paintIntoTransformedContext(HDC);
</span><span class="cx"> PassRefPtr<Image> snapshot();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> int m_mode;
</span><span class="cx"> int m_paramCount;
</span><span class="lines">@@ -352,11 +320,7 @@
</span><span class="cx"> bool m_haveInitialized;
</span><span class="cx"> bool m_isWaitingToStart;
</span><span class="cx">
</span><del>-#if defined(XP_UNIX)
- bool m_needsXEmbed;
-#endif
-
-#if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> OwnPtr<PluginMessageThrottlerWin> m_messageThrottler;
</span><span class="cx"> WNDPROC m_pluginWndProc;
</span><span class="cx"> unsigned m_lastMessage;
</span><span class="lines">@@ -365,48 +329,11 @@
</span><span class="cx"> bool m_haveUpdatedPluginWidget;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if (PLATFORM(GTK) && OS(WINDOWS)) || PLATFORM(EFL)
- // On Mac OSX and Qt/Windows the plugin does not have its own native widget,
- // but is using the containing window as its reference for positioning/painting.
- PlatformPluginWidget m_window;
</del><span class="cx"> public:
</span><del>- PlatformPluginWidget platformPluginWidget() const { return m_window; }
- void setPlatformPluginWidget(PlatformPluginWidget widget) { m_window = widget; }
-#else
-public:
</del><span class="cx"> void setPlatformPluginWidget(PlatformPluginWidget widget) { setPlatformWidget(widget); }
</span><span class="cx"> PlatformPluginWidget platformPluginWidget() const { return platformWidget(); }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><del>-
-#if defined(XP_UNIX) || PLATFORM(GTK)
- void setNPWindowIfNeeded();
-#elif defined(XP_MACOSX)
- NP_CGContext m_npCgContext;
- CGContextRef m_contextRef;
-
- void setNPWindowIfNeeded();
-#endif
-
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
- bool m_hasPendingGeometryChange;
- Pixmap m_drawable;
- Visual* m_visual;
- Colormap m_colormap;
- Display* m_pluginDisplay;
-
- void initXEvent(XEvent* event);
-#endif
-
-#if PLATFORM(GTK)
- static gboolean plugRemovedCallback(GtkSocket*, PluginView*);
- static void plugAddedCallback(GtkSocket*, PluginView*);
- void updateWidgetAllocationAndClip();
- bool m_plugAdded;
- IntRect m_delayedAllocation;
-#endif
-
</del><span class="cx"> IntRect m_clipRect; // The clip rect to apply to a windowed plug-in
</span><span class="cx"> IntRect m_windowRect; // Our window rect.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginViewWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/Plugins/PluginViewWin.cpp 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -78,22 +78,9 @@
</span><span class="cx"> #include <cairo-win32.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
-#include <gdk/gdkwin32.h>
-#include <gtk/gtk.h>
-#endif
-
</del><span class="cx"> static inline HWND windowHandleForPageClient(PlatformPageClient client)
</span><span class="cx"> {
</span><del>-#if PLATFORM(GTK)
- if (!client)
- return 0;
- if (GdkWindow* window = gtk_widget_get_window(client))
- return static_cast<HWND>(GDK_WINDOW_HWND(window));
- return 0;
-#else
</del><span class="cx"> return client;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> using JSC::ExecState;
</span><span class="lines">@@ -124,7 +111,7 @@
</span><span class="cx"> typedef HDC (WINAPI *PtrBeginPaint)(HWND, PAINTSTRUCT*);
</span><span class="cx"> typedef BOOL (WINAPI *PtrEndPaint)(HWND, const PAINTSTRUCT*);
</span><span class="cx">
</span><del>-#if OS(WINDOWS) && CPU(X86_64) && COMPILER(MSVC)
</del><ins>+#if CPU(X86_64)
</ins><span class="cx"> extern "C" HDC __stdcall _HBeginPaint(HWND hWnd, LPPAINTSTRUCT lpPaint);
</span><span class="cx"> extern "C" BOOL __stdcall _HEndPaint(HWND hWnd, const PAINTSTRUCT* lpPaint);
</span><span class="cx"> #endif
</span><span class="lines">@@ -141,17 +128,7 @@
</span><span class="cx"> return pluginView->m_wmPrintHDC;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if COMPILER(GCC)
- HDC result;
- asm ("push %2\n"
- "push %3\n"
- "call *%4\n"
- : "=a" (result)
- : "a" (beginPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (beginPaint)
- : "memory"
- );
- return result;
-#elif defined(_M_IX86)
</del><ins>+#if defined(_M_IX86)
</ins><span class="cx"> // Call through to the original BeginPaint.
</span><span class="cx"> __asm mov eax, beginPaintSysCall
</span><span class="cx"> __asm push lpPaint
</span><span class="lines">@@ -171,16 +148,7 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if COMPILER(GCC)
- BOOL result;
- asm ("push %2\n"
- "push %3\n"
- "call *%4\n"
- : "=a" (result)
- : "a" (endPaintSysCall), "g" (lpPaint), "g" (hWnd), "m" (endPaint)
- );
- return result;
-#elif defined (_M_IX86)
</del><ins>+#if defined (_M_IX86)
</ins><span class="cx"> // Call through to the original EndPaint.
</span><span class="cx"> __asm mov eax, endPaintSysCall
</span><span class="cx"> __asm push lpPaint
</span><span class="lines">@@ -200,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> pProc = reinterpret_cast<BYTE*>(reinterpret_cast<ptrdiff_t>(GetProcAddress(hMod, proc)));
</span><span class="cx">
</span><del>-#if COMPILER(GCC) || defined(_M_IX86)
</del><ins>+#if defined(_M_IX86)
</ins><span class="cx"> if (pProc[0] != 0xB8)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -271,10 +239,6 @@
</span><span class="cx">
</span><span class="cx"> haveRegisteredWindowClass = true;
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
- WebCore::setInstanceHandle((HINSTANCE)(GetModuleHandle(0)));
-#endif
-
</del><span class="cx"> ASSERT(WebCore::instanceHandle());
</span><span class="cx">
</span><span class="cx"> WNDCLASSEX wcex;
</span><span class="lines">@@ -594,21 +558,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // In the GTK and Qt ports we draw in an offscreen buffer and don't want to use the window
- // coordinates.
-#if PLATFORM(GTK)
- IntRect rectInWindow(rect);
- rectInWindow.intersect(frameRect());
-#else
</del><span class="cx"> IntRect rectInWindow = downcast<FrameView>(*parent()).contentsToWindow(frameRect());
</span><del>-#endif
</del><span class="cx"> LocalWindowsContext windowsContext(context, rectInWindow, m_isTransparent);
</span><span class="cx">
</span><span class="cx"> // On Safari/Windows without transparency layers the GraphicsContext returns the HDC
</span><span class="cx"> // of the window and the plugin expects that the passed in DC has window coordinates.
</span><del>- // In the GTK and Qt ports we always draw in an offscreen buffer and therefore need
- // to preserve the translation set in getWindowsContext.
-#if !PLATFORM(GTK)
</del><span class="cx"> if (!context->isInTransparencyLayer()) {
</span><span class="cx"> XFORM transform;
</span><span class="cx"> GetWorldTransform(windowsContext.hdc(), &transform);
</span><span class="lines">@@ -616,7 +570,6 @@
</span><span class="cx"> transform.eDy = 0;
</span><span class="cx"> SetWorldTransform(windowsContext.hdc(), &transform);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> paintIntoTransformedContext(windowsContext.hdc());
</span><span class="cx"> }
</span><span class="lines">@@ -714,13 +667,11 @@
</span><span class="cx"> if (dispatchNPEvent(npEvent))
</span><span class="cx"> event->setDefaultHandled();
</span><span class="cx">
</span><del>-#if !PLATFORM(GTK)
</del><span class="cx"> // Currently, Widget::setCursor is always called after this function in EventHandler.cpp
</span><span class="cx"> // and since we don't want that we set ignoreNextSetCursor to true here to prevent that.
</span><span class="cx"> ignoreNextSetCursor = true;
</span><span class="cx"> if (Page* page = m_parentFrame->page())
</span><span class="cx"> page->chrome().client().setLastSetCursorToCurrentCursor();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::setParent(ScrollView* parent)
</span><span class="lines">@@ -762,13 +713,7 @@
</span><span class="cx"> if (!m_isStarted)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // In the GTK port we draw in an offscreen buffer and don't want to use the window
- // coordinates.
-# if PLATFORM(GTK)
- IntPoint p = rect.location();
-# else
</del><span class="cx"> IntPoint p = downcast<FrameView>(*parent()).contentsToWindow(rect.location());
</span><del>-# endif
</del><span class="cx"> m_npWindow.x = p.x();
</span><span class="cx"> m_npWindow.y = p.y();
</span><span class="cx">
</span><span class="lines">@@ -933,15 +878,11 @@
</span><span class="cx"> HWND window = ::CreateWindowEx(0, kWebPluginViewdowClassName, 0, flags,
</span><span class="cx"> 0, 0, 0, 0, parentWindowHandle, 0, WebCore::instanceHandle(), 0);
</span><span class="cx">
</span><del>-#if OS(WINDOWS) && PLATFORM(GTK)
- m_window = window;
-#else
</del><span class="cx"> setPlatformWidget(window);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Calling SetWindowLongPtrA here makes the window proc ASCII, which is required by at least
</span><span class="cx"> // the Shockwave Director plug-in.
</span><del>-#if OS(WINDOWS) && CPU(X86_64)
</del><ins>+#if CPU(X86_64)
</ins><span class="cx"> ::SetWindowLongPtrA(platformPluginWidget(), GWLP_WNDPROC, (LONG_PTR)DefWindowProcA);
</span><span class="cx"> #else
</span><span class="cx"> ::SetWindowLongPtrA(platformPluginWidget(), GWL_WNDPROC, (LONG)DefWindowProcA);
</span><span class="lines">@@ -974,7 +915,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Image> PluginView::snapshot()
</span><span class="cx"> {
</span><del>-#if !PLATFORM(GTK) && !USE(WINGDI)
</del><ins>+#if !USE(WINGDI)
</ins><span class="cx"> auto hdc = adoptGDIObject(::CreateCompatibleDC(0));
</span><span class="cx">
</span><span class="cx"> if (!m_isWindowed) {
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsnpapicpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/npapi.cpp (178718 => 178719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/npapi.cpp 2015-01-20 17:25:13 UTC (rev 178718)
+++ trunk/Source/WebKit/win/Plugins/npapi.cpp 2015-01-20 17:34:15 UTC (rev 178719)
</span><span class="lines">@@ -122,12 +122,6 @@
</span><span class="cx"> void NPN_InvalidateRect(NPP instance, NPRect* invalidRect)
</span><span class="cx"> {
</span><span class="cx"> PluginView* view = pluginViewForInstance(instance);
</span><del>-#if defined(XP_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 (!view)
- return;
-#endif
</del><span class="cx"> view->invalidateRect(invalidRect);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>