Index: Source/web/WebViewImpl.cpp |
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp |
index 9be0184e482fc82dc9fe2aa9ec055af4336499e1..8d0187ebec2061a4fbc22b986e5f49193f386605 100644 |
--- a/Source/web/WebViewImpl.cpp |
+++ b/Source/web/WebViewImpl.cpp |
@@ -72,6 +72,7 @@ |
#include "core/layout/TextAutosizer.h" |
#include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" |
#include "core/loader/DocumentLoader.h" |
+#include "core/loader/FrameLoadRequest.h" |
#include "core/loader/FrameLoader.h" |
#include "core/page/ContextMenuController.h" |
#include "core/page/ContextMenuProvider.h" |
@@ -2759,8 +2760,16 @@ void WebViewImpl::setPageEncoding(const WebString& encodingName) |
newEncodingName = encodingName; |
m_page->frameHost().setOverrideEncoding(newEncodingName); |
- if (m_page->mainFrame()->isLocalFrame()) |
- m_page->deprecatedLocalMainFrame()->loader().reload(NormalReload); |
+ if (m_page->mainFrame()->isLocalFrame()) { |
+ if (!m_page->deprecatedLocalMainFrame()->loader().currentItem()) |
+ return; |
+ FrameLoadRequest request = FrameLoadRequest( |
+ nullptr, |
+ m_page->deprecatedLocalMainFrame()->loader().resourceRequestForReload( |
+ FrameLoadTypeReload, KURL(), ClientRedirect)); |
+ request.setClientRedirect(ClientRedirect); |
+ m_page->deprecatedLocalMainFrame()->loader().load(request, FrameLoadTypeReload); |
+ } |
} |
WebFrame* WebViewImpl::mainFrame() |