Changeset 127426 in webkit

Timestamp:

Sep 3, 2012 9:09:54 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: [WebGL] Make the injected resourceObject property non-enumerable
​https://bugs.webkit.org/show_bug.cgi?id=95682

Patch by Andrey Adaikin <​aandrey@chromium.org> on 2012-09-03
Reviewed by Pavel Feldman.

Make the injected auxiliary property resourceObject non-enumerable to hide it from for..in iterations.
Ideally this property should be completely hidden from the user's code.
Drive-by: Fix couple of small FIXME's.

• inspector/InjectedScriptWebGLModuleSource.js:

(.):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptWebGLModuleSource.js (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-03  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: [WebGL] Make the injected __resourceObject property non-enumerable
+        https://bugs.webkit.org/show_bug.cgi?id=95682
+
+        Reviewed by Pavel Feldman.
+
+        Make the injected auxiliary property __resourceObject non-enumerable to hide it from for..in iterations.
+        Ideally this property should be completely hidden from the user's code.
+        Drive-by: Fix couple of small FIXME's.
+
+        * inspector/InjectedScriptWebGLModuleSource.js:
+        (.):
+
 2012-09-03  Tommy Widenflycht  <tommyw@google.com>
 

trunk/Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js

@@ -650 +650 @@
 
     /**
-     * @param {Object} object
+     * @param {!Object} object
      */
     _bindObjectToResource: function(object)
     {
-        object["__resourceObject"] = this;
+        Object.defineProperty(object, "__resourceObject", {
+            value: this,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
     }
 }
@@ -1439 +1444 @@
                     set: function(value)
                     {
+                        console.error("ASSERT_NOT_REACHED: We assume all WebGLRenderingContext attributes are readonly. Trying to mutate " + property);
                         gl[property] = value;
                     }
@@ -1448 +1454 @@
             processProperty(property);
 
+        this._bindObjectToResource(proxy);
         return proxy;
     },
@@ -1859 +1866 @@
     wrapWebGLContext: function(glContext)
     {
-        var resource = Resource.forObject(glContext) || new WebGLRenderingContextResource(glContext, this._constructReplayContext.bind(this, glContext));
+        var resource = Resource.forObject(glContext) || new WebGLRenderingContextResource(glContext, this._constructWebGLReplayContext.bind(this, glContext));
         this._manager.registerResource(resource);
         var proxy = resource.proxyObject();
@@ -1952 +1959 @@
      * @return {WebGLRenderingContext}
      */
-    _constructReplayContext: function(originalGlContext)
+    _constructWebGLReplayContext: function(originalGlContext)
     {
         var replayContext = originalGlContext["__replayContext"];
         if (!replayContext) {
             var canvas = originalGlContext.canvas.cloneNode(true);
-            // FIXME: Pass original context id instead of "experimental-webgl".
-            // FIXME: Pass original ContextAttributes to the getContext() method.
-            replayContext = /** @type {WebGLRenderingContext} */ Resource.wrappedObject(canvas.getContext("experimental-webgl"));
-            originalGlContext["__replayContext"] = replayContext;
+            var attributes = originalGlContext.getContextAttributes();
+            var contextIds = ["experimental-webgl", "webkit-3d", "3d"];
+            for (var i = 0, contextId; contextId = contextIds[i]; ++i) {
+                replayContext = canvas.getContext(contextId, attributes);
+                if (replayContext) {
+                    replayContext = /** @type {WebGLRenderingContext} */ Resource.wrappedObject(replayContext);
+                    break;
+                }
+            }
+            Object.defineProperty(originalGlContext, "__replayContext", {
+                value: replayContext,
+                writable: false,
+                enumerable: false,
+                configurable: true
+            });
             this._replayContext = replayContext;
         } else {