Title: [91502] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (91501 => 91502)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-21 21:37:16 UTC (rev 91501)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-21 21:38:56 UTC (rev 91502)
@@ -1,5 +1,22 @@
2011-07-21 Lucas Forschler <[email protected]>
+ Merged 89067.
+
+ 2011-06-16 Abhishek Arya <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ RefPtr frame since it can get removed in
+ FrameLoader::finishedParsing.
+ https://bugs.webkit.org/show_bug.cgi?id=62812
+
+ Tests: already tested by fast/parser/document-write-into-initial-document.html.
+
+ * dom/Document.cpp:
+ (WebCore::Document::finishedParsing):
+
+2011-07-21 Lucas Forschler <[email protected]>
+
Merged 88987.
2011-06-15 Abhishek Arya <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/dom/Document.cpp (91501 => 91502)
--- branches/safari-534.51-branch/Source/WebCore/dom/Document.cpp 2011-07-21 21:37:16 UTC (rev 91501)
+++ branches/safari-534.51-branch/Source/WebCore/dom/Document.cpp 2011-07-21 21:38:56 UTC (rev 91502)
@@ -4259,7 +4259,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>
@@ -4271,7 +4271,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
