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

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

Issue 2701753003: [WIP] off-main-thread loading
Patch Set: small fix Created 3 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
6 * (http://www.torchmobile.com/) 6 * (http://www.torchmobile.com/)
7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
10 * Copyright (C) 2011 Google Inc. All rights reserved. 10 * Copyright (C) 2011 Google Inc. All rights reserved.
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1215 if (ScrollingCoordinator* scrollingCoordinator = 1215 if (ScrollingCoordinator* scrollingCoordinator =
1216 m_frame->page()->scrollingCoordinator()) 1216 m_frame->page()->scrollingCoordinator())
1217 scrollingCoordinator->frameViewRootLayerDidChange(view); 1217 scrollingCoordinator->frameViewRootLayerDidChange(view);
1218 } 1218 }
1219 1219
1220 documentLoader()->initialScrollState().didRestoreFromHistory = true; 1220 documentLoader()->initialScrollState().didRestoreFromHistory = true;
1221 } 1221 }
1222 1222
1223 String FrameLoader::userAgent() const { 1223 String FrameLoader::userAgent() const {
1224 String userAgent = client()->userAgent(); 1224 String userAgent = client()->userAgent();
1225 probe::applyUserAgentOverride(m_frame, &userAgent); 1225 probe::applyUserAgentOverride(m_frame->document(), &userAgent);
1226 return userAgent; 1226 return userAgent;
1227 } 1227 }
1228 1228
1229 void FrameLoader::detach() { 1229 void FrameLoader::detach() {
1230 detachDocumentLoader(m_documentLoader); 1230 detachDocumentLoader(m_documentLoader);
1231 detachDocumentLoader(m_provisionalDocumentLoader); 1231 detachDocumentLoader(m_provisionalDocumentLoader);
1232 1232
1233 Frame* parent = m_frame->tree().parent(); 1233 Frame* parent = m_frame->tree().parent();
1234 if (parent && parent->isLocalFrame()) 1234 if (parent && parent->isLocalFrame())
1235 toLocalFrame(parent)->loader().scheduleCheckCompleted(); 1235 toLocalFrame(parent)->loader().scheduleCheckCompleted();
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
1751 // TODO(japhet): This is needed because the browser process DCHECKs if the 1751 // TODO(japhet): This is needed because the browser process DCHECKs if the
1752 // first entry we commit in a new frame has replacement set. It's unclear 1752 // first entry we commit in a new frame has replacement set. It's unclear
1753 // whether the DCHECK is right, investigate removing this special case. 1753 // whether the DCHECK is right, investigate removing this special case.
1754 bool replaceCurrentItem = loadType == FrameLoadTypeReplaceCurrentItem && 1754 bool replaceCurrentItem = loadType == FrameLoadTypeReplaceCurrentItem &&
1755 (!opener() || !request.url().isEmpty()); 1755 (!opener() || !request.url().isEmpty());
1756 loader->setReplacesCurrentHistoryItem(replaceCurrentItem); 1756 loader->setReplacesCurrentHistoryItem(replaceCurrentItem);
1757 return loader; 1757 return loader;
1758 } 1758 }
1759 1759
1760 } // namespace blink 1760 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/core/loader/PingLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698