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

Side by Side Diff: android_webview/browser/renderer_host/aw_render_view_host_ext.h

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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
6 #define ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 6 #define ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
7 7
8 #include "content/public/browser/web_contents_observer.h" 8 #include "content/public/browser/web_contents_observer.h"
9 9
10 #include "android_webview/common/aw_hit_test_data.h" 10 #include "android_webview/common/aw_hit_test_data.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 void SetTextZoomFactor(float factor); 70 void SetTextZoomFactor(float factor);
71 71
72 void ResetScrollAndScaleState(); 72 void ResetScrollAndScaleState();
73 73
74 // Sets the initial page scale. This overrides initial scale set by 74 // Sets the initial page scale. This overrides initial scale set by
75 // the meta viewport tag. 75 // the meta viewport tag.
76 void SetInitialPageScale(double page_scale_factor); 76 void SetInitialPageScale(double page_scale_factor);
77 void SetBackgroundColor(SkColor c); 77 void SetBackgroundColor(SkColor c);
78 void SetJsOnlineProperty(bool network_up); 78 void SetJsOnlineProperty(bool network_up);
79 79
80 void SendCheckRenderThreadResponsiveness();
81
82 private: 80 private:
83 // content::WebContentsObserver implementation. 81 // content::WebContentsObserver implementation.
84 virtual void RenderViewCreated(content::RenderViewHost* view_host) OVERRIDE; 82 virtual void RenderViewCreated(content::RenderViewHost* view_host) OVERRIDE;
85 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE; 83 virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
86 virtual void DidNavigateAnyFrame( 84 virtual void DidNavigateAnyFrame(
87 const content::LoadCommittedDetails& details, 85 const content::LoadCommittedDetails& details,
88 const content::FrameNavigateParams& params) OVERRIDE; 86 const content::FrameNavigateParams& params) OVERRIDE;
89 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 87 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
90 88
91 void OnDocumentHasImagesResponse(int msg_id, bool has_images); 89 void OnDocumentHasImagesResponse(int msg_id, bool has_images);
(...skipping 15 matching lines...) Expand all
107 AwHitTestData last_hit_test_data_; 105 AwHitTestData last_hit_test_data_;
108 106
109 bool has_new_hit_test_data_; 107 bool has_new_hit_test_data_;
110 108
111 DISALLOW_COPY_AND_ASSIGN(AwRenderViewHostExt); 109 DISALLOW_COPY_AND_ASSIGN(AwRenderViewHostExt);
112 }; 110 };
113 111
114 } // namespace android_webview 112 } // namespace android_webview
115 113
116 #endif // ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_ 114 #endif // ANDROID_WEBVIEW_BROWSER_RENDER_HOST_RENDER_VIEW_HOST_EXT_H_
OLDNEW
« no previous file with comments | « android_webview/android_webview.gyp ('k') | android_webview/browser/renderer_host/aw_render_view_host_ext.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698