Changeset 56452 in webkit

Timestamp:

Mar 24, 2010 1:02:55 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-24 Anton Muhin <​antonm@chromium.org>

Reviewed by Nate Chapin.

Use newly introduced SetPrototype method to deal with global objects.
​https://bugs.webkit.org/show_bug.cgi?id=36497

No new tests, should be covered by the current test infrastructure.

• bindings/v8/V8DOMWindowShell.cpp: (WebCore::V8DOMWindowShell::installDOMWindow):
• bindings/v8/V8DOMWrapper.cpp: (WebCore::V8DOMWrapper::getConstructor):
• bindings/v8/WorkerContextExecutionProxy.cpp: (WebCore::WorkerContextExecutionProxy::initContextIfNeeded):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8DOMWindowShell.cpp (modified) (2 diffs)
• bindings/v8/V8DOMWrapper.cpp (modified) (1 diff)
• bindings/v8/WorkerContextExecutionProxy.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-24  Anton Muhin  <antonm@chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        Use newly introduced SetPrototype method to deal with global objects.
+        https://bugs.webkit.org/show_bug.cgi?id=36497
+
+        No new tests, should be covered by the current test infrastructure.
+
+        * bindings/v8/V8DOMWindowShell.cpp:
+        (WebCore::V8DOMWindowShell::installDOMWindow):
+        * bindings/v8/V8DOMWrapper.cpp:
+        (WebCore::V8DOMWrapper::getConstructor):
+        * bindings/v8/WorkerContextExecutionProxy.cpp:
+        (WebCore::WorkerContextExecutionProxy::initContextIfNeeded):
+
 2010-03-24  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/bindings/v8/V8DOMWindowShell.cpp

@@ -345 +345 @@
 bool V8DOMWindowShell::installDOMWindow(v8::Handle<v8::Context> context, DOMWindow* window)
 {
-    v8::Handle<v8::String> implicitProtoString = v8::String::New("__proto__");
-    if (implicitProtoString.IsEmpty())
-        return false;
-
     // Create a new JS window object and use it as the prototype for the  shadow global object.
     v8::Handle<v8::Function> windowConstructor = V8DOMWrapper::getConstructor(&V8DOMWindow::info, getHiddenObjectPrototype(context));
@@ -364 +360 @@
 
     // Insert the window instance as the prototype of the shadow object.
-    v8::Handle<v8::Object> v8Global = context->Global();
-    V8DOMWrapper::setDOMWrapper(v8::Handle<v8::Object>::Cast(v8Global->GetPrototype()), &V8DOMWindow::info, window);
-    v8Global->Set(implicitProtoString, jsWindow);
+    v8::Handle<v8::Object> v8RealGlobal = v8::Handle<v8::Object>::Cast(context->Global()->GetPrototype());
+    V8DOMWrapper::setDOMWrapper(v8RealGlobal, &V8DOMWindow::info, window);
+    v8RealGlobal->SetPrototype(jsWindow);
     return true;
 }

trunk/WebCore/bindings/v8/V8DOMWrapper.cpp

@@ -135 +135 @@
     // Hotmail fix, see comments above.
     if (!objectPrototype.IsEmpty())
-        value->Set(v8::String::New("__proto__"), objectPrototype);
+        value->SetPrototype(objectPrototype);
     return value;
 }

trunk/WebCore/bindings/v8/WorkerContextExecutionProxy.cpp

@@ -166 +166 @@
     v8::Context::Scope scope(context);
 
-    // Allocate strings used during initialization.
-    v8::Handle<v8::String> implicitProtoString = v8::String::New("__proto__");
-
     // Create a new JS object and use it as the prototype for the shadow global object.
     WrapperTypeInfo* contextType = &V8DedicatedWorkerContext::info;
@@ -190 +187 @@
 
     // Insert the object instance as the prototype of the shadow object.
-    v8::Handle<v8::Object> globalObject = m_context->Global();
-    globalObject->Set(implicitProtoString, jsWorkerContext);
+    v8::Handle<v8::Object> globalObject = v8::Handle<v8::Object>::Cast(m_context->Global()->GetPrototype());
+    globalObject->SetPrototype(jsWorkerContext);
     return true;
 }