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

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

Issue 2899973003: [wip]devtools
Patch Set: cleanup Created 3 years, 7 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 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 if (ScrollingCoordinator* scrolling_coordinator = 1165 if (ScrollingCoordinator* scrolling_coordinator =
1166 frame_->GetPage()->GetScrollingCoordinator()) 1166 frame_->GetPage()->GetScrollingCoordinator())
1167 scrolling_coordinator->FrameViewRootLayerDidChange(view); 1167 scrolling_coordinator->FrameViewRootLayerDidChange(view);
1168 } 1168 }
1169 1169
1170 GetDocumentLoader()->GetInitialScrollState().did_restore_from_history = true; 1170 GetDocumentLoader()->GetInitialScrollState().did_restore_from_history = true;
1171 } 1171 }
1172 1172
1173 String FrameLoader::UserAgent() const { 1173 String FrameLoader::UserAgent() const {
1174 String user_agent = Client()->UserAgent(); 1174 String user_agent = Client()->UserAgent();
1175 probe::applyUserAgentOverride(frame_, &user_agent); 1175 probe::applyUserAgentOverride(frame_->GetDocument(), &user_agent);
1176 return user_agent; 1176 return user_agent;
1177 } 1177 }
1178 1178
1179 void FrameLoader::Detach() { 1179 void FrameLoader::Detach() {
1180 DetachDocumentLoader(document_loader_); 1180 DetachDocumentLoader(document_loader_);
1181 DetachDocumentLoader(provisional_document_loader_); 1181 DetachDocumentLoader(provisional_document_loader_);
1182 1182
1183 if (progress_tracker_) { 1183 if (progress_tracker_) {
1184 progress_tracker_->Dispose(); 1184 progress_tracker_->Dispose();
1185 progress_tracker_.Clear(); 1185 progress_tracker_.Clear();
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
1710 // TODO(japhet): This is needed because the browser process DCHECKs if the 1710 // TODO(japhet): This is needed because the browser process DCHECKs if the
1711 // first entry we commit in a new frame has replacement set. It's unclear 1711 // first entry we commit in a new frame has replacement set. It's unclear
1712 // whether the DCHECK is right, investigate removing this special case. 1712 // whether the DCHECK is right, investigate removing this special case.
1713 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && 1713 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem &&
1714 (!Opener() || !request.Url().IsEmpty()); 1714 (!Opener() || !request.Url().IsEmpty());
1715 loader->SetReplacesCurrentHistoryItem(replace_current_item); 1715 loader->SetReplacesCurrentHistoryItem(replace_current_item);
1716 return loader; 1716 return loader;
1717 } 1717 }
1718 1718
1719 } // namespace blink 1719 } // 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