Add a origin clean flag in ImageBitmap class

third_party/WebKit/Source/core/frame/ImageBitmap.h

 // Copyright 2013 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 ImageBitmap_h
 #define ImageBitmap_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/CoreExport.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 10 matching lines @@
 namespace blink {
 
 class HTMLCanvasElement;
 class HTMLVideoElement;
 class ImageData;
 
 class CORE_EXPORT ImageBitmap final : public RefCountedWillBeGarbageCollectedFinalized<ImageBitmap>, public ScriptWrappable, public ImageLoaderClient, public CanvasImageSource, public ImageBitmapSource {
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ImageBitmap);
 public:
-    static PassRefPtrWillBeRawPtr<ImageBitmap> create(HTMLImageElement*, const IntRect&);
-    static PassRefPtrWillBeRawPtr<ImageBitmap> create(HTMLVideoElement*, const IntRect&);
+    static PassRefPtrWillBeRawPtr<ImageBitmap> create(HTMLImageElement*, const IntRect&, Document*);
+    static PassRefPtrWillBeRawPtr<ImageBitmap> create(HTMLVideoElement*, const IntRect&, Document*);
     static PassRefPtrWillBeRawPtr<ImageBitmap> create(HTMLCanvasElement*, const IntRect&);
     static PassRefPtrWillBeRawPtr<ImageBitmap> create(ImageData*, const IntRect&);
     static PassRefPtrWillBeRawPtr<ImageBitmap> create(ImageBitmap*, const IntRect&);
-    static PassRefPtrWillBeRawPtr<ImageBitmap> create(Image*, const IntRect&);
     static PassRefPtrWillBeRawPtr<ImageBitmap> create(PassRefPtr<StaticBitmapImage>);
+    static PassRefPtrWillBeRawPtr<ImageBitmap> create(PassRefPtr<StaticBitmapImage>, const IntRect&);
 
     StaticBitmapImage* bitmapImage() const { return (m_image) ? m_image.get() : nullptr; }
     unsigned long width() const;
     unsigned long height() const;
     IntSize size() const;
 
     bool isNeutered() const { return m_isNeutered; }
+    bool originClean() const { return m_isOriginClean; }
     PassRefPtr<StaticBitmapImage> transfer();
 
     ~ImageBitmap() override;
 
     // CanvasImageSource implementation
     PassRefPtr<Image> getSourceImageForCanvas(SourceImageStatus*, AccelerationHint) const override;
-    bool wouldTaintOrigin(SecurityOrigin*) const override { return false; }
+    bool wouldTaintOrigin(SecurityOrigin*) const override { return !m_isOriginClean; }
     void adjustDrawRects(FloatRect* srcRect, FloatRect* dstRect) const override;
     FloatSize elementSize() const override;
 
     // ImageBitmapSource implementation
     IntSize bitmapSourceSize() const override { return size(); }
     ScriptPromise createImageBitmap(ScriptState*, EventTarget&, int sx, int sy, int sw, int sh, ExceptionState&) override;
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    ImageBitmap(HTMLImageElement*, const IntRect&);
-    ImageBitmap(HTMLVideoElement*, const IntRect&);
+    ImageBitmap(HTMLImageElement*, const IntRect&, Document*);
+    ImageBitmap(HTMLVideoElement*, const IntRect&, Document*);
     ImageBitmap(HTMLCanvasElement*, const IntRect&);
     ImageBitmap(ImageData*, const IntRect&);
     ImageBitmap(ImageBitmap*, const IntRect&);
-    ImageBitmap(Image*, const IntRect&);
     ImageBitmap(PassRefPtr<StaticBitmapImage>);
+    ImageBitmap(PassRefPtr<StaticBitmapImage>, const IntRect&);
 
     // ImageLoaderClient
     void notifyImageSourceChanged() override;
     bool requestsHighLiveResourceCachePriority() override { return true; }
 
     RefPtr<StaticBitmapImage> m_image;
     bool m_isNeutered = false;
+    bool m_isOriginClean = true;

[Justin Novosad, 2016/01/08 22:09:39]

Can we safely get rid of this and just always use the origin clean flag in
m_image?  Having the flag in both places and possibly out of sync is a potential
source of confusion.

[xidachen, 2016/01/09 12:23:47]

This makes perfect sense and it is not hard. Since we have both getter and
setter function for StaticBitmapImage's origin clean flag, we just call
m_image->getOriginCleanflag or m_image->setOriginCleanflag to get it for
ImageBitmap.

 };
 
 } // namespace blink
 
 #endif // ImageBitmap_h