Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(573)

Unified Diff: content/renderer/render_widget.cc

Issue 6993043: Fix the mac hangup when force-compositing-mode is enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disabled CVDisplayLink code, seems to work Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 6e41354bcf3fee737d55d6fc1ff667ed1cd3a8ba..aced942b7eec48f74e5f768f5770c60e9a4013ac 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -391,11 +391,16 @@ void RenderWidget::OnSwapBuffersComplete()
TRACE_EVENT0("renderer", "RenderWidget::OnSwapBuffersComplete");
// When compositing deactivates, we reset the swapbuffers pending count. The
// swapbuffers acks may still arrive, however.
- if (num_swapbuffers_complete_pending_ == 0) {
- TRACE_EVENT0("renderer", "EarlyOut_ZeroSwapbuffersPending");
- return;
+//if (num_swapbuffers_complete_pending_ == 0) {
+// TRACE_EVENT0("renderer", "EarlyOut_ZeroSwapbuffersPending");
+// return;
+//}
+//num_swapbuffers_complete_pending_--;
jbates 2011/06/07 16:47:52 The num_swapbuffers_complete_pending_ count was wr
+ if (num_swapbuffers_complete_pending_ > 0) {
+ num_swapbuffers_complete_pending_--;
+ } else {
+ TRACE_EVENT0("renderer", "ZeroSwapbuffersPending");
}
- num_swapbuffers_complete_pending_--;
// If update reply is still pending, then defer the update until that reply
// occurs.

Powered by Google App Engine
This is Rietveld 408576698