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

Side by Side Diff: Source/core/loader/DocumentLoader.cpp

Issue 653223002: Navigation transitions (web to native app): Revert exit transition (Blink side) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: review fix Created 6 years 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 | « Source/core/html/HTMLLinkElement.cpp ('k') | Source/core/testing/Internals.h » ('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) 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 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 frame->document()->prepareForDestruction(); 805 frame->document()->prepareForDestruction();
806 806
807 if (!init.shouldReuseDefaultView()) 807 if (!init.shouldReuseDefaultView())
808 frame->setDOMWindow(LocalDOMWindow::create(*frame)); 808 frame->setDOMWindow(LocalDOMWindow::create(*frame));
809 809
810 RefPtrWillBeRawPtr<Document> document = frame->localDOMWindow()->installNewD ocument(mimeType, init); 810 RefPtrWillBeRawPtr<Document> document = frame->localDOMWindow()->installNewD ocument(mimeType, init);
811 if (ownerDocument) { 811 if (ownerDocument) {
812 document->setCookieURL(ownerDocument->cookieURL()); 812 document->setCookieURL(ownerDocument->cookieURL());
813 document->setSecurityOrigin(ownerDocument->securityOrigin()); 813 document->setSecurityOrigin(ownerDocument->securityOrigin());
814 if (ownerDocument->isTransitionDocument()) 814 if (ownerDocument->isTransitionDocument())
815 document->setIsTransitionDocument(); 815 document->setIsTransitionDocument(true);
816 } 816 }
817 817
818 frame->loader().didBeginDocument(dispatch); 818 frame->loader().didBeginDocument(dispatch);
819 819
820 return DocumentWriter::create(document.get(), mimeType, encoding); 820 return DocumentWriter::create(document.get(), mimeType, encoding);
821 } 821 }
822 822
823 const AtomicString& DocumentLoader::mimeType() const 823 const AtomicString& DocumentLoader::mimeType() const
824 { 824 {
825 if (m_writer) 825 if (m_writer)
(...skipping 10 matching lines...) Expand all
836 // This is only called by FrameLoader::replaceDocumentWhileExecutingJavaScriptUR L() 836 // This is only called by FrameLoader::replaceDocumentWhileExecutingJavaScriptUR L()
837 void DocumentLoader::replaceDocumentWhileExecutingJavaScriptURL(const DocumentIn it& init, const String& source, Document* ownerDocument) 837 void DocumentLoader::replaceDocumentWhileExecutingJavaScriptURL(const DocumentIn it& init, const String& source, Document* ownerDocument)
838 { 838 {
839 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri ter->encoding() : emptyAtom, true); 839 m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_wri ter->encoding() : emptyAtom, true);
840 if (!source.isNull()) 840 if (!source.isNull())
841 m_writer->appendReplacingData(source); 841 m_writer->appendReplacingData(source);
842 endWriting(m_writer.get()); 842 endWriting(m_writer.get());
843 } 843 }
844 844
845 } // namespace blink 845 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/html/HTMLLinkElement.cpp ('k') | Source/core/testing/Internals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698