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

Unified Diff: content/renderer/render_frame_proxy.h

Issue 345823002: Move ownership of ChildFrameCompositingHelper from frame to proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on Ken's review and fix for Android. Created 6 years, 6 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_frame_proxy.h
diff --git a/content/renderer/render_frame_proxy.h b/content/renderer/render_frame_proxy.h
index f05371df535698458a012fe5e93b9eee8d02c696..54c63619290485850f4598cfce1c5526fb4e0b41 100644
--- a/content/renderer/render_frame_proxy.h
+++ b/content/renderer/render_frame_proxy.h
@@ -6,6 +6,7 @@
#define CONTENT_RENDERER_RENDER_FRAME_PROXY_H_
#include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "ipc/ipc_listener.h"
#include "ipc/ipc_sender.h"
@@ -13,8 +14,12 @@
#include "third_party/WebKit/public/web/WebFrameClient.h"
#include "third_party/WebKit/public/web/WebRemoteFrame.h"
+struct FrameMsg_BuffersSwapped_Params;
+struct FrameMsg_CompositorFrameSwapped_Params;
+
namespace content {
+class ChildFrameCompositingHelper;
class RenderFrameImpl;
class RenderViewImpl;
@@ -58,6 +63,10 @@ class CONTENT_EXPORT RenderFrameProxy
return render_frame_;
}
+ // Out-of-process child frames receive a signal from RenderWidgetCompositor
+ // when a compositor frame has committed.
+ void DidCommitCompositorFrame();
+
private:
RenderFrameProxy(int routing_id, int frame_routing_id);
@@ -66,11 +75,18 @@ class CONTENT_EXPORT RenderFrameProxy
// IPC handlers
void OnDeleteProxy();
+ void OnChildFrameProcessGone();
+ void OnBuffersSwapped(const FrameMsg_BuffersSwapped_Params& params);
+ void OnCompositorFrameSwapped(const IPC::Message& message);
+
+ blink::WebFrame* GetWebFrame();
int routing_id_;
int frame_routing_id_;
RenderFrameImpl* render_frame_;
+ scoped_refptr<ChildFrameCompositingHelper> compositing_helper_;
+
DISALLOW_COPY_AND_ASSIGN(RenderFrameProxy);
};

Powered by Google App Engine
This is Rietveld 408576698