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

Side by Side Diff: Source/web/WebEncryptedMediaRequest.cpp

Issue 790793004: Oilpan: fix build after r186803. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "config.h" 5 #include "config.h"
6 6
7 #include "public/platform/WebEncryptedMediaRequest.h" 7 #include "public/platform/WebEncryptedMediaRequest.h"
8 8
9 #include "core/dom/ExecutionContext.h" 9 #include "core/dom/ExecutionContext.h"
10 #include "modules/encryptedmedia/EncryptedMediaRequest.h" 10 #include "modules/encryptedmedia/EncryptedMediaRequest.h"
11 #include "platform/weborigin/SecurityOrigin.h" 11 #include "platform/weborigin/SecurityOrigin.h"
12 #include "public/platform/WebMediaKeySystemConfiguration.h" 12 #include "public/platform/WebMediaKeySystemConfiguration.h"
13 #include "public/platform/WebString.h" 13 #include "public/platform/WebString.h"
14 #include "public/platform/WebVector.h" 14 #include "public/platform/WebVector.h"
15 #include "public/web/WebSecurityOrigin.h" 15 #include "public/web/WebSecurityOrigin.h"
16 16
17 namespace blink { 17 namespace blink {
18 18
19 WebEncryptedMediaRequest::WebEncryptedMediaRequest() 19 WebEncryptedMediaRequest::WebEncryptedMediaRequest()
20 { 20 {
21 } 21 }
22 22
23 WebEncryptedMediaRequest::WebEncryptedMediaRequest(const WebEncryptedMediaReques t& request) 23 WebEncryptedMediaRequest::WebEncryptedMediaRequest(const WebEncryptedMediaReques t& request)
24 { 24 {
25 assign(request); 25 assign(request);
26 } 26 }
27 27
28 WebEncryptedMediaRequest::WebEncryptedMediaRequest(const PassRefPtr<EncryptedMed iaRequest>& request) 28 WebEncryptedMediaRequest::WebEncryptedMediaRequest(EncryptedMediaRequest* reques t)
29 : m_private(request) 29 : m_private(request)
30 { 30 {
31 } 31 }
32 32
33 WebEncryptedMediaRequest::~WebEncryptedMediaRequest() 33 WebEncryptedMediaRequest::~WebEncryptedMediaRequest()
34 { 34 {
35 reset(); 35 reset();
36 } 36 }
37 37
38 WebString WebEncryptedMediaRequest::keySystem() const 38 WebString WebEncryptedMediaRequest::keySystem() const
(...skipping 25 matching lines...) Expand all
64 { 64 {
65 m_private = other.m_private; 65 m_private = other.m_private;
66 } 66 }
67 67
68 void WebEncryptedMediaRequest::reset() 68 void WebEncryptedMediaRequest::reset()
69 { 69 {
70 m_private.reset(); 70 m_private.reset();
71 } 71 }
72 72
73 } // namespace blink 73 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/EncryptedMediaRequest.h ('k') | public/platform/WebEncryptedMediaRequest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698