Commit Graph

11649 Commits

Author SHA1 Message Date
Ryan VanderMeulen
c39b31d3fd Merge inbound to m-c. a=merge 2015-04-23 17:10:28 -04:00
Carsten "Tomcat" Book
f87169c55d Merge mozilla-central to fx-team 2015-04-23 15:58:20 +02:00
Carsten "Tomcat" Book
ad1045aa02 merge mozilla-inbound to mozilla-central a=merge 2015-04-23 15:41:03 +02:00
Asaf Romano
3e864279a2 Bug 951651 - Make bookmarkProperties, Star UI and Library info pane work with PlacesTransactions. r=mak 2015-04-23 16:34:55 +03:00
Carsten "Tomcat" Book
113727c6bc Backed out changeset 7f9114a84892 (bug 951651) for bc2 test bustage on a CLOSED TREE 2015-04-23 08:52:56 +02:00
Carsten "Tomcat" Book
77282f2a3e Merge mozilla-central to fx-team on a CLOSED TREE 2015-04-23 08:47:11 +02:00
Carsten "Tomcat" Book
d7660b2db1 Merge mozilla-central to mozilla-inbound on a CLOSED TREE 2015-04-23 08:41:04 +02:00
Carsten "Tomcat" Book
bab9dbe9c4 Backed out 19 changesets (bug 1149397, bug 1065657, bug 1024774) for fixing Linux PGO xpcshell bustage on a CLOSED TREE
Backed out changeset 53058615e7a3 (bug 1024774)
Backed out changeset 68fe0894bb09 (bug 1065657)
Backed out changeset 1b9620d674df (bug 1024774)
Backed out changeset a31c514b59da (bug 1024774)
Backed out changeset 0fcf8757f6c2 (bug 1024774)
Backed out changeset 9a3c71b925d4 (bug 1024774)
Backed out changeset 783acc92af04 (bug 1024774)
Backed out changeset ad71c9a3446b (bug 1024774)
Backed out changeset 4f37e72e70f6 (bug 1024774)
Backed out changeset ec869578cc0a (bug 1024774)
Backed out changeset 3c1d306c8a3d (bug 1024774)
Backed out changeset b3a90f30892d (bug 1024774)
Backed out changeset cf7bbb3774c0 (bug 1024774)
Backed out changeset 2522eb4d3cf2 (bug 1024774)
Backed out changeset 89a502d88f9c (bug 1024774)
Backed out changeset 61046ad3161f (bug 1024774)
Backed out changeset 36706aaa2f06 (bug 1024774)
Backed out changeset ba8e68e05149 (bug 1149397)
Backed out changeset 532169437c2f (bug 1065657)

