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

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

Issue 1158743004: Oilpan: Build fix after r196532 (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 | « 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 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 // loading cannot continue in that case. 283 // loading cannot continue in that case.
284 if (!m_frame->page()) 284 if (!m_frame->page())
285 return; 285 return;
286 286
287 documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source, own erDocument); 287 documentLoader->replaceDocumentWhileExecutingJavaScriptURL(init, source, own erDocument);
288 } 288 }
289 289
290 void FrameLoader::setHistoryItemStateForCommit(HistoryCommitType historyCommitTy pe, HistoryNavigationType navigationType) 290 void FrameLoader::setHistoryItemStateForCommit(HistoryCommitType historyCommitTy pe, HistoryNavigationType navigationType)
291 { 291 {
292 RefPtrWillBeRawPtr<HistoryItem> oldItem = m_currentItem; 292 RefPtrWillBeRawPtr<HistoryItem> oldItem = m_currentItem;
293 m_currentItem = historyCommitType == BackForwardCommit ? m_provisionalItem.r elease() : HistoryItem::create(); 293 m_currentItem = historyCommitType == BackForwardCommit ? RawPtr<HistoryItem> (m_provisionalItem.release()) : HistoryItem::create();
294 m_currentItem->setURL(m_documentLoader->urlForHistory()); 294 m_currentItem->setURL(m_documentLoader->urlForHistory());
295 m_currentItem->setDocumentState(m_frame->document()->formElementsState()); 295 m_currentItem->setDocumentState(m_frame->document()->formElementsState());
296 m_currentItem->setTarget(m_frame->tree().uniqueName()); 296 m_currentItem->setTarget(m_frame->tree().uniqueName());
297 m_currentItem->setReferrer(SecurityPolicy::generateReferrer(m_documentLoader ->request().referrerPolicy(), m_currentItem->url(), m_documentLoader->request(). httpReferrer())); 297 m_currentItem->setReferrer(SecurityPolicy::generateReferrer(m_documentLoader ->request().referrerPolicy(), m_currentItem->url(), m_documentLoader->request(). httpReferrer()));
298 m_currentItem->setFormInfoFromRequest(m_documentLoader->request()); 298 m_currentItem->setFormInfoFromRequest(m_documentLoader->request());
299 299
300 // Don't propagate state from the old item to the new item if there isn't an old item (obviously), 300 // Don't propagate state from the old item to the new item if there isn't an old item (obviously),
301 // or if this is a back/forward navigation, since we explicitly want to rest ore the state we just 301 // or if this is a back/forward navigation, since we explicitly want to rest ore the state we just
302 // committed. 302 // committed.
303 if (!oldItem || historyCommitType == BackForwardCommit) 303 if (!oldItem || historyCommitType == BackForwardCommit)
(...skipping 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1441 // FIXME: We need a way to propagate insecure requests policy flags to 1441 // FIXME: We need a way to propagate insecure requests policy flags to
1442 // out-of-process frames. For now, we'll always use default behavior. 1442 // out-of-process frames. For now, we'll always use default behavior.
1443 if (!parentFrame->isLocalFrame()) 1443 if (!parentFrame->isLocalFrame())
1444 return nullptr; 1444 return nullptr;
1445 1445
1446 ASSERT(toLocalFrame(parentFrame)->document()); 1446 ASSERT(toLocalFrame(parentFrame)->document());
1447 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1447 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1448 } 1448 }
1449 1449
1450 } // namespace blink 1450 } // 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