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 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1707 // TODO(japhet): This is needed because the browser process DCHECKs if the | 1707 // TODO(japhet): This is needed because the browser process DCHECKs if the |
1708 // first entry we commit in a new frame has replacement set. It's unclear | 1708 // first entry we commit in a new frame has replacement set. It's unclear |
1709 // whether the DCHECK is right, investigate removing this special case. | 1709 // whether the DCHECK is right, investigate removing this special case. |
1710 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && | 1710 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && |
1711 (!Opener() || !request.Url().IsEmpty()); | 1711 (!Opener() || !request.Url().IsEmpty()); |
1712 loader->SetReplacesCurrentHistoryItem(replace_current_item); | 1712 loader->SetReplacesCurrentHistoryItem(replace_current_item); |
1713 return loader; | 1713 return loader; |
1714 } | 1714 } |
1715 | 1715 |
1716 } // namespace blink | 1716 } // namespace blink |
OLD | NEW |