| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #if ENABLE(MEDIA_STREAM) | 33 #if ENABLE(MEDIA_STREAM) |
| 34 | 34 |
| 35 #include <public/WebMediaConstraints.h> | 35 #include <public/WebMediaConstraints.h> |
| 36 | 36 |
| 37 #include "MediaConstraints.h" | 37 #include "core/platform/mediastream/MediaConstraints.h" |
| 38 | 38 |
| 39 using namespace WebCore; | 39 using namespace WebCore; |
| 40 | 40 |
| 41 namespace WebKit { | 41 namespace WebKit { |
| 42 | 42 |
| 43 WebMediaConstraint::WebMediaConstraint(const WebCore::MediaConstraint& other) | 43 WebMediaConstraint::WebMediaConstraint(const WebCore::MediaConstraint& other) |
| 44 : m_name(other.m_name) | 44 : m_name(other.m_name) |
| 45 , m_value(other.m_value) | 45 , m_value(other.m_value) |
| 46 { | 46 { |
| 47 } | 47 } |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 value = result; | 103 value = result; |
| 104 return true; | 104 return true; |
| 105 } | 105 } |
| 106 return false; | 106 return false; |
| 107 } | 107 } |
| 108 | 108 |
| 109 } // namespace WebKit | 109 } // namespace WebKit |
| 110 | 110 |
| 111 #endif // ENABLE(MEDIA_STREAM) | 111 #endif // ENABLE(MEDIA_STREAM) |
| 112 | 112 |
| OLD | NEW |