summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 21:39:14 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-28 21:39:14 +0000
commitf35d6675a5b26462fb1aadc9a01f07be82581a16 (patch)
treedc4bac0fa9c9340a3c7e65d13ba73254c8ff3449 /chrome/renderer
parent18d5d79eb6b11a05ca8876fc760416b5152f9fa2 (diff)
downloadchromium_src-f35d6675a5b26462fb1aadc9a01f07be82581a16.zip
chromium_src-f35d6675a5b26462fb1aadc9a01f07be82581a16.tar.gz
chromium_src-f35d6675a5b26462fb1aadc9a01f07be82581a16.tar.bz2
Let every "accelerated IO surface swapped" message have an identifier of the surface.
Currently, this is only used to DCHECK a currently implicit invariant, but I want to use this to let every surface container only remember its last painted-to surface, and not its last created surface. No behavior change. BUG=53165 TEST=none Review URL: http://codereview.chromium.org/4142004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/render_view.cc5
-rw-r--r--chrome/renderer/render_view.h3
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.cc4
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.h3
4 files changed, 9 insertions, 6 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 3554944..0996272 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -5987,8 +5987,9 @@ void RenderView::AcceleratedSurfaceFreeTransportDIB(TransportDIB::Id dib_id) {
}
void RenderView::AcceleratedSurfaceBuffersSwapped(
- gfx::PluginWindowHandle window) {
- Send(new ViewHostMsg_AcceleratedSurfaceBuffersSwapped(routing_id(), window));
+ gfx::PluginWindowHandle window, uint64 surface_id) {
+ Send(new ViewHostMsg_AcceleratedSurfaceBuffersSwapped(
+ routing_id(), window, surface_id));
}
#endif
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index fddfb13..a39aa63 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -332,7 +332,8 @@ class RenderView : public RenderWidget,
int32 width,
int32 height,
TransportDIB::Handle transport_dib);
- void AcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window);
+ void AcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window,
+ uint64 surface_id);
#endif
void RegisterPluginDelegate(WebPluginDelegateProxy* delegate);
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index a2553f2..d53909c 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -1527,9 +1527,9 @@ void WebPluginDelegateProxy::OnAcceleratedSurfaceFreeTransportDIB(
}
void WebPluginDelegateProxy::OnAcceleratedSurfaceBuffersSwapped(
- gfx::PluginWindowHandle window) {
+ gfx::PluginWindowHandle window, uint64 surface_id) {
if (render_view_)
- render_view_->AcceleratedSurfaceBuffersSwapped(window);
+ render_view_->AcceleratedSurfaceBuffersSwapped(window, surface_id);
}
#endif
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index ab2eac1..64f1b30 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -176,7 +176,8 @@ class WebPluginDelegateProxy
void OnAcceleratedSurfaceAllocTransportDIB(size_t size,
TransportDIB::Handle* dib_handle);
void OnAcceleratedSurfaceFreeTransportDIB(TransportDIB::Id dib_id);
- void OnAcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window);
+ void OnAcceleratedSurfaceBuffersSwapped(gfx::PluginWindowHandle window,
+ uint64 surface_id);
#endif
// Draw a graphic indicating a crashed plugin.