summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authoraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-19 19:34:45 +0000
committeraelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-19 19:34:45 +0000
commit5028bb4b47a9d98b07ee3fd4bd33e8d0c3238888 (patch)
tree9f32927b1cd2bd03d0e47a3277f02f88c0d3dea4 /android_webview
parent3b3b0ea2a5f71536b9c0b17dece9473fc8cf2c29 (diff)
downloadchromium_src-5028bb4b47a9d98b07ee3fd4bd33e8d0c3238888.zip
chromium_src-5028bb4b47a9d98b07ee3fd4bd33e8d0c3238888.tar.gz
chromium_src-5028bb4b47a9d98b07ee3fd4bd33e8d0c3238888.tar.bz2
Revert of Gamepad API support for chrome on android (https://codereview.chromium.org/133943002/)
Reason for revert: Gamepad list lookup causes a startup crash on Ice Cream Sandwich devices. Please reland after adding the appropriate version check and testing locally (note: you don't need to get OWNERS approval a second time when relanding if you reupload to this codereview entry instead of creating a new one). TBR=feng@chromium.org NOTRY=true Original issue's description: > Gamepad API support for chrome on android > > This change adds code to get gamepad data from java objects and > provide these updates to the GamepadProvider which then writes to > GamepadHardwareBuffer which in turn is read by SharedMemoryReader and > later returned by JS to the web page. > > Added singleton class GamepadsReader which is responsible for > communication with java class and accessing gamepad data. It adds > methods for communication with singleton java GamepadList class to > get gamepads data. > > This also adds new framework classes/methods required for Gamepad API > support. Frameworks changes are responsible for : > - Identifying gamepad devices and their capabilities. > - Managing connected gamepad devices > - Map the connected gamepad devices to standard Gamepad format. > - Keeping gamepads axes/buttons data up-to-date and returning it to > native whenever requested. In android we cannot get gamepad data > directly from sources, so framework is modified to capture > gamepad key and motion events and extract gamepad data from these > events. > > * Class GamepadPlatformDataFetcherAndroid : Android specific > implementation of gamepad data fetcher. > > * Class ContentViewCore : Manages gamepad list and notifies of new > key/motion event for gamepads. > > * Class GamepadList : A new class to manage connected gamepad devices > > * Class GamepadDevice : A new class to manage information related to > each gamepad device. > > * Class GamepadMappings : This class is responsible for mapping of > known gamepads to the standard gamepad. > > This change enables gamepad API by default. > > Adds support for parsing float array return type in JNI generator. > > NVIDIA Shield and XBox360 gamepads are mapped to the standard gamepad > > BUG=330094 > > TEST=http://www.html5rocks.com/en/tutorials/doodles/gamepad/gamepad-tester/tester.html > > R=tsepez@chromium.org > R=darin@chromium.org > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270620 Review URL: https://codereview.chromium.org/298483002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/Android.mk2
-rw-r--r--android_webview/android_webview.gyp1
2 files changed, 0 insertions, 3 deletions
diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index 525fb84..dd9e13b 100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -61,8 +61,6 @@ $(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chro
$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/GestureEventType.java \
$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/PageTransitionTypes.java \
$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/SpeechRecognitionError.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalAxisIndex.java \
-$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/CanonicalButtonIndex.java \
$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/browser/input/PopupItemType.java \
$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ResultCodes.java \
$(call intermediates-dir-for,GYP,shared,,,$(TARGET_2ND_ARCH))/templates/org/chromium/content/common/ScreenOrientationValues.java \
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index e2455f3..420cd76 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -26,7 +26,6 @@
'dependencies': [
'../base/base.gyp:base_java_application_state',
'../base/base.gyp:base_java_memory_pressure_level_list',
- '../content/content.gyp:content_gamepad_mapping',
'../content/content.gyp:gesture_event_type_java',
'../content/content.gyp:page_transition_types_java',
'../content/content.gyp:popup_item_type_java',