From 13db6d06963ae6d29e6ffed8b7713cd61652bac7 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 12:55:23 -0800 Subject: [PATCH 01/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/691ab18d63ff Author: Salvador de la Puente González Desc: Merge pull request #14176 from flodolo/fix_wifi Bug 944371 - [Cost Control] Use "Wi-Fi" consistently in strings instead of "wifi" r=me ======== https://hg.mozilla.org/integration/gaia-central/rev/244f5505a8e1 Author: Francesco Lodolo (:flod) Desc: Bug 944371 - [Cost Control] Use "Wi-Fi" consistently in strings instead of "wifi" No need to change IDs, it's just fixing consistency in en-US --- 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 f37aa0dcb7e7..58fa367e1a42 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c2506884aba22b968d3ab1ad6c28f0782b22a17f", + "revision": "691ab18d63ff26e68f1cd79cadbd6f4b9241526f", "repo_path": "/integration/gaia-central" } From cb39f53eff277aae1d472f3a5ca774cbddea2098 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 13:20:38 -0800 Subject: [PATCH 02/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/3743c5331ed5 Author: Mason Chang Desc: Merge pull request #14271 from changm/bug942337 bug 942337 - will-animate css property for contacts app ======== https://hg.mozilla.org/integration/gaia-central/rev/f5e8bf5851b3 Author: Mason Chang Desc: bug94233 will-animate css property for contacts app --- 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 58fa367e1a42..faf17b866045 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "691ab18d63ff26e68f1cd79cadbd6f4b9241526f", + "revision": "3743c5331ed5d208ab66c34b139dd0874b75022b", "repo_path": "/integration/gaia-central" } From e7f3b2ef3091aef952b42eece78d983d0ddd42ec Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 13:55:23 -0800 Subject: [PATCH 03/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/24561473dedb Author: Mason Chang Desc: Merge pull request #14274 from changm/bug942339 bug 942339, add will-animate to scrollable area in sms app, r+ benwa ======== https://hg.mozilla.org/integration/gaia-central/rev/4f8ab9c9a943 Author: Mason Chang Desc: bug 942339, add will-animate to scrollable area in sms app --- 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 faf17b866045..678529f9cc96 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "3743c5331ed5d208ab66c34b139dd0874b75022b", + "revision": "24561473dedb3ddb7816e2fe389594be655ac65d", "repo_path": "/integration/gaia-central" } From 6e1d7cccc875428d16edb801b5041cf103d98aeb Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 14:20:30 -0800 Subject: [PATCH 04/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/d08fc44b3727 Author: James Lal Desc: Merge pull request #14281 from lightsofapollo/bug-908931 Bug 908931 - vbump mocha r=me a=test-only +shepherd ======== https://hg.mozilla.org/integration/gaia-central/rev/25b687c6988b Author: James Lal Desc: Bug 908931 - vbump mocha r=me 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 678529f9cc96..1803b06397cd 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "24561473dedb3ddb7816e2fe389594be655ac65d", + "revision": "d08fc44b37277344534d921415adfa5626f5eb93", "repo_path": "/integration/gaia-central" } From bb5e1abd6b591990e0af1f58e2f288952eed5110 Mon Sep 17 00:00:00 2001 From: Botond Ballo Date: Mon, 2 Dec 2013 16:50:02 -0500 Subject: [PATCH 05/19] Bug 945260 - Remove overflow:hidden css from an element that is meant to scroll. r=jimm --- browser/metro/theme/browser.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/browser/metro/theme/browser.css b/browser/metro/theme/browser.css index dc921df8e8be..7b5c74b2731c 100644 --- a/browser/metro/theme/browser.css +++ b/browser/metro/theme/browser.css @@ -322,10 +322,6 @@ documenttab[selected] .documenttab-selection { min-width: @scroller_minimum@; } -#browsers[input="imprecise"] browser { - overflow: hidden; -} - /* overlay buttons */ .overlay-button { From d80d2662637ba3165f00745d1de0545fc81ef578 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 14:55:25 -0800 Subject: [PATCH 06/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/515e6b11adee Author: Kyle Machulis Desc: Merge pull request #14286 from qdot/943027-icchelper-fix Bug 943027: Fix configurable property for ICCHelper; r=arthurcc ======== https://hg.mozilla.org/integration/gaia-central/rev/d3135dd66089 Author: Kyle Machulis Desc: Bug 943027: Fix configurable property for ICCHelper; r=arthurcc --- 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 1803b06397cd..4bb416a1187d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "d08fc44b37277344534d921415adfa5626f5eb93", + "revision": "515e6b11adeec91d647a5a1eb854cbc6ba6e6997", "repo_path": "/integration/gaia-central" } From d93f005dcf12d7c06a2e646a192b52109150092d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 15:10:33 -0800 Subject: [PATCH 07/19] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cc8b862ffd2f Author: Mason Chang Desc: Merge pull request #14284 from changm/bug943086 bug 943086. Calender App Day, month, and week view scrolling portion with will-animate. r+ = benwa ======== https://hg.mozilla.org/integration/gaia-central/rev/99f11ba20f3b Author: Mason Chang Desc: bug 943086. Day, month, and week view scrolling portion with will-animate ======== https://hg.mozilla.org/integration/gaia-central/rev/354b3d14de95 Author: Mason Chang Desc: Merge pull request #14282 from changm/bug940734 bug 940734. Keeping scrolling portion of settings app as one layer. r+ benwa ======== https://hg.mozilla.org/integration/gaia-central/rev/c3f849c8162f Author: Mason Chang Desc: bug 940734. Keeping scrolling portion of settings app as one layer --- 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 4bb416a1187d..8f9e2498ba30 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "515e6b11adeec91d647a5a1eb854cbc6ba6e6997", + "revision": "cc8b862ffd2f0a89f748eaa2067ec48f97b8f13d", "repo_path": "/integration/gaia-central" } From c2930b7f6e637d284d2f2c485dfe89dd1bae6839 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 15:45:23 -0800 Subject: [PATCH 08/19] Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8ecdae39a8b0 Author: Casey Yee Desc: Merge pull request #14151 from Joshua-S/bug-941631 [Bug 941631] - [Cost Control] Update background and sub header colour [r=salva] ======== https://hg.mozilla.org/integration/gaia-central/rev/443bb7c84527 Author: Joshua Smith Desc: Bug 941631 - [Cost Control] Update background and sub header colour ======== https://hg.mozilla.org/integration/gaia-central/rev/86167748e300 Author: Casey Yee Desc: Merge pull request #14144 from Joshua-S/bug-941632 [Bug 941632] - [Email] Update background and sub header colour [r+=jrburke] ======== https://hg.mozilla.org/integration/gaia-central/rev/6f4ad24ee6d7 Author: Joshua Smith Desc: Bug 941632 - [Email] Update background and sub header colour --- 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 8f9e2498ba30..a4c745485a27 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "cc8b862ffd2f0a89f748eaa2067ec48f97b8f13d", + "revision": "8ecdae39a8b02a0b06edf1a6396be1408d17ed83", "repo_path": "/integration/gaia-central" } From b0a11c058796cd9c163b01304d1df778298793e7 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 16:00:24 -0800 Subject: [PATCH 09/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/507f903f0254 Author: Mason Chang Desc: Merge pull request #14283 from changm/bug943089 bug 943089 keep scrolling portion of gallery app as one layer using will... ======== https://hg.mozilla.org/integration/gaia-central/rev/43bb219195ed Author: Mason Chang Desc: bug 943089 keep scrolling portion of gallery app as one layer using will-animate --- 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 a4c745485a27..ea0b4e622206 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "8ecdae39a8b02a0b06edf1a6396be1408d17ed83", + "revision": "507f903f02543b099c656e7a72390ba74e129a54", "repo_path": "/integration/gaia-central" } From 7488b4694cc6469842fe2831c7326e5628b2da91 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 16:45:39 -0800 Subject: [PATCH 10/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/a4fc104407a6 Author: Mihai Cîrlănaru Desc: Merge pull request #14189 from mihai/bug_937533 Bug 937533 - [Settings] Update reset phone dialog. r=@crh0716 ======== https://hg.mozilla.org/integration/gaia-central/rev/3428b672e445 Author: Mihai Cirlanaru Desc: Bug 937533 - [Settings] Update reset phone dialog. r=arthurcc --- 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 ea0b4e622206..1089c841aaab 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "507f903f02543b099c656e7a72390ba74e129a54", + "revision": "a4fc104407a629ac706afe7d5c0ff092495e505e", "repo_path": "/integration/gaia-central" } From 57c132241d5f2a9d9f0ed6d7e263cab6f056fa0d Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 17:00:27 -0800 Subject: [PATCH 11/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/af00bc781ef2 Author: Michael Henretty Desc: Merge pull request #14088 from mikehenrty/bump-marionette-helper use new marionette helper, adds waitForElementToDisappear ======== https://hg.mozilla.org/integration/gaia-central/rev/c4d245fefa05 Author: Michael Henretty Desc: use new marionette helper, adds waitForElementToDisappear --- 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 1089c841aaab..c3771339662c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "a4fc104407a629ac706afe7d5c0ff092495e505e", + "revision": "af00bc781ef2886013b159e6ae6bb427c459f36a", "repo_path": "/integration/gaia-central" } From 2eb831f00bdc596274aadb057eca049c295e11d9 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 17:35:33 -0800 Subject: [PATCH 12/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/4b8f2afe1cbd Author: Mihai Cîrlănaru Desc: Merge pull request #14235 from mihai/bug_944214 Bug 944214 - [Settings] Update list buttons to match BB. r=@crh0716 ======== https://hg.mozilla.org/integration/gaia-central/rev/89b751b8094d Author: Mihai Cirlanaru Desc: Bug 944214 - [Settings] Update PIN and lockscreen list buttons to use arrows. r=arthurcc --- 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 c3771339662c..8027eaf535c9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "af00bc781ef2886013b159e6ae6bb427c459f36a", + "revision": "4b8f2afe1cbd98cee892c6a4c8c41d0e707f0480", "repo_path": "/integration/gaia-central" } From d5337ec0b8a1f6f40824d95f6d3e0dcf52730214 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 18:25:24 -0800 Subject: [PATCH 13/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/554341fd20a9 Author: Alive.Kuo Desc: Merge pull request #14233 from svic/rebase-80717b22-ShrinkUI Bug 943179 - Integrate P2P / Shrink UI to nfc_manager, r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/f5d9db3b62db Author: Siddartha Pothapragada Desc: Bug 943179 - Integrate P2P / Shrink UI to nfc_manager --- 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 8027eaf535c9..4e57e9f8fe75 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "4b8f2afe1cbd98cee892c6a4c8c41d0e707f0480", + "revision": "554341fd20a9c8053bfdcb07774d57817bd57751", "repo_path": "/integration/gaia-central" } From 8caf4f9ee0b5b96967d678cd2c17ed2707b61010 Mon Sep 17 00:00:00 2001 From: Alan Huang Date: Fri, 22 Nov 2013 17:10:30 +0800 Subject: [PATCH 14/19] Bug 942040 - Remove a process from BackgroundProcessLRUPool in ParticularProcessPriorityManager only if it is indeed a background process. r=khuey --- dom/ipc/ProcessPriorityManager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp index 90e630313df6..f4c3ee5b399a 100644 --- a/dom/ipc/ProcessPriorityManager.cpp +++ b/dom/ipc/ProcessPriorityManager.cpp @@ -1045,7 +1045,9 @@ ParticularProcessPriorityManager::ShutDown() mResetPriorityTimer = nullptr; } - ProcessPriorityManager::RemoveFromBackgroundLRUPool(mContentParent); + if (mPriority == PROCESS_PRIORITY_BACKGROUND && !IsPreallocated()) { + ProcessPriorityManager::RemoveFromBackgroundLRUPool(mContentParent); + } mContentParent = nullptr; } From 5c8720480548219bbb2ac48f0661527578a33ef2 Mon Sep 17 00:00:00 2001 From: Andrea Marchesini Date: Mon, 2 Dec 2013 22:37:03 -0500 Subject: [PATCH 15/19] Bug 935273 - Force nocrop property in FilePicker for b2g. r=fabrice --- b2g/components/FilePicker.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/b2g/components/FilePicker.js b/b2g/components/FilePicker.js index 980c72fcea5a..5d401198166f 100644 --- a/b2g/components/FilePicker.js +++ b/b2g/components/FilePicker.js @@ -47,6 +47,7 @@ FilePicker.prototype = { /* members */ mParent: undefined, + mExtraProps: {}, mFilterTypes: [], mFileEnumerator: undefined, mFilePickerShownCallback: undefined, @@ -85,6 +86,8 @@ FilePicker.prototype = { if (filterMask & Ci.nsIFilePicker.filterImages) { this.mFilterTypes = this.mFilterTypes.concat(IMAGE_FILTERS); + // This property is needed for the gallery app pick activity. + this.mExtraProps['nocrop'] = true; } // Ci.nsIFilePicker.filterXML is not supported @@ -117,6 +120,12 @@ FilePicker.prototype = { detail.type = this.mFilterTypes; } + for (let prop in this.mExtraProps) { + if (!(prop in detail)) { + detail[prop] = this.mExtraProps[prop]; + } + } + cpmm.sendAsyncMessage('file-picker', detail); }, From 9dd4bc9de098f24c3537e4d066f5fdbc43625009 Mon Sep 17 00:00:00 2001 From: Sushil Chauhan Date: Mon, 2 Dec 2013 16:58:39 -0800 Subject: [PATCH 16/19] Bug 940851 - Initialize acquire & release-fence fds of HWC_BACKGROUND layer. r=dwilson --- widget/gonk/HwcComposer2D.cpp | 2 ++ widget/gonk/libdisplay/GonkDisplayJB.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/widget/gonk/HwcComposer2D.cpp b/widget/gonk/HwcComposer2D.cpp index 5b21aef7ce90..97556f77f5b0 100644 --- a/widget/gonk/HwcComposer2D.cpp +++ b/widget/gonk/HwcComposer2D.cpp @@ -525,6 +525,8 @@ HwcComposer2D::Render(EGLDisplay dpy, EGLSurface sur) mList->hwLayers[0].compositionType = HWC_BACKGROUND; mList->hwLayers[0].flags = HWC_SKIP_LAYER; mList->hwLayers[0].backgroundColor = {0}; + mList->hwLayers[0].acquireFenceFd = -1; + mList->hwLayers[0].releaseFenceFd = -1; mList->hwLayers[0].displayFrame = {0, 0, mScreenRect.width, mScreenRect.height}; Prepare(fbsurface->lastHandle, fbsurface->lastFenceFD); } diff --git a/widget/gonk/libdisplay/GonkDisplayJB.cpp b/widget/gonk/libdisplay/GonkDisplayJB.cpp index 97612ae44a5d..7ab251af0587 100644 --- a/widget/gonk/libdisplay/GonkDisplayJB.cpp +++ b/widget/gonk/libdisplay/GonkDisplayJB.cpp @@ -234,6 +234,8 @@ GonkDisplayJB::Post(buffer_handle_t buf, int fence) /* Skip this layer so the hwc module doesn't complain about null handles */ mList->hwLayers[0].flags = HWC_SKIP_LAYER; mList->hwLayers[0].backgroundColor = {0}; + mList->hwLayers[0].acquireFenceFd = -1; + mList->hwLayers[0].releaseFenceFd = -1; /* hwc module checks displayFrame even though it shouldn't */ mList->hwLayers[0].displayFrame = r; mList->hwLayers[1].compositionType = HWC_FRAMEBUFFER_TARGET; From 05a8724f6ab98bb3effd4d43ef4550c4efbe9b25 Mon Sep 17 00:00:00 2001 From: Sotaro Ikeda Date: Mon, 2 Dec 2013 22:38:16 -0500 Subject: [PATCH 17/19] Bug 941274 - Fix ResetDecode in MediaOmxReader. r=doublec --- content/media/omx/MediaOmxReader.cpp | 25 +++++++++++-------------- content/media/omx/MediaOmxReader.h | 1 - 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/content/media/omx/MediaOmxReader.cpp b/content/media/omx/MediaOmxReader.cpp index 9442e0f93140..fc14561e49e7 100644 --- a/content/media/omx/MediaOmxReader.cpp +++ b/content/media/omx/MediaOmxReader.cpp @@ -37,6 +37,10 @@ MediaOmxReader::MediaOmxReader(AbstractMediaDecoder *aDecoder) : MediaOmxReader::~MediaOmxReader() { ResetDecode(); + VideoFrameContainer* container = mDecoder->GetVideoFrameContainer(); + if (container) { + container->ClearCurrentFrame(); + } mOmxDecoder.clear(); } @@ -64,6 +68,12 @@ bool MediaOmxReader::IsDormantNeeded() void MediaOmxReader::ReleaseMediaResources() { ResetDecode(); + // Before freeing a video codec, all video buffers needed to be released + // even from graphics pipeline. + VideoFrameContainer* container = mDecoder->GetVideoFrameContainer(); + if (container) { + container->ClearCurrentFrame(); + } if (mOmxDecoder.get()) { mOmxDecoder->ReleaseMediaResources(); } @@ -166,18 +176,6 @@ nsresult MediaOmxReader::ReadMetadata(MediaInfo* aInfo, return NS_OK; } -// Resets all state related to decoding, emptying all buffers etc. -nsresult MediaOmxReader::ResetDecode() -{ - MediaDecoderReader::ResetDecode(); - - VideoFrameContainer* container = mDecoder->GetVideoFrameContainer(); - if (container) { - container->ClearCurrentFrame(); - } - return NS_OK; -} - bool MediaOmxReader::DecodeVideoFrame(bool &aKeyframeSkip, int64_t aTimeThreshold) { @@ -347,12 +345,11 @@ nsresult MediaOmxReader::Seek(int64_t aTarget, int64_t aStartTime, int64_t aEndT { NS_ASSERTION(mDecoder->OnDecodeThread(), "Should be on decode thread."); + ResetDecode(); VideoFrameContainer* container = mDecoder->GetVideoFrameContainer(); if (container && container->GetImageContainer()) { container->GetImageContainer()->ClearAllImagesExceptFront(); } - mVideoQueue.Reset(); - mAudioQueue.Reset(); mAudioSeekTimeUs = mVideoSeekTimeUs = aTarget; diff --git a/content/media/omx/MediaOmxReader.h b/content/media/omx/MediaOmxReader.h index 58329da25688..a8c6d714905e 100644 --- a/content/media/omx/MediaOmxReader.h +++ b/content/media/omx/MediaOmxReader.h @@ -48,7 +48,6 @@ public: ~MediaOmxReader(); virtual nsresult Init(MediaDecoderReader* aCloneDonor); - virtual nsresult ResetDecode(); virtual void NotifyDataArrived(const char* aBuffer, uint32_t aLength, int64_t aOffset); From dc5c0cca88e9d33f61fc66ee6bd1a9a1582b30b2 Mon Sep 17 00:00:00 2001 From: Randy Lin Date: Sun, 1 Dec 2013 13:23:00 +0800 Subject: [PATCH 18/19] Bug 944130 - test_speakermanager.html: ASSERTION: background state is only maintained on outer windows. r=amarchesini --- dom/speakermanager/SpeakerManager.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dom/speakermanager/SpeakerManager.cpp b/dom/speakermanager/SpeakerManager.cpp index ecfc92e24ce7..d9ba574a0e8d 100644 --- a/dom/speakermanager/SpeakerManager.cpp +++ b/dom/speakermanager/SpeakerManager.cpp @@ -110,10 +110,12 @@ SpeakerManager::DispatchSimpleEvent(const nsAString& aStr) void SpeakerManager::Init(nsPIDOMWindow* aWindow) { - BindToOwner(aWindow->IsOuterWindow() ? - aWindow->GetCurrentInnerWindow() : aWindow); + BindToOwner(aWindow); + + nsCOMPtr docshell = do_GetInterface(GetOwner()); + NS_ENSURE_TRUE_VOID(docshell); + docshell->GetIsActive(&mVisible); - mVisible = !GetOwner()->IsBackground(); nsCOMPtr target = do_QueryInterface(GetOwner()); NS_ENSURE_TRUE_VOID(target); From 71bb1d9347f880ce69355a0635b0bca20cea51f3 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Mon, 2 Dec 2013 20:15:24 -0800 Subject: [PATCH 19/19] Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/001672effec8 Author: Yuren Ju Desc: Merge pull request #14175 from yurenju/minilla-sim4 Bug 897325: Part 3 - preload apps for certain carriers r=@ochameau f=@acperez ======== https://hg.mozilla.org/integration/gaia-central/rev/3ba85adebdde Author: Yuren Ju Desc: Bug 897325: Part 3 - preload apps for certain carriers --- 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 4e57e9f8fe75..20f5307562fb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "554341fd20a9c8053bfdcb07774d57817bd57751", + "revision": "001672effec8835928519312c1075a842af9166c", "repo_path": "/integration/gaia-central" }