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

Side by Side Diff: third_party/WebKit/Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp

Issue 2552993002: Rename activeDOMObjectsAreStopped to isContextDestroyed (Closed)
Patch Set: Created 4 years 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) 2011, Google Inc. All rights reserved. 2 * Copyright (C) 2011, Google Inc. All rights reserved.
3 * Copyright (C) 2014, Samsung Electronics. All rights reserved. 3 * Copyright (C) 2014, Samsung Electronics. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 const String& scheme, 193 const String& scheme,
194 const String& url, 194 const String& url,
195 ExceptionState& exceptionState) { 195 ExceptionState& exceptionState) {
196 DEFINE_STATIC_LOCAL(const String, declined, ("declined")); 196 DEFINE_STATIC_LOCAL(const String, declined, ("declined"));
197 197
198 if (!navigator.frame()) 198 if (!navigator.frame())
199 return declined; 199 return declined;
200 200
201 Document* document = navigator.frame()->document(); 201 Document* document = navigator.frame()->document();
202 ASSERT(document); 202 ASSERT(document);
203 if (document->activeDOMObjectsAreStopped()) 203 if (document->isContextDestroyed())
204 return declined; 204 return declined;
205 205
206 if (!verifyCustomHandlerURL(*document, url, exceptionState)) 206 if (!verifyCustomHandlerURL(*document, url, exceptionState))
207 return declined; 207 return declined;
208 208
209 if (!verifyCustomHandlerScheme(scheme, exceptionState)) 209 if (!verifyCustomHandlerScheme(scheme, exceptionState))
210 return declined; 210 return declined;
211 211
212 return customHandlersStateString( 212 return customHandlersStateString(
213 NavigatorContentUtils::from(*navigator.frame()) 213 NavigatorContentUtils::from(*navigator.frame())
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 } 247 }
248 248
249 void provideNavigatorContentUtilsTo(LocalFrame& frame, 249 void provideNavigatorContentUtilsTo(LocalFrame& frame,
250 NavigatorContentUtilsClient* client) { 250 NavigatorContentUtilsClient* client) {
251 NavigatorContentUtils::provideTo(frame, 251 NavigatorContentUtils::provideTo(frame,
252 NavigatorContentUtils::supplementName(), 252 NavigatorContentUtils::supplementName(),
253 NavigatorContentUtils::create(client)); 253 NavigatorContentUtils::create(client));
254 } 254 }
255 255
256 } // namespace blink 256 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698