summaryrefslogtreecommitdiffstats
path: root/android_webview/android_webview_tests.gypi
diff options
context:
space:
mode:
authorigsolla <igsolla@chromium.org>2014-10-30 09:52:15 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-30 16:52:48 +0000
commitc698e079008a03048933818525310fb34908a10a (patch)
tree273693e2afae1ed6063af3be50fc2e0276213e36 /android_webview/android_webview_tests.gypi
parent3d2ce69122a9d4757c8d6c5e0b50974654daf809 (diff)
downloadchromium_src-c698e079008a03048933818525310fb34908a10a.zip
chromium_src-c698e079008a03048933818525310fb34908a10a.tar.gz
chromium_src-c698e079008a03048933818525310fb34908a10a.tar.bz2
[aw] Transfer anchor views between container views.
The WebView swaps container views when transitioning from/to fullscreen. This change ensures that anchor views are transferred across container views too. We also remove the PowerSaveBlocker attached to the ContentVideoView because as a result it is not longer needed. We now reuse the PowerSaveBlocker attached to the WebContents which is implemented as an anchor view. This has a number of advantages: 1. The PowerSaveBlocker now works correctly between transitions from/to fullscreen. 2. A PowerSaveBlocker is now also created for video elements contained inside a div (for these a ContentVideoView is not created when going fullscreen). This change depends on: https://codereview.chromium.org/639923003/ This change also adds comprehensive tests to verify the new behaviour. For this we need a longer video, so we replace the old one-frame test video. We also refactor the tests to remove flakiness and unnecessary complexity. BUG=398485 Review URL: https://codereview.chromium.org/639413002 Cr-Commit-Position: refs/heads/master@{#302094}
Diffstat (limited to 'android_webview/android_webview_tests.gypi')
-rw-r--r--android_webview/android_webview_tests.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index 9ef2289..e2f55b2 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -28,6 +28,7 @@
'<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video.js',
'<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html',
'<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_inside_div_test.html',
+ '<(PRODUCT_DIR)/android_webview_apk/assets/video.mp4',
],
'conditions': [
['icu_use_data_file_flag==1', {
@@ -55,6 +56,7 @@
'<(java_in_dir)/assets/full_screen_video.js',
'<(java_in_dir)/assets/full_screen_video_test.html',
'<(java_in_dir)/assets/full_screen_video_inside_div_test.html',
+ '<(java_in_dir)/assets/video.mp4',
],
'conditions': [
['icu_use_data_file_flag==1', {