Title: [191020] branches/safari-601-branch/Source/WebKit2
- Revision
- 191020
- Author
- matthew_han...@apple.com
- Date
- 2015-10-13 17:15:45 -0700 (Tue, 13 Oct 2015)
Log Message
Merge r190141. rdar://problem/23075536
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebKit2/ChangeLog (191019 => 191020)
--- branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-10-14 00:15:43 UTC (rev 191019)
+++ branches/safari-601-branch/Source/WebKit2/ChangeLog 2015-10-14 00:15:45 UTC (rev 191020)
@@ -1,5 +1,25 @@
2015-10-13 Matthew Hanson <matthew_han...@apple.com>
+ Merge r190141. rdar://problem/23075536
+
+ 2015-09-22 Anders Carlsson <ander...@apple.com>
+
+ URL of page visited in private browsing still appears in Activity Monitor after page is closed
+ https://bugs.webkit.org/show_bug.cgi?id=149475
+ rdar://problem/22684521
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::close):
+ Make sure to call updateActivePages after removing the page from the page map.
+
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::updateActivePages):
+ Don't include pages that have private browsing enabled.
+
+2015-10-13 Matthew Hanson <matthew_han...@apple.com>
+
Merge r188443. rdar://problem/22801969
2015-08-13 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (191019 => 191020)
--- branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-10-14 00:15:43 UTC (rev 191019)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-10-14 00:15:45 UTC (rev 191020)
@@ -995,6 +995,8 @@
// The WebPage can be destroyed by this call.
WebProcess::singleton().removeWebPage(m_pageID);
+ WebProcess::singleton().updateActivePages();
+
if (isRunningModal)
RunLoop::main().stop();
}
Modified: branches/safari-601-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (191019 => 191020)
--- branches/safari-601-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-10-14 00:15:43 UTC (rev 191019)
+++ branches/safari-601-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-10-14 00:15:45 UTC (rev 191020)
@@ -255,13 +255,18 @@
void WebProcess::updateActivePages()
{
#if PLATFORM(MAC)
- RetainPtr<CFMutableArrayRef> activePageURLs = adoptCF(CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
+ auto activePageURLs = adoptNS([[NSMutableArray alloc] init]);
+
for (auto& page : m_pageMap.values()) {
+ if (page->usesEphemeralSession())
+ continue;
+
if (NSURL *originAsURL = origin(*page))
- CFArrayAppendValue(activePageURLs.get(), userVisibleString(originAsURL));
+ [activePageURLs addObject:userVisibleString(originAsURL)];
}
+
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [activePageURLs] {
- WKSetApplicationInformationItem(CFSTR("LSActivePageUserVisibleOriginsKey"), activePageURLs.get());
+ WKSetApplicationInformationItem(CFSTR("LSActivePageUserVisibleOriginsKey"), (__bridge CFArrayRef)activePageURLs.get());
});
#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
