| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 6 * (http://www.torchmobile.com/) | 6 * (http://www.torchmobile.com/) |
| 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 10 * Copyright (C) 2011 Google Inc. All rights reserved. | 10 * Copyright (C) 2011 Google Inc. All rights reserved. |
| (...skipping 1221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1232 Document::NoDismissal) | 1232 Document::NoDismissal) |
| 1233 return; | 1233 return; |
| 1234 | 1234 |
| 1235 // If this method is called from within this method, infinite recursion can | 1235 // If this method is called from within this method, infinite recursion can |
| 1236 // occur (3442218). Avoid this. | 1236 // occur (3442218). Avoid this. |
| 1237 if (m_inStopAllLoaders) | 1237 if (m_inStopAllLoaders) |
| 1238 return; | 1238 return; |
| 1239 | 1239 |
| 1240 m_inStopAllLoaders = true; | 1240 m_inStopAllLoaders = true; |
| 1241 | 1241 |
| 1242 if (m_isNavigationHandledByClient) { |
| 1243 client()->dispatchDidFailProvisionalLoad( |
| 1244 ResourceError::cancelledError(String()), StandardCommit); |
| 1245 } |
| 1246 |
| 1242 m_isNavigationHandledByClient = false; | 1247 m_isNavigationHandledByClient = false; |
| 1243 | 1248 |
| 1244 for (Frame* child = m_frame->tree().firstChild(); child; | 1249 for (Frame* child = m_frame->tree().firstChild(); child; |
| 1245 child = child->tree().nextSibling()) { | 1250 child = child->tree().nextSibling()) { |
| 1246 if (child->isLocalFrame()) | 1251 if (child->isLocalFrame()) |
| 1247 toLocalFrame(child)->loader().stopAllLoaders(); | 1252 toLocalFrame(child)->loader().stopAllLoaders(); |
| 1248 } | 1253 } |
| 1249 | 1254 |
| 1250 m_frame->document()->suppressLoadEvent(); | 1255 m_frame->document()->suppressLoadEvent(); |
| 1251 if (m_documentLoader) | 1256 if (m_documentLoader) |
| (...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2005 frameLoadRequest.clientRedirect()); | 2010 frameLoadRequest.clientRedirect()); |
| 2006 | 2011 |
| 2007 loader->setLoadType(loadType); | 2012 loader->setLoadType(loadType); |
| 2008 loader->setNavigationType(navigationType); | 2013 loader->setNavigationType(navigationType); |
| 2009 loader->setReplacesCurrentHistoryItem(loadType == | 2014 loader->setReplacesCurrentHistoryItem(loadType == |
| 2010 FrameLoadTypeReplaceCurrentItem); | 2015 FrameLoadTypeReplaceCurrentItem); |
| 2011 return loader; | 2016 return loader; |
| 2012 } | 2017 } |
| 2013 | 2018 |
| 2014 } // namespace blink | 2019 } // namespace blink |
| OLD | NEW |