Fix expando-loss-2.html test

third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.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/webgl/WebGL2RenderingContextBase.h"
 
 #include "bindings/modules/v8/WebGLAny.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
@@ skipping 1697 matching lines @@
 }
 
 GLboolean WebGL2RenderingContextBase::isQuery(WebGLQuery* query)
 {
     if (isContextLost() || !query)
         return 0;
 
     return contextGL()->IsQueryEXT(query->object());
 }
 
-void WebGL2RenderingContextBase::beginQuery(GLenum target, WebGLQuery* query)
+void WebGL2RenderingContextBase::beginQuery(ScriptState* scriptState, GLenum target, WebGLQuery* query)
 {
     bool deleted;
     if (!query) {
         synthesizeGLError(GL_INVALID_OPERATION, "beginQuery", "query object is null");
         return;
     }
 
     if (!checkObjectToBeBound("beginQuery", query, deleted))
         return;
     if (deleted) {
@@ skipping 28 matching lines @@
         break;
     default:
         synthesizeGLError(GL_INVALID_ENUM, "beginQuery", "invalid target");
         return;
     }
 
     if (!query->getTarget())
         query->setTarget(target);
 
     contextGL()->BeginQueryEXT(target, query->object());
+    preserveObjectWrapper(scriptState, this, V8HiddenValue::webglQueries(scriptState->isolate()), &m_queryWrappers, static_cast<uint32_t>(target), query);
 }
 
 void WebGL2RenderingContextBase::endQuery(GLenum target)
 {
     if (isContextLost())
         return;
 
     switch (target) {
     case GL_ANY_SAMPLES_PASSED:
     case GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
@@ skipping 117 matching lines @@
 }
 
 GLboolean WebGL2RenderingContextBase::isSampler(WebGLSampler* sampler)
 {
     if (isContextLost() || !sampler)
         return 0;
 
     return contextGL()->IsSampler(sampler->object());
 }
 
-void WebGL2RenderingContextBase::bindSampler(GLuint unit, WebGLSampler* sampler)
+void WebGL2RenderingContextBase::bindSampler(ScriptState* scriptState, GLuint unit, WebGLSampler* sampler)
 {
     if (isContextLost())
         return;
 
     bool deleted;
     if (!checkObjectToBeBound("bindSampler", sampler, deleted))
         return;
     if (deleted) {
         synthesizeGLError(GL_INVALID_OPERATION, "bindSampler", "attempted to bind a deleted sampler");
         return;
     }
 
     if (unit >= m_samplerUnits.size()) {
         synthesizeGLError(GL_INVALID_VALUE, "bindSampler", "texture unit out of range");
         return;
     }
 
     m_samplerUnits[unit] = sampler;
 
     contextGL()->BindSampler(unit, objectOrZero(sampler));
+
+    preserveObjectWrapper(scriptState, this, V8HiddenValue::webglSamplers(scriptState->isolate()), &m_samplerWrappers, static_cast<uint32_t>(unit), sampler);
 }
 
 void WebGL2RenderingContextBase::samplerParameter(WebGLSampler* sampler, GLenum pname, GLfloat paramf, GLint parami, bool isFloat)
 {
     if (isContextLost() || !validateWebGLObject("samplerParameter", sampler))
         return;
 
     GLint param = isFloat ? static_cast<GLint>(paramf) : parami;
     switch (pname) {
     case GL_TEXTURE_MAX_LOD:
@@ skipping 213 matching lines @@
 {
     if (isContextLost() || !feedback)
         return 0;
 
     if (!feedback->hasEverBeenBound())
         return 0;
 
     return contextGL()->IsTransformFeedback(feedback->object());
 }
 
-void WebGL2RenderingContextBase::bindTransformFeedback(GLenum target, WebGLTransformFeedback* feedback)
+void WebGL2RenderingContextBase::bindTransformFeedback(ScriptState* scriptState, GLenum target, WebGLTransformFeedback* feedback)
 {
     bool deleted;
     if (!checkObjectToBeBound("bindTransformFeedback", feedback, deleted))
         return;
     if (deleted) {
         synthesizeGLError(GL_INVALID_OPERATION, "bindTransformFeedback", "attempted to bind a deleted transform feedback object");
         return;
     }
 
     if (target != GL_TRANSFORM_FEEDBACK) {
         synthesizeGLError(GL_INVALID_ENUM, "bindTransformFeedback", "target must be TRANSFORM_FEEDBACK");
         return;
     }
 
     if (transformFeedbackActive() && !transformFeedbackPaused()) {
         synthesizeGLError(GL_INVALID_OPERATION, "bindTransformFeedback", "transform feedback is active and not paused");
         return;
     }
 
     m_transformFeedbackBinding = feedback;
 
     contextGL()->BindTransformFeedback(target, objectOrZero(feedback));
-    if (feedback)
+    if (feedback) {
         feedback->setTarget(target);
+        preserveObjectWrapper(scriptState, this, V8HiddenValue::webglMisc(scriptState->isolate()), &m_miscWrappers, static_cast<uint32_t>(PreservedTransformFeedback), feedback);
+    }
+
 }
 
 void WebGL2RenderingContextBase::beginTransformFeedback(GLenum primitiveMode)
 {
     if (isContextLost())
         return;
     if (!validateTransformFeedbackPrimitiveMode("beginTransformFeedback", primitiveMode))
         return;
 
     if (transformFeedbackActive()) {
@@ skipping 1390 matching lines @@
     params.skipPixels = m_unpackSkipPixels;
     params.skipRows = m_unpackSkipRows;
     if (dimension == Tex3D) {
         params.imageHeight = m_unpackImageHeight;
         params.skipImages = m_unpackSkipImages;
     }
     return params;
 }
 
 } // namespace blink