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

Side by Side Diff: content/renderer/media/midi_dispatcher.cc

Issue 323083002: [WebMIDI] Fix a WebMIDIPermissionRequest leak. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/renderer/media/midi_dispatcher.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/media/midi_dispatcher.h" 5 #include "content/renderer/media/midi_dispatcher.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/common/media/midi_messages.h" 9 #include "content/common/media/midi_messages.h"
10 #include "content/renderer/render_view_impl.h" 10 #include "content/renderer/render_view_impl.h"
(...skipping 26 matching lines...) Expand all
37 const WebMIDIPermissionRequest& request) { 37 const WebMIDIPermissionRequest& request) {
38 int bridge_id = requests_.Add(new WebMIDIPermissionRequest(request)); 38 int bridge_id = requests_.Add(new WebMIDIPermissionRequest(request));
39 WebSecurityOrigin security_origin = request.securityOrigin(); 39 WebSecurityOrigin security_origin = request.securityOrigin();
40 GURL url(security_origin.toString()); 40 GURL url(security_origin.toString());
41 Send(new MidiHostMsg_RequestSysExPermission(routing_id(), bridge_id, url, 41 Send(new MidiHostMsg_RequestSysExPermission(routing_id(), bridge_id, url,
42 blink::WebUserGestureIndicator::isProcessingUserGesture())); 42 blink::WebUserGestureIndicator::isProcessingUserGesture()));
43 } 43 }
44 44
45 void MidiDispatcher::cancelSysexPermissionRequest( 45 void MidiDispatcher::cancelSysexPermissionRequest(
46 const WebMIDIPermissionRequest& request) { 46 const WebMIDIPermissionRequest& request) {
47 for (IDMap<WebMIDIPermissionRequest>::iterator it(&requests_); 47 for (Requests::iterator it(&requests_); !it.IsAtEnd(); it.Advance()) {
48 !it.IsAtEnd();
49 it.Advance()) {
50 WebMIDIPermissionRequest* value = it.GetCurrentValue(); 48 WebMIDIPermissionRequest* value = it.GetCurrentValue();
51 if (value->equals(request)) { 49 if (value->equals(request)) {
52 base::string16 origin = request.securityOrigin().toString(); 50 base::string16 origin = request.securityOrigin().toString();
53 Send(new MidiHostMsg_CancelSysExPermissionRequest( 51 Send(new MidiHostMsg_CancelSysExPermissionRequest(
54 routing_id(), it.GetCurrentKey(), GURL(origin))); 52 routing_id(), it.GetCurrentKey(), GURL(origin)));
55 requests_.Remove(it.GetCurrentKey()); 53 requests_.Remove(it.GetCurrentKey());
56 break; 54 break;
57 } 55 }
58 } 56 }
59 } 57 }
60 58
61 void MidiDispatcher::OnSysExPermissionApproved(int bridge_id, 59 void MidiDispatcher::OnSysExPermissionApproved(int bridge_id,
62 bool is_allowed) { 60 bool is_allowed) {
63 // |request| can be NULL when the request is canceled. 61 // |request| can be NULL when the request is canceled.
64 WebMIDIPermissionRequest* request = requests_.Lookup(bridge_id); 62 WebMIDIPermissionRequest* request = requests_.Lookup(bridge_id);
65 if (!request) 63 if (!request)
66 return; 64 return;
67 request->setIsAllowed(is_allowed); 65 request->setIsAllowed(is_allowed);
68 requests_.Remove(bridge_id); 66 requests_.Remove(bridge_id);
69 } 67 }
70 68
71 } // namespace content 69 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/midi_dispatcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698