From e69f6aab4f5d93208365709a92a030adadecabf1 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Fri, 22 Jan 2010 15:13:04 +0000
Subject: Cherry-pick WebKit change 52104 to make changes to Geolocation

See http://trac.webkit.org/changeset/52104

This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code.

Change-Id: I342b9f6b6ef5a25fac37dd2187a67a834fb7e270
---
 WebCore/ChangeLog            | 7 +++++++
 WebCore/page/Geolocation.cpp | 1 -
 WebCore/page/Geolocation.h   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'WebCore')

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 777f32b..68d2cd1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-14  Sam Weinig  <sam@webkit.org>
+
+        Fix the build.
+
+        * page/Geolocation.cpp:
+        * page/Geolocation.h:
+
 2010-01-21  Steve Block  <steveblock@google.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index f0578a8..5a9768c 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -44,7 +44,6 @@
 #include "GeolocationController.h"
 #include "GeolocationError.h"
 #include "GeolocationPosition.h"
-#include "Geoposition.h"
 #include "PositionError.h"
 #endif
 
diff --git a/WebCore/page/Geolocation.h b/WebCore/page/Geolocation.h
index 5b5feb5..6249bc2 100644
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -34,11 +34,11 @@
 #include "PositionErrorCallback.h"
 #include "PositionOptions.h"
 #include "Timer.h"
-#include <wtf/Platform.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
+#include <wtf/Platform.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
-- 
cgit v1.1