<!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>[207595] branches/safari-602-branch</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/207595">207595</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 02:59:15 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205271">r205271</a>. rdar://problem/28476952</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestspluginsquicktimepluginreplacementhtml">branches/safari-602-branch/LayoutTests/plugins/quicktime-plugin-replacement.html</a></li>
<li><a href="#branchessafari602branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksquicktimepluginreplacementhtml">branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html</a></li>
<li><a href="#branchessafari602branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksyoutubepluginreplacementhtml">branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html</a></li>
<li><a href="#branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsquicktimepluginreplacementhtml">branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html</a></li>
<li><a href="#branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsyoutubepluginreplacementhtml">branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html</a></li>
<li><a href="#branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementwithoutmimetypehtml">branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html</a></li>
<li><a href="#branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementhtml">branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html</a></li>
<li><a href="#branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementwithoutmimetypehtml">branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html</a></li>
<li><a href="#branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementhtml">branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulespluginsPluginReplacementh">branches/safari-602-branch/Source/WebCore/Modules/plugins/PluginReplacement.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulespluginsQuickTimePluginReplacementh">branches/safari-602-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulespluginsQuickTimePluginReplacementmm">branches/safari-602-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulespluginsYouTubePluginReplacementcpp">branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreModulespluginsYouTubePluginReplacementh">branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.h</a></li>
<li><a href="#branchessafari602branchSourceWebCorehtmlHTMLPlugInElementcpp">branches/safari-602-branch/Source/WebCore/html/HTMLPlugInElement.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageSettingscpp">branches/safari-602-branch/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageSettingsin">branches/safari-602-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari602branchSourceWebCoretestingInternalSettingscpp">branches/safari-602-branch/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoretestingInternalSettingsh">branches/safari-602-branch/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoretestingInternalSettingsidl">branches/safari-602-branch/Source/WebCore/testing/InternalSettings.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r205271. rdar://problem/28476952
+
+ 2016-08-31 Ricky Mondello <rmondello@apple.com>
+
+ Break pluginReplacementEnabled into youTubeFlashPluginReplacementEnabled and quickTimePluginReplacementEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=161424
+ <rdar://problem/28050847>
+
+ Reviewed by Dean Jackson.
+
+ * plugins/quicktime-plugin-replacement.html: Updated for the internal setting rename.
+ * security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html: Ditto.
+ * security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html: Ditto.
+ * security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html: Ditto.
+ * security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html: Ditto.
+ * security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html: Ditto.
+ * security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html: Ditto.
+ * security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html: Ditto.
+ * security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html: Ditto.
+
</ins><span class="cx"> 2016-10-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r203602.
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestspluginsquicktimepluginreplacementhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/plugins/quicktime-plugin-replacement.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/plugins/quicktime-plugin-replacement.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/plugins/quicktime-plugin-replacement.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> window.testRunner.waitUntilDone();
</span><span class="cx"> window.testRunner.dumpAsText()
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setQuickTimePluginReplacementEnabled(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div = document.getElementById("parent");
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksquicktimepluginreplacementhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-quicktime-plugin-replacement.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setQuickTimePluginReplacementEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function done()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestssecuritycontentSecurityPolicyobjectsrcnoneblocksyoutubepluginreplacementhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/object-src-none-blocks-youtube-plugin-replacement.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setYouTubeFlashPluginReplacementEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function done()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsquicktimepluginreplacementhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-quicktime-plugin-replacement.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setQuickTimePluginReplacementEnabled(true);
</ins><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesallowsyoutubepluginreplacementhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-allows-youtube-plugin-replacement.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setYouTubeFlashPluginReplacementEnabled(true);
</ins><span class="cx">
</span><span class="cx"> // Waiting at least 100ms seems to ensure that YouTube plugin replacement has loaded.
</span><span class="cx"> window.setTimeout(function () {
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementwithoutmimetypehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement-without-mime-type.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setQuickTimePluginReplacementEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function done()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksquicktimepluginreplacementhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-quicktime-plugin-replacement.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setQuickTimePluginReplacementEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function done()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementwithoutmimetypehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement-without-mime-type.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setYouTubeFlashPluginReplacementEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function done()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestssecuritycontentSecurityPolicypluginstypesblocksyoutubepluginreplacementhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/LayoutTests/security/contentSecurityPolicy/plugins-types-blocks-youtube-plugin-replacement.html 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (window.internals)
</span><del>- window.internals.settings.setPluginReplacementEnabled(true);
</del><ins>+ window.internals.settings.setYouTubeFlashPluginReplacementEnabled(true);
</ins><span class="cx">
</span><span class="cx"> function done()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r205271. rdar://problem/28476952
+
+ 2016-08-31 Ricky Mondello <rmondello@apple.com>
+
+ Break pluginReplacementEnabled into youTubeFlashPluginReplacementEnabled and quickTimePluginReplacementEnabled
+ https://bugs.webkit.org/show_bug.cgi?id=161424
+ <rdar://problem/28050847>
+
+ Reviewed by Dean Jackson.
+
+ Replace the single pluginReplacementEnabled setting with individual settings for the YouTube Flash plug-in
+ behavior and the QuickTime plug-in behavior. Unless otherwise noted, this change copies the existing plumbing
+ for pluginReplacementEnabled and renames it twice. The default values for these settings remain the same.
+
+ * Modules/plugins/PluginReplacement.h:
+ (WebCore::ReplacementPlugin::ReplacementPlugin): Augment the constructor.
+ (WebCore::ReplacementPlugin::isEnabledBySettings): Added.
+ * Modules/plugins/QuickTimePluginReplacement.h: Declare a static member function.
+ * Modules/plugins/QuickTimePluginReplacement.mm:
+ (WebCore::QuickTimePluginReplacement::registerPluginReplacement): Properly create a ReplacementPlugin instance.
+ (WebCore::QuickTimePluginReplacement::isEnabledBySettings): Added.
+ * Modules/plugins/YouTubePluginReplacement.cpp:
+ (WebCore::YouTubePluginReplacement::registerPluginReplacement): Properly create a ReplacementPlugin instance.
+ (WebCore::YouTubePluginReplacement::isEnabledBySettings): Added.
+ * Modules/plugins/YouTubePluginReplacement.h: Declare a static member function.
+ * html/HTMLPlugInElement.cpp:
+ (WebCore::HTMLPlugInElement::requestObject): Ask the ReplacementPlugin whether it's enabled, rather than assume
+ all plug-in replacement is guarded by a single run-time setting.
+ * page/Settings.cpp: Declare values for defaults for both settings.
+ * page/Settings.in: Declare two settings.
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup): Handle both settings.
+ (WebCore::InternalSettings::Backup::restoreTo): Ditto.
+ (WebCore::InternalSettings::setQuickTimePluginReplacementEnabled): Added.
+ (WebCore::InternalSettings::setYouTubeFlashPluginReplacementEnabled): Added.
+ (WebCore::InternalSettings::setPluginReplacementEnabled): Deleted.
+ * testing/InternalSettings.h: Duplicate and rename.
+ * testing/InternalSettings.idl: Ditto.
+
+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r205214. rdar://problem/28476952
</span><span class="cx">
</span><span class="cx"> 2016-08-30 Ricky Mondello <rmondello@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulespluginsPluginReplacementh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/plugins/PluginReplacement.h (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/plugins/PluginReplacement.h 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/Modules/plugins/PluginReplacement.h 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> class RenderElement;
</span><span class="cx"> class RenderStyle;
</span><span class="cx"> class RenderTreePosition;
</span><ins>+class Settings;
</ins><span class="cx"> class ShadowRoot;
</span><span class="cx"> class URL;
</span><span class="cx">
</span><span class="lines">@@ -56,14 +57,16 @@
</span><span class="cx"> typedef bool (*PluginReplacementSupportsType)(const String&);
</span><span class="cx"> typedef bool (*PluginReplacementSupportsFileExtension)(const String&);
</span><span class="cx"> typedef bool (*PluginReplacementSupportsURL)(const URL&);
</span><del>-
</del><ins>+typedef bool (*PluginReplacementEnabledForSettings)(const Settings*);
+
</ins><span class="cx"> class ReplacementPlugin {
</span><span class="cx"> public:
</span><del>- ReplacementPlugin(CreatePluginReplacement constructor, PluginReplacementSupportsType supportsType, PluginReplacementSupportsFileExtension supportsFileExtension, PluginReplacementSupportsURL supportsURL)
</del><ins>+ ReplacementPlugin(CreatePluginReplacement constructor, PluginReplacementSupportsType supportsType, PluginReplacementSupportsFileExtension supportsFileExtension, PluginReplacementSupportsURL supportsURL, PluginReplacementEnabledForSettings isEnabledBySettings)
</ins><span class="cx"> : m_constructor(constructor)
</span><span class="cx"> , m_supportsType(supportsType)
</span><span class="cx"> , m_supportsFileExtension(supportsFileExtension)
</span><span class="cx"> , m_supportsURL(supportsURL)
</span><ins>+ , m_isEnabledBySettings(isEnabledBySettings)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,6 +75,7 @@
</span><span class="cx"> , m_supportsType(other.m_supportsType)
</span><span class="cx"> , m_supportsFileExtension(other.m_supportsFileExtension)
</span><span class="cx"> , m_supportsURL(other.m_supportsURL)
</span><ins>+ , m_isEnabledBySettings(other.m_isEnabledBySettings)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,12 +83,14 @@
</span><span class="cx"> bool supportsType(const String& mimeType) const { return m_supportsType(mimeType); }
</span><span class="cx"> bool supportsFileExtension(const String& extension) const { return m_supportsFileExtension(extension); }
</span><span class="cx"> bool supportsURL(const URL& url) const { return m_supportsURL(url); }
</span><del>-
</del><ins>+ bool isEnabledBySettings(const Settings* settings) const { return m_isEnabledBySettings(settings); };
+
</ins><span class="cx"> private:
</span><span class="cx"> CreatePluginReplacement m_constructor;
</span><span class="cx"> PluginReplacementSupportsType m_supportsType;
</span><span class="cx"> PluginReplacementSupportsFileExtension m_supportsFileExtension;
</span><span class="cx"> PluginReplacementSupportsURL m_supportsURL;
</span><ins>+ PluginReplacementEnabledForSettings m_isEnabledBySettings;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef void (*PluginReplacementRegistrar)(const ReplacementPlugin&);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulespluginsQuickTimePluginReplacementh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.h (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.h 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.h 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> static bool supportsMimeType(const String&);
</span><span class="cx"> static bool supportsFileExtension(const String&);
</span><span class="cx"> static bool supportsURL(const URL&) { return true; }
</span><ins>+ static bool isEnabledBySettings(const Settings*);
</ins><span class="cx">
</span><span class="cx"> bool installReplacement(ShadowRoot&) final;
</span><span class="cx"> JSC::JSObject* scriptObject() final { return m_scriptObject; }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulespluginsQuickTimePluginReplacementmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #import "RenderElement.h"
</span><span class="cx"> #import "ScriptController.h"
</span><span class="cx"> #import "ScriptSourceCode.h"
</span><ins>+#import "Settings.h"
</ins><span class="cx"> #import "UserAgentScripts.h"
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="lines">@@ -72,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> void QuickTimePluginReplacement::registerPluginReplacement(PluginReplacementRegistrar registrar)
</span><span class="cx"> {
</span><del>- registrar(ReplacementPlugin(create, supportsMimeType, supportsFileExtension, supportsURL));
</del><ins>+ registrar(ReplacementPlugin(create, supportsMimeType, supportsFileExtension, supportsURL, isEnabledBySettings));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<PluginReplacement> QuickTimePluginReplacement::create(HTMLPlugInElement& plugin, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="lines">@@ -114,6 +115,11 @@
</span><span class="cx"> return extensionSet.get().contains(extension);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool QuickTimePluginReplacement::isEnabledBySettings(const Settings* settings)
+{
+ return settings->quickTimePluginReplacementEnabled();
+}
+
</ins><span class="cx"> QuickTimePluginReplacement::QuickTimePluginReplacement(HTMLPlugInElement& plugin, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="cx"> :PluginReplacement()
</span><span class="cx"> , m_parentElement(&plugin)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulespluginsYouTubePluginReplacementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.cpp 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "HTMLPlugInElement.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "RenderElement.h"
</span><ins>+#include "Settings.h"
</ins><span class="cx"> #include "ShadowRoot.h"
</span><span class="cx"> #include "YouTubeEmbedShadowElement.h"
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -40,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> void YouTubePluginReplacement::registerPluginReplacement(PluginReplacementRegistrar registrar)
</span><span class="cx"> {
</span><del>- registrar(ReplacementPlugin(create, supportsMimeType, supportsFileExtension, supportsURL));
</del><ins>+ registrar(ReplacementPlugin(create, supportsMimeType, supportsFileExtension, supportsURL, isEnabledBySettings));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<PluginReplacement> YouTubePluginReplacement::create(HTMLPlugInElement& plugin, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="lines">@@ -344,5 +345,10 @@
</span><span class="cx"> {
</span><span class="cx"> return isYouTubeURL(url);
</span><span class="cx"> }
</span><ins>+
+bool YouTubePluginReplacement::isEnabledBySettings(const Settings* settings)
+{
+ return settings->youTubeFlashPluginReplacementEnabled();
+}
</ins><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreModulespluginsYouTubePluginReplacementh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.h (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.h 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/Modules/plugins/YouTubePluginReplacement.h 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> static bool supportsMimeType(const String&);
</span><span class="cx"> static bool supportsFileExtension(const String&);
</span><span class="cx"> static bool supportsURL(const URL&);
</span><ins>+ static bool isEnabledBySettings(const Settings*);
</ins><span class="cx">
</span><span class="cx"> bool installReplacement(ShadowRoot&) final;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorehtmlHTMLPlugInElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/html/HTMLPlugInElement.cpp (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/html/HTMLPlugInElement.cpp 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/html/HTMLPlugInElement.cpp 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -403,9 +403,6 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLPlugInElement::requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="cx"> {
</span><del>- if (!document().settings()->pluginReplacementEnabled())
- return false;
-
</del><span class="cx"> if (m_pluginReplacement)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -414,7 +411,7 @@
</span><span class="cx"> completedURL = document().completeURL(url);
</span><span class="cx">
</span><span class="cx"> ReplacementPlugin* replacement = pluginReplacementForType(completedURL, mimeType);
</span><del>- if (!replacement)
</del><ins>+ if (!replacement || !replacement->isEnabledBySettings(document().settings()))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> LOG(Plugins, "%p - Found plug-in replacement for %s.", this, completedURL.string().utf8().data());
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/Settings.cpp (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/Settings.cpp 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/page/Settings.cpp 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -146,7 +146,8 @@
</span><span class="cx"> static const bool defaultImageSubsamplingEnabled = true;
</span><span class="cx"> static const bool defaultScrollingTreeIncludesFrames = true;
</span><span class="cx"> static const bool defaultMediaControlsScaleWithPageZoom = true;
</span><del>-static const bool defaultPluginReplacementEnabled = true;
</del><ins>+static const bool defaultQuickTimePluginReplacementEnabled = true;
+static const bool defaultYouTubeFlashPluginReplacementEnabled = true;
</ins><span class="cx"> #else
</span><span class="cx"> static const bool defaultFixedPositionCreatesStackingContext = false;
</span><span class="cx"> static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
</span><span class="lines">@@ -160,7 +161,8 @@
</span><span class="cx"> static const bool defaultImageSubsamplingEnabled = false;
</span><span class="cx"> static const bool defaultScrollingTreeIncludesFrames = false;
</span><span class="cx"> static const bool defaultMediaControlsScaleWithPageZoom = true;
</span><del>-static const bool defaultPluginReplacementEnabled = false;
</del><ins>+static const bool defaultQuickTimePluginReplacementEnabled = false;
+static const bool defaultYouTubeFlashPluginReplacementEnabled = false;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static const bool defaultAllowsPictureInPictureMediaPlayback = true;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/Settings.in (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/Settings.in 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/page/Settings.in 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -273,4 +273,5 @@
</span><span class="cx">
</span><span class="cx"> springTimingFunctionEnabled initial=false
</span><span class="cx">
</span><del>-pluginReplacementEnabled initial=defaultPluginReplacementEnabled
</del><ins>+quickTimePluginReplacementEnabled initial=defaultQuickTimePluginReplacementEnabled
+youTubeFlashPluginReplacementEnabled initial=defaultYouTubeFlashPluginReplacementEnabled
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/testing/InternalSettings.cpp (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/testing/InternalSettings.cpp 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/testing/InternalSettings.cpp 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -91,7 +91,8 @@
</span><span class="cx"> , m_originalTimeWithoutMouseMovementBeforeHidingControls(settings.timeWithoutMouseMovementBeforeHidingControls())
</span><span class="cx"> , m_useLegacyBackgroundSizeShorthandBehavior(settings.useLegacyBackgroundSizeShorthandBehavior())
</span><span class="cx"> , m_autoscrollForDragAndDropEnabled(settings.autoscrollForDragAndDropEnabled())
</span><del>- , m_pluginReplacementEnabled(settings.pluginReplacementEnabled())
</del><ins>+ , m_quickTimePluginReplacementEnabled(settings.quickTimePluginReplacementEnabled())
+ , m_youTubeFlashPluginReplacementEnabled(settings.youTubeFlashPluginReplacementEnabled())
</ins><span class="cx"> , m_shouldConvertPositionStyleOnCopy(settings.shouldConvertPositionStyleOnCopy())
</span><span class="cx"> , m_fontFallbackPrefersPictographs(settings.fontFallbackPrefersPictographs())
</span><span class="cx"> , m_webFontsAlwaysFallBack(settings.webFontsAlwaysFallBack())
</span><span class="lines">@@ -183,7 +184,8 @@
</span><span class="cx"> settings.setAllowsInlineMediaPlayback(m_allowsInlineMediaPlayback);
</span><span class="cx"> settings.setAllowsInlineMediaPlaybackAfterFullscreen(m_allowsInlineMediaPlaybackAfterFullscreen);
</span><span class="cx"> settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(m_inlineMediaPlaybackRequiresPlaysInlineAttribute);
</span><del>- settings.setPluginReplacementEnabled(m_pluginReplacementEnabled);
</del><ins>+ settings.setQuickTimePluginReplacementEnabled(m_quickTimePluginReplacementEnabled);
+ settings.setYouTubeFlashPluginReplacementEnabled(m_youTubeFlashPluginReplacementEnabled);
</ins><span class="cx"> #if ENABLE(INDEXED_DATABASE_IN_WORKERS)
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
</span><span class="cx"> #endif
</span><span class="lines">@@ -548,12 +550,18 @@
</span><span class="cx"> settings()->setWebFontsAlwaysFallBack(enable);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InternalSettings::setPluginReplacementEnabled(bool enabled, ExceptionCode& ec)
</del><ins>+void InternalSettings::setQuickTimePluginReplacementEnabled(bool enabled, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> InternalSettingsGuardForSettings();
</span><del>- settings()->setPluginReplacementEnabled(enabled);
</del><ins>+ settings()->setQuickTimePluginReplacementEnabled(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void InternalSettings::setYouTubeFlashPluginReplacementEnabled(bool enabled, ExceptionCode& ec)
+{
+ InternalSettingsGuardForSettings();
+ settings()->setYouTubeFlashPluginReplacementEnabled(enabled);
+}
+
</ins><span class="cx"> void InternalSettings::setBackgroundShouldExtendBeyondPage(bool hasExtendedBackground, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> InternalSettingsGuardForSettings();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/testing/InternalSettings.h (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/testing/InternalSettings.h 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/testing/InternalSettings.h 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -91,7 +91,8 @@
</span><span class="cx"> bool m_originalTimeWithoutMouseMovementBeforeHidingControls;
</span><span class="cx"> bool m_useLegacyBackgroundSizeShorthandBehavior;
</span><span class="cx"> bool m_autoscrollForDragAndDropEnabled;
</span><del>- bool m_pluginReplacementEnabled;
</del><ins>+ bool m_quickTimePluginReplacementEnabled;
+ bool m_youTubeFlashPluginReplacementEnabled;
</ins><span class="cx"> bool m_shouldConvertPositionStyleOnCopy;
</span><span class="cx"> bool m_fontFallbackPrefersPictographs;
</span><span class="cx"> bool m_webFontsAlwaysFallBack;
</span><span class="lines">@@ -156,7 +157,8 @@
</span><span class="cx"> void setAutoscrollForDragAndDropEnabled(bool, ExceptionCode&);
</span><span class="cx"> void setFontFallbackPrefersPictographs(bool, ExceptionCode&);
</span><span class="cx"> void setWebFontsAlwaysFallBack(bool, ExceptionCode&);
</span><del>- void setPluginReplacementEnabled(bool, ExceptionCode&);
</del><ins>+ void setQuickTimePluginReplacementEnabled(bool, ExceptionCode&);
+ void setYouTubeFlashPluginReplacementEnabled(bool, ExceptionCode&);
</ins><span class="cx"> void setBackgroundShouldExtendBeyondPage(bool, ExceptionCode&);
</span><span class="cx"> void setShouldConvertPositionStyleOnCopy(bool, ExceptionCode&);
</span><span class="cx"> void setScrollingTreeIncludesFrames(bool, ExceptionCode&);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoretestingInternalSettingsidl"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/testing/InternalSettings.idl (207594 => 207595)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/testing/InternalSettings.idl 2016-10-20 09:59:07 UTC (rev 207594)
+++ branches/safari-602-branch/Source/WebCore/testing/InternalSettings.idl 2016-10-20 09:59:15 UTC (rev 207595)
</span><span class="lines">@@ -57,7 +57,8 @@
</span><span class="cx">
</span><span class="cx"> [RaisesException] void setForcePendingWebGLPolicy(boolean forced);
</span><span class="cx">
</span><del>- [RaisesException] void setPluginReplacementEnabled(boolean enabled);
</del><ins>+ [RaisesException] void setQuickTimePluginReplacementEnabled(boolean enabled);
+ [RaisesException] void setYouTubeFlashPluginReplacementEnabled(boolean enabled);
</ins><span class="cx">
</span><span class="cx"> // Editing, forms
</span><span class="cx"> [RaisesException] void setEditingBehavior(DOMString behavior);
</span></span></pre>
</div>
</div>
</body>
</html>