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

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

Issue 1172613003: Oilpan: fix build after r196753. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | 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 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 m_policyDocumentLoader->setDefersLoading(defers); 209 m_policyDocumentLoader->setDefersLoading(defers);
210 210
211 if (Document* document = m_frame->document()) { 211 if (Document* document = m_frame->document()) {
212 if (defers) 212 if (defers)
213 document->suspendScheduledTasks(); 213 document->suspendScheduledTasks();
214 else 214 else
215 document->resumeScheduledTasks(); 215 document->resumeScheduledTasks();
216 } 216 }
217 217
218 if (!defers) { 218 if (!defers) {
219 if (m_deferredHistoryLoad.get()) { 219 if (m_deferredHistoryLoad) {
220 load(FrameLoadRequest(nullptr, m_deferredHistoryLoad->m_request), 220 load(FrameLoadRequest(nullptr, m_deferredHistoryLoad->m_request),
221 m_deferredHistoryLoad->m_loadType, m_deferredHistoryLoad->m_item .get(), 221 m_deferredHistoryLoad->m_loadType, m_deferredHistoryLoad->m_item .get(),
222 m_deferredHistoryLoad->m_historyLoadType); 222 m_deferredHistoryLoad->m_historyLoadType);
223 m_deferredHistoryLoad.clear(); 223 m_deferredHistoryLoad.clear();
224 } 224 }
225 m_frame->navigationScheduler().startTimer(); 225 m_frame->navigationScheduler().startTimer();
226 scheduleCheckCompleted(); 226 scheduleCheckCompleted();
227 } 227 }
228 } 228 }
229 229
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 HistoryItem* historyItem, HistoryLoadType historyLoadType) 815 HistoryItem* historyItem, HistoryLoadType historyLoadType)
816 { 816 {
817 ASSERT(m_frame->document()); 817 ASSERT(m_frame->document());
818 818
819 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get()); 819 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get());
820 820
821 if (m_inStopAllLoaders) 821 if (m_inStopAllLoaders)
822 return; 822 return;
823 823
824 if (m_frame->page()->defersLoading() && isBackForwardLoadType(frameLoadType) ) { 824 if (m_frame->page()->defersLoading() && isBackForwardLoadType(frameLoadType) ) {
825 m_deferredHistoryLoad = adoptPtr(new DeferredHistoryLoad( 825 m_deferredHistoryLoad = DeferredHistoryLoad::create(passedRequest.resour ceRequest(), historyItem, frameLoadType, historyLoadType);
826 passedRequest.resourceRequest(), historyItem, frameLoadType, history LoadType));
827 return; 826 return;
828 } 827 }
829 828
830 FrameLoadRequest request(passedRequest); 829 FrameLoadRequest request(passedRequest);
831 request.resourceRequest().setHasUserGesture(UserGestureIndicator::processing UserGesture()); 830 request.resourceRequest().setHasUserGesture(UserGestureIndicator::processing UserGesture());
832 831
833 if (!prepareRequestForThisFrame(request)) 832 if (!prepareRequestForThisFrame(request))
834 return; 833 return;
835 834
836 RefPtrWillBeRawPtr<Frame> targetFrame = request.form() ? nullptr : m_frame-> findFrameForNavigation(AtomicString(request.frameName()), *m_frame); 835 RefPtrWillBeRawPtr<Frame> targetFrame = request.form() ? nullptr : m_frame-> findFrameForNavigation(AtomicString(request.frameName()), *m_frame);
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 // FIXME: We need a way to propagate insecure requests policy flags to 1471 // FIXME: We need a way to propagate insecure requests policy flags to
1473 // out-of-process frames. For now, we'll always use default behavior. 1472 // out-of-process frames. For now, we'll always use default behavior.
1474 if (!parentFrame->isLocalFrame()) 1473 if (!parentFrame->isLocalFrame())
1475 return nullptr; 1474 return nullptr;
1476 1475
1477 ASSERT(toLocalFrame(parentFrame)->document()); 1476 ASSERT(toLocalFrame(parentFrame)->document());
1478 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1477 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1479 } 1478 }
1480 1479
1481 } // namespace blink 1480 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698