diff --git a/cef1/patch/patch.cfg b/cef1/patch/patch.cfg index 356001c3c..d986e5b37 100644 --- a/cef1/patch/patch.cfg +++ b/cef1/patch/patch.cfg @@ -21,6 +21,11 @@ patches = [ 'name': 'message_loop_443', 'path': '../base/', }, + { + # http://code.google.com/p/chromiumembedded/issues/detail?id=844 + 'name': 'webkit_844', + 'path': '../third_party/WebKit/Source/WebCore/loader/', + }, { # http://code.google.com/p/chromiumembedded/issues/detail?id=933 'name': 'webkit_933', diff --git a/cef1/patch/patches/webkit_844.patch b/cef1/patch/patches/webkit_844.patch new file mode 100644 index 000000000..b05791748 --- /dev/null +++ b/cef1/patch/patches/webkit_844.patch @@ -0,0 +1,27 @@ +Index: DocumentLoader.cpp +=================================================================== +--- DocumentLoader.cpp (revision 149374) ++++ DocumentLoader.cpp (working copy) +@@ -510,6 +510,8 @@ + setRequest(newRequest); + + if (!redirectResponse.isNull()) { ++ frameLoader()->client()->dispatchDidReceiveServerRedirectForProvisionalLoad(); ++ + // We checked application cache for initial URL, now we need to check it for redirected one. + ASSERT(!m_substituteData.isValid()); + m_applicationCacheHost->maybeLoadMainResourceForRedirect(newRequest, m_substituteData); +Index: ResourceLoader.cpp +=================================================================== +--- ResourceLoader.cpp (revision 149374) ++++ ResourceLoader.cpp (working copy) +@@ -265,9 +265,6 @@ + #endif + } + m_request = request; +- +- if (!redirectResponse.isNull() && !m_documentLoader->isCommitted()) +- frameLoader()->client()->dispatchDidReceiveServerRedirectForProvisionalLoad(); + } + + void ResourceLoader::didSendData(unsigned long long, unsigned long long)