Commit 3b813a2b authored by shrekshao's avatar shrekshao Committed by Commit Bot

Fix WebGL PushFrame crash when GetDrawingBuffer returns NULL

Bug: 1059491
Change-Id: I6df4870cb8ece3986a2ad0fecd28b50593ae2e8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108874Reviewed-by: default avatarKai Ninomiya <kainino@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Shrek Shao <shrekshao@google.com>
Cr-Commit-Position: refs/heads/master@{#751547}
parent 61351f79
...@@ -1412,11 +1412,11 @@ void WebGLRenderingContextBase::DidDraw() { ...@@ -1412,11 +1412,11 @@ void WebGLRenderingContextBase::DidDraw() {
} }
bool WebGLRenderingContextBase::PushFrame() { bool WebGLRenderingContextBase::PushFrame() {
int width = GetDrawingBuffer()->Size().Width();
int height = GetDrawingBuffer()->Size().Height();
int submitted_frame = false; int submitted_frame = false;
if (PaintRenderingResultsToCanvas(kBackBuffer)) { if (PaintRenderingResultsToCanvas(kBackBuffer)) {
if (Host()->GetOrCreateCanvasResourceProvider(kPreferAcceleration)) { if (Host()->GetOrCreateCanvasResourceProvider(kPreferAcceleration)) {
int width = GetDrawingBuffer()->Size().Width();
int height = GetDrawingBuffer()->Size().Height();
submitted_frame = submitted_frame =
Host()->PushFrame(Host()->ResourceProvider()->ProduceCanvasResource(), Host()->PushFrame(Host()->ResourceProvider()->ProduceCanvasResource(),
SkIRect::MakeWH(width, height)); SkIRect::MakeWH(width, height));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment