Title: [101911] trunk/Source/WebCore
- Revision
- 101911
- Author
- [email protected]
- Date
- 2011-12-02 22:47:35 -0800 (Fri, 02 Dec 2011)
Log Message
ASSERT fails in updateState ACTION_DRAW case
https://bugs.webkit.org/show_bug.cgi?id=73351
Patch by Armand Navabi <[email protected]> on 2011-12-02
Reviewed by James Robinson.
Changed ASSERT in CCSchedulerStateMachine to include ( || !m_visible) as discussed in bug
report. m_commitState is set to COMMIT_STATE_WAITING_FOR_FIRST_DRAW if m_needsCommit or
!m_visible, so in ACTION_DRAW the assert should have both conditions.
* platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp:
(WebCore::CCSchedulerStateMachine::updateState):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101910 => 101911)
--- trunk/Source/WebCore/ChangeLog 2011-12-03 06:31:50 UTC (rev 101910)
+++ trunk/Source/WebCore/ChangeLog 2011-12-03 06:47:35 UTC (rev 101911)
@@ -1,3 +1,17 @@
+2011-12-02 Armand Navabi <[email protected]>
+
+ ASSERT fails in updateState ACTION_DRAW case
+ https://bugs.webkit.org/show_bug.cgi?id=73351
+
+ Reviewed by James Robinson.
+
+ Changed ASSERT in CCSchedulerStateMachine to include ( || !m_visible) as discussed in bug
+ report. m_commitState is set to COMMIT_STATE_WAITING_FOR_FIRST_DRAW if m_needsCommit or
+ !m_visible, so in ACTION_DRAW the assert should have both conditions.
+
+ * platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp:
+ (WebCore::CCSchedulerStateMachine::updateState):
+
2011-12-02 Shawn Singh <[email protected]>
[chromium] Scissor rect optimization for chromium compositor
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp (101910 => 101911)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp 2011-12-03 06:31:50 UTC (rev 101910)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCSchedulerStateMachine.cpp 2011-12-03 06:47:35 UTC (rev 101911)
@@ -106,7 +106,7 @@
if (m_insideVSync)
m_lastFrameNumberWhereDrawWasCalled = m_currentFrameNumber;
if (m_commitState == COMMIT_STATE_WAITING_FOR_FIRST_DRAW) {
- ASSERT(m_needsCommit);
+ ASSERT(m_needsCommit || !m_visible);
m_commitState = COMMIT_STATE_IDLE;
}
return;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
