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

Unified Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge fix Created 8 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/browser/renderer_host/render_widget_host_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 62fd6edbc99ef68534bfecfeb75d4304dbe6059d..fd21c734e1282dcf15371ae23604f0e81deac635 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -312,6 +312,8 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) {
OnMsgDidActivateAcceleratedCompositing)
IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnMsgLockMouse)
IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnMsgUnlockMouse)
+ IPC_MESSAGE_HANDLER(ViewHostMsg_SwapCompositorFrame,
+ OnMsgSwapCompositorFrame)
#if defined(OS_POSIX) || defined(USE_AURA)
IPC_MESSAGE_HANDLER(ViewHostMsg_GetWindowRect, OnMsgGetWindowRect)
IPC_MESSAGE_HANDLER(ViewHostMsg_GetRootWindowRect, OnMsgGetRootWindowRect)
@@ -1764,6 +1766,20 @@ void RenderWidgetHostImpl::OnMsgUnlockMouse() {
RejectMouseLockOrUnlockIfNecessary();
}
+void RenderWidgetHostImpl::OnMsgSwapCompositorFrame(
+ const WebKit::WebCompositorFrame& frame) {
+ if (!view_) {
+ WebKit::WebCompositorFrameAck ack;
+ SwapCompositorFrameAck(ack);
+ }
+ view_->SwapCompositorFrame(frame);
+}
+
+void RenderWidgetHostImpl::SwapCompositorFrameAck(
+ const WebKit::WebCompositorFrameAck& ack) {
+ Send(new ViewMsg_SwapCompositorFrameACK(routing_id_, ack));
+}
+
#if defined(OS_POSIX) || defined(USE_AURA)
void RenderWidgetHostImpl::OnMsgGetWindowRect(gfx::NativeViewId window_id,
gfx::Rect* results) {

Powered by Google App Engine
This is Rietveld 408576698