| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 { | 80 { |
| 81 Geolocation* geolocation = new Geolocation(context); | 81 Geolocation* geolocation = new Geolocation(context); |
| 82 geolocation->suspendIfNeeded(); | 82 geolocation->suspendIfNeeded(); |
| 83 return geolocation; | 83 return geolocation; |
| 84 } | 84 } |
| 85 | 85 |
| 86 Geolocation::Geolocation(ExecutionContext* context) | 86 Geolocation::Geolocation(ExecutionContext* context) |
| 87 : ActiveDOMObject(context) | 87 : ActiveDOMObject(context) |
| 88 , m_geolocationPermission(PermissionUnknown) | 88 , m_geolocationPermission(PermissionUnknown) |
| 89 { | 89 { |
| 90 ScriptWrappable::init(this); | |
| 91 } | 90 } |
| 92 | 91 |
| 93 Geolocation::~Geolocation() | 92 Geolocation::~Geolocation() |
| 94 { | 93 { |
| 95 ASSERT(m_geolocationPermission != PermissionRequested); | 94 ASSERT(m_geolocationPermission != PermissionRequested); |
| 96 } | 95 } |
| 97 | 96 |
| 98 void Geolocation::trace(Visitor* visitor) | 97 void Geolocation::trace(Visitor* visitor) |
| 99 { | 98 { |
| 100 visitor->trace(m_oneShots); | 99 visitor->trace(m_oneShots); |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 notifier->startTimer(); | 516 notifier->startTimer(); |
| 518 else | 517 else |
| 519 notifier->setFatalError(PositionError::create(PositionError::POS
ITION_UNAVAILABLE, failedToStartServiceErrorMessage)); | 518 notifier->setFatalError(PositionError::create(PositionError::POS
ITION_UNAVAILABLE, failedToStartServiceErrorMessage)); |
| 520 } else { | 519 } else { |
| 521 notifier->setFatalError(PositionError::create(PositionError::PERMISS
ION_DENIED, permissionDeniedErrorMessage)); | 520 notifier->setFatalError(PositionError::create(PositionError::PERMISS
ION_DENIED, permissionDeniedErrorMessage)); |
| 522 } | 521 } |
| 523 } | 522 } |
| 524 } | 523 } |
| 525 | 524 |
| 526 } // namespace blink | 525 } // namespace blink |
| OLD | NEW |