Make sure RecordingImageBufferSurface's current frame is valid

third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp

Index: third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp
index e9b89e7fa8ec5881a70570e7158e1f190d053590..1f2940418b174d4ad0c917a4c2810085c9993842 100644
--- a/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp
+++ b/third_party/WebKit/Source/platform/graphics/RecordingImageBufferSurface.cpp
@@ -270,6 +270,8 @@ bool RecordingImageBufferSurface::finalizeFrameInternal(FallbackReason* fallback
             m_previousFrame = fromSkSp(m_currentFrame->finishRecordingAsPicture());
             initializeCurrentFrame();
         }
+        if (!m_currentFrame.get())
+            *fallbackReason = FallbackReasonCurrentFrameNull;

[Justin Novosad, 2016/07/04 14:01:05]

I don't think this is right. If m_currentFrame is not set, it means that a
fallback has already occured, in which case finalizeFrameInternal should not be
called (ASSERTs above check that).  If this code is reachable, we might be in an
invalid state.  Do you have a repro case that exercises this case?

[xidachen, 2016/07/04 14:06:36]

I don't have a repro case. But from the histogram of canary channel, we still
see 0.2% that is Unkonwn. This seems to be the only place that could happen.
Could this happen when browser crashes, or some un-expected behavior?

[Justin Novosad, 2016/07/04 14:16:57]

Let's do an experiment on the canary channel then: Change the two first ASSERTs
at the top of this method into "CHECK", and right here, do:
CHECK(m_currentFrame);
return true;

[xidachen, 2016/07/04 14:36:37]

Okay. Let's do the experiment then. I remove the category in the histogram and
replace the ASSERTs by CHECKs. My understanding is that CHECK won't do anything
if it is not hit, is that correct?

         return m_currentFrame.get();
     }