Add patch to fix OnBeforeBrowse |isRedirect| parameter (issue #844).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1256 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-05-20 19:55:51 +00:00
parent 52b1159aa8
commit aa546ffcc0
2 changed files with 32 additions and 0 deletions

View File

@@ -21,6 +21,11 @@ patches = [
'name': 'message_loop_443', 'name': 'message_loop_443',
'path': '../base/', '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 # http://code.google.com/p/chromiumembedded/issues/detail?id=933
'name': 'webkit_933', 'name': 'webkit_933',

View File

@@ -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)