John Lin
32f337db55
Bug 1326238 - stop calling InputExhausted() once RemoteDataDecoder sends EOS input. r=snorp
...
MozReview-Commit-ID: L5KPHUi8uLx
--HG--
extra : rebase_source : a920c76ed031897c91e50d18100709a6d70f45b5
2016-12-30 13:52:49 +08:00
maliu
5e8973835a
Bug 1321633 - Apply gradient based on text direction with first strong strategy, r=ahunt
...
MozReview-Commit-ID: 5GMlUcp290f
--HG--
extra : rebase_source : 46910026bafed11c9dafffda90ea65e5ba3a8991
2016-12-29 17:24:32 +08:00
Brian Chen
348fb50602
Bug 1325488 - Deduplicate subdomain removal in IconGenerator. r=ahunt
2016-12-23 17:35:00 -05:00
Phil Ringnalda
082d6bd9df
Merge m-i to m-c, a=merge
...
MozReview-Commit-ID: 1NtOkt6oQ7d
2017-01-14 09:38:58 -08:00
Wes Kocher
f8a62a9ce6
Merge m-c to inbound, a=merge
...
MozReview-Commit-ID: ASajzspkOe1
2017-01-13 15:48:34 -08:00
Andrzej Hunt
ab7d8d0615
Bug 1325929 - Reimport certain AS VectorDrawable's using different converter r=sebastian
...
System SVG rendering on Android 6.0 seems to be broken for certain VectorDrawable's:
these three icons were being distorted, only on Android 6. Using a different SVG
converter (an online converter, as opposed to the Android Studio converter),
results in the icons being rendered correctly.
MozReview-Commit-ID: 2INnb0clb54
--HG--
extra : rebase_source : 5b3fd9ca7354855c6ee70594b960f0098c98d974
2017-01-13 10:18:22 -08:00
Andrew Swan
630f1e4a05
Bug 1329450 Fix amIWebInstallInfo fallout on fennec r=JanH
...
MozReview-Commit-ID: FJsJiYs5Ole
--HG--
extra : rebase_source : a09691c32eaf7d7436efc718ac60374301dcaae0
2017-01-13 08:06:22 -08:00
Jan Henning
67f2776365
Bug 1301160 - Part 4 - Test that the parent tab ID is properly restored when reopening a recently closed tab. r=sebastian
...
MozReview-Commit-ID: 6X4KYhJxagj
--HG--
extra : rebase_source : 339230345adc5a9a8d03683dfa236ade514606df
2017-01-07 22:26:46 +01:00
Jan Henning
7e58d7d4e5
Bug 1301160 - Part 3 - Pass the saved parent tab ID when restoring tabs. r=sebastian
...
When restoring recently closed tabs during a browsing session, we can just pass the stored parentId as a parameter to addTab and be done with it.
During startup however, we first need to update the parent tab IDs before being able to use it.
At the moment, new tabs are always opened at the end of the tab list and cannot be resorted by the user, so child tabs always appear *after* their parent tabs in the tab list. However because we don't want to rely on this behaviour, we still need to collect a complete mapping between old and new tab IDs first before being able to update the stored parent tab IDs.
Therefore we cannot use the usual method of passing in the parentId during tab creation and have to set it after the fact for this case.
MozReview-Commit-ID: JT5YSkuOSZw
--HG--
extra : rebase_source : 5487f05ed5fd99e12e4f33170688243b36da55e4
2017-01-07 22:26:36 +01:00
Jan Henning
b3df9b3c93
Bug 1301160 - Part 2 - Update stored parent tab IDs during startup. r=sebastian
...
As long as the browser remains alive, tab IDs are stable and not reused, however if Firefox is killed and subsequently restarted, the ID sequence is reset and therefore all tabs opened through session restore will most probably be assigned a new tab ID.
Because of this, the stored parent tab IDs will be out of date and have to be refreshed as well so they continue pointing to the correct tab. To achieve this, we therefore create a mapping between old and new tab IDs as they are assigned and then use that to update the stored parent tab IDs, too.
MozReview-Commit-ID: 2GP2H6cUGrx
--HG--
extra : rebase_source : 74adb38f457b9f3cc874bb149b01c9043908d019
2017-01-06 19:05:08 +01:00
Jan Henning
62eb2dc0df
Bug 1301160 - Part 1 - Include tab IDs in the session store data. r=sebastian
...
Having the previous tab ID in the session store data is required in order to be able to create a mapping between old and new IDs on starting up.
Likewise, the parent ID now needs to be tracked on the Gecko side as well, so it can be saved by the session store and later used when restoring a tab/session.
MozReview-Commit-ID: 3zwoZ9YpZlC
--HG--
extra : rebase_source : 25254f6dbbfbf8291fd1d6dcd194540b15da0cef
2017-01-04 15:34:11 +01:00
Jim Chen
f48add8fb6
Bug 1330515 - Try to recover from IME errors; r=esawin
...
Instead of throwing IME exceptions, try to recover from IME errors by
flushing the entire text unless we already tried that before. This
prevents annoying crashes, and deals with known IME bugs that are too
risky to uplift to older releases.
2017-01-13 14:39:27 -05:00
Jim Chen
3b07a04a6b
Bug 1330458 - Queue undipatched events before Gecko is ready; r=snorp
...
To deal with the Java side trying to send events to Gecko before Gecko
is ready, make a special exception to queue any undispatched events when
Gecko is not ready, so that the events can be redispatched to Gecko
later.
2017-01-13 14:39:27 -05:00
Wes Kocher
fc600035ac
Merge m-c to inbound, a=merge
...
MozReview-Commit-ID: CnzP0d2mrPx
2017-01-12 16:05:53 -08:00
Myk Melez
afb5cd9a82
Bug 1309049 - move embedding/ files out of that directory, r=jst,mossop
...
--HG--
rename : embedding/browser/nsCTooltipTextProvider.h => docshell/base/nsCTooltipTextProvider.h
rename : embedding/browser/nsContextMenuInfo.cpp => docshell/base/nsContextMenuInfo.cpp
rename : embedding/browser/nsContextMenuInfo.h => docshell/base/nsContextMenuInfo.h
rename : embedding/browser/nsDocShellTreeOwner.cpp => docshell/base/nsDocShellTreeOwner.cpp
rename : embedding/browser/nsDocShellTreeOwner.h => docshell/base/nsDocShellTreeOwner.h
rename : embedding/browser/nsIContextMenuListener.idl => docshell/base/nsIContextMenuListener.idl
rename : embedding/browser/nsIContextMenuListener2.idl => docshell/base/nsIContextMenuListener2.idl
rename : embedding/browser/nsITooltipListener.idl => docshell/base/nsITooltipListener.idl
rename : embedding/browser/nsITooltipTextProvider.idl => docshell/base/nsITooltipTextProvider.idl
rename : embedding/components/commandhandler/moz.build => dom/commandhandler/moz.build
rename : embedding/components/commandhandler/nsBaseCommandController.cpp => dom/commandhandler/nsBaseCommandController.cpp
rename : embedding/components/commandhandler/nsBaseCommandController.h => dom/commandhandler/nsBaseCommandController.h
rename : embedding/components/commandhandler/nsCommandGroup.cpp => dom/commandhandler/nsCommandGroup.cpp
rename : embedding/components/commandhandler/nsCommandGroup.h => dom/commandhandler/nsCommandGroup.h
rename : embedding/components/commandhandler/nsCommandManager.cpp => dom/commandhandler/nsCommandManager.cpp
rename : embedding/components/commandhandler/nsCommandManager.h => dom/commandhandler/nsCommandManager.h
rename : embedding/components/commandhandler/nsCommandParams.cpp => dom/commandhandler/nsCommandParams.cpp
rename : embedding/components/commandhandler/nsCommandParams.h => dom/commandhandler/nsCommandParams.h
rename : embedding/components/commandhandler/nsControllerCommandTable.cpp => dom/commandhandler/nsControllerCommandTable.cpp
rename : embedding/components/commandhandler/nsControllerCommandTable.h => dom/commandhandler/nsControllerCommandTable.h
rename : embedding/components/commandhandler/nsICommandManager.idl => dom/commandhandler/nsICommandManager.idl
rename : embedding/components/commandhandler/nsICommandParams.idl => dom/commandhandler/nsICommandParams.idl
rename : embedding/components/commandhandler/nsIControllerCommand.idl => dom/commandhandler/nsIControllerCommand.idl
rename : embedding/components/commandhandler/nsIControllerCommandTable.idl => dom/commandhandler/nsIControllerCommandTable.idl
rename : embedding/components/commandhandler/nsIControllerContext.idl => dom/commandhandler/nsIControllerContext.idl
rename : embedding/components/commandhandler/nsPICommandUpdater.idl => dom/commandhandler/nsPICommandUpdater.idl
rename : embedding/components/webbrowserpersist/PWebBrowserPersistDocument.ipdl => dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl
rename : embedding/components/webbrowserpersist/PWebBrowserPersistResources.ipdl => dom/webbrowserpersist/PWebBrowserPersistResources.ipdl
rename : embedding/components/webbrowserpersist/PWebBrowserPersistSerialize.ipdl => dom/webbrowserpersist/PWebBrowserPersistSerialize.ipdl
rename : embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.cpp => dom/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.h => dom/webbrowserpersist/WebBrowserPersistDocumentChild.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.cpp => dom/webbrowserpersist/WebBrowserPersistDocumentParent.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.h => dom/webbrowserpersist/WebBrowserPersistDocumentParent.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.cpp => dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.h => dom/webbrowserpersist/WebBrowserPersistLocalDocument.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp => dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.h => dom/webbrowserpersist/WebBrowserPersistRemoteDocument.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.cpp => dom/webbrowserpersist/WebBrowserPersistResourcesChild.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.h => dom/webbrowserpersist/WebBrowserPersistResourcesChild.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.cpp => dom/webbrowserpersist/WebBrowserPersistResourcesParent.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.h => dom/webbrowserpersist/WebBrowserPersistResourcesParent.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.cpp => dom/webbrowserpersist/WebBrowserPersistSerializeChild.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.h => dom/webbrowserpersist/WebBrowserPersistSerializeChild.h
rename : embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.cpp => dom/webbrowserpersist/WebBrowserPersistSerializeParent.cpp
rename : embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.h => dom/webbrowserpersist/WebBrowserPersistSerializeParent.h
rename : embedding/components/webbrowserpersist/moz.build => dom/webbrowserpersist/moz.build
rename : embedding/components/webbrowserpersist/nsCWebBrowserPersist.idl => dom/webbrowserpersist/nsCWebBrowserPersist.idl
rename : embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl => dom/webbrowserpersist/nsIWebBrowserPersist.idl
rename : embedding/components/webbrowserpersist/nsIWebBrowserPersistDocument.idl => dom/webbrowserpersist/nsIWebBrowserPersistDocument.idl
rename : embedding/components/webbrowserpersist/nsIWebBrowserPersistable.idl => dom/webbrowserpersist/nsIWebBrowserPersistable.idl
rename : embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp => dom/webbrowserpersist/nsWebBrowserPersist.cpp
rename : embedding/components/webbrowserpersist/nsWebBrowserPersist.h => dom/webbrowserpersist/nsWebBrowserPersist.h
rename : embedding/browser/build/moz.build => toolkit/components/browser/build/moz.build
rename : embedding/browser/build/nsWebBrowserModule.cpp => toolkit/components/browser/build/nsWebBrowserModule.cpp
rename : embedding/browser/nsCWebBrowser.idl => toolkit/components/browser/nsCWebBrowser.idl
rename : embedding/browser/nsCommandHandler.cpp => toolkit/components/browser/nsCommandHandler.cpp
rename : embedding/browser/nsCommandHandler.h => toolkit/components/browser/nsCommandHandler.h
rename : embedding/nsEmbedCID.h => toolkit/components/browser/nsEmbedCID.h
rename : embedding/browser/nsEmbedStream.cpp => toolkit/components/browser/nsEmbedStream.cpp
rename : embedding/browser/nsEmbedStream.h => toolkit/components/browser/nsEmbedStream.h
rename : embedding/browser/nsICommandHandler.idl => toolkit/components/browser/nsICommandHandler.idl
rename : embedding/browser/nsIEmbeddingSiteWindow.idl => toolkit/components/browser/nsIEmbeddingSiteWindow.idl
rename : embedding/browser/nsIPrintPreviewNavigation.idl => toolkit/components/browser/nsIPrintPreviewNavigation.idl
rename : embedding/browser/nsIWebBrowser.idl => toolkit/components/browser/nsIWebBrowser.idl
rename : embedding/browser/nsIWebBrowserChrome.idl => toolkit/components/browser/nsIWebBrowserChrome.idl
rename : embedding/browser/nsIWebBrowserChrome2.idl => toolkit/components/browser/nsIWebBrowserChrome2.idl
rename : embedding/browser/nsIWebBrowserChrome3.idl => toolkit/components/browser/nsIWebBrowserChrome3.idl
rename : embedding/browser/nsIWebBrowserChromeFocus.idl => toolkit/components/browser/nsIWebBrowserChromeFocus.idl
rename : embedding/browser/nsIWebBrowserFocus.idl => toolkit/components/browser/nsIWebBrowserFocus.idl
rename : embedding/browser/nsIWebBrowserPrint.idl => toolkit/components/browser/nsIWebBrowserPrint.idl
rename : embedding/browser/nsIWebBrowserSetup.idl => toolkit/components/browser/nsIWebBrowserSetup.idl
rename : embedding/browser/nsIWebBrowserStream.idl => toolkit/components/browser/nsIWebBrowserStream.idl
rename : embedding/browser/nsWebBrowser.cpp => toolkit/components/browser/nsWebBrowser.cpp
rename : embedding/browser/nsWebBrowser.h => toolkit/components/browser/nsWebBrowser.h
rename : embedding/browser/nsWebBrowserContentPolicy.cpp => toolkit/components/browser/nsWebBrowserContentPolicy.cpp
rename : embedding/browser/nsWebBrowserContentPolicy.h => toolkit/components/browser/nsWebBrowserContentPolicy.h
rename : embedding/components/find/nsFind.cpp => toolkit/components/find/nsFind.cpp
rename : embedding/components/find/nsFind.h => toolkit/components/find/nsFind.h
rename : embedding/components/find/nsIFind.idl => toolkit/components/find/nsIFind.idl
rename : embedding/components/find/nsIWebBrowserFind.idl => toolkit/components/find/nsIWebBrowserFind.idl
rename : embedding/components/find/nsWebBrowserFind.cpp => toolkit/components/find/nsWebBrowserFind.cpp
rename : embedding/components/find/nsWebBrowserFind.h => toolkit/components/find/nsWebBrowserFind.h
rename : embedding/components/printingui/ipc/PPrintProgressDialog.ipdl => toolkit/components/printingui/ipc/PPrintProgressDialog.ipdl
rename : embedding/components/printingui/ipc/PPrintSettingsDialog.ipdl => toolkit/components/printingui/ipc/PPrintSettingsDialog.ipdl
rename : embedding/components/printingui/ipc/PPrinting.ipdl => toolkit/components/printingui/ipc/PPrinting.ipdl
rename : embedding/components/printingui/ipc/PPrintingTypes.ipdlh => toolkit/components/printingui/ipc/PPrintingTypes.ipdlh
rename : embedding/components/printingui/ipc/PrintDataUtils.cpp => toolkit/components/printingui/ipc/PrintDataUtils.cpp
rename : embedding/components/printingui/ipc/PrintDataUtils.h => toolkit/components/printingui/ipc/PrintDataUtils.h
rename : embedding/components/printingui/ipc/PrintProgressDialogChild.cpp => toolkit/components/printingui/ipc/PrintProgressDialogChild.cpp
rename : embedding/components/printingui/ipc/PrintProgressDialogChild.h => toolkit/components/printingui/ipc/PrintProgressDialogChild.h
rename : embedding/components/printingui/ipc/PrintProgressDialogParent.cpp => toolkit/components/printingui/ipc/PrintProgressDialogParent.cpp
rename : embedding/components/printingui/ipc/PrintProgressDialogParent.h => toolkit/components/printingui/ipc/PrintProgressDialogParent.h
rename : embedding/components/printingui/ipc/PrintSettingsDialogChild.cpp => toolkit/components/printingui/ipc/PrintSettingsDialogChild.cpp
rename : embedding/components/printingui/ipc/PrintSettingsDialogChild.h => toolkit/components/printingui/ipc/PrintSettingsDialogChild.h
rename : embedding/components/printingui/ipc/PrintSettingsDialogParent.cpp => toolkit/components/printingui/ipc/PrintSettingsDialogParent.cpp
rename : embedding/components/printingui/ipc/PrintSettingsDialogParent.h => toolkit/components/printingui/ipc/PrintSettingsDialogParent.h
rename : embedding/components/printingui/ipc/PrintingParent.cpp => toolkit/components/printingui/ipc/PrintingParent.cpp
rename : embedding/components/printingui/ipc/PrintingParent.h => toolkit/components/printingui/ipc/PrintingParent.h
rename : embedding/components/printingui/ipc/moz.build => toolkit/components/printingui/ipc/moz.build
rename : embedding/components/printingui/ipc/nsPrintingProxy.cpp => toolkit/components/printingui/ipc/nsPrintingProxy.cpp
rename : embedding/components/printingui/ipc/nsPrintingProxy.h => toolkit/components/printingui/ipc/nsPrintingProxy.h
rename : embedding/components/printingui/mac/moz.build => toolkit/components/printingui/mac/moz.build
rename : embedding/components/printingui/mac/nsPrintProgress.cpp => toolkit/components/printingui/mac/nsPrintProgress.cpp
rename : embedding/components/printingui/mac/nsPrintProgress.h => toolkit/components/printingui/mac/nsPrintProgress.h
rename : embedding/components/printingui/win/nsPrintProgressParams.cpp => toolkit/components/printingui/mac/nsPrintProgressParams.cpp
rename : embedding/components/printingui/mac/nsPrintProgressParams.h => toolkit/components/printingui/mac/nsPrintProgressParams.h
rename : embedding/components/printingui/mac/nsPrintingPromptService.h => toolkit/components/printingui/mac/nsPrintingPromptService.h
rename : embedding/components/printingui/mac/nsPrintingPromptServiceX.mm => toolkit/components/printingui/mac/nsPrintingPromptServiceX.mm
rename : embedding/components/printingui/moz.build => toolkit/components/printingui/moz.build
rename : embedding/components/printingui/unixshared/moz.build => toolkit/components/printingui/unixshared/moz.build
rename : embedding/components/printingui/unixshared/nsPrintProgress.cpp => toolkit/components/printingui/unixshared/nsPrintProgress.cpp
rename : embedding/components/printingui/unixshared/nsPrintProgress.h => toolkit/components/printingui/unixshared/nsPrintProgress.h
rename : embedding/components/printingui/unixshared/nsPrintProgressParams.cpp => toolkit/components/printingui/unixshared/nsPrintProgressParams.cpp
rename : embedding/components/printingui/unixshared/nsPrintProgressParams.h => toolkit/components/printingui/unixshared/nsPrintProgressParams.h
rename : embedding/components/printingui/unixshared/nsPrintingPromptService.cpp => toolkit/components/printingui/unixshared/nsPrintingPromptService.cpp
rename : embedding/components/printingui/unixshared/nsPrintingPromptService.h => toolkit/components/printingui/unixshared/nsPrintingPromptService.h
rename : embedding/components/printingui/win/moz.build => toolkit/components/printingui/win/moz.build
rename : embedding/components/printingui/win/nsPrintDialogUtil.cpp => toolkit/components/printingui/win/nsPrintDialogUtil.cpp
rename : embedding/components/printingui/win/nsPrintDialogUtil.h => toolkit/components/printingui/win/nsPrintDialogUtil.h
rename : embedding/components/printingui/win/nsPrintProgress.cpp => toolkit/components/printingui/win/nsPrintProgress.cpp
rename : embedding/components/printingui/win/nsPrintProgress.h => toolkit/components/printingui/win/nsPrintProgress.h
rename : embedding/components/printingui/mac/nsPrintProgressParams.cpp => toolkit/components/printingui/win/nsPrintProgressParams.cpp
rename : embedding/components/printingui/win/nsPrintProgressParams.h => toolkit/components/printingui/win/nsPrintProgressParams.h
rename : embedding/components/printingui/win/nsPrintingPromptService.cpp => toolkit/components/printingui/win/nsPrintingPromptService.cpp
rename : embedding/components/printingui/win/nsPrintingPromptService.h => toolkit/components/printingui/win/nsPrintingPromptService.h
rename : embedding/nsIWindowCreator.idl => toolkit/components/windowcreator/nsIWindowCreator.idl
rename : embedding/nsIWindowCreator2.idl => toolkit/components/windowcreator/nsIWindowCreator2.idl
rename : embedding/nsIWindowProvider.idl => toolkit/components/windowcreator/nsIWindowProvider.idl
rename : embedding/test/320x240.ogv => toolkit/components/windowcreator/test/320x240.ogv
rename : embedding/test/browser.ini => toolkit/components/windowcreator/test/browser.ini
rename : embedding/test/browser_bug1204626.js => toolkit/components/windowcreator/test/browser_bug1204626.js
rename : embedding/test/bug1170334_iframe.xml => toolkit/components/windowcreator/test/bug1170334_iframe.xml
rename : embedding/test/bug1170334_style.css => toolkit/components/windowcreator/test/bug1170334_style.css
rename : embedding/test/bug1204626_doc0.html => toolkit/components/windowcreator/test/bug1204626_doc0.html
rename : embedding/test/bug1204626_doc1.html => toolkit/components/windowcreator/test/bug1204626_doc1.html
rename : embedding/test/bug293834_form.html => toolkit/components/windowcreator/test/bug293834_form.html
rename : embedding/test/bug449141_page.html => toolkit/components/windowcreator/test/bug449141_page.html
rename : embedding/test/chrome.ini => toolkit/components/windowcreator/test/chrome.ini
rename : embedding/test/mochitest.ini => toolkit/components/windowcreator/test/mochitest.ini
rename : embedding/test/moz.build => toolkit/components/windowcreator/test/moz.build
rename : embedding/test/test_bug1170334_wbp_xmlstyle.html => toolkit/components/windowcreator/test/test_bug1170334_wbp_xmlstyle.html
rename : embedding/test/test_bug1192654.html => toolkit/components/windowcreator/test/test_bug1192654.html
rename : embedding/test/test_bug293834.html => toolkit/components/windowcreator/test/test_bug293834.html
rename : embedding/test/test_bug449141.html => toolkit/components/windowcreator/test/test_bug449141.html
rename : embedding/test/test_bug499115.html => toolkit/components/windowcreator/test/test_bug499115.html
rename : embedding/test/test_nsFind.html => toolkit/components/windowcreator/test/test_nsFind.html
rename : embedding/test/test_private_window_from_content.html => toolkit/components/windowcreator/test/test_private_window_from_content.html
rename : embedding/test/test_window_open_position_constraint.html => toolkit/components/windowcreator/test/test_window_open_position_constraint.html
rename : embedding/test/test_window_open_units.html => toolkit/components/windowcreator/test/test_window_open_units.html
rename : embedding/tests/unit/test_wwauthpromptfactory.js => toolkit/components/windowcreator/tests/unit/test_wwauthpromptfactory.js
rename : embedding/tests/unit/test_wwpromptfactory.js => toolkit/components/windowcreator/tests/unit/test_wwpromptfactory.js
rename : embedding/tests/unit/xpcshell.ini => toolkit/components/windowcreator/tests/unit/xpcshell.ini
rename : embedding/components/windowwatcher/moz.build => toolkit/components/windowwatcher/moz.build
rename : embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp => toolkit/components/windowwatcher/nsAutoWindowStateHelper.cpp
rename : embedding/components/windowwatcher/nsAutoWindowStateHelper.h => toolkit/components/windowwatcher/nsAutoWindowStateHelper.h
rename : embedding/components/windowwatcher/nsDialogParamBlock.cpp => toolkit/components/windowwatcher/nsDialogParamBlock.cpp
rename : embedding/components/windowwatcher/nsDialogParamBlock.h => toolkit/components/windowwatcher/nsDialogParamBlock.h
rename : embedding/components/windowwatcher/nsIDialogParamBlock.idl => toolkit/components/windowwatcher/nsIDialogParamBlock.idl
rename : embedding/components/windowwatcher/nsIPromptFactory.idl => toolkit/components/windowwatcher/nsIPromptFactory.idl
rename : embedding/components/windowwatcher/nsIPromptService.idl => toolkit/components/windowwatcher/nsIPromptService.idl
rename : embedding/components/windowwatcher/nsIPromptService2.idl => toolkit/components/windowwatcher/nsIPromptService2.idl
rename : embedding/components/windowwatcher/nsIWindowWatcher.idl => toolkit/components/windowwatcher/nsIWindowWatcher.idl
rename : embedding/components/windowwatcher/nsPIPromptService.idl => toolkit/components/windowwatcher/nsPIPromptService.idl
rename : embedding/components/windowwatcher/nsPIWindowWatcher.idl => toolkit/components/windowwatcher/nsPIWindowWatcher.idl
rename : embedding/components/windowwatcher/nsPromptUtils.h => toolkit/components/windowwatcher/nsPromptUtils.h
rename : embedding/components/windowwatcher/nsWindowWatcher.cpp => toolkit/components/windowwatcher/nsWindowWatcher.cpp
rename : embedding/components/windowwatcher/nsWindowWatcher.h => toolkit/components/windowwatcher/nsWindowWatcher.h
rename : embedding/components/windowwatcher/test/browser.ini => toolkit/components/windowwatcher/test/browser.ini
rename : embedding/components/windowwatcher/test/browser_new_content_window_chromeflags.js => toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
rename : embedding/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js => toolkit/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js
rename : embedding/components/windowwatcher/test/browser_new_remote_window_flags.js => toolkit/components/windowwatcher/test/browser_new_remote_window_flags.js
rename : embedding/components/windowwatcher/test/browser_new_sized_window.js => toolkit/components/windowwatcher/test/browser_new_sized_window.js
rename : embedding/components/windowwatcher/test/chrome.ini => toolkit/components/windowwatcher/test/chrome.ini
rename : embedding/components/windowwatcher/test/file_storage_copied.html => toolkit/components/windowwatcher/test/file_storage_copied.html
rename : embedding/components/windowwatcher/test/file_test_dialog.html => toolkit/components/windowwatcher/test/file_test_dialog.html
rename : embedding/components/windowwatcher/test/mochitest.ini => toolkit/components/windowwatcher/test/mochitest.ini
rename : embedding/components/windowwatcher/test/moz.build => toolkit/components/windowwatcher/test/moz.build
rename : embedding/components/windowwatcher/test/test_blank_named_window.html => toolkit/components/windowwatcher/test/test_blank_named_window.html
rename : embedding/components/windowwatcher/test/test_dialog_arguments.html => toolkit/components/windowwatcher/test/test_dialog_arguments.html
rename : embedding/components/windowwatcher/test/test_modal_windows.html => toolkit/components/windowwatcher/test/test_modal_windows.html
rename : embedding/components/windowwatcher/test/test_named_window.html => toolkit/components/windowwatcher/test/test_named_window.html
rename : embedding/components/windowwatcher/test/test_storage_copied.html => toolkit/components/windowwatcher/test/test_storage_copied.html
rename : embedding/components/appstartup/nsAppStartupNotifier.cpp => toolkit/xre/nsAppStartupNotifier.cpp
rename : embedding/components/appstartup/nsAppStartupNotifier.h => toolkit/xre/nsAppStartupNotifier.h
rename : embedding/components/build/nsEmbeddingModule.cpp => toolkit/xre/nsEmbeddingModule.cpp
rename : embedding/components/appstartup/nsIAppStartupNotifier.h => toolkit/xre/nsIAppStartupNotifier.h
2017-01-12 13:47:27 -08:00
Carsten "Tomcat" Book
58469cc1a0
Merge mozilla-central to autoland
2017-01-13 10:24:01 +01:00
John Lin
18c9f6badd
bug 1324530 - part 5: do not recycle EOS input sample. r=snorp
...
MozReview-Commit-ID: IbQLII0XTTf
--HG--
extra : rebase_source : d42ae2b35182b94b2cec9e9e9502aa5957f5a492
2017-01-06 20:04:43 +08:00
John Lin
844c44d275
Bug 1324530 - part 4: improve remote manager init wait time. r=snorp
...
Fix the issue that RemoteManager.init() will be block for 5s when onServiceConnected() is
finished before latch creation.
MozReview-Commit-ID: CYYpLpY7Ns9
--HG--
extra : rebase_source : a1e3612916a4b08790b4798d309e87c7e9121a37
2016-12-23 16:28:48 +08:00
John Lin
9db2d08a30
Bug 1324530 - part 3: make codec methods that change state(start, stop, flush, release) synchronous. r=snorp
...
MozReview-Commit-ID: EVjtpzX9dbD
--HG--
extra : rebase_source : 9e1b2bd9de5e7806ad9b71a521d168faef2c0200
2016-12-23 16:25:43 +08:00
John Lin
b962f1371d
Bug 1324530 - part 2: rewrite the logic of discarding invalid buffers for flush. r=esawin
...
MozReview-Commit-ID: EwTRMaJOJhK
--HG--
extra : rebase_source : b20b22cc1e0ca7d3d739e02b4b8ba6e242fe8abb
2016-12-28 15:56:42 +08:00
John Lin
c3d851b322
Bug 1324530 - part 1: add method to AsyncCodec for resuming receiving input buffers after flush(). r=esawin
...
2 birds with 1 stone:
- according to MediaCodec doc, when running in async mode start() must be called after flush() to 'resume receiving input buffers'.
- in JellyBeanAsyncCodec's case, explicit resuming polling input buffers helps Codec decide which buffers are invalid by flush().
MozReview-Commit-ID: Ee5QbppgsVf
--HG--
extra : rebase_source : 52ea8eab4732f3c1e609fcc71673716991e9191d
2016-12-28 15:41:55 +08:00
Wes Kocher
ca99354e00
Backed out changeset 5566e83980ed (bug 1313155) for mass build bustage a=backout CLOSED TREE
...
MozReview-Commit-ID: Co3f2Vkbf4y
2017-01-12 14:16:52 -08:00
Michelangelo De Simone
0b3a927918
Bug 1313155 - Remove dom/settings and related code. r=Ehsan
...
MozReview-Commit-ID: Gi7frPFQ6yW
--HG--
extra : rebase_source : 401a8a202b1d8ebfd719d460bff96c9280062ded
2016-12-29 11:26:49 -08:00
Carsten "Tomcat" Book
088f1dc213
Merge mozilla-central to autoland
2017-01-12 10:39:04 +01:00
Carsten "Tomcat" Book
3ad97e202a
merge mozilla-inbound to mozilla-central a=merge
2017-01-12 10:14:43 +01:00
Shih-Chiang Chien
9996cceaa6
Bug 1329902 - Part 3, don't notify Gecko if removed route is not a presentation display. r=KuoE0
...
MozReview-Commit-ID: 21kjmNYaW1b
--HG--
extra : rebase_source : 6648f7aa31ee0f72f1f610d73d8d60cff2731f67
2017-01-11 15:51:31 +08:00
Shih-Chiang Chien
97b4a06e2b
Bug 1329902 - Part 2, handle onRouteChanged without onRouteAdded. r=KuoE0
...
MozReview-Commit-ID: KF0UYqYzDRe
--HG--
extra : rebase_source : 7fb67d84743e88dd8079909b9394d0fa1d3a3904
2017-01-10 15:13:35 +08:00
Florian Quèze
a03918c148
Bug 1330147 - automatic removal of the third boolean parameter in removeObserver calls, r=jaws.
2017-01-11 22:27:42 +01:00
Wes Kocher
cee20adcc3
Backed out changeset 090e52000b34 (bug 1303362) for android failures in test_openWindow.html a=backout
...
MozReview-Commit-ID: 5Nw8QEy4Z7H
2017-01-11 12:53:11 -08:00
Sebastian Kaspari
a687740727
Bug 1328937 - Disable testActivityStreamContextMenu. r=me
...
There's some refactoring needed to make the test work with the new code base.
This will be worked on in bug 1330280.
MozReview-Commit-ID: 7OtZbrZK1A9
--HG--
extra : rebase_source : 8c87d91df04ef0e74fdfbf17951889cd10f498fa
2017-01-11 12:10:34 +01:00
Sebastian Kaspari
7af955600d
Bug 1328937 - Introduce shared interface for activity stream models. r=Grisha
...
MozReview-Commit-ID: EkfmQfCQNMM
--HG--
extra : rebase_source : 76c9a7fd5689edc1d7b60be6f5afe6f0a54f0f15
2017-01-09 14:39:34 +01:00
Sebastian Kaspari
db2ca3513d
Bug 1328937 - Extract TopSite model from stream adapter. r=Grisha
...
MozReview-Commit-ID: IfSgvPooI9F
--HG--
extra : rebase_source : a9af37843e599a68dc3116aee58f5c182768d64a
2017-01-09 13:53:10 +01:00
Sebastian Kaspari
03599a1afe
Bug 1328937 - HighlightItem: Move data into separate Highlight / Metadata model classes. r=Grisha
...
MozReview-Commit-ID: LfeoFZB9MiL
--HG--
extra : rebase_source : 7757dfb53ca9414b08cb1312c062ec80ac9cf42a
2017-01-05 20:02:54 +01:00
Sebastian Kaspari
e4769785b3
Bug 1328937 - HighlightItem: Make all properties 'private'. r=Grisha
...
MozReview-Commit-ID: 9Ots1ZF8oZ8
--HG--
extra : rebase_source : afded220ad755e974a656f55a83432dd4aec71f9
2017-01-05 19:33:49 +01:00
Sebastian Kaspari
e5b3db0942
Bug 1328937 - StreamItem: Move inner classes to separate files. r=Grisha
...
MozReview-Commit-ID: K6q39diAjms
--HG--
extra : rebase_source : 5978d1acd87ef9c538c35ad04b2b7149dd439c2f
2017-01-05 19:29:38 +01:00
Mats Palmgren
fde90825e1
Bug 1328030 - Add basic tests that select content including form controls, using various mouse/kbd gestures.
2017-01-11 16:57:27 +01:00
Carsten "Tomcat" Book
ccfe5b9092
Merge mozilla-central to mozilla-inbound
2017-01-11 16:37:37 +01:00
Carsten "Tomcat" Book
a712d69adb
merge mozilla-inbound to mozilla-central a=merge
2017-01-11 16:23:39 +01:00
Carsten "Tomcat" Book
f2693baa0a
Backed out changeset 5d1623b6bcca (bug 1328937) for continued bustage on android
2017-01-11 12:47:08 +01:00
Carsten "Tomcat" Book
ccd2feb7ba
Backed out changeset e1dbcf0b7019 (bug 1328937)
2017-01-11 12:46:32 +01:00
Carsten "Tomcat" Book
8f9863970b
Backed out changeset 927275a3ea2c (bug 1328937)
2017-01-11 12:46:30 +01:00
Carsten "Tomcat" Book
1851a07b40
Backed out changeset 1d0bc7e990fe (bug 1328937)
2017-01-11 12:46:28 +01:00
Carsten "Tomcat" Book
c1a0c67e9e
Backed out changeset 8e5f0fda8a89 (bug 1328937)
2017-01-11 12:46:25 +01:00
Carsten "Tomcat" Book
04547310e6
Backed out changeset 21f392a1ac51 (bug 1328937)
2017-01-11 12:46:23 +01:00
Sebastian Kaspari
746b8c030b
Bug 1328937 - Disable testActivityStreamContextMenu. a=bustagefix
...
There's some refactoring needed to make the test work with the new code base.
This will be worked on in bug 1330280.
MozReview-Commit-ID: 7OtZbrZK1A9
2017-01-11 12:10:34 +01:00
Dylan Roeh
9e7a48109b
Bug 1329664 - Finish a CustomTabsActivity if the corresponding tab has been closed. r=snorp
2017-01-09 09:40:08 -06:00
Dylan Roeh
81ec7a757b
Bug 1303362 - Set a flag on custom tabs so that links do not open in a new tab. r=snorp
2017-01-05 16:43:30 -06:00
Dylan Roeh
e1654d20ef
Bug 1325174 - Make the toolbar back button in a custom tab close the tab and finish the activity, rather than navigating. r=snorp
2016-12-22 09:43:08 -06:00
Tom Ritter
c123b23b46
Bug 1314784 - Add an 'Is Orbot Installed' telemetry probe. r=bsmedberg,sebastian
...
MozReview-Commit-ID: IlTLcVtycj8
--HG--
extra : rebase_source : 4ca3b38b231896073fcba32d31ae35ce849aa54e
2017-01-10 14:13:15 -06:00
Sebastian Kaspari
02f5484445
Bug 1328937 - Introduce shared interface for activity stream models. r=Grisha
...
MozReview-Commit-ID: EkfmQfCQNMM
--HG--
extra : rebase_source : b135eb52467c8d8672867718a873d6d1a91549ef
2017-01-09 14:39:34 +01:00
Sebastian Kaspari
3f3b45478b
Bug 1328937 - Extract TopSite model from stream adapter. r=Grisha
...
MozReview-Commit-ID: IfSgvPooI9F
--HG--
extra : rebase_source : 89d357ee7560f086b5bc88eec6af56d86d7b1874
2017-01-09 13:53:10 +01:00
Sebastian Kaspari
ca5ef85aee
Bug 1328937 - HighlightItem: Move data into separate Highlight / Metadata model classes. r=Grisha
...
MozReview-Commit-ID: LfeoFZB9MiL
--HG--
extra : rebase_source : a30228b7b3dac40b82b24d8d6d4217785c89514b
2017-01-05 20:02:54 +01:00
Sebastian Kaspari
257780da34
Bug 1328937 - HighlightItem: Make all properties 'private'. r=Grisha
...
MozReview-Commit-ID: 9Ots1ZF8oZ8
--HG--
extra : rebase_source : e491481428f69722145ad63f70d1876272b0966e
2017-01-05 19:33:49 +01:00
Sebastian Kaspari
ced99a8367
Bug 1328937 - StreamItem: Move inner classes to separate files. r=Grisha
...
MozReview-Commit-ID: K6q39diAjms
--HG--
extra : rebase_source : 353e09186988a40d36a6a23af5549f422fb9b978
2017-01-05 19:29:38 +01:00
Sebastian Kaspari
49420991ca
Bug 1319017 - browser.js addEngine(): Use icon pipeline to load search engine icon. r=Grisha,maliu
...
I missed this part of the code when refactoring the icon code in bug 1290014 - because this code
never used our favicon loader but instead accessed the database directly. Now this code is using
the same pipeline we use from Java code and should therefore always load (or generate) an icon.
MozReview-Commit-ID: 9WPvTW1uscI
--HG--
extra : rebase_source : 8f07cb040c0fb7d5b33dbd3ae47ec4a4df8668f0
2017-01-10 14:15:33 +01:00
Julian_Chu
cc5b063156
Bug 1323759 - To ensure distribution is initialized r=rnewman
...
The referrer intent INSTALL_REFERRER comes after Fennec been installed.
On Android 5+ we might receive the referrer intent and never actually
launch the browser. Attempt to init here to handle that case.
MozReview-Commit-ID: 6kDeqnNT2pS
--HG--
extra : rebase_source : c84cee733760b83de51180b9cfff8744db496575
2016-12-19 14:25:14 +08:00
Jim Chen
781d8b92af
Bug 1328684 - Convert SharedPreferencesHelper events to bundle events; r=sebastian
...
Convert events used in SharedPreferencesHelper to
GeckoBundle/BundleEventListener events. Gecko thread events are used
because the listeners are expected to be synchronous, especially for the
SharedPreferences:Get event, which also requires a synchronous callback.
2017-01-10 23:01:28 -05:00
Jim Chen
e56ec60a5b
Bug 1328683 - Convert ReadingListHelper events to bundle events; r=sebastian
2017-01-10 23:01:27 -05:00
Jim Chen
b6b448520d
Bug 1328682 - Convert MediaPlayerManager events to bundle events; r=sebastian
2017-01-10 23:01:27 -05:00
Jim Chen
50d82c3cce
Bug 1328680
- Convert GeckoService event to bundle event; r=sebastian
...
Convert the "Gecko:ScheduleRun" event that GeckoService listens to to a
GeckoBundle/BundleEventListener event.
2017-01-10 23:01:27 -05:00
Jim Chen
bcea78238a
Bug 1326317 - Convert FilePicker events to bundle events; r=sebastian
...
Convert the "FilePicker:Show" event used in FilePicker and
testFilePicker to use GeckoBundle/BundleEventListener. UI event is used
because the listener performs Intent operations, which is best for the
UI thread. "FilePicker:Result" notification is removed in favor of
using a callback.
2017-01-10 23:00:58 -05:00
Jim Chen
ca13c79fba
Bug 1326249 - Convert MulticastDNSManager events to bundle events; r=sebastian
...
Convert events used in MulticastDNSManager to
GeckoBundle/BundleEventListener events. MulticastDNSManager also sends
observer notifications from Java to Gecko, and that converts nicely to
using the new unified EventDispatcher on both sides. The patch also
hides some logging behind a flag to reduce logcat clutter.
2017-01-10 23:00:58 -05:00
Jim Chen
36a6807488
Bug 1325156 - 2. Convert JavaAddonManager events to bundle events; r=sebastian
...
Convert events used in the two JavaAddonManager implementations to
GeckoBundle/BundleEventListener events. Gecko thread events are used to
keep with previous behavior. The external interface for addons is kept
the same (using Bundle/JSONObject as container objects), in order to
preserve compatibility, while the internal implementation is changed to
use GeckoBundle.
2017-01-10 23:00:57 -05:00
Jim Chen
34b69f4bac
Bug 1325156 - 1. Add complete Bundle/JSONObject conversion methods to GeckoBundle; r=sebastian
...
In addition to the existing fromJSONObject method, add fromBundle,
toBundle, and toJSONObject methods to GeckoBundle, so a GeckoBundle can
be easily converted to/from Bundle and JSONObject.
2017-01-10 23:00:57 -05:00
Tom Klein
a5b2829f5f
Bug 1258176 - Remove bookmark star stub drawables in drawable/ that were formerly needed for API 9. r=sebastian
...
They're getting selected on mdpi (and presumably ldpi) devices.
MozReview-Commit-ID: I60hcKehPnf
--HG--
extra : rebase_source : 3a7f55fbaa020d407a7b4f227796c85a1a85d03b
2017-01-05 16:33:40 -06:00
Sebastian Kaspari
879be7f02a
Bug 1315982 - findbugs: Ignore DE_MIGHT_IGNORE warning in FennecTabsRepositorySession.releaseProviders(). r=walkingice
...
MozReview-Commit-ID: 6jG2QDQ62l8
--HG--
extra : rebase_source : 9baecbb5e22a775532b7ed55de3642dee634e46b
2017-01-05 18:45:39 +01:00
Sebastian Kaspari
fcf58ca917
Bug 1316011 - findbugs: Enable VO_VOLATILE_INCREMENT check and ignore false positive in SerialRecordConsumer. r=walkingice
...
MozReview-Commit-ID: 5HGkERPyhUU
--HG--
extra : rebase_source : ea47c4276306f9dd4d75c6b4c0763adcf95ef2cb
2017-01-05 18:33:18 +01:00
Carsten "Tomcat" Book
47628ca590
Merge mozilla-central to autoland
2017-01-10 12:24:10 +01:00
Carsten "Tomcat" Book
89882dc5f4
merge mozilla-inbound to mozilla-central a=merge
2017-01-10 12:11:31 +01:00
Wes Kocher
105aea2522
Merge m-c to inbound a=merge
...
MozReview-Commit-ID: G24aq5fbYNd
2017-01-09 16:44:58 -08:00
James Cheng
801c518cad
Bug 1325332 - [EME][Fennec] Pref on EME API and only support it for M+ android version. r=cpearce
...
MozReview-Commit-ID: Bi5pRhIFsxB
--HG--
extra : rebase_source : 3fa45b404874c87a41448491af00e71bc94ecfd6
2016-12-23 15:50:13 +08:00
Nevin Chen
2a730ce5e0
Bug 1310622 - Display the item as-is but do not load an icon if we do not have a page URL r=sebastian
...
MozReview-Commit-ID: Ij9VS5NvMAs
--HG--
extra : rebase_source : 082dae732686014ead1776ab3816e70ae382ba91
2016-12-13 13:18:55 +08:00
Grigory Kruglov
cc5147ace0
Bug 1326018 - Process telemetry for highlight click before url open action r=sebastian
...
MozReview-Commit-ID: 8Tlth9GvqOb
--HG--
extra : rebase_source : 3075b2c4da4454adb518fd5fc686a92622633d30
2017-01-09 15:04:58 -08:00
Grigory Kruglov
d85172870c
Bug 1330151 - Adjust docs slightly to better reflect current implementation r=nalexander
...
MozReview-Commit-ID: 3Ko9unIGKOt
--HG--
extra : rebase_source : d05327fb620fd48bba391e0a13c06f3ab9d0a4f6
2017-01-10 17:39:25 -08:00
Grigory Kruglov
68302b82af
Bug 1330151 - Push Architecture docs recovered from Bug 1207714 r=nalexander
...
Nick's original docs copy-pasted verbatim.
MozReview-Commit-ID: PPVXwoL6He
--HG--
extra : rebase_source : 3e59b34b2e1aceb9672dc5f5ec5be8461d8ed6a7
2017-01-10 15:29:11 -08:00
Sebastian Kaspari
61df41e772
Bug 1323408
- Do not show first run tour in guest profiles. r=nechen
...
MozReview-Commit-ID: 42FcUvGzRr9
--HG--
extra : rebase_source : 8469c10382791b370106eeea2d988e1372691355
2017-01-05 13:12:52 +01:00
Phil Ringnalda
dd6884450a
Backed out changeset c273666082fa (bug 1325332) for Android test_interfaces.html failures
2017-01-08 21:17:41 -08:00
James Cheng
b6276d9ee4
Bug 1325332 - [EME][Fennec] Pref on EME API and only support it for M+ android version. r=cpearce
...
MozReview-Commit-ID: Bi5pRhIFsxB
--HG--
extra : rebase_source : 8413b9ea132dc4388bdc48e7c09d3f9e4b7676eb
2016-12-23 15:50:13 +08:00
Tom Klein
667cb809fa
Bug 1233415 - Make action bar actions full action bar height. r=sebastian
...
MozReview-Commit-ID: G78wgtWkfgQ
--HG--
extra : rebase_source : a755ad3c1bcd8b375e44c8dd35d987b163d9c890
2017-01-07 02:33:14 -06:00
Mark Banner
582fcb8090
Bug 1329614 - [eslint] Catch more cases of importing globals from 'var foo = Cu.import('...');'. r=jaws
...
MozReview-Commit-ID: 5NKHHb70YA6
--HG--
extra : rebase_source : 4551e56f56065349fb9ddc8d90e67f9dc84c1701
2017-01-09 10:12:26 +00:00
Jan Henning
042e2b6664
Bug 1301160 - Part 0 - Add an explicit string conversion to fix an error in Android Studio. r=sebastian
...
MozReview-Commit-ID: GLf0zXsAkAI
--HG--
extra : rebase_source : a30afeb2b9f139ac2c73f7c824ac39e05aa8cb11
2016-11-18 20:14:26 +01:00
Mike Hommey
71106c149c
Bug 1330875 - Remove MOZ_APP_STATIC_INI. r=mshal
...
It's now always set, even on comm-central, so we can just remote it.
--HG--
extra : rebase_source : 8687e2f3b8636fb79564d074d2cce2e088570413
2017-01-13 14:51:07 +09:00
Ralph Giles
881ffe6392
Bug 1323773
- Update android builders to rust 1.15.0-beta.2. r=mshal
...
Fix code generation for armv7 devices without neon by switching
official builds to the 1.15 beta rust compiler. This fixes the
target generation (and standard library image) to not assume
neon is available, per Google's NDK guidelines.
We expect to update this to 1.15.0 stable before release.
MozReview-Commit-ID: HWJLLGJaUDY
--HG--
extra : rebase_source : 53f00f34f40bb2adb07de27e05019ef0159f5ec8
2017-01-04 13:42:36 -08:00
Sebastian Hengst
d0e4cec2ba
Backed out changeset cce21c0cb2dd (bug 1324530) for failing passwd-1.xul on Android 4.3 debug and number-2.xul on Android 4.3 opt. r=backout
2017-01-06 09:50:28 +01:00
Sebastian Hengst
31bfe3ddf1
Backed out changeset 3e71466a060d (bug 1324530)
2017-01-06 09:49:22 +01:00
Sebastian Hengst
9f9a0ec996
Backed out changeset bedf2a853f91 (bug 1324530)
2017-01-06 09:49:18 +01:00
Sebastian Hengst
d2f92b241d
Backed out changeset c520d79f9611 (bug 1324530)
2017-01-06 09:49:13 +01:00
John Lin
ecfd4663f7
Bug 1324530 - part 4: improve remote manager init wait time. r=snorp
...
Fix the issue that RemoteManager.init() will be block for 5s when onServiceConnected() is
finished before latch creation.
MozReview-Commit-ID: CYYpLpY7Ns9
--HG--
extra : rebase_source : cfb6a6aa25d1f274418f879e8a536dbdff664615
2016-12-23 16:28:48 +08:00
John Lin
2d0c14f448
Bug 1324530 - part 3: make codec methods that change state(start, stop, flush, release) synchronous. r=snorp
...
MozReview-Commit-ID: EVjtpzX9dbD
--HG--
extra : rebase_source : 26a5b10c3e3dbae0ffb2caad67863c5db7134275
2016-12-23 16:25:43 +08:00
John Lin
d483677db4
Bug 1324530 - part 2: rewrite the logic of discarding invalid buffers for flush. r=esawin
...
MozReview-Commit-ID: EwTRMaJOJhK
--HG--
extra : rebase_source : d636b2da2799029a8e78cfc23302bd0d63454efc
2016-12-28 15:56:42 +08:00
John Lin
a03d12f09c
Bug 1324530 - part 1: add method to AsyncCodec for resuming receiving input buffers after flush(). r=esawin
...
2 birds with 1 stone:
- according to MediaCodec doc, when running in async mode start() must be called after flush() to 'resume receiving input buffers'.
- in JellyBeanAsyncCodec's case, explicit resuming polling input buffers helps Codec decide which buffers are invalid by flush().
MozReview-Commit-ID: Ee5QbppgsVf
--HG--
extra : rebase_source : e1593952f0dbbdeabd07e014482bc161315b83de
2016-12-28 15:41:55 +08:00
Tomer Cohen
3c55375e33
bug 1298385 Add RTL alignment to text in the Private Tab welcome page r=sebastian
...
MozReview-Commit-ID: 8pDxAlMnNMX
--HG--
extra : rebase_source : 8b4eb972665842956d693fb9ea7e159673f64554
2016-12-06 22:58:46 +02:00
Tomer Cohen
1029adf9d1
Bug 1298904 [RTL] Change the Search field and Add button locations in about:config r=sebastian
...
MozReview-Commit-ID: GIQ2NV2VGAO
--HG--
extra : rebase_source : 0a0d27e6c462ca443ea9d9b1f6502f5c3143485f
2016-12-08 19:15:57 +02:00
Tomer Cohen
429ed16c76
Bug 1298903
[RTL] Add padding to the right side of the list's text in about:firefox r=sebastian
...
MozReview-Commit-ID: 4R52HcujmL5
--HG--
extra : rebase_source : 051a19cfd45fcc54fb006a6f0385f3f18cf79069
2016-12-19 00:22:30 +02:00
Tomer Cohen
88a6128407
Bug 1298889 [RTL] "Firefox \<VersionNumber\>" is hidden by Firefox logo in about:firefox r=sebastian
...
MozReview-Commit-ID: J4rWoKrsaAv
--HG--
extra : rebase_source : ed197586ae6c47685616b9d419b80ef466e4494d
2016-12-07 00:53:11 +02:00
Tomer Cohen
44dd80970e
Bug 1298688 [RTL] Change the small arrow icon's position in about:addons r=sebastian
...
MozReview-Commit-ID: 6lhBD9CCGYc
--HG--
extra : rebase_source : 829cd46bc194c34adfc27f1968a9f37bbd8e82b9
2016-12-19 20:16:52 +02:00
Jan Henning
5d35d375c9
Bug 1305027 - Choose button order in the download app chooser depending on the Android version we're running on. r=sebastian
...
MozReview-Commit-ID: ItNYtoX8VEX
--HG--
extra : rebase_source : bdb3e73b9ef58c944c5ae550f502b7cac704145d
2017-01-02 21:46:21 +01:00
Jan Henning
4de8d3f783
Bug 1266594 - Part 3 - Explain shutdown sequence and related data cleaning problems in the docs. r=jchen
...
MozReview-Commit-ID: AdVQnTQ3tsH
--HG--
extra : rebase_source : fdb3420a5fb5755b39c454c7be9867a034a1bdb3
2016-12-30 22:08:20 +01:00
Jan Henning
05c501b32c
Bug 1266594 - Part 2 - Fix the session store to handle the new shutdown sequence. r=sebastian
...
Experimenting with the shutdown sequence for Part 1 has thrown up a few edge cases that aren't yet properly handled by the session store:
- If Gecko is busy (e.g. loading a resource-intensive page), shutdown of the UI can be delayed for a bit - if the user then manually switches away from Firefox, we might get an application-background message which needs to be ignored if we're already quitting
- Backgrounding of the app while quitting can change the event ordering - the "browser:purge-session-history" notification might arrive *after* we've received "quit-application", in which case we need to flush the session history to disk again after having handled the "purge-session-history" notification.
- clearDisk() should rather delete the session store files synchronously when quitting, because otherwise there's a chance that the delete operation runs *after* the new state has already been written out
MozReview-Commit-ID: LZzGcJHxqhz
--HG--
extra : rebase_source : 9f18b99ae92a8ff0753375ea1e279df08d61640e
2017-01-03 20:55:22 +01:00
Jan Henning
fa8b0f3184
Bug 1266594 - Part 1 - Wait for Java-side sanitizing to be triggered before exiting the UI. r=jchen
...
When clearing private data on exit, Gecko sends a "Sanitize:ClearHistory" message back to the Java UI, so the latter can clear the history DB if necessary.
For some users, this process is not working, presumably because there is a race condition depending on whether Gecko gets as far as sending that message before the background thread responsible for receiving that message has already shut down/had its listener unregistered, or not.
Therefore, we now wait until the UI's sanitize handlers have been called before starting to shut it down as well.
MozReview-Commit-ID: HoifMYv3spA
--HG--
extra : rebase_source : de4bb656c67104b9d5b1ea83329b77de0688a5d6
2016-12-31 13:35:38 +01:00
Shan
b49d2baeb1
Bug 1320298 - Change mutable array to unmutable list; r=sebastian
...
MozReview-Commit-ID: 3HkWfzEeZFw
--HG--
extra : rebase_source : efdf63a91f3ac846ab714a6e1f4200d0c59a8e7e
2016-12-13 14:41:10 +05:30
maliu
b4a2fbcf70
Bug 1328515 - Refine fallback margin left/right to include api23, r=sebastian
...
MozReview-Commit-ID: Ac8FP1fOGa
--HG--
extra : rebase_source : bea5cd0ff1ca83621ac9f4c5b595b479d587da06
2017-01-04 12:04:28 +08:00
maliu
9de04c0e17
Bug 1322119 - Put mirrored 9patch drawable into ldrtl resource folder, r=sebastian
...
MozReview-Commit-ID: BqijcKYbWSz
--HG--
extra : rebase_source : eae4b5a23f62f10a263344831f96ee9e081df42c
2016-12-16 19:57:19 +08:00
Julian_Chu
41076b6f35
Bug 1320898: To make notification bar only dimmed in Reader Mode r=sebastian
...
The notification bar will be dimmed if in Reader Mode and user scroll
down the page. If not in Reader Mode, make sure the notification bar is
not dimmed.
MozReview-Commit-ID: 87LisdS3nRO
--HG--
extra : rebase_source : c7a6795a2b9b007aeddbee1044f94168a03cd761
2016-12-27 17:42:47 +08:00
Phil Ringnalda
d105fd40fd
Merge m-c to autoland
2017-01-04 19:01:49 -08:00
Phil Ringnalda
c83d1d7ce9
Merge m-i to m-c, a=merge
...
MozReview-Commit-ID: 51FMtH1yTe6
2017-01-04 18:33:32 -08:00
Jim Chen
cdb5767ec4
Bug 1319660 - 1. Don't take shortcut if old replacement ranges don't match; r=esawin
...
The block at [1] is a shortcut we take when we reconcile Java text
changes with Gecko text changes. However, we only checked that the new
ranges are the same, i.e. that the new Gecko text is the same as the new
Java text. We should also be checking that the old ranges are the same,
i.e. that the replaced Gecko text is the same as the replaced Java text.
[1] https://dxr.mozilla.org/mozilla-central/rev/bbbd2f7539f224a482cc6d2dd10e6a5f31c8baf3/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditable.java#1233
2017-01-04 14:46:10 -05:00
Andrew Swan
c6e46bcd64
Bug 1323129 part 2: remove amIWebInstaller r=rhelmer
...
MozReview-Commit-ID: O0jtQi9BzQ
--HG--
rename : toolkit/mozapps/extensions/amIWebInstallListener.idl => toolkit/mozapps/extensions/amIWebInstallPrompt.idl
extra : rebase_source : 7d1981f282b5e2c34b8b720c0a96e2cc8b71a86f
extra : source : 8a61b376d87f52d1bd660af41bdc6bdb5d5e44ae
2017-01-04 10:13:16 -08:00
Mike Taylor
a45c16df23
Bug 1328416. Add src param to track where compat reports are coming from. r=sebastian
...
MozReview-Commit-ID: GNLVJHVWEB4
--HG--
extra : rebase_source : 394c5cf6486271411fd4bff70dd7138f989a133f
2017-01-03 17:10:06 -06:00
Ralph Giles
9f66a9ca47
Bug 1325445 - Update builders to rust 1.14.0 stable. r=mshal
...
Repacks of the upstream builds of rust 1.14.0 stable release.
MozReview-Commit-ID: B5DclOLeBjM
--HG--
extra : rebase_source : 67db55dd62d6177b30ace5008edc680f95c6ed22
2016-12-23 13:20:26 -08:00
Adrian Zatreanu
c57580a398
Bug 1316008: Use explicit charset encoding r=nechen,sebastian
...
MozReview-Commit-ID: 3y2CKQZrLtl
--HG--
extra : rebase_source : b75b5f59c7d9e6ef95a06dde982f8a70a352649b
2016-11-29 20:42:08 +02:00
Mark Banner
3539bc390b
Bug 1255149
- Remove unused nsICookiePromptService. r=jdm
...
MozReview-Commit-ID: IO07pbRqq2I
--HG--
extra : rebase_source : 7c432454f216797a9937f6b6a30dc683439102d6
2017-01-03 12:14:06 +00:00
Jim Chen
c3a02d7e8e
Bug 1325155 - 2. Convert text selection events to bundle events; r=sebastian
...
Convert the "TextSelection:*" events to use BundleEventListener /
GeckoBundle, in both ActionBarTextSelection.java and
FloatingToolbarTextSelection.java. UI events are used because the
listeners require the UI thread. The "TextSelection:Update" listeners
are removed because the event is no longer sent by ActionBarHandler.
2016-12-28 17:49:29 -05:00
Jim Chen
34ae4d687c
Bug 1325155 - 1. Add Object overrides for GeckoBundle; r=sebastian
...
Add overrides for Object methods in GeckoBundle, and redirected them to
the corresponding methods in SimpleArrayMap. For equals, a custom
implementation is used because the equals implementation in
SimpleArrayMap had bugs across different support library versions.
2016-12-28 17:49:28 -05:00
Jim Chen
922fcb61b5
Bug 1325154 - Convert NotificationHelper events to bundle events; r=sebastian
...
Convert NotificationHelper events to use BundleEventListener and
GeckoBundle. UI events are used to perform notification operations, and
to keep access to mClearableNotifications to the UI thread. Also,
refactor some recently-added code in NotificationHelper.
2016-12-28 17:49:28 -05:00
Jim Chen
16e63f30d7
Bug 1325153 - Convert DoorHangerPopup events to bundle events; r=sebastian
...
Convert "Doorhanger:Add" and "Doorhanger:Remove" to bundle events. UI
events are used because the listener performs UI operations. As part of
the refactoring, DoorHangerConfig was refactored to use GeckoBundle, and
due to that change, a lot of other doorhanger-related classes also had
to be refactored to use GeckoBundle.
2016-12-28 17:49:28 -05:00
Phil Ringnalda
ce22845813
Merge m-c to m-i
...
MozReview-Commit-ID: 28f3Y4WDMFL
2016-12-27 20:38:00 -08:00
Randell Jesup
ac570b16c4
Bug 1250356: rollup of changes for webrtc after applying webrtc.org v49 update r=pkerr,ng,pehrsons,etc
...
See ssh://hg.mozilla.org/users/paulrkerr_gmail.com/webrtc49_merge/ for the
patch development history.
2016-12-27 19:41:02 -05:00
James Cheng
14369bf152
Bug 1325330 - [EME][Fennec] Create MediaCrypto object inside GeckoMediaDrmBridge's constructor. r=kikuo
...
MozReview-Commit-ID: 4QmvUxrMe47
--HG--
extra : rebase_source : 93a7d5df5b17a88ee5e909a4b68d45e5541b5e4e
2016-12-23 15:42:22 +08:00
Wes Kocher
7cd2d99f0f
Backed out 2 changesets (bug 1325445) for lint failures and possibly build bustage a=backout
...
Backed out changeset 26dfb927a58d (bug 1325445)
Backed out changeset 4fcea80bb19e (bug 1325445)
2016-12-23 14:28:27 -08:00
Ralph Giles
af4d2e7ffe
Bug 1325445 - Update builders to rust 1.14.0 stable. r=mshal
...
Repacks of the upstream builds of rust 1.14.0 stable release.
MozReview-Commit-ID: B5DclOLeBjM
--HG--
extra : rebase_source : f56feadb24193f1bec13c93bf0414a50a7de219c
2016-12-23 13:20:26 -08:00
David Keeler
104c38c723
bug 1324071 - add nsIPK11Token.hasPassword to replace unnecessary uses of nsIPKCS11Slot.status r=Cykesiopka,gps,MattN,sebastian
...
MozReview-Commit-ID: C2jwQHPEDC0
--HG--
extra : rebase_source : 16271e70ef32da8657cdc4f8df41b7822430e3bf
2016-12-02 15:09:35 -08:00
Sebastian Kaspari
3f306fc9d4
Bug 1325380 - Use provider name for AS highlights. r=Grisha
...
MozReview-Commit-ID: 2vPk2DdrYed
--HG--
extra : rebase_source : e7de82507816ad026917b281c1d97a0a07e6289e
2016-12-22 16:17:28 +01:00
Wes Kocher
31ced84f43
Merge m-c to autoland, a=merge
2016-12-22 18:45:10 -08:00
Wes Kocher
60785fce6d
Merge inbound to central, a=merge
...
MozReview-Commit-ID: I54WGOLqHI2
2016-12-22 18:37:07 -08:00
Grisha Kruglov
e05b65163b
Bug 1320798 - Re-order context menu items for Activity Stream r=ahunt
...
MozReview-Commit-ID: Ldt0H5XQxsz
--HG--
extra : rebase_source : f5467ada9237ad4db1ce8b481e7c29bcce6e6ec5
2016-12-21 14:30:50 -08:00
Sebastian Hengst
010d63ba33
Bug 1324280 - Revert MarginLayoutParamsCompat with setting margin left/right by current layout direction: lint style fixes. r=lint-fixes
2016-12-22 18:52:34 +01:00
Carsten "Tomcat" Book
0aed7a4ac5
Merge mozilla-central to mozilla-inbound
...
--HG--
rename : testing/docker/base-build/HASH => taskcluster/docker/base-build/HASH
rename : testing/docker/base-test/HASH => taskcluster/docker/base-test/HASH
rename : testing/docker/centos6-build-upd/HASH => taskcluster/docker/centos6-build-upd/HASH
rename : testing/docker/centos6-build/HASH => taskcluster/docker/centos6-build/HASH
rename : testing/docker/decision/HASH => taskcluster/docker/decision/HASH
rename : testing/docker/image_builder/HASH => taskcluster/docker/image_builder/HASH
rename : testing/docker/recipes/tooltool.py => taskcluster/docker/recipes/tooltool.py
rename : testing/docker/tester/HASH => taskcluster/docker/tester/HASH
2016-12-22 16:25:35 +01:00
maliu
03b008aa5c
Bug 1324280 - Revert MarginLayoutParamsCompat with setting margin left/right by current layout direction, r=sebastian
...
MozReview-Commit-ID: amwDqXRxE5
--HG--
extra : rebase_source : 8561d5541d7aae658c9002d57add058980384fc0
2016-12-21 15:27:09 +08:00
Sebastian Kaspari
bbe7ce58a6
Bug 1311434
- Website Metadata: Get provider name from Open Graph tags. r=Grisha
...
There's a pull request [1] and issue [2] on GitHub tracking the work to land this
in the page-metadata-parser repository. Multiple potential sources for getting a
'provider name' are considered in the linked issue - however they all have
slightly different semantic meanings. Only 'og:site_name' actually has the same
meaning as "provider name". Therefore it is pretty safe to land this part.
[1] https://github.com/mozilla/page-metadata-parser/pull/81
[2] https://github.com/mozilla/page-metadata-parser/issues/79
MozReview-Commit-ID: KQFSLo85JoS
--HG--
extra : rebase_source : ba86e5c3785cda500a1e8f5a8887228c72f6d00f
2016-12-20 14:21:32 +01:00
James Cheng
3b8bb20163
Bug 1325005 - Preference on media.decoder.recycle.enabled not only for Nightly build. r=jolin
...
MozReview-Commit-ID: Ivsy0Y6ot13
--HG--
extra : rebase_source : 70aefea4badc57f2616e59464c2585b628029cae
2016-12-21 15:50:04 +08:00
Grisha Kruglov
90b4168ba0
Bug 1325446 - Remove "private tab" telemetry from Activity Stream r=liuche
...
MozReview-Commit-ID: JUHQOxGXvAu
--HG--
extra : rebase_source : a8d73e4b5394be3e27a5831b64d05e46fde40682
2016-12-22 11:57:42 -08:00
Grisha Kruglov
70a40310cc
Bug 1319245 - Post: clean up async tasks and access levels r=sebastian
...
MozReview-Commit-ID: IWwTqkqa2OH
--HG--
extra : rebase_source : 41ffd99339ebb8aae662910c000d64705de76768
2016-12-21 23:01:45 -08:00
Grisha Kruglov
e78ac7e0a2
Bug 1319245 - Documentation for Activity Stream telemetry r=liuche,sebastian
...
MozReview-Commit-ID: DAG9eOOdNn5
--HG--
extra : rebase_source : 7787682276cc75e2b098e5c5d58431e2e319cd0c
2016-12-21 23:25:27 -08:00
Grisha Kruglov
2f9475c465
Bug 1319245 - Track rich telemetry data for Activity Stream r=sebastian
...
General concept is to populate the "extras" field with a stringified JSON object
which contains bunch of additional data which, in aggregate, might give insight
into user's actions.
A builder is used in order to make constructing the extras json string easier.
This builder has a concept of a "global state" which lets us easily include some information
with every A-S telemetry ping.
Currently this is used to track whether or not user has a firefox account.
An instance of a builder is passed around, augmented as more information becomes known,
and is materialized into an "extras" string whenever an action occurs and telemetry
event needs to be sent.
MozReview-Commit-ID: GDmxkWChnnA
--HG--
extra : rebase_source : 025d198e16d3a8af8b6e94bd531e916b80f9841a
2016-12-21 22:51:27 -08:00
maliu
dde53f57e8
Bug 1323763 - Revert setAutomirrored solution and provide drawable in ldrtl folder, r=ahunt
...
MozReview-Commit-ID: JwHTNbQ1HcN
--HG--
extra : rebase_source : d9c849a98bc5a09ebc706be237ec42b15de70c0d
2016-12-16 18:21:58 +08:00
Sebastian Hengst
bc2f204f46
Backed out changeset 57ccc83a450f (bug 1311555) for Android build bustage. r=backout
2017-01-19 19:47:08 +01:00
Sebastian Hengst
2121d17026
Backed out changeset d8c85b0ed424 (bug 1311555)
2017-01-19 19:46:40 +01:00
Andrzej Hunt
b8252551d9
Bug 1311555 - Use filled bookmark star in ActivityStream context menu r=sebastian
...
Unfortunately tinting the bookmark star is highly complicated due to the tinting
that NavigationView performs (i.e. we'd likely have to disable NavigationView
tinting, and do manual tinting on every icon - alternatively we could hack
the tint-list to use blue for "checked" items, and set the bookmark item
as checked). Since it's unclear if we even want the star to be blue,
we'll leave it grey (but filled) for now.
MozReview-Commit-ID: DekRZJayKIz
--HG--
extra : rebase_source : 45c4391fe2756b4aae082f89f8e2f6456cac27a2
2017-01-18 12:20:50 +01:00
Andrzej Hunt
7c8c454827
Bug 1311555 - Pre: remove unused imports r=ahunt
...
MozReview-Commit-ID: 6Xk7Z01m41A
--HG--
extra : rebase_source : 6ac181618d63b0b69b8b7bab836e6bce4e659ace
2017-01-18 12:18:06 +01:00
Florian Quèze
fc6379e827
Bug 1329182 - remove trailing newURI null parameters in the rest of the tree, r=jaws.
2017-01-09 20:27:26 +01:00
Jim Chen
aa76b81db3
Bug 1328115 - 1. Test vsync support in native code; r=snorp
...
Don't go through the VsyncSource Java class to test support for vsync.
Because VsyncSource references symbols from API 16+, Dalvik fails to
load it for API 15 and below. Also make several other changes in
VsyncSource, including removing the unnecessary JNIObject superclass,
and refactoring the instance initialization code, which fixes a possible
race when initializing.
2017-01-09 14:10:23 -05:00
Chenxia Liu
70fab1925d
Bug 1325243 - Update UI Telemetry docs to reflect usage of "extras". r=Grisha
...
MozReview-Commit-ID: 9FBXQioCZ2A
--HG--
extra : rebase_source : f479791398c94d95bfa4b730d6d57f4dd80580e2
2016-12-21 17:04:45 -08:00
Ralph Giles
b548230620
Bug 1322323 - Consolidate common artifact build mozconfig options. r=chmanchester
...
Collect common options used in artifact build tests in a single
mozconfig so they can be set more consistently.
Use this to make unsetting toolchain defines universal in these
tasks, fixing fallout from bug 1283898 which defined CARGO and
RUSTC everywhere, conflicting with --disable-compiler-environment
just like CC and CXX were conflicts in some artifact tasks.
MozReview-Commit-ID: 4SbxByjClQb
--HG--
extra : rebase_source : d8a48fd2192ceb5ece76c827e2243ae784b991cb
2016-12-21 15:44:48 -08:00
Carsten "Tomcat" Book
d1a09e06c8
Merge mozilla-central to autoland
2016-12-21 17:07:24 +01:00
Sebastian Kaspari
d259c32a81
Backed out changeset 82753b1778fa (bug 1316011)
2016-12-21 10:41:36 +01:00
Phil Ringnalda
4f5f9f3222
Merge m-i to m-c, a=merge
...
MozReview-Commit-ID: EI1fU13SR79
2016-12-20 20:15:20 -08:00
Jim Chen
33dd6ce59b
Bug 1324817
- Fix NPE in setSearchEngineFromBundle; r=me
...
Fix a NPE in setSearchEngineFromBundle when mIdentifier is null. r=me
for trivial patch.
2016-12-20 17:01:04 -05:00
Wes Kocher
584a2f0f62
Merge inbound to central, a=merge
...
MozReview-Commit-ID: Cr9L1dhIzP2
2016-12-20 11:41:57 -08:00
Nevin Chen
87f359cccd
Bug 1320889 - Tapping the notification for a downloaded file shouldn't open firefox. r=ahunt
...
MozReview-Commit-ID: FzBk0TmVlm0
--HG--
extra : rebase_source : f83153ae5519c44d045db6f21df6f8b319723edc
2016-12-16 16:30:19 +08:00