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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 447113004: Fix crash in GotAcceleratedIOSurfaceFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index f80585a0f84bda8df033495a7f234670204f27c7..ec202eae2ceddf1450de9dd33bccb8b05e765028 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -2314,14 +2314,21 @@ bool RenderWidgetHostViewMac::AcceleratedLayerShouldAckImmediately() const {
return false;
}
-void RenderWidgetHostViewMac::AcceleratedLayerDidDrawFrame(bool succeeded) {
+void RenderWidgetHostViewMac::AcceleratedLayerDidDrawFrame() {
if (!render_widget_host_)
return;
SendPendingLatencyInfoToHost();
SendPendingSwapAck();
- if (!succeeded)
- GotAcceleratedCompositingError();
+}
+
+void RenderWidgetHostViewMac::AcceleratedLayerHitError() {
+ if (!render_widget_host_)
+ return;
+ // Perform all acks that would have been done if the frame had succeeded, to
+ // un-block the renderer.
+ AcceleratedLayerDidDrawFrame();
+ GotAcceleratedCompositingError();
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698