Changeset 31304 in webkit

Timestamp:

Mar 25, 2008 6:32:44 PM (16 years ago)

Author:

pewtermoose@webkit.org

Message:

2008-03-25 Matt Lilek <​webkit@mattlilek.com>

Rubber stamped by Adam

Roll out r30300 since it causes assertion failures on page load.
See ​http://bugs.webkit.org/show_bug.cgi?id=18093

• page/InspectorController.cpp: (WebCore::InspectorController::didFinishLoading): (WebCore::InspectorController::didFailLoading):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-25  Matt Lilek  <webkit@mattlilek.com>
+
+        Rubber stamped by Adam
+
+        Roll out r30300 since it causes assertion failures on page load.
+        See http://bugs.webkit.org/show_bug.cgi?id=18093
+
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::didFinishLoading):
+        (WebCore::InspectorController::didFailLoading):
+
 2008-03-25  Darin Adler  <darin@apple.com>
 

trunk/WebCore/page/InspectorController.cpp

@@ -1575 +1575 @@
         return;
 
-    InspectorResource* resource = m_resources.get(identifier).get();
+    RefPtr<InspectorResource> resource = m_resources.get(identifier);
     if (!resource)
         return;
 
-    removeResource(resource);
+    removeResource(resource.get());
 
     resource->finished = true;
     resource->endTime = currentTime();
 
-    addResource(resource);
+    addResource(resource.get());
 
     if (windowVisible() && resource->scriptObject) {
-        updateScriptResource(resource, resource->startTime, resource->responseReceivedTime, resource->endTime);
-        updateScriptResource(resource, resource->finished);
+        updateScriptResource(resource.get(), resource->startTime, resource->responseReceivedTime, resource->endTime);
+        updateScriptResource(resource.get(), resource->finished);
     }
 }
@@ -1597 +1597 @@
         return;
 
-    InspectorResource* resource = m_resources.get(identifier).get();
+    RefPtr<InspectorResource> resource = m_resources.get(identifier);
     if (!resource)
         return;
 
-    removeResource(resource);
+    removeResource(resource.get());
 
     resource->finished = true;
@@ -1607 +1607 @@
     resource->endTime = currentTime();
 
-    addResource(resource);
+    addResource(resource.get());
 
     if (windowVisible() && resource->scriptObject) {
-        updateScriptResource(resource, resource->startTime, resource->responseReceivedTime, resource->endTime);
-        updateScriptResource(resource, resource->finished, resource->failed);
+        updateScriptResource(resource.get(), resource->startTime, resource->responseReceivedTime, resource->endTime);
+        updateScriptResource(resource.get(), resource->finished, resource->failed);
     }
 }