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 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1134 if (ScrollingCoordinator* scrolling_coordinator = | 1134 if (ScrollingCoordinator* scrolling_coordinator = |
1135 frame_->GetPage()->GetScrollingCoordinator()) | 1135 frame_->GetPage()->GetScrollingCoordinator()) |
1136 scrolling_coordinator->FrameViewRootLayerDidChange(view); | 1136 scrolling_coordinator->FrameViewRootLayerDidChange(view); |
1137 } | 1137 } |
1138 | 1138 |
1139 GetDocumentLoader()->GetInitialScrollState().did_restore_from_history = true; | 1139 GetDocumentLoader()->GetInitialScrollState().did_restore_from_history = true; |
1140 } | 1140 } |
1141 | 1141 |
1142 String FrameLoader::UserAgent() const { | 1142 String FrameLoader::UserAgent() const { |
1143 String user_agent = Client()->UserAgent(); | 1143 String user_agent = Client()->UserAgent(); |
1144 probe::applyUserAgentOverride(frame_, &user_agent); | 1144 probe::applyUserAgentOverride(frame_->GetDocument(), &user_agent); |
1145 return user_agent; | 1145 return user_agent; |
1146 } | 1146 } |
1147 | 1147 |
1148 void FrameLoader::Detach() { | 1148 void FrameLoader::Detach() { |
1149 DetachDocumentLoader(document_loader_); | 1149 DetachDocumentLoader(document_loader_); |
1150 DetachDocumentLoader(provisional_document_loader_); | 1150 DetachDocumentLoader(provisional_document_loader_); |
1151 | 1151 |
1152 if (progress_tracker_) { | 1152 if (progress_tracker_) { |
1153 progress_tracker_->Dispose(); | 1153 progress_tracker_->Dispose(); |
1154 progress_tracker_.Clear(); | 1154 progress_tracker_.Clear(); |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1699 // TODO(japhet): This is needed because the browser process DCHECKs if the | 1699 // TODO(japhet): This is needed because the browser process DCHECKs if the |
1700 // first entry we commit in a new frame has replacement set. It's unclear | 1700 // first entry we commit in a new frame has replacement set. It's unclear |
1701 // whether the DCHECK is right, investigate removing this special case. | 1701 // whether the DCHECK is right, investigate removing this special case. |
1702 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && | 1702 bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && |
1703 (!Opener() || !request.Url().IsEmpty()); | 1703 (!Opener() || !request.Url().IsEmpty()); |
1704 loader->SetReplacesCurrentHistoryItem(replace_current_item); | 1704 loader->SetReplacesCurrentHistoryItem(replace_current_item); |
1705 return loader; | 1705 return loader; |
1706 } | 1706 } |
1707 | 1707 |
1708 } // namespace blink | 1708 } // namespace blink |
OLD | NEW |