Commit Graph

408194 Commits

Author SHA1 Message Date
Wes Kocher
530c4a09f9 Merge inbound to m-c a=merge 2015-02-23 16:05:13 -08:00
Wes Kocher
a2295b58c5 Merge fx-team to m-c a=merge 2015-02-23 16:00:36 -08:00
Benoit Girard
aa69b47387 Bug 1135857 - Remove ContentClientIncremental. r=mattwoodrow 2015-02-23 18:22:06 -05:00
Mike Conley
d5f390bba3 Bug 1134891 - Print progress code paths for OS X should be unreachable. r=trivial.
These code paths should never be reached, since nsPrintingPromptService returns
NS_ERROR_NOT_IMPLEMENTED for ShowProgress.

Bug 1135901 has been filed to remove this dead code entirely.

--HG--
extra : rebase_source : be406f9945be781242c287f7690a8fca90463a0f
2015-02-23 18:01:52 -05:00
Mike Conley
9d5fe8c633 Bug 1134891 - Make the print progress dialog for Windows and Linux be opened by the browser window's nsIDOMWindow instead of the content window. r=smaug.
--HG--
extra : rebase_source : 3eceb4d6da51864d9873e9e8aabac3719b5fa1fe
2015-02-24 18:34:16 -05:00
Xidorn Quan
2db6e570ff Bug 1135535 part 4 - Fix C4275 dll-interface warning and mark this warning as error in js/src on MSVC. r=luke
Fix warning:
js\src\jswrapper.h(58) : error C4275: non dll-interface class 'js::DirectProxyHandler' used as base for dll-interface class 'js::Wrapper'
        obj-firefox\dist\include\js/Proxy.h(358) : see declaration of 'js::DirectProxyHandler'
        js\src\jswrapper.h(57) : see declaration of 'js::Wrapper'

--HG--
extra : rebase_source : cc1e87a0b1ce01094263a20f40638b0532e3f24e
extra : source : 9207eefa78eea211092df344b7aa9752fbc7bfb3
2015-02-25 15:26:23 +11:00
Xidorn Quan
8d137d5b83 Bug 1135535 part 3 - Fix C4258 definition ignored warnings and mark it an error in js/src on MSVC. r=luke
Fix warnings:
js\src\vm/UnboxedObject.cpp(212) : error C4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used
        js\src\vm/UnboxedObject.cpp(209) : definition of 'i' ignored
        js\src\vm/UnboxedObject.cpp(204) : definition of 'i' used
js\src\vm/UnboxedObject.cpp(213) : error C4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used
        js\src\vm/UnboxedObject.cpp(209) : definition of 'i' ignored
        js\src\vm/UnboxedObject.cpp(204) : definition of 'i' used

--HG--
extra : rebase_source : 8ac8533686614faac97c7e58c1a014fae24f067c
extra : source : 1c10edf1b22a90eb60dfeb7557043a9d3e71d90d
2015-02-25 15:26:23 +11:00
Xidorn Quan
79b28e6f04 Bug 1135535 part 2 - Fix C4067 unexpected token in js/src and mark this warning an error on MSVC. r=luke
Fix warning:
js/src/frontend/Parser.cpp(2571) : error C4067: unexpected tokens following preprocessor directive - expected a newline

--HG--
extra : rebase_source : 306de2dd08d4ae6cd5cd2c3d98253834af30e91d
extra : source : a92c239aab4f18bed4df0f5581152862c5e75740
2015-02-25 15:26:23 +11:00
Xidorn Quan
ac32ade601 Bug 1135535 part 1 - Suppress C4805 unsafe mix type warnings in js/src and mark that warning an error on MSVC. r=luke
Suppress warnings:
js\src\asmjs/AsmJSModule.cpp(2060) : error C4805: '!=' : unsafe mix of type 'const uint32_t' and type 'bool' in operation
js\src\jit/BaselineDebugModeOSR.cpp(650) : error C4805: '==' : unsafe mix of type 'bool' and type 'js::Debugger::IsObserving' in operation
js\src\jit/BaselineDebugModeOSR.cpp(670) : error C4805: '==' : unsafe mix of type 'bool' and type 'js::Debugger::IsObserving' in operation
js\src\jit/shared/Assembler-x86-shared.h(2434) : error C4805: '|' : unsafe mix of type 'bool' and type 'int' in operation
js\src\vm/Debugger.cpp(2042) : error C4805: '==' : unsafe mix of type 'bool' and type 'js::Debugger::IsObserving' in operation
js\src\vm/Debugger.cpp(2063) : error C4805: '==' : unsafe mix of type 'bool' and type 'js::Debugger::IsObserving' in operation
js\src\vm/ScopeObject.cpp(823) : error C4805: '|' : unsafe mix of type 'int' and type 'bool' in operation
js\src\vm/SPSProfiler.cpp(81) : error C4805: '==' : unsafe mix of type 'uint32_t' and type 'bool' in operation

