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

Side by Side Diff: third_party/WebKit/Source/core/page/ChromeClient.cpp

Issue 2858963002: Replace ASSERT with DCHECK in core/ (Closed)
Patch Set: WorkerBackingThread Created 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2012, Samsung Electronics. All rights reserved. 4 * Copyright (C) 2012, Samsung Electronics. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 ScopedPageSuspender suspender; 105 ScopedPageSuspender suspender;
106 probe::willRunJavaScriptDialog(frame, message, dialog_type); 106 probe::willRunJavaScriptDialog(frame, message, dialog_type);
107 bool result = delegate(); 107 bool result = delegate();
108 probe::didRunJavaScriptDialog(frame, result); 108 probe::didRunJavaScriptDialog(frame, result);
109 return result; 109 return result;
110 } 110 }
111 111
112 bool ChromeClient::OpenBeforeUnloadConfirmPanel(const String& message, 112 bool ChromeClient::OpenBeforeUnloadConfirmPanel(const String& message,
113 LocalFrame* frame, 113 LocalFrame* frame,
114 bool is_reload) { 114 bool is_reload) {
115 ASSERT(frame); 115 DCHECK(frame);
116 return OpenJavaScriptDialog( 116 return OpenJavaScriptDialog(
117 frame, message, ChromeClient::kHTMLDialog, [this, frame, is_reload]() { 117 frame, message, ChromeClient::kHTMLDialog, [this, frame, is_reload]() {
118 return OpenBeforeUnloadConfirmPanelDelegate(frame, is_reload); 118 return OpenBeforeUnloadConfirmPanelDelegate(frame, is_reload);
119 }); 119 });
120 } 120 }
121 121
122 bool ChromeClient::OpenJavaScriptAlert(LocalFrame* frame, 122 bool ChromeClient::OpenJavaScriptAlert(LocalFrame* frame,
123 const String& message) { 123 const String& message) {
124 ASSERT(frame); 124 DCHECK(frame);
125 if (!CanOpenModalIfDuringPageDismissal(frame->Tree().Top(), 125 if (!CanOpenModalIfDuringPageDismissal(frame->Tree().Top(),
126 ChromeClient::kAlertDialog, message)) 126 ChromeClient::kAlertDialog, message))
127 return false; 127 return false;
128 return OpenJavaScriptDialog( 128 return OpenJavaScriptDialog(
129 frame, message, ChromeClient::kAlertDialog, [this, frame, &message]() { 129 frame, message, ChromeClient::kAlertDialog, [this, frame, &message]() {
130 return OpenJavaScriptAlertDelegate(frame, message); 130 return OpenJavaScriptAlertDelegate(frame, message);
131 }); 131 });
132 } 132 }
133 133
134 bool ChromeClient::OpenJavaScriptConfirm(LocalFrame* frame, 134 bool ChromeClient::OpenJavaScriptConfirm(LocalFrame* frame,
135 const String& message) { 135 const String& message) {
136 ASSERT(frame); 136 DCHECK(frame);
137 if (!CanOpenModalIfDuringPageDismissal(frame->Tree().Top(), 137 if (!CanOpenModalIfDuringPageDismissal(frame->Tree().Top(),
138 ChromeClient::kConfirmDialog, message)) 138 ChromeClient::kConfirmDialog, message))
139 return false; 139 return false;
140 return OpenJavaScriptDialog( 140 return OpenJavaScriptDialog(
141 frame, message, ChromeClient::kConfirmDialog, [this, frame, &message]() { 141 frame, message, ChromeClient::kConfirmDialog, [this, frame, &message]() {
142 return OpenJavaScriptConfirmDelegate(frame, message); 142 return OpenJavaScriptConfirmDelegate(frame, message);
143 }); 143 });
144 } 144 }
145 145
146 bool ChromeClient::OpenJavaScriptPrompt(LocalFrame* frame, 146 bool ChromeClient::OpenJavaScriptPrompt(LocalFrame* frame,
147 const String& prompt, 147 const String& prompt,
148 const String& default_value, 148 const String& default_value,
149 String& result) { 149 String& result) {
150 ASSERT(frame); 150 DCHECK(frame);
151 if (!CanOpenModalIfDuringPageDismissal(frame->Tree().Top(), 151 if (!CanOpenModalIfDuringPageDismissal(frame->Tree().Top(),
152 ChromeClient::kPromptDialog, prompt)) 152 ChromeClient::kPromptDialog, prompt))
153 return false; 153 return false;
154 return OpenJavaScriptDialog( 154 return OpenJavaScriptDialog(
155 frame, prompt, ChromeClient::kPromptDialog, 155 frame, prompt, ChromeClient::kPromptDialog,
156 [this, frame, &prompt, &default_value, &result]() { 156 [this, frame, &prompt, &default_value, &result]() {
157 return OpenJavaScriptPromptDelegate(frame, prompt, default_value, 157 return OpenJavaScriptPromptDelegate(frame, prompt, default_value,
158 result); 158 result);
159 }); 159 });
160 } 160 }
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 // Suspend pages in case the client method runs a new event loop that would 234 // Suspend pages in case the client method runs a new event loop that would
235 // otherwise cause the load to continue while we're in the middle of 235 // otherwise cause the load to continue while we're in the middle of
236 // executing JavaScript. 236 // executing JavaScript.
237 ScopedPageSuspender suspender; 237 ScopedPageSuspender suspender;
238 238
239 PrintDelegate(frame); 239 PrintDelegate(frame);
240 return true; 240 return true;
241 } 241 }
242 242
243 } // namespace blink 243 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698