Merge b2g-inbound to m-c
authorWes Kocher <wkocher@mozilla.com>
Wed, 06 Nov 2013 18:20:55 -0800
changeset 168456 70de5e24d79bee41171616753e4d5dc3d35140b4
parent 168443 6fb613e4a79f0f8bbede4f662e2bf97bfff42c23 (current diff)
parent 168455 ed53f428d0f26a8aa83ba208fa85be4f9ece7014 (diff)
child 168469 50de687c6bf928d66861dc047926973b9b3f5026
child 168491 c17073bda80b696da118fe2c42c0db0d2f4b671a
child 170545 88104a2deda5f03e058c7e89dcd0fb3e08a77540
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone28.0a1
first release with
nightly linux32
70de5e24d79b / 28.0a1 / 20131107030200 / files
nightly linux64
70de5e24d79b / 28.0a1 / 20131107030200 / files
nightly mac
70de5e24d79b / 28.0a1 / 20131107030200 / files
nightly win32
70de5e24d79b / 28.0a1 / 20131107030200 / files
nightly win64
70de5e24d79b / 28.0a1 / 20131107030200 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge b2g-inbound to m-c
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "d995823e80fa7f2e67263699bb6e42a6bcde65ea", 
+    "revision": "1f7e70f3ad1c7a79dc03410d774e32a07093da3f", 
     "repo_path": "/integration/gaia-central"
 }
--- a/gfx/layers/ImageContainer.cpp
+++ b/gfx/layers/ImageContainer.cpp
@@ -130,17 +130,21 @@ ImageContainer::ImageContainer(int flag)
   mRemoteData(nullptr),
   mRemoteDataMutex(nullptr),
   mCompositionNotifySink(nullptr),
   mImageClient(nullptr)
 {
   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);
   }
 }
 
 ImageContainer::~ImageContainer()
 {
   if (IsAsync()) {
     ImageBridgeChild::DispatchReleaseImageClient(mImageClient);