Commit Graph

315835 Commits

Author SHA1 Message Date
Andrew Wilcox
8f29ae6f7c Bug 893723 - Ignore trailing '+' in Mercurial version string; r=gps
DONTBUILD (NPOTB)
2013-07-15 04:15:00 -07:00
Gregory Szorc
751089c21c Merge fx-team into mozilla-central 2013-07-15 12:11:09 -07:00
Justin Lebar
fc156c847f Bug 892839 - Fix buggy example code in Move.h. r=luke DONTBUILD 2013-07-15 10:40:30 -07:00
Ed Morley
6d766118c8 Merge latest green birch changeset and mozilla-central 2013-07-15 13:01:56 +01:00
Ed Morley
a5daa8f4fd Merge latest green inbound changeset and mozilla-central 2013-07-15 10:48:54 +01:00
Gaia Pushbot
4dc9e7b10c Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d717e2e751a6
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #10894 from crdlc/bug-890813

Bug 890813 - Memory Card import needs to support cancelling

========

https://hg.mozilla.org/integration/gaia-central/rev/5705fd11039c
Author: crdlc <crdlc@tid.es>
Desc: Bug 890813 - Memory Card import needs to support cancelling
2013-07-15 01:00:27 -07:00
Gina Yeh
f6f15ffa76 Bug 892862 - Failed to receive system message of Sco connection status changed, r=echou 2013-07-15 15:58:49 +08:00
Wes Kocher
b68938ecb2 Backed out changeset fa6ef0b63025 (bug 889515) for OSX browser-chrome bustage on a CLOSED TREE
--HG--
extra : amend_source : f0064ef485170a679744ea3e211535a9d58f0fc9
2013-07-14 20:59:36 -07:00
ffxbld
e1159218c3 No bug, Automated HSTS preload list update from host bld-centos6-hp-017 - a=hsts-update 2013-07-13 03:11:47 -07:00
ffxbld
cb222c0fee No bug, Automated blocklist update from host bld-centos6-hp-016 - a=blocklist-update 2013-07-13 03:09:41 -07:00
Chris Manchester
27896e25c7 Bug 884397 - Implement structured logging in Log4Moz; r=gps 2013-07-12 16:39:43 -07:00
Sotaro Ikeda
be9402b476 Bug 891445 - Fix incorrect pointer comparison. r=doublec 2013-07-12 17:27:17 -04:00
Ryan VanderMeulen
42a74471cb Merge m-c to fx-team. 2013-07-12 16:48:06 -04:00
Heather Arthur
d0c182f35a Bug 892757 - Also listen for events with -actorId in Style Editor client; r=dcamp
--HG--
extra : amend_source : b51769b6dd414ffeab01e8066074c0ee05d64ef3
2013-07-12 13:28:47 -07:00
Ryan VanderMeulen
6305b2595a Merge m-c to birch. 2013-07-12 16:16:45 -04:00
Gaia Pushbot
6fb3f2835d Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/9a9c7a559a26
Author: Dave Hylands <dhylands@gmail.com>
Desc: Merge pull request #10949 from dhylands/bug-893120-mochitest-perms

Bug 893120 - Fix devicestorage permissions for mochitest. r=dclarke

========

https://hg.mozilla.org/integration/gaia-central/rev/9ac658beb8a3
Author: Dave Hylands <dhylands@gmail.com>
Desc: Bug 893120 - Fix devicestorage permissions for mochitest.
2013-07-12 13:00:22 -07:00
Ryan VanderMeulen
31830329ea Merge fx-team to m-c. 2013-07-12 15:50:50 -04:00
Gaia Pushbot
835ddddd20 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/3004264248cc
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #10867 from wanderview/unit-test-script

Bug 891366: Provide unit test script and make target. r=mwu

========

https://hg.mozilla.org/integration/gaia-central/rev/304aef72c600
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 891366: Provide unit test script in gaia/bin
2013-07-12 12:30:22 -07:00
Panos Astithas
e9012c3b84 Fix step-in in chrome debugging by loading the promise library in the debugger server's compartment (Bug 834756); r=dtownsend,vporof 2013-07-12 22:13:21 +03:00
Gaia Pushbot
da19b91b33 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/015185f797c4
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 887712 - [SMS/MMS] Make editable cursor element "zero width" until any user interaction r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=887712

Includes: 4880acb5ec

