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

Unified Diff: android_webview/browser/browser_view_renderer_impl.h

Issue 12668003: Fix for crash in testWindows test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mutual deregistration Created 7 years, 9 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/browser/browser_view_renderer_impl.h
diff --git a/android_webview/browser/browser_view_renderer_impl.h b/android_webview/browser/browser_view_renderer_impl.h
index 050645d70e8bd264b617e28fd7084d05cf1fd35b..3ba29091b5311eca92961881f208d32532350b73 100644
--- a/android_webview/browser/browser_view_renderer_impl.h
+++ b/android_webview/browser/browser_view_renderer_impl.h
@@ -38,13 +38,13 @@ class BrowserViewRendererImpl
public:
static BrowserViewRendererImpl* Create(BrowserViewRenderer::Client* client,
JavaHelper* java_helper);
- virtual ~BrowserViewRendererImpl();
-
- // Platform methods.
+ static BrowserViewRendererImpl* FromWebContents(
+ content::WebContents* contents);
static void SetAwDrawSWFunctionTable(AwDrawSWFunctionTable* table);
+ virtual ~BrowserViewRendererImpl();
+
// BrowserViewRenderer implementation.
- // |content_view_core| must not outlive |this| BrowserViewRenderer instance.
virtual void SetContents(
content::ContentViewCore* content_view_core) OVERRIDE;
virtual void DrawGL(AwDrawGLInfo* draw_info) OVERRIDE;
@@ -69,6 +69,9 @@ class BrowserViewRendererImpl
JavaHelper* java_helper);
private:
+ class UserData;
+ friend class UserData;
+
// Returns the latest locally available picture if any.
// If none is available will synchronously request the latest one
// and block until the result is received.
@@ -85,6 +88,9 @@ class BrowserViewRendererImpl
const gfx::Vector2dF& scroll_offset,
float page_scale_factor);
+ // Called when |web_contents_| is disconnected from |this| object.
+ void WebContentsGone();
+
BrowserViewRenderer::Client* client_;
BrowserViewRenderer::JavaHelper* java_helper_;

Powered by Google App Engine
This is Rietveld 408576698