SkiaRenderer: fix a crash with SkDDL + RenderPass

Bug: 825901
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel
Change-Id: I83f7d79a3bf5a75945a9f3546468804249fe95a0
Reviewed-on: https://chromium-review.googlesource.com/1050365Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
Commit-Queue: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556872}

components/viz/service/display/skia_renderer.cc

@@ -805,10 +805,9 @@ void SkiaRenderer::DrawRenderPassQuad(const RenderPassDrawQuad* quad) {
   shader = content->makeShader(&content_mat);
 
   if (quad->mask_resource_id()) {
-    cc::DisplayResourceProvider::ScopedReadLockSkImage mask_lock(
-        resource_provider_, quad->mask_resource_id());
-    const SkImage* image = mask_lock.sk_image();
-    if (!mask_lock.valid())
+    ScopedSkImageBuilder builder(this, quad->mask_resource_id());
+    const SkImage* image = builder.sk_image();
+    if (!image)
       return;
 
     // Scale normalized uv rect into absolute texel coordinates.