<!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>[211143] branches/safari-603-branch/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/211143">211143</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-25 08:45:58 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211052">r211052</a>. rdar://problem/29857388</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorepagePagecpp">branches/safari-603-branch/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepagePageh">branches/safari-603-branch/Source/WebCore/page/Page.h</a></li>
<li><a href="#branchessafari603branchSourceWebCorepluginsPluginInfoProvidercpp">branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepluginsPluginInfoProviderh">branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2ChangeLog">branches/safari-603-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessPluginsWebPluginInfoProviderh">branches/safari-603-branch/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h</a></li>
<li><a href="#branchessafari603branchSourceWebKit2WebProcessWebProcesscpp">branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211142 => 211143)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-25 14:34:27 UTC (rev 211142)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-25 16:45:58 UTC (rev 211143)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2017-01-25 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211052. rdar://problem/29857388
+
+ 2017-01-20 Anders Carlsson <andersca@apple.com>
+
+ When Safari reloads pages with Flash objects after Flash is installed, placeholders don't paint (but do work!)
+ https://bugs.webkit.org/show_bug.cgi?id=167268
+ rdar://problem/29857388
+
+ Reviewed by Sam Weinig.
+
+ * page/Page.cpp:
+ (WebCore::Page::refreshPlugins):
+ Call PluginInfoProvider::refresh instead.
+
+ (WebCore::Page::clearPluginData):
+ Add new setter.
+
+ * page/Page.h:
+ Declare new members.
+
+ * plugins/PluginInfoProvider.cpp:
+ (WebCore::PluginInfoProvider::refresh):
+ Put the logic to clear plug-in data and reload frames here.
+
+ * plugins/PluginInfoProvider.h:
+ Add new members.
+
</ins><span class="cx"> 2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211067. rdar://problem/29319962
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/Page.cpp (211142 => 211143)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/Page.cpp 2017-01-25 14:34:27 UTC (rev 211142)
+++ branches/safari-603-branch/Source/WebCore/page/Page.cpp 2017-01-25 16:45:58 UTC (rev 211143)
</span><span class="lines">@@ -538,24 +538,11 @@
</span><span class="cx">
</span><span class="cx"> Vector<Ref<Frame>> framesNeedingReload;
</span><span class="cx">
</span><del>- for (auto& page : *allPages) {
</del><ins>+ for (auto& page : *allPages)
</ins><span class="cx"> pluginInfoProviders.add(&page->pluginInfoProvider());
</span><del>- page->m_pluginData = nullptr;
</del><span class="cx">
</span><del>- if (!reload)
- continue;
-
- for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (frame->loader().subframeLoader().containsPlugins())
- framesNeedingReload.append(*frame);
- }
- }
-
</del><span class="cx"> for (auto& pluginInfoProvider : pluginInfoProviders)
</span><del>- pluginInfoProvider->refreshPlugins();
-
- for (auto& frame : framesNeedingReload)
- frame->loader().reload();
</del><ins>+ pluginInfoProvider->refresh(reload);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PluginData& Page::pluginData()
</span><span class="lines">@@ -565,6 +552,11 @@
</span><span class="cx"> return *m_pluginData;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Page::clearPluginData()
+{
+ m_pluginData = nullptr;
+}
+
</ins><span class="cx"> bool Page::showAllPlugins() const
</span><span class="cx"> {
</span><span class="cx"> if (m_showAllPlugins)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/Page.h (211142 => 211143)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/Page.h 2017-01-25 14:34:27 UTC (rev 211142)
+++ branches/safari-603-branch/Source/WebCore/page/Page.h 2017-01-25 16:45:58 UTC (rev 211143)
</span><span class="lines">@@ -166,6 +166,7 @@
</span><span class="cx">
</span><span class="cx"> static void refreshPlugins(bool reload);
</span><span class="cx"> WEBCORE_EXPORT PluginData& pluginData();
</span><ins>+ void clearPluginData();
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setCanStartMedia(bool);
</span><span class="cx"> bool canStartMedia() const { return m_canStartMedia; }
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepluginsPluginInfoProvidercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.cpp (211142 => 211143)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.cpp 2017-01-25 14:34:27 UTC (rev 211142)
+++ branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.cpp 2017-01-25 16:45:58 UTC (rev 211143)
</span><span class="lines">@@ -26,6 +26,10 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PluginInfoProvider.h"
</span><span class="cx">
</span><ins>+#include "MainFrame.h"
+#include "Page.h"
+#include "SubframeLoader.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PluginInfoProvider::~PluginInfoProvider()
</span><span class="lines">@@ -33,6 +37,26 @@
</span><span class="cx"> ASSERT(m_pages.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginInfoProvider::refresh(bool reloadPages)
+{
+ Vector<Ref<Frame>> framesNeedingReload;
+
+ for (auto& page : m_pages) {
+ page->clearPluginData();
+
+ if (!reloadPages)
+ continue;
+
+ for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
+ if (frame->loader().subframeLoader().containsPlugins())
+ framesNeedingReload.append(*frame);
+ }
+ }
+
+ for (auto& frame : framesNeedingReload)
+ frame->loader().reload();
+}
+
</ins><span class="cx"> void PluginInfoProvider::addPage(Page& page)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_pages.contains(&page));
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepluginsPluginInfoProviderh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.h (211142 => 211143)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.h 2017-01-25 14:34:27 UTC (rev 211142)
+++ branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.h 2017-01-25 16:45:58 UTC (rev 211143)
</span><span class="lines">@@ -34,16 +34,17 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~PluginInfoProvider();
</span><span class="cx">
</span><del>- void refreshPlugins(bool reloadPages);
</del><ins>+ void refresh(bool reloadPages);
</ins><span class="cx">
</span><span class="cx"> void addPage(Page&);
</span><span class="cx"> void removePage(Page&);
</span><span class="cx">
</span><del>- virtual void refreshPlugins() = 0;
</del><span class="cx"> virtual void getPluginInfo(Page&, Vector<PluginInfo>&) = 0;
</span><span class="cx"> virtual void getWebVisiblePluginInfo(Page&, Vector<PluginInfo>&) = 0;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ virtual void refreshPlugins() = 0;
+
</ins><span class="cx"> HashSet<Page*> m_pages;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211142 => 211143)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-25 14:34:27 UTC (rev 211142)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-25 16:45:58 UTC (rev 211143)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-25 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211052. rdar://problem/29857388
+
+ 2017-01-20 Anders Carlsson <andersca@apple.com>
+
+ When Safari reloads pages with Flash objects after Flash is installed, placeholders don't paint (but do work!)
+ https://bugs.webkit.org/show_bug.cgi?id=167268
+ rdar://problem/29857388
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/Plugins/WebPluginInfoProvider.h:
+ Make refreshPlugins() private.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::refreshPlugins):
+ Call the newly added PluginInfoProvider::refresh().
+
</ins><span class="cx"> 2017-01-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211086. rdar://problem/29948645
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessPluginsWebPluginInfoProviderh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h (211142 => 211143)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h 2017-01-25 14:34:27 UTC (rev 211142)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/Plugins/WebPluginInfoProvider.h 2017-01-25 16:45:58 UTC (rev 211143)
</span><span class="lines">@@ -42,13 +42,12 @@
</span><span class="cx"> void clearPluginClientPolicies();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void refreshPlugins() override;
-
</del><span class="cx"> private:
</span><span class="cx"> WebPluginInfoProvider();
</span><span class="cx">
</span><span class="cx"> void getPluginInfo(WebCore::Page&, Vector<WebCore::PluginInfo>&) override;
</span><span class="cx"> void getWebVisiblePluginInfo(WebCore::Page&, Vector<WebCore::PluginInfo>&) override;
</span><ins>+ void refreshPlugins() override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void populatePluginCache(const WebCore::Page&);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp (211142 => 211143)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2017-01-25 14:34:27 UTC (rev 211142)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2017-01-25 16:45:58 UTC (rev 211143)
</span><span class="lines">@@ -921,7 +921,7 @@
</span><span class="cx"> void WebProcess::refreshPlugins()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- WebPluginInfoProvider::singleton().refreshPlugins();
</del><ins>+ WebPluginInfoProvider::singleton().refresh(false);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>