--HG--
rename : toolkit/components/protobuf/src/google/protobuf/extension_set.cc => toolkit/components/protobuf/google/protobuf/extension_set.cc
rename : toolkit/components/protobuf/src/google/protobuf/extension_set.h => toolkit/components/protobuf/google/protobuf/extension_set.h
rename : toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h => toolkit/components/protobuf/google/protobuf/generated_message_util.cc
rename : toolkit/components/protobuf/src/google/protobuf/stubs/stringprintf.h => toolkit/components/protobuf/google/protobuf/generated_message_util.h
rename : toolkit/components/protobuf/src/google/protobuf/io/coded_stream.cc => toolkit/components/protobuf/google/protobuf/io/coded_stream.cc
rename : toolkit/components/protobuf/src/google/protobuf/io/coded_stream.h => toolkit/components/protobuf/google/protobuf/io/coded_stream.h
rename : toolkit/components/protobuf/src/google/protobuf/io/coded_stream_inl.h => toolkit/components/protobuf/google/protobuf/io/coded_stream_inl.h
rename : toolkit/components/protobuf/src/google/protobuf/io/package_info.h => toolkit/components/protobuf/google/protobuf/io/package_info.h
rename : toolkit/components/protobuf/src/google/protobuf/service.cc => toolkit/components/protobuf/google/protobuf/io/zero_copy_stream.cc
rename : toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream.h => toolkit/components/protobuf/google/protobuf/io/zero_copy_stream.h
rename : toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h => toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl.h
rename : toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc => toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
rename : toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h => toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h
rename : toolkit/components/protobuf/src/google/protobuf/message_lite.cc => toolkit/components/protobuf/google/protobuf/message_lite.cc
rename : toolkit/components/protobuf/src/google/protobuf/message_lite.h => toolkit/components/protobuf/google/protobuf/message_lite.h
rename : toolkit/components/protobuf/src/google/protobuf/package_info.h => toolkit/components/protobuf/google/protobuf/package_info.h
rename : toolkit/components/protobuf/src/google/protobuf/repeated_field.cc => toolkit/components/protobuf/google/protobuf/repeated_field.cc
rename : toolkit/components/protobuf/src/google/protobuf/repeated_field.h => toolkit/components/protobuf/google/protobuf/repeated_field.h
rename : toolkit/components/protobuf/src/google/protobuf/stubs/common.cc => toolkit/components/protobuf/google/protobuf/stubs/common.cc
rename : toolkit/components/protobuf/src/google/protobuf/stubs/common.h => toolkit/components/protobuf/google/protobuf/stubs/common.h
rename : toolkit/components/protobuf/src/google/protobuf/stubs/hash.h => toolkit/components/protobuf/google/protobuf/stubs/hash.h
rename : toolkit/components/protobuf/src/google/protobuf/stubs/once.cc => toolkit/components/protobuf/google/protobuf/stubs/once.cc
rename : toolkit/components/protobuf/src/google/protobuf/stubs/once.h => toolkit/components/protobuf/google/protobuf/stubs/once.h
rename : toolkit/components/protobuf/src/google/protobuf/stubs/stl_util.h => toolkit/components/protobuf/google/protobuf/stubs/stl_util-inl.h
rename : toolkit/components/protobuf/src/google/protobuf/wire_format_lite.cc => toolkit/components/protobuf/google/protobuf/wire_format_lite.cc
rename : toolkit/components/protobuf/src/google/protobuf/wire_format_lite.h => toolkit/components/protobuf/google/protobuf/wire_format_lite.h
rename : toolkit/components/protobuf/src/google/protobuf/wire_format_lite_inl.h => toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h
2015-04-23 08:37:24 +02:00
Asaf Romano
7f68adcfa1 Bug 951651 - Make bookmarkProperties, Star UI and Library info pane work with PlacesTransactions. r=mak. 2015-04-23 08:15:21 +03:00
Tooru Fujisawa
3082327595 Bug 891107 - Part 3: Report argument type error as TypeError in js-ctypes. r=jorendorff 2015-04-23 13:41:31 +09:00
Tooru Fujisawa
7c26967f31 Bug 891107 - Part 2: Report argument length error as TypeError in js-ctypes. r=jorendorff 2015-04-23 13:41:27 +09:00
Tooru Fujisawa
cf2e4ba315 Bug 891107 - Part 1: Show information about value, type, function, and argument number in type conversion error messages in js-ctypes. r=jorendorff 2015-04-23 13:41:10 +09:00
Wes Kocher
b43e5283da Merge m-c to fx-team a=merge 2015-04-22 17:27:15 -07:00
Nick Fitzgerald
21c2d145e3 Bug 1024774 - Part 0: Upgrade the protobuf library. r=mmc,glandium
--HG--
rename : toolkit/components/protobuf/google/protobuf/extension_set.cc => toolkit/components/protobuf/src/google/protobuf/extension_set.cc
rename : toolkit/components/protobuf/google/protobuf/extension_set.h => toolkit/components/protobuf/src/google/protobuf/extension_set.h
rename : toolkit/components/protobuf/google/protobuf/generated_message_util.cc => toolkit/components/protobuf/src/google/protobuf/generated_message_util.cc
rename : toolkit/components/protobuf/google/protobuf/generated_message_util.h => toolkit/components/protobuf/src/google/protobuf/generated_message_util.h
rename : toolkit/components/protobuf/google/protobuf/io/coded_stream.cc => toolkit/components/protobuf/src/google/protobuf/io/coded_stream.cc
rename : toolkit/components/protobuf/google/protobuf/io/coded_stream.h => toolkit/components/protobuf/src/google/protobuf/io/coded_stream.h
rename : toolkit/components/protobuf/google/protobuf/io/coded_stream_inl.h => toolkit/components/protobuf/src/google/protobuf/io/coded_stream_inl.h
rename : toolkit/components/protobuf/google/protobuf/io/package_info.h => toolkit/components/protobuf/src/google/protobuf/io/package_info.h
rename : toolkit/components/protobuf/google/protobuf/io/zero_copy_stream.cc => toolkit/components/protobuf/src/google/protobuf/io/strtod.h
rename : toolkit/components/protobuf/google/protobuf/io/zero_copy_stream.cc => toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream.cc
rename : toolkit/components/protobuf/google/protobuf/io/zero_copy_stream.h => toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream.h
rename : toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl.h => toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h
rename : toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc => toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
rename : toolkit/components/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h => toolkit/components/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h
rename : toolkit/components/protobuf/google/protobuf/message_lite.cc => toolkit/components/protobuf/src/google/protobuf/message_lite.cc
rename : toolkit/components/protobuf/google/protobuf/message_lite.h => toolkit/components/protobuf/src/google/protobuf/message_lite.h
rename : toolkit/components/protobuf/google/protobuf/package_info.h => toolkit/components/protobuf/src/google/protobuf/package_info.h
rename : toolkit/components/protobuf/google/protobuf/generated_message_util.h => toolkit/components/protobuf/src/google/protobuf/reflection_ops.h
rename : toolkit/components/protobuf/google/protobuf/repeated_field.cc => toolkit/components/protobuf/src/google/protobuf/repeated_field.cc
rename : toolkit/components/protobuf/google/protobuf/repeated_field.h => toolkit/components/protobuf/src/google/protobuf/repeated_field.h
rename : toolkit/components/protobuf/google/protobuf/io/zero_copy_stream.cc => toolkit/components/protobuf/src/google/protobuf/service.cc
rename : toolkit/components/protobuf/google/protobuf/generated_message_util.cc => toolkit/components/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h
rename : toolkit/components/protobuf/google/protobuf/stubs/common.cc => toolkit/components/protobuf/src/google/protobuf/stubs/common.cc
rename : toolkit/components/protobuf/google/protobuf/stubs/common.h => toolkit/components/protobuf/src/google/protobuf/stubs/common.h
rename : toolkit/components/protobuf/google/protobuf/stubs/hash.h => toolkit/components/protobuf/src/google/protobuf/stubs/hash.h
rename : toolkit/components/protobuf/google/protobuf/stubs/once.cc => toolkit/components/protobuf/src/google/protobuf/stubs/once.cc
rename : toolkit/components/protobuf/google/protobuf/stubs/once.h => toolkit/components/protobuf/src/google/protobuf/stubs/once.h
rename : toolkit/components/protobuf/google/protobuf/stubs/stl_util-inl.h => toolkit/components/protobuf/src/google/protobuf/stubs/stl_util.h
rename : toolkit/components/protobuf/google/protobuf/generated_message_util.h => toolkit/components/protobuf/src/google/protobuf/stubs/stringprintf.h
rename : toolkit/components/protobuf/google/protobuf/wire_format_lite.cc => toolkit/components/protobuf/src/google/protobuf/wire_format_lite.cc
rename : toolkit/components/protobuf/google/protobuf/wire_format_lite.h => toolkit/components/protobuf/src/google/protobuf/wire_format_lite.h
rename : toolkit/components/protobuf/google/protobuf/wire_format_lite_inl.h => toolkit/components/protobuf/src/google/protobuf/wire_format_lite_inl.h
2015-04-22 11:09:54 -07:00
Tim Taubert
bed2a2af1d Bug 1134518 - Send a state object instead of a string to SessionWorker.write() r=Yoric 2015-04-22 16:18:26 +02:00
Robert Strong
70f12f8266 Bug 1157311 - Add telemetry alert_emails for UPDATE_* histograms. r=vdjeric 2015-04-22 10:58:05 -07:00
Marco Bonardo
34e6d5de56 Bug 1148459 - Use new keywords API in tests. r=ttaubert 2015-04-21 22:21:52 +02:00
David Rajchenbach-Teller
15afd14713 Bug 1153657 - Performance Monitoring is not ready to ride the trains. r=yoric 2015-04-18 14:26:13 +02:00
David Rajchenbach-Teller
742c76ab81 Bug 1151750 - about:performance now recapitulates alerts. r=mossop 2015-04-09 23:20:35 +02:00
Vladan Djeric
80a240082f Bug 1149284 - Restore Telemetry tests. r=rvitillo, r=sstamm 2015-04-20 19:41:53 -04:00
Carsten "Tomcat" Book
92635b7ff7 Merge mozilla-central to fx-team 2015-04-21 12:45:22 +02:00
Carsten "Tomcat" Book
57a5fd4e81 merge fx-team to mozilla-central a=merge 2015-04-21 12:06:04 +02:00
Wes Kocher
4b97517c7c Merge m-c to fx-team a=merge CLOSED TREE 2015-04-20 17:19:07 -07:00
Wes Kocher
1d3fd84d27 Merge fx-team to m-c a=merge CLOSED TREE 2015-04-20 17:04:09 -07:00
Georg Fritzsche
536bd3cd7b Bug 1155604 - Increase limit for pending pings before Telemetry evicts them. r=vladan 2015-04-20 13:39:40 +02:00
Alessio Placitelli
e4c6c59421 Bug 1154902 - Don't gather profile data in Telemetry on Android devices. r=gfritzsche 2015-04-20 14:03:29 +02:00
Alessio Placitelli
61ab49d51d Bug 1137404 - Remove DWriteVersion reporting from Telemetry. r=gfritzsche 2015-04-20 14:03:29 +02:00
Denis Volk
32e981896d Bug 1095098 - move do_QueryObject templates into their own header; r=froydnj 2015-04-15 12:47:03 -04:00
Georg Fritzsche
df9db8b754 Bug 1154717 - Fix toLocalTimeISOString(). r=yoric 2015-04-15 15:48:03 +02:00
Georg Fritzsche
d922320c54 Bug 1154856 - Fix TelemetrySession test issues. r=vladan 2015-04-20 11:54:00 +02:00
Tooru Fujisawa
779ce8a8fd Bug 1155846 - Comment out intentionally unreachable code and unused parameters in Prefetcher.jsm. r=billm 2015-04-18 14:58:29 +09:00
David Rajchenbach-Teller
44431cb42b Bug 1153658 - browser_compartments.js logspam. r=yoric 2015-04-13 17:42:58 +02:00
Tim Taubert
42b1229275 Bug 1129498 - Replace remove_all_bookmarks() with .eraseEverything() r=mak 2015-04-20 12:29:37 +02:00
Ehsan Akhgari
01599695e2 Bug 1156032 - Add some missing error handling in HashStore; r=gcp 2015-04-20 08:30:02 -04:00
Wes Kocher
afda1781f5 Merge m-c to inbound a=merge CLOSED TREE 2015-04-20 17:16:03 -07:00
Blake Kaplan
3cf91da55a Bug 1141661 - No need to manually convert this URI anymore. r=mossop
--HG--
extra : rebase_source : 5b4448b4b900b0cd1bd82ab4cd8b32f34972610e
2015-04-20 12:50:33 -07:00
Chirag Bhatia
a39a6a103f Bug 967196 - tagURI should trim tags. r=mak 2015-04-17 05:04:00 +02:00
Ryan VanderMeulen
dd1120e715 Merge m-c to inbound. a=merge
CLOSED TREE
2015-04-17 16:11:58 -04:00
Ryan VanderMeulen
86aee22968 Merge inbound to m-c. a=merge
--HG--
rename : toolkit/modules/tests/browser/browser_AddonWatcher.js => toolkit/components/perfmonitoring/tests/browser/browser_AddonWatcher.js
2015-04-17 15:44:37 -04:00
Gijs Kruitbosch
536b4ebf14 Bug 1155692 - include latest Readability/JSDOMParser changes into m-c, rs=me
--HG--
extra : rebase_source : 73f88154eac69eb7fc52567084a80eac2524d07e
2015-04-17 16:02:19 +01:00
Mike de Boer
a27986070d Bug 1152733: Convert all Loop keyed histograms to be enumerated types and opt-out, which helps reporting tremendously. r=vladan,dmose 2015-04-17 11:14:55 +02:00
Wasiur Rahman
fe312a66b4 Bug 1153877 - in about:performance, increased the setInterval period from 2 sec to 10 sec. r=Yoric 2015-04-14 11:32:00 +02:00
David Rajchenbach-Teller
b7c5568999 Bug 1152759 - Regroup Performance Monitoring modules/components;r=yoric
--HG--
rename : toolkit/modules/AddonWatcher.jsm => toolkit/components/perfmonitoring/AddonWatcher.jsm
rename : toolkit/modules/PerformanceStats.jsm => toolkit/components/perfmonitoring/PerformanceStats.jsm
rename : toolkit/components/aboutperformance/nsIPerformanceStats.idl => toolkit/components/perfmonitoring/nsIPerformanceStats.idl
rename : toolkit/components/aboutperformance/nsPerformanceStats.cpp => toolkit/components/perfmonitoring/nsPerformanceStats.cpp
rename : toolkit/components/aboutperformance/nsPerformanceStats.h => toolkit/components/perfmonitoring/nsPerformanceStats.h
rename : toolkit/modules/tests/browser/browser_AddonWatcher.js => toolkit/components/perfmonitoring/tests/browser/browser_AddonWatcher.js
rename : toolkit/modules/tests/browser/browser_Addons_sample.xpi => toolkit/components/perfmonitoring/tests/browser/browser_Addons_sample.xpi
rename : toolkit/components/aboutperformance/tests/browser/browser_compartments.html => toolkit/components/perfmonitoring/tests/browser/browser_compartments.html
rename : toolkit/components/aboutperformance/tests/browser/browser_compartments.js => toolkit/components/perfmonitoring/tests/browser/browser_compartments.js
rename : toolkit/components/aboutperformance/tests/xpcshell/test_compartments.js => toolkit/components/perfmonitoring/tests/xpcshell/test_compartments.js
rename : toolkit/components/aboutperformance/tests/xpcshell/xpcshell.ini => toolkit/components/perfmonitoring/tests/xpcshell/xpcshell.ini
2015-04-14 17:10:04 +02:00
Sebastian Hengst
23ac798095 Bug 1151994 - test_telemetryPing.js in asyncSetup if datareporting.healthreport.service.enabled is undefined or false. r=vdjeric 2015-04-07 20:28:12 +02:00
Blake Winton
5d4e692d69 Bug 1149068 - Use the correct font for the Sans Serif font button. ui-r=maritz, r=jaws, r=margaret 2015-04-01 18:51:53 -04:00
Gijs Kruitbosch
c5783ea4a3 Bug 1152219 - make reader mode node limit a pref, turn off entirely for desktop because of isProbablyReaderable, r=margaret
--HG--
extra : rebase_source : 37dc49ce9fd0deaae03c06d44ce7d1864ab420af
2015-04-16 16:24:08 +01:00
Carsten "Tomcat" Book
b79fa6d217 Merge mozilla-central to fx-team 2015-04-16 12:49:21 +02:00
Marco Bonardo
e2d85aa876 Bug 1148466 - Use new keywords API in BookmarkHTMLUtils and BookmarkJSONUtils. r=ttaubert 2015-04-16 12:13:43 +02:00
Bill McCloskey
dff23ab14d Bug 1154465 - Test for add-on compat warnings (r=gabor) 2015-04-15 20:01:13 -07:00
Bill McCloskey
9090527720 Bug 1154465 - Fix add-on shim telemetry (r=gabor) 2015-04-15 20:00:37 -07:00