| 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 1214 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1225     if (ScrollingCoordinator* scrolling_coordinator = |  1225     if (ScrollingCoordinator* scrolling_coordinator = | 
|  1226             frame_->GetPage()->GetScrollingCoordinator()) |  1226             frame_->GetPage()->GetScrollingCoordinator()) | 
|  1227       scrolling_coordinator->FrameViewRootLayerDidChange(view); |  1227       scrolling_coordinator->FrameViewRootLayerDidChange(view); | 
|  1228   } |  1228   } | 
|  1229  |  1229  | 
|  1230   GetDocumentLoader()->GetInitialScrollState().did_restore_from_history = true; |  1230   GetDocumentLoader()->GetInitialScrollState().did_restore_from_history = true; | 
|  1231 } |  1231 } | 
|  1232  |  1232  | 
|  1233 String FrameLoader::UserAgent() const { |  1233 String FrameLoader::UserAgent() const { | 
|  1234   String user_agent = Client()->UserAgent(); |  1234   String user_agent = Client()->UserAgent(); | 
|  1235   probe::applyUserAgentOverride(frame_, &user_agent); |  1235   probe::applyUserAgentOverride(frame_->GetDocument(), &user_agent); | 
|  1236   return user_agent; |  1236   return user_agent; | 
|  1237 } |  1237 } | 
|  1238  |  1238  | 
|  1239 void FrameLoader::Detach() { |  1239 void FrameLoader::Detach() { | 
|  1240   DetachDocumentLoader(document_loader_); |  1240   DetachDocumentLoader(document_loader_); | 
|  1241   DetachDocumentLoader(provisional_document_loader_); |  1241   DetachDocumentLoader(provisional_document_loader_); | 
|  1242  |  1242  | 
|  1243   Frame* parent = frame_->Tree().Parent(); |  1243   Frame* parent = frame_->Tree().Parent(); | 
|  1244   if (parent && parent->IsLocalFrame()) |  1244   if (parent && parent->IsLocalFrame()) | 
|  1245     ToLocalFrame(parent)->Loader().ScheduleCheckCompleted(); |  1245     ToLocalFrame(parent)->Loader().ScheduleCheckCompleted(); | 
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1774   // TODO(japhet): This is needed because the browser process DCHECKs if the |  1774   // TODO(japhet): This is needed because the browser process DCHECKs if the | 
|  1775   // first entry we commit in a new frame has replacement set. It's unclear |  1775   // first entry we commit in a new frame has replacement set. It's unclear | 
|  1776   // whether the DCHECK is right, investigate removing this special case. |  1776   // whether the DCHECK is right, investigate removing this special case. | 
|  1777   bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && |  1777   bool replace_current_item = load_type == kFrameLoadTypeReplaceCurrentItem && | 
|  1778                               (!Opener() || !request.Url().IsEmpty()); |  1778                               (!Opener() || !request.Url().IsEmpty()); | 
|  1779   loader->SetReplacesCurrentHistoryItem(replace_current_item); |  1779   loader->SetReplacesCurrentHistoryItem(replace_current_item); | 
|  1780   return loader; |  1780   return loader; | 
|  1781 } |  1781 } | 
|  1782  |  1782  | 
|  1783 }  // namespace blink |  1783 }  // namespace blink | 
| OLD | NEW |