Commit Graph

15968 Commits

Author SHA1 Message Date
Ryan VanderMeulen
1c2e96e8f9 Merge m-c to inbound. 2013-07-30 15:41:57 -04:00
Ryan VanderMeulen
37174a2eb7 Merge m-c to fx-team. 2013-07-30 13:12:26 -04:00
Steven MacLeod
735b2cb34a Bug 897396 - Add telemetry to Session Store for restoring a window; r=ttaubert 2013-07-30 09:38:49 -07:00
Ryan VanderMeulen
e3e2198ade Merge m-c to inbound on a CLOSED TREE. 2013-07-30 09:23:28 -04:00
Stephen Pohl
cfbcb464d4 Bug 891136: Set pointer-events:auto CSS rule for overlay scrollbars to help make them work on sites such as Google Docs. r=roc 2013-07-29 20:23:31 -04:00
Bobby Holley
c00f6379ec Bug 899245 - Rename JS_GetGlobalForScopeChain to JS::CurrentGlobalOrNull. r=luke
This was done with perl/grep.
2013-07-29 16:45:27 -07:00
Nick Fitzgerald
5de4726d79 Bug 899215 - test_breakpointstore.js isn't testing anything; r=jimb 2013-07-29 15:52:35 -07:00
Ryan VanderMeulen
78c8d092c8 Merge m-c to inbound. 2013-07-29 18:42:45 -04:00
Ryan VanderMeulen
8e8446554e Merge m-c to fx-team. 2013-07-29 16:08:41 -04:00
Shane Caraveo
5ae8ef14b5 bug 896314 fix permission icon when swapping social providers, r=felipe 2013-07-29 09:35:41 -07:00
Marco Castelluccio
1634e16fb6 Bug 893297 - Icon problem when installing an app from within another app (yo dawg). r=Mossop
--HG--
rename : browser/themes/linux/webapps-16.png => toolkit/themes/linux/global/icons/webapps-16.png
rename : browser/themes/linux/webapps-64.png => toolkit/themes/linux/global/icons/webapps-64.png
rename : browser/themes/osx/webapps-16.png => toolkit/themes/osx/global/icons/webapps-16.png
rename : browser/themes/osx/webapps-16@2x.png => toolkit/themes/osx/global/icons/webapps-16@2x.png
rename : browser/themes/osx/webapps-64.png => toolkit/themes/osx/global/icons/webapps-64.png
rename : browser/themes/windows/webapps-16.png => toolkit/themes/windows/global/icons/webapps-16.png
rename : browser/themes/windows/webapps-64.png => toolkit/themes/windows/global/icons/webapps-64.png
2013-07-29 12:17:57 -04:00
Christos Stathis
d72e018f11 Bug 686937 - Include JSTerm helpers in autocompletion suggestions; r=past 2013-07-27 11:44:00 +03:00
Ed Morley
c02ed6a62f Merge mozilla-central and inbound 2013-07-29 15:42:41 +01:00
Jon Coppeard
8278efd42a Bug 897484 - GC: Convert JS_GetProperty APIs to take MutableHandleValue r=terrence r=bholley r=smaug 2013-07-26 10:00:38 +01:00
Ehsan Akhgari
77a958fb3c Bug 895322 - Part 2: Stop generating MOZ_STATIC_ASSERT in the telemetry code; r=Waldo
--HG--
extra : rebase_source : 5fae47388a94b4429eb4ed217b92ed919b58d2d8
2013-07-18 14:32:52 -04:00
Ehsan Akhgari
5ee21d6d3f Bug 895322 - Part 1: Replace the usages of MOZ_STATIC_ASSERT with C++11 static_assert; r=Waldo
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:

# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.mm" \) | \
    xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
                   media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
                   modules/libmar/src/mar_private.h \
                   modules/libmar/src/mar.h


# assert_replacer.py
#!/usr/bin/python

import sys
import re

pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")

def replaceInPlace(fname):
  print fname
  f = open(fname, "rw+")
  lines = f.readlines()
  for i in range(0, len(lines)):
    while True:
      index = re.search(pattern, lines[i])
      if index != None:
        index = index.start()
        lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
        for j in range(i + 1, len(lines)):
          if lines[j].find("                 ", index) == index:
            lines[j] = lines[j][0:index] + lines[j][index+4:]
          else:
            break
      else:
        break
  f.seek(0, 0)
  f.truncate()
  f.write("".join(lines))
  f.close()

argc = len(sys.argv)
for i in range(1, argc):
  replaceInPlace(sys.argv[i])

