Title: [140013] tags/Safari-537.26.1/Source/WebKit2
- Revision
- 140013
- Author
- lforsch...@apple.com
- Date
- 2013-01-17 11:35:08 -0800 (Thu, 17 Jan 2013)
Log Message
Merge patch for <rdar://problem/13007758>
Modified Paths
Diff
Modified: tags/Safari-537.26.1/Source/WebKit2/ChangeLog (140012 => 140013)
--- tags/Safari-537.26.1/Source/WebKit2/ChangeLog 2013-01-17 19:30:07 UTC (rev 140012)
+++ tags/Safari-537.26.1/Source/WebKit2/ChangeLog 2013-01-17 19:35:08 UTC (rev 140013)
@@ -1,5 +1,25 @@
2013-01-17 Lucas Forschler <lforsch...@apple.com>
+ Merge patch from <rdar://problem/13007758>
+
+ 2013-01-16 Kiran Muppala <cmupp...@apple.com>
+
+ Enable process suppression by default on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=106804
+
+ Reviewed by Alexey Proskuryakov.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext): Change initialized value of
+ m_processSuppressionEnabled from false to true.
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitialize): Since process suppression
+ is no longer disabled on construction, do not disable it for global
+ child processes either. Instead enable occlusion notifications as
+ they are needed to trigger process suppression.
+
+2013-01-17 Lucas Forschler <lforsch...@apple.com>
+
Merge r139888
2013-01-16 Kiran Muppala <cmupp...@apple.com>
Modified: tags/Safari-537.26.1/Source/WebKit2/UIProcess/WebContext.cpp (140012 => 140013)
--- tags/Safari-537.26.1/Source/WebKit2/UIProcess/WebContext.cpp 2013-01-17 19:30:07 UTC (rev 140012)
+++ tags/Safari-537.26.1/Source/WebKit2/UIProcess/WebContext.cpp 2013-01-17 19:35:08 UTC (rev 140013)
@@ -142,7 +142,7 @@
, m_usesNetworkProcess(false)
#endif
#if PLATFORM(MAC)
- , m_processSuppressionEnabled(false)
+ , m_processSuppressionEnabled(true)
#endif
#if USE(SOUP)
, m_ignoreTLSErrors(true)
Modified: tags/Safari-537.26.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm (140012 => 140013)
--- tags/Safari-537.26.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2013-01-17 19:30:07 UTC (rev 140012)
+++ tags/Safari-537.26.1/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2013-01-17 19:35:08 UTC (rev 140013)
@@ -228,8 +228,8 @@
{
registerUserDefaultsIfNeeded();
registerNotificationObservers();
- ASSERT(!m_processSuppressionEnabled);
- disableProcessSuppressionForGlobalChildProcesses();
+ ASSERT(m_processSuppressionEnabled);
+ enableOcclusionNotifications();
}
String WebContext::applicationCacheDirectory()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
