Changeset 24516 in webkit

Timestamp:

Jul 22, 2007, 12:43:43 PM (18 years ago)

Author:

darin

Message:

Reviewed by Adam.

• fix <rdar://problem/5350604> REGRESSION: Crash in inspector controller code after clicking back button in test application (13250)

• page/InspectorController.cpp: (WebCore::InspectorController::addScriptResource): Replace an assertion that was firing with some code that at least doesn't immediately crash.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/InspectorController.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-18  Darin Adler  <darin@apple.com>
+
+        Reviewed by Adam.
+
+        - fix <rdar://problem/5350604> REGRESSION: Crash in inspector controller code after
+          clicking back button in test application (13250)
+
+        * page/InspectorController.cpp: (WebCore::InspectorController::addScriptResource):
+        Replace an assertion that was firing with some code that at least doesn't immediately crash.
+
 2007-07-22  Darin Adler  <darin@apple.com>
 

trunk/WebCore/page/InspectorController.cpp

@@ -727 +727 @@
 {
     ASSERT_ARG(resource, resource);
-    ASSERT(!resource->scriptObject);
+
+    // This happens for pages loaded from the back/forward cache.
+    if (resource->scriptObject)
+        return resource->scriptObject;
 
     ASSERT(m_scriptContext);