diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 15:03:20 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-08 15:03:20 +0000 |
| commit | 538195fb9b4d4adf1e1727d195c73eea2188ecef (patch) | |
| tree | 812186ce4f826983be988974493ba8a34b5e89ec /content/common/gpu/gpu_channel_manager.cc | |
| parent | c9b773fc3fa283674623e2d2b274821e708559e2 (diff) | |
| download | chromium_src-538195fb9b4d4adf1e1727d195c73eea2188ecef.zip chromium_src-538195fb9b4d4adf1e1727d195c73eea2188ecef.tar.gz chromium_src-538195fb9b4d4adf1e1727d195c73eea2188ecef.tar.bz2 | |
ImageTransportSurface: Get rid of multiple inheritance.
This fixes a style guide violation where classes were inheriting from more than one non-pure interface. This refactoring is in preparation for having OSX use a similar code path.
Also some minor fixes to GLXImageTransportSurface:
- disable vsync in OnMakeCurrent because we are actually rendering offscreen via XComposite
- wait for SwapBuffersACK before processing more commands for flow control
BUG=none
TEST=3D CSS on TOUCH_UI build
Review URL: http://codereview.chromium.org/7839033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/gpu_channel_manager.cc')
| -rw-r--r-- | content/common/gpu/gpu_channel_manager.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc index d9732fc..900e6eb 100644 --- a/content/common/gpu/gpu_channel_manager.cc +++ b/content/common/gpu/gpu_channel_manager.cc @@ -44,6 +44,14 @@ void GpuChannelManager::RemoveRoute(int32 routing_id) { gpu_child_thread_->RemoveRoute(routing_id); } +GpuChannel* GpuChannelManager::LookupChannel(int32 renderer_id) { + GpuChannelMap::const_iterator iter = gpu_channels_.find(renderer_id); + if (iter == gpu_channels_.end()) + return NULL; + else + return iter->second; +} + bool GpuChannelManager::OnMessageReceived(const IPC::Message& msg) { bool msg_is_ok = true; bool handled = true; |