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

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

Issue 10392060: Disable the hang dialog detector when showModalDialog is running. (Closed) Base URL: svn://svn.chromium.org/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 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after
2081 // We must keep WebKit's shared timer running in this case in order to allow 2081 // We must keep WebKit's shared timer running in this case in order to allow
2082 // showModalDialog to function properly. 2082 // showModalDialog to function properly.
2083 // 2083 //
2084 // TODO(darin): WebKit should really be smarter about suppressing events and 2084 // TODO(darin): WebKit should really be smarter about suppressing events and
2085 // timers so that we do not need to manage the shared timer in such a heavy 2085 // timers so that we do not need to manage the shared timer in such a heavy
2086 // handed manner. 2086 // handed manner.
2087 // 2087 //
2088 if (RenderThreadImpl::current()) // Will be NULL during unit tests. 2088 if (RenderThreadImpl::current()) // Will be NULL during unit tests.
2089 RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer(); 2089 RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer();
2090 2090
2091 SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(routing_id_)); 2091 SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(
2092 routing_id_, opener_id_));
2092 } 2093 }
2093 2094
2094 bool RenderViewImpl::enterFullScreen() { 2095 bool RenderViewImpl::enterFullScreen() {
2095 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true)); 2096 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, true));
2096 return true; 2097 return true;
2097 } 2098 }
2098 2099
2099 void RenderViewImpl::exitFullScreen() { 2100 void RenderViewImpl::exitFullScreen() {
2100 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false)); 2101 Send(new ViewHostMsg_ToggleFullscreen(routing_id_, false));
2101 } 2102 }
(...skipping 3209 matching lines...) Expand 10 before | Expand all | Expand 10 after
5311 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5312 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5312 return !!RenderThreadImpl::current()->compositor_thread(); 5313 return !!RenderThreadImpl::current()->compositor_thread();
5313 } 5314 }
5314 5315
5315 void RenderViewImpl::OnJavaBridgeInit() { 5316 void RenderViewImpl::OnJavaBridgeInit() {
5316 DCHECK(!java_bridge_dispatcher_.get()); 5317 DCHECK(!java_bridge_dispatcher_.get());
5317 #if defined(ENABLE_JAVA_BRIDGE) 5318 #if defined(ENABLE_JAVA_BRIDGE)
5318 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5319 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5319 #endif 5320 #endif
5320 } 5321 }
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