| Index: content/renderer/render_widget.cc
|
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
|
| index 4aa576c64a7beebb7f5983d19afecf1481600738..e21aeda4b03bce52228e785255e7a77e5c2dc0b2 100644
|
| --- a/content/renderer/render_widget.cc
|
| +++ b/content/renderer/render_widget.cc
|
| @@ -1081,6 +1081,7 @@ void RenderWidget::didAutoResize(const WebSize& new_size) {
|
| void RenderWidget::didActivateCompositor(int input_handler_identifier) {
|
| TRACE_EVENT0("gpu", "RenderWidget::didActivateCompositor");
|
|
|
| +#if !defined(OS_MACOSX)
|
| if (!is_accelerated_compositing_active_) {
|
| // When not in accelerated compositing mode, in certain cases (e.g. waiting
|
| // for a resize or if no backing store) the RenderWidgetHost is blocking the
|
| @@ -1089,9 +1090,11 @@ void RenderWidget::didActivateCompositor(int input_handler_identifier) {
|
| // round-trips to the browser's UI thread before finishing the frame,
|
| // causing deadlocks if we delay the UpdateRect until we receive the
|
| // OnSwapBuffersComplete. So send a dummy message that will unblock the
|
| - // browser's UI thread.
|
| + // browser's UI thread. This is not necessary on Mac, because SwapBuffers
|
| + // now unblocks GetBackingStore on Mac.
|
| Send(new ViewHostMsg_UpdateIsDelayed(routing_id_));
|
| }
|
| +#endif
|
|
|
| is_accelerated_compositing_active_ = true;
|
| Send(new ViewHostMsg_DidActivateAcceleratedCompositing(
|
|
|