OSDN Git Service

Merge commit 'goog/master' into merge
authorBen Murdoch <benm@google.com>
Tue, 18 Aug 2009 10:35:14 +0000 (11:35 +0100)
committerBen Murdoch <benm@google.com>
Tue, 18 Aug 2009 10:35:14 +0000 (11:35 +0100)
commite0330ac957b8434cd2c9c7b5447aaa0faabe77ec
tree395ba85351595e79b5e357e46af5c28a0dcb5211
parentb32f88b61a9162a5194ab02c12fc3aff6140e30e
parent8ca4160fde81af362cf2ea375997797b1df8243d
Merge commit 'goog/master' into merge

Conflicts:
WebCore/bindings/v8/ScriptController.cpp
WebCore/page/Geolocation.cpp
WebCore/platform/android/GeolocationServiceAndroid.cpp
12 files changed:
Android.v8.mk
WebCore/bindings/v8/ScriptController.cpp
WebCore/html/HTMLBodyElement.cpp
WebCore/page/Geolocation.cpp
WebCore/page/Geolocation.h
WebCore/page/SecurityOrigin.cpp
WebCore/plugins/PluginPackage.cpp
WebCore/plugins/PluginPackage.h
WebCore/rendering/RenderPartObject.cpp
WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
WebKit/android/jni/WebCoreFrameBridge.cpp
WebKit/android/jni/WebViewCore.cpp