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

Unified Diff: content/renderer/render_view_impl.h

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 2 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: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 7f7dca483200b11e926ccb80d68ce594bae6202f..591cd6b4d0c681165bf1e8338d8f18d02a84c128 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -48,6 +48,7 @@
#include "third_party/WebKit/public/web/WebConsoleMessage.h"
#include "third_party/WebKit/public/web/WebDataSource.h"
#include "third_party/WebKit/public/web/WebElement.h"
+#include "third_party/WebKit/public/web/WebFrameWidget.h"
#include "third_party/WebKit/public/web/WebHistoryItem.h"
#include "third_party/WebKit/public/web/WebIconURL.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
@@ -239,6 +240,8 @@ class CONTENT_EXPORT RenderViewImpl
// FocusController.
void SetFocus(bool enable);
+ void AttachWebFrameWidget(blink::WebWidget* frame_widget);
+
// Plugin-related functions --------------------------------------------------
#if defined(ENABLE_PLUGINS)
@@ -449,6 +452,7 @@ class CONTENT_EXPORT RenderViewImpl
protected:
// RenderWidget overrides:
+ void CloseForFrame() override;
void Close() override;
void OnResize(const ViewMsg_Resize_Params& params) override;
void DidInitiatePaint() override;
@@ -901,6 +905,10 @@ class CONTENT_EXPORT RenderViewImpl
RenderFrameImpl* main_render_frame_;
+ // Note: RenderViewImpl is pulling double duty: it's the RenderWidget for the
+ // "view", but it's also the RenderWidget for the main frame.
+ blink::WebWidget* frame_widget_;
+
// The next group of objects all implement RenderViewObserver, so are deleted
// along with the RenderView automatically. This is why we just store
// weak references.

Powered by Google App Engine
This is Rietveld 408576698