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

Unified Diff: content/renderer/child_frame_compositing_helper.cc

Issue 1229413003: DelegatedFrameHost should handle satisfied sequences in frame metadata. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment stating that |satifies_sequences| is cleared on call to SwapDelegatedFrame. Created 5 years, 5 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 | « content/renderer/child_frame_compositing_helper.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/child_frame_compositing_helper.cc
diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index e6a3fabf2073dbcbfcc3f9760ae0fbcd69007531..adec05be8e643a2a0f4ccb28ddc124bda9d6ac26 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -279,6 +279,16 @@ void ChildFrameCompositingHelper::SatisfyCallback(
}
// static
+void ChildFrameCompositingHelper::SatisfyCallbackBrowserPlugin(
+ scoped_refptr<ThreadSafeSender> sender,
+ int host_routing_id,
+ int browser_plugin_instance_id,
+ cc::SurfaceSequence sequence) {
+ sender->Send(new BrowserPluginHostMsg_SatisfySequence(
+ host_routing_id, browser_plugin_instance_id, sequence));
+}
+
+// static
void ChildFrameCompositingHelper::RequireCallback(
scoped_refptr<ThreadSafeSender> sender,
int host_routing_id,
@@ -316,8 +326,13 @@ void ChildFrameCompositingHelper::OnSetSurface(
scoped_refptr<ThreadSafeSender> sender(
RenderThreadImpl::current()->thread_safe_sender());
cc::SurfaceLayer::SatisfyCallback satisfy_callback =
- base::Bind(&ChildFrameCompositingHelper::SatisfyCallback, sender,
- host_routing_id_);
+ render_frame_proxy_
+ ? base::Bind(&ChildFrameCompositingHelper::SatisfyCallback, sender,
+ host_routing_id_)
+ : base::Bind(
+ &ChildFrameCompositingHelper::SatisfyCallbackBrowserPlugin,
+ sender, host_routing_id_,
+ browser_plugin_->browser_plugin_instance_id());
cc::SurfaceLayer::RequireCallback require_callback =
render_frame_proxy_
? base::Bind(&ChildFrameCompositingHelper::RequireCallback, sender,
« no previous file with comments | « content/renderer/child_frame_compositing_helper.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698