Fix content scripts that use WebGL.

third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
index 7cfd619db6c863d5bdcb01e239d49562bad9dadb..8b626823727292bc0674be52b5a2f4651a3e7ad3 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
@@ -321,11 +321,11 @@ void WebGL2RenderingContextBase::framebufferTextureLayer(ScriptState* scriptStat
         // We divide it here so in WebGLFramebuffer, we don't have to handle DEPTH_STENCIL_ATTACHMENT in WebGL 2.
         framebufferBinding->setAttachmentForBoundFramebuffer(target, GL_DEPTH_ATTACHMENT, textarget, texture, level, layer);
         framebufferBinding->setAttachmentForBoundFramebuffer(target, GL_STENCIL_ATTACHMENT, textarget, texture, level, layer);
-        preserveObjectWrapper(scriptState, framebufferBinding, V8HiddenValue::webglAttachments(scriptState->isolate()), framebufferBinding->getPersistentCache(), GL_DEPTH_ATTACHMENT, texture);
-        preserveObjectWrapper(scriptState, framebufferBinding, V8HiddenValue::webglAttachments(scriptState->isolate()), framebufferBinding->getPersistentCache(), GL_STENCIL_ATTACHMENT, texture);
+        preserveObjectWrapper(scriptState, framebufferBinding, V8PrivateProperty::getWebGLFramebufferAttachments(scriptState->isolate()), GL_DEPTH_ATTACHMENT, texture);
+        preserveObjectWrapper(scriptState, framebufferBinding, V8PrivateProperty::getWebGLFramebufferAttachments(scriptState->isolate()), GL_STENCIL_ATTACHMENT, texture);
     } else {
         framebufferBinding->setAttachmentForBoundFramebuffer(target, attachment, textarget, texture, level, layer);
-        preserveObjectWrapper(scriptState, framebufferBinding, V8HiddenValue::webglAttachments(scriptState->isolate()), framebufferBinding->getPersistentCache(), attachment, texture);
+        preserveObjectWrapper(scriptState, framebufferBinding, V8PrivateProperty::getWebGLFramebufferAttachments(scriptState->isolate()), attachment, texture);

[Yuki, 2016/06/02 13:07:22]

Could you tell us why you need to preserve the wrapper of |texture|?

Preserved wrapper objects seem never used.  If you only need to keep |texture|
alive, is it enough to keep Member<WebGLTexture> and let Oilpan know the
dependency through DEFINE_TRACE()?  Or do you need the wrapper object of
|texture| alive in addition to |texture| itself?

By the way, the following member variables seem not used.
    ScopedPersistent<v8::Array> m_samplerWrappers;
    ScopedPersistent<v8::Array> m_queryWrappers;

[Ken Russell (switch to Gerrit), 2016/06/03 00:59:19]

Yes, the wrapper objects need to be kept alive, per the WebGL specification and
the associated conformance tests.
Thanks for pointing that out; I missed them. The persistent caches had to be
reintroduced for performance reasons, so these are used again.

     }
     applyStencilTest();
 }
@@ -1778,7 +1778,7 @@ void WebGL2RenderingContextBase::beginQuery(ScriptState* scriptState, GLenum tar
         query->setTarget(target);
 
     contextGL()->BeginQueryEXT(target, query->object());
-    preserveObjectWrapper(scriptState, this, V8HiddenValue::webglQueries(scriptState->isolate()), &m_queryWrappers, static_cast<uint32_t>(target), query);
+    preserveObjectWrapper(scriptState, this, V8PrivateProperty::getWebGLRenderingContextQueries(scriptState->isolate()), static_cast<uint32_t>(target), query);
 }
 
 void WebGL2RenderingContextBase::endQuery(GLenum target)
@@ -1938,7 +1938,7 @@ void WebGL2RenderingContextBase::bindSampler(ScriptState* scriptState, GLuint un
 
     contextGL()->BindSampler(unit, objectOrZero(sampler));
 
-    preserveObjectWrapper(scriptState, this, V8HiddenValue::webglSamplers(scriptState->isolate()), &m_samplerWrappers, static_cast<uint32_t>(unit), sampler);
+    preserveObjectWrapper(scriptState, this, V8PrivateProperty::getWebGLRenderingContextSamplers(scriptState->isolate()), static_cast<uint32_t>(unit), sampler);
 }
 
 void WebGL2RenderingContextBase::samplerParameter(WebGLSampler* sampler, GLenum pname, GLfloat paramf, GLint parami, bool isFloat)
@@ -2197,7 +2197,7 @@ void WebGL2RenderingContextBase::bindTransformFeedback(ScriptState* scriptState,
     contextGL()->BindTransformFeedback(target, objectOrZero(feedback));
     if (feedback) {
         feedback->setTarget(target);
-        preserveObjectWrapper(scriptState, this, V8HiddenValue::webglMisc(scriptState->isolate()), &m_miscWrappers, static_cast<uint32_t>(PreservedTransformFeedback), feedback);
+        preserveObjectWrapper(scriptState, this, V8PrivateProperty::getWebGLRenderingContextMisc(scriptState->isolate()), static_cast<uint32_t>(PreservedTransformFeedback), feedback);
     }
 
 }
@@ -2738,7 +2738,7 @@ void WebGL2RenderingContextBase::bindFramebuffer(ScriptState* scriptState, GLenu
 
     setFramebuffer(target, buffer);
     if (scriptState) {
-        preserveObjectWrapper(scriptState, this, V8HiddenValue::webglMisc(scriptState->isolate()), &m_miscWrappers, static_cast<uint32_t>(PreservedFramebuffer), buffer);
+        preserveObjectWrapper(scriptState, this, V8PrivateProperty::getWebGLRenderingContextMisc(scriptState->isolate()), static_cast<uint32_t>(PreservedFramebuffer), buffer);
     }
 }