resolved conflicts for merge of df644d06 to master

Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da

diff --cc WebCore/ChangeLog
index b306b29,d60de59..e6d6de6
--- 1/WebCore/ChangeLog
--- 2/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@@ -1,82 -1,22 +1,101 @@@
+ 2010-01-18  Steve Block  <steveblock@google.com>
+ 
+         Reviewed by Adam Barth.
+ 
+         Moves JSC-specific version of JavaInstance from bridge/jni/jni_instance to bridge/jni/jsc/JavaInstanceJSC
+         https://bugs.webkit.org/show_bug.cgi?id=33672
+ 
+         No new tests, refactoring only.
+ 
+         * Android.jscbindings.mk: Modified. Removed jni_instance.cpp and added JavaInstanceJSC.cpp
+         * GNUmakefile.am: Modified. Removed jni_instance.h and added JavaInstanceJSC.h
+         * WebCore.xcodeproj/project.pbxproj: Modified. Removed jni_instance.[cpp|h] and added JavaInstanceJSC.[cpp|h]
+         * bindings/js/ScriptControllerMac.mm: Modified. Includes JavaInstanceJSC.h
+         * bridge/jni/jni_instance.cpp: Removed.
+         * bridge/jni/jni_instance.h: Removed.
+         * bridge/jni/jni_runtime.h: Modified. Includes JavaInstanceJSC.h
+         * bridge/jni/jsc/JavaInstanceJSC.cpp: Copied from WebCore/bridge/jni/jni_instance.cpp.
+         * bridge/jni/jsc/JavaInstanceJSC.h: Copied from WebCore/bridge/jni/jni_instance.h.
+ 
 +2009-12-13  Sam Weinig  <sam@webkit.org>
 +
 +        Reviewed by Dan Bernstein.
 +
 +        Fix for https://bugs.webkit.org/show_bug.cgi?id=32499
 +        Add client based Geolocation provider
 +
 +        Add first cut of a client based Geolocation provider. This is guarded by
 +        ENABLE(CLIENT_BASED_GEOLOCATION) and is off by default for now. This adds a
 +        GeolocationControllerClient interface that no-one currently implements,
 +        but will in a subsequent patch.
 +
 +        * GNUmakefile.am:
 +        * WebCore.base.exp:
 +        * WebCore.gypi:
 +        * WebCore.pro:
 +        * WebCore.vcproj/WebCore.vcproj:
 +        * WebCore.xcodeproj/project.pbxproj:
 +        * WebCoreSources.bkl:
 +        * page/Geolocation.cpp:
 +        (WebCore::createGeopositionFromGeolocationPosition):
 +        (WebCore::createPositionErrorFromGeolocationError):
 +        (WebCore::Geolocation::Geolocation):
 +        (WebCore::Geolocation::~Geolocation):
 +        (WebCore::Geolocation::disconnectFrame):
 +        (WebCore::Geolocation::lastPosition):
 +        (WebCore::Geolocation::startRequest):
 +        (WebCore::Geolocation::fatalErrorOccurred):
 +        (WebCore::Geolocation::requestTimedOut):
 +        (WebCore::Geolocation::clearWatch):
 +        (WebCore::Geolocation::handleError):
 +        (WebCore::Geolocation::positionChanged):
 +        (WebCore::Geolocation::makeSuccessCallbacks):
 +        (WebCore::Geolocation::errorOccurred):
 +        (WebCore::Geolocation::geolocationServicePositionChanged):
 +        (WebCore::Geolocation::geolocationServiceErrorOccurred):
 +        (WebCore::Geolocation::startUpdating):
 +        (WebCore::Geolocation::stopUpdating):
 +        * page/Geolocation.h:
 +        * page/GeolocationController.cpp: Added.
 +        (WebCore::GeolocationController::GeolocationController):
 +        (WebCore::GeolocationController::~GeolocationController):
 +        (WebCore::GeolocationController::addObserver):
 +        (WebCore::GeolocationController::removeObserver):
 +        (WebCore::GeolocationController::positionChanged):
 +        (WebCore::GeolocationController::errorOccurred):
 +        (WebCore::GeolocationController::lastPosition):
 +        * page/GeolocationController.h: Added.
 +        * page/GeolocationControllerClient.h: Added.
 +        (WebCore::GeolocationControllerClient::~GeolocationControllerClient):
 +        * page/GeolocationError.h: Added.
 +        (WebCore::GeolocationError::):
 +        (WebCore::GeolocationError::create):
 +        (WebCore::GeolocationError::code):
 +        (WebCore::GeolocationError::message):
 +        * page/GeolocationPosition.h: Added.
 +        (WebCore::GeolocationPosition::create):
 +        (WebCore::GeolocationPosition::timestamp):
 +        (WebCore::GeolocationPosition::latitude):
 +        (WebCore::GeolocationPosition::longitude):
 +        (WebCore::GeolocationPosition::accuracy):
 +        (WebCore::GeolocationPosition::altitude):
 +        (WebCore::GeolocationPosition::altitudeAccuracy):
 +        (WebCore::GeolocationPosition::heading):
 +        (WebCore::GeolocationPosition::speed):
 +        (WebCore::GeolocationPosition::canProvideAltitude):
 +        (WebCore::GeolocationPosition::canProvideAltitudeAccuracy):
 +        (WebCore::GeolocationPosition::canProvideHeading):
 +        (WebCore::GeolocationPosition::canProvideSpeed):
 +        (WebCore::GeolocationPosition::GeolocationPosition):
 +        * page/Geoposition.h:
 +        (WebCore::Geoposition::create):
 +        * page/Page.cpp:
 +        (WebCore::Page::Page):
 +        * page/Page.h:
 +        (WebCore::Page::geolocationController):
 +        * svg/graphics/SVGImage.cpp:
 +        (WebCore::SVGImage::dataChanged):
 +
  2009-12-10  Alexey Proskuryakov  <ap@apple.com>
  
          Reviewed by Darin Adler.

diff --cc WebCore/GNUmakefile.am
Simple merge

diff --cc WebCore/WebCore.xcodeproj/project.pbxproj
Simple merge

diff --cc WebKit/android/jni/WebCoreFrameBridge.cpp
Simple merge