--HG--
extra : rebase_source : a601688b79fa8f8925f21d6d0f9b28fc8cfc26ef
extra : source : d4711addda74fcce0804bd09646ca7589638a1b5
2015-02-25 15:26:23 +11:00
Gregory Szorc
0cb191aded Bug 1134072 - Support for sub-contexts; r=glandium
As content in moz.build files has grown, it has become clear that
storing everything in one global namespace (the "context") per moz.build
file will not scale. This approach (which is carried over from
Makefile.in patterns) limits our ability to do things like declare
multiple instances of things (like libraries) per file.

A few months ago, templates were introduced to moz.build files. These
started the process of introducing separate contexts / containers in
each moz.build file. But it stopped short of actually emitting multiple
contexts per container. Instead, results were merged with the main
context.

This patch takes sub-contexts to the next level.

Introduced is the "SubContext" class. It is a Context derived from
another context. SubContexts are special in that they are context
managers. With the context manager is entered, the SubContext becomes
the main context associated with the executing sandbox, temporarily
masking the existence of the main context. This means that UPPERCASE
variable accesses and writes will be handled by the active SubContext.
This allows SubContext instances to define different sets of variables.

When a SubContext is spawned, it is attached to the sandbox executing
it. The moz.build reader will now emit not only the main context, but
also every SubContext that was derived from it.

To aid with the creation and declaration of sub-contexts, we introduce
the SUBCONTEXTS variable. This variable holds a list of classes that
define sub-contexts.

Sub-contexts behave a lot like templates. Their class names becomes the
symbol name in the sandbox.

--HG--
extra : rebase_source : 5df4bcf073ce46605b972021f1e918ce4affa6f3
2015-02-24 13:05:59 -08:00
B2G Bumper Bot
875832dc66 Bumping manifests a=b2g-bump 2015-02-23 14:15:41 -08:00
B2G Bumper Bot
7d0f672331 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f90c9ab3d3fa
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1134436 - merge pull request #28324 from punamdahiya:Bug1134436 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/64943b8fde47
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug 1134436 - [Gallery][RTL] - Exposure slider is not mirrored r= djf
2015-02-23 14:15:24 -08:00
aus@mozilla.com
f917f305c5 bug 1126065 - Make JS callers of ios.newChannel call ios.newChannel2 in dom/browser-element. r=sicking 2015-02-23 14:11:23 -08:00
B2G Bumper Bot
f8586bb4b5 Bumping manifests a=b2g-bump 2015-02-23 13:57:59 -08:00
B2G Bumper Bot
6a57489253 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

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

Bug 1122688 - missing "Emergency Call" icon, r=drs

========

https://hg.mozilla.org/integration/gaia-central/rev/82ddb69e764e
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Bug 1122688 - missing "Emergency Call" icon

========

https://hg.mozilla.org/integration/gaia-central/rev/e5d8d590f396
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #28000 from eliperelman/bug-1129041-verticalhome

Bug 1129041 - Homescreen: remove user timing shim

========

https://hg.mozilla.org/integration/gaia-central/rev/d665408e9d2b
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1129041 - Homescreen: remove user timing shim
2015-02-23 13:55:35 -08:00
B2G Bumper Bot
ad2fbb30e4 Bumping manifests a=b2g-bump 2015-02-23 13:33:16 -08:00
B2G Bumper Bot
fbe072cb1a Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/151a63aae5c5
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #27994 from eliperelman/bug-1129041-fm

Bug 1129041 - FM Radio: remove user timing shim

========

https://hg.mozilla.org/integration/gaia-central/rev/fb7cb44c9faf
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1129041 - FM Radio: remove user timing shim

========

https://hg.mozilla.org/integration/gaia-central/rev/15fce38fe7d7
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #27991 from eliperelman/bug-1129041-costcontrol

Bug 1129041 - Usage: remove user timing shim

========

https://hg.mozilla.org/integration/gaia-central/rev/faeca3d56a5e
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1129041 - Usage: remove user timing shim

========

https://hg.mozilla.org/integration/gaia-central/rev/3d6eb9204775
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #27989 from eliperelman/bug-1129041-clock

