Make OffscreenCanvas Transferable

third_party/WebKit/Source/modules/offscreencanvas/OffscreenCanvas.cpp

 // Copyright 2015 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/offscreencanvas/OffscreenCanvas.h"
 
 #include "core/dom/ExceptionCode.h"
 #include "core/html/canvas/CanvasContextCreationAttributes.h"
 #include "modules/offscreencanvas/OffscreenCanvasRenderingContext.h"
 #include "modules/offscreencanvas/OffscreenCanvasRenderingContextFactory.h"
 #include "modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.h"
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
 OffscreenCanvas::OffscreenCanvas(const IntSize& size)
-    : m_size(size)
+    : m_canvasId(-1) // DOMNodeIds starts from 0, using -1 to indicate no associated canvas element.
+    , m_size(size)
 { }
 
 OffscreenCanvas::~OffscreenCanvas()
 { }
 
 OffscreenCanvas* OffscreenCanvas::create(unsigned width, unsigned height)
 {
     return new OffscreenCanvas(IntSize(clampTo<int>(width), clampTo<int>(height)));
 }
 
 void OffscreenCanvas::setWidth(unsigned width)
 {
     m_size.setWidth(clampTo<int>(width));
 }
 
 void OffscreenCanvas::setHeight(unsigned height)
 {
     m_size.setHeight(clampTo<int>(height));
 }
 
+void OffscreenCanvas::setNeutered()
+{
+    m_isNeutered = true;

[Justin Novosad, 2016/04/12 18:10:23]

Add "ASSERT(!m_context);"

[xidachen, 2016/04/12 19:35:14]

Done.

+    m_size.setWidth(0);

[Justin Novosad, 2016/04/12 18:10:23]

Why do we need to reset m_size? This has observable side-effects in JS.

[xidachen, 2016/04/12 19:35:14]

When an offscreenCanvas gets transferred to worker, it is neutered, shouldn't
its size be 0?

+    m_size.setHeight(0);
+}
+
 OffscreenCanvasRenderingContext2D* OffscreenCanvas::getContext(const String& id, const CanvasContextCreationAttributes& attributes)

[Justin Novosad, 2016/04/12 18:10:23]

This method need to throw an InvalidStateError exception if the object is
neutered. And there should be a test to cover this case.

[xidachen, 2016/04/12 19:35:14]

Done.

 {
     OffscreenCanvasRenderingContext::ContextType contextType = OffscreenCanvasRenderingContext::contextTypeFromId(id);
 
     // Unknown type.
     if (contextType == OffscreenCanvasRenderingContext::ContextTypeCount)
         return nullptr;
 
     OffscreenCanvasRenderingContextFactory* factory = getRenderingContextFactory(contextType);
     if (!factory)
         return nullptr;
 
     if (m_context) {
         if (m_context->getContextType() != contextType) {
             factory->onError(this, "OffscreenCanvas has an existing context of a different type");
             return nullptr;
         }
     } else {
         m_context = factory->create(this, attributes);
     }
 
     // TODO: When there're more than one context type implemented in the future,
     // the return type here should be changed to base class of all Offscreen
     // context types.
     return static_cast<OffscreenCanvasRenderingContext2D*>(m_context.get());
 }
 
 ImageBitmap* OffscreenCanvas::transferToImageBitmap(ExceptionState& exceptionState)

[Justin Novosad, 2016/04/12 18:10:23]

Same here: throw if neutered + test.

[xidachen, 2016/04/12 19:35:14]

Done.

 {
     if (!m_context) {
         exceptionState.throwDOMException(InvalidStateError, "Cannot transfer an ImageBitmap from an OffscreenCanvas with no context");
         return nullptr;
     }
     ImageBitmap* image = m_context->transferToImageBitmap(exceptionState);
     if (!image) {
         // Undocumented exception (not in spec)
         exceptionState.throwDOMException(V8GeneralError, "Out of memory");
     }
     return image;
 }
 
 OffscreenCanvasRenderingContext2D* OffscreenCanvas::renderingContext() const

[Justin Novosad, 2016/04/12 18:10:23]

ASSERT(!m_isNeutered);

[xidachen, 2016/04/12 19:35:14]

Done.

 {
     // TODO: When there're more than one context type implemented in the future,
     // the return type here should be changed to base class of all Offscreen
     // context types.
     return static_cast<OffscreenCanvasRenderingContext2D*>(m_context.get());
 }
 
 OffscreenCanvas::ContextFactoryVector& OffscreenCanvas::renderingContextFactories()
 {
     DEFINE_STATIC_LOCAL(ContextFactoryVector, s_contextFactories, (OffscreenCanvasRenderingContext::ContextTypeCount));
@@ skipping 10 matching lines @@
 {
     OffscreenCanvasRenderingContext::ContextType type = renderingContextFactory->getContextType();
     ASSERT(type < OffscreenCanvasRenderingContext::ContextTypeCount);
     ASSERT(!renderingContextFactories()[type]);
     renderingContextFactories()[type] = renderingContextFactory;
 }
 
 DEFINE_TRACE(OffscreenCanvas)
 {
     visitor->trace(m_context);
-    visitor->trace(m_canvas);
 }
 
 } // namespace blink