From 2b8b415849a9711e7ae4588bf4638a307785fdf0 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 6 Aug 2013 12:35:24 -0700 Subject: [PATCH 01/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/d4325ada997b Author: Jonathan Griffin Desc: Merge pull request #11384 from jonallengriffin/disable_visibility Bug 902045 - Disable tag_visibility_monitor_test.js in TBPL due to frequ... ======== https://hg.mozilla.org/integration/gaia-central/rev/5a2ff5e6c537 Author: Jonathan Griffin Desc: Bug 902045 - Disable tag_visibility_monitor_test.js in TBPL due to frequent orange, a=test-only --- 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 16ef68723a22..326c6f192b6b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "ca81894022ba9094e24f6f1d233ef0ebb1b59bba", + "revision": "d4325ada997b50fa1f6e385f45542aeb269b500a", "repo_path": "/integration/gaia-central" } From 5deed7113382a3d07155bc35aa068832e49f6fc7 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 6 Aug 2013 13:20:23 -0700 Subject: [PATCH 02/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/76dcfb5668d2 Author: vingtetun <21@vingtetun.org> Desc: Merge pull request #11385 from EverythingMe/evme-middle-squashed [Bug 838634] Move Evme to landing page [r=21] ======== https://hg.mozilla.org/integration/gaia-central/rev/38ff7535c268 Author: Evyatar Amitay Desc: [Bug 838634] Move Evme to landing page [r=21] --- 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 326c6f192b6b..3524657c7af9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "d4325ada997b50fa1f6e385f45542aeb269b500a", + "revision": "76dcfb5668d2968cdc2b3caba5b3dc2b95dc8d06", "repo_path": "/integration/gaia-central" } From 66fff2ca4632294f0497e5ce821e53ba71040607 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Tue, 6 Aug 2013 16:20:14 -0400 Subject: [PATCH 03/22] Bug 900742 - Fix APZC hit testing problem introduced by bug 866232. r=BenWa --- gfx/layers/composite/APZCTreeManager.cpp | 30 ++++++++++++------- gfx/layers/composite/APZCTreeManager.h | 1 + gfx/layers/ipc/AsyncPanZoomController.h | 26 +++++++++++----- .../gtest/TestAsyncPanZoomController.cpp | 7 ++--- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/gfx/layers/composite/APZCTreeManager.cpp b/gfx/layers/composite/APZCTreeManager.cpp index d00d44a00c0b..dfe107a23e6a 100644 --- a/gfx/layers/composite/APZCTreeManager.cpp +++ b/gfx/layers/composite/APZCTreeManager.cpp @@ -67,7 +67,7 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor, Laye aRoot, // aCompositor is null in gtest scenarios aCompositor ? aCompositor->RootLayerTreeId() : 0, - nullptr, nullptr, + gfx3DMatrix(), nullptr, nullptr, aIsFirstPaint, aFirstPaintLayersId, &apzcsToDestroy); } @@ -81,11 +81,15 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor, Laye AsyncPanZoomController* APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor, Layer* aLayer, uint64_t aLayersId, + gfx3DMatrix aTransform, AsyncPanZoomController* aParent, AsyncPanZoomController* aNextSibling, bool aIsFirstPaint, uint64_t aFirstPaintLayersId, nsTArray< nsRefPtr >* aApzcsToDestroy) { + // Accumulate the CSS transform between layers that have an APZC + aTransform = aTransform * aLayer->GetTransform(); + ContainerLayer* container = aLayer->AsContainerLayer(); AsyncPanZoomController* controller = nullptr; if (container) { @@ -116,13 +120,13 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor, controller->NotifyLayersUpdated(container->GetFrameMetrics(), aIsFirstPaint && (aLayersId == aFirstPaintLayersId)); - gfx3DMatrix transform = container->GetEffectiveTransform(); LayerRect visible = container->GetFrameMetrics().mViewport * container->GetFrameMetrics().LayersPixelsPerCSSPixel(); - gfxRect transformed = transform.TransformBounds(gfxRect(visible.x, visible.y, visible.width, visible.height)); - controller->SetVisibleRegion(transformed); - APZC_LOG("Setting rect(%f %f %f %f) as visible region for %p\n", transformed.x, transformed.y, - transformed.width, transformed.height, - controller); + controller->SetLayerHitTestData(visible, aTransform); + // Reset the accumulated transform once we hit a layer with an APZC + aTransform = gfx3DMatrix(); + APZC_LOG("Setting rect(%f %f %f %f) as visible region for APZC %p\n", visible.x, visible.y, + visible.width, visible.height, + controller); // Bind the APZC instance into the tree of APZCs if (aNextSibling) { @@ -144,7 +148,7 @@ APZCTreeManager::UpdatePanZoomControllerTree(CompositorParent* aCompositor, uint64_t childLayersId = (aLayer->AsRefLayer() ? aLayer->AsRefLayer()->GetReferentId() : aLayersId); AsyncPanZoomController* next = nullptr; for (Layer* child = aLayer->GetLastChild(); child; child = child->GetPrevSibling()) { - next = UpdatePanZoomControllerTree(aCompositor, child, childLayersId, aParent, next, + next = UpdatePanZoomControllerTree(aCompositor, child, childLayersId, aTransform, aParent, next, aIsFirstPaint, aFirstPaintLayersId, aApzcsToDestroy); } @@ -366,17 +370,21 @@ APZCTreeManager::FindTargetAPZC(AsyncPanZoomController* aApzc, const ScrollableL AsyncPanZoomController* APZCTreeManager::GetAPZCAtPoint(AsyncPanZoomController* aApzc, gfxPoint aHitTestPoint) { + gfx3DMatrix transform = gfx3DMatrix(aApzc->GetCurrentAsyncTransform()) * aApzc->GetCSSTransform(); + gfx3DMatrix untransform = transform.Inverse(); + gfxPoint untransformed = untransform.ProjectPoint(aHitTestPoint); + APZC_LOG("Untransformed %f %f to %f %f for APZC %p\n", aHitTestPoint.x, aHitTestPoint.y, untransformed.x, untransformed.y, aApzc); + // This walks the tree in depth-first, reverse order, so that it encounters // APZCs front-to-back on the screen. - ViewTransform apzcTransform = aApzc->GetCurrentAsyncTransform(); - gfxPoint untransformed = gfx3DMatrix(apzcTransform).Inverse().ProjectPoint(aHitTestPoint); for (AsyncPanZoomController* child = aApzc->GetLastChild(); child; child = child->GetPrevSibling()) { AsyncPanZoomController* match = GetAPZCAtPoint(child, untransformed); if (match) { return match; } } - if (aApzc->VisibleRegionContains(untransformed)) { + if (aApzc->VisibleRegionContains(LayerPoint(untransformed.x, untransformed.y))) { + APZC_LOG("Successfully matched untransformed point %f %f to visible region for APZC %p\n", untransformed.x, untransformed.y, aApzc); return aApzc; } return nullptr; diff --git a/gfx/layers/composite/APZCTreeManager.h b/gfx/layers/composite/APZCTreeManager.h index de8c55b4221d..2ac334fc1179 100644 --- a/gfx/layers/composite/APZCTreeManager.h +++ b/gfx/layers/composite/APZCTreeManager.h @@ -253,6 +253,7 @@ private: */ AsyncPanZoomController* UpdatePanZoomControllerTree(CompositorParent* aCompositor, Layer* aLayer, uint64_t aLayersId, + gfx3DMatrix aTransform, AsyncPanZoomController* aParent, AsyncPanZoomController* aNextSibling, bool aIsFirstPaint, diff --git a/gfx/layers/ipc/AsyncPanZoomController.h b/gfx/layers/ipc/AsyncPanZoomController.h index 06fcc795e67d..b52e2203da6d 100644 --- a/gfx/layers/ipc/AsyncPanZoomController.h +++ b/gfx/layers/ipc/AsyncPanZoomController.h @@ -16,6 +16,7 @@ #include "Axis.h" #include "TaskThrottler.h" #include "mozilla/layers/APZCTreeManager.h" +#include "gfx3DMatrix.h" #include "base/message_loop.h" @@ -641,17 +642,28 @@ private: * hit-testing to see which APZC instance should handle touch events. */ public: - void SetVisibleRegion(gfxRect rect) { mVisibleRegion = rect; } + void SetLayerHitTestData(const LayerRect& aRect, const gfx3DMatrix& aTransform) { + mVisibleRect = aRect; + mCSSTransform = aTransform; + } - bool VisibleRegionContains(const gfxPoint& aPoint) const { - return mVisibleRegion.Contains(aPoint.x, aPoint.y); + gfx3DMatrix GetCSSTransform() const { + return mCSSTransform; + } + + bool VisibleRegionContains(const LayerPoint& aPoint) const { + return mVisibleRect.Contains(aPoint); } private: - /* This is the viewport of the layer that this APZC corresponds to, but - * post-transform. In other words, it is in the coordinate space of its - * parent layer. */ - gfxRect mVisibleRegion; + /* This is the viewport of the layer that this APZC corresponds to, in + * layer pixels. It position here does not account for any transformations + * applied to any layers, whether they are CSS transforms or async + * transforms. */ + LayerRect mVisibleRect; + /* This is the cumulative layer transform from the parent APZC down to this + * one. */ + gfx3DMatrix mCSSTransform; }; } diff --git a/gfx/tests/gtest/TestAsyncPanZoomController.cpp b/gfx/tests/gtest/TestAsyncPanZoomController.cpp index 00a16b1476c3..7effd5cea271 100644 --- a/gfx/tests/gtest/TestAsyncPanZoomController.cpp +++ b/gfx/tests/gtest/TestAsyncPanZoomController.cpp @@ -421,20 +421,20 @@ TEST(APZCTreeManager, GetAPZCAtPoint) { gfx3DMatrix transform; transform.ScalePost(0.1, 0.1, 1); root->SetBaseTransform(transform); - root->ComputeEffectiveTransforms(gfx3DMatrix()); manager->UpdatePanZoomControllerTree(nullptr, root, 0, false); hit = manager->GetTargetAPZC(ScreenPoint(50, 50)); // This point is now outside the root layer EXPECT_EQ(nullAPZC, hit.get()); + // This hit test will hit both layers[3] and layers[4]; layers[4] is later in the tree so + // it is a better match hit = manager->GetTargetAPZC(ScreenPoint(2, 2)); - EXPECT_EQ(layers[3]->AsContainerLayer()->GetAsyncPanZoomController(), hit.get()); + EXPECT_EQ(layers[4]->AsContainerLayer()->GetAsyncPanZoomController(), hit.get()); // expect hit point at LayerPoint(20, 20) // Scale layer[4] outside the range layers[4]->SetBaseTransform(transform); // layer 4 effective visible screenrect: (0.05, 0.05, 0.2, 0.2) // Does not contain (2, 2) - root->ComputeEffectiveTransforms(gfx3DMatrix()); manager->UpdatePanZoomControllerTree(nullptr, root, 0, false); hit = manager->GetTargetAPZC(ScreenPoint(2, 2)); EXPECT_EQ(layers[3]->AsContainerLayer()->GetAsyncPanZoomController(), hit.get()); @@ -455,7 +455,6 @@ TEST(APZCTreeManager, GetAPZCAtPoint) { translateTransform3.ScalePost(1,15,1); layers[7]->SetBaseTransform(translateTransform3); - root->ComputeEffectiveTransforms(gfx3DMatrix()); manager->UpdatePanZoomControllerTree(nullptr, root, 0, false); // layer 7 effective visible screenrect (0,16,4,60) but clipped by parent layers hit = manager->GetTargetAPZC(ScreenPoint(1, 45)); From 79d5a88b657334b7374065a8301a6f01dd2f58ef Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 6 Aug 2013 14:15:24 -0700 Subject: [PATCH 04/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/14566701e80e Author: Dave Hylands Desc: Merge pull request #11388 from dhylands/dhylands-902028-mediadb Bug 902028 - DeviceStorage fix enumerateAll to work with webidl and the 1.1 way. r=djf ======== https://hg.mozilla.org/integration/gaia-central/rev/a143c46ccd8f Author: Dave Hylands Desc: Bug 902028 - DeviceStorage fix enumerateAll to work with webidl and the 1.1 way. --- 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 3524657c7af9..85ef4d96d4cd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "76dcfb5668d2968cdc2b3caba5b3dc2b95dc8d06", + "revision": "14566701e80ead7675d70f65ac5eb793520a31fd", "repo_path": "/integration/gaia-central" } From e3dbebce3eaa500545657b3548f7d9ce8c846cce Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 6 Aug 2013 15:00:23 -0700 Subject: [PATCH 05/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/6c183e1466d6 Author: Dale Harvey Desc: Merge pull request #11103 from daleharvey/796563 Bug 796563 - Add animation when entering and leaving settings. r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/fb8a0e633da4 Author: Dale Harvey Desc: Bug 796563 - Add animation when entering and leaving settings --- 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 85ef4d96d4cd..4b52e30c1200 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "14566701e80ead7675d70f65ac5eb793520a31fd", + "revision": "6c183e1466d64b6c4122930a19cab425a6c32107", "repo_path": "/integration/gaia-central" } From 530aef2a1d5ae904f6dc0dce36da54286676126d Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Tue, 6 Aug 2013 15:12:27 -0700 Subject: [PATCH 06/22] Bug 811924 - Center boot animation on black background. r=mwu Change-Id: I110e75331fa5455c226a9b4d23748372ca9ccbe9 --- widget/gonk/libdisplay/BootAnimation.cpp | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) --- widget/gonk/libdisplay/BootAnimation.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/widget/gonk/libdisplay/BootAnimation.cpp b/widget/gonk/libdisplay/BootAnimation.cpp index b8bd19832ce2..54b550a3d500 100644 --- a/widget/gonk/libdisplay/BootAnimation.cpp +++ b/widget/gonk/libdisplay/BootAnimation.cpp @@ -524,8 +524,27 @@ AnimationThread(void *) display->QueueBuffer(buf); break; } - memcpy(vaddr, frame.buf, - frame.width * frame.height * frame.bytepp); + + if (buf->height == frame.height && buf->width == frame.width) { + memcpy(vaddr, frame.buf, + frame.width * frame.height * frame.bytepp); + } else if (buf->height >= frame.height && + buf->width >= frame.width) { + int startx = (buf->width - frame.width) / 2; + int starty = (buf->height - frame.height) / 2; + + int src_stride = frame.width * frame.bytepp; + int dst_stride = buf->stride * frame.bytepp; + + char *src = frame.buf; + char *dst = (char *) vaddr + starty * dst_stride + startx * frame.bytepp; + + for (int i = 0; i < frame.height; i++) { + memcpy(dst, src, src_stride); + src += src_stride; + dst += dst_stride; + } + } grmodule->unlock(grmodule, buf->handle); gettimeofday(&tv2, nullptr); From 4b1971f6d41a6e2273cbd08e9a1b85a87dfce54e Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 6 Aug 2013 15:45:23 -0700 Subject: [PATCH 07/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/51071ff883bd Author: Kevin Grandon Desc: Merge pull request #11389 from KevinGrandon/bug_902176_add_mozTelephony_shim Bug 902176 - Add telephony mock r=vingtetun ======== https://hg.mozilla.org/integration/gaia-central/rev/9e88e777cc0f Author: Kevin Grandon Desc: Bug 902176 - Add telephony mock --- 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 4b52e30c1200..a3a5a4e309c2 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "6c183e1466d64b6c4122930a19cab425a6c32107", + "revision": "51071ff883bd3cbfcc269291a8f73d0cb2c2769f", "repo_path": "/integration/gaia-central" } From b9d62d1e34437efcc8b527a82d8dae38dce8b4e8 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 6 Aug 2013 16:30:23 -0700 Subject: [PATCH 08/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/77aed7428666 Author: Kevin Grandon Desc: Merge pull request #11390 from KevinGrandon/bug_902199_fix_travis Bug 902199 - Fix travis error r=vingtetun ======== https://hg.mozilla.org/integration/gaia-central/rev/fad675024f68 Author: Kevin Grandon Desc: Bug 902199 - Fix travis error. --- 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 a3a5a4e309c2..c0b2c1148b9a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "51071ff883bd3cbfcc269291a8f73d0cb2c2769f", + "revision": "77aed7428666627e423b5acaa5cefdb36d944b4b", "repo_path": "/integration/gaia-central" } From 8e9ccae04ff494938172aa962cc15dc6ec3f61ff Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Tue, 6 Aug 2013 21:20:23 -0700 Subject: [PATCH 09/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/13332352a031 Author: Arthur Chen Desc: Merge pull request #11394 from crh0716/895287_master Bug 895287 - Set wifi.suspended to false when manually turning off wifi r=evelyn, a=leo+ ======== https://hg.mozilla.org/integration/gaia-central/rev/ce51afbd03b3 Author: crh0716 Desc: Bug 895287 - Set wifi.suspended to false when manually turning off wifi --- 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 c0b2c1148b9a..7890aa814ab1 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "77aed7428666627e423b5acaa5cefdb36d944b4b", + "revision": "13332352a031a45f0dabcbedf6d221e58d5cdd2d", "repo_path": "/integration/gaia-central" } From 01b578898a12ea027da9541e7a6b8028a9d7d1dc Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 00:55:23 -0700 Subject: [PATCH 10/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/b26ac118fa83 Author: Etienne Segonzac Desc: Merge pull request #11381 from etiennesegonzac/telephony-helper-tests Bug 883276 - Cover the TelephonyHelper with unit tests. ======== https://hg.mozilla.org/integration/gaia-central/rev/1e7a4ae29bf8 Author: Etienne Segonzac Desc: Bug 883276 - Cover the TelephonyHelper with unit tests. r=julienw --- 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 7890aa814ab1..851dc9705ae3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "13332352a031a45f0dabcbedf6d221e58d5cdd2d", + "revision": "b26ac118fa8330654bbe6e3baa96dd08d1f99f31", "repo_path": "/integration/gaia-central" } From 4564ab6819e7c2fa8eb174bc029c75da29b014c2 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Wed, 7 Aug 2013 10:14:20 +0200 Subject: [PATCH 11/22] Bug 892939: Remove PrepareAdapterTask, r=echou,gyeh PrepareAdapterRunnable does not block for DBus anymore, so the intermediate step of PrepareAdapterTask in the main thread is unnecessary. This patch merges the code of PrepareAdapterTask into PrepareAdapterRunnable and removes PrepareAdapterTask. PrepareAdapterRunnable now runs directly on the main thread. --- dom/bluetooth/linux/BluetoothDBusService.cpp | 52 +++++++++----------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp index 103649b3a1d1..2389ad43d9a0 100644 --- a/dom/bluetooth/linux/BluetoothDBusService.cpp +++ b/dom/bluetooth/linux/BluetoothDBusService.cpp @@ -1258,6 +1258,10 @@ private: class PrepareAdapterRunnable : public nsRunnable { public: + PrepareAdapterRunnable(const nsAString& aAdapterPath) + : mAdapterPath(aAdapterPath) + { } + NS_IMETHOD Run() { static const dbus_uint32_t sServices[] = { @@ -1266,14 +1270,23 @@ public: BluetoothServiceClass::OBJECT_PUSH }; - MOZ_ASSERT(!NS_IsMainThread()); + MOZ_ASSERT(NS_IsMainThread()); - nsRefPtr handler = new AddReservedServiceRecordsReplyHandler(); - MOZ_ASSERT(handler.get()); + nsRefPtr threadConnection = gThreadConnection; + + if (!threadConnection.get()) { + BT_WARNING("%s: DBus connection has been closed.", __FUNCTION__); + return false; + } + + sAdapterPath = mAdapterPath; + + nsRefPtr handler = + new AddReservedServiceRecordsReplyHandler(); const dbus_uint32_t* services = sServices; - bool success = dbus_func_args_async(gThreadConnection->GetConnection(), -1, + bool success = dbus_func_args_async(threadConnection->GetConnection(), -1, DBusReplyHandler::Callback, handler.get(), NS_ConvertUTF16toUTF8(sAdapterPath).get(), DBUS_ADAPTER_IFACE, "AddReservedServiceRecords", @@ -1286,30 +1299,9 @@ public: return NS_OK; } -}; - -class PrepareAdapterTask : public nsRunnable -{ -public: - PrepareAdapterTask(const nsAString& aPath) - : mPath(aPath) - { - } - - nsresult Run() - { - MOZ_ASSERT(NS_IsMainThread()); - - BluetoothService* bs = BluetoothService::Get(); - NS_ENSURE_TRUE(bs, NS_ERROR_FAILURE); - sAdapterPath = mPath; - nsRefPtr func(new PrepareAdapterRunnable()); - bs->DispatchToCommandThread(func); - return NS_OK; - } private: - nsString mPath; + nsString mAdapterPath; }; class SendPlayStatusTask : public nsRunnable @@ -1517,7 +1509,7 @@ EventFilter(DBusConnection* aConn, DBusMessage* aMsg, void* aData) errorStr.AssignLiteral("Cannot parse manager path!"); } else { v = NS_ConvertUTF8toUTF16(str); - NS_DispatchToMainThread(new PrepareAdapterTask(v.get_nsString())); + NS_DispatchToMainThread(new PrepareAdapterRunnable(v.get_nsString())); } } else if (dbus_message_is_signal(aMsg, DBUS_MANAGER_IFACE, "PropertyChanged")) { @@ -1671,10 +1663,10 @@ BluetoothDBusService::StartInternal() nsAutoString replyError; if (!GetDefaultAdapterPath(v, replyError)) { // Adapter path is not ready yet - // Let's do PrepareAdapterTask when we receive signal 'AdapterAdded' + // Let's do PrepareAdapterRunnable when we receive signal 'AdapterAdded' } else { - // Adapter path has been ready. let's do PrepareAdapterTask now - nsRefPtr b = new PrepareAdapterTask(v.get_nsString()); + // Adapter path has been ready. let's do PrepareAdapterRunnable now + nsRefPtr b = new PrepareAdapterRunnable(v.get_nsString()); if (NS_FAILED(NS_DispatchToMainThread(b))) { NS_WARNING("Failed to dispatch to main thread!"); } From 024523fc3c12e74357a917a213a01577ea9f4c1b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 01:40:23 -0700 Subject: [PATCH 12/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/9c12b7dc33c7 Author: Francisco Jordano Desc: Merge pull request #11329 from leob2g/Bug_876123_Avoid_Multiple_SelectionBox_Values_Display [Costcontrol] Bug_876123_Avoid_Multiple_Display r=lodr ======== https://hg.mozilla.org/integration/gaia-central/rev/9161e96366e3 Author: sarath27.vs Desc: Bug_876123_Avoid_Multiple_Display --- 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 851dc9705ae3..610b01ab03ef 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "b26ac118fa8330654bbe6e3baa96dd08d1f99f31", + "revision": "9c12b7dc33c7a12b3838567e7f2a0e22ae69dbd1", "repo_path": "/integration/gaia-central" } From 2baf9bc6fffb13dc03c61527bdd0c0a893ad4f14 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 10:00:24 -0700 Subject: [PATCH 13/22] Bumping gaia.json for 1 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/93418295d620 Author: Vivien Nicolas <21@vingtetun.org> Desc: Bug 902233 - Failing unit tests. r=ran --- 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 610b01ab03ef..83a3c70e9670 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "9c12b7dc33c7a12b3838567e7f2a0e22ae69dbd1", + "revision": "93418295d620c4bac22cac61ddf4dc4fa372d6a7", "repo_path": "/integration/gaia-central" } From f9920b3ebc6e26604e037901cb557131660a147a Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 10:00:46 -0700 Subject: [PATCH 14/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/514eeba803a5 Author: Francisco Borja Salguero Castellano Desc: Merge pull request #11382 from borjasalguero/paris_settings_contact Bug 901471 - Revamp Contact Settings screen to allow to import / export ... ======== https://hg.mozilla.org/integration/gaia-central/rev/2bb3fbad978c Author: borjasalguero Desc: Bug 901471 - Revamp Contact Settings screen to allow to import / export from / to different sources r=jmcanterafonseca --- 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 83a3c70e9670..f14addac7cab 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "93418295d620c4bac22cac61ddf4dc4fa372d6a7", + "revision": "514eeba803a5f1035e3603cea3b02d2710c5a0da", "repo_path": "/integration/gaia-central" } From e5126d04d0b0d9cc83b2a5b276f0fa7412f43b59 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 10:12:10 -0700 Subject: [PATCH 15/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/a983aefa1136 Author: Ben Francis Desc: Merge pull request #11346 from gasolin/issue-900345 Bug 900345 - HD: [browser] left arrow in sidebar is bigger than expect r=benfrancis ======== https://hg.mozilla.org/integration/gaia-central/rev/a99af35ab2be Author: gasolin Desc: Bug 900345 - HD: [browser] left arrow in sidebar is bigger than expect --- 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 f14addac7cab..7a6dd0fa863d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "514eeba803a5f1035e3603cea3b02d2710c5a0da", + "revision": "a983aefa11361f99c563c3c65e1c5eb2687c8893", "repo_path": "/integration/gaia-central" } From bb24e19c0a3a60800c885beac42c155928cf8e7d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 10:15:29 -0700 Subject: [PATCH 16/22] Bumping gaia.json for 4 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/f90b4d8c90a1 Author: Jonathan Griffin Desc: Merge pull request #11403 from jonallengriffin/gaiaui Bug 900630 - Update gaia-ui-tests.json, a=test-only ======== https://hg.mozilla.org/integration/gaia-central/rev/80bf009e8d60 Author: Jonathan Griffin Desc: Bug 900630 - Update gaia-ui-tests.json, a=test-only ======== https://hg.mozilla.org/integration/gaia-central/rev/772427971529 Author: Fabien Cazenave Desc: Merge pull request #11275 from fabi1cazenave/contactSearchFocus-bug898976 Bug 898976: [Contacts] Keyboard does not disappear when clicking then Enter key in the contacts search page, r=jmcf ======== https://hg.mozilla.org/integration/gaia-central/rev/add784345ea7 Author: Fabien Cazenave Desc: Bug 898976: [Contacts] Keyboard does not disappear when clicking ENTER key in contacts search page --- 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 7a6dd0fa863d..dbf41d91c929 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a983aefa11361f99c563c3c65e1c5eb2687c8893", + "revision": "f90b4d8c90a1f067d6b5321efdbf5dd32eb90d73", "repo_path": "/integration/gaia-central" } From a6c187eb8035ec49289abbd45f188bb7a8da22b8 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 10:25:23 -0700 Subject: [PATCH 17/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/14deb0991916 Author: Fabien Cazenave Desc: Merge pull request #11397 from fabi1cazenave/localizeShouldNotClearAll-bug902363 Bug 902363: [mozL10n] factorize `setTextContent` to fix `localizeElement`, r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/49303a4a3e82 Author: Fabien Cazenave Desc: Bug 902363: factorize `setTextContent` to fix `localizeElement` --- 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 dbf41d91c929..d57c11f078a3 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "f90b4d8c90a1f067d6b5321efdbf5dd32eb90d73", + "revision": "14deb09919168c6375463510087a583754e3915d", "repo_path": "/integration/gaia-central" } From 4fd40a9ce9eb15a71c4650c917f8babf4a167ee9 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 11:31:24 -0700 Subject: [PATCH 18/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/fb932dc7c5c4 Author: Jonathan Griffin Desc: Merge pull request #11406 from jonallengriffin/902551 Bug 902551 - Disable save_bookmark_test.js on TBPL for near permaorange,... ======== https://hg.mozilla.org/integration/gaia-central/rev/a7a15ae05e97 Author: Jonathan Griffin Desc: Bug 902551 - Disable save_bookmark_test.js on TBPL for near permaorange, a=test-only --- 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 d57c11f078a3..de70a9d9c47f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "14deb09919168c6375463510087a583754e3915d", + "revision": "fb932dc7c5c444f365ab187a81b464246af0bbe2", "repo_path": "/integration/gaia-central" } From ed43f63663729f2dd10d23ff6201ee1017f3479b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 12:15:23 -0700 Subject: [PATCH 19/22] Bumping gaia.json for 1 gaia-central revision(s) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/c4acbffef44e Author: Fabrice Desré Desc: Bug 901383 - Some permissions dialogs should have a 'more info' capability. r=etienne --- 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 de70a9d9c47f..138eca2d0d96 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "fb932dc7c5c444f365ab187a81b464246af0bbe2", + "revision": "c4acbffef44e649f328f9b9320defdc326209e50", "repo_path": "/integration/gaia-central" } From b0ed22baba40f8ed989a747152550215331a017b Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 12:30:23 -0700 Subject: [PATCH 20/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/6991d4067741 Author: vingtetun <21@vingtetun.org> Desc: Merge pull request #11344 from fcampo/TutorialSwipeLeft Bug 901041 - Remove 'swipe left' screen in tutorial (as part of the first run experience) ======== https://hg.mozilla.org/integration/gaia-central/rev/03ec92421539 Author: Fernando Campo Desc: Bug 901041 - Remove 'swipe left' screen in tutorial (as part of the first run experience) --- 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 138eca2d0d96..249427702928 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c4acbffef44e649f328f9b9320defdc326209e50", + "revision": "6991d4067741e0eb1eff1bafef7de820c8959cb2", "repo_path": "/integration/gaia-central" } From 0d464a390a53f7e3eb6b6d482cc740ffee3f33a5 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 12:40:23 -0700 Subject: [PATCH 21/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/fc8241f97254 Author: Evyatar Amitay Desc: Bug 902517 - The e.me banner is shown above the dock when a bookmark is added. r=vingtetun ======== https://hg.mozilla.org/integration/gaia-central/rev/37024c7e63d1 Author: Evyatar Amitay Desc: Bug 902123 - The background of the landing page is darker once e.me has been opened. r=vingtetun --- 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 249427702928..b3b272949287 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "6991d4067741e0eb1eff1bafef7de820c8959cb2", + "revision": "fc8241f97254539052d2c8bf7b4766c11cb5239b", "repo_path": "/integration/gaia-central" } From a0cda917c22fd16b7636f69df8dce3c3acb0dd19 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 7 Aug 2013 12:50:23 -0700 Subject: [PATCH 22/22] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/acd53f668718 Author: Vivien Nicolas <21@vingtetun.org> Desc: Bug 902465 - Too many CanvasLayer on e.me results hurts panning. part 2. r=ran ======== https://hg.mozilla.org/integration/gaia-central/rev/f94712ea7073 Author: Evyatar Amitay Desc: Bug 902465 - Too many CanvasLayer on e.me results hurts panning. part 1. r=vingtetun --- 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 b3b272949287..2697277bbc2f 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "fc8241f97254539052d2c8bf7b4766c11cb5239b", + "revision": "acd53f668718d06090805303ed85e36dddf61853", "repo_path": "/integration/gaia-central" }