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

Side by Side Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2624723002: PlzNavigate: fix regression on the FYI bot. (Closed)
Patch Set: PlzNavigate: fix regression on the FYI bot. Created 3 years, 11 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
« no previous file with comments | « no previous file | 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, 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 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after
1454 if (m_progressTracker) { 1454 if (m_progressTracker) {
1455 m_progressTracker->dispose(); 1455 m_progressTracker->dispose();
1456 m_progressTracker.clear(); 1456 m_progressTracker.clear();
1457 } 1457 }
1458 1458
1459 TRACE_EVENT_OBJECT_DELETED_WITH_ID("loading", "FrameLoader", this); 1459 TRACE_EVENT_OBJECT_DELETED_WITH_ID("loading", "FrameLoader", this);
1460 } 1460 }
1461 1461
1462 void FrameLoader::loadFailed(DocumentLoader* loader, 1462 void FrameLoader::loadFailed(DocumentLoader* loader,
1463 const ResourceError& error) { 1463 const ResourceError& error) {
1464 m_isNavigationHandledByClient = false;
Nate Chapin 2017/01/11 20:30:46 This isn't obvious to me. A blink-internal navigat
arthursonzogni 2017/01/12 12:33:29 If an external navigation is in progress, what oth
1464 if (!error.isCancellation() && m_frame->owner()) { 1465 if (!error.isCancellation() && m_frame->owner()) {
1465 // FIXME: For now, fallback content doesn't work cross process. 1466 // FIXME: For now, fallback content doesn't work cross process.
1466 if (m_frame->owner()->isLocal()) 1467 if (m_frame->owner()->isLocal())
1467 m_frame->deprecatedLocalOwner()->renderFallbackContent(); 1468 m_frame->deprecatedLocalOwner()->renderFallbackContent();
1468 } 1469 }
1469 1470
1470 HistoryCommitType historyCommitType = loadTypeToCommitType(m_loadType); 1471 HistoryCommitType historyCommitType = loadTypeToCommitType(m_loadType);
1471 if (loader == m_provisionalDocumentLoader) { 1472 if (loader == m_provisionalDocumentLoader) {
1472 m_provisionalDocumentLoader->setSentDidFinishLoad(); 1473 m_provisionalDocumentLoader->setSentDidFinishLoad();
1473 client()->dispatchDidFailProvisionalLoad(error, historyCommitType); 1474 client()->dispatchDidFailProvisionalLoad(error, historyCommitType);
1474 if (loader != m_provisionalDocumentLoader) 1475 if (loader != m_provisionalDocumentLoader)
1475 return; 1476 return;
1476 detachDocumentLoader(m_provisionalDocumentLoader); 1477 detachDocumentLoader(m_provisionalDocumentLoader);
1477 } else { 1478 } else {
1478 DCHECK_EQ(loader, m_documentLoader); 1479 DCHECK_EQ(loader, m_documentLoader);
1479 if (m_frame->document()->parser()) 1480 if (m_frame->document()->parser())
1480 m_frame->document()->parser()->stopParsing(); 1481 m_frame->document()->parser()->stopParsing();
1481 if (!m_documentLoader->sentDidFinishLoad()) { 1482 if (!m_documentLoader->sentDidFinishLoad()) {
1482 m_documentLoader->setSentDidFinishLoad(); 1483 m_documentLoader->setSentDidFinishLoad();
1483 client()->dispatchDidFailLoad(error, historyCommitType); 1484 client()->dispatchDidFailLoad(error, historyCommitType);
1484 } 1485 }
1485 } 1486 }
1486 checkCompleted(); 1487 checkCompleted();
arthursonzogni 2017/01/10 13:24:25 In https://codereview.chromium.org/2563423004 in F
1487 } 1488 }
1488 1489
1489 bool FrameLoader::shouldPerformFragmentNavigation(bool isFormSubmission, 1490 bool FrameLoader::shouldPerformFragmentNavigation(bool isFormSubmission,
1490 const String& httpMethod, 1491 const String& httpMethod,
1491 FrameLoadType loadType, 1492 FrameLoadType loadType,
1492 const KURL& url) { 1493 const KURL& url) {
1493 // We don't do this if we are submitting a form with method other than "GET", 1494 // We don't do this if we are submitting a form with method other than "GET",
1494 // explicitly reloading, currently displaying a frameset, or if the URL does 1495 // explicitly reloading, currently displaying a frameset, or if the URL does
1495 // not have a fragment. 1496 // not have a fragment.
1496 return (!isFormSubmission || equalIgnoringCase(httpMethod, HTTPNames::GET)) && 1497 return (!isFormSubmission || equalIgnoringCase(httpMethod, HTTPNames::GET)) &&
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
1896 m_documentLoader ? m_documentLoader->url() : String()); 1897 m_documentLoader ? m_documentLoader->url() : String());
1897 return tracedValue; 1898 return tracedValue;
1898 } 1899 }
1899 1900
1900 inline void FrameLoader::takeObjectSnapshot() const { 1901 inline void FrameLoader::takeObjectSnapshot() const {
1901 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, 1902 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
1902 toTracedValue()); 1903 toTracedValue());
1903 } 1904 }
1904 1905
1905 } // namespace blink 1906 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698