Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1705)

Unified Diff: android_webview/renderer/aw_content_renderer_client.cc

Issue 536593004: Revert "Merge 281715 "[Android WebView] Terminate execution of stuck JS ..."" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2062
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/renderer/aw_content_renderer_client.cc
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index f4f0b1efb5811ad1f7b37b3a58173bca3fbc1e96..9ae387b3a5b30efa58fdfc3acca300394919f7ee 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -7,7 +7,6 @@
#include "android_webview/common/aw_resource.h"
#include "android_webview/common/render_view_messages.h"
#include "android_webview/common/url_constants.h"
-#include "android_webview/renderer/aw_execution_termination_filter.h"
#include "android_webview/renderer/aw_key_systems.h"
#include "android_webview/renderer/aw_permission_client.h"
#include "android_webview/renderer/aw_render_frame_ext.h"
@@ -32,7 +31,6 @@
#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/web/WebFrame.h"
-#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebNavigationType.h"
#include "third_party/WebKit/public/web/WebSecurityPolicy.h"
#include "url/gurl.h"
@@ -63,17 +61,6 @@ void AwContentRendererClient::RenderThreadStarted() {
visited_link_slave_.reset(new visitedlink::VisitedLinkSlave);
thread->AddObserver(visited_link_slave_.get());
-
- execution_termination_filter_ = new AwExecutionTerminationFilter(
- thread->GetIOMessageLoopProxy(),
- thread->GetMessageLoop()->message_loop_proxy());
- thread->AddFilter(execution_termination_filter_.get());
- thread->AddObserver(this);
-}
-
-void AwContentRendererClient::WebKitInitialized() {
- execution_termination_filter_->SetRenderThreadIsolate(
- blink::mainThreadIsolate());
}
bool AwContentRendererClient::HandleNavigation(
« no previous file with comments | « android_webview/renderer/aw_content_renderer_client.h ('k') | android_webview/renderer/aw_execution_termination_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698