summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authoralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-11 11:06:56 +0000
committeralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-11 11:06:56 +0000
commit0f21e8588960f96f5da3340e27ba0c99df596f80 (patch)
treee45c5d02a6a351a06629a7c4d137d787bfb14887 /content/common
parentacdbbfcc0c1ef4c7fa2ef7e3081bacc2392daa5c (diff)
downloadchromium_src-0f21e8588960f96f5da3340e27ba0c99df596f80.zip
chromium_src-0f21e8588960f96f5da3340e27ba0c99df596f80.tar.gz
chromium_src-0f21e8588960f96f5da3340e27ba0c99df596f80.tar.bz2
Enables compositing support for webview.
Mailboxes for the webview are received from RWHVGuest and set on the texture layer with a callback that gets triggered when they are no longer in use by the compositor. An IPC is sent back to the browser with a sync point to ack the presented buffer. BUG=143429 Review URL: https://chromiumcodereview.appspot.com/11824040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176310 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/gpu/image_transport_surface_linux.cc1
-rw-r--r--content/common/gpu/image_transport_surface_win.cc1
2 files changed, 0 insertions, 2 deletions
diff --git a/content/common/gpu/image_transport_surface_linux.cc b/content/common/gpu/image_transport_surface_linux.cc
index ffa2b5a..1d10b21 100644
--- a/content/common/gpu/image_transport_surface_linux.cc
+++ b/content/common/gpu/image_transport_surface_linux.cc
@@ -16,7 +16,6 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
scoped_refptr<gfx::GLSurface> surface;
if (!handle.handle) {
DCHECK(handle.transport);
- DCHECK(handle.parent_client_id);
surface = new TextureImageTransportSurface(manager, stub, handle);
} else {
surface = gfx::GLSurface::CreateViewGLSurface(false, handle.handle);
diff --git a/content/common/gpu/image_transport_surface_win.cc b/content/common/gpu/image_transport_surface_win.cc
index fe99b79..1331e7d 100644
--- a/content/common/gpu/image_transport_surface_win.cc
+++ b/content/common/gpu/image_transport_surface_win.cc
@@ -246,7 +246,6 @@ scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
// coming from a renderer and we want to render the webpage contents to a
// texture.
DCHECK(handle.transport);
- DCHECK(handle.parent_client_id);
surface = new TextureImageTransportSurface(manager, stub, handle);
} else {
if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2 &&