Title: [114432] branches/safari-534.57-branch/Source/WebCore
- Revision
- 114432
- Author
- lforsch...@apple.com
- Date
- 2012-04-17 14:28:52 -0700 (Tue, 17 Apr 2012)
Log Message
Merge 114142.
Modified Paths
Diff
Modified: branches/safari-534.57-branch/Source/WebCore/ChangeLog (114431 => 114432)
--- branches/safari-534.57-branch/Source/WebCore/ChangeLog 2012-04-17 20:56:12 UTC (rev 114431)
+++ branches/safari-534.57-branch/Source/WebCore/ChangeLog 2012-04-17 21:28:52 UTC (rev 114432)
@@ -1,3 +1,19 @@
+2012-04-17 Lucas Forschler <lforsch...@apple.com>
+
+ Merging to the correct branch.
+
+ 2012-04-13 David Harrison <harri...@apple.com>
+
+ Reviewed by Darin Adler.
+
+ <rdar://problem/10552398> Meringue: 11A390: CrashTracer: 56,187 crashes in WebProcess at com.apple.WebCore: WebCore::DocumentWriter::deprecatedFrameEncoding const + 12 (71828)
+
+ No new tests because this change is going only on the Safari Nectarine branch, not TOT.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::addExtraFieldsToRequest):
+ Nil check the activeDocumentLoader().
+
2012-03-29 Beth Dakin <bda...@apple.com>
Reviewed by Dan Bernstein.
Modified: branches/safari-534.57-branch/Source/WebCore/loader/FrameLoader.cpp (114431 => 114432)
--- branches/safari-534.57-branch/Source/WebCore/loader/FrameLoader.cpp 2012-04-17 20:56:12 UTC (rev 114431)
+++ branches/safari-534.57-branch/Source/WebCore/loader/FrameLoader.cpp 2012-04-17 21:28:52 UTC (rev 114432)
@@ -2795,7 +2795,8 @@
// Always try UTF-8. If that fails, try frame encoding (if any) and then the default.
// For a newly opened frame with an empty URL, encoding() should not be used, because this methods asks decoder, which uses ISO-8859-1.
Settings* settings = m_frame->settings();
- request.setResponseContentDispositionEncodingFallbackArray("UTF-8", activeDocumentLoader()->writer()->deprecatedFrameEncoding(), settings ? settings->defaultTextEncodingName() : String());
+ DocumentLoader* docLoader = activeDocumentLoader();
+ request.setResponseContentDispositionEncodingFallbackArray("UTF-8", docLoader ? docLoader->writer()->deprecatedFrameEncoding() : String(), settings ? settings->defaultTextEncodingName() : String());
}
void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest& request, String origin)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