--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
2013-07-18 13:59:53 -04:00
Ryan VanderMeulen
7c78789aec Merge inbound to m-c. 2013-07-27 21:52:40 -04:00
Ryan VanderMeulen
596b9a226a Merge fx-team to m-c. 2013-07-27 21:51:16 -04:00
Matt Brubeck
d67cc2dd72 Bug 897674 - Don't use STL wrappers when building maintenance service [r=gps] 2013-07-27 11:07:10 -07:00
Nick Fitzgerald
14e226bf9d Bug 892605 - part 2: add 'dbg blackbox' and 'dbg unblackbox' gcli commands; r=vporof 2013-07-27 10:50:57 -07:00
Nick Fitzgerald
6443c688de Bug 892605 - part 1: move the BlackBoxChange DOM event to blackboxchange thread client event; r=vporof 2013-07-27 10:49:45 -07:00
Ryan VanderMeulen
7d033099d0 Merge m-c to inbound. 2013-07-27 13:31:57 -04:00
Dão Gottwald
fbfe753446 Backed out fe1213d6035d (bug 887868) because it seems to have caused bug 898713. CLOSED TREE 2013-07-27 15:47:36 +02:00
Olli Pettay
676d2b13e5 Bug 897433 - Telemetry for SnowWhite and more async SnowWhite freeing (patch v4), r=mccr8 2013-07-27 13:48:45 +03:00
Nick Fitzgerald
44140a118e Bug 897777 - fix source mapped source resolution when there is no source root; r=jimb 2013-07-26 22:27:15 -07:00
Ryan VanderMeulen
0e7ad338bd Merge m-c to fx-team. 2013-07-26 22:27:22 -04:00
Felipe Gomes
04b62d74c6 Bug 898170 - nsIWebProgress.isToplevel should be true when not notifying listeners (r=billm) 2013-07-26 14:26:43 -07:00
Bill McCloskey
d712b7b982 Bug 898170 - Don't remove listeners after their message manager is gone (r=felipe) 2013-07-26 14:26:40 -07:00
Bill McCloskey
62598015b8 Bug 898170 - contentTitle should default to empty string (r=felipe) 2013-07-26 14:26:35 -07:00
Dave Camp
59f0439fe0 Bug 896274 - Allow an object's form to be an actor id. r=jimb 2013-07-21 11:02:30 -07:00
Dave Camp
144d1df6f6 Bug 896270 - Replace optional arguments with nullable types in protocol.js, part 2. r=jimb 2013-07-21 10:38:40 -07:00
Dave Camp
4c5527dc91 Bug 896270 - Replace optional arguments with nullable types in protocol.js, part 1. r=jimb 2013-07-21 10:15:59 -07:00
Ryan VanderMeulen
3c07cf2db4 Merge m-c to fx-team. 2013-07-26 10:49:26 -04:00
Paolo Amadini
73c5042e70 Bug 836437 - Part 1 of 3 - Unify DownloadLegacy tests in preparation for resuming support. r=enn
--HG--
rename : toolkit/components/jsdownloads/test/unit/test_DownloadCore.js => toolkit/components/jsdownloads/test/unit/common_test_Download.js
2013-07-26 15:30:40 +02:00
Paolo Amadini
74a0a0026b Bug 851454 - Define the format of "downloads.json" and of the parameters of createDownload. r=enn 2013-07-26 15:30:35 +02:00
Ryan VanderMeulen
8b01e79375 Merge birch to m-c. 2013-07-25 21:56:14 -04:00
Ed Morley
817db8cfd2 Merge mozilla-central and birch 2013-07-25 17:05:50 +01:00
Ed Morley
64c47c4c55 Merge latest green fx-team changeset and mozilla-central 2013-07-25 16:51:21 +01:00
Gijs Kruitbosch
1d987c71cd Backed out changeset 0593679c47a9 (bug 894099) because it causes bug 897901. DONTBUILD 2013-07-25 11:46:25 +02:00
Gijs Kruitbosch
a33cfde917 Bug 894099 - Use WindowDraggingUtils.jsm for dragging the window on XP because the hit test is slow, r=jimm,felipe,dao 2013-07-22 23:08:09 -07:00
Wes Kocher
ee8587cfcf Merge m-c to fx-team 2013-07-24 20:09:12 -07:00
Wes Kocher
8973fa932b Backout 4ededc9b11f (bug 897433) for intermittent dromeao crashes 2013-07-24 19:45:31 -07:00
Nick Fitzgerald
fd08b554a4 Bug 860035 - script actors should handle breakpoints with columns; r=jimb 2013-07-24 17:46:49 -07:00
Matthew Noorenberghe
dca6c7c510 Bug 583578 - Auto-fill password fields even if the username field is disabled or read-only. r=dolske 2013-07-24 16:57:46 -07:00
Matthew Noorenberghe
54c4b31e26 Bug 896316 - Part 2 - Cleanup nsFormFillController::Focus to not treat password fields specially. r=dolske 2013-07-24 16:57:46 -07:00
Matthew Noorenberghe
8d4889033a Bug 896316 - Part 1 - Don't start controlling a read-only input even if it's marked as a login manager field. r=dolske 2013-07-24 16:57:45 -07:00
Ryan VanderMeulen
4089fb5f64 Merge m-c to inbound. 2013-07-24 18:27:51 -04:00
Ryan VanderMeulen
274e2e8dc0 Merge m-c to inbound. 2013-07-24 18:22:45 -04:00
Ryan VanderMeulen
0271fd8de0 Merge m-c to birch. 2013-07-24 18:22:06 -04:00
Olli Pettay
7b5e7439fb Bug 897433, Telemetry for SnowWhite and more async SnowWhite freeing, r=mccr8
--HG--
extra : rebase_source : 8dc76b113da44372fe3e558a588a8fc70d2cfaab
2013-07-24 22:34:51 +03:00