Merge 90914

Source/WebCore/page/Geolocation.cpp

 /*
  * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 424 matching lines @@
 void Geolocation::resume()
 {
 #if !ENABLE(CLIENT_BASED_GEOLOCATION)
     if (hasListeners())
         m_service->resume();
 #endif
 }
 
 void Geolocation::setIsAllowed(bool allowed)
 {
+    // Protect the Geolocation object from garbage collection during a callback.
+    RefPtr<Geolocation> protect(this);
+
     // This may be due to either a new position from the service, or a cached
     // position.
     m_allowGeolocation = allowed ? Yes : No;
     
 #if USE(PREEMPT_GEOLOCATION_PERMISSION)
     // Permission request was made during the startRequest process
     if (!m_pendingForPermissionNotifiers.isEmpty()) {
         handlePendingPermissionNotifiers();
         m_pendingForPermissionNotifiers.clear();
         return;
@@ skipping 306 matching lines @@
 
 Geolocation::Geolocation(Frame*) {}
 
 Geolocation::~Geolocation() {}
 
 void Geolocation::setIsAllowed(bool) {}
 
 }
                                                         
 #endif // ENABLE(GEOLOCATION)