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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 10377017: Disable the hang dialog detector when showModalDialog is running. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « content/common/view_messages.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2076 matching lines...) Expand 10 before | Expand all | Expand 10 after
2087 // We must keep WebKit's shared timer running in this case in order to allow 2087 // We must keep WebKit's shared timer running in this case in order to allow
2088 // showModalDialog to function properly. 2088 // showModalDialog to function properly.
2089 // 2089 //
2090 // TODO(darin): WebKit should really be smarter about suppressing events and 2090 // TODO(darin): WebKit should really be smarter about suppressing events and
2091 // timers so that we do not need to manage the shared timer in such a heavy 2091 // timers so that we do not need to manage the shared timer in such a heavy
2092 // handed manner. 2092 // handed manner.
2093 // 2093 //
2094 if (RenderThreadImpl::current()) // Will be NULL during unit tests. 2094 if (RenderThreadImpl::current()) // Will be NULL during unit tests.
2095 RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer(); 2095 RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer();
2096 2096
2097 SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(routing_id_)); 2097 SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(
2098 routing_id_, opener_id_));
2098 } 2099 }
2099 2100
2100 bool RenderViewImpl::enterFullScreen() { 2101 bool RenderViewImpl::enterFullScreen() {
2101 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true)); 2102 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true));
2102 return true; 2103 return true;
2103 } 2104 }
2104 2105
2105 void RenderViewImpl::exitFullScreen() { 2106 void RenderViewImpl::exitFullScreen() {
2106 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false)); 2107 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false));
2107 } 2108 }
(...skipping 3198 matching lines...) Expand 10 before | Expand all | Expand 10 after
5306 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5307 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5307 return !!RenderThreadImpl::current()->compositor_thread(); 5308 return !!RenderThreadImpl::current()->compositor_thread();
5308 } 5309 }
5309 5310
5310 void RenderViewImpl::OnJavaBridgeInit() { 5311 void RenderViewImpl::OnJavaBridgeInit() {
5311 DCHECK(!java_bridge_dispatcher_.get()); 5312 DCHECK(!java_bridge_dispatcher_.get());
5312 #if defined(ENABLE_JAVA_BRIDGE) 5313 #if defined(ENABLE_JAVA_BRIDGE)
5313 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5314 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5314 #endif 5315 #endif
5315 } 5316 }
OLDNEW
« no previous file with comments | « content/common/view_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698