Fixed expando-loss.html test.

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 206 matching lines @@
 void HTMLCanvasElement::registerRenderingContextFactory(PassOwnPtr<CanvasRenderingContextFactory> renderingContextFactory)
 {
     CanvasRenderingContext::ContextType type = renderingContextFactory->contextType();
     ASSERT(type < CanvasRenderingContext::ContextTypeCount);
     ASSERT(!renderingContextFactories()[type]);
     renderingContextFactories()[type] = renderingContextFactory;
 }
 
 ScriptValue HTMLCanvasElement::getContext(ScriptState* scriptState, const String& type, const CanvasContextCreationAttributes& attributes)
 {
-    CanvasRenderingContext* context = getCanvasRenderingContext(type, attributes);
+    CanvasRenderingContext* context = getCanvasRenderingContext(scriptState, type, attributes);
     if (!context) {
         return ScriptValue::createNull(scriptState);
     }
     return ScriptValue(scriptState, toV8(context, scriptState->context()->Global(), scriptState->isolate()));
 }
 
-CanvasRenderingContext* HTMLCanvasElement::getCanvasRenderingContext(const String& type, const CanvasContextCreationAttributes& attributes)
+CanvasRenderingContext* HTMLCanvasElement::getCanvasRenderingContext(ScriptState* scriptState, const String& type, const CanvasContextCreationAttributes& attributes)
 {
     CanvasRenderingContext::ContextType contextType = CanvasRenderingContext::contextTypeFromId(type);
 
     // Unknown type.
     if (contextType == CanvasRenderingContext::ContextTypeCount)
         return nullptr;
 
     // Log the aliased context type used.
     if (!m_context)
         Platform::current()->histogramEnumeration("Canvas.ContextType", contextType, CanvasRenderingContext::ContextTypeCount);
 
     contextType = CanvasRenderingContext::resolveContextTypeAliases(contextType);
 
     CanvasRenderingContextFactory* factory = getRenderingContextFactory(contextType);
     if (!factory)
         return nullptr;
 
     // FIXME - The code depends on the context not going away once created, to prevent JS from
     // seeing a dangling pointer. So for now we will disallow the context from being changed
     // once it is created.
     if (m_context) {
         if (m_context->contextType() == contextType)
             return m_context.get();
 
         factory->onError(this, "Canvas has an existing context of a different type");
         return nullptr;
     }
 
-    m_context = factory->create(this, attributes, document());
+    m_context = factory->create(this, scriptState, attributes, document());
     if (!m_context)
         return nullptr;
 
     if (m_context->is3d()) {
         const ComputedStyle* style = ensureComputedStyle();
         if (style)
             m_context->setFilterQuality(style->imageRendering() == ImageRenderingPixelated ? kNone_SkFilterQuality : kLow_SkFilterQuality);
         updateExternallyAllocatedMemory();
     }
     setNeedsCompositingUpdate();
@@ skipping 705 matching lines @@
 {
     return FloatSize(width(), height());
 }
 
 bool HTMLCanvasElement::isOpaque() const
 {
     return m_context && !m_context->hasAlpha();
 }
 
 } // blink