Permalink
Browse files

Fix vsync-disabled Null pointer crash bug

https://bugs.webkit.org/show_bug.cgi?id=94280

Patch by John Bates <jbates@google.com> on 2012-08-16
Reviewed by Kentaro Hara.

The m_timeSource member is NULL for vsync-disabled path, need to check for that.

Tests: Covered by Chromium throughput tests. All the compositor thread throughput tests are crashing.

* platform/graphics/chromium/cc/CCFrameRateController.cpp:
(WebCore::CCFrameRateController::setTimebaseAndInterval):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@125847 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information...
1 parent 3e121cf commit e1b3a5d981d51f9ea5420c51b9c8af95a1eac7df commit-queue committed Aug 17, 2012
View
@@ -1,3 +1,17 @@
+2012-08-16 John Bates <jbates@google.com>
+
+ Fix vsync-disabled Null pointer crash bug
+ https://bugs.webkit.org/show_bug.cgi?id=94280
+
+ Reviewed by Kentaro Hara.
+
+ The m_timeSource member is NULL for vsync-disabled path, need to check for that.
+
+ Tests: Covered by Chromium throughput tests. All the compositor thread throughput tests are crashing.
+
+ * platform/graphics/chromium/cc/CCFrameRateController.cpp:
+ (WebCore::CCFrameRateController::setTimebaseAndInterval):
+
2012-08-16 Michael Saboff <msaboff@apple.com>
HTML Parser should produce 8bit substrings for inline style and script elements
@@ -100,7 +100,8 @@ void CCFrameRateController::setMaxFramesPending(int maxFramesPending)
void CCFrameRateController::setTimebaseAndInterval(double timebase, double intervalSeconds)
{
- m_timeSource->setTimebaseAndInterval(timebase, intervalSeconds);
+ if (m_isTimeSourceThrottling)
+ m_timeSource->setTimebaseAndInterval(timebase, intervalSeconds);
}
void CCFrameRateController::onTimerTick()

0 comments on commit e1b3a5d

Please sign in to comment.