wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge b2g-inbound to m-c

Browse Source
This commit is contained in:
Wes Kocher 2013-11-06 18:20:55 -08:00
commit 2ae2400b0f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
b2g/config/gaia.json
View File

@ -1,4 +1,4 @@
{
"revision": "d995823e80fa7f2e67263699bb6e42a6bcde65ea",
"revision": "1f7e70f3ad1c7a79dc03410d774e32a07093da3f",
"repo_path": "/integration/gaia-central"
}

6
gfx/layers/ImageContainer.cpp
View File

@ -135,7 +135,11 @@ ImageContainer::ImageContainer(int flag)
if (flag == ENABLE_ASYNC && ImageBridgeChild::IsCreated()) {
// the refcount of this ImageClient is 1. we don't use a RefPtr here because the refcount
// of this class must be done on the ImageBridge thread.
mImageClient = ImageBridgeChild::GetSingleton()->CreateImageClient(BUFFER_IMAGE_BUFFERED).drop();
if (gfxPlatform::GetPlatform()->UseDeprecatedTextures()) {
mImageClient = ImageBridgeChild::GetSingleton()->CreateImageClient(BUFFER_IMAGE_BUFFERED).drop();
} else {
mImageClient = ImageBridgeChild::GetSingleton()->CreateImageClient(BUFFER_IMAGE_SINGLE).drop();
}
MOZ_ASSERT(mImageClient);
}
}