WebKit merge 41660:41709 (WebKit side)....

third_party/WebKit/WebCore/page/Geolocation.h

Index: third_party/WebKit/WebCore/page/Geolocation.h
===================================================================
--- third_party/WebKit/WebCore/page/Geolocation.h	(revision 11711)
+++ third_party/WebKit/WebCore/page/Geolocation.h	(working copy)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2009 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -60,6 +60,12 @@
 
     void suspend();
     void resume();
+    
+    void setIsAllowed(bool);
+    bool isAllowed() const { return m_allowGeolocation == Yes; }
+    
+    void setShouldClearCache(bool shouldClearCache) { m_shouldClearCache = shouldClearCache; }
+    bool shouldClearCache() const { return m_shouldClearCache; }
 
 private:
     Geolocation(Frame*);
@@ -87,12 +93,12 @@
     
     void handleError(PositionError*);
 
+    void requestPermission();
+
     // GeolocationServiceClient
     virtual void geolocationServicePositionChanged(GeolocationService*);
     virtual void geolocationServiceErrorOccurred(GeolocationService*);
 
-    bool shouldAllowGeolocation();
-
     typedef HashSet<RefPtr<GeoNotifier> > GeoNotifierSet;
     typedef HashMap<int, RefPtr<GeoNotifier> > GeoNotifierMap;
     
@@ -103,9 +109,11 @@
 
     enum {
         Unknown,
+        InProgress,
         Yes,
         No
     } m_allowGeolocation;
+    bool m_shouldClearCache;
 };
     
 } // namespace WebCore