Merge changes 8489,8490

* changes:
  Android specifics for 'Removes uneccessary IDL files for Geolocation permissions'.
  Removes uneccessary IDL files for Geolocation callbacks.

4 files changed, 0 insertions, 78 deletions

diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index c8a2651..4a90eef 100644
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -25,7 +25,6 @@
 #	dom/EventTarget.idl \
 #	html/CanvasPixelArray.idl \
 #	page/AbstractView.idl \
-#	page/PositionCallback.idl \
 #	svg/ElementTimeControl.idl \
 #	svg/SVGAnimatedPathData.idl \
 #	svg/SVGAnimatedPoints.idl \
@@ -430,12 +429,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/loader/appcache/%.cpp : $(interme
 # out/.../JSAbstractView.cpp:27:26: error: AbstractView.h: No such file or directory
 # I can't find AbstractView.h anywhere
 #    $(intermediates)/page/JSAbstractView.h \
-#
-# also:
-#
-# out/.../JSPositionCallback.cpp:145: error: no matching function for call to 'WebCore::PositionCallback::handleEvent(WebCore::Geoposition*&)'
-#  note: candidates are: virtual void WebCore::PositionCallback::handleEvent(WebCore::Geoposition*, bool&)
-#    $(intermediates)/page/JSPositionCallback.h \
 
 GEN := \
     $(intermediates)/page/JSBarInfo.h \
@@ -449,7 +442,6 @@ GEN := \
     $(intermediates)/page/JSLocation.h \
     $(intermediates)/page/JSNavigator.h \
     $(intermediates)/page/JSPositionError.h \
-    $(intermediates)/page/JSPositionErrorCallback.h \
     $(intermediates)/page/JSScreen.h \
     $(intermediates)/page/JSWebKitPoint.h \
     $(intermediates)/page/JSWorkerNavigator.h
diff --git a/WebCore/DerivedSources.make b/WebCore/DerivedSources.make
index f1c3058..30ec038 100644
--- a/WebCore/DerivedSources.make
+++ b/WebCore/DerivedSources.make
@@ -186,9 +186,7 @@ DOM_CLASSES = \
     OverflowEvent \
     Plugin \
     PluginArray \
-    PositionCallback \
     PositionError \
-    PositionErrorCallback \
     ProcessingInstruction \
     ProgressEvent \
     RGBColor \
diff --git a/WebCore/page/PositionCallback.idl b/WebCore/page/PositionCallback.idl
deleted file mode 100644
index e862538..0000000
--- a/WebCore/page/PositionCallback.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * 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.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module core {
-
-    interface [
-        GenerateConstructor
-    ] PositionCallback {
-        void handleEvent(in Geoposition position);
-    };
-
-}
diff --git a/WebCore/page/PositionErrorCallback.idl b/WebCore/page/PositionErrorCallback.idl
deleted file mode 100644
index 07edfa6..0000000
--- a/WebCore/page/PositionErrorCallback.idl
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * 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.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-module core {
-
-    interface [
-        GenerateConstructor
-    ] PositionErrorCallback {
-        void handleEvent(in PositionError error);
-    };
-
-}