Changeset 65730 in webkit

Timestamp:

Aug 20, 2010 4:34:16 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-08-20 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: discard InjectedScript reference on ScriptState when clearing injected scripts
​https://bugs.webkit.org/show_bug.cgi?id=44328

Otherwise if the reference is not cleared we may remove InjectedScript from the
map on InjectedScriptHost but keep it on ScriptState and try to reuse it later.

• bindings/js/JSInjectedScriptHostCustom.cpp: (WebCore::InjectedScriptHost::discardInjectedScript):
• bindings/v8/V8HiddenPropertyName.h:
• bindings/v8/custom/V8InjectedScriptHostCustom.cpp: (WebCore::InjectedScriptHost::discardInjectedScript): (WebCore::InjectedScriptHost::injectedScriptFor):
• inspector/InjectedScript.h: (WebCore::InjectedScript::scriptState):
• inspector/InjectedScriptHost.cpp: (WebCore::InjectedScriptHost::discardInjectedScripts):
• inspector/InjectedScriptHost.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSInjectedScriptHostCustom.cpp (modified) (1 diff)
• bindings/v8/V8HiddenPropertyName.h (modified) (1 diff)
• bindings/v8/custom/V8InjectedScriptHostCustom.cpp (modified) (3 diffs)
• inspector/InjectedScript.h (modified) (1 diff)
• inspector/InjectedScriptHost.cpp (modified) (1 diff)
• inspector/InjectedScriptHost.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-20  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: discard InjectedScript reference on ScriptState when clearing injected scripts
+        https://bugs.webkit.org/show_bug.cgi?id=44328
+
+        Otherwise if the reference is not cleared we may remove InjectedScript from the
+        map on InjectedScriptHost but keep it on ScriptState and try to reuse it later.
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::InjectedScriptHost::discardInjectedScript):
+        * bindings/v8/V8HiddenPropertyName.h:
+        * bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
+        (WebCore::InjectedScriptHost::discardInjectedScript):
+        (WebCore::InjectedScriptHost::injectedScriptFor):
+        * inspector/InjectedScript.h:
+        (WebCore::InjectedScript::scriptState):
+        * inspector/InjectedScriptHost.cpp:
+        (WebCore::InjectedScriptHost::discardInjectedScripts):
+        * inspector/InjectedScriptHost.h:
+
 2010-08-20  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp

@@ -104 +104 @@
 }
 
+void InjectedScriptHost::discardInjectedScript(ScriptState* scriptState)
+{
+    JSDOMGlobalObject* globalObject = static_cast<JSDOMGlobalObject*>(scriptState->lexicalGlobalObject());
+    globalObject->setInjectedScript(0);
+}
+
 #if ENABLE(JAVASCRIPT_DEBUGGER)
 JSValue JSInjectedScriptHost::currentCallFrame(ExecState* exec)

trunk/WebCore/bindings/v8/V8HiddenPropertyName.h

@@ -41 +41 @@
     V(attributeListener) \
     V(scriptState) \
+    V(devtoolsInjectedScript) \
     V(sleepFunction) \
     V(toStringString) \
     V(event)
+
 
     class V8HiddenPropertyName {

trunk/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

@@ -47 +47 @@
 #include "V8DOMWindow.h"
 #include "V8Database.h"
+#include "V8HiddenPropertyName.h"
 #include "V8JavaScriptCallFrame.h"
 #include "V8Node.h"
@@ -121 +122 @@
 }
 
+void InjectedScriptHost::discardInjectedScript(ScriptState* inspectedScriptState)
+{
+    v8::HandleScope handleScope;
+    v8::Local<v8::Context> context = inspectedScriptState->context();
+    v8::Context::Scope contextScope(context);
+
+    v8::Local<v8::Object> global = context->Global();
+    // Skip proxy object. The proxy object will survive page navigation while we need
+    // an object whose lifetime consides with that of the inspected context.
+    global = v8::Local<v8::Object>::Cast(global->GetPrototype());
+
+    v8::Handle<v8::String> key = V8HiddenPropertyName::devtoolsInjectedScript();
+    global->DeleteHiddenValue(key);
+}
+
 v8::Handle<v8::Value> V8InjectedScriptHost::nodeForIdCallback(const v8::Arguments& args)
 {
@@ -207 +223 @@
     global = v8::Local<v8::Object>::Cast(global->GetPrototype());
 
-    v8::Local<v8::String> key = v8::String::New("Devtools_InjectedScript");
+    v8::Handle<v8::String> key = V8HiddenPropertyName::devtoolsInjectedScript();
     v8::Local<v8::Value> val = global->GetHiddenValue(key);
     if (!val.IsEmpty() && val->IsObject())

trunk/WebCore/inspector/InjectedScript.h

@@ -55 +55 @@
     PassRefPtr<InspectorValue> wrapForConsole(ScriptValue);
     void releaseWrapperObjectGroup(const String&);
+    ScriptState* scriptState() const { return m_injectedScriptObject.scriptState(); }
 
 private:

trunk/WebCore/inspector/InjectedScriptHost.cpp

@@ -150 +150 @@
 void InjectedScriptHost::discardInjectedScripts()
 {
+    IdToInjectedScriptMap::iterator end = m_idToInjectedScript.end();
+    for (IdToInjectedScriptMap::iterator it = m_idToInjectedScript.begin(); it != end; ++it)
+        discardInjectedScript(it->second.scriptState());
     m_idToInjectedScript.clear();
 }

trunk/WebCore/inspector/InjectedScriptHost.h

@@ -98 +98 @@
     RemoteInspectorFrontend* remoteFrontend();
     ScriptObject createInjectedScript(const String& source, ScriptState* scriptState, long id);
+    void discardInjectedScript(ScriptState*);
 
     InspectorController* m_inspectorController;