From d7feab45603152c0145840f72db77c7285be2397 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 12 Jul 2013 11:20:23 -0700 Subject: [PATCH 1/4] Bumping gaia.json for 1 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/015185f797c4 Author: Rick Waldron Desc: Bug 887712 - [SMS/MMS] Make editable cursor element "zero width" until any user interaction r=gnarf https://bugzilla.mozilla.org/show_bug.cgi?id=887712 Includes: https://github.com/gnarf/gaia/commit/4880acb5ecf10b274dd8f6cf5e75b7d9ab5f8ab3 - Empty, out of focus placeholders contract to zero offset width - Empty, in focus placeholders expand to rem-based width (margin: r & l, padding: r & l) - When all recipients are deleted, don't leave empty editable in the to-field. - When the editable placeholder is contracted to a zero offset width, it's possible to accidentally tap a recipient when the intention is to tap the to-field area around the recipient list, which will correctly prompt the user to remove the recipient. Since there is no way to unambiguously detect the user's intention, always handle "Remove" and "Cancel" in an intuitive way. Signed-off-by: Rick Waldron --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e9125cefb0c..f66936d0873 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "93d613b62a4697824f918b3625da100d2e177eaa", + "revision": "015185f797c407b83fdc51d0f731a533be1ca0a5", "repo_path": "/integration/gaia-central" } From 723ada7a281c2e11301e6bc8410c1fa4efac05fe Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 12 Jul 2013 12:30:22 -0700 Subject: [PATCH 2/4] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/3004264248cc Author: Ben Kelly Desc: Merge pull request #10867 from wanderview/unit-test-script Bug 891366: Provide unit test script and make target. r=mwu ======== https://hg.mozilla.org/integration/gaia-central/rev/304aef72c600 Author: Ben Kelly Desc: Bug 891366: Provide unit test script in gaia/bin --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index f66936d0873..272f70cef43 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "015185f797c407b83fdc51d0f731a533be1ca0a5", + "revision": "3004264248cc5114ca75603e679f375724d26c9e", "repo_path": "/integration/gaia-central" } From 50b9ada80b426d1451f8337cc87f6a79cb4e48a5 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Fri, 12 Jul 2013 13:00:22 -0700 Subject: [PATCH 3/4] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/9a9c7a559a26 Author: Dave Hylands Desc: Merge pull request #10949 from dhylands/bug-893120-mochitest-perms Bug 893120 - Fix devicestorage permissions for mochitest. r=dclarke ======== https://hg.mozilla.org/integration/gaia-central/rev/9ac658beb8a3 Author: Dave Hylands Desc: Bug 893120 - Fix devicestorage permissions for mochitest. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 272f70cef43..11b7875aecd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "3004264248cc5114ca75603e679f375724d26c9e", + "revision": "9a9c7a559a26cc11669de92c05e36d6e9e81fe6d", "repo_path": "/integration/gaia-central" } From 1aa95b8f433f25dc6e46f6c91034314807114493 Mon Sep 17 00:00:00 2001 From: Sotaro Ikeda Date: Fri, 12 Jul 2013 17:27:17 -0400 Subject: [PATCH 4/4] Bug 891445 - Fix incorrect pointer comparison. r=doublec --- .../omx/mediaresourcemanager/MediaResourceManagerService.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp index c75ff19488e..b3810b4a7c7 100644 --- a/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp +++ b/content/media/omx/mediaresourcemanager/MediaResourceManagerService.cpp @@ -159,7 +159,7 @@ void MediaResourceManagerService::cancelClientLocked(const sp& binder) // Clear the request from request queue. Fifo::iterator it(mVideoCodecRequestQueue.begin()); while (it != mVideoCodecRequestQueue.end()) { - if (*it == binder) { + if ((*it).get() == binder.get()) { it = mVideoCodecRequestQueue.erase(it); continue; } @@ -168,7 +168,7 @@ void MediaResourceManagerService::cancelClientLocked(const sp& binder) // Clear the client from the resource for (int i=0 ; i