Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / geolocation / Geolocation.h

diff --git a/src/third_party/WebKit/Source/modules/geolocation/Geolocation.h b/src/third_party/WebKit/Source/modules/geolocation/Geolocation.h
index bb15240..eb8e4c6 100644 (file)
--- a/src/third_party/WebKit/Source/modules/geolocation/Geolocation.h
+++ b/src/third_party/WebKit/Source/modules/geolocation/Geolocation.h
@@ -44,12 +44,10 @@ namespace blink {
 class Dictionary;
 class Document;
 class LocalFrame;
-class GeolocationController;
 class GeolocationError;
-class GeolocationPosition;
 class ExecutionContext;
 
-class Geolocation FINAL
+class Geolocation final
     : public GarbageCollectedFinalized<Geolocation>
     , public ScriptWrappable
     , public ActiveDOMObject {
@@ -59,7 +57,7 @@ public:
     virtual ~Geolocation();
     void trace(Visitor*);
 
-    virtual void stop() OVERRIDE;
+    virtual void stop() override;
     Document* document() const;
     LocalFrame* frame() const;
 
@@ -164,6 +162,11 @@ private:
     // position, the set is then cleared. The oneshots are removed everywhere.
     void makeCachedPositionCallbacks();
 
+    // Record whether the origin trying to access Geolocation would be allowed
+    // to access a feature that can only be accessed by secure origins.
+    // See http://goo.gl/lq4gCo
+    void recordOriginTypeAccess() const;
+
     GeoNotifierSet m_oneShots;
     GeolocationWatchers m_watchers;
     GeoNotifierSet m_pendingForPermissionNotifiers;