Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(926)

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h

Issue 2023603003: Fix content scripts that use WebGL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@yukishiino-v8privateproperty-fix
Patch Set: Rebased. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
index f6738b88b58248e6ae101cf6b1e65dac499bdb38..1a98dc8ba87f00069983f185e11a4dcafe44900b 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.h
@@ -27,10 +27,10 @@
#define WebGLRenderingContextBase_h
#include "bindings/core/v8/Nullable.h"
-#include "bindings/core/v8/ScopedPersistent.h"
#include "bindings/core/v8/ScriptState.h"
#include "bindings/core/v8/ScriptValue.h"
#include "bindings/core/v8/ScriptWrappable.h"
+#include "bindings/core/v8/V8PrivateProperty.h"
#include "core/CoreExport.h"
#include "core/dom/DOMTypedArray.h"
#include "core/dom/TypedFlexibleArrayBufferView.h"
@@ -1036,16 +1036,6 @@ protected:
virtual void renderbufferStorageImpl(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, const char* functionName);
- // Ensures that the JavaScript wrappers for objects that are
- // latched into the context's state, or which are implicitly
- // linked together (like programs and their attached shaders), are
- // not garbage collected before they should be.
- ScopedPersistent<v8::Array> m_2DTextureWrappers;
- ScopedPersistent<v8::Array> m_2DArrayTextureWrappers;
- ScopedPersistent<v8::Array> m_3DTextureWrappers;
- ScopedPersistent<v8::Array> m_cubeMapTextureWrappers;
- ScopedPersistent<v8::Array> m_extensionWrappers;
-
// The "catch-all" array for the rest of the preserved object
// wrappers. The enum below defines how the indices in this array
// are used.
@@ -1059,9 +1049,8 @@ protected:
PreservedVAO,
PreservedTransformFeedback,
};
- ScopedPersistent<v8::Array> m_miscWrappers;
- static void preserveObjectWrapper(ScriptState*, ScriptWrappable* sourceObject, v8::Local<v8::String> hiddenValueName, ScopedPersistent<v8::Array>* persistentCache, uint32_t index, ScriptWrappable* targetObject);
+ static void preserveObjectWrapper(ScriptState*, ScriptWrappable* sourceObject, const V8PrivateProperty::Symbol& privateSymbol, uint32_t index, ScriptWrappable* targetObject);
// Called to lazily instantiate the wrapper for the default VAO
// during calls to bindBuffer and vertexAttribPointer (from

Powered by Google App Engine
This is Rietveld 408576698