Chromium Code Reviews

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 35 matching lines...)
46 , m_executionContext(&context) 46 , m_executionContext(&context)
47 { 47 {
48 } 48 }
49 49
50 MediaStreamTrackSourcesRequestImpl::~MediaStreamTrackSourcesRequestImpl() 50 MediaStreamTrackSourcesRequestImpl::~MediaStreamTrackSourcesRequestImpl()
51 { 51 {
52 } 52 }
53 53
54 String MediaStreamTrackSourcesRequestImpl::origin() 54 String MediaStreamTrackSourcesRequestImpl::origin()
55 { 55 {
56 return m_executionContext->securityOrigin()->toString(); 56 return m_executionContext->getSecurityOrigin()->toString();
57 } 57 }
58 58
59 void MediaStreamTrackSourcesRequestImpl::requestSucceeded(const WebVector<WebSou rceInfo>& webSourceInfos) 59 void MediaStreamTrackSourcesRequestImpl::requestSucceeded(const WebVector<WebSou rceInfo>& webSourceInfos)
60 { 60 {
61 ASSERT(m_callback); 61 ASSERT(m_callback);
62 62
63 for (size_t i = 0; i < webSourceInfos.size(); ++i) 63 for (size_t i = 0; i < webSourceInfos.size(); ++i)
64 m_sourceInfos.append(SourceInfo::create(webSourceInfos[i])); 64 m_sourceInfos.append(SourceInfo::create(webSourceInfos[i]));
65 m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&MediaSt reamTrackSourcesRequestImpl::performCallback, this)); 65 m_executionContext->postTask(BLINK_FROM_HERE, createCrossThreadTask(&MediaSt reamTrackSourcesRequestImpl::performCallback, this));
66 } 66 }
67 67
68 void MediaStreamTrackSourcesRequestImpl::performCallback() 68 void MediaStreamTrackSourcesRequestImpl::performCallback()
69 { 69 {
70 m_callback->handleEvent(m_sourceInfos); 70 m_callback->handleEvent(m_sourceInfos);
71 m_callback.clear(); 71 m_callback.clear();
72 } 72 }
73 73
74 DEFINE_TRACE(MediaStreamTrackSourcesRequestImpl) 74 DEFINE_TRACE(MediaStreamTrackSourcesRequestImpl)
75 { 75 {
76 visitor->trace(m_callback); 76 visitor->trace(m_callback);
77 visitor->trace(m_executionContext); 77 visitor->trace(m_executionContext);
78 visitor->trace(m_sourceInfos); 78 visitor->trace(m_sourceInfos);
79 MediaStreamTrackSourcesRequest::trace(visitor); 79 MediaStreamTrackSourcesRequest::trace(visitor);
80 } 80 }
81 81
82 } // namespace blink 82 } // namespace blink
OLDNEW

Powered by Google App Engine