| Index: Source/web/WebViewImpl.cpp
|
| diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
|
| index dcfbd0aa20221c191454e21706336f561e2ad99e..54c46321b7037f7d9ed596c994e6b3ea18334b46 100644
|
| --- a/Source/web/WebViewImpl.cpp
|
| +++ b/Source/web/WebViewImpl.cpp
|
| @@ -71,6 +71,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/Chrome.h"
|
| #include "core/page/ContextMenuController.h"
|
| @@ -2854,8 +2855,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 = FrameLoader::frameRequestForReload(
|
| + FrameLoader::resourceRequestForReload(
|
| + m_page->deprecatedLocalMainFrame()->loader().currentItem(),
|
| + *m_page->deprecatedLocalMainFrame(), FrameLoadTypeReload, KURL(), ClientRedirect),
|
| + ClientRedirect);
|
| + m_page->deprecatedLocalMainFrame()->loader().load(request, FrameLoadTypeReload);
|
| + }
|
| }
|
|
|
| WebFrame* WebViewImpl::mainFrame()
|
|
|