Title: [125504] trunk/Source/WebCore
- Revision
- 125504
- Author
- [email protected]
- Date
- 2012-08-13 19:53:57 -0700 (Mon, 13 Aug 2012)
Log Message
[Chromium] Patch CCThreadProxy to call setTimebaseAndInterval on CCScheduler
https://bugs.webkit.org/show_bug.cgi?id=93918
Patch by John Bates <[email protected]> on 2012-08-13
Reviewed by James Robinson.
Also, update some trace events.
* platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp:
(WebCore::CCDelayBasedTimeSource::setActive):
* platform/graphics/chromium/cc/CCFrameRateController.cpp:
(WebCore::CCFrameRateController::setActive):
* platform/graphics/chromium/cc/CCThreadProxy.cpp:
(WebCore::CCThreadProxy::onVSyncParametersChanged):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (125503 => 125504)
--- trunk/Source/WebCore/ChangeLog 2012-08-14 02:52:03 UTC (rev 125503)
+++ trunk/Source/WebCore/ChangeLog 2012-08-14 02:53:57 UTC (rev 125504)
@@ -1,3 +1,19 @@
+2012-08-13 John Bates <[email protected]>
+
+ [Chromium] Patch CCThreadProxy to call setTimebaseAndInterval on CCScheduler
+ https://bugs.webkit.org/show_bug.cgi?id=93918
+
+ Reviewed by James Robinson.
+
+ Also, update some trace events.
+
+ * platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp:
+ (WebCore::CCDelayBasedTimeSource::setActive):
+ * platform/graphics/chromium/cc/CCFrameRateController.cpp:
+ (WebCore::CCFrameRateController::setActive):
+ * platform/graphics/chromium/cc/CCThreadProxy.cpp:
+ (WebCore::CCThreadProxy::onVSyncParametersChanged):
+
2012-08-13 Douglas Stockwell <[email protected]>
Crash in WebCore::RenderBlock::LineBreaker::nextLineBreak
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp (125503 => 125504)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp 2012-08-14 02:52:03 UTC (rev 125503)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCDelayBasedTimeSource.cpp 2012-08-14 02:53:57 UTC (rev 125504)
@@ -26,6 +26,7 @@
#include "cc/CCDelayBasedTimeSource.h"
+#include "TraceEvent.h"
#include <algorithm>
#include <wtf/CurrentTime.h>
#include <wtf/MathExtras.h>
@@ -66,6 +67,7 @@
void CCDelayBasedTimeSource::setActive(bool active)
{
+ TRACE_EVENT1("cc", "CCDelayBasedTimeSource::setActive", "active", active);
if (!active) {
m_state = STATE_INACTIVE;
m_timer.stop();
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.cpp (125503 => 125504)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.cpp 2012-08-14 02:52:03 UTC (rev 125503)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCFrameRateController.cpp 2012-08-14 02:53:57 UTC (rev 125504)
@@ -78,9 +78,9 @@
void CCFrameRateController::setActive(bool active)
{
+ TRACE_EVENT1("cc", "CCFrameRateController::setActive", "active", active);
if (m_active == active)
return;
- TRACE_EVENT1("cc", "CCFrameRateController::setActive", "active", active);
m_active = active;
if (m_isTimeSourceThrottling)
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp (125503 => 125504)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-08-14 02:52:03 UTC (rev 125503)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.cpp 2012-08-14 02:53:57 UTC (rev 125504)
@@ -328,7 +328,7 @@
{
ASSERT(isImplThread());
TRACE_EVENT0("cc", "CCThreadProxy::onVSyncParametersChanged");
- // FIXME: route this into the scheduler once the scheduler supports vsync.
+ m_schedulerOnImplThread->setTimebaseAndInterval(monotonicTimebase, intervalInSeconds);
}
void CCThreadProxy::setNeedsCommitOnImplThread()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
