Add a origin clean flag in ImageBitmap class

third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

 /*
  * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 100 matching lines @@
     if (size.width() > MaxSkiaDim || size.height() > MaxSkiaDim)
         return false;
     return true;
 }
 
 PassRefPtr<Image> createTransparentImage(const IntSize& size)
 {
     ASSERT(canCreateImageBuffer(size));
     RefPtr<SkSurface> surface = adoptRef(SkSurface::NewRasterN32Premul(size.width(), size.height()));
     surface->getCanvas()->clear(SK_ColorTRANSPARENT);
-    return StaticBitmapImage::create(adoptRef(surface->newImageSnapshot()));
+    return StaticBitmapImage::create(adoptRef(surface->newImageSnapshot()), HasSingleSecurityOrigin);
 }
 
 } // namespace
 
 inline HTMLCanvasElement::HTMLCanvasElement(Document& document)
     : HTMLElement(canvasTag, document)
     , DocumentVisibilityObserver(document)
     , m_size(DefaultWidth, DefaultHeight)
     , m_ignoreReset(false)
     , m_externallyAllocatedMemory(0)
@@ skipping 662 matching lines @@
     if (m_context)
         setNeedsCompositingUpdate();
 }
 
 void HTMLCanvasElement::notifySurfaceInvalid()
 {
     if (m_context && m_context->is2d())
         m_context->loseContext(CanvasRenderingContext::RealLostContext);
 }
 
+bool HTMLCanvasElement::hasSingleSecurityOrigin()
+{
+    return originClean();
+}
+
 DEFINE_TRACE(HTMLCanvasElement)
 {
     visitor->trace(m_listeners);
     visitor->trace(m_context);
     DocumentVisibilityObserver::trace(visitor);
     HTMLElement::trace(visitor);
 }
 
 void HTMLCanvasElement::updateExternallyAllocatedMemory() const
 {
@@ skipping 157 matching lines @@
         return createTransparentImage(size());
     }
 
     if (m_context->is3d()) {
         m_context->paintRenderingResultsToCanvas(BackBuffer);
     }
 
     RefPtr<SkImage> image = buffer()->newSkImageSnapshot(hint);
     if (image) {
         *status = NormalSourceImageStatus;
-        return StaticBitmapImage::create(image.release());
+        return StaticBitmapImage::create(image.release(), originClean() ? HasSingleSecurityOrigin : NoSingleSecurityOrigin);
     }
 
     *status = InvalidSourceImageStatus;
     return nullptr;
 }
 
 bool HTMLCanvasElement::wouldTaintOrigin(SecurityOrigin*) const
 {
     return !originClean();
 }
 
 FloatSize HTMLCanvasElement::elementSize() const
 {
     return FloatSize(width(), height());
 }
 
 IntSize HTMLCanvasElement::bitmapSourceSize() const
 {
     return IntSize(width(), height());
 }
 
 ScriptPromise HTMLCanvasElement::createImageBitmap(ScriptState* scriptState, EventTarget& eventTarget, int sx, int sy, int sw, int sh, ExceptionState& exceptionState)
 {
     ASSERT(eventTarget.toDOMWindow());
-    if (!originClean()) {
-        exceptionState.throwSecurityError("The canvas element provided is tainted with cross-origin data.");
-        return ScriptPromise();
-    }
     if (!sw || !sh) {
         exceptionState.throwDOMException(IndexSizeError, String::format("The source %s provided is 0.", sw ? "height" : "width"));
         return ScriptPromise();
     }
     return ImageBitmapSource::fulfillImageBitmap(scriptState, isPaintable() ? ImageBitmap::create(this, IntRect(sx, sy, sw, sh)) : nullptr);
 }
 
 bool HTMLCanvasElement::isOpaque() const
 {
     return m_context && !m_context->hasAlpha();
 }
 
 } // blink