Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 868123002: Reset gesture detection upon page navigation for Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "content/browser/media/audio_stream_monitor.h" 42 #include "content/browser/media/audio_stream_monitor.h"
43 #include "content/browser/media/capture/web_contents_audio_muter.h" 43 #include "content/browser/media/capture/web_contents_audio_muter.h"
44 #include "content/browser/message_port_message_filter.h" 44 #include "content/browser/message_port_message_filter.h"
45 #include "content/browser/message_port_service.h" 45 #include "content/browser/message_port_service.h"
46 #include "content/browser/plugin_content_origin_whitelist.h" 46 #include "content/browser/plugin_content_origin_whitelist.h"
47 #include "content/browser/power_save_blocker_impl.h" 47 #include "content/browser/power_save_blocker_impl.h"
48 #include "content/browser/renderer_host/render_process_host_impl.h" 48 #include "content/browser/renderer_host/render_process_host_impl.h"
49 #include "content/browser/renderer_host/render_view_host_delegate_view.h" 49 #include "content/browser/renderer_host/render_view_host_delegate_view.h"
50 #include "content/browser/renderer_host/render_view_host_impl.h" 50 #include "content/browser/renderer_host/render_view_host_impl.h"
51 #include "content/browser/renderer_host/render_widget_host_impl.h" 51 #include "content/browser/renderer_host/render_widget_host_impl.h"
52 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
52 #include "content/browser/renderer_host/render_widget_host_view_base.h" 53 #include "content/browser/renderer_host/render_widget_host_view_base.h"
53 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_ impl.h" 54 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_ impl.h"
54 #include "content/browser/site_instance_impl.h" 55 #include "content/browser/site_instance_impl.h"
55 #include "content/browser/web_contents/web_contents_view_guest.h" 56 #include "content/browser/web_contents/web_contents_view_guest.h"
56 #include "content/browser/webui/generic_handler.h" 57 #include "content/browser/webui/generic_handler.h"
57 #include "content/browser/webui/web_ui_controller_factory_registry.h" 58 #include "content/browser/webui/web_ui_controller_factory_registry.h"
58 #include "content/browser/webui/web_ui_impl.h" 59 #include "content/browser/webui/web_ui_impl.h"
59 #include "content/common/browser_plugin/browser_plugin_constants.h" 60 #include "content/common/browser_plugin/browser_plugin_constants.h"
60 #include "content/common/browser_plugin/browser_plugin_messages.h" 61 #include "content/common/browser_plugin/browser_plugin_messages.h"
61 #include "content/common/frame_messages.h" 62 #include "content/common/frame_messages.h"
(...skipping 2535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2597 const LoadCommittedDetails& details, 2598 const LoadCommittedDetails& details,
2598 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { 2599 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) {
2599 if (details.is_navigation_to_different_page()) { 2600 if (details.is_navigation_to_different_page()) {
2600 // Clear the status bubble. This is a workaround for a bug where WebKit 2601 // 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 2602 // 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 2603 // 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 2604 // 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 2605 // clear the bubble when a user navigates to a named anchor in the same
2605 // page. 2606 // page.
2606 UpdateTargetURL(render_frame_host->GetRenderViewHost(), GURL()); 2607 UpdateTargetURL(render_frame_host->GetRenderViewHost(), GURL());
2608
2609 // Cancel all the active touch events on the aura window to prevent they
tdresser 2015/01/24 14:29:01 This comment breaks some layering assumptions. You
lanwei 2015/01/30 14:21:49 Done.
2610 // are passed to the navigated page.
2611 RenderWidgetHostView* rwhv = GetRenderWidgetHostView();
2612 if (rwhv)
2613 rwhv->ResetGestureDetection();
tdresser 2015/01/24 14:29:01 Won't this call Android's ResetGestureDetection()
lanwei 2015/01/30 14:21:49 Done.
2607 } 2614 }
2608 2615
2609 if (!details.is_in_page) { 2616 if (!details.is_in_page) {
2610 // Once the main frame is navigated, we're no longer considered to have 2617 // Once the main frame is navigated, we're no longer considered to have
2611 // displayed insecure content. 2618 // displayed insecure content.
2612 displayed_insecure_content_ = false; 2619 displayed_insecure_content_ = false;
2613 SSLManager::NotifySSLInternalStateChanged( 2620 SSLManager::NotifySSLInternalStateChanged(
2614 GetController().GetBrowserContext()); 2621 GetController().GetBrowserContext());
2615 } 2622 }
2616 2623
(...skipping 1790 matching lines...) Expand 10 before | Expand all | Expand 10 after
4407 node->render_manager()->ResumeResponseDeferredAtStart(); 4414 node->render_manager()->ResumeResponseDeferredAtStart();
4408 } 4415 }
4409 4416
4410 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4417 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4411 force_disable_overscroll_content_ = force_disable; 4418 force_disable_overscroll_content_ = force_disable;
4412 if (view_) 4419 if (view_)
4413 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4420 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4414 } 4421 }
4415 4422
4416 } // namespace content 4423 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698