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

Unified Diff: content/common/gpu/image_transport_surface_linux.cc

Issue 8625003: Revert 111040 - Reland 110355 - Use shared D3D9 texture to transport the compositor's backing buf... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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/common/gpu/image_transport_surface.cc ('k') | content/common/gpu/image_transport_surface_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/image_transport_surface_linux.cc
===================================================================
--- content/common/gpu/image_transport_surface_linux.cc (revision 111041)
+++ content/common/gpu/image_transport_surface_linux.cc (working copy)
@@ -77,7 +77,6 @@
virtual void OnNewSurfaceACK(
uint64 surface_id, TransportDIB::Handle surface_handle) OVERRIDE;
virtual void OnBuffersSwappedACK() OVERRIDE;
- virtual void OnResizeViewACK() OVERRIDE;
virtual void OnResize(gfx::Size size) OVERRIDE;
private:
@@ -120,7 +119,6 @@
virtual void OnNewSurfaceACK(
uint64 surface_id, TransportDIB::Handle surface_handle) OVERRIDE;
virtual void OnBuffersSwappedACK() OVERRIDE;
- virtual void OnResizeViewACK() OVERRIDE;
virtual void OnResize(gfx::Size size) OVERRIDE;
private:
@@ -169,7 +167,6 @@
virtual void OnNewSurfaceACK(
uint64 surface_id, TransportDIB::Handle surface_handle) OVERRIDE;
virtual void OnBuffersSwappedACK() OVERRIDE;
- virtual void OnResizeViewACK() OVERRIDE;
virtual void OnResize(gfx::Size size) OVERRIDE;
private:
@@ -377,11 +374,6 @@
helper_->SetScheduled(true);
}
-
-void EGLImageTransportSurface::OnResizeViewACK() {
- NOTREACHED();
-}
-
GLXImageTransportSurface::GLXImageTransportSurface(
GpuChannelManager* manager,
int32 render_view_id,
@@ -547,10 +539,6 @@
helper_->SetScheduled(true);
}
-void GLXImageTransportSurface::OnResizeViewACK() {
- NOTREACHED();
-}
-
OSMesaImageTransportSurface::OSMesaImageTransportSurface(
GpuChannelManager* manager,
int32 render_view_id,
@@ -629,10 +617,6 @@
helper_->SetScheduled(true);
}
-void OSMesaImageTransportSurface::OnResizeViewACK() {
- NOTREACHED();
-}
-
bool OSMesaImageTransportSurface::SwapBuffers() {
DCHECK_NE(shared_mem_.get(), static_cast<void*>(NULL));
@@ -664,9 +648,8 @@
int32 render_view_id,
int32 renderer_id,
int32 command_buffer_id,
- gfx::PluginWindowHandle handle) {
+ gfx::PluginWindowHandle /* handle */) {
scoped_refptr<gfx::GLSurface> surface;
-#if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
switch (gfx::GetGLImplementation()) {
case gfx::kGLImplementationDesktopGL:
surface = new GLXImageTransportSurface(manager,
@@ -690,17 +673,6 @@
NOTREACHED();
return NULL;
}
-#else
- surface = gfx::GLSurface::CreateViewGLSurface(false, handle);
- if (!surface.get())
- return NULL;
-
- surface = new PassThroughImageTransportSurface(manager,
- render_view_id,
- renderer_id,
- command_buffer_id,
- surface.get());
-#endif
if (surface->Initialize())
return surface;
else
« no previous file with comments | « content/common/gpu/image_transport_surface.cc ('k') | content/common/gpu/image_transport_surface_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698