| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "platform/mediastream/MediaStreamSource.h" | 38 #include "platform/mediastream/MediaStreamSource.h" |
| 39 #include "platform/weborigin/SecurityOrigin.h" | 39 #include "platform/weborigin/SecurityOrigin.h" |
| 40 #include "public/platform/WebMediaConstraints.h" | 40 #include "public/platform/WebMediaConstraints.h" |
| 41 #include "public/platform/WebMediaStream.h" | 41 #include "public/platform/WebMediaStream.h" |
| 42 #include "public/platform/WebMediaStreamSource.h" | 42 #include "public/platform/WebMediaStreamSource.h" |
| 43 #include "public/platform/WebString.h" | 43 #include "public/platform/WebString.h" |
| 44 #include "public/platform/WebVector.h" | 44 #include "public/platform/WebVector.h" |
| 45 #include "public/web/WebDocument.h" | 45 #include "public/web/WebDocument.h" |
| 46 #include "public/web/WebSecurityOrigin.h" | 46 #include "public/web/WebSecurityOrigin.h" |
| 47 | 47 |
| 48 using namespace blink; | |
| 49 | |
| 50 namespace blink { | 48 namespace blink { |
| 51 | 49 |
| 52 WebUserMediaRequest::WebUserMediaRequest(UserMediaRequest* request) | 50 WebUserMediaRequest::WebUserMediaRequest(UserMediaRequest* request) |
| 53 : m_private(request) | 51 : m_private(request) |
| 54 { | 52 { |
| 55 } | 53 } |
| 56 | 54 |
| 57 void WebUserMediaRequest::reset() | 55 void WebUserMediaRequest::reset() |
| 58 { | 56 { |
| 59 m_private.reset(); | 57 m_private.reset(); |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 { | 128 { |
| 131 m_private = other.m_private; | 129 m_private = other.m_private; |
| 132 } | 130 } |
| 133 | 131 |
| 134 WebUserMediaRequest::operator UserMediaRequest*() const | 132 WebUserMediaRequest::operator UserMediaRequest*() const |
| 135 { | 133 { |
| 136 return m_private.get(); | 134 return m_private.get(); |
| 137 } | 135 } |
| 138 | 136 |
| 139 } // namespace blink | 137 } // namespace blink |
| OLD | NEW |