OLD | NEW |
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 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1285 if (ScrollingCoordinator* scrolling_coordinator = | 1285 if (ScrollingCoordinator* scrolling_coordinator = |
1286 frame_->GetPage()->GetScrollingCoordinator()) | 1286 frame_->GetPage()->GetScrollingCoordinator()) |
1287 scrolling_coordinator->FrameViewRootLayerDidChange(view); | 1287 scrolling_coordinator->FrameViewRootLayerDidChange(view); |
1288 } | 1288 } |
1289 | 1289 |
1290 GetDocumentLoader()->GetInitialScrollState().did_restore_from_history = true; | 1290 GetDocumentLoader()->GetInitialScrollState().did_restore_from_history = true; |
1291 } | 1291 } |
1292 | 1292 |
1293 String FrameLoader::UserAgent() const { | 1293 String FrameLoader::UserAgent() const { |
1294 String user_agent = Client()->UserAgent(); | 1294 String user_agent = Client()->UserAgent(); |
1295 probe::applyUserAgentOverride(frame_, &user_agent); | 1295 probe::applyUserAgentOverride(frame_->GetDocument(), &user_agent); |
1296 return user_agent; | 1296 return user_agent; |
1297 } | 1297 } |
1298 | 1298 |
1299 void FrameLoader::Detach() { | 1299 void FrameLoader::Detach() { |
1300 DetachDocumentLoader(document_loader_); | 1300 DetachDocumentLoader(document_loader_); |
1301 DetachDocumentLoader(provisional_document_loader_); | 1301 DetachDocumentLoader(provisional_document_loader_); |
1302 | 1302 |
1303 Frame* parent = frame_->Tree().Parent(); | 1303 Frame* parent = frame_->Tree().Parent(); |
1304 if (parent && parent->IsLocalFrame()) | 1304 if (parent && parent->IsLocalFrame()) |
1305 ToLocalFrame(parent)->Loader().ScheduleCheckCompleted(); | 1305 ToLocalFrame(parent)->Loader().ScheduleCheckCompleted(); |
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1834 // TODO(japhet): This is needed because the browser process DCHECKs if the | 1834 // TODO(japhet): This is needed because the browser process DCHECKs if the |
1835 // first entry we commit in a new frame has replacement set. It's unclear | 1835 // first entry we commit in a new frame has replacement set. It's unclear |
1836 // whether the DCHECK is right, investigate removing this special case. | 1836 // whether the DCHECK is right, investigate removing this special case. |
1837 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && | 1837 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && |
1838 (!Opener() || !request.Url().IsEmpty()); | 1838 (!Opener() || !request.Url().IsEmpty()); |
1839 loader->SetReplacesCurrentHistoryItem(replace_current_item); | 1839 loader->SetReplacesCurrentHistoryItem(replace_current_item); |
1840 return loader; | 1840 return loader; |
1841 } | 1841 } |
1842 | 1842 |
1843 } // namespace blink | 1843 } // namespace blink |
OLD | NEW |