- Empty, out of focus placeholders contract to zero offset width
- Empty, in focus placeholders expand to rem-based width (margin: r & l, padding: r & l)
- When all recipients are deleted, don't leave empty editable in the to-field.
- When the editable placeholder is contracted to a zero offset width, it's possible to accidentally tap a recipient when the intention is to tap the to-field area around the recipient list, which will correctly prompt the user to remove the recipient. Since there is no way to unambiguously detect the user's intention, always handle "Remove" and "Cancel" in an intuitive way.

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-07-12 11:20:23 -07:00
Ryan VanderMeulen
f175b8ed70 Merge m-c to fx-team. 2013-07-12 13:34:44 -04:00
Ryan VanderMeulen
ae807eef57 Merge m-c to birch. 2013-07-12 13:31:17 -04:00
Ryan VanderMeulen
3ab99c254f Merge inbound to m-c. 2013-07-12 13:29:35 -04:00
Gaia Pushbot
5440bb7e9b Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/93d613b62a46
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 889763 - [MMS] Only image is received when sending image + audio file from android device. Co-author with gnarf37
2013-07-12 10:15:24 -07:00
Rail Aliiev
8493cf922e Bug 886842 - Add clang trunk builds for ASan. r=froydnj 2013-07-12 13:14:57 -04:00
Gaia Pushbot
00b40d8b98 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/8d2dd720cd08
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #10906 from EdgarChen/bug_877978

Bug 877978 - [Gaia] Use new WebAPI to access iccInfo related attribute/event

========

https://hg.mozilla.org/integration/gaia-central/rev/977de81e0fae
Author: Edgar Chen <echen@mozilla.com>
Desc: Bug 877978 - Use IccHelper to access iccInfo. r=alive,arthur,fcampo,salva
2013-07-12 09:30:23 -07:00
Gaia Pushbot
56cacc6cbd Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/419504104ae7
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #10869 from eeejay/highlight-fix

Explicitly set the active background of lockscreen icons to none.r=mihai

========

https://hg.mozilla.org/integration/gaia-central/rev/eddd5f65c50a
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 889925 - Explicitly set the active background of lockscreen icons to none.
2013-07-12 07:26:23 -07:00
Gaia Pushbot
51a4d89fe2 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d3bf1e5466f0
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #10943 from fabi1cazenave/mmsAttachmentContainers-bug889899

Bug 889899: use <div> instead of <iframe> for MMS attachment containers, r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/662a0765f17a
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Bug 889899: use <div> instead of <iframe> for MMS attachment containers, r=julienw

Attachment containers use `<iframe>` in the SMS app because they are handy in the Compose area (work well in a contenteditable element): this ensures that attachment blocks are deletable but not editable.  However, `<iframes>` are a pain to use in the message thread, and can become a performance killer on threads with lots of attachments.

This patch keeps `<iframe>` containers for draft attachments in the Compose area but relies on `<div>` containers for the message thread.  To achieve this we use three templates:

* one `attachment-preview` template:
  - display it in a 80x80 px placeholder (can be extended to 120x80 or 80x120);
  - display the attachment size if in the Compose window;
  - do not display the file name for images
    (another patch will enable to display the file name on video with previews)

* one `attachment-nopreview` template: (audio, video, large images)
  - display the attachment type as a 80x80 px icon (audio, video, image, other);
  - display the attachment size if in the Compose window;
  - display the file name, both in the Compose window and in the message thread.

* one `attachment-draft` template to embed one of the two previous templates in an `<iframe>` container for the Compose area.

Non-draft attachments are displayed in a `<div>` container. In both cases (div or iframe), the container carries an `attachment-container` class and a `preview` or `nopreview` one.

