Title: [211144] branches/safari-603-branch/Source/WebCore
- Revision
- 211144
- Author
- [email protected]
- Date
- 2017-01-25 08:46:02 -0800 (Wed, 25 Jan 2017)
Log Message
Merge r211114. rdar://problem/29857388
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211143 => 211144)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-25 16:45:58 UTC (rev 211143)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-25 16:46:02 UTC (rev 211144)
@@ -1,5 +1,26 @@
2017-01-25 Matthew Hanson <[email protected]>
+ Merge r211114. rdar://problem/29857388
+
+ 2017-01-24 Anders Carlsson <[email protected]>
+
+ 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=167391
+ rdar://problem/29857388
+
+ Reviewed by Sam Weinig.
+
+ * page/Page.cpp:
+ (WebCore::Page::refreshPlugins):
+ Remove an unused variable.
+
+ * plugins/PluginInfoProvider.cpp:
+ (WebCore::PluginInfoProvider::refresh):
+ Make sure to call refreshPlugins(). Instead of reloading subframes, just reload all the main frames with
+ subframes that contain plug-ins.
+
+2017-01-25 Matthew Hanson <[email protected]>
+
Merge r211052. rdar://problem/29857388
2017-01-20 Anders Carlsson <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/page/Page.cpp (211143 => 211144)
--- branches/safari-603-branch/Source/WebCore/page/Page.cpp 2017-01-25 16:45:58 UTC (rev 211143)
+++ branches/safari-603-branch/Source/WebCore/page/Page.cpp 2017-01-25 16:46:02 UTC (rev 211144)
@@ -536,8 +536,6 @@
HashSet<PluginInfoProvider*> pluginInfoProviders;
- Vector<Ref<Frame>> framesNeedingReload;
-
for (auto& page : *allPages)
pluginInfoProviders.add(&page->pluginInfoProvider());
Modified: branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.cpp (211143 => 211144)
--- branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.cpp 2017-01-25 16:45:58 UTC (rev 211143)
+++ branches/safari-603-branch/Source/WebCore/plugins/PluginInfoProvider.cpp 2017-01-25 16:46:02 UTC (rev 211144)
@@ -39,8 +39,10 @@
void PluginInfoProvider::refresh(bool reloadPages)
{
- Vector<Ref<Frame>> framesNeedingReload;
+ refreshPlugins();
+ Vector<Ref<MainFrame>> framesNeedingReload;
+
for (auto& page : m_pages) {
page->clearPluginData();
@@ -49,7 +51,7 @@
for (Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
if (frame->loader().subframeLoader().containsPlugins())
- framesNeedingReload.append(*frame);
+ framesNeedingReload.append(page->mainFrame());
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