Bug 1129041 - Clock: remove user timing shim

========

https://hg.mozilla.org/integration/gaia-central/rev/37de0d40b303
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1129041 - Clock: remove user timing shim

========

https://hg.mozilla.org/integration/gaia-central/rev/2cb07571eba1
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #27988 from eliperelman/bug-1129041-camera

Bug 1129041 - Camera: remove user timing shim

========

https://hg.mozilla.org/integration/gaia-central/rev/88258fb73715
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1129041 - Camera: remove user timing shim
2015-02-23 13:30:35 -08:00
B2G Bumper Bot
3b54111668 Bumping manifests a=b2g-bump 2015-02-23 13:17:41 -08:00
B2G Bumper Bot
90c8d1b2c2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9354e52c382c
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #28274 from eliperelman/bug-1129687

Bug 1129687 - Supporting changes to User Timing proper

========

https://hg.mozilla.org/integration/gaia-central/rev/f202eb65639f
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1129687 - Supporting changes to User Timing proper
2015-02-23 13:15:17 -08:00
Margaret Leibovic
7de05fc0ce Bug 1073775 - Pass default engine from JS to Java, instead of making assumptions based on engine list order. r=liuche
--HG--
extra : rebase_source : 63d2c0c787bbb936823332f3ec347ceb4baf1e82
2015-02-23 13:13:24 -08:00
Benoit Girard
ca353d647a Bug 1135809 - add apz. prefs to about:support. r=kats
--HG--
extra : rebase_source : baf3839711892bfc490fc410d434733fd1307128
2015-02-23 15:51:41 -05:00
Xidorn Quan
728e9e7a08 Bug 1135361 - Fix position of ruby annotation in vertical-rl mode when justification is applied to the base. r=jfkthame
--HG--
extra : source : 9e051be10b37ed8c189bcae17fe8cb95b490d661
2015-02-24 14:46:29 +11:00
B2G Bumper Bot
44e8029232 Bumping manifests a=b2g-bump 2015-02-23 12:43:06 -08:00
B2G Bumper Bot
c274ab5b84 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c67f4c74721d
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #28285 from lissyx/bug1133965

Bug 1133965 - Support Camera and CameraFocus buttons r=wilsonpage

========

https://hg.mozilla.org/integration/gaia-central/rev/aa3cb20625a3
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 1133965 - Support Camera and CameraFocus buttons r=wilsonpage

========

https://hg.mozilla.org/integration/gaia-central/rev/0d8c9e85c245
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #27303 from fabi1cazenave/transparency-search

Bug 1121831 - Transparency Control, app search, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/3369f585c52b
Author: Fabien Cazenave <fabien@phoxygen.com>
Desc: bug 1121831 - Transparency Control: app search
2015-02-23 12:40:19 -08:00
Mason Chang
fbd9897745 Bug 1133526. Only enable vsync compositor or refresh driver if hardware vsync is enabled. r=kats 2015-02-23 12:04:11 -08:00
B2G Bumper Bot
e40d26cc72 Bumping manifests a=b2g-bump 2015-02-23 12:02:56 -08:00
B2G Bumper Bot
aa1555d1e7 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d1aa7657d315
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1132845 - merge pull request #28215 from millermedeiros:1132845-rtl-drawer-buttons to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/92d47f17e456
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1132845 - [RTL][Calendar] The settings button and reload button change their position.

========

https://hg.mozilla.org/integration/gaia-central/rev/a8803158d744
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1132336 - merge pull request #28195 from millermedeiros:1132336-notification-click-close to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/bde5f0827002
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1132336 - [Calendar] notifications aren't closed during click if it was triggered while the calendar app was closed

========

