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

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

Issue 1838733002: Allow LoadNavigationErrorPage to run scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 488
489 // This can be called from the LocalFrame's destructor, in which case we sho uldn't protect ourselves 489 // This can be called from the LocalFrame's destructor, in which case we sho uldn't protect ourselves
490 // because doing so will cause us to re-enter the destructor when protector goes out of scope. 490 // because doing so will cause us to re-enter the destructor when protector goes out of scope.
491 // Null-checking the FrameView indicates whether or not we're in the destruc tor. 491 // Null-checking the FrameView indicates whether or not we're in the destruc tor.
492 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame->view() ? m_frame.get() : nul lptr); 492 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame->view() ? m_frame.get() : nul lptr);
493 493
494 m_progressTracker->finishedParsing(); 494 m_progressTracker->finishedParsing();
495 495
496 if (client()) { 496 if (client()) {
497 ScriptForbiddenScope forbidScripts; 497 ScriptForbiddenScope forbidScripts;
498 client()->dispatchDidFinishDocumentLoad(m_documentLoader ? m_documentLoa der->isCommittedButEmpty() : true); 498 client()->dispatchDidFinishDocumentLoad();
499 } 499 }
500 500
501 if (client()) 501 if (client())
502 client()->runScriptsAtDocumentReady(); 502 client()->runScriptsAtDocumentReady(m_documentLoader ? m_documentLoader- >isCommittedButEmpty() : true);
503 503
504 checkCompleted(); 504 checkCompleted();
505 505
506 if (!m_frame->view()) 506 if (!m_frame->view())
507 return; // We are being destroyed by something checkCompleted called. 507 return; // We are being destroyed by something checkCompleted called.
508 508
509 // Check if the scrollbars are really needed for the content. 509 // Check if the scrollbars are really needed for the content.
510 // If not, remove them, relayout, and repaint. 510 // If not, remove them, relayout, and repaint.
511 m_frame->view()->restoreScrollbar(); 511 m_frame->view()->restoreScrollbar();
512 processFragment(m_frame->document()->url(), NavigationToDifferentDocument); 512 processFragment(m_frame->document()->url(), NavigationToDifferentDocument);
(...skipping 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 // FIXME: We need a way to propagate insecure requests policy flags to 1584 // FIXME: We need a way to propagate insecure requests policy flags to
1585 // out-of-process frames. For now, we'll always use default behavior. 1585 // out-of-process frames. For now, we'll always use default behavior.
1586 if (!parentFrame->isLocalFrame()) 1586 if (!parentFrame->isLocalFrame())
1587 return nullptr; 1587 return nullptr;
1588 1588
1589 ASSERT(toLocalFrame(parentFrame)->document()); 1589 ASSERT(toLocalFrame(parentFrame)->document());
1590 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1590 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1591 } 1591 }
1592 1592
1593 } // namespace blink 1593 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.h ('k') | third_party/WebKit/Source/core/loader/FrameLoaderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698