[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [124259] trunk/Source/WebKit2
From: andersca () apple ! com
Date: 2012-07-31 22:44:53
Message-ID: 20120731224455.458AB4A1645 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[124259] 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/124259">124259</a></dd> \
<dt>Author</dt> <dd>andersca@apple.com</dd> <dt>Date</dt> <dd>2012-07-31 15:44:53 \
-0700 (Tue, 31 Jul 2012)</dd> </dl>
<h3>Log Message</h3>
<pre>Prefer the Oracle Java plug-in over the Apple Java plug-in
https://bugs.webkit.org/show_bug.cgi?id=92780
Reviewed by Oliver Hunt.
* UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
(WebKit::findPluginWithBundleIdentifier):
Add a new helper for finding a plug-in with the given bundle identifier.
(WebKit::checkForPreferredPlugin):
Helper function for making sure that an old plug-in is never loaded if a new plug-in \
is found, and that the old plug-in is removed from the list of loaded plug-ins if the \
new plug-in is found.
(WebKit::PluginInfoStore::shouldUsePlugin):
Prefer the Oracle Java plug-in over the Apple Java plug-in.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsmacPluginInfoStoreMacmm">trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (124258 => \
124259)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2012-07-31 22:36:20 UTC (rev \
124258)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-31 22:44:53 UTC (rev 124259)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2012-07-31 Anders Carlsson <andersca@apple.com>
+
+ Prefer the Oracle Java plug-in over the Apple Java plug-in
+ https://bugs.webkit.org/show_bug.cgi?id=92780
+
+ Reviewed by Oliver Hunt.
+
+ * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+ (WebKit::findPluginWithBundleIdentifier):
+ Add a new helper for finding a plug-in with the given bundle identifier.
+
+ (WebKit::checkForPreferredPlugin):
+ Helper function for making sure that an old plug-in is never loaded if a new \
plug-in is found, and that the old plug-in + is removed from the list of \
loaded plug-ins if the new plug-in is found. +
+ (WebKit::PluginInfoStore::shouldUsePlugin):
+ Prefer the Oracle Java plug-in over the Apple Java plug-in.
+
</ins><span class="cx"> 2012-07-31 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Use an actual WebProcessProxy when decoding \
messages </span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsmacPluginInfoStoreMacmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm (124258 => \
124259)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-07-31 22:36:20 \
UTC (rev 124258)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm 2012-07-31 \
22:44:53 UTC (rev 124259) </span><span class="lines">@@ -82,6 +82,33 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static size_t findPluginWithBundleIdentifier(const \
Vector<PluginModuleInfo>& plugins, const String& bundleIdentifier) +{
+ for (size_t i = 0; i < plugins.size(); ++i) {
+ if (plugins[i].bundleIdentifier == bundleIdentifier)
+ return i;
+ }
+
+ return notFound;
+}
+
+// Returns true if the given plug-in should be loaded, false otherwise.
+static bool checkForPreferredPlugin(Vector<PluginModuleInfo>& \
alreadyLoadedPlugins, const PluginModuleInfo& plugin, const String& \
oldPluginBundleIdentifier, const String& newPluginBundleIdentifier) +{
+ if (plugin.bundleIdentifier == oldPluginBundleIdentifier) {
+ // If we've already found the new plug-in, we don't want to load the old \
plug-in. + if (findPluginWithBundleIdentifier(alreadyLoadedPlugins, \
newPluginBundleIdentifier) != notFound) + return false;
+ } else if (plugin.bundleIdentifier == newPluginBundleIdentifier) {
+ // If we've already found the old plug-in, remove it from the list of loaded \
plug-ins. + size_t oldPluginIndex = \
findPluginWithBundleIdentifier(alreadyLoadedPlugins, oldPluginBundleIdentifier); + \
if (oldPluginIndex != notFound) + \
alreadyLoadedPlugins.remove(oldPluginIndex); + }
+
+ return true;
+}
+
</ins><span class="cx"> bool \
PluginInfoStore::shouldUsePlugin(Vector<PluginModuleInfo>& \
alreadyLoadedPlugins, const PluginModuleInfo& plugin) </span><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < alreadyLoadedPlugins.size(); \
++i) { </span><span class="lines">@@ -92,6 +119,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Prefer the Oracle Java plug-in over the Apple java plug-in.
+ if (!checkForPreferredPlugin(alreadyLoadedPlugins, plugin, \
"com.apple.java.JavaAppletPlugin", \
"com.oracle.java.JavaAppletPlugin")) + return false;
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic