Title: [152250] branches/safari-537-branch/Source/WebCore
- Revision
- 152250
- Author
- [email protected]
- Date
- 2013-07-01 13:53:31 -0700 (Mon, 01 Jul 2013)
Log Message
Merged r152202. <rdar://problem/14247819>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152249 => 152250)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-01 20:45:17 UTC (rev 152249)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-01 20:53:31 UTC (rev 152250)
@@ -1,5 +1,27 @@
2013-07-01 Lucas Forschler <[email protected]>
+ Merge r152202
+
+ 2013-06-28 Gavin Barraclough <[email protected]>
+
+ PageThrottler::shouldThrottleTimers is wrong.
+ https://bugs.webkit.org/show_bug.cgi?id=118210
+
+ Reviewed by Anders Carlson.
+
+ m_throttleState == PageNotThrottledState
+ -> page NOT throttled, so should NOT throttle timers
+ m_throttleState != PageNotThrottledState
+ -> page NOT NOT throttled, so should throttle timers
+
+ This needs cleaning up, but for now, 1 character fix.
+
+ * page/PageThrottler.h:
+ (WebCore::PageThrottler::shouldThrottleTimers):
+ == -> !=
+
+2013-07-01 Lucas Forschler <[email protected]>
+
Merge r152198
2013-06-28 Ryosuke Niwa <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/page/PageThrottler.h (152249 => 152250)
--- branches/safari-537-branch/Source/WebCore/page/PageThrottler.h 2013-07-01 20:45:17 UTC (rev 152249)
+++ branches/safari-537-branch/Source/WebCore/page/PageThrottler.h 2013-07-01 20:53:31 UTC (rev 152250)
@@ -44,7 +44,7 @@
}
bool shouldThrottleAnimations() const { return m_throttleState != PageNotThrottledState; }
- bool shouldThrottleTimers() const { return m_throttleState == PageNotThrottledState; }
+ bool shouldThrottleTimers() const { return m_throttleState != PageNotThrottledState; }
void setThrottled(bool);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
