OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved. |
3 * Copyright (C) 2009 Torch Mobile, Inc. | 3 * Copyright (C) 2009 Torch Mobile, Inc. |
4 * Copyright 2010, The Android Open Source Project | 4 * Copyright 2010, The Android Open Source Project |
5 * | 5 * |
6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
8 * are met: | 8 * are met: |
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 DCHECK(document); | 144 DCHECK(document); |
145 | 145 |
146 // It is required by isSecureContext() but isn't | 146 // It is required by isSecureContext() but isn't |
147 // actually used. This could be used later if a warning is shown in the | 147 // actually used. This could be used later if a warning is shown in the |
148 // developer console. | 148 // developer console. |
149 String insecure_origin_msg; | 149 String insecure_origin_msg; |
150 if (document->IsSecureContext(insecure_origin_msg)) { | 150 if (document->IsSecureContext(insecure_origin_msg)) { |
151 UseCounter::Count(document, WebFeature::kGeolocationSecureOrigin); | 151 UseCounter::Count(document, WebFeature::kGeolocationSecureOrigin); |
152 UseCounter::CountCrossOriginIframe( | 152 UseCounter::CountCrossOriginIframe( |
153 *document, WebFeature::kGeolocationSecureOriginIframe); | 153 *document, WebFeature::kGeolocationSecureOriginIframe); |
| 154 Deprecation::CountDeprecationCrossOriginIframe( |
| 155 *document, WebFeature::kGeolocationDisabledIframe); |
154 } else if (GetFrame() | 156 } else if (GetFrame() |
155 ->GetSettings() | 157 ->GetSettings() |
156 ->GetAllowGeolocationOnInsecureOrigins()) { | 158 ->GetAllowGeolocationOnInsecureOrigins()) { |
157 // TODO(jww): This should be removed after WebView is fixed so that it | 159 // TODO(jww): This should be removed after WebView is fixed so that it |
158 // disallows geolocation in insecure contexts. | 160 // disallows geolocation in insecure contexts. |
159 // | 161 // |
160 // See https://crbug.com/603574. | 162 // See https://crbug.com/603574. |
161 Deprecation::CountDeprecation( | 163 Deprecation::CountDeprecation( |
162 document, WebFeature::kGeolocationInsecureOriginDeprecatedNotRemoved); | 164 document, WebFeature::kGeolocationInsecureOriginDeprecatedNotRemoved); |
163 Deprecation::CountDeprecationCrossOriginIframe( | 165 Deprecation::CountDeprecationCrossOriginIframe( |
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 PositionError::kPositionUnavailable, kFailedToStartServiceErrorMessage); | 558 PositionError::kPositionUnavailable, kFailedToStartServiceErrorMessage); |
557 error->SetIsFatal(true); | 559 error->SetIsFatal(true); |
558 HandleError(error); | 560 HandleError(error); |
559 } | 561 } |
560 | 562 |
561 void Geolocation::OnPermissionConnectionError() { | 563 void Geolocation::OnPermissionConnectionError() { |
562 OnGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED); | 564 OnGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED); |
563 } | 565 } |
564 | 566 |
565 } // namespace blink | 567 } // namespace blink |
OLD | NEW |