ShapeDetection: use ImageBitmapSource as input and support ImageData

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

 // 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.
 
 #ifndef ShapeDetector_h
 #define ShapeDetector_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
+#include "core/imagebitmap/ImageBitmapFactories.h"
 #include "modules/ModulesExport.h"
 #include "modules/canvas2d/CanvasRenderingContext2D.h"
 
 namespace blink {
 
 class LocalFrame;
 
 class MODULES_EXPORT ShapeDetector
     : public GarbageCollectedFinalized<ShapeDetector> {
  public:
   // TODO(mcasas): Implement TextDetector after
   // https://github.com/WICG/shape-detection-api/issues/6
   explicit ShapeDetector(LocalFrame&);
   virtual ~ShapeDetector() = default;
 
-  ScriptPromise detect(ScriptState*, const CanvasImageSourceUnion&);
+  ScriptPromise detect(ScriptState*, const ImageBitmapSourceUnion&);
   DEFINE_INLINE_VIRTUAL_TRACE() {}
 
  private:
+  ScriptPromise detectShapesOnImageData(ScriptPromiseResolver*, ImageData*);
   ScriptPromise detectShapesOnImageElement(ScriptPromiseResolver*,
                                            const HTMLImageElement*);
 
   virtual ScriptPromise doDetect(ScriptPromiseResolver*,
                                  mojo::ScopedSharedBufferHandle,
                                  int imageWidth,
                                  int imageHeight) = 0;
 };
 
 }  // namespace blink
 
 #endif  // ShapeDetector_h