diff options
| author | rsleevi <rsleevi@chromium.org> | 2014-12-08 13:53:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-08 21:54:29 +0000 |
| commit | 6b150518257d898af57991939f9481bc3e95b5e7 (patch) | |
| tree | 5ba251ef3a87bdd2b90b4a13c0c8e1b7a1733ada /android_webview | |
| parent | 629d7c940346b6e707f35d55f7a50e99a650e5c0 (diff) | |
| download | chromium_src-6b150518257d898af57991939f9481bc3e95b5e7.zip chromium_src-6b150518257d898af57991939f9481bc3e95b5e7.tar.gz chromium_src-6b150518257d898af57991939f9481bc3e95b5e7.tar.bz2 | |
Revert of Move TouchSelectionController from content to ui (patchset #12 id:600001 of https://codereview.chromium.org/759433002/)
Reason for revert:
Suspected of causing Win8 GN failure
http://build.chromium.org/p/chromium.win/builders/Win8%20GN/builds/1552/steps/compile/logs/stdio#error1
FAILED: ninja -t msvc -e environment.x86 -- "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86/cl.exe" /nologo /showIncludes /FC @obj/ui/base/dragdrop/ui_base_unittests.os_exchange_data_provider_aurax11_unittest.obj.rsp /c ../../ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc /Foobj/ui/base/dragdrop/ui_base_unittests.os_exchange_data_provider_aurax11_unittest.obj /Fdobj/ui/base/ui_base_unittests_cc.pdb
c:\b\build\slave\win8_gn\build\src\ui\base\dragdrop\os_exchange_data_provider_aurax11.h(8) : fatalerror C1083: Cannot open include file: 'X11/Xlib.h': No such file or directory
Original issue's description:
> Move TouchSelectionController from content to ui
>
> This patch is only moving new unified touch selection files from
> content/ to ui/touch_selection/. This is the first step to allow Aura
> use the new unified TouchSelectionController.
>
> The only change to TouchSelectionController needed for this move is
> replacing use of cc::ViewportSelectionBound with ui::SelectionBound.
>
> The actual use of the new touch selection for Aura will happen in future
> CL(s). After that, we can remove current touch selection code from
> ui/base/touch/.
>
> BUG=399721
>
> Committed: https://crrev.com/29fd405ca491a6fcf0dde6277d92d44300cb2926
> Cr-Commit-Position: refs/heads/master@{#307336}
TBR=jdduke@chromium.org,mfomitchev@chromium.org,sadrul@chromium.org,boliu@chromium.org,jam@chromium.org,mohsen@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=399721
Review URL: https://codereview.chromium.org/754963007
Cr-Commit-Position: refs/heads/master@{#307344}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/java_library_common.mk | 2 | ||||
| -rw-r--r-- | android_webview/libwebviewchromium.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk index 2dc1a1f..8ddc77e 100644 --- a/android_webview/java_library_common.mk +++ b/android_webview/java_library_common.mk @@ -57,7 +57,7 @@ $(call intermediates-dir-for,GYP,shared)/enums/popup_item_type_java/org/chromium $(call intermediates-dir-for,GYP,shared)/enums/private_key_types_java/org/chromium/net/PrivateKeyType.java \ $(call intermediates-dir-for,GYP,shared)/enums/result_codes_java/org/chromium/content_public/common/ResultCode.java \ $(call intermediates-dir-for,GYP,shared)/enums/screen_orientation_values_java/org/chromium/content_public/common/ScreenOrientationValues.java \ -$(call intermediates-dir-for,GYP,shared)/enums/selection_event_type_java/org/chromium/ui/touch_selection/SelectionEventType.java \ +$(call intermediates-dir-for,GYP,shared)/enums/selection_event_type_java/org/chromium/content/browser/input/SelectionEventType.java \ $(call intermediates-dir-for,GYP,shared)/enums/speech_recognition_error_java/org/chromium/content_public/common/SpeechRecognitionErrorCode.java \ $(call intermediates-dir-for,GYP,shared)/enums/top_controls_state_java/org/chromium/content_public/common/TopControlsState.java \ $(call intermediates-dir-for,GYP,shared)/enums/window_open_disposition_java/org/chromium/ui/WindowOpenDisposition.java \ diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi index 8f5dbe9..89b7d4d 100644 --- a/android_webview/libwebviewchromium.gypi +++ b/android_webview/libwebviewchromium.gypi @@ -21,6 +21,7 @@ '../content/content.gyp:popup_item_type_java', '../content/content.gyp:result_codes_java', '../content/content.gyp:screen_orientation_values_java', + '../content/content.gyp:selection_event_type_java', '../content/content.gyp:speech_recognition_error_java', '../content/content.gyp:top_controls_state_java', '../media/media.gyp:media_android_imageformat', @@ -36,7 +37,6 @@ '../ui/android/ui_android.gyp:touch_device_types_java', '../ui/android/ui_android.gyp:window_open_disposition_java', '../ui/android/ui_android.gyp:text_input_type_java', - '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java', ], # Enable feedback-directed optimisation for the library when building in # android. |