Changeset 99386 in webkit

Timestamp:

Nov 6, 2011, 2:52:22 PM (15 years ago)

Author:

abarth@webkit.org

Message:

Don't crash when a context hasn't been created. This fixed a
testing-only crash on the bots in the Chromium port.

• testing/v8/WebCoreTestSupport.cpp:

(WebCoreTestSupport::resetInternalsObject):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• testing/v8/WebCoreTestSupport.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-06  Adam Barth  <abarth@webkit.org>
+
+        Don't crash when a context hasn't been created.  This fixed a
+        testing-only crash on the bots in the Chromium port.
+
+        * testing/v8/WebCoreTestSupport.cpp:
+        (WebCoreTestSupport::resetInternalsObject):
+
 2011-11-06  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/testing/v8/WebCoreTestSupport.cpp

@@ -48 +48 @@
 void resetInternalsObject(v8::Local<v8::Context> context)
 {
+    // This can happen if JavaScript is disabled in the main frame.
+    if (context.IsEmpty())
+        return;
+
     v8::Context::Scope contextScope(context);
     v8::HandleScope scope;
 
     v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(context->Global()->Get(v8::String::New(Internals::internalsId)));
-    Internals * internals = V8Internals::toNative(object);
+    Internals* internals = V8Internals::toNative(object);
     if (internals) {
         ScriptExecutionContext* scriptContext = getScriptExecutionContext();