| 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 | 116 |
| 117 void Geolocation::contextDestroyed(ExecutionContext*) { | 117 void Geolocation::contextDestroyed(ExecutionContext*) { |
| 118 m_permissionService.reset(); | 118 m_permissionService.reset(); |
| 119 cancelAllRequests(); | 119 cancelAllRequests(); |
| 120 stopUpdating(); | 120 stopUpdating(); |
| 121 m_geolocationPermission = PermissionDenied; | 121 m_geolocationPermission = PermissionDenied; |
| 122 m_pendingForPermissionNotifiers.clear(); | 122 m_pendingForPermissionNotifiers.clear(); |
| 123 m_lastPosition = nullptr; | 123 m_lastPosition = nullptr; |
| 124 } | 124 } |
| 125 | 125 |
| 126 void Geolocation::contextDestroyed(Page*) {} | |
| 127 | |
| 128 void Geolocation::recordOriginTypeAccess() const { | 126 void Geolocation::recordOriginTypeAccess() const { |
| 129 DCHECK(frame()); | 127 DCHECK(frame()); |
| 130 | 128 |
| 131 Document* document = this->document(); | 129 Document* document = this->document(); |
| 132 DCHECK(document); | 130 DCHECK(document); |
| 133 | 131 |
| 134 // It is required by isSecureContext() but isn't | 132 // It is required by isSecureContext() but isn't |
| 135 // actually used. This could be used later if a warning is shown in the | 133 // actually used. This could be used later if a warning is shown in the |
| 136 // developer console. | 134 // developer console. |
| 137 String insecureOriginMsg; | 135 String insecureOriginMsg; |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 // be called. In that case, blink has already shut down so do nothing. | 546 // be called. In that case, blink has already shut down so do nothing. |
| 549 // | 547 // |
| 550 // TODO(sammc): Remove this once renderer shutdown is no longer graceful. | 548 // TODO(sammc): Remove this once renderer shutdown is no longer graceful. |
| 551 if (!Platform::current()) | 549 if (!Platform::current()) |
| 552 return; | 550 return; |
| 553 | 551 |
| 554 onGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED); | 552 onGeolocationPermissionUpdated(mojom::blink::PermissionStatus::DENIED); |
| 555 } | 553 } |
| 556 | 554 |
| 557 } // namespace blink | 555 } // namespace blink |
| OLD | NEW |