Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: Source/core/loader/ResourceLoader.cpp

Issue 15303010: Call dispatchDidReceiveServerRedirectForProvisionalLoad before checking navigation policy for a red… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com) 3 * (C) 2007 Graham Dennis (graham.dennis@gmail.com)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 if (request.isNull() || reachedTerminalState()) 321 if (request.isNull() || reachedTerminalState())
322 return; 322 return;
323 323
324 if (m_options.sendLoadCallbacks == SendCallbacks) 324 if (m_options.sendLoadCallbacks == SendCallbacks)
325 frameLoader()->notifier()->willSendRequest(this, request, redirectRespon se); 325 frameLoader()->notifier()->willSendRequest(this, request, redirectRespon se);
326 else 326 else
327 InspectorInstrumentation::willSendRequest(m_frame.get(), m_identifier, m _frame->loader()->documentLoader(), request, redirectResponse); 327 InspectorInstrumentation::willSendRequest(m_frame.get(), m_identifier, m _frame->loader()->documentLoader(), request, redirectResponse);
328 328
329 m_request = request; 329 m_request = request;
330 330
331 if (!redirectResponse.isNull() && !m_documentLoader->isCommitted())
332 frameLoader()->client()->dispatchDidReceiveServerRedirectForProvisionalL oad();
333
334 if (request.isNull()) 331 if (request.isNull())
335 cancel(); 332 cancel();
336 } 333 }
337 334
338 void ResourceLoader::didReceiveCachedMetadata(ResourceHandle*, const char* data, int length) 335 void ResourceLoader::didReceiveCachedMetadata(ResourceHandle*, const char* data, int length)
339 { 336 {
340 ASSERT(m_state == Initialized); 337 ASSERT(m_state == Initialized);
341 ASSERT(!m_resource->resourceToRevalidate()); 338 ASSERT(!m_resource->resourceToRevalidate());
342 m_resource->setSerializedCachedMetadata(data, length); 339 m_resource->setSerializedCachedMetadata(data, length);
343 } 340 }
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 info.addMember(m_request, "request"); 489 info.addMember(m_request, "request");
493 info.addMember(m_originalRequest, "originalRequest"); 490 info.addMember(m_originalRequest, "originalRequest");
494 info.addMember(m_deferredRequest, "deferredRequest"); 491 info.addMember(m_deferredRequest, "deferredRequest");
495 info.addMember(m_options, "options"); 492 info.addMember(m_options, "options");
496 info.addMember(m_resource, "resource"); 493 info.addMember(m_resource, "resource");
497 info.addMember(m_documentLoader, "documentLoader"); 494 info.addMember(m_documentLoader, "documentLoader");
498 info.addMember(m_requestCountTracker, "requestCountTracker"); 495 info.addMember(m_requestCountTracker, "requestCountTracker");
499 } 496 }
500 497
501 } 498 }
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698