Do not make an extra submit callback during SurfaceFrame destruction if the frame was already submitted (#5669)

jason-simmons · web-flow · commit d085f1df2cbe · 2018-07-03T17:17:57.000-07:00
diff --git a/shell/common/surface.cc b/shell/common/surface.cc
@@ -21,7 +21,7 @@ SurfaceFrame::SurfaceFrame(sk_sp<SkSurface> surface,
 }
 
 SurfaceFrame::~SurfaceFrame() {
-  if (submit_callback_) {
+  if (submit_callback_ && !submitted_) {
     // Dropping without a Submit.
     submit_callback_(*this, nullptr);
   }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ SurfaceFrame::SurfaceFrame(sk_sp<SkSurface> surface,`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`SurfaceFrame::~SurfaceFrame() {`
`24`		`- if (submit_callback_) {`
	`24`	`+ if (submit_callback_ && !submitted_) {`
`25`	`25`	`// Dropping without a Submit.`
`26`	`26`	`submit_callback_(*this, nullptr);`
`27`	`27`	`}`