diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2014-09-08 10:23:33 +0100 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2014-09-08 10:23:33 +0100 |
| commit | a648f0a2a2db1c831cd3760bba309908e69697e7 (patch) | |
| tree | 97a53ed293b9530669a6e86ca5bc8670faa7912f /android_webview/android_webview.gyp | |
| parent | c622a8f4bfc6aaf5ef2ccfe28cc3249c35af26ef (diff) | |
| download | chromium_org-a648f0a2a2db1c831cd3760bba309908e69697e7.tar.gz | |
Cherry-pick: Revert "Merge 281715 "[Android WebView] Terminate execution of stuck JS ...""
The approach implemented in the patch is prone to crashing Blink bindings code.
See more comments in the bugs.
Bug: 13509205, 17175122, 17173843
Original description:
Revert "Merge 281715 "[Android WebView] Terminate execution of stuck JS ...""
This reverts commit 8508a2f18909b0768d273bb9161aee749f47beca.
As described in the bug, the proposed approach is invalid, as Blink's bindings
code isn't ready to deal with terminated scripts properly, resulting in random
crashes. Hence reverting the patch.
BUG=390906
Review URL: https://codereview.chromium.org/536593004
Cr-Commit-Position: refs/branch-heads/2062@{#587}
Cr-Branched-From: 2e531f7c26d0d9e2aa0cced17a35eea6687dc58c-refs/heads/master@{#278856}
Change-Id: I6805a85cefef55492d5b3934b4fbd9263c1d004e
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index f8821c00b3..a3faee3f80 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -116,7 +116,6 @@ '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', '../third_party/WebKit/public/blink.gyp:blink', - '../v8/tools/gyp/v8.gyp:v8', '../ui/gl/gl.gyp:gl', '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', @@ -238,8 +237,6 @@ 'public/browser/draw_gl.h', 'renderer/aw_content_renderer_client.cc', 'renderer/aw_content_renderer_client.h', - 'renderer/aw_execution_termination_filter.cc', - 'renderer/aw_execution_termination_filter.h', 'renderer/aw_key_systems.cc', 'renderer/aw_key_systems.h', 'renderer/aw_permission_client.cc', |