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

Unified Diff: Source/web/WebViewFrameWidget.h

Issue 1310063002: Snapshot a pointer to the main frame when creating WebViewFrameWidget. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Futureproof Created 5 years, 4 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 | « Source/web/WebFrameWidgetImpl.cpp ('k') | Source/web/WebViewFrameWidget.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewFrameWidget.h
diff --git a/Source/web/WebViewFrameWidget.h b/Source/web/WebViewFrameWidget.h
index 49f2fba21a637c72fb60ce6c748d35f0fc5a375c..9e31b787f303c8a1eba02f474e1e857c8184a1c8 100644
--- a/Source/web/WebViewFrameWidget.h
+++ b/Source/web/WebViewFrameWidget.h
@@ -5,12 +5,16 @@
#ifndef WebViewFrameWidget_h
#define WebViewFrameWidget_h
+#include "platform/heap/Handle.h"
#include "public/web/WebFrameWidget.h"
#include "wtf/Noncopyable.h"
+#include "wtf/RefPtr.h"
namespace blink {
+class WebLocalFrameImpl;
class WebViewImpl;
+class WebWidgetClient;
// Shim class to help normalize the widget interfaces in the Blink public API.
// For OOPI, subframes have WebFrameWidgets for input and rendering.
@@ -30,7 +34,7 @@ class WebViewImpl;
class WebViewFrameWidget : public WebFrameWidget {
WTF_MAKE_NONCOPYABLE(WebViewFrameWidget);
public:
- explicit WebViewFrameWidget(WebViewImpl&);
+ explicit WebViewFrameWidget(WebWidgetClient*, WebViewImpl&, WebLocalFrameImpl&);
virtual ~WebViewFrameWidget();
// WebFrameWidget overrides:
@@ -92,7 +96,9 @@ public:
bool forSubframe() const { return false; }
private:
- WebViewImpl* m_webView;
+ WebWidgetClient* m_client;
+ RefPtr<WebViewImpl> m_webView;
+ RefPtrWillBePersistent<WebLocalFrameImpl> m_mainFrame;
};
} // namespace blink
« no previous file with comments | « Source/web/WebFrameWidgetImpl.cpp ('k') | Source/web/WebViewFrameWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698