diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 01:14:02 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 01:14:02 +0000 |
| commit | eca382fbf4888b1ed3be7d2e3c487f06eaad1eb1 (patch) | |
| tree | 2d58da00b71e60e6a794c52aa2d0083682ef03aa /cc/resources | |
| parent | 413cc98fb2ed5a98e760d8325d97e3017b76cf67 (diff) | |
| download | chromium_src-eca382fbf4888b1ed3be7d2e3c487f06eaad1eb1.zip chromium_src-eca382fbf4888b1ed3be7d2e3c487f06eaad1eb1.tar.gz chromium_src-eca382fbf4888b1ed3be7d2e3c487f06eaad1eb1.tar.bz2 | |
Reverts r207524. Mapping the same buffer twice causes a freeze on certain devices even if we unmap after the first map.
NOTRY=true
BUG=b/9661060
Review URL: https://chromiumcodereview.appspot.com/18871004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211002 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources')
| -rw-r--r-- | cc/resources/resource_provider.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc index 0b8cc98..c12c601 100644 --- a/cc/resources/resource_provider.cc +++ b/cc/resources/resource_provider.cc @@ -1278,8 +1278,11 @@ void ResourceProvider::AcquireImage(ResourceId id) { if (resource->image_id != 0) { // If we had previously allocated an image for this resource, - // then just reuse same image. - return; + // release it first, before acquiring the new image. + // TODO(kaanb): This is a temporary workaround. We must return here + // immediately. Platform specific code needs to deal with this + // situation appropriately. + ReleaseImage(id); } WebGraphicsContext3D* context3d = output_surface_->context3d(); |