https://hg.mozilla.org/integration/gaia-central/rev/cd29feff9a24
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1132238 - merge pull request #28198 from millermedeiros:1132238-rtl-account-truncated to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/5b106841d7dc
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1132238 - [RTL][Calendar] Accounts are incorrectly truncated.
2015-02-23 12:00:30 -08:00
Chris
19e182b01e Bug 1121417: Change hiddenOneOffs pref to use unichar type. r=florian 2015-02-23 10:45:15 -08:00
Johan K. Jensen
84536e6ce5 Bug 1096294 - Display pseudo-arrays like arrays in the console; r=pbrosset 2015-02-23 17:27:05 -08:00
Jordan Santell
24ae013821 Bug 978948 - Add animation generator support for setTimeout in the canvas debugger. r=vp 2015-02-23 17:26:56 -08:00
Wes Kocher
a72a85f6e2 Merge m-c to fx-team a=merge 2015-02-23 17:03:56 -08:00
Ehsan Akhgari
baf73d756f Bug 1135745 - Disable the reserved-id-macro macro in security/pkix; r=briansmith 2015-02-23 13:40:09 -05:00
Richard Newman
7baddf9574 Bug 1130461 - Part 3: disable ReadingListHelper's background fetch triggers to avoid test problems. r=margaret 2015-02-23 10:35:11 -08:00
Richard Newman
b4c36f7f5d Bug 1130461 - Part 2: correct value setting in AddToReadingList. r=margaret
It turns out we were using bookmark columns here, which was wrong. We also need to specify ADDED_ON etc.
2015-02-23 10:35:11 -08:00
Richard Newman
aa7371af28 Bug 1130461 - Part 1: change schema for reading list. r=margaret
This patch does several things, all in one commit because of a schema update:

* Uses _id instead of guid when referring to reading list items, allowing the guid column to be null.
* Reworks schema upgrading.
* Completely revises the reading list schema itself.
* Fixes the tests.
* Cleans up how we do deletion: if an item hasn't yet been synced, it's simply deleted immediately. We can do this because the server allocates GUIDs.
* Adds columns to manage sync-related metadata.
2015-02-23 10:35:11 -08:00
Ehsan Akhgari
c666513656 Bug 1123111 - Fix a typo 2015-02-23 13:13:29 -05:00
William Chen
46214bb09f Bug 1134021 - Use composed document when getting nsDOMWindowUtils from shadow DOM content. r=kats 2015-02-23 10:10:23 -08:00
Jared Wein
fe221f3402 Bug 1047040 - Add browser-specific graphic of GUM prompt to the media-wait message. r=dmose
--HG--
extra : rebase_source : 53512e75b501e3e486e48828c41d7a2ea492d9b4
2015-02-23 13:00:03 -05:00
Ms2ger
2649263bed Bug 1135138 - Remove UNICODE from DEFINES in moz.build rather than Makefile.in; r=mshal
This was made possible by bug 928709.
2015-02-23 18:46:55 +01:00
B2G Bumper Bot
db93afe0f6 Bumping manifests a=b2g-bump 2015-02-23 09:46:02 -08:00
B2G Bumper Bot
3c6437b8ba Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/002a7af7c23a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #28353 from KevinGrandon/bug_1123433_oop_coppa_screen

Bug 1123433 - [FxA] Use EntrySheet for coppa error

========

https://hg.mozilla.org/integration/gaia-central/rev/5a62d6cbe819
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1123433 - [FxA] Use EntrySheet for coppa error

========

https://hg.mozilla.org/integration/gaia-central/rev/39c704bb1fe1
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1134337 - merge pull request #28351 from KevinGrandon:bug_1134337_cards_view_app_window_title to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/9a9e9ecd854a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1134337 - Do not expose URLs from the app protocol in the cards view
2015-02-23 09:45:44 -08:00
Robert Strong
e793fd04f4 Bug 1135319 - Fix several javascript warnings when for mochitest-chrome app update tests and cleanup style. r=spohl 2015-02-23 09:45:03 -08:00
Ryan VanderMeulen
fe6e64f262 Backed out changeset 45d4cc092de1 (bug 1134598) for WinXP reftest leaks. 2015-02-23 12:37:04 -05:00
Ryan VanderMeulen
8979effb6c Merge m-c to inbound. a=merge 2015-02-23 12:33:38 -05:00
Ryan VanderMeulen
e522eacb94 Merge b2g-inbound to m-c. a=merge 2015-02-23 12:32:53 -05:00
Ryan VanderMeulen
46cf692211 Merge fx-team to m-c. a=merge 2015-02-23 12:28:02 -05:00
Tom Schuster
affc0dee90 Bug 1131531 - Ion GetElement IC should handle dense element holes. r=jandem 2015-02-23 18:21:51 +01:00
Tom Schuster
5189e1f281 Bug 1127629 - Handle void in ExpressionDecompiler. r=jandem 2015-02-23 18:21:51 +01:00
Botond Ballo
19a974637b Bug 1135591 - Fix build breakage from bug 1132153 in code conditional on '--enable-ipdl-tests'. r=dholbert 2015-02-23 11:42:16 -05:00
B2G Bumper Bot
abaafc0608 Bumping manifests a=b2g-bump 2015-02-23 07:52:41 -08:00