ShapeDetection: use makeNonTextureImage() to support texture-backed sources

third_party/WebKit/Source/modules/shapedetection/ShapeDetector.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/shapedetection/ShapeDetector.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/ImageBitmap.h"
@@ skipping 98 matching lines @@
   if (size.IsEmpty()) {
     resolver->Resolve(HeapVector<Member<DOMRect>>());
     return promise;
   }
 
   SkPixmap pixmap;
   RefPtr<Uint8Array> pixel_data;
   uint8_t* pixel_data_ptr = nullptr;
   WTF::CheckedNumeric<int> allocation_size = 0;
 
-  sk_sp<SkImage> sk_image = image->ImageForCurrentFrame();
-  // Use |skImage|'s pixels if it has direct access to them.
-  if (sk_image->peekPixels(&pixmap)) {
+  // makeNonTextureImage() will make a raster copy of ImageForCurrentFrame() if
+  // needed, otherwise returning the original SkImage.
+  const sk_sp<SkImage> sk_image =
+      image->ImageForCurrentFrame()->makeNonTextureImage();
+  if (sk_image && sk_image->peekPixels(&pixmap)) {
     pixel_data_ptr = static_cast<uint8_t*>(pixmap.writable_addr());
     allocation_size = pixmap.getSafeSize();
-  } else if (image_source.isImageBitmap()) {
-    ImageBitmap* image_bitmap = image_source.getAsImageBitmap();
-    pixel_data = image_bitmap->CopyBitmapData(image_bitmap->IsPremultiplied()
-                                                  ? kPremultiplyAlpha
-                                                  : kDontPremultiplyAlpha,
-                                              kN32ColorType);
-    pixel_data_ptr = pixel_data->Data();
-    allocation_size = image_bitmap->Size().Area() * 4 /* bytes per pixel */;
   } else {
     // TODO(mcasas): retrieve the pixels from elsewhere.
     NOTREACHED();
     resolver->Reject(DOMException::Create(
         kInvalidStateError, "Failed to get pixels for current frame."));
     return promise;
   }
 
   mojo::ScopedSharedBufferHandle shared_buffer_handle = GetSharedBufferOnData(
       resolver, pixel_data_ptr, allocation_size.ValueOrDefault(0));
@@ skipping 89 matching lines @@
         kInvalidStateError,
         "Failed to read pixels: Unable to decompress or unsupported format."));
     return promise;
   }
 
   return DoDetect(resolver, std::move(shared_buffer_handle),
                   img->naturalWidth(), img->naturalHeight());
 }
 
 }  // namespace blink