Title: [95460] branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp
- Revision
- 95460
- Author
- [email protected]
- Date
- 2011-09-19 13:09:39 -0700 (Mon, 19 Sep 2011)
Log Message
Manual merge of 94902 to 874 branch.
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp (95459 => 95460)
--- branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp 2011-09-19 20:07:46 UTC (rev 95459)
+++ branches/chromium/874/Source/WebCore/loader/FrameLoader.cpp 2011-09-19 20:09:39 UTC (rev 95460)
@@ -2539,11 +2539,6 @@
// Make sure we send the Origin header.
addHTTPOriginIfNeeded(request, String());
-
- // 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());
}
void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest& request, const String& origin)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
