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

Side by Side Diff: Source/web/AssociatedURLLoader.cpp

Issue 689293003: Notify client when AssociatedURLLoader fail because of unallowed redirect. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | Source/web/tests/AssociatedURLLoaderTest.cpp » ('j') | 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) 2010, 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2010, 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 return; 256 return;
257 257
258 m_didFail = true; 258 m_didFail = true;
259 m_error = WebURLError(error); 259 m_error = WebURLError(error);
260 if (m_enableErrorNotifications) 260 if (m_enableErrorNotifications)
261 notifyError(&m_errorTimer); 261 notifyError(&m_errorTimer);
262 } 262 }
263 263
264 void AssociatedURLLoader::ClientAdapter::didFailRedirectCheck() 264 void AssociatedURLLoader::ClientAdapter::didFailRedirectCheck()
265 { 265 {
266 m_loader->cancel(); 266 didFail(ResourceError());
267 } 267 }
268 268
269 void AssociatedURLLoader::ClientAdapter::setDelayedError(const ResourceError& er ror) 269 void AssociatedURLLoader::ClientAdapter::setDelayedError(const ResourceError& er ror)
270 { 270 {
271 didFail(error); 271 didFail(error);
272 } 272 }
273 273
274 void AssociatedURLLoader::ClientAdapter::enableErrorNotifications() 274 void AssociatedURLLoader::ClientAdapter::enableErrorNotifications()
275 { 275 {
276 m_enableErrorNotifications = true; 276 m_enableErrorNotifications = true;
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 m_loader->cancel(); 376 m_loader->cancel();
377 } 377 }
378 378
379 void AssociatedURLLoader::setDefersLoading(bool defersLoading) 379 void AssociatedURLLoader::setDefersLoading(bool defersLoading)
380 { 380 {
381 if (m_loader) 381 if (m_loader)
382 m_loader->setDefersLoading(defersLoading); 382 m_loader->setDefersLoading(defersLoading);
383 } 383 }
384 384
385 } // namespace blink 385 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/web/tests/AssociatedURLLoaderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698