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

Side by Side Diff: third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.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. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" 5 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h"
6 6
7 #include "core/html/HTMLCanvasElement.h" 7 #include "core/html/HTMLCanvasElement.h"
8 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h" 8 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h"
9 #include "modules/mediacapturefromelement/OnRequestCanvasDrawListener.h" 9 #include "modules/mediacapturefromelement/OnRequestCanvasDrawListener.h"
10 #include "modules/mediacapturefromelement/TimedCanvasDrawListener.h" 10 #include "modules/mediacapturefromelement/TimedCanvasDrawListener.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 } 42 }
43 43
44 DEFINE_TRACE(CanvasCaptureMediaStreamTrack) 44 DEFINE_TRACE(CanvasCaptureMediaStreamTrack)
45 { 45 {
46 visitor->trace(m_canvasElement); 46 visitor->trace(m_canvasElement);
47 visitor->trace(m_drawListener); 47 visitor->trace(m_drawListener);
48 MediaStreamTrack::trace(visitor); 48 MediaStreamTrack::trace(visitor);
49 } 49 }
50 50
51 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(const CanvasCapture MediaStreamTrack& track, MediaStreamComponent* component) 51 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(const CanvasCapture MediaStreamTrack& track, MediaStreamComponent* component)
52 :MediaStreamTrack(track.m_canvasElement->executionContext(), component) 52 :MediaStreamTrack(track.m_canvasElement->getExecutionContext(), component)
53 , m_canvasElement(track.m_canvasElement) 53 , m_canvasElement(track.m_canvasElement)
54 , m_drawListener(track.m_drawListener) 54 , m_drawListener(track.m_drawListener)
55 { 55 {
56 suspendIfNeeded(); 56 suspendIfNeeded();
57 m_canvasElement->addListener(m_drawListener.get()); 57 m_canvasElement->addListener(m_drawListener.get());
58 } 58 }
59 59
60 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt r<WebCanvasCaptureHandler> handler) 60 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt r<WebCanvasCaptureHandler> handler)
61 : MediaStreamTrack(element->executionContext(), component) 61 : MediaStreamTrack(element->getExecutionContext(), component)
62 , m_canvasElement(element) 62 , m_canvasElement(element)
63 { 63 {
64 suspendIfNeeded(); 64 suspendIfNeeded();
65 m_drawListener = AutoCanvasDrawListener::create(handler); 65 m_drawListener = AutoCanvasDrawListener::create(handler);
66 m_canvasElement->addListener(m_drawListener.get()); 66 m_canvasElement->addListener(m_drawListener.get());
67 } 67 }
68 68
69 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt r<WebCanvasCaptureHandler> handler, double frameRate) 69 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt r<WebCanvasCaptureHandler> handler, double frameRate)
70 : MediaStreamTrack(element->executionContext(), component) 70 : MediaStreamTrack(element->getExecutionContext(), component)
71 , m_canvasElement(element) 71 , m_canvasElement(element)
72 { 72 {
73 suspendIfNeeded(); 73 suspendIfNeeded();
74 if (frameRate == 0) { 74 if (frameRate == 0) {
75 m_drawListener = OnRequestCanvasDrawListener::create(handler); 75 m_drawListener = OnRequestCanvasDrawListener::create(handler);
76 } else { 76 } else {
77 m_drawListener = TimedCanvasDrawListener::create(handler, frameRate); 77 m_drawListener = TimedCanvasDrawListener::create(handler, frameRate);
78 } 78 }
79 m_canvasElement->addListener(m_drawListener.get()); 79 m_canvasElement->addListener(m_drawListener.get());
80 } 80 }
81 81
82 } // namespace blink 82 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698