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

Side by Side Diff: android_webview/renderer/aw_content_renderer_client.h

Issue 366913006: [Android WebView] Terminate execution of stuck JS code on navigation requests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_
6 #define ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_ 6 #define ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_
7 7
8 #include "content/public/renderer/content_renderer_client.h" 8 #include "content/public/renderer/content_renderer_client.h"
9 9
10 #include "android_webview/renderer/aw_render_process_observer.h" 10 #include "android_webview/renderer/aw_render_process_observer.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 12
13 namespace visitedlink { 13 namespace visitedlink {
14 class VisitedLinkSlave; 14 class VisitedLinkSlave;
15 } 15 }
16 16
17 namespace android_webview { 17 namespace android_webview {
18 18
19 class AwContentRendererClient : public content::ContentRendererClient { 19 class AwExecutionTerminationFilter;
20
21 class AwContentRendererClient : public content::ContentRendererClient,
22 public content::RenderProcessObserver {
20 public: 23 public:
21 AwContentRendererClient(); 24 AwContentRendererClient();
22 virtual ~AwContentRendererClient(); 25 virtual ~AwContentRendererClient();
23 26
24 // ContentRendererClient implementation. 27 // ContentRendererClient implementation.
25 virtual void RenderThreadStarted() OVERRIDE; 28 virtual void RenderThreadStarted() OVERRIDE;
26 virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE; 29 virtual void RenderFrameCreated(content::RenderFrame* render_frame) OVERRIDE;
27 virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE; 30 virtual void RenderViewCreated(content::RenderView* render_view) OVERRIDE;
28 virtual std::string GetDefaultEncoding() OVERRIDE; 31 virtual std::string GetDefaultEncoding() OVERRIDE;
29 virtual bool HasErrorPage(int http_status_code, 32 virtual bool HasErrorPage(int http_status_code,
(...skipping 13 matching lines...) Expand all
43 46
44 virtual bool HandleNavigation(content::RenderFrame* render_frame, 47 virtual bool HandleNavigation(content::RenderFrame* render_frame,
45 content::DocumentState* document_state, 48 content::DocumentState* document_state,
46 int opener_id, 49 int opener_id,
47 blink::WebFrame* frame, 50 blink::WebFrame* frame,
48 const blink::WebURLRequest& request, 51 const blink::WebURLRequest& request,
49 blink::WebNavigationType type, 52 blink::WebNavigationType type,
50 blink::WebNavigationPolicy default_policy, 53 blink::WebNavigationPolicy default_policy,
51 bool is_redirect) OVERRIDE; 54 bool is_redirect) OVERRIDE;
52 55
56 // content::RenderProcessObserver implementation.
57 virtual void WebKitInitialized() OVERRIDE;
58
53 private: 59 private:
54 scoped_ptr<AwRenderProcessObserver> aw_render_process_observer_; 60 scoped_ptr<AwRenderProcessObserver> aw_render_process_observer_;
55 scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_; 61 scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
62 scoped_refptr<AwExecutionTerminationFilter> execution_termination_filter_;
56 }; 63 };
57 64
58 } // namespace android_webview 65 } // namespace android_webview
59 66
60 #endif // ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_ 67 #endif // ANDROID_WEBVIEW_RENDERER_AW_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « android_webview/native/aw_contents.cc ('k') | android_webview/renderer/aw_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698