Title: [89070] branches/chromium/782/Source/WebCore/dom/Document.cpp
- Revision
- 89070
- Author
- cev...@google.com
- Date
- 2011-06-16 15:05:48 -0700 (Thu, 16 Jun 2011)
Log Message
Merge 89067
BUG=86367
Review URL: http://codereview.chromium.org/7190015
Modified Paths
Diff
Modified: branches/chromium/782/Source/WebCore/dom/Document.cpp (89069 => 89070)
--- branches/chromium/782/Source/WebCore/dom/Document.cpp 2011-06-16 22:01:43 UTC (rev 89069)
+++ branches/chromium/782/Source/WebCore/dom/Document.cpp 2011-06-16 22:05:48 UTC (rev 89070)
@@ -4279,7 +4279,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>
@@ -4291,7 +4291,7 @@
f->loader()->finishedParsing();
- InspectorInstrumentation::domContentLoadedEventFired(f, url());
+ InspectorInstrumentation::domContentLoadedEventFired(f.get(), url());
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
