Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 2586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2597 const LoadCommittedDetails& details, | 2597 const LoadCommittedDetails& details, |
| 2598 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { | 2598 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { |
| 2599 if (details.is_navigation_to_different_page()) { | 2599 if (details.is_navigation_to_different_page()) { |
| 2600 // Clear the status bubble. This is a workaround for a bug where WebKit | 2600 // Clear the status bubble. This is a workaround for a bug where WebKit |
| 2601 // doesn't let us know that the cursor left an element during a | 2601 // doesn't let us know that the cursor left an element during a |
| 2602 // transition (this is also why the mouse cursor remains as a hand after | 2602 // transition (this is also why the mouse cursor remains as a hand after |
| 2603 // clicking on a link); see bugs 1184641 and 980803. We don't want to | 2603 // clicking on a link); see bugs 1184641 and 980803. We don't want to |
| 2604 // clear the bubble when a user navigates to a named anchor in the same | 2604 // clear the bubble when a user navigates to a named anchor in the same |
| 2605 // page. | 2605 // page. |
| 2606 UpdateTargetURL(render_frame_host->GetRenderViewHost(), GURL()); | 2606 UpdateTargetURL(render_frame_host->GetRenderViewHost(), GURL()); |
| 2607 | |
| 2608 // Cancel all the active touch events on the main frame to prevent they | |
|
jdduke (slow)
2015/01/30 18:49:48
Let's leave this comment out.
lanwei
2015/02/04 21:10:05
Done.
| |
| 2609 // are passed to the navigated page. | |
| 2610 RenderWidgetHostView* rwhv = GetRenderWidgetHostView(); | |
| 2611 if (rwhv) | |
| 2612 rwhv->OnMainFrameNavigation(); | |
|
jdduke (slow)
2015/01/30 18:49:48
I don't have a strong opinion on the wording here,
lanwei
2015/02/04 21:10:05
Done.
| |
| 2607 } | 2613 } |
| 2608 | 2614 |
| 2609 if (!details.is_in_page) { | 2615 if (!details.is_in_page) { |
| 2610 // Once the main frame is navigated, we're no longer considered to have | 2616 // Once the main frame is navigated, we're no longer considered to have |
| 2611 // displayed insecure content. | 2617 // displayed insecure content. |
| 2612 displayed_insecure_content_ = false; | 2618 displayed_insecure_content_ = false; |
| 2613 SSLManager::NotifySSLInternalStateChanged( | 2619 SSLManager::NotifySSLInternalStateChanged( |
| 2614 GetController().GetBrowserContext()); | 2620 GetController().GetBrowserContext()); |
| 2615 } | 2621 } |
| 2616 | 2622 |
| (...skipping 1790 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4407 node->render_manager()->ResumeResponseDeferredAtStart(); | 4413 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4408 } | 4414 } |
| 4409 | 4415 |
| 4410 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4416 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4411 force_disable_overscroll_content_ = force_disable; | 4417 force_disable_overscroll_content_ = force_disable; |
| 4412 if (view_) | 4418 if (view_) |
| 4413 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4419 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4414 } | 4420 } |
| 4415 | 4421 |
| 4416 } // namespace content | 4422 } // namespace content |
| OLD | NEW |