[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[weinig at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 8944eee329fdfde299cf66119548cf5557678cbf
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 19:38:37 2009 +0000

    Fix the build.
    
    * page/Geolocation.cpp:
    * page/Geolocation.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52104 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8170b4f..cf79592 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-14  Sam Weinig  <sam at webkit.org>
+
+        Fix the build.
+
+        * page/Geolocation.cpp:
+        * page/Geolocation.h:
+
 2009-12-13  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index ce204fd..12c9f4e 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -37,7 +37,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 db513be..1561f47 100644
--- a/WebCore/page/Geolocation.h
+++ b/WebCore/page/Geolocation.h
@@ -27,16 +27,17 @@
 #define Geolocation_h
 
 #include "GeolocationService.h"
+#include "Geoposition.h"
 #include "PositionCallback.h"
 #include "PositionError.h"
 #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>
@@ -44,7 +45,6 @@
 namespace WebCore {
 
 class Frame;
-class Geoposition;
 
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
 class GeolocationPosition;

-- 
WebKit Debian packaging