Title: [140008] tags/Safari-537.26.1/Source/WebCore
- Revision
- 140008
- Author
- lforsch...@apple.com
- Date
- 2013-01-17 11:23:21 -0800 (Thu, 17 Jan 2013)
Log Message
Merged r139800. <rdar://problem/12961725>
Modified Paths
Diff
Modified: tags/Safari-537.26.1/Source/WebCore/ChangeLog (140007 => 140008)
--- tags/Safari-537.26.1/Source/WebCore/ChangeLog 2013-01-17 19:15:24 UTC (rev 140007)
+++ tags/Safari-537.26.1/Source/WebCore/ChangeLog 2013-01-17 19:23:21 UTC (rev 140008)
@@ -1,5 +1,19 @@
2013-01-17 Lucas Forschler <lforsch...@apple.com>
+ Merge r139800
+
+ 2013-01-15 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=106940
+ Suspend CSS animations for background tabs
+
+ Reviewed by Simon Fraser.
+
+ * page/Page.cpp:
+ (WebCore::Page::setVisibilityState):
+
+2013-01-17 Lucas Forschler <lforsch...@apple.com>
+
Merge r139796
2013-01-15 Enrica Casucci <enr...@apple.com>
Modified: tags/Safari-537.26.1/Source/WebCore/page/Page.cpp (140007 => 140008)
--- tags/Safari-537.26.1/Source/WebCore/page/Page.cpp 2013-01-17 19:15:24 UTC (rev 140007)
+++ tags/Safari-537.26.1/Source/WebCore/page/Page.cpp 2013-01-17 19:23:21 UTC (rev 140008)
@@ -1184,15 +1184,20 @@
m_mainFrame->dispatchVisibilityStateChangeEvent();
#endif
+ if (visibilityState == WebCore::PageVisibilityStateHidden) {
#if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
- if (visibilityState == WebCore::PageVisibilityStateHidden)
setTimerAlignmentInterval(Settings::hiddenPageDOMTimerAlignmentInterval());
- else
+#endif
+ mainFrame()->animation()->suspendAnimations();
+ } else {
+#if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
setTimerAlignmentInterval(Settings::defaultDOMTimerAlignmentInterval());
+#endif
+ mainFrame()->animation()->resumeAnimations();
+ }
#if !ENABLE(PAGE_VISIBILITY_API)
UNUSED_PARAM(isInitialState);
#endif
-#endif
}
#endif // ENABLE(PAGE_VISIBILITY_API) || ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
