Title: [89068] branches/chromium/742/Source/WebCore/dom/Document.cpp
Revision
89068
Author
[email protected]
Date
2011-06-16 14:54:10 -0700 (Thu, 16 Jun 2011)

Log Message

Merge 89067
BUG=86367
Review URL: http://codereview.chromium.org/7189020

Modified Paths

Diff

Modified: branches/chromium/742/Source/WebCore/dom/Document.cpp (89067 => 89068)


--- branches/chromium/742/Source/WebCore/dom/Document.cpp	2011-06-16 21:27:30 UTC (rev 89067)
+++ branches/chromium/742/Source/WebCore/dom/Document.cpp	2011-06-16 21:54:10 UTC (rev 89068)
@@ -4209,7 +4209,7 @@
     if (!m_documentTiming.domContentLoadedEventEnd)
         m_documentTiming.domContentLoadedEventEnd = currentTime();
 
-    if (Frame* f = frame()) {
+    if (RefPtr<Frame> f = frame()) {
         // FrameLoader::finishedParsing() might end up calling Document::implicitClose() if all
         // resource loads are complete. HTMLObjectElements can start loading their resources from
         // post attach callbacks triggered by recalcStyle().  This means if we parse out an <object>
@@ -4221,7 +4221,7 @@
 
         f->loader()->finishedParsing();
 
-        InspectorInstrumentation::domContentLoadedEventFired(f, url());
+        InspectorInstrumentation::domContentLoadedEventFired(f.get(), url());
     }
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to