diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 01:00:35 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 01:00:35 +0000 |
| commit | 4232b250edef4e6325d792290af2895aac8cb8fe (patch) | |
| tree | 1c28c72a9c2e4df125efa4d4520e37483a6dbad4 /cc/resources | |
| parent | 2c68be07377cb224e4c4f56549301352953cb2d4 (diff) | |
| download | chromium_src-4232b250edef4e6325d792290af2895aac8cb8fe.zip chromium_src-4232b250edef4e6325d792290af2895aac8cb8fe.tar.gz chromium_src-4232b250edef4e6325d792290af2895aac8cb8fe.tar.bz2 | |
Make --enable-delegated-renderer show stuff on Mac
With this patch, pixels appear on screen and tab capture works.
Add a OnNativeSurfaceBuffersSwapped mechanism to display
an IOSurface to an NSView. This is wired up to the existing
CompositingIOSurfaceMac. In a future refactoring, something
much more light-weight than CompositingIOSurfaceMac will
be used (CompositingIOSurfaceMac has capture code, etc, in
it).
Add a DelegatedFrameHost to RenderWidgetHostViewMac, and
hookup the DelegatedFrameHostClient implementation. Create
the DelegatedFrameHost when a delegated frame is received, and
use its existence to determine which mode is active.
BUG=314190
Review URL: https://codereview.chromium.org/267073003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269946 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources')
| -rw-r--r-- | cc/resources/resource_provider.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index c49591c..09b12a3 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc @@ -1606,7 +1606,6 @@ void ResourceProvider::TransferResource(GLES2Interface* gl, DCHECK(!source->lock_for_read_count); DCHECK(source->origin != Resource::External || source->mailbox.IsValid()); DCHECK(source->allocated); - DCHECK_EQ(source->wrap_mode, GL_CLAMP_TO_EDGE); resource->id = id; resource->format = source->format; resource->mailbox_holder.texture_target = source->target; |