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

Side by Side Diff: third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.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
« no previous file with comments | « third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp ('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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, 67 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState,
68 Navigator& navigator, 68 Navigator& navigator,
69 const MIDIOptions& options) { 69 const MIDIOptions& options) {
70 return NavigatorWebMIDI::from(navigator).requestMIDIAccess(scriptState, 70 return NavigatorWebMIDI::from(navigator).requestMIDIAccess(scriptState,
71 options); 71 options);
72 } 72 }
73 73
74 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState, 74 ScriptPromise NavigatorWebMIDI::requestMIDIAccess(ScriptState* scriptState,
75 const MIDIOptions& options) { 75 const MIDIOptions& options) {
76 if (!frame() || frame()->document()->activeDOMObjectsAreStopped()) { 76 if (!frame() || frame()->document()->isContextDestroyed()) {
77 return ScriptPromise::rejectWithDOMException( 77 return ScriptPromise::rejectWithDOMException(
78 scriptState, 78 scriptState,
79 DOMException::create(AbortError, "The frame is not working.")); 79 DOMException::create(AbortError, "The frame is not working."));
80 } 80 }
81 81
82 UseCounter::countCrossOriginIframe(*frame()->document(), 82 UseCounter::countCrossOriginIframe(*frame()->document(),
83 UseCounter::RequestMIDIAccessIframe); 83 UseCounter::RequestMIDIAccessIframe);
84 return MIDIAccessInitializer::start(scriptState, options); 84 return MIDIAccessInitializer::start(scriptState, options);
85 } 85 }
86 86
87 } // namespace blink 87 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/webmidi/MIDIAccess.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698