OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 29 matching lines...) Expand all Loading... |
40 WebMediaDevicesRequest::WebMediaDevicesRequest(MediaDevicesRequest* request) | 40 WebMediaDevicesRequest::WebMediaDevicesRequest(MediaDevicesRequest* request) |
41 : m_private(request) | 41 : m_private(request) |
42 { | 42 { |
43 } | 43 } |
44 | 44 |
45 void WebMediaDevicesRequest::reset() | 45 void WebMediaDevicesRequest::reset() |
46 { | 46 { |
47 m_private.reset(); | 47 m_private.reset(); |
48 } | 48 } |
49 | 49 |
50 WebSecurityOrigin WebMediaDevicesRequest::securityOrigin() const | 50 WebSecurityOrigin WebMediaDevicesRequest::getSecurityOrigin() const |
51 { | 51 { |
52 ASSERT(!isNull() && m_private->executionContext()); | 52 ASSERT(!isNull() && m_private->getExecutionContext()); |
53 return WebSecurityOrigin(m_private->executionContext()->securityOrigin()); | 53 return WebSecurityOrigin(m_private->getExecutionContext()->getSecurityOrigin
()); |
54 } | 54 } |
55 | 55 |
56 WebDocument WebMediaDevicesRequest::ownerDocument() const | 56 WebDocument WebMediaDevicesRequest::ownerDocument() const |
57 { | 57 { |
58 ASSERT(!isNull()); | 58 ASSERT(!isNull()); |
59 return WebDocument(m_private->ownerDocument()); | 59 return WebDocument(m_private->ownerDocument()); |
60 } | 60 } |
61 | 61 |
62 void WebMediaDevicesRequest::requestSucceeded(WebVector<WebMediaDeviceInfo> webD
evices) | 62 void WebMediaDevicesRequest::requestSucceeded(WebVector<WebMediaDeviceInfo> webD
evices) |
63 { | 63 { |
(...skipping 17 matching lines...) Expand all Loading... |
81 { | 81 { |
82 m_private = other.m_private; | 82 m_private = other.m_private; |
83 } | 83 } |
84 | 84 |
85 WebMediaDevicesRequest::operator MediaDevicesRequest*() const | 85 WebMediaDevicesRequest::operator MediaDevicesRequest*() const |
86 { | 86 { |
87 return m_private.get(); | 87 return m_private.get(); |
88 } | 88 } |
89 | 89 |
90 } // namespace blink | 90 } // namespace blink |
OLD | NEW |