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/DocumentLoader.cpp

Issue 2461043003: Fix for the RedirectTest.ClientServerServer test. (Closed)
Patch Set: Fix presubmit Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
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 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 } 604 }
605 605
606 void DocumentLoader::clearRedirectChain() { 606 void DocumentLoader::clearRedirectChain() {
607 m_redirectChain.clear(); 607 m_redirectChain.clear();
608 } 608 }
609 609
610 void DocumentLoader::appendRedirect(const KURL& url) { 610 void DocumentLoader::appendRedirect(const KURL& url) {
611 m_redirectChain.append(url); 611 m_redirectChain.append(url);
612 } 612 }
613 613
614 void DocumentLoader::prependRedirect(const KURL& url) {
615 m_redirectChain.prepend(url);
616 }
617
614 void DocumentLoader::detachFromFrame() { 618 void DocumentLoader::detachFromFrame() {
615 DCHECK(m_frame); 619 DCHECK(m_frame);
616 620
617 // It never makes sense to have a document loader that is detached from its 621 // It never makes sense to have a document loader that is detached from its
618 // frame have any loads active, so go ahead and kill all the loads. 622 // frame have any loads active, so go ahead and kill all the loads.
619 m_fetcher->stopFetching(); 623 m_fetcher->stopFetching();
620 624
621 // If that load cancellation triggered another detach, leave. 625 // If that load cancellation triggered another detach, leave.
622 // (fast/frames/detach-frame-nested-no-crash.html is an example of this.) 626 // (fast/frames/detach-frame-nested-no-crash.html is an example of this.)
623 if (!m_frame) 627 if (!m_frame)
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 m_writer ? m_writer->encoding() : emptyAtom, true, 791 m_writer ? m_writer->encoding() : emptyAtom, true,
788 ForceSynchronousParsing); 792 ForceSynchronousParsing);
789 if (!source.isNull()) 793 if (!source.isNull())
790 m_writer->appendReplacingData(source); 794 m_writer->appendReplacingData(source);
791 endWriting(); 795 endWriting();
792 } 796 }
793 797
794 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); 798 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
795 799
796 } // namespace blink 800 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698