Bug 958119 - Some cleanup for XPConnect. r=gabor
Bug 961655 - Ensure that webapps-registry-ready event is fired, even if the Webapps registry is initialized before shell.html is loaded. r=fabrice
bug 962229 - suppress spurious error messages about webapps.json not found on Fennec firstrun; r=fabrice

--HG--
extra : amend_source : 5ddf753e11f7d3a7d120d1db5f0700db810a2a8a
Bug 916564 - Move countFinalSourceNotes to a better place (r=jorendorff)

--HG--
extra : rebase_source : c0b10f87f1e10499586fed2e4fa570edfcaaf510
Bug 916564 - Expand source notes to hold 31-bit offsets (r=jorendorff)

--HG--
extra : rebase_source : bf350f233c514d6a97273d2ee23ce68476ae3b79
Bug 961108 - make dumpScreen always write to a file in MOZ_UPLOAD_DIR. r=ted,jmaher
Bug 927355 - Print fractional milliseconds in event tracer samples. r=bsmedberg
Bug 959380 - 1/5 - Make gfxBreakPriority a typed enum - r=jrmuizel
Bug 959380 - 2/5 - Make gfxImageFormat a typed enum - r=jrmuizel

find . -type f | grep -v \./obj | grep -v \.hg | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxImageFormat\(ARGB32\|RGB24\|A8\|A1\|RGB16_565\|Unknown\)\($\|[^A-Za-z0-9_]\)/\1gfxImageFormat::\2\3/g'
Bug 959380 - 3/5 - Make gfxSurfaceType a typed enum - r=jrmuizel

find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)gfxSurfaceType\(Image\|PDF\|PS\|Xlib\|Xcb\|Glitz\|Quartz\|Win32\|BeOS\|DirectFB\|SVG\|OS2\|Win32Printing\|QuartzImage\|Script\|QPainter\|Recording\|VG\|GL\|DRM\|Tee\|XML\|Skia\|Subsurface\|D2D\|Max\)\($\|[^A-Za-z0-9_]\)/\1gfxSurfaceType::\2\3/g'
Bug 959380 - 4/5 - Make gfxContentType a typed enum - r=jrmuizel

find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)GFX_CONTENT_\(COLOR\|ALPHA\|COLOR_ALPHA\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1gfxContentType::\2\3/g'
Bug 959380 - 5/5 - Make gfxMemoryLocation a typed enum - r=jrmuizel

find . -type f | grep -v '\./obj' | grep -v '\.hg' | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)GFX_MEMORY_\(IN_PROCESS_HEAP\|IN_PROCESS_NONHEAP\|OUT_OF_PROCESS\)\($\|[^A-Za-z0-9_]\)/\1gfxMemoryLocation::\2\3/g'
Bug 959448 - Convert most of LayersTypes.h to typed enums - r=nrc

find content/media dom/ipc widget/ gfx/tests gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)LAYERS_\(NONE\|BASIC\|OPENGL\|D3D9\|D3D10\|D3D11\|CLIENT\|LAST\)\($\|[^A-Za-z0-9_]\)/\1LayersBackend::LAYERS_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::BUFFER_\2\3/g'

find widget gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)BUFFER_\(BUFFERED\)\($\|[^A-Za-z0-9_]\)/\1BufferMode::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(DRAW\|DRAW_SNAPPED\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)CLIP_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1DrawRegionClip::CLIP_\2\3/g'

find gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SURFACE_\(NONE\|OPAQUE\|SINGLE_CHANNEL_ALPHA\|COMPONENT_ALPHA\)\($\|[^A-Za-z0-9_]\)/\1SurfaceMode::SURFACE_\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(STRETCH\|SENTINEL\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::\2\3/g'

find gfx/ipc/ gfx/layers/ layout/ -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)SCALE_\(NONE\)\($\|[^A-Za-z0-9_]\)/\1ScaleMode::SCALE_\2\3/g'
Bug 960248 - Fix range adjustments when on a label. r=yzen
Bug 960257 - [AccessFu] Introduce SettingCache in Utils.jsm. r=yzen
Bug 960267 - Use settings speech volume and rate, when available. r=yzen
Bug 961044 - Update to libvorbis 1.3.4. r=cpearce
This is primarily to take the long->char fix to reduce encoder
table footprint, but also includes the declaration mis-match
patch we were carrying and some warning fixes.
Bug 879245 - Implement thenables for Promises. r=bz

--HG--
extra : rebase_source : cde27792ae58b13c88367df7a99fc8981097eedd
Bug 961408 - Partial rollback of an incorrect change. No 'this' in static functions. r=me DONTBUILD
Bug 960859 - [e10s] Fix scrollwheel behavior when content not in focus (r=smaug)