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

Unified Diff: android_webview/native/aw_contents.h

Issue 1858853002: Rename SharedRendererState to RenderThreadManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix rebase Created 4 years, 8 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
« no previous file with comments | « android_webview/browser/test/rendering_test.cc ('k') | android_webview/native/aw_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_contents.h
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index 044eca6676a3c8d75ae35d71784f5491e1f4f527..75e07e756aaecaf8d9f257bda763d34b7f7a3165 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -19,9 +19,9 @@
#include "android_webview/browser/find_helper.h"
#include "android_webview/browser/gl_view_renderer_manager.h"
#include "android_webview/browser/icon_helper.h"
+#include "android_webview/browser/render_thread_manager.h"
+#include "android_webview/browser/render_thread_manager_client.h"
#include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
-#include "android_webview/browser/shared_renderer_state.h"
-#include "android_webview/browser/shared_renderer_state_client.h"
#include "android_webview/native/permission/permission_request_handler_client.h"
#include "base/android/jni_weak_ref.h"
#include "base/android/scoped_java_ref.h"
@@ -64,7 +64,7 @@ class AwContents : public FindHelper::Listener,
public BrowserViewRendererClient,
public PermissionRequestHandlerClient,
public AwBrowserPermissionRequestDelegate,
- public SharedRendererStateClient {
+ public RenderThreadManagerClient {
public:
// Returns the AwContents instance associated with |web_contents|, or NULL.
static AwContents* FromWebContents(content::WebContents* web_contents);
@@ -237,7 +237,7 @@ class AwContents : public FindHelper::Listener,
const base::Callback<void(bool)>& callback) override;
void CancelMIDISysexPermissionRequests(const GURL& origin) override;
- // SharedRendererStateClient implementation.
+ // RenderThreadManagerClient implementation.
void OnParentDrawConstraintsUpdated() override;
bool RequestDrawGL(bool wait_for_completion) override;
void DetachFunctorFromView() override;
@@ -347,7 +347,7 @@ class AwContents : public FindHelper::Listener,
void SetDipScaleInternal(float dip_scale);
JavaObjectWeakGlobalRef java_ref_;
- SharedRendererState shared_renderer_state_;
+ RenderThreadManager render_thread_manager_;
BrowserViewRenderer browser_view_renderer_; // Must outlive |web_contents_|.
std::unique_ptr<AwWebContentsDelegate> web_contents_delegate_;
std::unique_ptr<AwContentsClientBridge> contents_client_bridge_;
« no previous file with comments | « android_webview/browser/test/rendering_test.cc ('k') | android_webview/native/aw_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698