summaryrefslogtreecommitdiffstats
path: root/content/plugin
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 00:14:00 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-25 00:14:00 +0000
commit27543452369d6a2cdcc058cb5f92910d7a47e823 (patch)
tree4a1c2f46659e653f2186947a27e7ff4571c80832 /content/plugin
parent0f46f8115f6b5baf16e602e006d5c1ffa7f08482 (diff)
downloadchromium_src-27543452369d6a2cdcc058cb5f92910d7a47e823.zip
chromium_src-27543452369d6a2cdcc058cb5f92910d7a47e823.tar.gz
chromium_src-27543452369d6a2cdcc058cb5f92910d7a47e823.tar.bz2
Adds a TransportDIB::Id value that is explicitly invalid and use it when compositing
BUG=76001 TEST= Review URL: http://codereview.chromium.org/6665029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
-rw-r--r--content/plugin/webplugin_accelerated_surface_proxy_mac.cc2
-rw-r--r--content/plugin/webplugin_proxy.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/content/plugin/webplugin_accelerated_surface_proxy_mac.cc b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc
index 7f5d486..ec4571d 100644
--- a/content/plugin/webplugin_accelerated_surface_proxy_mac.cc
+++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.cc
@@ -51,7 +51,7 @@ void WebPluginAcceleratedSurfaceProxy::SetSize(const gfx::Size& size) {
plugin_proxy_->SetAcceleratedSurface(window_handle_, size, io_surface_id);
} else {
TransportDIB::Handle transport_dib = surface_->SetTransportDIBSize(size);
- if (TransportDIB::is_valid(transport_dib)) {
+ if (TransportDIB::is_valid_handle(transport_dib)) {
plugin_proxy_->SetAcceleratedDIB(window_handle_, size, transport_dib);
}
}
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 57e61b2..108d455 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -412,7 +412,7 @@ void WebPluginProxy::UpdateGeometry(
// Update the buffers before doing anything that could call into plugin code,
// so that we don't process buffer changes out of order if plugins make
// synchronous calls that lead to nested UpdateGeometry calls.
- if (TransportDIB::is_valid(windowless_buffer)) {
+ if (TransportDIB::is_valid_handle(windowless_buffer)) {
// The plugin's rect changed, so now we have a new buffer to draw into.
SetWindowlessBuffer(windowless_buffer, background_buffer, window_rect);
}