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 28 matching lines...) Expand all Loading... |
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 #include "wtf/Vector.h" | 47 #include "wtf/Vector.h" |
48 | 48 |
49 using namespace WebCore; | 49 using namespace blink; |
50 | 50 |
51 namespace blink { | 51 namespace blink { |
52 | 52 |
53 WebUserMediaRequest::WebUserMediaRequest(UserMediaRequest* request) | 53 WebUserMediaRequest::WebUserMediaRequest(UserMediaRequest* request) |
54 : m_private(request) | 54 : m_private(request) |
55 { | 55 { |
56 } | 56 } |
57 | 57 |
58 void WebUserMediaRequest::reset() | 58 void WebUserMediaRequest::reset() |
59 { | 59 { |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 { | 131 { |
132 m_private = other.m_private; | 132 m_private = other.m_private; |
133 } | 133 } |
134 | 134 |
135 WebUserMediaRequest::operator UserMediaRequest*() const | 135 WebUserMediaRequest::operator UserMediaRequest*() const |
136 { | 136 { |
137 return m_private.get(); | 137 return m_private.get(); |
138 } | 138 } |
139 | 139 |
140 } // namespace blink | 140 } // namespace blink |
OLD | NEW |