| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 if (document->isSecureContext(errorMessage)) { | 126 if (document->isSecureContext(errorMessage)) { |
| 127 UseCounter::count(document->frame(), UseCounter::GetUserMediaSecureOrigi
n); | 127 UseCounter::count(document->frame(), UseCounter::GetUserMediaSecureOrigi
n); |
| 128 UseCounter::countCrossOriginIframe(*document, UseCounter::GetUserMediaSe
cureOriginIframe); | 128 UseCounter::countCrossOriginIframe(*document, UseCounter::GetUserMediaSe
cureOriginIframe); |
| 129 OriginsUsingFeatures::countAnyWorld(*document, OriginsUsingFeatures::Fea
ture::GetUserMediaSecureOrigin); | 129 OriginsUsingFeatures::countAnyWorld(*document, OriginsUsingFeatures::Fea
ture::GetUserMediaSecureOrigin); |
| 130 return true; | 130 return true; |
| 131 } | 131 } |
| 132 | 132 |
| 133 // While getUserMedia is blocked on insecure origins, we still want to | 133 // While getUserMedia is blocked on insecure origins, we still want to |
| 134 // count attempts to use it. | 134 // count attempts to use it. |
| 135 Deprecation::countDeprecation(document->frame(), UseCounter::GetUserMediaIns
ecureOrigin); | 135 Deprecation::countDeprecation(document->frame(), UseCounter::GetUserMediaIns
ecureOrigin); |
| 136 UseCounter::countCrossOriginIframe(*document, UseCounter::GetUserMediaInsecu
reOriginIframe); | 136 Deprecation::countDeprecationCrossOriginIframe(*document, UseCounter::GetUse
rMediaInsecureOriginIframe); |
| 137 OriginsUsingFeatures::countAnyWorld(*document, OriginsUsingFeatures::Feature
::GetUserMediaInsecureOrigin); | 137 OriginsUsingFeatures::countAnyWorld(*document, OriginsUsingFeatures::Feature
::GetUserMediaInsecureOrigin); |
| 138 return false; | 138 return false; |
| 139 } | 139 } |
| 140 | 140 |
| 141 Document* UserMediaRequest::ownerDocument() | 141 Document* UserMediaRequest::ownerDocument() |
| 142 { | 142 { |
| 143 if (ExecutionContext* context = executionContext()) { | 143 if (ExecutionContext* context = executionContext()) { |
| 144 return toDocument(context); | 144 return toDocument(context); |
| 145 } | 145 } |
| 146 | 146 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 | 208 |
| 209 DEFINE_TRACE(UserMediaRequest) | 209 DEFINE_TRACE(UserMediaRequest) |
| 210 { | 210 { |
| 211 visitor->trace(m_controller); | 211 visitor->trace(m_controller); |
| 212 visitor->trace(m_successCallback); | 212 visitor->trace(m_successCallback); |
| 213 visitor->trace(m_errorCallback); | 213 visitor->trace(m_errorCallback); |
| 214 ContextLifecycleObserver::trace(visitor); | 214 ContextLifecycleObserver::trace(visitor); |
| 215 } | 215 } |
| 216 | 216 |
| 217 } // namespace blink | 217 } // namespace blink |
| OLD | NEW |