Side notes:
* this fixes bug 882094 (display attachment file names in MMS);
* the `bubbleEvents` method has been slightly re-rewritten to be more self-explanatory;
* some basic cleanup has been done on the HTML & CSS front.
2013-07-12 07:05:23 -07:00
Sotaro Ikeda
9a12bc256f Bug 886897 - Call VideoFrameContainer::ClearCurrentFrame() before camera hw close. r=mikeh 2013-07-12 09:33:50 -04:00
Ryan VanderMeulen
2fc3f244cf Merge m-c to inbound. 2013-07-12 09:29:59 -04:00
Ryan VanderMeulen
10629c1937 Merge birch to m-c. 2013-07-12 09:28:48 -04:00
Tim Taubert
ae97627a64 Bug 890409 - Disable browser_aboutHome.js for intermittent failures; rs=mak 2013-07-12 14:59:18 +02:00
Tim Taubert
7b669f895b Bug 891360 - Follow-up to fix syntax error; r=bustage 2013-07-12 14:00:00 +02:00
Tim Taubert
6b014f1dd8 Bug 891360 - Move SessionStore I/O logic to a dedicated worker; r=yoric 2013-07-12 13:46:14 +02:00
Tim Taubert
70ba4e8a27 Bug 892766 - SessionStore tests should wait for delayed startup to be finished when opening new windows; r=yoric 2013-07-12 13:35:18 +02:00
Ed Morley
a945e4355b Backed out changeset 512a1fd86008 (bug 892285) for failures in invalidation/test-animated-image-layers.html 2013-07-12 10:10:48 +01:00
Tim Taubert
dad1e71278 Bug 867550 - Make browser_aboutHome.js not fail if it starts before but runs past midnight; r=mak 2013-07-12 11:03:00 +02:00
Fernando Jiménez
7e437cd37f Bug 883048 - [MMI] Send a ussd code while in airplane mode is allowed and doesn´t show any notification. r=vicamo 2013-07-12 10:42:17 +02:00
Gaia Pushbot
c68b03ae76 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/8f402e9a5c9a
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #10934 from rexboy7/fix-bug892373-master

Bug 892373 - @1.5x asset revise for Dialer app

========

https://hg.mozilla.org/integration/gaia-central/rev/80be3e3a4c6f
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 892373 - @1.5x asset revise for Dialer app
2013-07-11 23:30:22 -07:00
Michael Wu
a089db32c4 Bug 892285 - Only unlock gralloc surfaces if they were locked, r=bas 2013-07-12 01:52:37 -04:00
Gaia Pushbot
1c6a972598 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/cbffb3b5e67c
Author: mozshiao9 <mshiao@mozilla.com>
Desc: Merge pull request #10933 from mozshiao9/master_settings_889717

Bug 889717 - [Settings] Do not work when you are scrolling and select a menu, r=pivanov

========

https://hg.mozilla.org/integration/gaia-central/rev/e25731e3555a
Author: Mark Shiao <mshiao@mozilla.com>
Desc: Bug 889717 - [Settings] Do not work when you are scrolling and select a menu
2013-07-11 20:50:23 -07:00
Gaia Pushbot
27f59cb395 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/6aa0e53d6672
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #10910 from rexboy7/fixhd-881146-ftu-master

Bug 881146 - hdpi/xhdpi resolution assets and layout for FTU. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/4f8fc20dae05
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 881146 - hdpi/xhdpi resolution assets and layout for First run experience app
2013-07-11 20:40:22 -07:00
Olli Pettay
8935cd9b26 Bug 892582 - crash in nsContentSink::WillParseImpl , r=bz
--HG--
extra : rebase_source : 23cba75e0470c0170ea48e7deb44f24f191dee38
2013-07-11 22:39:06 -04:00
Matt Woodrow
f8f9c46878 Bug 889515 - Get rid of static sCompositorParent. r=nical 2013-07-11 22:32:09 -04:00
Matt Woodrow
70cfe88aa9 Bug 892966 - Clear any cached SourceSurfaces when a gfxASurface is flushed or marked dirty. r=jrmuizel 2013-07-11 22:44:29 -04:00
Matt Woodrow
c342a3955c Bug 892966 - Allow CG to be enabled as an azure content backend. r=jrmuizel 2013-07-12 17:19:29 -04:00
Matt Woodrow
8d17852f86 Bug 892966 - Make gfxQuartzNativeDrawing support Moz2D surfaces. r=jrmuizel 2013-07-12 17:19:29 -04:00
Matt Woodrow
cf7c30ed33 Bug 892966 - Setup dashing correctly in DrawTargetCG::StrokeRect. r=jrmuizel 2013-07-12 17:19:28 -04:00
Matt Woodrow
7afb3b3690 Bug 892966 - Don't rely on being able to retrieve the current surface from a gfxContext when drawing cocoa menus. r=jrmuizel 2013-07-12 17:19:28 -04:00
Matt Woodrow
c45ae27d7e Bug 892966 - Take a reference to the CGContext when constructing a DrawTargetCG from one. r=jrmuizel 2013-07-12 17:19:27 -04:00