diff options
| author | Steve Block <steveblock@google.com> | 2010-09-10 04:32:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 04:32:52 -0700 |
| commit | 4b59a578dfea4d5ae9b902b834ca44cc28ac993b (patch) | |
| tree | c00014db026ed7eeab8afb5ba95cb283e0ee3356 /WebCore | |
| parent | 7777773eaa086fa6180ab47e86dd7d903a2e7b2f (diff) | |
| parent | 0a05678e32a04623b93aa4d3990d14877ee80386 (diff) | |
| download | external_webkit-4b59a578dfea4d5ae9b902b834ca44cc28ac993b.zip external_webkit-4b59a578dfea4d5ae9b902b834ca44cc28ac993b.tar.gz external_webkit-4b59a578dfea4d5ae9b902b834ca44cc28ac993b.tar.bz2 | |
am 0a05678e: Cherry-pick security fix in WebKit change 65329
Merge commit '0a05678e32a04623b93aa4d3990d14877ee80386' into gingerbread-plus-aosp
* commit '0a05678e32a04623b93aa4d3990d14877ee80386':
Cherry-pick security fix in WebKit change 65329
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/page/Geolocation.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index a885062..eddbc36 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -271,6 +271,9 @@ Geoposition* Geolocation::lastPosition() void Geolocation::getCurrentPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) { + if (!m_frame) + return; + RefPtr<GeoNotifier> notifier = startRequest(successCallback, errorCallback, options); ASSERT(notifier); @@ -279,6 +282,9 @@ void Geolocation::getCurrentPosition(PassRefPtr<PositionCallback> successCallbac int Geolocation::watchPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) { + if (!m_frame) + return 0; + RefPtr<GeoNotifier> notifier = startRequest(successCallback, errorCallback, options); ASSERT(notifier); |