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

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

Issue 1480303003: Oilpan: fix build after r362110. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 visitor->trace(m_documentLoader); 183 visitor->trace(m_documentLoader);
184 visitor->trace(m_provisionalDocumentLoader); 184 visitor->trace(m_provisionalDocumentLoader);
185 visitor->trace(m_currentItem); 185 visitor->trace(m_currentItem);
186 visitor->trace(m_provisionalItem); 186 visitor->trace(m_provisionalItem);
187 visitor->trace(m_deferredHistoryLoad); 187 visitor->trace(m_deferredHistoryLoad);
188 } 188 }
189 189
190 void FrameLoader::init() 190 void FrameLoader::init()
191 { 191 {
192 // init() may dispatch JS events, so protect a reference to m_frame. 192 // init() may dispatch JS events, so protect a reference to m_frame.
193 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame); 193 RefPtrWillBeRawPtr<LocalFrame> protect(m_frame.get());
194 ResourceRequest initialRequest(KURL(ParsedURLString, emptyString())); 194 ResourceRequest initialRequest(KURL(ParsedURLString, emptyString()));
195 initialRequest.setRequestContext(WebURLRequest::RequestContextInternal); 195 initialRequest.setRequestContext(WebURLRequest::RequestContextInternal);
196 initialRequest.setFrameType(m_frame->isMainFrame() ? WebURLRequest::FrameTyp eTopLevel : WebURLRequest::FrameTypeNested); 196 initialRequest.setFrameType(m_frame->isMainFrame() ? WebURLRequest::FrameTyp eTopLevel : WebURLRequest::FrameTypeNested);
197 m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, initia lRequest, SubstituteData()); 197 m_provisionalDocumentLoader = client()->createDocumentLoader(m_frame, initia lRequest, SubstituteData());
198 m_provisionalDocumentLoader->startLoadingMainResource(); 198 m_provisionalDocumentLoader->startLoadingMainResource();
199 m_frame->document()->cancelParsing(); 199 m_frame->document()->cancelParsing();
200 m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocu ment); 200 m_stateMachine.advanceTo(FrameLoaderStateMachine::DisplayingInitialEmptyDocu ment);
201 } 201 }
202 202
203 FrameLoaderClient* FrameLoader::client() const 203 FrameLoaderClient* FrameLoader::client() const
(...skipping 1343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1547 // FIXME: We need a way to propagate insecure requests policy flags to 1547 // FIXME: We need a way to propagate insecure requests policy flags to
1548 // out-of-process frames. For now, we'll always use default behavior. 1548 // out-of-process frames. For now, we'll always use default behavior.
1549 if (!parentFrame->isLocalFrame()) 1549 if (!parentFrame->isLocalFrame())
1550 return nullptr; 1550 return nullptr;
1551 1551
1552 ASSERT(toLocalFrame(parentFrame)->document()); 1552 ASSERT(toLocalFrame(parentFrame)->document());
1553 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ; 1553 return toLocalFrame(parentFrame)->document()->insecureNavigationsToUpgrade() ;
1554 } 1554 }
1555 1555
1556 } // namespace blink 1556 } // 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