From ae6214cb514623ac4bff6577824729008e055c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Pag=C3=A8s?= <j.parkouss@gmail.com>
Date: Thu, 18 Dec 2014 11:53:14 -0500
Subject: [PATCH 001/183] Bug 794984 - [mozprocess] Add ability to separate
 stderr from stdout, r=ahal

A new parameter called 'processStderrLine' is added. When specified, stdout gets processed by the
'processOutputLine' callbacks and stderr is processed by the 'processStderrLine' callbacks. When
not specified, stderr is redirected to stdout which is the same default behaviour.

A side effect of this is that mozprocess now uses three threads to process output. One thread each
for stdout and stderr that reads output lines and stores them in a Queue as fast as possible, this
makes sure there is no blocking in stdout.write(). A third thread executes the callbacks.

--HG--
extra : rebase_source : d4601a6ae21ca61bfdca308c68155ce2c2e09e43
---
 .../mozprocess/mozprocess/processhandler.py   | 304 +++++++++---------
 testing/mozbase/mozprocess/tests/manifest.ini |   1 +
 .../mozprocess/tests/test_process_reader.py   |  95 ++++++
 3 files changed, 245 insertions(+), 155 deletions(-)
 create mode 100644 testing/mozbase/mozprocess/tests/test_process_reader.py

diff --git a/testing/mozbase/mozprocess/mozprocess/processhandler.py b/testing/mozbase/mozprocess/mozprocess/processhandler.py
index 65f6e5177437..2aa64c4246de 100644
--- a/testing/mozbase/mozprocess/mozprocess/processhandler.py
+++ b/testing/mozbase/mozprocess/mozprocess/processhandler.py
@@ -11,7 +11,7 @@ import sys
 import threading
 import time
 import traceback
-from Queue import Queue
+from Queue import Queue, Empty
 from datetime import datetime
 __all__ = ['ProcessHandlerMixin', 'ProcessHandler']
 
@@ -40,7 +40,13 @@ class ProcessHandlerMixin(object):
     :param env: is the environment to use for the process (defaults to os.environ).
     :param ignore_children: causes system to ignore child processes when True, defaults to False (which tracks child processes).
     :param kill_on_timeout: when True, the process will be killed when a timeout is reached. When False, the caller is responsible for killing the process. Failure to do so could cause a call to wait() to hang indefinitely. (Defaults to True.)
-    :param processOutputLine: function or list of functions to be called for each line of output produced by the process (defaults to None).
+    :param processOutputLine: function or list of functions to be called for
+        each line of output produced by the process (defaults to an empty
+        list).
+    :param processStderrLine: function or list of functions to be called
+        for each line of error output - stderr - produced by the process
+        (defaults to an empty list). If this is not specified, stderr lines
+        will be sent to the *processOutputLine* callbacks.
     :param onTimeout: function or list of functions to be called when the process times out.
     :param onFinish: function or list of functions to be called when the process terminates normally without timing out.
     :param kwargs: additional keyword args to pass directly into Popen.
@@ -594,6 +600,7 @@ falling back to not using job objects for managing child processes"""
                  ignore_children = False,
                  kill_on_timeout = True,
                  processOutputLine=(),
+                 processStderrLine=(),
                  onTimeout=(),
                  onFinish=(),
                  **kwargs):
@@ -602,9 +609,7 @@ falling back to not using job objects for managing child processes"""
         self.cwd = cwd
         self.didTimeout = False
         self._ignore_children = ignore_children
-        self._kill_on_timeout = kill_on_timeout
         self.keywordargs = kwargs
-        self.outThread = None
         self.read_buffer = ''
 
         if env is None:
@@ -612,15 +617,29 @@ falling back to not using job objects for managing child processes"""
         self.env = env
 
         # handlers
-        if callable(processOutputLine):
-            processOutputLine = [processOutputLine]
-        self.processOutputLineHandlers = list(processOutputLine)
-        if callable(onTimeout):
-            onTimeout = [onTimeout]
-        self.onTimeoutHandlers = list(onTimeout)
-        if callable(onFinish):
-            onFinish = [onFinish]
-        self.onFinishHandlers = list(onFinish)
+        def to_callable_list(arg):
+            if callable(arg):
+                arg = [arg]
+            return CallableList(arg)
+
+        processOutputLine = to_callable_list(processOutputLine)
+        processStderrLine = to_callable_list(processStderrLine)
+        onTimeout = to_callable_list(onTimeout)
+        onFinish = to_callable_list(onFinish)
+
+        def on_timeout():
+            self.didTimeout = True
+            if kill_on_timeout:
+                self.kill()
+        onTimeout.insert(0, on_timeout)
+
+        self._stderr = subprocess.STDOUT
+        if processStderrLine:
+            self._stderr = subprocess.PIPE
+        self.reader = ProcessReader(stdout_callback=processOutputLine,
+                                    stderr_callback=processStderrLine,
+                                    finished_callback=onFinish,
+                                    timeout_callback=onTimeout)
 
         # It is common for people to pass in the entire array with the cmd and
         # the args together since this is how Popen uses it.  Allow for that.
@@ -654,11 +673,10 @@ falling back to not using job objects for managing child processes"""
         being killed.
         """
         self.didTimeout = False
-        self.startTime = datetime.now()
 
         # default arguments
         args = dict(stdout=subprocess.PIPE,
-                    stderr=subprocess.STDOUT,
+                    stderr=self._stderr,
                     cwd=self.cwd,
                     env=self.env,
                     ignore_children=self._ignore_children)
@@ -690,7 +708,7 @@ falling back to not using job objects for managing child processes"""
             self.proc.kill(sig=sig)
 
             # When we kill the the managed process we also have to wait for the
-            # outThread to be finished. Otherwise consumers would have to assume
+            # reader thread to be finished. Otherwise consumers would have to assume
             # that it still has not completely shutdown.
             return self.wait()
         except AttributeError:
@@ -700,36 +718,6 @@ falling back to not using job objects for managing child processes"""
             else:
                 raise
 
-    def readWithTimeout(self, f, timeout):
-        """
-        Try to read a line of output from the file object *f*.
-
-        *f* must be a  pipe, like the *stdout* member of a subprocess.Popen
-        object created with stdout=PIPE. If no output
-        is received within *timeout* seconds, return a blank line.
-
-        Returns a tuple (line, did_timeout), where *did_timeout* is True
-        if the read timed out, and False otherwise.
-        """
-        # Calls a private member because this is a different function based on
-        # the OS
-        return self._readWithTimeout(f, timeout)
-
-    def processOutputLine(self, line):
-        """Called for each line of output that a process sends to stdout/stderr."""
-        for handler in self.processOutputLineHandlers:
-            handler(line)
-
-    def onTimeout(self):
-        """Called when a process times out."""
-        for handler in self.onTimeoutHandlers:
-            handler()
-
-    def onFinish(self):
-        """Called when a process finishes without a timeout."""
-        for handler in self.onFinishHandlers:
-            handler()
-
     def poll(self):
         """Check if child process has terminated
 
@@ -739,10 +727,10 @@ falling back to not using job objects for managing child processes"""
         - '0' if the process ended without failures
 
         """
-        # Ensure that we first check for the outputThread status. Otherwise
+        # Ensure that we first check for the reader status. Otherwise
         # we might mark the process as finished while output is still getting
         # processed.
-        if self.outThread and self.outThread.isAlive():
+        if self.reader.is_alive():
             return None
         elif hasattr(self.proc, "returncode"):
             return self.proc.returncode
@@ -760,43 +748,15 @@ falling back to not using job objects for managing child processes"""
         for that number of seconds without producing any output before
         being killed.
         """
-        def _processOutput():
-            self.didTimeout = False
-            logsource = self.proc.stdout
-
-            lineReadTimeout = None
-            if timeout:
-                lineReadTimeout = timeout - (datetime.now() - self.startTime).seconds
-            elif outputTimeout:
-                lineReadTimeout = outputTimeout
-
-            (lines, self.didTimeout) = self.readWithTimeout(logsource, lineReadTimeout)
-            while lines != "":
-                for line in lines.splitlines():
-                    self.processOutputLine(line.rstrip())
-
-                if self.didTimeout:
-                    break
-
-                if timeout:
-                    lineReadTimeout = timeout - (datetime.now() - self.startTime).seconds
-                (lines, self.didTimeout) = self.readWithTimeout(logsource, lineReadTimeout)
-
-            if self.didTimeout:
-                if self._kill_on_timeout:
-                    self.proc.kill()
-                self.onTimeout()
-            else:
-                self.onFinish()
-
+        # this method is kept for backward compatibility
         if not hasattr(self, 'proc'):
-            self.run()
-
-        if not self.outThread:
-            self.outThread = threading.Thread(target=_processOutput)
-            self.outThread.daemon = True
-            self.outThread.start()
-
+            self.run(timeout=timeout, outputTimeout=outputTimeout)
+            # self.run will call this again
+            return
+        if not self.reader.is_alive():
+            self.reader.timeout = timeout
+            self.reader.output_timeout = outputTimeout
+            self.reader.start(self.proc)
 
     def wait(self, timeout=None):
         """
@@ -813,12 +773,12 @@ falling back to not using job objects for managing child processes"""
         - '0' if the process ended without failures
 
         """
-        if self.outThread and self.outThread is not threading.current_thread():
-            # Thread.join() blocks the main thread until outThread is finished
+        if self.reader.thread and self.reader.thread is not threading.current_thread():
+            # Thread.join() blocks the main thread until the reader thread is finished
             # wake up once a second in case a keyboard interrupt is sent
             count = 0
-            while self.outThread.isAlive():
-                self.outThread.join(timeout=1)
+            while self.reader.is_alive():
+                self.reader.thread.join(timeout=1)
                 count += 1
                 if timeout and count > timeout:
                     return None
@@ -832,77 +792,111 @@ falling back to not using job objects for managing child processes"""
                              "use ProcessHandler.wait() instead"
         return self.wait(timeout=timeout)
 
-
-    ### Private methods from here on down. Thar be dragons.
-
-    if isWin:
-        # Windows Specific private functions are defined in this block
-        PeekNamedPipe = ctypes.windll.kernel32.PeekNamedPipe
-        GetLastError = ctypes.windll.kernel32.GetLastError
-
-        @staticmethod
-        def _normalize_newline(line):
-            # adb on windows returns \r\r\n at the end of each line, to get around
-            # this normalize all newlines to have a unix-style '\n'
-            # http://src.chromium.org/viewvc/chrome/trunk/src/build/android/pylib/android_commands.py#l1944
-            return re.sub(r'\r+\n?$', '\n', line)
-
-        def _readWithTimeout(self, f, timeout):
-            if timeout is None:
-                # shortcut to allow callers to pass in "None" for no timeout.
-                return (self._normalize_newline(f.readline()), False)
-            x = msvcrt.get_osfhandle(f.fileno())
-            l = ctypes.c_long()
-            done = time.time() + timeout
-            while time.time() < done:
-                if self.PeekNamedPipe(x, None, 0, None, ctypes.byref(l), None) == 0:
-                    err = self.GetLastError()
-                    if err == 38 or err == 109: # ERROR_HANDLE_EOF || ERROR_BROKEN_PIPE
-                        return ('', False)
-                    else:
-                        raise OSError("readWithTimeout got error: %d", err)
-                if l.value > 0:
-                    # we're assuming that the output is line-buffered,
-                    # which is not unreasonable
-                    return (self._normalize_newline(f.readline()), False)
-                time.sleep(0.01)
-            return ('', True)
-
-    else:
-        # Generic
-        def _readWithTimeout(self, f, timeout):
-            while True:
-                try:
-                    (r, w, e) = select.select([f], [], [], timeout)
-                except:
-                    # return a blank line
-                    return ('', True)
-
-                if len(r) == 0:
-                    return ('', True)
-
-                output = os.read(f.fileno(), 4096)
-                if not output:
-                    output = self.read_buffer
-                    self.read_buffer = ''
-                    return (output, False)
-                self.read_buffer += output
-                if '\n' not in self.read_buffer:
-                    time.sleep(0.01)
-                    continue
-                tmp = self.read_buffer.split('\n')
-                lines, self.read_buffer = tmp[:-1], tmp[-1]
-                real_lines = [x for x in lines if x != '']
-                if not real_lines:
-                    time.sleep(0.01)
-                    continue
-                break
-            return ('\n'.join(lines), False)
-
     @property
     def pid(self):
         return self.proc.pid
 
+class CallableList(list):
+    def __call__(self, *args, **kwargs):
+        for e in self:
+            e(*args, **kwargs)
+
+    def __add__(self, lst):
+        return CallableList(list.__add__(self, lst))
+
+class ProcessReader(object):
+    def __init__(self, stdout_callback=None, stderr_callback=None,
+                 finished_callback=None, timeout_callback=None,
+                 timeout=None, output_timeout=None):
+        self.stdout_callback = stdout_callback or (lambda line: True)
+        self.stderr_callback = stderr_callback or (lambda line: True)
+        self.finished_callback = finished_callback or (lambda: True)
+        self.timeout_callback = timeout_callback or (lambda: True)
+        self.timeout = timeout
+        self.output_timeout = output_timeout
+        self.thread = None
+
+    def _create_stream_reader(self, name, stream, queue, callback):
+        thread = threading.Thread(name=name,
+                                  target=self._read_stream,
+                                  args=(stream, queue, callback))
+        thread.daemon = True
+        thread.start()
+        return thread
+
+    def _read_stream(self, stream, queue, callback):
+        for line in iter(stream.readline, b''):
+            queue.put((line, callback))
+        stream.close()
+
+    def start(self, proc):
+        queue = Queue()
+        stdout_reader = None
+        if proc.stdout:
+            stdout_reader = self._create_stream_reader('ProcessReaderStdout',
+                                                       proc.stdout,
+                                                       queue,
+                                                       self.stdout_callback)
+        stderr_reader = None
+        if proc.stderr and proc.stderr != proc.stdout:
+            stderr_reader = self._create_stream_reader('ProcessReaderStderr',
+                                                       proc.stderr,
+                                                       queue,
+                                                       self.stderr_callback)
+        self.thread = threading.Thread(name='ProcessReader',
+                                       target=self._read,
+                                       args=(stdout_reader,
+                                             stderr_reader,
+                                             queue))
+        self.thread.daemon = True
+        self.thread.start()
+
+    def _read(self, stdout_reader, stderr_reader, queue):
+        start_time = time.time()
+        timed_out = False
+        timeout = self.timeout
+        if timeout is not None:
+            timeout += start_time
+        output_timeout = self.output_timeout
+        if output_timeout is not None:
+            output_timeout += start_time
+
+        while (stdout_reader and stdout_reader.is_alive()) \
+              or (stderr_reader and stderr_reader.is_alive()):
+            has_line = True
+            try:
+                line, callback = queue.get(True, 0.02)
+            except Empty:
+                has_line = False
+            now = time.time()
+            if not has_line:
+                if output_timeout is not None and now > output_timeout:
+                    timed_out = True
+                    break
+            else:
+                if output_timeout is not None:
+                    output_timeout = now + self.output_timeout
+                callback(line.rstrip())
+            if timeout is not None and now > timeout:
+                timed_out = True
+                break
+        # process remaining lines to read
+        while not queue.empty():
+            line, callback = queue.get(False)
+            callback(line.rstrip())
+        if timed_out:
+            self.timeout_callback()
+        if stdout_reader:
+            stdout_reader.join()
+        if stderr_reader:
+            stderr_reader.join()
+        if not timed_out:
+            self.finished_callback()
+
+    def is_alive(self):
+        if self.thread:
+            return self.thread.is_alive()
+        return False
 
 ### default output handlers
 ### these should be callables that take the output line
diff --git a/testing/mozbase/mozprocess/tests/manifest.ini b/testing/mozbase/mozprocess/tests/manifest.ini
index a61bdfd2477a..d869952e3f36 100644
--- a/testing/mozbase/mozprocess/tests/manifest.ini
+++ b/testing/mozbase/mozprocess/tests/manifest.ini
@@ -15,3 +15,4 @@ disabled = bug 921632
 [test_mozprocess_wait.py]
 [test_mozprocess_output.py]
 [test_mozprocess_params.py]
+[test_process_reader.py]
diff --git a/testing/mozbase/mozprocess/tests/test_process_reader.py b/testing/mozbase/mozprocess/tests/test_process_reader.py
new file mode 100644
index 000000000000..5fd17b4be72e
--- /dev/null
+++ b/testing/mozbase/mozprocess/tests/test_process_reader.py
@@ -0,0 +1,95 @@
+import unittest
+import subprocess
+import sys
+from mozprocess.processhandler import ProcessReader, StoreOutput
+
+def run_python(str_code, stdout=subprocess.PIPE, stderr=subprocess.PIPE):
+    cmd = [sys.executable, '-c', str_code]
+    return subprocess.Popen(cmd, stdout=stdout, stderr=stderr)
+
+class TestProcessReader(unittest.TestCase):
+    def setUp(self):
+        self.out = StoreOutput()
+        self.err = StoreOutput()
+        self.finished = False
+        def on_finished():
+            self.finished = True
+        self.timeout = False
+        def on_timeout():
+            self.timeout = True
+        self.reader = ProcessReader(stdout_callback=self.out,
+                                    stderr_callback=self.err,
+                                    finished_callback=on_finished,
+                                    timeout_callback=on_timeout)
+
+    def test_stdout_callback(self):
+        proc = run_python('print 1; print 2')
+        self.reader.start(proc)
+        self.reader.thread.join()
+
+        self.assertEqual(self.out.output, ['1', '2'])
+        self.assertEqual(self.err.output, [])
+
+    def test_stderr_callback(self):
+        proc = run_python('import sys; sys.stderr.write("hello world\\n")')
+        self.reader.start(proc)
+        self.reader.thread.join()
+
+        self.assertEqual(self.out.output, [])
+        self.assertEqual(self.err.output, ['hello world'])
+
+    def test_stdout_and_stderr_callbacks(self):
+        proc = run_python('import sys; sys.stderr.write("hello world\\n"); print 1; print 2')
+        self.reader.start(proc)
+        self.reader.thread.join()
+
+        self.assertEqual(self.out.output, ['1', '2'])
+        self.assertEqual(self.err.output, ['hello world'])
+
+    def test_finished_callback(self):
+        self.assertFalse(self.finished)
+        proc = run_python('')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertTrue(self.finished)
+
+    def test_timeout(self):
+        self.reader.timeout = 0.05
+        self.assertFalse(self.timeout)
+        proc = run_python('import time; time.sleep(0.1)')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertTrue(self.timeout)
+        self.assertFalse(self.finished)
+
+    def test_output_timeout(self):
+        self.reader.output_timeout = 0.05
+        self.assertFalse(self.timeout)
+        proc = run_python('import time; time.sleep(0.1)')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertTrue(self.timeout)
+        self.assertFalse(self.finished)
+
+    def test_read_without_eol(self):
+        proc = run_python('import sys; sys.stdout.write("1")')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertEqual(self.out.output, ['1'])
+
+    def test_read_with_strange_eol(self):
+        proc = run_python('import sys; sys.stdout.write("1\\r\\r\\r\\n")')
+        self.reader.start(proc)
+        self.reader.thread.join()
+        self.assertEqual(self.out.output, ['1'])
+
+    def test_mixed_stdout_stderr(self):
+        proc = run_python('import sys; sys.stderr.write("hello world\\n"); print 1; print 2', stderr=subprocess.STDOUT)
+        self.reader.start(proc)
+        self.reader.thread.join()
+
+        self.assertEqual(sorted(self.out.output), sorted(['1', '2', 'hello world']))
+        self.assertEqual(self.err.output, [])
+
+if __name__ == '__main__':
+    unittest.main()

From a425715aebc17a47d4a974e8323f56c407a59e57 Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aklotz@mozilla.com>
Date: Thu, 18 Dec 2014 12:20:32 -0700
Subject: [PATCH 002/183] Bug 1112827: Add IPDL's implicit typedefs to the set
 of explicit typedefs, preventing duplicates in generated code; r=bent

---
 ipc/ipdl/ipdl/lower.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py
index 3bb885b11d6e..031b15e14ed1 100644
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -1329,7 +1329,15 @@ with some new IPDL/C++ nodes that are tuned for C++ codegen."""
         # fully-qualified name. e.g. |Foo| rather than |a::b::Foo|.
         self.typedefs = [ ]
         self.typedefSet = set([ Typedef(Type('mozilla::ipc::ActorHandle'),
-                                        'ActorHandle') ])
+                                        'ActorHandle'),
+                                Typedef(Type('base::ProcessId'),
+                                        'ProcessId'),
+                                Typedef(Type('mozilla::ipc::ProtocolId'),
+                                        'ProtocolId'),
+                                Typedef(Type('mozilla::ipc::Transport'),
+                                        'Transport'),
+                                Typedef(Type('mozilla::ipc::TransportDescriptor'),
+                                        'TransportDescriptor') ])
         self.protocolName = None
 
     def visitTranslationUnit(self, tu):
@@ -2787,14 +2795,6 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
             self.cls.addstmt(typedef)
         for typedef in self.includedActorTypedefs:
             self.cls.addstmt(typedef)
-        # XXX these don't really fit in the other lists; just include
-        # them here for now
-        self.cls.addstmts([
-            Typedef(Type('base::ProcessId'), 'ProcessId'),
-            Typedef(Type('mozilla::ipc::ProtocolId'), 'ProtocolId'),
-            Typedef(Type('mozilla::ipc::Transport'), 'Transport'),
-            Typedef(Type('mozilla::ipc::TransportDescriptor'), 'TransportDescriptor')
-        ])
 
         self.cls.addstmt(Whitespace.NL)
 

From 145ebfeec299daccbf4ae22bf39ad3155347bc11 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Wed, 9 Jul 2014 12:26:51 -0700
Subject: [PATCH 003/183] Bug 1036602 - add D3D11 support for VR rendering;
 r=bas

From fbb1e2ba9936896a1eb932585218401f4c95e411 Mon Sep 17 00:00:00 2001
---
 gfx/layers/d3d11/CompositorD3D11.cpp  | 212 +++++++++++++++++++++++++++++++++-
 gfx/layers/d3d11/CompositorD3D11.fx   |   1 +
 gfx/layers/d3d11/CompositorD3D11.h    |   9 ++
 gfx/layers/d3d11/CompositorD3D11VR.fx |  71 ++++++++++++
 4 files changed, 290 insertions(+), 3 deletions(-)
 create mode 100644 gfx/layers/d3d11/CompositorD3D11VR.fx
---
 gfx/layers/d3d11/CompositorD3D11.cpp  | 212 +++++++++++++++++++++++++-
 gfx/layers/d3d11/CompositorD3D11.fx   |   1 +
 gfx/layers/d3d11/CompositorD3D11.h    |   9 ++
 gfx/layers/d3d11/CompositorD3D11VR.fx |  71 +++++++++
 4 files changed, 290 insertions(+), 3 deletions(-)
 create mode 100644 gfx/layers/d3d11/CompositorD3D11VR.fx

diff --git a/gfx/layers/d3d11/CompositorD3D11.cpp b/gfx/layers/d3d11/CompositorD3D11.cpp
index 11225837b301..2e3e196cdc51 100644
--- a/gfx/layers/d3d11/CompositorD3D11.cpp
+++ b/gfx/layers/d3d11/CompositorD3D11.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -7,6 +7,7 @@
 
 #include "TextureD3D11.h"
 #include "CompositorD3D11Shaders.h"
+#include "CompositorD3D11ShadersVR.h"
 
 #include "gfxWindowsPlatform.h"
 #include "nsIWidget.h"
@@ -16,6 +17,7 @@
 #include "nsWindowsHelpers.h"
 #include "gfxPrefs.h"
 #include "gfxCrashReporterUtils.h"
+#include "gfxVR.h"
 
 #include "mozilla/EnumeratedArray.h"
 
@@ -67,6 +69,27 @@ struct DeviceAttachmentsD3D11
   RefPtr<ID3D11BlendState> mComponentBlendState;
   RefPtr<ID3D11BlendState> mDisabledBlendState;
   RefPtr<IDXGIResource> mSyncTexture;
+
+  //
+  // VR pieces
+  //
+  RefPtr<ID3D11InputLayout> mVRDistortionInputLayout;
+  RefPtr<ID3D11Buffer> mVRDistortionConstants;
+
+  typedef EnumeratedArray<VRHMDType, VRHMDType::NumHMDTypes, RefPtr<ID3D11VertexShader>>
+          VRVertexShaderArray;
+  typedef EnumeratedArray<VRHMDType, VRHMDType::NumHMDTypes, RefPtr<ID3D11PixelShader>>
+          VRPixelShaderArray;
+
+  VRVertexShaderArray mVRDistortionVS;
+  VRPixelShaderArray mVRDistortionPS;
+
+  // These will be created/filled in as needed during rendering whenever the configuration
+  // changes.
+  VRHMDConfiguration mVRConfiguration;
+  RefPtr<ID3D11Buffer> mVRDistortionVertices[2]; // one for each eye
+  RefPtr<ID3D11Buffer> mVRDistortionIndices[2];
+  uint32_t mVRDistortionIndexCount[2];
 };
 
 CompositorD3D11::CompositorD3D11(nsIWidget* aWidget)
@@ -282,13 +305,34 @@ CompositorD3D11::Initialize()
 
     RefPtr<ID3D11Texture2D> texture;
     hr = mDevice->CreateTexture2D(&desc, nullptr, byRef(texture));
-    
     if (FAILED(hr)) {
       return false;
     }
 
     hr = texture->QueryInterface((IDXGIResource**)byRef(mAttachments->mSyncTexture));
+    if (FAILED(hr)) {
+      return false;
+    }
+    
+    //
+    // VR additions
+    //
+    D3D11_INPUT_ELEMENT_DESC vrlayout[] =
+    {
+      { "POSITION", 0, DXGI_FORMAT_R32G32_FLOAT,       0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+      { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT,       0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+      { "TEXCOORD", 1, DXGI_FORMAT_R32G32_FLOAT,       0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+      { "TEXCOORD", 2, DXGI_FORMAT_R32G32_FLOAT,       0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+      { "COLOR",    0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 },
+    };
 
+    hr = mDevice->CreateInputLayout(vrlayout,
+                                    sizeof(vrlayout) / sizeof(D3D11_INPUT_ELEMENT_DESC),
+                                    OculusVRDistortionVS,
+                                    sizeof(OculusVRDistortionVS),
+                                    byRef(mAttachments->mVRDistortionInputLayout));
+    cBufferDesc.ByteWidth = sizeof(gfx::VRDistortionConstants);
+    hr = mDevice->CreateBuffer(&cBufferDesc, nullptr, byRef(mAttachments->mVRDistortionConstants));
     if (FAILED(hr)) {
       return false;
     }
@@ -589,6 +633,141 @@ CompositorD3D11::ClearRect(const gfx::Rect& aRect)
   mContext->OMSetBlendState(mAttachments->mPremulBlendState, sBlendFactor, 0xFFFFFFFF);
 }
 
+void
+CompositorD3D11::DrawVRDistortion(const gfx::Rect& aRect,
+                                  const gfx::Rect& aClipRect,
+                                  const EffectChain& aEffectChain,
+                                  gfx::Float aOpacity,
+                                  const gfx::Matrix4x4& aTransform)
+{
+  MOZ_ASSERT(aEffectChain.mPrimaryEffect->mType == EffectTypes::VR_DISTORTION);
+
+  if (aEffectChain.mSecondaryEffects[EffectTypes::MASK] ||
+      aEffectChain.mSecondaryEffects[EffectTypes::BLEND_MODE])
+  {
+    NS_WARNING("DrawVRDistortion: ignoring secondary effect!");
+  }
+
+  HRESULT hr;
+
+  EffectVRDistortion* vrEffect =
+    static_cast<EffectVRDistortion*>(aEffectChain.mPrimaryEffect.get());
+
+  TextureSourceD3D11* source = vrEffect->mTexture->AsSourceD3D11();
+  gfx::IntSize size = vrEffect->mRenderTarget->GetSize(); // XXX source->GetSize()
+
+  VRHMDInfo* hmdInfo = vrEffect->mHMD;
+  VRDistortionConstants shaderConstants;
+
+  // do we need to recreate the VR buffers, since the config has changed?
+  if (hmdInfo->GetConfiguration() != mAttachments->mVRConfiguration) {
+    D3D11_SUBRESOURCE_DATA sdata = { 0 };
+    CD3D11_BUFFER_DESC desc(0, D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_IMMUTABLE);
+
+    // XXX as an optimization, we should really pack the indices and vertices for both eyes
+    // into one buffer instead of needing one eye each.  Then we can just bind them once.
+    for (uint32_t eye = 0; eye < 2; eye++) {
+      const gfx::VRDistortionMesh& mesh = hmdInfo->GetDistortionMesh(eye);
+
+      desc.BindFlags = D3D11_BIND_VERTEX_BUFFER;
+      desc.ByteWidth = mesh.mVertices.Length() * sizeof(gfx::VRDistortionVertex);
+      sdata.pSysMem = mesh.mVertices.Elements();
+      
+      hr = mDevice->CreateBuffer(&desc, &sdata, byRef(mAttachments->mVRDistortionVertices[eye]));
+      if (FAILED(hr)) {
+        NS_WARNING("CreateBuffer failed");
+        return;
+      }
+
+      desc.BindFlags = D3D11_BIND_INDEX_BUFFER;
+      desc.ByteWidth = mesh.mIndices.Length() * sizeof(uint16_t);
+      sdata.pSysMem = mesh.mIndices.Elements();
+
+      hr = mDevice->CreateBuffer(&desc, &sdata, byRef(mAttachments->mVRDistortionIndices[eye]));
+      if (FAILED(hr)) {
+        NS_WARNING("CreateBuffer failed");
+        return;
+      }
+
+      mAttachments->mVRDistortionIndexCount[eye] = mesh.mIndices.Length();
+    }
+
+    mAttachments->mVRConfiguration = hmdInfo->GetConfiguration();
+  }
+
+  // XXX do I need to set a scissor rect? Is this the right scissor rect?
+  D3D11_RECT scissor;
+  scissor.left = aClipRect.x;
+  scissor.right = aClipRect.XMost();
+  scissor.top = aClipRect.y;
+  scissor.bottom = aClipRect.YMost();
+  mContext->RSSetScissorRects(1, &scissor);
+
+  // Triangle lists and same layout for both eyes
+  mContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+  mContext->IASetInputLayout(mAttachments->mVRDistortionInputLayout);
+
+  // Shaders for this HMD
+  mContext->VSSetShader(mAttachments->mVRDistortionVS[mAttachments->mVRConfiguration.hmdType], nullptr, 0);
+  mContext->PSSetShader(mAttachments->mVRDistortionPS[mAttachments->mVRConfiguration.hmdType], nullptr, 0);
+
+  // This is the source texture SRV for the pixel shader
+  // XXX, um should we cache this SRV?
+  RefPtr<ID3D11ShaderResourceView> view;
+  mDevice->CreateShaderResourceView(source->GetD3D11Texture(), nullptr, byRef(view));
+  ID3D11ShaderResourceView* srView = view;
+  mContext->PSSetShaderResources(0, 1, &srView);
+
+
+  gfx::IntSize vpSizeInt = mCurrentRT->GetSize();
+  gfx::Size vpSize(vpSizeInt.width, vpSizeInt.height);
+  ID3D11Buffer* vbuffer;
+  UINT vsize, voffset;
+
+  for (uint32_t eye = 0; eye < 2; eye++) {
+    gfx::IntRect eyeViewport;
+    eyeViewport.x = eye * size.width / 2;
+    eyeViewport.y = 0;
+    eyeViewport.width = size.width / 2;
+    eyeViewport.height = size.height;
+
+    hmdInfo->FillDistortionConstants(eye,
+                                     size, eyeViewport,
+                                     vpSize, aRect,
+                                     shaderConstants);
+
+    // D3D has clip space top-left as -1,1 so we need to flip the Y coordinate offset here
+    shaderConstants.destinationScaleAndOffset[1] = - shaderConstants.destinationScaleAndOffset[1];
+
+    // XXX I really want to write a templated helper for these next 4 lines
+    D3D11_MAPPED_SUBRESOURCE resource;
+    mContext->Map(mAttachments->mVRDistortionConstants, 0, D3D11_MAP_WRITE_DISCARD, 0, &resource);
+    *(gfx::VRDistortionConstants*)resource.pData = shaderConstants;
+    mContext->Unmap(mAttachments->mVRDistortionConstants, 0);
+
+    // XXX is there a better way to change a bunch of these things from what they were set to
+    // in BeginFrame/etc?
+    vbuffer = mAttachments->mVRDistortionVertices[eye];
+    vsize = sizeof(gfx::VRDistortionVertex);
+    voffset = 0;
+    mContext->IASetVertexBuffers(0, 1, &vbuffer, &vsize, &voffset);
+    mContext->IASetIndexBuffer(mAttachments->mVRDistortionIndices[eye], DXGI_FORMAT_R16_UINT, 0);
+
+    ID3D11Buffer* constBuf = mAttachments->mVRDistortionConstants;
+    mContext->VSSetConstantBuffers(0, 1, &constBuf);
+
+    mContext->DrawIndexed(mAttachments->mVRDistortionIndexCount[eye], 0, 0);
+  }
+
+  // restore previous configurations
+  vbuffer = mAttachments->mVertexBuffer;
+  vsize = sizeof(Vertex);
+  voffset = 0;
+  mContext->IASetVertexBuffers(0, 1, &vbuffer, &vsize, &voffset);
+  mContext->IASetIndexBuffer(nullptr, DXGI_FORMAT_R16_UINT, 0);
+  mContext->IASetInputLayout(mAttachments->mInputLayout);
+}
+
 void
 CompositorD3D11::DrawQuad(const gfx::Rect& aRect,
                           const gfx::Rect& aClipRect,
@@ -601,6 +780,12 @@ CompositorD3D11::DrawQuad(const gfx::Rect& aRect,
   }
 
   MOZ_ASSERT(mCurrentRT, "No render target");
+
+  if (aEffectChain.mPrimaryEffect->mType == EffectTypes::VR_DISTORTION) {
+    DrawVRDistortion(aRect, aClipRect, aEffectChain, aOpacity, aTransform);
+    return;
+  }
+
   memcpy(&mVSConstants.layerTransform, &aTransform._11, 64);
   IntPoint origin = mCurrentRT->GetOrigin();
   mVSConstants.renderTargetOffset[0] = origin.x;
@@ -966,7 +1151,7 @@ CompositorD3D11::PrepareViewport(const gfx::IntSize& aSize)
 {
   D3D11_VIEWPORT viewport;
   viewport.MaxDepth = 1.0f;
-  viewport.MinDepth = 0;
+  viewport.MinDepth = 0.0f;
   viewport.Width = aSize.width;
   viewport.Height = aSize.height;
   viewport.TopLeftX = 0;
@@ -974,6 +1159,8 @@ CompositorD3D11::PrepareViewport(const gfx::IntSize& aSize)
 
   mContext->RSSetViewports(1, &viewport);
 
+  // This view matrix translates coordinates from 0..width and 0..height to
+  // -1..1 on the X axis, and -1..1 on the Y axis (flips the Y coordinate)
   Matrix viewMatrix = Matrix::Translation(-1.0, 1.0);
   viewMatrix.PreScale(2.0f / float(aSize.width), 2.0f / float(aSize.height));
   viewMatrix.PreScale(1.0f, -1.0f);
@@ -1113,6 +1300,25 @@ CompositorD3D11::CreateShaders()
     return false;
   }
 
+
+  /* VR stuff */
+
+  hr = mDevice->CreateVertexShader(OculusVRDistortionVS,
+                                   sizeof(OculusVRDistortionVS),
+                                   nullptr,
+                                   byRef(mAttachments->mVRDistortionVS[VRHMDType::Oculus]));
+  if (FAILED(hr)) {
+    return false;
+  }
+
+  hr = mDevice->CreatePixelShader(OculusVRDistortionPS,
+                                  sizeof(OculusVRDistortionPS),
+                                  nullptr,
+                                  byRef(mAttachments->mVRDistortionPS[VRHMDType::Oculus]));
+  if (FAILED(hr)) {
+    return false;
+  }
+
   return true;
 }
 
diff --git a/gfx/layers/d3d11/CompositorD3D11.fx b/gfx/layers/d3d11/CompositorD3D11.fx
index ca189b5a028c..e5a586e8f347 100644
--- a/gfx/layers/d3d11/CompositorD3D11.fx
+++ b/gfx/layers/d3d11/CompositorD3D11.fx
@@ -71,6 +71,7 @@ SamplerState LayerTextureSamplerLinear
 float4 TransformedPosition(float2 aInPosition)
 {
   // the current vertex's position on the quad
+  // [x,y,0,1] is mandated by the CSS Transforms spec as the point value to transform
   float4 position = float4(0, 0, 0, 1);
 
   // We use 4 component floats to uniquely describe a rectangle, by the structure
diff --git a/gfx/layers/d3d11/CompositorD3D11.h b/gfx/layers/d3d11/CompositorD3D11.h
index 86510912e28b..f2a00292eef0 100644
--- a/gfx/layers/d3d11/CompositorD3D11.h
+++ b/gfx/layers/d3d11/CompositorD3D11.h
@@ -27,6 +27,8 @@ struct VertexShaderConstants
   gfx::Rect textureCoords;
   gfx::Rect layerQuad;
   gfx::Rect maskQuad;
+  float vrEyeToSourceUVScale[2];
+  float vrEyeToSourceUVOffset[2];
 };
 
 struct PixelShaderConstants
@@ -94,6 +96,13 @@ public:
                         gfx::Float aOpacity,
                         const gfx::Matrix4x4 &aTransform) MOZ_OVERRIDE;
 
+  /* Helper for when the primary effect is VR_DISTORTION */
+  void DrawVRDistortion(const gfx::Rect &aRect,
+                        const gfx::Rect &aClipRect,
+                        const EffectChain &aEffectChain,
+                        gfx::Float aOpacity,
+                        const gfx::Matrix4x4 &aTransform);
+
   /**
    * Start a new frame. If aClipRectIn is null, sets *aClipRectOut to the
    * screen dimensions. 
diff --git a/gfx/layers/d3d11/CompositorD3D11VR.fx b/gfx/layers/d3d11/CompositorD3D11VR.fx
new file mode 100644
index 000000000000..9a129ebc5517
--- /dev/null
+++ b/gfx/layers/d3d11/CompositorD3D11VR.fx
@@ -0,0 +1,71 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* These constants should match mozilla:gfx::VRDistortionConstants */
+float4 VREyeToSource : register(vs, c0);
+float4 VRDestinationScaleAndOffset : register(vs, c1);
+
+/* This is the input undistorted texture */
+Texture2D Texture    : register(ps, t0);
+
+/* This maps to mozilla::gfx::VRDistortionVertex in gfxVR.h.
+ * It's shared amongst all of the different rendering types;
+ * some might not be in use for a particular distortion effect.
+ */
+struct VS_VR_INPUT {
+  float2 vPosition : POSITION;
+  float2 vTexCoord0 : TEXCOORD0;
+  float2 vTexCoord1 : TEXCOORD1;
+  float2 vTexCoord2 : TEXCOORD2;
+  float4 vGenericAttribs : COLOR0;
+};
+
+struct VS_VR_OUTPUT {
+  float4 vPosition : SV_Position;
+  float3 vTexCoord0 : TEXCOORD0;
+  float3 vTexCoord1 : TEXCOORD1;
+  float3 vTexCoord2 : TEXCOORD2;
+  float4 vGenericAttribs : COLOR;
+};
+
+SamplerState Linear
+{
+  Filter = MIN_MAG_MIP_LINEAR;
+  AddressU = Clamp;
+  AddressV = Clamp;
+};
+
+VS_VR_OUTPUT OculusVRDistortionVS(const VS_VR_INPUT aVertex)
+{
+  VS_VR_OUTPUT res;
+
+  float2 tc0 = VREyeToSource.xy * aVertex.vTexCoord0 + VREyeToSource.zw;
+  float2 tc1 = VREyeToSource.xy * aVertex.vTexCoord1 + VREyeToSource.zw;
+  float2 tc2 = VREyeToSource.xy * aVertex.vTexCoord2 + VREyeToSource.zw;
+
+  //res.vPosition.xy = aVertex.vPosition.xy;
+  res.vPosition.xy = aVertex.vPosition.xy * VRDestinationScaleAndOffset.zw + VRDestinationScaleAndOffset.xy;
+  res.vPosition.zw = float2(0.5, 1.0);
+
+  res.vTexCoord0 = float3(tc0, 1);
+  res.vTexCoord1 = float3(tc1, 1);
+  res.vTexCoord2 = float3(tc2, 1);
+
+  res.vGenericAttribs = aVertex.vGenericAttribs;
+  
+  return res;
+}
+
+float4 OculusVRDistortionPS(const VS_VR_OUTPUT aVertex) : SV_Target
+{
+  float resR = Texture.Sample(Linear, aVertex.vTexCoord0.xy).r;
+  float resG = Texture.Sample(Linear, aVertex.vTexCoord1.xy).g;
+  float resB = Texture.Sample(Linear, aVertex.vTexCoord2.xy).b;
+
+  return float4(resR * aVertex.vGenericAttribs.r,
+                resG * aVertex.vGenericAttribs.r,
+                resB * aVertex.vGenericAttribs.r,
+                1.0);
+}

From 883e1dee4c91cc3b2f87cd913fea680537339c11 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Wed, 17 Dec 2014 11:47:06 -0500
Subject: [PATCH 004/183] Bug 1036602 - rename d3d11 .fx files to .hlsl; r=bas

From 0117494b71e0b9ea01d8b552523529cf305ab919 Mon Sep 17 00:00:00 2001
---
 gfx/layers/d3d11/CompositorD3D11.fx     | 279 --------------------------------
 gfx/layers/d3d11/CompositorD3D11.hlsl   | 279 ++++++++++++++++++++++++++++++++
 gfx/layers/d3d11/CompositorD3D11VR.fx   |  71 --------
 gfx/layers/d3d11/CompositorD3D11VR.hlsl |  71 ++++++++
 gfx/layers/d3d11/genshaders.sh          |  28 ++--
 5 files changed, 364 insertions(+), 364 deletions(-)
 delete mode 100644 gfx/layers/d3d11/CompositorD3D11.fx
 create mode 100644 gfx/layers/d3d11/CompositorD3D11.hlsl
 delete mode 100644 gfx/layers/d3d11/CompositorD3D11VR.fx
 create mode 100644 gfx/layers/d3d11/CompositorD3D11VR.hlsl
---
 ...ompositorD3D11.fx => CompositorD3D11.hlsl} |  0
 ...sitorD3D11VR.fx => CompositorD3D11VR.hlsl} |  0
 gfx/layers/d3d11/genshaders.sh                | 28 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename gfx/layers/d3d11/{CompositorD3D11.fx => CompositorD3D11.hlsl} (100%)
 rename gfx/layers/d3d11/{CompositorD3D11VR.fx => CompositorD3D11VR.hlsl} (100%)

diff --git a/gfx/layers/d3d11/CompositorD3D11.fx b/gfx/layers/d3d11/CompositorD3D11.hlsl
similarity index 100%
rename from gfx/layers/d3d11/CompositorD3D11.fx
rename to gfx/layers/d3d11/CompositorD3D11.hlsl
diff --git a/gfx/layers/d3d11/CompositorD3D11VR.fx b/gfx/layers/d3d11/CompositorD3D11VR.hlsl
similarity index 100%
rename from gfx/layers/d3d11/CompositorD3D11VR.fx
rename to gfx/layers/d3d11/CompositorD3D11VR.hlsl
diff --git a/gfx/layers/d3d11/genshaders.sh b/gfx/layers/d3d11/genshaders.sh
index 9a69bae542fb..edc66703b21b 100644
--- a/gfx/layers/d3d11/genshaders.sh
+++ b/gfx/layers/d3d11/genshaders.sh
@@ -4,32 +4,32 @@
 
 tempfile=tmpShaderHeader
 rm CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ELayerQuadVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadVS
+fxc CompositorD3D11.hlsl -ELayerQuadVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadVS
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ESolidColorShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnSolidColorShader
+fxc CompositorD3D11.hlsl -ESolidColorShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnSolidColorShader
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ERGBShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBShader
+fxc CompositorD3D11.hlsl -ERGBShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBShader
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ERGBAShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShader
+fxc CompositorD3D11.hlsl -ERGBAShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShader
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -EComponentAlphaShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnComponentAlphaShader
+fxc CompositorD3D11.hlsl -EComponentAlphaShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnComponentAlphaShader
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -EYCbCrShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnYCbCrShader
+fxc CompositorD3D11.hlsl -EYCbCrShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnYCbCrShader
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ELayerQuadMaskVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadMaskVS
+fxc CompositorD3D11.hlsl -ELayerQuadMaskVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadMaskVS
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ELayerQuadMask3DVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadMask3DVS
+fxc CompositorD3D11.hlsl -ELayerQuadMask3DVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadMask3DVS
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ESolidColorShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnSolidColorShaderMask
+fxc CompositorD3D11.hlsl -ESolidColorShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnSolidColorShaderMask
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ERGBShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBShaderMask
+fxc CompositorD3D11.hlsl -ERGBShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBShaderMask
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ERGBAShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShaderMask
+fxc CompositorD3D11.hlsl -ERGBAShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShaderMask
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -ERGBAShaderMask3D -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShaderMask3D
+fxc CompositorD3D11.hlsl -ERGBAShaderMask3D -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShaderMask3D
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -EYCbCrShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnYCbCrShaderMask
+fxc CompositorD3D11.hlsl -EYCbCrShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnYCbCrShaderMask
 cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.fx -EComponentAlphaShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnComponentAlphaShaderMask
+fxc CompositorD3D11.hlsl -EComponentAlphaShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnComponentAlphaShaderMask
 cat $tempfile >> CompositorD3D11Shaders.h
 rm $tempfile

From 8cf3cb0f2dec85768570e1603ff8a1ba6fd8d694 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Wed, 9 Jul 2014 12:27:38 -0700
Subject: [PATCH 005/183] Bug 1036602 - Fix up D3D11 genshaders.sh script;
 r=bas

From 42aa031e5b36efe5603525c7967557fec7e09ec5 Mon Sep 17 00:00:00 2001
---
 gfx/layers/d3d11/genshaders.sh | 74 +++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 29 deletions(-)
---
 gfx/layers/d3d11/genshaders.sh | 74 +++++++++++++++++++++-------------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/gfx/layers/d3d11/genshaders.sh b/gfx/layers/d3d11/genshaders.sh
index edc66703b21b..f479ba7c0378 100644
--- a/gfx/layers/d3d11/genshaders.sh
+++ b/gfx/layers/d3d11/genshaders.sh
@@ -3,33 +3,49 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 tempfile=tmpShaderHeader
-rm CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ELayerQuadVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadVS
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ESolidColorShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnSolidColorShader
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ERGBShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBShader
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ERGBAShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShader
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -EComponentAlphaShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnComponentAlphaShader
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -EYCbCrShader -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnYCbCrShader
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ELayerQuadMaskVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadMaskVS
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ELayerQuadMask3DVS -nologo -Tvs_4_0_level_9_3 -Fh$tempfile -VnLayerQuadMask3DVS
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ESolidColorShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnSolidColorShaderMask
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ERGBShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBShaderMask
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ERGBAShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShaderMask
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -ERGBAShaderMask3D -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnRGBAShaderMask3D
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -EYCbCrShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnYCbCrShaderMask
-cat $tempfile >> CompositorD3D11Shaders.h
-fxc CompositorD3D11.hlsl -EComponentAlphaShaderMask -Tps_4_0_level_9_3 -nologo -Fh$tempfile -VnComponentAlphaShaderMask
-cat $tempfile >> CompositorD3D11Shaders.h
+
+FXC_DEBUG_FLAGS="-Zi -Fd shaders.pdb"
+FXC_FLAGS=""
+
+# If DEBUG is in the environment, then rebuild with debug info
+if [ "$DEBUG" != "" ] ; then
+  FXC_FLAGS="$FXC_DEBUG_FLAGS"
+fi
+
+makeShaderVS() {
+    fxc -nologo $FXC_FLAGS -Tvs_4_0_level_9_3 $SRC -E$1 -Vn$1 -Fh$tempfile
+    cat $tempfile >> $DEST
+}
+
+makeShaderPS() {
+    fxc -nologo $FXC_FLAGS -Tps_4_0_level_9_3 $SRC -E$1 -Vn$1 -Fh$tempfile
+    cat $tempfile >> $DEST
+}
+
+SRC=CompositorD3D11.hlsl
+DEST=CompositorD3D11Shaders.h
+
+rm -f $DEST
+makeShaderVS LayerQuadVS
+makeShaderPS SolidColorShader
+makeShaderPS RGBShader
+makeShaderPS RGBAShader
+makeShaderPS ComponentAlphaShader
+makeShaderPS YCbCrShader
+makeShaderVS LayerQuadMaskVS
+makeShaderVS LayerQuadMask3DVS
+makeShaderPS SolidColorShaderMask
+makeShaderPS RGBShaderMask
+makeShaderPS RGBAShaderMask
+makeShaderPS RGBAShaderMask3D
+makeShaderPS YCbCrShaderMask
+makeShaderPS ComponentAlphaShaderMask
+
+SRC=CompositorD3D11VR.hlsl
+DEST=CompositorD3D11ShadersVR.h
+
+rm -f $DEST
+makeShaderVS OculusVRDistortionVS
+makeShaderPS OculusVRDistortionPS
+
 rm $tempfile

From 18fcfec1c785b1055eca9b0766014d6d36ac0c81 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Wed, 9 Jul 2014 12:28:05 -0700
Subject: [PATCH 006/183] Bug 1036602 - Regenerate D3D11 shaders; r=Bas

From 11ab35cf793e6a2a0342b4e1a761a6f4cc394ff5 Mon Sep 17 00:00:00 2001
---
 gfx/layers/d3d11/CompositorD3D11Shaders.h   | 282 ++++++------
 gfx/layers/d3d11/CompositorD3D11ShadersVR.h | 638 ++++++++++++++++++++++++++++
 2 files changed, 786 insertions(+), 134 deletions(-)
 create mode 100644 gfx/layers/d3d11/CompositorD3D11ShadersVR.h
---
 gfx/layers/d3d11/CompositorD3D11Shaders.h   | 282 +++++----
 gfx/layers/d3d11/CompositorD3D11ShadersVR.h | 638 ++++++++++++++++++++
 2 files changed, 786 insertions(+), 134 deletions(-)
 create mode 100644 gfx/layers/d3d11/CompositorD3D11ShadersVR.h

diff --git a/gfx/layers/d3d11/CompositorD3D11Shaders.h b/gfx/layers/d3d11/CompositorD3D11Shaders.h
index 18b99663296b..f6379c7f4ccb 100644
--- a/gfx/layers/d3d11/CompositorD3D11Shaders.h
+++ b/gfx/layers/d3d11/CompositorD3D11Shaders.h
@@ -1,8 +1,9 @@
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -103,10 +104,10 @@ ret
 
 const BYTE LayerQuadVS[] =
 {
-     68,  88,  66,  67, 200, 251, 
-     64, 251, 166, 240, 101, 137, 
-    191, 140,  75, 217,   9, 168, 
-     61, 163,   1,   0,   0,   0, 
+     68,  88,  66,  67,  67,  61, 
+     27, 151,  57,  33,  48,  19, 
+     55,   6,  95,  77, 254, 163, 
+    118, 237,   1,   0,   0,   0, 
     180,   6,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     152,   1,   0,   0, 160,   3, 
@@ -261,7 +262,7 @@ const BYTE LayerQuadVS[] =
      65,  84, 116,   0,   0,   0, 
      13,   0,   0,   0,   2,   0, 
       0,   0,   0,   0,   0,   0, 
-      3,   0,   0,   0,  12,   0, 
+      3,   0,   0,   0,   6,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -271,7 +272,7 @@ const BYTE LayerQuadVS[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -362,10 +363,10 @@ const BYTE LayerQuadVS[] =
      41,  32,  72,  76,  83,  76, 
      32,  83, 104,  97, 100, 101, 
     114,  32,  67, 111, 109, 112, 
-    105, 108, 101, 114,  32,  54, 
-     46,  51,  46,  57,  54,  48, 
-     48,  46,  49,  54,  51,  56, 
-     52,   0, 171, 171,  73,  83, 
+    105, 108, 101, 114,  32,  57, 
+     46,  51,  48,  46,  57,  50, 
+     48,  48,  46,  50,  48,  53, 
+     52,  54,   0, 171,  73,  83, 
      71,  78,  44,   0,   0,   0, 
       1,   0,   0,   0,   8,   0, 
       0,   0,  32,   0,   0,   0, 
@@ -392,9 +393,10 @@ const BYTE LayerQuadVS[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -458,10 +460,10 @@ ret
 
 const BYTE SolidColorShader[] =
 {
-     68,  88,  66,  67,  30, 148, 
-    104, 202, 165,  39,  58, 182, 
-    100, 205,  95, 195,  52, 137, 
-    197, 241,   1,   0,   0,   0, 
+     68,  88,  66,  67, 182,  98, 
+    102, 100, 187, 218,  19,  40, 
+     99,  74,  29, 228,  47, 107, 
+    160, 122,   1,   0,   0,   0, 
     224,   3,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     132,   0,   0,   0, 204,   0, 
@@ -506,7 +508,7 @@ const BYTE SolidColorShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -597,9 +599,9 @@ const BYTE SolidColorShader[] =
      76,  83,  76,  32,  83, 104, 
      97, 100, 101, 114,  32,  67, 
     111, 109, 112, 105, 108, 101, 
-    114,  32,  54,  46,  51,  46, 
-     57,  54,  48,  48,  46,  49, 
-     54,  51,  56,  52,   0, 171, 
+    114,  32,  57,  46,  51,  48, 
+     46,  57,  50,  48,  48,  46, 
+     50,  48,  53,  52,  54,   0, 
      73,  83,  71,  78,  80,   0, 
       0,   0,   2,   0,   0,   0, 
       8,   0,   0,   0,  56,   0, 
@@ -627,9 +629,10 @@ const BYTE SolidColorShader[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -713,10 +716,10 @@ ret
 
 const BYTE RGBShader[] =
 {
-     68,  88,  66,  67, 239, 198, 
-     87, 206,  69,  92, 245,  30, 
-    125, 195, 239,  77,  37, 241, 
-    175, 187,   1,   0,   0,   0, 
+     68,  88,  66,  67, 195,  54, 
+    227,  44,  79, 159, 121,  69, 
+     60, 252, 145,  90, 151, 241, 
+    175, 162,   1,   0,   0,   0, 
     232,   4,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     204,   0,   0,   0, 136,   1, 
@@ -792,7 +795,7 @@ const BYTE RGBShader[] =
       1,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -896,9 +899,9 @@ const BYTE RGBShader[] =
      76,  83,  76,  32,  83, 104, 
      97, 100, 101, 114,  32,  67, 
     111, 109, 112, 105, 108, 101, 
-    114,  32,  54,  46,  51,  46, 
-     57,  54,  48,  48,  46,  49, 
-     54,  51,  56,  52,   0, 171, 
+    114,  32,  57,  46,  51,  48, 
+     46,  57,  50,  48,  48,  46, 
+     50,  48,  53,  52,  54,   0, 
      73,  83,  71,  78,  80,   0, 
       0,   0,   2,   0,   0,   0, 
       8,   0,   0,   0,  56,   0, 
@@ -926,9 +929,10 @@ const BYTE RGBShader[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -1010,10 +1014,10 @@ ret
 
 const BYTE RGBAShader[] =
 {
-     68,  88,  66,  67, 230,  59, 
-     90,  23,  60,  77,  18, 113, 
-     14, 129, 183, 152, 233,  55, 
-    111,  42,   1,   0,   0,   0, 
+     68,  88,  66,  67, 124,  18, 
+      8, 218,  34, 168,  20, 218, 
+    144, 232, 183, 104, 152, 211, 
+      5,  26,   1,   0,   0,   0, 
     196,   4,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     192,   0,   0,   0, 100,   1, 
@@ -1083,7 +1087,7 @@ const BYTE RGBAShader[] =
       1,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1187,9 +1191,9 @@ const BYTE RGBAShader[] =
      76,  83,  76,  32,  83, 104, 
      97, 100, 101, 114,  32,  67, 
     111, 109, 112, 105, 108, 101, 
-    114,  32,  54,  46,  51,  46, 
-     57,  54,  48,  48,  46,  49, 
-     54,  51,  56,  52,   0, 171, 
+    114,  32,  57,  46,  51,  48, 
+     46,  57,  50,  48,  48,  46, 
+     50,  48,  53,  52,  54,   0, 
      73,  83,  71,  78,  80,   0, 
       0,   0,   2,   0,   0,   0, 
       8,   0,   0,   0,  56,   0, 
@@ -1217,9 +1221,10 @@ const BYTE RGBAShader[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -1319,10 +1324,10 @@ ret
 
 const BYTE ComponentAlphaShader[] =
 {
-     68,  88,  66,  67, 186, 162, 
-     72,  42,  69,  36, 160,  68, 
-    108, 121, 216, 238, 108,  37, 
-      6, 145,   1,   0,   0,   0, 
+     68,  88,  66,  67, 152,  37, 
+    117,  77,  87, 153,  20,  62, 
+     92, 142,  77, 134, 246, 203, 
+    174,  59,   1,   0,   0,   0, 
      68,   6,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      64,   1,   0,   0, 160,   2, 
@@ -1445,7 +1450,7 @@ const BYTE ComponentAlphaShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1556,9 +1561,9 @@ const BYTE ComponentAlphaShader[] =
      76,  83,  76,  32,  83, 104, 
      97, 100, 101, 114,  32,  67, 
     111, 109, 112, 105, 108, 101, 
-    114,  32,  54,  46,  51,  46, 
-     57,  54,  48,  48,  46,  49, 
-     54,  51,  56,  52,   0, 171, 
+    114,  32,  57,  46,  51,  48, 
+     46,  57,  50,  48,  48,  46, 
+     50,  48,  53,  52,  54,   0, 
      73,  83,  71,  78,  80,   0, 
       0,   0,   2,   0,   0,   0, 
       8,   0,   0,   0,  56,   0, 
@@ -1590,9 +1595,10 @@ const BYTE ComponentAlphaShader[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -1708,10 +1714,10 @@ ret
 
 const BYTE YCbCrShader[] =
 {
-     68,  88,  66,  67, 181, 118, 
-    100,  53, 248, 120, 136,  92, 
-     59, 190,  18, 201, 139, 224, 
-     32, 141,   1,   0,   0,   0, 
+     68,  88,  66,  67,  26, 187, 
+     43, 127,  28, 135, 212,  40, 
+     57, 230, 160, 198, 151, 242, 
+    106, 110,   1,   0,   0,   0, 
     212,   7,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     220,   1,   0,   0,  44,   4, 
@@ -1890,7 +1896,7 @@ const BYTE YCbCrShader[] =
       0,   0,  15,   0,   0,   0, 
       3,   0,   0,   0,   0,   0, 
       0,   0,   2,   0,   0,   0, 
-     10,   0,   0,   0,   0,   0, 
+      6,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1900,7 +1906,7 @@ const BYTE YCbCrShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2016,9 +2022,9 @@ const BYTE YCbCrShader[] =
      76,  32,  83, 104,  97, 100, 
     101, 114,  32,  67, 111, 109, 
     112, 105, 108, 101, 114,  32, 
-     54,  46,  51,  46,  57,  54, 
-     48,  48,  46,  49,  54,  51, 
-     56,  52,   0, 171,  73,  83, 
+     57,  46,  51,  48,  46,  57, 
+     50,  48,  48,  46,  50,  48, 
+     53,  52,  54,   0,  73,  83, 
      71,  78,  80,   0,   0,   0, 
       2,   0,   0,   0,   8,   0, 
       0,   0,  56,   0,   0,   0, 
@@ -2045,9 +2051,10 @@ const BYTE YCbCrShader[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -2158,10 +2165,10 @@ ret
 
 const BYTE LayerQuadMaskVS[] =
 {
-     68,  88,  66,  67, 223, 251, 
-     10,  17,  13,  90,  47,  25, 
-    119, 198,  20, 157, 124, 193, 
-    251, 234,   1,   0,   0,   0, 
+     68,  88,  66,  67, 229,  18, 
+    238, 182, 176, 120, 118,  84, 
+     74, 135, 103, 188, 146,  51, 
+    229, 207,   1,   0,   0,   0, 
     120,   7,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     224,   1,   0,   0,  76,   4, 
@@ -2345,7 +2352,7 @@ const BYTE LayerQuadMaskVS[] =
     116,   0,   0,   0,  16,   0, 
       0,   0,   2,   0,   0,   0, 
       0,   0,   0,   0,   4,   0, 
-      0,   0,  14,   0,   0,   0, 
+      0,   0,   8,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2355,7 +2362,7 @@ const BYTE LayerQuadMaskVS[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2446,10 +2453,10 @@ const BYTE LayerQuadMaskVS[] =
      72,  76,  83,  76,  32,  83, 
     104,  97, 100, 101, 114,  32, 
      67, 111, 109, 112, 105, 108, 
-    101, 114,  32,  54,  46,  51, 
-     46,  57,  54,  48,  48,  46, 
-     49,  54,  51,  56,  52,   0, 
-    171, 171,  73,  83,  71,  78, 
+    101, 114,  32,  57,  46,  51, 
+     48,  46,  57,  50,  48,  48, 
+     46,  50,  48,  53,  52,  54, 
+      0, 171,  73,  83,  71,  78, 
      44,   0,   0,   0,   1,   0, 
       0,   0,   8,   0,   0,   0, 
      32,   0,   0,   0,   0,   0, 
@@ -2480,9 +2487,10 @@ const BYTE LayerQuadMaskVS[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -2597,10 +2605,10 @@ ret
 
 const BYTE LayerQuadMask3DVS[] =
 {
-     68,  88,  66,  67, 151, 141, 
-     11,  11, 111, 244,  17, 242, 
-    119, 116, 248,  53, 235, 192, 
-     38, 193,   1,   0,   0,   0, 
+     68,  88,  66,  67,  81, 198, 
+     45,  88, 207, 133,  27,  66, 
+      4, 235, 107, 238,  69,  93, 
+     43, 232,   1,   0,   0,   0, 
     204,   7,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      24,   2,   0,   0, 160,   4, 
@@ -2798,7 +2806,7 @@ const BYTE LayerQuadMask3DVS[] =
     116,   0,   0,   0,  17,   0, 
       0,   0,   3,   0,   0,   0, 
       0,   0,   0,   0,   4,   0, 
-      0,   0,  15,   0,   0,   0, 
+      0,   0,   9,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2808,7 +2816,7 @@ const BYTE LayerQuadMask3DVS[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2899,10 +2907,10 @@ const BYTE LayerQuadMask3DVS[] =
      72,  76,  83,  76,  32,  83, 
     104,  97, 100, 101, 114,  32, 
      67, 111, 109, 112, 105, 108, 
-    101, 114,  32,  54,  46,  51, 
-     46,  57,  54,  48,  48,  46, 
-     49,  54,  51,  56,  52,   0, 
-    171, 171,  73,  83,  71,  78, 
+    101, 114,  32,  57,  46,  51, 
+     48,  46,  57,  50,  48,  48, 
+     46,  50,  48,  53,  52,  54, 
+      0, 171,  73,  83,  71,  78, 
      44,   0,   0,   0,   1,   0, 
       0,   0,   8,   0,   0,   0, 
      32,   0,   0,   0,   0,   0, 
@@ -2933,9 +2941,10 @@ const BYTE LayerQuadMask3DVS[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -3019,10 +3028,10 @@ ret
 
 const BYTE SolidColorShaderMask[] =
 {
-     68,  88,  66,  67, 236, 109, 
-     19, 151,  23, 187, 157, 205, 
-    112, 188,  91, 187, 108, 106, 
-    138,  14,   1,   0,   0,   0, 
+     68,  88,  66,  67, 110, 173, 
+    179, 170, 121,  56,  16,  38, 
+    131, 202, 191, 200, 149, 158, 
+    191, 136,   1,   0,   0,   0, 
     232,   4,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     204,   0,   0,   0, 112,   1, 
@@ -3094,7 +3103,7 @@ const BYTE SolidColorShaderMask[] =
       1,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3198,9 +3207,9 @@ const BYTE SolidColorShaderMask[] =
      76,  83,  76,  32,  83, 104, 
      97, 100, 101, 114,  32,  67, 
     111, 109, 112, 105, 108, 101, 
-    114,  32,  54,  46,  51,  46, 
-     57,  54,  48,  48,  46,  49, 
-     54,  51,  56,  52,   0, 171, 
+    114,  32,  57,  46,  51,  48, 
+     46,  57,  50,  48,  48,  46, 
+     50,  48,  53,  52,  54,   0, 
      73,  83,  71,  78, 104,   0, 
       0,   0,   3,   0,   0,   0, 
       8,   0,   0,   0,  80,   0, 
@@ -3232,9 +3241,10 @@ const BYTE SolidColorShaderMask[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -3329,10 +3339,10 @@ ret
 
 const BYTE RGBShaderMask[] =
 {
-     68,  88,  66,  67,  30,  30, 
-     87,  58, 114, 156, 251, 151, 
-     29,  94,  34, 100, 228, 250, 
-     37, 251,   1,   0,   0,   0, 
+     68,  88,  66,  67,  90, 156, 
+    108, 215,   2, 184,  95, 225, 
+    139, 102,  23,  57, 234, 197, 
+     48,  52,   1,   0,   0,   0, 
     192,   5,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
       8,   1,   0,   0,  32,   2, 
@@ -3433,7 +3443,7 @@ const BYTE RGBShaderMask[] =
       0,   0,   2,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   2,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3544,9 +3554,9 @@ const BYTE RGBShaderMask[] =
      76,  83,  76,  32,  83, 104, 
      97, 100, 101, 114,  32,  67, 
     111, 109, 112, 105, 108, 101, 
-    114,  32,  54,  46,  51,  46, 
-     57,  54,  48,  48,  46,  49, 
-     54,  51,  56,  52,   0, 171, 
+    114,  32,  57,  46,  51,  48, 
+     46,  57,  50,  48,  48,  46, 
+     50,  48,  53,  52,  54,   0, 
      73,  83,  71,  78, 104,   0, 
       0,   0,   3,   0,   0,   0, 
       8,   0,   0,   0,  80,   0, 
@@ -3578,9 +3588,10 @@ const BYTE RGBShaderMask[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -3673,10 +3684,10 @@ ret
 
 const BYTE RGBAShaderMask[] =
 {
-     68,  88,  66,  67, 188,  13, 
-    191, 168, 231, 201,  42, 209, 
-     88, 243,  29,  35, 226,  31, 
-    145,  20,   1,   0,   0,   0, 
+     68,  88,  66,  67, 106,  15, 
+     51,  47, 230,  18,  55,  40, 
+     97,  21, 143,  67,  32,  99, 
+    176,  32,   1,   0,   0,   0, 
     156,   5,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     252,   0,   0,   0, 252,   1, 
@@ -3771,7 +3782,7 @@ const BYTE RGBAShaderMask[] =
       0,   0,   2,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3882,9 +3893,9 @@ const BYTE RGBAShaderMask[] =
      76,  83,  76,  32,  83, 104, 
      97, 100, 101, 114,  32,  67, 
     111, 109, 112, 105, 108, 101, 
-    114,  32,  54,  46,  51,  46, 
-     57,  54,  48,  48,  46,  49, 
-     54,  51,  56,  52,   0, 171, 
+    114,  32,  57,  46,  51,  48, 
+     46,  57,  50,  48,  48,  46, 
+     50,  48,  53,  52,  54,   0, 
      73,  83,  71,  78, 104,   0, 
       0,   0,   3,   0,   0,   0, 
       8,   0,   0,   0,  80,   0, 
@@ -3916,9 +3927,10 @@ const BYTE RGBAShaderMask[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -4016,10 +4028,10 @@ ret
 
 const BYTE RGBAShaderMask3D[] =
 {
-     68,  88,  66,  67, 113, 141, 
-     78,  23, 128, 223, 235,  10, 
-      0,  97,  49, 111,  47,  53, 
-    229,  55,   1,   0,   0,   0, 
+     68,  88,  66,  67, 176, 186, 
+     72,  64, 199, 228, 205, 219, 
+     97, 152, 199, 132, 157, 124, 
+    226, 212,   1,   0,   0,   0, 
      24,   6,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      24,   1,   0,   0,  64,   2, 
@@ -4126,7 +4138,7 @@ const BYTE RGBAShaderMask3D[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4246,9 +4258,9 @@ const BYTE RGBAShaderMask3D[] =
      76,  32,  83, 104,  97, 100, 
     101, 114,  32,  67, 111, 109, 
     112, 105, 108, 101, 114,  32, 
-     54,  46,  51,  46,  57,  54, 
-     48,  48,  46,  49,  54,  51, 
-     56,  52,   0, 171,  73,  83, 
+     57,  46,  51,  48,  46,  57, 
+     50,  48,  48,  46,  50,  48, 
+     53,  52,  54,   0,  73,  83, 
      71,  78, 104,   0,   0,   0, 
       3,   0,   0,   0,   8,   0, 
       0,   0,  80,   0,   0,   0, 
@@ -4279,9 +4291,10 @@ const BYTE RGBAShaderMask3D[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -4408,10 +4421,10 @@ ret
 
 const BYTE YCbCrShaderMask[] =
 {
-     68,  88,  66,  67, 103, 162, 
-    223, 236, 236, 142, 143, 151, 
-     73, 154, 187, 112,  81, 114, 
-    229, 251,   1,   0,   0,   0, 
+     68,  88,  66,  67, 115,  10, 
+     33,  43, 108, 217,  72,  92, 
+    140,  65,  97,  68, 194, 221, 
+     95,  25,   1,   0,   0,   0, 
     168,   8,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      24,   2,   0,   0, 196,   4, 
@@ -4615,7 +4628,7 @@ const BYTE YCbCrShaderMask[] =
     116,   0,   0,   0,  17,   0, 
       0,   0,   3,   0,   0,   0, 
       0,   0,   0,   0,   3,   0, 
-      0,   0,  11,   0,   0,   0, 
+      0,   0,   7,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4625,7 +4638,7 @@ const BYTE YCbCrShaderMask[] =
       4,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4747,9 +4760,9 @@ const BYTE YCbCrShaderMask[] =
      76,  83,  76,  32,  83, 104, 
      97, 100, 101, 114,  32,  67, 
     111, 109, 112, 105, 108, 101, 
-    114,  32,  54,  46,  51,  46, 
-     57,  54,  48,  48,  46,  49, 
-     54,  51,  56,  52,   0, 171, 
+    114,  32,  57,  46,  51,  48, 
+     46,  57,  50,  48,  48,  46, 
+     50,  48,  53,  52,  54,   0, 
      73,  83,  71,  78, 104,   0, 
       0,   0,   3,   0,   0,   0, 
       8,   0,   0,   0,  80,   0, 
@@ -4781,9 +4794,10 @@ const BYTE YCbCrShaderMask[] =
 };
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
 //
 //
+///
 // Buffer Definitions: 
 //
 // cbuffer $Globals
@@ -4894,10 +4908,10 @@ ret
 
 const BYTE ComponentAlphaShaderMask[] =
 {
-     68,  88,  66,  67, 245,  71, 
-    211, 223, 156, 101, 223, 204, 
-    145, 138,  53,  12,  16, 220, 
-    106,  83,   1,   0,   0,   0, 
+     68,  88,  66,  67,  66, 175, 
+    106, 103, 136,  76, 200,  80, 
+     95, 179,  74, 140, 138, 144, 
+     12,  21,   1,   0,   0,   0, 
      20,   7,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     124,   1,   0,   0,  52,   3, 
@@ -5044,7 +5058,7 @@ const BYTE ComponentAlphaShaderMask[] =
       0,   0,   3,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,   3,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -5162,9 +5176,9 @@ const BYTE ComponentAlphaShaderMask[] =
      76,  32,  83, 104,  97, 100, 
     101, 114,  32,  67, 111, 109, 
     112, 105, 108, 101, 114,  32, 
-     54,  46,  51,  46,  57,  54, 
-     48,  48,  46,  49,  54,  51, 
-     56,  52,   0, 171,  73,  83, 
+     57,  46,  51,  48,  46,  57, 
+     50,  48,  48,  46,  50,  48, 
+     53,  52,  54,   0,  73,  83, 
      71,  78, 104,   0,   0,   0, 
       3,   0,   0,   0,   8,   0, 
       0,   0,  80,   0,   0,   0, 
diff --git a/gfx/layers/d3d11/CompositorD3D11ShadersVR.h b/gfx/layers/d3d11/CompositorD3D11ShadersVR.h
new file mode 100644
index 000000000000..ade0666127cf
--- /dev/null
+++ b/gfx/layers/d3d11/CompositorD3D11ShadersVR.h
@@ -0,0 +1,638 @@
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
+//
+//
+///
+// Buffer Definitions: 
+//
+// cbuffer $Globals
+// {
+//
+//   float4 VREyeToSource;              // Offset:    0 Size:    16
+//   float4 VRDestinationScaleAndOffset;// Offset:   16 Size:    16
+//
+// }
+//
+//
+// Resource Bindings:
+//
+// Name                                 Type  Format         Dim Slot Elements
+// ------------------------------ ---------- ------- ----------- ---- --------
+// $Globals                          cbuffer      NA          NA    0        1
+//
+//
+//
+// Input signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// POSITION                 0   xy          0     NONE   float   xy  
+// TEXCOORD                 0   xy          1     NONE   float   xy  
+// TEXCOORD                 1   xy          2     NONE   float   xy  
+// TEXCOORD                 2   xy          3     NONE   float   xy  
+// COLOR                    0   xyzw        4     NONE   float   xyzw
+//
+//
+// Output signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// SV_Position              0   xyzw        0      POS   float   xyzw
+// TEXCOORD                 0   xyz         1     NONE   float   xyz 
+// TEXCOORD                 1   xyz         2     NONE   float   xyz 
+// TEXCOORD                 2   xyz         3     NONE   float   xyz 
+// COLOR                    0   xyzw        4     NONE   float   xyzw
+//
+//
+// Constant buffer to DX9 shader constant mappings:
+//
+// Target Reg Buffer  Start Reg # of Regs        Data Conversion
+// ---------- ------- --------- --------- ----------------------
+// c1         cb0             0         2  ( FLT, FLT, FLT, FLT)
+//
+//
+// Runtime generated constant mappings:
+//
+// Target Reg                               Constant Description
+// ---------- --------------------------------------------------
+// c0                              Vertex Shader position offset
+//
+//
+// Level9 shader bytecode:
+//
+    vs_2_x
+    def c3, 0.5, 1, 0, 0
+    dcl_texcoord v0
+    dcl_texcoord1 v1
+    dcl_texcoord2 v2
+    dcl_texcoord3 v3
+    dcl_texcoord4 v4
+    mad oT0.xy, c1, v1, c1.zwzw
+    mad oT1.xy, c1, v2, c1.zwzw
+    mad oT2.xy, c1, v3, c1.zwzw
+    mad r0.xy, v0, c2.zwzw, c2
+    add oPos.xy, r0, c0
+    mov oPos.zw, c3.xyxy
+    mov oT0.z, c3.y
+    mov oT1.z, c3.y
+    mov oT2.z, c3.y
+    mov oT3, v4
+
+// approximately 10 instruction slots used
+vs_4_0
+dcl_constantbuffer cb0[2], immediateIndexed
+dcl_input v0.xy
+dcl_input v1.xy
+dcl_input v2.xy
+dcl_input v3.xy
+dcl_input v4.xyzw
+dcl_output_siv o0.xyzw, position
+dcl_output o1.xyz
+dcl_output o2.xyz
+dcl_output o3.xyz
+dcl_output o4.xyzw
+mad o0.xy, v0.xyxx, cb0[1].zwzz, cb0[1].xyxx
+mov o0.zw, l(0,0,0.500000,1.000000)
+mad o1.xy, cb0[0].xyxx, v1.xyxx, cb0[0].zwzz
+mov o1.z, l(1.000000)
+mad o2.xy, cb0[0].xyxx, v2.xyxx, cb0[0].zwzz
+mov o2.z, l(1.000000)
+mad o3.xy, cb0[0].xyxx, v3.xyxx, cb0[0].zwzz
+mov o3.z, l(1.000000)
+mov o4.xyzw, v4.xyzw
+ret 
+// Approximately 10 instruction slots used
+#endif
+
+const BYTE OculusVRDistortionVS[] =
+{
+     68,  88,  66,  67, 146, 215, 
+     61, 238,  94,   6,  58,  25, 
+     65, 203, 120, 251,  26,  22, 
+    109,   4,   1,   0,   0,   0, 
+    244,   5,   0,   0,   6,   0, 
+      0,   0,  56,   0,   0,   0, 
+    108,   1,   0,   0,  44,   3, 
+      0,   0, 168,   3,   0,   0, 
+    176,   4,   0,   0,  80,   5, 
+      0,   0,  65, 111, 110,  57, 
+     44,   1,   0,   0,  44,   1, 
+      0,   0,   0,   2, 254, 255, 
+    248,   0,   0,   0,  52,   0, 
+      0,   0,   1,   0,  36,   0, 
+      0,   0,  48,   0,   0,   0, 
+     48,   0,   0,   0,  36,   0, 
+      1,   0,  48,   0,   0,   0, 
+      0,   0,   2,   0,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   2, 254, 255, 
+     81,   0,   0,   5,   3,   0, 
+     15, 160,   0,   0,   0,  63, 
+      0,   0, 128,  63,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     31,   0,   0,   2,   5,   0, 
+      0, 128,   0,   0,  15, 144, 
+     31,   0,   0,   2,   5,   0, 
+      1, 128,   1,   0,  15, 144, 
+     31,   0,   0,   2,   5,   0, 
+      2, 128,   2,   0,  15, 144, 
+     31,   0,   0,   2,   5,   0, 
+      3, 128,   3,   0,  15, 144, 
+     31,   0,   0,   2,   5,   0, 
+      4, 128,   4,   0,  15, 144, 
+      4,   0,   0,   4,   0,   0, 
+      3, 224,   1,   0, 228, 160, 
+      1,   0, 228, 144,   1,   0, 
+    238, 160,   4,   0,   0,   4, 
+      1,   0,   3, 224,   1,   0, 
+    228, 160,   2,   0, 228, 144, 
+      1,   0, 238, 160,   4,   0, 
+      0,   4,   2,   0,   3, 224, 
+      1,   0, 228, 160,   3,   0, 
+    228, 144,   1,   0, 238, 160, 
+      4,   0,   0,   4,   0,   0, 
+      3, 128,   0,   0, 228, 144, 
+      2,   0, 238, 160,   2,   0, 
+    228, 160,   2,   0,   0,   3, 
+      0,   0,   3, 192,   0,   0, 
+    228, 128,   0,   0, 228, 160, 
+      1,   0,   0,   2,   0,   0, 
+     12, 192,   3,   0,  68, 160, 
+      1,   0,   0,   2,   0,   0, 
+      4, 224,   3,   0,  85, 160, 
+      1,   0,   0,   2,   1,   0, 
+      4, 224,   3,   0,  85, 160, 
+      1,   0,   0,   2,   2,   0, 
+      4, 224,   3,   0,  85, 160, 
+      1,   0,   0,   2,   3,   0, 
+     15, 224,   4,   0, 228, 144, 
+    255, 255,   0,   0,  83,  72, 
+     68,  82, 184,   1,   0,   0, 
+     64,   0,   1,   0, 110,   0, 
+      0,   0,  89,   0,   0,   4, 
+     70, 142,  32,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+     95,   0,   0,   3,  50,  16, 
+     16,   0,   0,   0,   0,   0, 
+     95,   0,   0,   3,  50,  16, 
+     16,   0,   1,   0,   0,   0, 
+     95,   0,   0,   3,  50,  16, 
+     16,   0,   2,   0,   0,   0, 
+     95,   0,   0,   3,  50,  16, 
+     16,   0,   3,   0,   0,   0, 
+     95,   0,   0,   3, 242,  16, 
+     16,   0,   4,   0,   0,   0, 
+    103,   0,   0,   4, 242,  32, 
+     16,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0, 101,   0, 
+      0,   3, 114,  32,  16,   0, 
+      1,   0,   0,   0, 101,   0, 
+      0,   3, 114,  32,  16,   0, 
+      2,   0,   0,   0, 101,   0, 
+      0,   3, 114,  32,  16,   0, 
+      3,   0,   0,   0, 101,   0, 
+      0,   3, 242,  32,  16,   0, 
+      4,   0,   0,   0,  50,   0, 
+      0,  11,  50,  32,  16,   0, 
+      0,   0,   0,   0,  70,  16, 
+     16,   0,   0,   0,   0,   0, 
+    230, 138,  32,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+     70, 128,  32,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+     54,   0,   0,   8, 194,  32, 
+     16,   0,   0,   0,   0,   0, 
+      2,  64,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,  63,   0,   0, 
+    128,  63,  50,   0,   0,  11, 
+     50,  32,  16,   0,   1,   0, 
+      0,   0,  70, 128,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  70,  16,  16,   0, 
+      1,   0,   0,   0, 230, 138, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  54,   0, 
+      0,   5,  66,  32,  16,   0, 
+      1,   0,   0,   0,   1,  64, 
+      0,   0,   0,   0, 128,  63, 
+     50,   0,   0,  11,  50,  32, 
+     16,   0,   2,   0,   0,   0, 
+     70, 128,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     70,  16,  16,   0,   2,   0, 
+      0,   0, 230, 138,  32,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,  54,   0,   0,   5, 
+     66,  32,  16,   0,   2,   0, 
+      0,   0,   1,  64,   0,   0, 
+      0,   0, 128,  63,  50,   0, 
+      0,  11,  50,  32,  16,   0, 
+      3,   0,   0,   0,  70, 128, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  70,  16, 
+     16,   0,   3,   0,   0,   0, 
+    230, 138,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     54,   0,   0,   5,  66,  32, 
+     16,   0,   3,   0,   0,   0, 
+      1,  64,   0,   0,   0,   0, 
+    128,  63,  54,   0,   0,   5, 
+    242,  32,  16,   0,   4,   0, 
+      0,   0,  70,  30,  16,   0, 
+      4,   0,   0,   0,  62,   0, 
+      0,   1,  83,  84,  65,  84, 
+    116,   0,   0,   0,  10,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  10,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   6,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     82,  68,  69,  70,   0,   1, 
+      0,   0,   1,   0,   0,   0, 
+     72,   0,   0,   0,   1,   0, 
+      0,   0,  28,   0,   0,   0, 
+      0,   4, 254, 255,   0,   1, 
+      0,   0, 204,   0,   0,   0, 
+     60,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  36,  71, 108, 111, 
+     98,  97, 108, 115,   0, 171, 
+    171, 171,  60,   0,   0,   0, 
+      2,   0,   0,   0,  96,   0, 
+      0,   0,  32,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0, 144,   0,   0,   0, 
+      0,   0,   0,   0,  16,   0, 
+      0,   0,   2,   0,   0,   0, 
+    160,   0,   0,   0,   0,   0, 
+      0,   0, 176,   0,   0,   0, 
+     16,   0,   0,   0,  16,   0, 
+      0,   0,   2,   0,   0,   0, 
+    160,   0,   0,   0,   0,   0, 
+      0,   0,  86,  82,  69, 121, 
+    101,  84, 111,  83, 111, 117, 
+    114,  99, 101,   0, 171, 171, 
+      1,   0,   3,   0,   1,   0, 
+      4,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  86,  82, 
+     68, 101, 115, 116, 105, 110, 
+     97, 116, 105, 111, 110,  83, 
+     99,  97, 108, 101,  65, 110, 
+    100,  79, 102, 102, 115, 101, 
+    116,   0,  77, 105,  99, 114, 
+    111, 115, 111, 102, 116,  32, 
+     40,  82,  41,  32,  72,  76, 
+     83,  76,  32,  83, 104,  97, 
+    100, 101, 114,  32,  67, 111, 
+    109, 112, 105, 108, 101, 114, 
+     32,  57,  46,  51,  48,  46, 
+     57,  50,  48,  48,  46,  50, 
+     48,  53,  52,  54,   0, 171, 
+     73,  83,  71,  78, 152,   0, 
+      0,   0,   5,   0,   0,   0, 
+      8,   0,   0,   0, 128,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   3,   0,   0, 137,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+      3,   3,   0,   0, 137,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   2,   0,   0,   0, 
+      3,   3,   0,   0, 137,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   3,   0,   0,   0, 
+      3,   3,   0,   0, 146,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   4,   0,   0,   0, 
+     15,  15,   0,   0,  80,  79, 
+     83,  73,  84,  73,  79,  78, 
+      0,  84,  69,  88,  67,  79, 
+     79,  82,  68,   0,  67,  79, 
+     76,  79,  82,   0,  79,  83, 
+     71,  78, 156,   0,   0,   0, 
+      5,   0,   0,   0,   8,   0, 
+      0,   0, 128,   0,   0,   0, 
+      0,   0,   0,   0,   1,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,  15,   0, 
+      0,   0, 140,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      1,   0,   0,   0,   7,   8, 
+      0,   0, 140,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      2,   0,   0,   0,   7,   8, 
+      0,   0, 140,   0,   0,   0, 
+      2,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      3,   0,   0,   0,   7,   8, 
+      0,   0, 149,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   3,   0,   0,   0, 
+      4,   0,   0,   0,  15,   0, 
+      0,   0,  83,  86,  95,  80, 
+    111, 115, 105, 116, 105, 111, 
+    110,   0,  84,  69,  88,  67, 
+     79,  79,  82,  68,   0,  67, 
+     79,  76,  79,  82,   0, 171
+};
+#if 0
+//
+// Generated by Microsoft (R) HLSL Shader Compiler 9.30.9200.20546
+//
+//
+///
+// Resource Bindings:
+//
+// Name                                 Type  Format         Dim Slot Elements
+// ------------------------------ ---------- ------- ----------- ---- --------
+// Linear                            sampler      NA          NA    0        1
+// Texture                           texture  float4          2d    0        1
+//
+//
+//
+// Input signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// SV_Position              0   xyzw        0      POS   float       
+// TEXCOORD                 0   xyz         1     NONE   float   xy  
+// TEXCOORD                 1   xyz         2     NONE   float   xy  
+// TEXCOORD                 2   xyz         3     NONE   float   xy  
+// COLOR                    0   xyzw        4     NONE   float   x   
+//
+//
+// Output signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// SV_Target                0   xyzw        0   TARGET   float   xyzw
+//
+//
+// Sampler/Resource to DX9 shader sampler mappings:
+//
+// Target Sampler Source Sampler  Source Resource
+// -------------- --------------- ----------------
+// s0             s0              t0               
+//
+//
+// Level9 shader bytecode:
+//
+    ps_2_x
+    def c0, 1, 0, 0, 0
+    dcl t0.xyz
+    dcl t1.xyz
+    dcl t2.xyz
+    dcl t3
+    dcl_2d s0
+    texld r0, t1, s0
+    texld r1, t0, s0
+    mul r1.x, r1.x, t3.x
+    mul r1.y, r0.y, t3.x
+    texld r0, t2, s0
+    mul r1.z, r0.z, t3.x
+    mov r1.w, c0.x
+    mov oC0, r1
+
+// approximately 8 instruction slots used (3 texture, 5 arithmetic)
+ps_4_0
+dcl_sampler s0, mode_default
+dcl_resource_texture2d (float,float,float,float) t0
+dcl_input_ps linear v1.xy
+dcl_input_ps linear v2.xy
+dcl_input_ps linear v3.xy
+dcl_input_ps linear v4.x
+dcl_output o0.xyzw
+dcl_temps 1
+sample r0.xyzw, v1.xyxx, t0.xyzw, s0
+mul o0.x, r0.x, v4.x
+sample r0.xyzw, v2.xyxx, t0.xyzw, s0
+mul o0.y, r0.y, v4.x
+sample r0.xyzw, v3.xyxx, t0.xyzw, s0
+mul o0.z, r0.z, v4.x
+mov o0.w, l(1.000000)
+ret 
+// Approximately 8 instruction slots used
+#endif
+
+const BYTE OculusVRDistortionPS[] =
+{
+     68,  88,  66,  67, 150, 176, 
+     84, 101, 196,  27,  87, 110, 
+    226, 144, 161,  15,  69,  81, 
+     48, 158,   1,   0,   0,   0, 
+    128,   4,   0,   0,   6,   0, 
+      0,   0,  56,   0,   0,   0, 
+     60,   1,   0,   0, 132,   2, 
+      0,   0,   0,   3,   0,   0, 
+    168,   3,   0,   0,  76,   4, 
+      0,   0,  65, 111, 110,  57, 
+    252,   0,   0,   0, 252,   0, 
+      0,   0,   0,   2, 255, 255, 
+    212,   0,   0,   0,  40,   0, 
+      0,   0,   0,   0,  40,   0, 
+      0,   0,  40,   0,   0,   0, 
+     40,   0,   1,   0,  36,   0, 
+      0,   0,  40,   0,   0,   0, 
+      0,   0,   1,   2, 255, 255, 
+     81,   0,   0,   5,   0,   0, 
+     15, 160,   0,   0, 128,  63, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     31,   0,   0,   2,   0,   0, 
+      0, 128,   0,   0,   7, 176, 
+     31,   0,   0,   2,   0,   0, 
+      0, 128,   1,   0,   7, 176, 
+     31,   0,   0,   2,   0,   0, 
+      0, 128,   2,   0,   7, 176, 
+     31,   0,   0,   2,   0,   0, 
+      0, 128,   3,   0,  15, 176, 
+     31,   0,   0,   2,   0,   0, 
+      0, 144,   0,   8,  15, 160, 
+     66,   0,   0,   3,   0,   0, 
+     15, 128,   1,   0, 228, 176, 
+      0,   8, 228, 160,  66,   0, 
+      0,   3,   1,   0,  15, 128, 
+      0,   0, 228, 176,   0,   8, 
+    228, 160,   5,   0,   0,   3, 
+      1,   0,   1, 128,   1,   0, 
+      0, 128,   3,   0,   0, 176, 
+      5,   0,   0,   3,   1,   0, 
+      2, 128,   0,   0,  85, 128, 
+      3,   0,   0, 176,  66,   0, 
+      0,   3,   0,   0,  15, 128, 
+      2,   0, 228, 176,   0,   8, 
+    228, 160,   5,   0,   0,   3, 
+      1,   0,   4, 128,   0,   0, 
+    170, 128,   3,   0,   0, 176, 
+      1,   0,   0,   2,   1,   0, 
+      8, 128,   0,   0,   0, 160, 
+      1,   0,   0,   2,   0,   8, 
+     15, 128,   1,   0, 228, 128, 
+    255, 255,   0,   0,  83,  72, 
+     68,  82,  64,   1,   0,   0, 
+     64,   0,   0,   0,  80,   0, 
+      0,   0,  90,   0,   0,   3, 
+      0,  96,  16,   0,   0,   0, 
+      0,   0,  88,  24,   0,   4, 
+      0, 112,  16,   0,   0,   0, 
+      0,   0,  85,  85,   0,   0, 
+     98,  16,   0,   3,  50,  16, 
+     16,   0,   1,   0,   0,   0, 
+     98,  16,   0,   3,  50,  16, 
+     16,   0,   2,   0,   0,   0, 
+     98,  16,   0,   3,  50,  16, 
+     16,   0,   3,   0,   0,   0, 
+     98,  16,   0,   3,  18,  16, 
+     16,   0,   4,   0,   0,   0, 
+    101,   0,   0,   3, 242,  32, 
+     16,   0,   0,   0,   0,   0, 
+    104,   0,   0,   2,   1,   0, 
+      0,   0,  69,   0,   0,   9, 
+    242,   0,  16,   0,   0,   0, 
+      0,   0,  70,  16,  16,   0, 
+      1,   0,   0,   0,  70, 126, 
+     16,   0,   0,   0,   0,   0, 
+      0,  96,  16,   0,   0,   0, 
+      0,   0,  56,   0,   0,   7, 
+     18,  32,  16,   0,   0,   0, 
+      0,   0,  10,   0,  16,   0, 
+      0,   0,   0,   0,  10,  16, 
+     16,   0,   4,   0,   0,   0, 
+     69,   0,   0,   9, 242,   0, 
+     16,   0,   0,   0,   0,   0, 
+     70,  16,  16,   0,   2,   0, 
+      0,   0,  70, 126,  16,   0, 
+      0,   0,   0,   0,   0,  96, 
+     16,   0,   0,   0,   0,   0, 
+     56,   0,   0,   7,  34,  32, 
+     16,   0,   0,   0,   0,   0, 
+     26,   0,  16,   0,   0,   0, 
+      0,   0,  10,  16,  16,   0, 
+      4,   0,   0,   0,  69,   0, 
+      0,   9, 242,   0,  16,   0, 
+      0,   0,   0,   0,  70,  16, 
+     16,   0,   3,   0,   0,   0, 
+     70, 126,  16,   0,   0,   0, 
+      0,   0,   0,  96,  16,   0, 
+      0,   0,   0,   0,  56,   0, 
+      0,   7,  66,  32,  16,   0, 
+      0,   0,   0,   0,  42,   0, 
+     16,   0,   0,   0,   0,   0, 
+     10,  16,  16,   0,   4,   0, 
+      0,   0,  54,   0,   0,   5, 
+    130,  32,  16,   0,   0,   0, 
+      0,   0,   1,  64,   0,   0, 
+      0,   0, 128,  63,  62,   0, 
+      0,   1,  83,  84,  65,  84, 
+    116,   0,   0,   0,   8,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   5,   0, 
+      0,   0,   3,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+     82,  68,  69,  70, 160,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      0,   0,  28,   0,   0,   0, 
+      0,   4, 255, 255,   0,   1, 
+      0,   0, 107,   0,   0,   0, 
+     92,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  99,   0,   0,   0, 
+      2,   0,   0,   0,   5,   0, 
+      0,   0,   4,   0,   0,   0, 
+    255, 255, 255, 255,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+     13,   0,   0,   0,  76, 105, 
+    110, 101,  97, 114,   0,  84, 
+    101, 120, 116, 117, 114, 101, 
+      0,  77, 105,  99, 114, 111, 
+    115, 111, 102, 116,  32,  40, 
+     82,  41,  32,  72,  76,  83, 
+     76,  32,  83, 104,  97, 100, 
+    101, 114,  32,  67, 111, 109, 
+    112, 105, 108, 101, 114,  32, 
+     57,  46,  51,  48,  46,  57, 
+     50,  48,  48,  46,  50,  48, 
+     53,  52,  54,   0, 171, 171, 
+     73,  83,  71,  78, 156,   0, 
+      0,   0,   5,   0,   0,   0, 
+      8,   0,   0,   0, 128,   0, 
+      0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   3,   0, 
+      0,   0,   0,   0,   0,   0, 
+     15,   0,   0,   0, 140,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   1,   0,   0,   0, 
+      7,   3,   0,   0, 140,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   2,   0,   0,   0, 
+      7,   3,   0,   0, 140,   0, 
+      0,   0,   2,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   3,   0,   0,   0, 
+      7,   3,   0,   0, 149,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   3,   0, 
+      0,   0,   4,   0,   0,   0, 
+     15,   1,   0,   0,  83,  86, 
+     95,  80, 111, 115, 105, 116, 
+    105, 111, 110,   0,  84,  69, 
+     88,  67,  79,  79,  82,  68, 
+      0,  67,  79,  76,  79,  82, 
+      0, 171,  79,  83,  71,  78, 
+     44,   0,   0,   0,   1,   0, 
+      0,   0,   8,   0,   0,   0, 
+     32,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      3,   0,   0,   0,   0,   0, 
+      0,   0,  15,   0,   0,   0, 
+     83,  86,  95,  84,  97, 114, 
+    103, 101, 116,   0, 171, 171
+};

From e80e04cd172b33d28a8aca1ed3608043987dda6e Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Wed, 9 Jul 2014 12:28:27 -0700
Subject: [PATCH 007/183] Bug 1036602 - Add GL support for VR rendering;
 r=BenWa

From aec0bd50768482fe516111010bad2e57f01ede36 Mon Sep 17 00:00:00 2001
---
 gfx/layers/moz.build                           |   1 +
 gfx/layers/opengl/CompositingRenderTargetOGL.h |   4 +
 gfx/layers/opengl/CompositorOGL.cpp            |  14 ++
 gfx/layers/opengl/CompositorOGL.h              |  38 +++
 gfx/layers/opengl/CompositorOGLVR.cpp          | 326 +++++++++++++++++++++++++
 5 files changed, 383 insertions(+)
 create mode 100644 gfx/layers/opengl/CompositorOGLVR.cpp
---
 gfx/layers/moz.build                          |   1 +
 .../opengl/CompositingRenderTargetOGL.h       |   4 +
 gfx/layers/opengl/CompositorOGL.cpp           |  14 +
 gfx/layers/opengl/CompositorOGL.h             |  38 ++
 gfx/layers/opengl/CompositorOGLVR.cpp         | 326 ++++++++++++++++++
 5 files changed, 383 insertions(+)
 create mode 100644 gfx/layers/opengl/CompositorOGLVR.cpp

diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index f326c9e72b0b..5d3437237d84 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -317,6 +317,7 @@ UNIFIED_SOURCES += [
     'LayerSorter.cpp',
     'opengl/CompositingRenderTargetOGL.cpp',
     'opengl/CompositorOGL.cpp',
+    'opengl/CompositorOGLVR.cpp',
     'opengl/GLBlitTextureImageHelper.cpp',
     'opengl/OGLShaderProgram.cpp',
     'opengl/TextureClientOGL.cpp',
diff --git a/gfx/layers/opengl/CompositingRenderTargetOGL.h b/gfx/layers/opengl/CompositingRenderTargetOGL.h
index 0cb5f14498e0..46430df554fd 100644
--- a/gfx/layers/opengl/CompositingRenderTargetOGL.h
+++ b/gfx/layers/opengl/CompositingRenderTargetOGL.h
@@ -149,6 +149,10 @@ public:
   virtual TemporaryRef<gfx::DataSourceSurface> Dump(Compositor* aCompositor);
 #endif
 
+  const gfx::IntSize& GetInitSize() const {
+    return mInitParams.mSize;
+  }
+
 private:
   /**
    * Actually do the initialisation. Note that we leave our FBO bound, and so
diff --git a/gfx/layers/opengl/CompositorOGL.cpp b/gfx/layers/opengl/CompositorOGL.cpp
index 6dde2bc3a053..121c42bc942e 100644
--- a/gfx/layers/opengl/CompositorOGL.cpp
+++ b/gfx/layers/opengl/CompositorOGL.cpp
@@ -175,6 +175,8 @@ CompositorOGL::CleanupResources()
     mQuadVBO = 0;
   }
 
+  DestroyVR(ctx);
+
   mGLContext->MakeCurrent();
 
   mBlitTextureImageHelper = nullptr;
@@ -384,6 +386,13 @@ CompositorOGL::Initialize()
     console->LogStringMessage(msg.get());
   }
 
+  mVR.mInitialized = false;
+  if (gfxPrefs::VREnabled()) {
+    if (!InitializeVR()) {
+      NS_WARNING("Failed to initialize VR in CompositorOGL");
+    }
+  }
+
   reporter.SetSuccessful();
   return true;
 }
@@ -889,6 +898,11 @@ CompositorOGL::DrawQuad(const Rect& aRect,
   MOZ_ASSERT(mFrameInProgress, "frame not started");
   MOZ_ASSERT(mCurrentRenderTarget, "No destination");
 
+  if (aEffectChain.mPrimaryEffect->mType == EffectTypes::VR_DISTORTION) {
+    DrawVRDistortion(aRect, aClipRect, aEffectChain, aOpacity, aTransform);
+    return;
+  }
+
   Rect clipRect = aClipRect;
   // aClipRect is in destination coordinate space (after all
   // transforms and offsets have been applied) so if our
diff --git a/gfx/layers/opengl/CompositorOGL.h b/gfx/layers/opengl/CompositorOGL.h
index 6cef4f62ade7..372c1b9dabe0 100644
--- a/gfx/layers/opengl/CompositorOGL.h
+++ b/gfx/layers/opengl/CompositorOGL.h
@@ -35,6 +35,7 @@
 #ifdef MOZ_WIDGET_GONK
 #include <ui/GraphicBuffer.h>
 #endif
+#include "gfxVR.h"
 
 class nsIWidget;
 
@@ -153,6 +154,32 @@ protected:
   nsTArray<GLuint> mUnusedTextures;
 };
 
+struct CompositorOGLVRObjects {
+  bool mInitialized;
+
+  gfx::VRHMDConfiguration mConfiguration;
+
+  GLuint mDistortionVertices[2];
+  GLuint mDistortionIndices[2];
+  GLuint mDistortionIndexCount[2];
+
+  GLint mAPosition;
+  GLint mATexCoord0;
+  GLint mATexCoord1;
+  GLint mATexCoord2;
+  GLint mAGenericAttribs;
+
+  // The program here implements distortion rendering for VR devices
+  // (in this case Oculus only).  We'll need to extend this to support
+  // other device types in the future.
+
+  // 0 = TEXTURE_2D, 1 = TEXTURE_RECTANGLE for source
+  GLuint mDistortionProgram[2];
+  GLint mUTexture[2];
+  GLint mUVREyeToSource[2];
+  GLint mUVRDestionatinScaleAndOffset[2];
+};
+
 // If you want to make this class not MOZ_FINAL, first remove calls to virtual
 // methods (Destroy) that are made in the destructor.
 class CompositorOGL MOZ_FINAL : public Compositor
@@ -283,6 +310,15 @@ private:
     return gfx::ToIntSize(mWidgetSize);
   }
 
+  bool InitializeVR();
+  void DestroyVR(GLContext *gl);
+
+  void DrawVRDistortion(const gfx::Rect& aRect,
+                        const gfx::Rect& aClipRect,
+                        const EffectChain& aEffectChain,
+                        gfx::Float aOpacity,
+                        const gfx::Matrix4x4& aTransform);
+
   /** Widget associated with this compositor */
   nsIWidget *mWidget;
   nsIntSize mWidgetSize;
@@ -409,6 +445,8 @@ private:
 
   FenceHandle mReleaseFenceHandle;
   ShaderProgramOGL *mCurrentProgram;
+
+  CompositorOGLVRObjects mVR;
 };
 
 }
diff --git a/gfx/layers/opengl/CompositorOGLVR.cpp b/gfx/layers/opengl/CompositorOGLVR.cpp
new file mode 100644
index 000000000000..3022e7e342c1
--- /dev/null
+++ b/gfx/layers/opengl/CompositorOGLVR.cpp
@@ -0,0 +1,326 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "CompositorOGL.h"
+#include <sstream>                      // for ostringstream
+#include <stddef.h>                     // for size_t
+#include <stdint.h>                     // for uint32_t, uint8_t
+#include <stdlib.h>                     // for free, malloc
+#include "mozilla/layers/LayerManagerComposite.h"  // for LayerComposite, etc
+#include "mozilla/layers/Effects.h"     // for EffectChain, TexturedEffect, etc
+#include "mozilla/layers/CompositingRenderTargetOGL.h"
+#include "mozilla/layers/TextureHost.h"  // for TextureSource, etc
+#include "mozilla/layers/TextureHostOGL.h"  // for TextureSourceOGL, etc
+#include "GLContextProvider.h"          // for GLContextProvider
+#include "GLContext.h"                  // for GLContext
+#include "GLUploadHelpers.h"
+#include "Layers.h"                     // for WriteSnapshotToDumpFile
+#include "LayerScope.h"                 // for LayerScope
+#include "gfx2DGlue.h"                  // for ThebesFilter
+#include "gfx3DMatrix.h"                // for gfx3DMatrix
+#include "gfxCrashReporterUtils.h"      // for ScopedGfxFeatureReporter
+#include "gfxMatrix.h"                  // for gfxMatrix
+#include "GraphicsFilter.h"             // for GraphicsFilter
+#include "gfxPlatform.h"                // for gfxPlatform
+#include "gfxPrefs.h"                   // for gfxPrefs
+#include "gfxRect.h"                    // for gfxRect
+#include "gfxUtils.h"                   // for NextPowerOfTwo, gfxUtils, etc
+#include "gfxVR.h"
+
+namespace mozilla {
+
+using namespace std;
+using namespace gfx;
+
+namespace layers {
+
+using namespace mozilla::gl;
+
+bool
+CompositorOGL::InitializeVR()
+{
+  gl()->fGenBuffers(2, mVR.mDistortionVertices);
+  gl()->fGenBuffers(2, mVR.mDistortionIndices);
+
+  // these are explicitly bound later
+  mVR.mAPosition = 0;
+  mVR.mATexCoord0 = 1;
+  mVR.mATexCoord1 = 2;
+  mVR.mATexCoord2 = 3;
+  mVR.mAGenericAttribs = 4;
+
+  ostringstream vs;
+
+  vs << "uniform vec4 uVREyeToSource;\n";
+  vs << "uniform vec4 uVRDestinationScaleAndOffset;\n";
+  vs << "attribute vec2 aPosition;\n";
+  vs << "attribute vec2 aTexCoord0;\n";
+  vs << "attribute vec2 aTexCoord1;\n";
+  vs << "attribute vec2 aTexCoord2;\n";
+  vs << "attribute vec4 aGenericAttribs;\n";
+  vs << "varying vec2 vTexCoord0;\n";
+  vs << "varying vec2 vTexCoord1;\n";
+  vs << "varying vec2 vTexCoord2;\n";
+  vs << "varying vec4 vGenericAttribs;\n";
+  vs << "void main() {\n";
+  vs << "  gl_Position = vec4(aPosition.xy * uVRDestinationScaleAndOffset.zw + uVRDestinationScaleAndOffset.xy, 0.5, 1.0);\n";
+  vs << "  vTexCoord0 = uVREyeToSource.xy * aTexCoord0 + uVREyeToSource.zw;\n";
+  vs << "  vTexCoord1 = uVREyeToSource.xy * aTexCoord1 + uVREyeToSource.zw;\n";
+  vs << "  vTexCoord2 = uVREyeToSource.xy * aTexCoord2 + uVREyeToSource.zw;\n";
+  vs << "  vTexCoord0.y = 1.0 - vTexCoord0.y;\n";
+  vs << "  vTexCoord1.y = 1.0 - vTexCoord1.y;\n";
+  vs << "  vTexCoord2.y = 1.0 - vTexCoord2.y;\n";
+  vs << "  vGenericAttribs = aGenericAttribs;\n";
+  vs << "}\n";
+
+  std::string vsSrcString(vs.str());
+  const char *vsSrc = vsSrcString.c_str();
+
+  for (int programIndex = 0; programIndex < 2; programIndex++) {
+    GLenum textureTarget = programIndex == 0 ? LOCAL_GL_TEXTURE_2D : LOCAL_GL_TEXTURE_RECTANGLE;
+
+    const char *sampler2D = "sampler2D";
+    const char *texture2D = "texture2D";
+
+    ostringstream fs;
+
+    if (textureTarget == LOCAL_GL_TEXTURE_RECTANGLE_ARB) {
+      fs << "#extension GL_ARB_texture_rectangle : require\n";
+      sampler2D = "sampler2DRect";
+      texture2D = "texture2DRect";
+    }
+
+    if (gl()->IsGLES()) {
+      fs << "precision highp float;\n";
+    }
+
+    fs << "uniform " << sampler2D << " uTexture;\n";
+
+    fs << "varying vec2 vTexCoord0;\n";
+    fs << "varying vec2 vTexCoord1;\n";
+    fs << "varying vec2 vTexCoord2;\n";
+    fs << "varying vec4 vGenericAttribs;\n";
+    fs << "void main() {\n";
+    fs << "  float resR = " << texture2D << "(uTexture, vTexCoord0.xy).r;\n";
+    fs << "  float resG = " << texture2D << "(uTexture, vTexCoord1.xy).g;\n";
+    fs << "  float resB = " << texture2D << "(uTexture, vTexCoord2.xy).b;\n";
+    fs << "  gl_FragColor = vec4(resR * vGenericAttribs.r, resG * vGenericAttribs.r, resB * vGenericAttribs.r, 1.0);\n";
+    fs << "}\n";
+
+    std::string fsSrcString(fs.str());
+    const char *fsSrc = fsSrcString.c_str();
+
+    GLint status;
+#ifdef DEBUG
+    GLint length;
+    nsCString logStr;
+#endif
+
+    GLuint shaders[2];
+    shaders[0] = gl()->fCreateShader(LOCAL_GL_VERTEX_SHADER);
+    shaders[1] = gl()->fCreateShader(LOCAL_GL_FRAGMENT_SHADER);
+
+    GLint shaderLen[2] = { (GLint) strlen(vsSrc), (GLint) strlen(fsSrc) };
+    gl()->fShaderSource(shaders[0], 1, &vsSrc, &shaderLen[0]);
+    gl()->fShaderSource(shaders[1], 1, &fsSrc, &shaderLen[1]);
+
+    for (int k = 0; k < 2; ++k) {
+      gl()->fCompileShader(shaders[k]);
+      gl()->fGetShaderiv(shaders[k], LOCAL_GL_COMPILE_STATUS, &status);
+      if (!status) {
+        NS_WARNING("VR GL shader failed to compile!");
+
+#ifdef DEBUG
+        gl()->fGetShaderiv(shaders[k], LOCAL_GL_INFO_LOG_LENGTH, &length);
+        logStr.SetLength(length);
+        gl()->fGetShaderInfoLog(shaders[k], length, &length, logStr.BeginWriting());
+        printf_stderr("GL %s shader failed to compile:\n%s\n", k == 0 ? "vertex" : "fragment", logStr.BeginReading());
+#endif
+
+        gl()->fDeleteShader(shaders[0]);
+        gl()->fDeleteShader(shaders[1]);
+
+        return false;
+      }
+    }
+
+    GLuint prog = gl()->fCreateProgram();
+    gl()->fAttachShader(prog, shaders[0]);
+    gl()->fAttachShader(prog, shaders[1]);
+
+    gl()->fBindAttribLocation(prog, mVR.mAPosition, "aPosition");
+    gl()->fBindAttribLocation(prog, mVR.mATexCoord0, "aTexCoord0");
+    gl()->fBindAttribLocation(prog, mVR.mATexCoord1, "aTexCoord1");
+    gl()->fBindAttribLocation(prog, mVR.mATexCoord2, "aTexCoord2");
+    gl()->fBindAttribLocation(prog, mVR.mAGenericAttribs, "aGenericAttribs");
+
+    gl()->fLinkProgram(prog);
+
+    gl()->fGetProgramiv(prog, LOCAL_GL_LINK_STATUS, &status);
+    if (!status) {
+      NS_WARNING("VR GL program failed to link!");
+
+#ifdef DEBUG
+      gl()->fGetProgramiv(prog, LOCAL_GL_INFO_LOG_LENGTH, &length);
+      logStr.SetLength(length);
+      gl()->fGetProgramInfoLog(prog, length, &length, logStr.BeginWriting());
+      printf_stderr("GL shader failed to link:\n%s\n", logStr.BeginReading());
+#endif
+
+      gl()->fDeleteProgram(prog);
+      gl()->fDeleteShader(shaders[0]);
+      gl()->fDeleteShader(shaders[1]);
+
+      return false;
+    }
+
+    mVR.mUTexture[programIndex] = gl()->fGetUniformLocation(prog, "uTexture");
+    mVR.mUVREyeToSource[programIndex] = gl()->fGetUniformLocation(prog, "uVREyeToSource");
+    mVR.mUVRDestionatinScaleAndOffset[programIndex] = gl()->fGetUniformLocation(prog, "uVRDestinationScaleAndOffset");
+
+    mVR.mDistortionProgram[programIndex] = prog;
+
+    gl()->fDeleteShader(shaders[0]);
+    gl()->fDeleteShader(shaders[1]);
+  }
+
+  mVR.mInitialized = true;
+  return true;
+}
+
+void
+CompositorOGL::DestroyVR(GLContext *gl)
+{
+  if (!mVR.mInitialized)
+    return;
+
+  gl->fDeleteBuffers(2, mVR.mDistortionVertices);
+  gl->fDeleteBuffers(2, mVR.mDistortionIndices);
+  gl->fDeleteProgram(mVR.mDistortionProgram[0]);
+  gl->fDeleteProgram(mVR.mDistortionProgram[1]);
+
+  mVR.mInitialized = false;
+}
+
+void
+CompositorOGL::DrawVRDistortion(const gfx::Rect& aRect,
+                                const gfx::Rect& aClipRect,
+                                const EffectChain& aEffectChain,
+                                gfx::Float aOpacity,
+                                const gfx::Matrix4x4& aTransform)
+{
+  MOZ_ASSERT(aEffectChain.mPrimaryEffect->mType == EffectTypes::VR_DISTORTION);
+  MOZ_ASSERT(mVR.mInitialized);
+
+  if (aEffectChain.mSecondaryEffects[EffectTypes::MASK] ||
+      aEffectChain.mSecondaryEffects[EffectTypes::BLEND_MODE])
+  {
+    NS_WARNING("DrawVRDistortion: ignoring secondary effect!");
+  }
+
+  EffectVRDistortion* vrEffect =
+    static_cast<EffectVRDistortion*>(aEffectChain.mPrimaryEffect.get());
+
+  GLenum textureTarget = LOCAL_GL_TEXTURE_2D;
+  if (vrEffect->mRenderTarget)
+    textureTarget = mFBOTextureTarget;
+
+  RefPtr<CompositingRenderTargetOGL> surface =
+    static_cast<CompositingRenderTargetOGL*>(vrEffect->mRenderTarget.get());
+
+  gfx::IntSize size = surface->GetInitSize(); // XXX source->GetSize()
+
+  VRHMDInfo* hmdInfo = vrEffect->mHMD;
+  VRDistortionConstants shaderConstants;
+
+  if (hmdInfo->GetConfiguration() != mVR.mConfiguration) {
+    for (uint32_t eye = 0; eye < 2; eye++) {
+      const gfx::VRDistortionMesh& mesh = hmdInfo->GetDistortionMesh(eye);
+      gl()->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mVR.mDistortionVertices[eye]);
+      gl()->fBufferData(LOCAL_GL_ARRAY_BUFFER,
+                       mesh.mVertices.Length() * sizeof(gfx::VRDistortionVertex),
+                       mesh.mVertices.Elements(),
+                       LOCAL_GL_STATIC_DRAW);
+
+      gl()->fBindBuffer(LOCAL_GL_ELEMENT_ARRAY_BUFFER, mVR.mDistortionIndices[eye]);
+      gl()->fBufferData(LOCAL_GL_ELEMENT_ARRAY_BUFFER,
+                       mesh.mIndices.Length() * sizeof(uint16_t),
+                       mesh.mIndices.Elements(),
+                       LOCAL_GL_STATIC_DRAW);
+
+      mVR.mDistortionIndexCount[eye] = mesh.mIndices.Length();
+    }
+
+    mVR.mConfiguration = hmdInfo->GetConfiguration();
+  }
+
+  int programIndex = textureTarget == LOCAL_GL_TEXTURE_2D ? 0 : 1;
+
+  gl()->fScissor(aClipRect.x, FlipY(aClipRect.y + aClipRect.height),
+                 aClipRect.width, aClipRect.height);
+
+  // Clear out the entire area that we want to render; this ensures that
+  // the layer will be opaque, even though the mesh geometry we'll be
+  // drawing below won't cover the full rectangle.
+  gl()->fClearColor(0.0, 0.0, 0.0, 1.0);
+  gl()->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
+
+  gl()->fUseProgram(mVR.mDistortionProgram[programIndex]);
+
+  gl()->fEnableVertexAttribArray(mVR.mAPosition);
+  gl()->fEnableVertexAttribArray(mVR.mATexCoord0);
+  gl()->fEnableVertexAttribArray(mVR.mATexCoord1);
+  gl()->fEnableVertexAttribArray(mVR.mATexCoord2);
+  gl()->fEnableVertexAttribArray(mVR.mAGenericAttribs);
+
+  surface->BindTexture(LOCAL_GL_TEXTURE0, mFBOTextureTarget);
+  gl()->fUniform1i(mVR.mUTexture[programIndex], 0);
+
+  gfx::IntSize vpSizeInt = mCurrentRenderTarget->GetInitSize();
+  gfx::Size vpSize(vpSizeInt.width, vpSizeInt.height);
+
+  for (uint32_t eye = 0; eye < 2; eye++) {
+    gfx::IntRect eyeViewport;
+    eyeViewport.x = eye * size.width / 2;
+    eyeViewport.y = 0;
+    eyeViewport.width = size.width / 2;
+    eyeViewport.height = size.height;
+
+    hmdInfo->FillDistortionConstants(eye,
+                                     size, eyeViewport,
+                                     vpSize, aRect,
+                                     shaderConstants);
+
+    gl()->fUniform4fv(mVR.mUVRDestionatinScaleAndOffset[programIndex], 1, shaderConstants.destinationScaleAndOffset);
+    gl()->fUniform4fv(mVR.mUVREyeToSource[programIndex], 1, shaderConstants.eyeToSourceScaleAndOffset);
+
+    gl()->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, mVR.mDistortionVertices[eye]);
+
+    gl()->fVertexAttribPointer(mVR.mAPosition, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, sizeof(gfx::VRDistortionVertex),
+                               (void*) offsetof(gfx::VRDistortionVertex, pos));
+    gl()->fVertexAttribPointer(mVR.mATexCoord0, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, sizeof(gfx::VRDistortionVertex),
+                               (void*) offsetof(gfx::VRDistortionVertex, texR));
+    gl()->fVertexAttribPointer(mVR.mATexCoord1, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, sizeof(gfx::VRDistortionVertex),
+                               (void*) offsetof(gfx::VRDistortionVertex, texG));
+    gl()->fVertexAttribPointer(mVR.mATexCoord2, 2, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, sizeof(gfx::VRDistortionVertex),
+                               (void*) offsetof(gfx::VRDistortionVertex, texB));
+    gl()->fVertexAttribPointer(mVR.mAGenericAttribs, 4, LOCAL_GL_FLOAT, LOCAL_GL_FALSE, sizeof(gfx::VRDistortionVertex),
+                               (void*) offsetof(gfx::VRDistortionVertex, genericAttribs));
+
+    gl()->fBindBuffer(LOCAL_GL_ELEMENT_ARRAY_BUFFER, mVR.mDistortionIndices[eye]);
+    gl()->fDrawElements(LOCAL_GL_TRIANGLES, mVR.mDistortionIndexCount[eye], LOCAL_GL_UNSIGNED_SHORT, 0);
+  }
+
+  // Not clear if I should disable all of this; but going to do it and hope that
+  // any later code will enable what it needs.
+  gl()->fDisableVertexAttribArray(mVR.mAPosition);
+  gl()->fDisableVertexAttribArray(mVR.mATexCoord0);
+  gl()->fDisableVertexAttribArray(mVR.mATexCoord1);
+  gl()->fDisableVertexAttribArray(mVR.mATexCoord2);
+  gl()->fDisableVertexAttribArray(mVR.mAGenericAttribs);
+}
+
+}
+}

From 82c98fdc63b67168497f8cc342666a416fc216d1 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Thu, 18 Dec 2014 00:18:35 -0500
Subject: [PATCH 008/183] Bug 1113242 - Load Oculus VR support libs from
 location specified in prefs

From d4d1705a879295f9530da436fa437b1452c1768e Mon Sep 17 00:00:00 2001
---
 gfx/thebes/gfxVR.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
---
 gfx/thebes/gfxVR.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxVR.cpp b/gfx/thebes/gfxVR.cpp
index a73466c5f158..27907a5e0230 100644
--- a/gfx/thebes/gfxVR.cpp
+++ b/gfx/thebes/gfxVR.cpp
@@ -10,6 +10,7 @@
 #include "prenv.h"
 #include "gfxPrefs.h"
 #include "gfxVR.h"
+#include "mozilla/Preferences.h"
 
 #include "ovr_capi_dynamic.h"
 
@@ -76,12 +77,19 @@ InitializeOculusCAPI()
   if (!ovrlib) {
     const char *libName = OVR_LIB_NAME;
 
+    // If the pref is present, we override libName
+    nsAdoptingCString prefLibName = Preferences::GetCString("dom.vr.ovr_lib_path");
+    if (prefLibName && prefLibName.get()) {
+      libName = prefLibName.get();
+    }
+
+    // If the env var is present, we override libName
     if (PR_GetEnv("OVR_LIB_NAME")) {
       libName = PR_GetEnv("OVR_LIB_NAME");
     }
 
     if (!libName) {
-      printf_stderr("Don't know how to find Oculus VR library; missing OVR_LIB_NAME\n");
+      printf_stderr("Don't know how to find Oculus VR library; missing dom.vr.ovr_lib_path or OVR_LIB_NAME\n");
       return false;
     }
 

From b59e740e248324239285e3a9aa3d834088209621 Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Thu, 18 Dec 2014 14:58:09 -0500
Subject: [PATCH 009/183] Bug 1113242 - followup; fix missing namespace -
 CLOSED TREE

--HG--
extra : amend_source : 150f66d2444e56f30562265236080835fe1ffc58
---
 gfx/thebes/gfxVR.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxVR.cpp b/gfx/thebes/gfxVR.cpp
index 27907a5e0230..c402c1b3f1f0 100644
--- a/gfx/thebes/gfxVR.cpp
+++ b/gfx/thebes/gfxVR.cpp
@@ -78,7 +78,7 @@ InitializeOculusCAPI()
     const char *libName = OVR_LIB_NAME;
 
     // If the pref is present, we override libName
-    nsAdoptingCString prefLibName = Preferences::GetCString("dom.vr.ovr_lib_path");
+    nsAdoptingCString prefLibName = mozilla::Preferences::GetCString("dom.vr.ovr_lib_path");
     if (prefLibName && prefLibName.get()) {
       libName = prefLibName.get();
     }

From 6f4182dd43a5ce0eb7e2abf3d1b3614ea08a558b Mon Sep 17 00:00:00 2001
From: Vladimir Vukicevic <vladimir@pobox.com>
Date: Thu, 18 Dec 2014 15:08:45 -0500
Subject: [PATCH 010/183] Bug 1113242 - followup; fix missing include, just in
 case - CLOSED TREE

---
 gfx/thebes/gfxVR.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gfx/thebes/gfxVR.cpp b/gfx/thebes/gfxVR.cpp
index c402c1b3f1f0..a750cbf3f04b 100644
--- a/gfx/thebes/gfxVR.cpp
+++ b/gfx/thebes/gfxVR.cpp
@@ -10,6 +10,7 @@
 #include "prenv.h"
 #include "gfxPrefs.h"
 #include "gfxVR.h"
+#include "nsString.h"
 #include "mozilla/Preferences.h"
 
 #include "ovr_capi_dynamic.h"

From 8a94c3960bb6d6220db5c82d7d714e3e643fb307 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Dec 2014 15:26:05 -0500
Subject: [PATCH 011/183] Backed out changeset f0d4cb5f206c (bug 1112827) for
 Mulet permacrashing.

---
 ipc/ipdl/ipdl/lower.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py
index 031b15e14ed1..3bb885b11d6e 100644
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -1329,15 +1329,7 @@ with some new IPDL/C++ nodes that are tuned for C++ codegen."""
         # fully-qualified name. e.g. |Foo| rather than |a::b::Foo|.
         self.typedefs = [ ]
         self.typedefSet = set([ Typedef(Type('mozilla::ipc::ActorHandle'),
-                                        'ActorHandle'),
-                                Typedef(Type('base::ProcessId'),
-                                        'ProcessId'),
-                                Typedef(Type('mozilla::ipc::ProtocolId'),
-                                        'ProtocolId'),
-                                Typedef(Type('mozilla::ipc::Transport'),
-                                        'Transport'),
-                                Typedef(Type('mozilla::ipc::TransportDescriptor'),
-                                        'TransportDescriptor') ])
+                                        'ActorHandle') ])
         self.protocolName = None
 
     def visitTranslationUnit(self, tu):
@@ -2795,6 +2787,14 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
             self.cls.addstmt(typedef)
         for typedef in self.includedActorTypedefs:
             self.cls.addstmt(typedef)
+        # XXX these don't really fit in the other lists; just include
+        # them here for now
+        self.cls.addstmts([
+            Typedef(Type('base::ProcessId'), 'ProcessId'),
+            Typedef(Type('mozilla::ipc::ProtocolId'), 'ProtocolId'),
+            Typedef(Type('mozilla::ipc::Transport'), 'Transport'),
+            Typedef(Type('mozilla::ipc::TransportDescriptor'), 'TransportDescriptor')
+        ])
 
         self.cls.addstmt(Whitespace.NL)
 

From b791aba21ceecbcc25f57e64a619bf63de2eba03 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 18 Dec 2014 15:25:15 -0500
Subject: [PATCH 012/183] Bug 867348 - Part 1: Add an analysis that catches
 calls to certain functions involving arithmetic expressions; r=jrmuizel

--HG--
extra : rebase_source : d89b16b9ab591479400a3e5e89b217a67319669d
---
 build/clang-plugin/clang-plugin.cpp           | 83 +++++++++++++++++++
 .../tests/TestNoArithmeticExprInArgument.cpp  | 32 +++++++
 build/clang-plugin/tests/moz.build            |  1 +
 3 files changed, 116 insertions(+)
 create mode 100644 build/clang-plugin/tests/TestNoArithmeticExprInArgument.cpp

diff --git a/build/clang-plugin/clang-plugin.cpp b/build/clang-plugin/clang-plugin.cpp
index f28c9fecbdc2..c75ce62f3490 100644
--- a/build/clang-plugin/clang-plugin.cpp
+++ b/build/clang-plugin/clang-plugin.cpp
@@ -329,6 +329,49 @@ AST_MATCHER(QualType, nonheapClassAggregate) {
 AST_MATCHER(FunctionDecl, heapAllocator) {
   return MozChecker::hasCustomAnnotation(&Node, "moz_heap_allocator");
 }
+
+/// This matcher will match any declaration that is marked as not accepting
+/// arithmetic expressions in its arguments.
+AST_MATCHER(Decl, noArithmeticExprInArgs) {
+  return MozChecker::hasCustomAnnotation(&Node, "moz_no_arith_expr_in_arg");
+}
+
+/// This matcher will match all arithmetic binary operators.
+AST_MATCHER(BinaryOperator, binaryArithmeticOperator) {
+  BinaryOperatorKind opcode = Node.getOpcode();
+  return opcode == BO_Mul ||
+         opcode == BO_Div ||
+         opcode == BO_Rem ||
+         opcode == BO_Add ||
+         opcode == BO_Sub ||
+         opcode == BO_Shl ||
+         opcode == BO_Shr ||
+         opcode == BO_And ||
+         opcode == BO_Xor ||
+         opcode == BO_Or ||
+         opcode == BO_MulAssign ||
+         opcode == BO_DivAssign ||
+         opcode == BO_RemAssign ||
+         opcode == BO_AddAssign ||
+         opcode == BO_SubAssign ||
+         opcode == BO_ShlAssign ||
+         opcode == BO_ShrAssign ||
+         opcode == BO_AndAssign ||
+         opcode == BO_XorAssign ||
+         opcode == BO_OrAssign;
+}
+
+/// This matcher will match all arithmetic unary operators.
+AST_MATCHER(UnaryOperator, unaryArithmeticOperator) {
+  UnaryOperatorKind opcode = Node.getOpcode();
+  return opcode == UO_PostInc ||
+         opcode == UO_PostDec ||
+         opcode == UO_PreInc ||
+         opcode == UO_PreDec ||
+         opcode == UO_Plus ||
+         opcode == UO_Minus ||
+         opcode == UO_Not;
+}
 }
 }
 
@@ -367,6 +410,33 @@ DiagnosticsMatcher::DiagnosticsMatcher() {
   astMatcher.addMatcher(callExpr(callee(functionDecl(allOf(heapAllocator(),
       returns(pointerType(pointee(stackClassAggregate()))))))).bind("node"),
     &stackClassChecker);
+
+  astMatcher.addMatcher(callExpr(allOf(hasDeclaration(noArithmeticExprInArgs()),
+          anyOf(
+              hasDescendant(binaryOperator(allOf(binaryArithmeticOperator(),
+                  hasLHS(hasDescendant(declRefExpr())),
+                  hasRHS(hasDescendant(declRefExpr()))
+              )).bind("node")),
+              hasDescendant(unaryOperator(allOf(unaryArithmeticOperator(),
+                  hasUnaryOperand(allOf(hasType(builtinType()),
+                                        anyOf(hasDescendant(declRefExpr()), declRefExpr())))
+              )).bind("node"))
+          )
+      )).bind("call"),
+    &arithmeticArgChecker);
+  astMatcher.addMatcher(constructExpr(allOf(hasDeclaration(noArithmeticExprInArgs()),
+          anyOf(
+              hasDescendant(binaryOperator(allOf(binaryArithmeticOperator(),
+                  hasLHS(hasDescendant(declRefExpr())),
+                  hasRHS(hasDescendant(declRefExpr()))
+              )).bind("node")),
+              hasDescendant(unaryOperator(allOf(unaryArithmeticOperator(),
+                  hasUnaryOperand(allOf(hasType(builtinType()),
+                                        anyOf(hasDescendant(declRefExpr()), declRefExpr())))
+              )).bind("node"))
+          )
+      )).bind("call"),
+    &arithmeticArgChecker);
 }
 
 void DiagnosticsMatcher::StackClassChecker::run(
@@ -472,6 +542,19 @@ void DiagnosticsMatcher::NonHeapClassChecker::noteInferred(QualType T,
   noteInferred(cast<ValueDecl>(cause)->getType(), Diag);
 }
 
+void DiagnosticsMatcher::ArithmeticArgChecker::run(
+    const MatchFinder::MatchResult &Result) {
+  DiagnosticsEngine &Diag = Result.Context->getDiagnostics();
+  unsigned errorID = Diag.getDiagnosticIDs()->getCustomDiagID(
+      DiagnosticIDs::Error, "cannot pass an arithmetic expression of built-in types to %0");
+  const Expr *expr = Result.Nodes.getNodeAs<Expr>("node");
+  if (const CallExpr *call = Result.Nodes.getNodeAs<CallExpr>("call")) {
+    Diag.Report(expr->getLocStart(), errorID) << call->getDirectCallee();
+  } else if (const CXXConstructExpr *ctr = Result.Nodes.getNodeAs<CXXConstructExpr>("call")) {
+    Diag.Report(expr->getLocStart(), errorID) << ctr->getConstructor();
+  }
+}
+
 class MozCheckAction : public PluginASTAction {
 public:
   ASTConsumerPtr CreateASTConsumer(CompilerInstance &CI, StringRef fileName) override {
diff --git a/build/clang-plugin/tests/TestNoArithmeticExprInArgument.cpp b/build/clang-plugin/tests/TestNoArithmeticExprInArgument.cpp
new file mode 100644
index 000000000000..96f46c2ff41d
--- /dev/null
+++ b/build/clang-plugin/tests/TestNoArithmeticExprInArgument.cpp
@@ -0,0 +1,32 @@
+#define MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT __attribute__((annotate("moz_no_arith_expr_in_arg")))
+
+struct X {
+  explicit X(int) MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT;
+  void baz(int) MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT;
+};
+
+int operator+(int, X);
+int operator+(X, int);
+int operator++(X);
+
+void badArithmeticsInArgs() {
+  int a;
+  typedef int myint;
+  myint b;
+  X goodObj1(a);
+  goodObj1.baz(b);
+  X badObj1(a + b); // expected-error{{cannot pass an arithmetic expression of built-in types to 'X'}}
+  X badObj2 = X(a ? 0 : ++a); // expected-error{{cannot pass an arithmetic expression of built-in types to 'X'}}
+  X badObj3(~a); // expected-error{{cannot pass an arithmetic expression of built-in types to 'X'}}
+  badObj1.baz(a - 1 - b); // expected-error{{cannot pass an arithmetic expression of built-in types to 'baz'}}
+  badObj1.baz(++a); // expected-error{{cannot pass an arithmetic expression of built-in types to 'baz'}}
+  badObj1.baz(a++); // expected-error{{cannot pass an arithmetic expression of built-in types to 'baz'}}
+  badObj1.baz(a || b);
+  badObj1.baz(a + goodObj1);
+  badObj1.baz(goodObj1 + a);
+  badObj1.baz(++goodObj1);
+  badObj1.baz(-1);
+  badObj1.baz(-1.0);
+  badObj1.baz(1 + 2);
+  badObj1.baz(1 << (sizeof(int)/2));
+}
diff --git a/build/clang-plugin/tests/moz.build b/build/clang-plugin/tests/moz.build
index 4066642f13e5..d2c78a93638c 100644
--- a/build/clang-plugin/tests/moz.build
+++ b/build/clang-plugin/tests/moz.build
@@ -8,6 +8,7 @@ SOURCES += [
     'TestBadImplicitConversionCtor.cpp',
     'TestCustomHeap.cpp',
     'TestMustOverride.cpp',
+    'TestNoArithmeticExprInArgument.cpp',
     'TestNonHeapClass.cpp',
     'TestStackClass.cpp',
 ]

From 2e80a8882067ba7b037d8ede36ad213de326246a Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 18 Dec 2014 15:27:05 -0500
Subject: [PATCH 013/183] Bug 867348 - Part 2: Apply
 MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT to CheckedInt's constructor; r=jrmuizel

Note that the analysis currently just looks at the AST subtree of the
function call site and is therefore unable to correctly deal with cases
such as the last two hunks of the change to OggCodecState.cpp.  Fixing
the analysis to deal with that would be very difficult, so we currently
adjust the code so that it compiles.  The first hunk in that file though
is a real bug that this analysis found.

--HG--
extra : rebase_source : b44bb6d90d95551d860e0b5a1afcf2bb35cde084
---
 dom/media/ogg/OggCodecState.cpp | 8 +++++---
 mfbt/Attributes.h               | 4 ++++
 mfbt/CheckedInt.h               | 3 ++-
 mfbt/tests/TestCheckedInt.cpp   | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dom/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp
index 58871bc8af7d..acba322a0500 100644
--- a/dom/media/ogg/OggCodecState.cpp
+++ b/dom/media/ogg/OggCodecState.cpp
@@ -936,7 +936,7 @@ int64_t OpusState::Time(int aPreSkip, int64_t aGranulepos)
     return -1;
 
   // Ogg Opus always runs at a granule rate of 48 kHz.
-  CheckedInt64 t = CheckedInt64(aGranulepos - aPreSkip) * USECS_PER_S;
+  CheckedInt64 t = (CheckedInt64(aGranulepos) - aPreSkip) * USECS_PER_S;
   return t.isValid() ? t.value() / 48000 : -1;
 }
 
@@ -1197,7 +1197,8 @@ bool SkeletonState::DecodeIndex(ogg_packet* aPacket)
   }
 
   // Extract the start time.
-  CheckedInt64 t = CheckedInt64(LittleEndian::readInt64(p + INDEX_FIRST_NUMER_OFFSET)) * USECS_PER_S;
+  int64_t timeRawInt = LittleEndian::readInt64(p + INDEX_FIRST_NUMER_OFFSET);
+  CheckedInt64 t = CheckedInt64(timeRawInt) * USECS_PER_S;
   if (!t.isValid()) {
     return (mActive = false);
   } else {
@@ -1205,7 +1206,8 @@ bool SkeletonState::DecodeIndex(ogg_packet* aPacket)
   }
 
   // Extract the end time.
-  t = LittleEndian::readInt64(p + INDEX_LAST_NUMER_OFFSET) * USECS_PER_S;
+  timeRawInt = LittleEndian::readInt64(p + INDEX_LAST_NUMER_OFFSET);
+  t = CheckedInt64(timeRawInt) * USECS_PER_S;
   if (!t.isValid()) {
     return (mActive = false);
   } else {
diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h
index fa190af92f78..4e52fe659c92 100644
--- a/mfbt/Attributes.h
+++ b/mfbt/Attributes.h
@@ -502,12 +502,15 @@
  *   are disallowed by default unless they are marked as MOZ_IMPLICIT. This
  *   attribute must be used for constructors which intend to provide implicit
  *   conversions.
+ * MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT: Applies to functions. Makes it a compile
+ *   time error to path arithmetic expressions on variables to the function.
  */
 #ifdef MOZ_CLANG_PLUGIN
 #  define MOZ_MUST_OVERRIDE __attribute__((annotate("moz_must_override")))
 #  define MOZ_STACK_CLASS __attribute__((annotate("moz_stack_class")))
 #  define MOZ_NONHEAP_CLASS __attribute__((annotate("moz_nonheap_class")))
 #  define MOZ_IMPLICIT __attribute__((annotate("moz_implicit")))
+#  define MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT __attribute__((annotate("moz_no_arith_expr_in_arg")))
 /*
  * It turns out that clang doesn't like void func() __attribute__ {} without a
  * warning, so use pragmas to disable the warning. This code won't work on GCC
@@ -523,6 +526,7 @@
 #  define MOZ_STACK_CLASS /* nothing */
 #  define MOZ_NONHEAP_CLASS /* nothing */
 #  define MOZ_IMPLICIT /* nothing */
+#  define MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT /* nothing */
 #  define MOZ_HEAP_ALLOCATOR /* nothing */
 #endif /* MOZ_CLANG_PLUGIN */
 
diff --git a/mfbt/CheckedInt.h b/mfbt/CheckedInt.h
index e4f08992038b..bed71a430922 100644
--- a/mfbt/CheckedInt.h
+++ b/mfbt/CheckedInt.h
@@ -11,6 +11,7 @@
 
 #include <stdint.h>
 #include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/IntegerTypeTraits.h"
 
 namespace mozilla {
@@ -525,7 +526,7 @@ public:
    * argument is valid.
    */
   template<typename U>
-  CheckedInt(U aValue)
+  CheckedInt(U aValue) MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT
     : mValue(T(aValue)),
       mIsValid(detail::IsInRange<T>(aValue))
   {
diff --git a/mfbt/tests/TestCheckedInt.cpp b/mfbt/tests/TestCheckedInt.cpp
index cca1821746c0..7ded8e350a39 100644
--- a/mfbt/tests/TestCheckedInt.cpp
+++ b/mfbt/tests/TestCheckedInt.cpp
@@ -521,7 +521,7 @@ void test()
                                                     : sizeof(T) >= sizeof(U)); \
   }
   #define VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE(U) \
-    VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U,U,+0) \
+    VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U,U,+zero) \
     VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U,CheckedInt<U>,.toChecked<T>())
 
   VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE(int8_t)

From d74cb4fa0576b99f9fd274a789fb3ec3e3547adc Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Thu, 18 Dec 2014 13:32:45 -0500
Subject: [PATCH 014/183] Bug 1112476 - Support dumping texture data on the
 ClientLayerManager. r=mstange

--HG--
extra : rebase_source : 5d5cf3372993ca4af78e12236fc64836a56eff4b
---
 gfx/layers/TiledLayerBuffer.h                 | 34 ++++++++++++++++
 gfx/layers/client/ClientPaintedLayer.cpp      | 11 +++++
 gfx/layers/client/ClientPaintedLayer.h        |  4 +-
 gfx/layers/client/ClientTiledPaintedLayer.cpp | 12 ++++++
 gfx/layers/client/ClientTiledPaintedLayer.h   |  2 +
 gfx/layers/client/CompositableClient.cpp      | 14 +++++++
 gfx/layers/client/CompositableClient.h        |  1 +
 gfx/layers/client/ContentClient.cpp           | 23 +++++++++++
 gfx/layers/client/ContentClient.h             |  9 +++++
 gfx/layers/client/TextureClient.cpp           | 40 +++++++++++++++++++
 gfx/layers/client/TextureClient.h             |  6 +++
 gfx/layers/client/TiledContentClient.cpp      | 22 ++++++++++
 gfx/layers/client/TiledContentClient.h        | 11 +++++
 gfx/layers/composite/TiledContentHost.cpp     | 33 +--------------
 gfx/layers/composite/TiledContentHost.h       |  5 +++
 .../opengl/MacIOSurfaceTextureClientOGL.cpp   |  6 +++
 .../opengl/MacIOSurfaceTextureClientOGL.h     |  2 +
 17 files changed, 202 insertions(+), 33 deletions(-)

diff --git a/gfx/layers/TiledLayerBuffer.h b/gfx/layers/TiledLayerBuffer.h
index 7bf1f918cba8..9b1a42e9c4c0 100644
--- a/gfx/layers/TiledLayerBuffer.h
+++ b/gfx/layers/TiledLayerBuffer.h
@@ -176,6 +176,8 @@ public:
   Iterator TilesBegin() { return mRetainedTiles.Elements(); }
   Iterator TilesEnd() { return mRetainedTiles.Elements() + mRetainedTiles.Length(); }
 
+  void Dump(std::stringstream& aStream, const char* aPrefix, bool aDumpHtml);
+
 protected:
   // The implementor should call Update() to change
   // the new valid region. This implementation will call
@@ -307,6 +309,38 @@ TiledLayerBuffer<Derived, Tile>::RemoveTile(int x, int y, Tile& aRemovedTile)
   return false;
 }
 
+template<typename Derived, typename Tile> void
+TiledLayerBuffer<Derived, Tile>::Dump(std::stringstream& aStream,
+                                      const char* aPrefix,
+                                      bool aDumpHtml)
+{
+  nsIntRect visibleRect = GetValidRegion().GetBounds();
+  gfx::IntSize scaledTileSize = GetScaledTileSize();
+  for (int32_t x = visibleRect.x; x < visibleRect.x + visibleRect.width;) {
+    int32_t tileStartX = GetTileStart(x, scaledTileSize.width);
+    int32_t w = scaledTileSize.width - tileStartX;
+
+    for (int32_t y = visibleRect.y; y < visibleRect.y + visibleRect.height;) {
+      int32_t tileStartY = GetTileStart(y, scaledTileSize.height);
+      Tile tileTexture =
+        GetTile(nsIntPoint(RoundDownToTileEdge(x, scaledTileSize.width),
+                           RoundDownToTileEdge(y, scaledTileSize.height)));
+      int32_t h = scaledTileSize.height - tileStartY;
+
+      aStream << "\n" << aPrefix << "Tile (x=" <<
+        RoundDownToTileEdge(x, scaledTileSize.width) << ", y=" <<
+        RoundDownToTileEdge(y, scaledTileSize.height) << "): ";
+      if (tileTexture != AsDerived().GetPlaceholderTile()) {
+        tileTexture.DumpTexture(aStream);
+      } else {
+        aStream << "empty tile";
+      }
+      y += h;
+    }
+    x += w;
+  }
+}
+
 template<typename Derived, typename Tile> void
 TiledLayerBuffer<Derived, Tile>::Update(const nsIntRegion& aNewValidRegion,
                                         const nsIntRegion& aPaintRegion)
diff --git a/gfx/layers/client/ClientPaintedLayer.cpp b/gfx/layers/client/ClientPaintedLayer.cpp
index f9c980eee535..7096f5f3be2d 100644
--- a/gfx/layers/client/ClientPaintedLayer.cpp
+++ b/gfx/layers/client/ClientPaintedLayer.cpp
@@ -176,6 +176,17 @@ ClientLayerManager::CreatePaintedLayerWithHint(PaintedLayerCreationHint aHint)
   }
 }
 
+void
+ClientPaintedLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix)
+{
+  PaintedLayer::PrintInfo(aStream, aPrefix);
+  if (mContentClient) {
+    aStream << "\n";
+    nsAutoCString pfx(aPrefix);
+    pfx += "  ";
+    mContentClient->PrintInfo(aStream, pfx.get());
+  }
+}
 
 }
 }
diff --git a/gfx/layers/client/ClientPaintedLayer.h b/gfx/layers/client/ClientPaintedLayer.h
index 449ee3dfbcc1..288c33740e21 100644
--- a/gfx/layers/client/ClientPaintedLayer.h
+++ b/gfx/layers/client/ClientPaintedLayer.h
@@ -108,7 +108,9 @@ public:
 
 protected:
   void PaintThebes();
-  
+
+  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix) MOZ_OVERRIDE;
+
   void DestroyBackBuffer()
   {
     mContentClient = nullptr;
diff --git a/gfx/layers/client/ClientTiledPaintedLayer.cpp b/gfx/layers/client/ClientTiledPaintedLayer.cpp
index c71b769f2270..5452d8e81397 100644
--- a/gfx/layers/client/ClientTiledPaintedLayer.cpp
+++ b/gfx/layers/client/ClientTiledPaintedLayer.cpp
@@ -470,5 +470,17 @@ ClientTiledPaintedLayer::RenderLayer()
   EndPaint();
 }
 
+void
+ClientTiledPaintedLayer::PrintInfo(std::stringstream& aStream, const char* aPrefix)
+{
+  PaintedLayer::PrintInfo(aStream, aPrefix);
+  if (mContentClient) {
+    aStream << "\n";
+    nsAutoCString pfx(aPrefix);
+    pfx += "  ";
+    mContentClient->PrintInfo(aStream, pfx.get());
+  }
+}
+
 } // mozilla
 } // layers
diff --git a/gfx/layers/client/ClientTiledPaintedLayer.h b/gfx/layers/client/ClientTiledPaintedLayer.h
index 6648a5e4fbe8..37b3674305e8 100644
--- a/gfx/layers/client/ClientTiledPaintedLayer.h
+++ b/gfx/layers/client/ClientTiledPaintedLayer.h
@@ -47,6 +47,8 @@ public:
 protected:
   ~ClientTiledPaintedLayer();
 
+  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix) MOZ_OVERRIDE;
+
 public:
   // Override name to distinguish it from ClientPaintedLayer in layer dumps
   virtual const char* Name() const { return "TiledPaintedLayer"; }
diff --git a/gfx/layers/client/CompositableClient.cpp b/gfx/layers/client/CompositableClient.cpp
index 94ee01bd0ff8..66fef80f0e88 100644
--- a/gfx/layers/client/CompositableClient.cpp
+++ b/gfx/layers/client/CompositableClient.cpp
@@ -16,6 +16,7 @@
 #include "mozilla/layers/TextureD3D11.h"
 #include "mozilla/layers/TextureD3D9.h"
 #endif
+#include "gfxUtils.h"
 
 namespace mozilla {
 namespace layers {
@@ -258,5 +259,18 @@ CompositableClient::GetTextureClientRecycler()
   return mTextureClientRecycler;
 }
 
+void
+CompositableClient::DumpTextureClient(std::stringstream& aStream, TextureClient* aTexture)
+{
+  if (!aTexture) {
+    return;
+  }
+  RefPtr<gfx::DataSourceSurface> dSurf = aTexture->GetAsSurface();
+  if (!dSurf) {
+    return;
+  }
+  aStream << gfxUtils::GetAsLZ4Base64Str(dSurf).get();
+}
+
 } // namespace layers
 } // namespace mozilla
diff --git a/gfx/layers/client/CompositableClient.h b/gfx/layers/client/CompositableClient.h
index 0c51e3f726b1..63c8f457f473 100644
--- a/gfx/layers/client/CompositableClient.h
+++ b/gfx/layers/client/CompositableClient.h
@@ -232,6 +232,7 @@ public:
 
   TextureClientRecycleAllocator* GetTextureClientRecycler();
 
+  static void DumpTextureClient(std::stringstream& aStream, TextureClient* aTexture);
 protected:
   CompositableChild* mCompositableChild;
   CompositableForwarder* mForwarder;
diff --git a/gfx/layers/client/ContentClient.cpp b/gfx/layers/client/ContentClient.cpp
index 0c7c9f941267..62298d81ffe4 100644
--- a/gfx/layers/client/ContentClient.cpp
+++ b/gfx/layers/client/ContentClient.cpp
@@ -118,6 +118,20 @@ ContentClient::EndPaint(nsTArray<ReadbackProcessor::Update>* aReadbackUpdates)
   OnTransaction();
 }
 
+void
+ContentClient::PrintInfo(std::stringstream& aStream, const char* aPrefix)
+{
+  aStream << aPrefix;
+  aStream << nsPrintfCString("ContentClient (0x%p)", this).get();
+
+  if (profiler_feature_active("displaylistdump")) {
+    nsAutoCString pfx(aPrefix);
+    pfx += "  ";
+
+    Dump(aStream, pfx.get(), false);
+  }
+}
+
 // We pass a null pointer for the ContentClient Forwarder argument, which means
 // this client will not have a ContentHost on the other side.
 ContentClientBasic::ContentClientBasic()
@@ -401,6 +415,15 @@ ContentClientRemoteBuffer::SwapBuffers(const nsIntRegion& aFrontUpdatedRegion)
   mFrontAndBackBufferDiffer = true;
 }
 
+void
+ContentClientRemoteBuffer::Dump(std::stringstream& aStream,
+                                const char* aPrefix,
+                                bool aDumpHtml)
+{
+  // TODO We should combine the OnWhite/OnBlack here an just output a single image.
+  CompositableClient::DumpTextureClient(aStream, mTextureClient);
+}
+
 void
 ContentClientDoubleBuffered::DestroyFrontBuffer()
 {
diff --git a/gfx/layers/client/ContentClient.h b/gfx/layers/client/ContentClient.h
index bd597e6843c1..dec05a882d1f 100644
--- a/gfx/layers/client/ContentClient.h
+++ b/gfx/layers/client/ContentClient.h
@@ -89,6 +89,11 @@ public:
   virtual ~ContentClient()
   {}
 
+  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);
+
+  virtual void Dump(std::stringstream& aStream,
+                    const char* aPrefix="",
+                    bool aDumpHtml=false) {};
 
   virtual void Clear() = 0;
   virtual RotatedContentBuffer::PaintState BeginPaintBuffer(PaintedLayer* aLayer,
@@ -208,6 +213,10 @@ public:
     mTextureClientOnWhite = nullptr;
   }
 
+  virtual void Dump(std::stringstream& aStream,
+                    const char* aPrefix="",
+                    bool aDumpHtml=false) MOZ_OVERRIDE;
+
   virtual PaintState BeginPaintBuffer(PaintedLayer* aLayer,
                                       uint32_t aFlags) MOZ_OVERRIDE
   {
diff --git a/gfx/layers/client/TextureClient.cpp b/gfx/layers/client/TextureClient.cpp
index fdb22befca6b..793ef3514119 100644
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -22,6 +22,10 @@
 #include "mozilla/layers/PTextureChild.h"
 #include "SharedSurface.h"
 #include "GLContext.h"
+#include "mozilla/gfx/DataSurfaceHelpers.h" // for CreateDataSourceSurfaceByCloning
+#include "nsPrintfCString.h"            // for nsPrintfCString
+#include "LayersLogging.h"              // for AppendToString
+#include "gfxUtils.h"                   // for gfxUtils::GetAsLZ4Base64Str
 
 #ifdef XP_WIN
 #include "mozilla/layers/TextureD3D9.h"
@@ -572,6 +576,28 @@ TextureClient::ShouldDeallocateInDestructor() const
   return !IsSharedWithCompositor() || (GetFlags() & TextureFlags::DEALLOCATE_CLIENT);
 }
 
+void
+TextureClient::PrintInfo(std::stringstream& aStream, const char* aPrefix)
+{
+  aStream << aPrefix;
+  aStream << nsPrintfCString("TextureClient (0x%p)", this).get();
+  AppendToString(aStream, GetSize(), " [size=", "]");
+  AppendToString(aStream, GetFormat(), " [format=", "]");
+  AppendToString(aStream, mFlags, " [flags=", "]");
+
+#ifdef MOZ_DUMP_PAINTING
+  if (gfxPrefs::LayersDumpTexture() || profiler_feature_active("layersdump")) {
+    nsAutoCString pfx(aPrefix);
+    pfx += "  ";
+
+    aStream << "\n" << pfx.get() << "Surface: ";
+    RefPtr<gfx::DataSourceSurface> dSurf = GetAsSurface();
+    if (dSurf) {
+      aStream << gfxUtils::GetAsLZ4Base64Str(dSurf).get();
+    }
+  }
+#endif
+}
 bool
 ShmemTextureClient::ToSurfaceDescriptor(SurfaceDescriptor& aDescriptor)
 {
@@ -866,6 +892,20 @@ BufferTextureClient::GetLockedData() const
   return serializer.GetData();
 }
 
+TemporaryRef<gfx::DataSourceSurface>
+BufferTextureClient::GetAsSurface()
+{
+  ImageDataSerializer serializer(GetBuffer(), GetBufferSize());
+  MOZ_ASSERT(serializer.IsValid());
+
+  RefPtr<gfx::DataSourceSurface> wrappingSurf =
+    gfx::Factory::CreateWrappingDataSourceSurface(serializer.GetData(),
+                                                  serializer.GetStride(),
+                                                  serializer.GetSize(),
+                                                  serializer.GetFormat());
+  return gfx::CreateDataSourceSurfaceByCloning(wrappingSurf);
+}
+
 ////////////////////////////////////////////////////////////////////////
 // SharedSurfaceTextureClient
 
diff --git a/gfx/layers/client/TextureClient.h b/gfx/layers/client/TextureClient.h
index 4ac737d53ec4..bb520c8c217f 100644
--- a/gfx/layers/client/TextureClient.h
+++ b/gfx/layers/client/TextureClient.h
@@ -281,6 +281,10 @@ public:
     return gfx::SurfaceFormat::UNKNOWN;
   }
 
+  virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() { return nullptr; }
+
+  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);
+
   /**
    * Copies a rectangle from this texture client to a position in aTarget.
    * It is assumed that the necessary locks are in place; so this should at
@@ -584,6 +588,8 @@ public:
                                 gfx::IntSize aCbCrSize,
                                 StereoMode aStereoMode) MOZ_OVERRIDE;
 
+  virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() MOZ_OVERRIDE;
+
   virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE { return mFormat; }
 
   // XXX - Bug 908196 - Make Allocate(uint32_t) and GetBufferSize() protected.
diff --git a/gfx/layers/client/TiledContentClient.cpp b/gfx/layers/client/TiledContentClient.cpp
index 3af084784893..2795f2d7a5d9 100644
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -1598,5 +1598,27 @@ ClientTiledLayerBuffer::ProgressiveUpdate(nsIntRegion& aValidRegion,
   return isBufferChanged;
 }
 
+void
+TiledContentClient::PrintInfo(std::stringstream& aStream, const char* aPrefix)
+{
+  aStream << aPrefix;
+  aStream << nsPrintfCString("TiledContentClient (0x%p)", this).get();
+
+  if (profiler_feature_active("displaylistdump")) {
+    nsAutoCString pfx(aPrefix);
+    pfx += "  ";
+
+    Dump(aStream, pfx.get(), false);
+  }
+}
+
+void
+TiledContentClient::Dump(std::stringstream& aStream,
+                       const char* aPrefix,
+                       bool aDumpHtml)
+{
+  mTiledBuffer.Dump(aStream, aPrefix, aDumpHtml);
+}
+
 }
 }
diff --git a/gfx/layers/client/TiledContentClient.h b/gfx/layers/client/TiledContentClient.h
index 4a68dd973ced..303fca780f38 100644
--- a/gfx/layers/client/TiledContentClient.h
+++ b/gfx/layers/client/TiledContentClient.h
@@ -218,6 +218,11 @@ struct TileClient
   */
   void Flip();
 
+  void DumpTexture(std::stringstream& aStream) {
+    // TODO We should combine the OnWhite/OnBlack here an just output a single image.
+    CompositableClient::DumpTextureClient(aStream, mFrontBuffer);
+  }
+
   /**
   * Returns an unlocked TextureClient that can be used for writing new
   * data to the tile. This may flip the front-buffer to the back-buffer if
@@ -527,6 +532,12 @@ protected:
     mLowPrecisionTiledBuffer.Release();
   }
 
+  virtual void PrintInfo(std::stringstream& aStream, const char* aPrefix);
+
+  virtual void Dump(std::stringstream& aStream,
+                    const char* aPrefix="",
+                    bool aDumpHtml=false);
+
 public:
   virtual TextureInfo GetTextureInfo() const MOZ_OVERRIDE
   {
diff --git a/gfx/layers/composite/TiledContentHost.cpp b/gfx/layers/composite/TiledContentHost.cpp
index 9b53ef21b576..164a61284b0f 100644
--- a/gfx/layers/composite/TiledContentHost.cpp
+++ b/gfx/layers/composite/TiledContentHost.cpp
@@ -642,38 +642,7 @@ TiledContentHost::Dump(std::stringstream& aStream,
                        const char* aPrefix,
                        bool aDumpHtml)
 {
-  nsIntRect visibleRect = mTiledBuffer.GetValidRegion().GetBounds();
-  gfx::IntSize scaledTileSize = mTiledBuffer.GetScaledTileSize();
-  for (int32_t x = visibleRect.x; x < visibleRect.x + visibleRect.width;) {
-    int32_t tileStartX = mTiledBuffer.GetTileStart(x, scaledTileSize.width);
-    int32_t w = scaledTileSize.width - tileStartX;
-    if (x + w > visibleRect.x + visibleRect.width) {
-      w = visibleRect.x + visibleRect.width - x;
-    }
-
-    for (int32_t y = visibleRect.y; y < visibleRect.y + visibleRect.height;) {
-      int32_t tileStartY = mTiledBuffer.GetTileStart(y, scaledTileSize.height);
-      TileHost tileTexture = mTiledBuffer.
-        GetTile(nsIntPoint(mTiledBuffer.RoundDownToTileEdge(x, scaledTileSize.width),
-                           mTiledBuffer.RoundDownToTileEdge(y, scaledTileSize.height)));
-      int32_t h = scaledTileSize.height - tileStartY;
-      if (y + h > visibleRect.y + visibleRect.height) {
-        h = visibleRect.y + visibleRect.height - y;
-      }
-
-      aStream << "\n" << aPrefix << "Tile (x=" <<
-        mTiledBuffer.RoundDownToTileEdge(x, scaledTileSize.width) << ", y=" <<
-        mTiledBuffer.RoundDownToTileEdge(y, scaledTileSize.height) << "): ";
-      if (tileTexture != mTiledBuffer.GetPlaceholderTile()) {
-        DumpTextureHost(aStream, tileTexture.mTextureHost);
-        // TODO We should combine the OnWhite/OnBlack here an just output a single image.
-      } else {
-        aStream << "empty tile";
-      }
-      y += h;
-    }
-    x += w;
-  }
+  mTiledBuffer.Dump(aStream, aPrefix, aDumpHtml);
 }
 
 } // namespace
diff --git a/gfx/layers/composite/TiledContentHost.h b/gfx/layers/composite/TiledContentHost.h
index 229d07e355f1..c7f0d495cf57 100644
--- a/gfx/layers/composite/TiledContentHost.h
+++ b/gfx/layers/composite/TiledContentHost.h
@@ -106,6 +106,11 @@ public:
     }
   }
 
+  void DumpTexture(std::stringstream& aStream) {
+    // TODO We should combine the OnWhite/OnBlack here an just output a single image.
+    CompositableHost::DumpTextureHost(aStream, mTextureHost);
+  }
+
   RefPtr<gfxSharedReadLock> mSharedLock;
   CompositableTextureHostRef mTextureHost;
   CompositableTextureHostRef mTextureHostOnWhite;
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp b/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp
index 1b784f44d761..cdf9601f1bd1 100644
--- a/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp
+++ b/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.cpp
@@ -65,5 +65,11 @@ MacIOSurfaceTextureClientOGL::GetSize() const
   return gfx::IntSize(mSurface->GetDevicePixelWidth(), mSurface->GetDevicePixelHeight());
 }
 
+TemporaryRef<gfx::DataSourceSurface>
+MacIOSurfaceTextureClientOGL::GetAsSurface()
+{
+  RefPtr<gfx::SourceSurface> surf = mSurface->GetAsSurface();
+  return surf->GetDataSurface();
+}
 }
 }
diff --git a/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.h b/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.h
index b7353464337a..e423ffc95995 100644
--- a/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.h
+++ b/gfx/layers/opengl/MacIOSurfaceTextureClientOGL.h
@@ -36,6 +36,8 @@ public:
 
   virtual bool HasInternalBuffer() const MOZ_OVERRIDE { return false; }
 
+  virtual TemporaryRef<gfx::DataSourceSurface> GetAsSurface() MOZ_OVERRIDE;
+
   // This TextureClient should not be used in a context where we use CreateSimilar
   // (ex. component alpha) because the underlying texture data is always created by
   // an external producer.

From 0003ef72d01c7c45f9620b975178efada7b06e69 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Thu, 18 Dec 2014 13:32:51 -0500
Subject: [PATCH 015/183] Bug 1112483 - Add the layer bounds in the DisplayList
 dump. r=mattwoodrow

--HG--
extra : rebase_source : cb6d1329dc507607ef57bcd26d825dde052121ea
---
 layout/base/nsLayoutDebugger.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/layout/base/nsLayoutDebugger.cpp b/layout/base/nsLayoutDebugger.cpp
index b53dc3f4cab0..3f873f001361 100644
--- a/layout/base/nsLayoutDebugger.cpp
+++ b/layout/base/nsLayoutDebugger.cpp
@@ -149,6 +149,9 @@ PrintDisplayItemTo(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem,
 #endif
   bool snap;
   nsRect rect = aItem->GetBounds(aBuilder, &snap);
+  nsRect layerRect = rect -
+    nsLayoutUtils::GetAnimatedGeometryRootFor(aItem, aBuilder, nullptr)->
+      GetOffsetToCrossDoc(aItem->ReferenceFrame());
   nscolor color;
   nsRect vis = aItem->GetVisibleRect();
   nsRect component = aItem->GetComponentAlphaBounds(aBuilder);
@@ -161,10 +164,11 @@ PrintDisplayItemTo(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem,
     string.AppendInt((uint64_t)aItem);
     aStream << nsPrintfCString("<a href=\"javascript:ViewImage('%s')\">", string.BeginReading());
   }
-  aStream << nsPrintfCString("%s p=0x%p f=0x%p(%s) %sbounds(%d,%d,%d,%d) visible(%d,%d,%d,%d) componentAlpha(%d,%d,%d,%d) clip(%s) %s",
+  aStream << nsPrintfCString("%s p=0x%p f=0x%p(%s) %sbounds(%d,%d,%d,%d) layerBounds(%d,%d,%d,%d) visible(%d,%d,%d,%d) componentAlpha(%d,%d,%d,%d) clip(%s) %s",
           aItem->Name(), aItem, (void*)f, NS_ConvertUTF16toUTF8(fName).get(),
           (aItem->ZIndex() ? nsPrintfCString("z=%d ", aItem->ZIndex()).get() : ""),
           rect.x, rect.y, rect.width, rect.height,
+          layerRect.x, layerRect.y, layerRect.width, layerRect.height,
           vis.x, vis.y, vis.width, vis.height,
           component.x, component.y, component.width, component.height,
           clip.ToString().get(),

From 22355f0c17a51e29f1e9072c36419a1538ac64e7 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Thu, 18 Dec 2014 13:32:53 -0500
Subject: [PATCH 016/183] Bug 1112756 - Pass display list and layers data
 directly to the profiler. r=mstange

--HG--
extra : rebase_source : 5c7295e80105b0db43651553c1b901836571cbbb
---
 .../composite/LayerManagerComposite.cpp       |  6 +++++-
 gfx/thebes/gfxUtils.cpp                       |  2 +-
 layout/base/nsLayoutUtils.cpp                 | 21 +++++++++++++++----
 tools/profiler/GeckoProfiler.h                |  3 +++
 tools/profiler/GeckoProfilerFunc.h            |  2 ++
 tools/profiler/GeckoProfilerImpl.h            | 12 +++++++++++
 tools/profiler/platform.cpp                   |  6 +++---
 7 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/gfx/layers/composite/LayerManagerComposite.cpp b/gfx/layers/composite/LayerManagerComposite.cpp
index a48f547ebf66..634a8a272099 100644
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@@ -627,8 +627,12 @@ LayerManagerComposite::Render()
   LayerScopeAutoFrame frame(PR_Now());
 
   // Dump to console
-  if (gfxPrefs::LayersDump() || profiler_feature_active("layersdump")) {
+  if (gfxPrefs::LayersDump()) {
     this->Dump();
+  } else if (profiler_feature_active("layersdump")) {
+    std::stringstream ss;
+    Dump(ss);
+    profiler_log(ss.str().c_str());
   }
 
   // Dump to LayerScope Viewer
diff --git a/gfx/thebes/gfxUtils.cpp b/gfx/thebes/gfxUtils.cpp
index 6e5a1dc1bb8f..9dd8ee262dc0 100644
--- a/gfx/thebes/gfxUtils.cpp
+++ b/gfx/thebes/gfxUtils.cpp
@@ -1443,7 +1443,7 @@ static bool sDumpPaintList = getenv("MOZ_DUMP_PAINT_LIST") != 0;
 
 /* static */ bool
 gfxUtils::DumpPaintList() {
-  return sDumpPaintList || gfxPrefs::LayoutDumpDisplayList() || profiler_feature_active("displaylistdump");
+  return sDumpPaintList || gfxPrefs::LayoutDumpDisplayList();
 }
 
 bool gfxUtils::sDumpPainting = getenv("MOZ_DUMP_PAINT") != 0;
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index b74a921fbed0..1b5c24acad5b 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -3106,8 +3106,11 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram
 #ifdef MOZ_DUMP_PAINTING
   FILE* savedDumpFile = gfxUtils::sDumpPaintFile;
 
+  bool profilerNeedsDisplayList = profiler_feature_active("displaylistdump");
+  bool consoleNeedsDisplayList = gfxUtils::DumpPaintList() || gfxUtils::sDumpPainting;
+
   UniquePtr<std::stringstream> ss = MakeUnique<std::stringstream>();
-  if (gfxUtils::DumpPaintList() || gfxUtils::sDumpPainting) {
+  if (consoleNeedsDisplayList || profilerNeedsDisplayList) {
     if (gfxUtils::sDumpPaintingToFile) {
       nsCString string("dump-");
       string.AppendInt(gPaintCount);
@@ -3127,7 +3130,12 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram
     } else {
       // Flush stream now to avoid reordering dump output relative to
       // messages dumped by PaintRoot below.
-      fprint_stderr(gfxUtils::sDumpPaintFile, *ss);
+      if (profilerNeedsDisplayList && !consoleNeedsDisplayList) {
+        profiler_log(ss->str().c_str());
+      } else {
+        // Send to the console which will send to the profiler if required.
+        fprint_stderr(gfxUtils::sDumpPaintFile, *ss);
+      }
       ss = MakeUnique<std::stringstream>();
     }
   }
@@ -3171,7 +3179,7 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram
                                  paintStart);
 
 #ifdef MOZ_DUMP_PAINTING
-  if (gfxUtils::DumpPaintList() || gfxUtils::sDumpPainting) {
+  if (consoleNeedsDisplayList || profilerNeedsDisplayList) {
     if (gfxUtils::sDumpPaintingToFile) {
       *ss << "</script>";
     }
@@ -3187,7 +3195,12 @@ nsLayoutUtils::PaintFrame(nsRenderingContext* aRenderingContext, nsIFrame* aFram
       *ss << "</body></html>";
     }
 
-    fprint_stderr(gfxUtils::sDumpPaintFile, *ss);
+    if (profilerNeedsDisplayList && !consoleNeedsDisplayList) {
+      profiler_log(ss->str().c_str());
+    } else {
+      // Send to the console which will send to the profiler if required.
+      fprint_stderr(gfxUtils::sDumpPaintFile, *ss);
+    }
 
     if (gfxUtils::sDumpPaintingToFile) {
       fclose(gfxUtils::sDumpPaintFile);
diff --git a/tools/profiler/GeckoProfiler.h b/tools/profiler/GeckoProfiler.h
index 64767f113730..f567ab933c75 100644
--- a/tools/profiler/GeckoProfiler.h
+++ b/tools/profiler/GeckoProfiler.h
@@ -201,6 +201,9 @@ static inline double profiler_time(const mozilla::TimeStamp& aTime) { return 0;
 
 static inline bool profiler_in_privacy_mode() { return false; }
 
+static inline void profiler_log(const char *str) {}
+static inline void profiler_log(const char *fmt, va_list args) {}
+
 #else
 
 #include "GeckoProfilerImpl.h"
diff --git a/tools/profiler/GeckoProfilerFunc.h b/tools/profiler/GeckoProfilerFunc.h
index 9fb7619def4e..bdea46fe2c5e 100644
--- a/tools/profiler/GeckoProfilerFunc.h
+++ b/tools/profiler/GeckoProfilerFunc.h
@@ -97,5 +97,7 @@ void mozilla_sampler_tracing(const char* aCategory, const char* aInfo,
                              ProfilerBacktrace* aCause,
                              TracingMetadata aMetaData);
 
+void mozilla_sampler_log(const char *fmt, va_list args);
+
 #endif
 
diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h
index 84cd06a5128b..2bca7432271e 100644
--- a/tools/profiler/GeckoProfilerImpl.h
+++ b/tools/profiler/GeckoProfilerImpl.h
@@ -460,4 +460,16 @@ inline void mozilla_sampler_call_exit(void *aHandle)
 
 void mozilla_sampler_add_marker(const char *aMarker, ProfilerMarkerPayload *aPayload);
 
+static inline
+void profiler_log(const char *str)
+{
+  profiler_tracing("log", str, TRACING_EVENT);
+}
+
+static inline
+void profiler_log(const char *fmt, va_list args)
+{
+  mozilla_sampler_log(fmt, args);
+}
+
 #endif /* ndef TOOLS_SPS_SAMPLER_H_ */
diff --git a/tools/profiler/platform.cpp b/tools/profiler/platform.cpp
index 6d3d977ddd9b..22ec7334bdec 100644
--- a/tools/profiler/platform.cpp
+++ b/tools/profiler/platform.cpp
@@ -491,8 +491,8 @@ bool is_main_thread_name(const char* aName) {
 #define VARARGS_ASSIGN(foo, bar)     (foo) = (bar)
 #endif
 
-static void
-profiler_log(const char *fmt, va_list args)
+void
+mozilla_sampler_log(const char *fmt, va_list args)
 {
   if (profiler_is_active()) {
     // nsAutoCString AppendPrintf would be nicer but
@@ -561,7 +561,7 @@ void mozilla_sampler_init(void* stackTop)
   // platform specific initialization
   OS::Startup();
 
-  set_stderr_callback(profiler_log);
+  set_stderr_callback(mozilla_sampler_log);
 
   // We can't open pref so we use an environment variable
   // to know if we should trigger the profiler on startup

From e9f1d90071550a9e879fc0ec0e7fbc07da458d97 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Dec 2014 12:39:30 -0800
Subject: [PATCH 017/183] Bug 1112925 - Don't re-enter JS with a pending
 exception in CheckForPendingException. r=terrence

---
 js/xpconnect/src/XPCWrappedJSClass.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
index ac4f843b8e83..1474aec1302f 100644
--- a/js/xpconnect/src/XPCWrappedJSClass.cpp
+++ b/js/xpconnect/src/XPCWrappedJSClass.cpp
@@ -704,15 +704,6 @@ nsXPCWrappedJSClass::CleanupPointerTypeObject(const nsXPTType& type,
     }
 }
 
-class AutoClearPendingException
-{
-public:
-  explicit AutoClearPendingException(JSContext *cx) : mCx(cx) { }
-  ~AutoClearPendingException() { JS_ClearPendingException(mCx); }
-private:
-  JSContext* mCx;
-};
-
 nsresult
 nsXPCWrappedJSClass::CheckForException(XPCCallContext & ccx,
                                        const char * aPropertyName,
@@ -748,7 +739,10 @@ nsXPCWrappedJSClass::CheckForException(XPCCallContext & ccx,
         }
     }
 
-    AutoClearPendingException acpe(cx);
+    // Clear the pending exception now, because xpc_exception might be JS-
+    // implemented, so invoking methods on it might re-enter JS, which we can't
+    // do with an exception on the stack.
+    JS_ClearPendingException(cx);
 
     if (xpc_exception) {
         nsresult e_result;
@@ -793,6 +787,10 @@ nsXPCWrappedJSClass::CheckForException(XPCCallContext & ccx,
             // error if it came from a JS exception.
             if (reportable && is_js_exception)
             {
+                // Note that we cleared the exception above, so we need to set it again,
+                // just so that we can tell the JS engine to pass it back to us via the
+                // error reporting callback. This is all very dumb.
+                JS_SetPendingException(cx, js_exception);
                 reportable = !JS_ReportPendingException(cx);
             }
 

From 682a5b2f5c9f644b746b7a47a86abc52c820501c Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Dec 2014 12:44:42 -0800
Subject: [PATCH 018/183] Bug 1110546 - Allow null as the principal argument
 for the sandbox constructor. r=gabor

---
 js/xpconnect/src/Sandbox.cpp               | 4 ++++
 js/xpconnect/tests/unit/test_bug1110546.js | 5 +++++
 js/xpconnect/tests/unit/xpcshell.ini       | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 js/xpconnect/tests/unit/test_bug1110546.js

diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp
index 926897822e29..793377416cb5 100644
--- a/js/xpconnect/src/Sandbox.cpp
+++ b/js/xpconnect/src/Sandbox.cpp
@@ -1415,6 +1415,10 @@ nsXPCComponents_utils_Sandbox::CallOrConstruct(nsIXPConnectWrappedNative *wrappe
         } else {
             ok = GetPrincipalOrSOP(cx, obj, getter_AddRefs(prinOrSop));
         }
+    } else if (args[0].isNull()) {
+        // Null means that we just pass prinOrSop = nullptr, and get an
+        // nsNullPrincipal.
+        ok = true;
     }
 
     if (!ok)
diff --git a/js/xpconnect/tests/unit/test_bug1110546.js b/js/xpconnect/tests/unit/test_bug1110546.js
new file mode 100644
index 000000000000..02687296d68e
--- /dev/null
+++ b/js/xpconnect/tests/unit/test_bug1110546.js
@@ -0,0 +1,5 @@
+const Cu = Components.utils;
+function run_test() {
+  var sb = new Cu.Sandbox(null);
+  do_check_true(Cu.getObjectPrincipal(sb).isNullPrincipal);
+}
diff --git a/js/xpconnect/tests/unit/xpcshell.ini b/js/xpconnect/tests/unit/xpcshell.ini
index 0c4b4bf0f7bb..8569221d9a97 100644
--- a/js/xpconnect/tests/unit/xpcshell.ini
+++ b/js/xpconnect/tests/unit/xpcshell.ini
@@ -53,6 +53,7 @@ support-files =
 [test_bug1034262.js]
 [test_bug1082450.js]
 [test_bug1081990.js]
+[test_bug1110546.js]
 [test_bug_442086.js]
 [test_file.js]
 [test_blob.js]

From a23d2bdf73ef806210e9f0ec28d4e77080929bed Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Fri, 19 Dec 2014 09:54:34 +1300
Subject: [PATCH 019/183] Bug 1109457 - Add persistent session to our ClearKey
 CDM. r=edwin

---
 dom/media/gmp/gmp-api/gmp-storage.h           |    1 +
 dom/media/test/eme.js                         |   21 +-
 dom/media/test/mochitest.ini                  |    2 +
 .../test/test_eme_persistent_sessions.html    |  156 ++
 .../0.1/ClearKeyDecryptionManager.cpp         |  229 +-
 .../0.1/ClearKeyDecryptionManager.h           |   15 +-
 .../gmp-clearkey/0.1/ClearKeyPersistence.cpp  |  236 ++
 media/gmp-clearkey/0.1/ClearKeyPersistence.h  |   39 +
 media/gmp-clearkey/0.1/ClearKeySession.cpp    |   19 +-
 media/gmp-clearkey/0.1/ClearKeySession.h      |   23 +-
 media/gmp-clearkey/0.1/ClearKeyStorage.cpp    |  174 ++
 media/gmp-clearkey/0.1/ClearKeyStorage.h      |   36 +
 media/gmp-clearkey/0.1/ClearKeyUtils.cpp      |   45 +-
 media/gmp-clearkey/0.1/ClearKeyUtils.h        |   17 +-
 media/gmp-clearkey/0.1/RefCounted.h           |   34 +
 .../0.1/gmp-task-utils-generated.h            | 1898 +++++++++++++++++
 media/gmp-clearkey/0.1/gmp-task-utils.h       |   37 +
 media/gmp-clearkey/0.1/moz.build              |    2 +
 18 files changed, 2915 insertions(+), 69 deletions(-)
 create mode 100644 dom/media/test/test_eme_persistent_sessions.html
 create mode 100644 media/gmp-clearkey/0.1/ClearKeyPersistence.cpp
 create mode 100644 media/gmp-clearkey/0.1/ClearKeyPersistence.h
 create mode 100644 media/gmp-clearkey/0.1/ClearKeyStorage.cpp
 create mode 100644 media/gmp-clearkey/0.1/ClearKeyStorage.h
 create mode 100644 media/gmp-clearkey/0.1/RefCounted.h
 create mode 100644 media/gmp-clearkey/0.1/gmp-task-utils-generated.h
 create mode 100644 media/gmp-clearkey/0.1/gmp-task-utils.h

diff --git a/dom/media/gmp/gmp-api/gmp-storage.h b/dom/media/gmp/gmp-api/gmp-storage.h
index c070c01245c8..43ad12b01a4e 100644
--- a/dom/media/gmp/gmp-api/gmp-storage.h
+++ b/dom/media/gmp/gmp-api/gmp-storage.h
@@ -118,6 +118,7 @@ class GMPRecordClient {
 class GMPRecordIterator {
 public:
   // Retrieve the name for the current record.
+  // aOutName is null terminated at character  at index (*aOutNameLength).
   // Returns GMPNoErr if successful, or GMPEndOfEnumeration if iteration has
   // reached the end.
   virtual GMPErr GetName(const char ** aOutName, uint32_t * aOutNameLength) = 0;
diff --git a/dom/media/test/eme.js b/dom/media/test/eme.js
index c98b20d39de2..bdec0decfd4b 100644
--- a/dom/media/test/eme.js
+++ b/dom/media/test/eme.js
@@ -3,9 +3,12 @@ const KEYSYSTEM_TYPE = "org.w3.clearkey";
 function bail(message)
 {
   return function(err) {
+    if (err) {
+      message +=  "; " + String(err)
+    }
     ok(false, message);
     if (err) {
-      info(err);
+      info(String(err));
     }
     SimpleTest.finish();
   }
@@ -70,13 +73,13 @@ function Log(token, msg) {
   info(TimeStamp(token) + " " + msg);
 }
 
-function UpdateSessionFunc(test, token) {
+function UpdateSessionFunc(test, token, sessionType) {
   return function(ev) {
     var msgStr = ArrayBufferToString(ev.message);
     var msg = JSON.parse(msgStr);
 
     Log(token, "got message from CDM: " + msgStr);
-    is(msg.type, test.sessionType, TimeStamp(token) + " key session type should match");
+    is(msg.type, sessionType, TimeStamp(token) + " key session type should match");
     ok(msg.kids, TimeStamp(token) + " message event should contain key ID array");
 
     var outKeys = [];
@@ -211,24 +214,24 @@ function SetupEME(test, token, params)
       .then(function(keySystemAccess) {
         return keySystemAccess.createMediaKeys();
       }, bail(token + " Failed to request key system access."))
-      
+
       .then(function(mediaKeys) {
         Log(token, "created MediaKeys object ok");
         mediaKeys.sessions = [];
         return v.setMediaKeys(mediaKeys);
       }, bail("failed to create MediaKeys object"))
-      
+
       .then(function() {
         Log(token, "set MediaKeys on <video> element ok");
-
-        var session = v.mediaKeys.createSession(test.sessionType);
+        var sessionType = (params && params.sessionType) ? params.sessionType : "temporary";
+        var session = v.mediaKeys.createSession(sessionType);
         if (params && params.onsessioncreated) {
           params.onsessioncreated(session);
         }
-        session.addEventListener("message", UpdateSessionFunc(test, token));
+        session.addEventListener("message", UpdateSessionFunc(test, token, sessionType));
         return session.generateRequest(ev.initDataType, ev.initData);
       }, onSetKeysFail)
-      
+
       .then(function() {
         Log(token, "generated request");
       }, bail(token + " Failed to request key system access2."));
diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini
index ca0430f55de4..0b242c697c95 100644
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -364,6 +364,8 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 skip-if = buildapp == 'b2g' && toolkit != 'gonk' # bug 1082984
 [test_eme_canvas_blocked.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # bug 1043403, bug 1057908
+[test_eme_persistent_sessions.html]
+skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # bug 1043403, bug 1057908
 [test_eme_playback.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # bug 1043403, bug 1057908
 [test_eme_requestKeySystemAccess.html]
diff --git a/dom/media/test/test_eme_persistent_sessions.html b/dom/media/test/test_eme_persistent_sessions.html
new file mode 100644
index 000000000000..34597fe07903
--- /dev/null
+++ b/dom/media/test/test_eme_persistent_sessions.html
@@ -0,0 +1,156 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test Encrypted Media Extensions</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+  <script type="text/javascript" src="eme.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+var manager = new MediaTestManager;
+
+function UsableKeyIdsMatch(usableKeyIds, expectedKeyIds) {
+  var hexKeyIds = usableKeyIds.map(function(keyId) {
+    return Base64ToHex(window.btoa(ArrayBufferToString(keyId)));
+  }).sort();
+  var expected = Object.keys(expectedKeyIds).sort();
+  if (expected.length != hexKeyIds.length) {
+    return false;
+  }
+  for (var i = 0; i < hexKeyIds.length; i++) {
+    if (hexKeyIds[i] != expected[i]){
+      return false;
+    }
+  }
+  return true;
+}
+
+function AwaitAllKeysUsable(session, keys, token) {
+  return new Promise(function(resolve, reject) {
+    function listener(event) {
+      session.getUsableKeyIds().then(function(usableKeyIds) {
+        var u = UsableKeyIdsMatch(usableKeyIds, keys);
+        if (UsableKeyIdsMatch(usableKeyIds, keys)) {
+          Log(token, "resolving AwaitAllKeysUsable promise");
+          session.removeEventListener("keyschange", listener);
+          resolve();
+        }
+      }, bail(token + " failed to get usableKeyIds"));
+    }
+    session.addEventListener("keyschange", listener);
+  });
+}
+
+function AwaitAllKeysNotUsable(session, token) {
+  return new Promise(function(resolve, reject) {
+    function listener(event) {
+      session.getUsableKeyIds().then(function(usableKeyIds) {
+        if (usableKeyIds.length == 0) {
+          session.removeEventListener("keyschange", listener);
+          resolve();
+        }
+      }, bail(token + " failed to get usableKeyIds"));
+    }
+    session.addEventListener("keyschange", listener);
+  });
+}
+
+function startTest(test, token)
+{
+  manager.started(token);
+
+  var recreatedSession; // will have remove() called on it.
+
+  var keySystemAccess;
+
+  var v = SetupEME(test, token,
+    {
+      onsessioncreated: function(session) {
+        Log(token, "Session created");
+        var sessionId;
+        initialSession = session;
+
+        // Once the session has loaded and has all its keys usable, close
+        // all sessions without calling remove() on them.
+        AwaitAllKeysUsable(session, test.keys, token).then(
+          function() {
+            sessionId = session.sessionId;
+            Log(token, "Closing session with id=" + sessionId);
+            session.close();
+          }
+        );
+
+        // Once the session is closed, reload the MediaKeys and reload the session
+        session.closed.then(function() {
+          return navigator.requestMediaKeySystemAccess(KEYSYSTEM_TYPE)
+        }, bail("close promise rejected"))
+
+        .then(function(requestedKeySystemAccess) {
+          keySystemAccess = requestedKeySystemAccess;
+          return keySystemAccess.createMediaKeys();
+        }, bail(token + " Failed to request key system access."))
+
+        .then(function(mediaKeys) {
+          Log(token, "re-created MediaKeys object ok");
+          recreatedSession = mediaKeys.createSession("persistent");
+          Log(token, "Created recreatedSession, loading sessionId=" + sessionId);
+          return Promise.all([AwaitAllKeysUsable(recreatedSession, test.keys, token), recreatedSession.load(sessionId)]);
+        }, bail(token + " failed to create mediaKeys"))
+
+        .then(function() {
+          Log(token, "re-loaded persistent session, all keys still usable");
+          return Promise.all([AwaitAllKeysNotUsable(recreatedSession, token), recreatedSession.remove()]);
+        }, bail(token + " failed to get reload session or keys"))
+
+        .then(function() {
+          Log(token, "removed session, all keys unusable.");
+          // Attempt to recreate the session, the attempt should fail.
+          return keySystemAccess.createMediaKeys();
+        }, bail(token + " failed to remove session"))
+
+        .then(function(mediaKeys) {
+          Log(token, "re-re-created MediaKeys object ok");
+          // Trying to load the removed persistent session should fail.
+          return mediaKeys.createSession("persistent").load(sessionId);
+        }, bail(token + " failed to create mediaKeys"))
+
+        .then(function(suceeded) {
+          is(suceeded, false, token + " we expect the third session creation to fail, as the session should have been removed.");
+          manager.finished(token);
+        }, bail(token + " failure to load session."));
+
+      },
+      sessionType: "persistent",
+    }
+  );
+
+  v.addEventListener("error", bail(token + " got error event"));
+
+  LoadTest(test, v, token);
+}
+
+function beginTest() {
+  manager.runTests(gEMETests, startTest);
+}
+
+var prefs = [
+  [ "media.mediasource.enabled", true ],
+  [ "media.mediasource.mp4.enabled", true ],
+];
+
+if (/Linux/.test(navigator.userAgent) ||
+    !document.createElement('video').canPlayType("video/mp4")) {
+  // XXX remove once we have mp4 PlatformDecoderModules on all platforms.
+  prefs.push([ "media.fragmented-mp4.exposed", true ]);
+  prefs.push([ "media.fragmented-mp4.use-blank-decoder", true ]);
+}
+
+SimpleTest.waitForExplicitFinish();
+SpecialPowers.pushPrefEnv({ "set" : prefs }, beginTest);
+</script>
+</pre>
+</body>
+</html>
diff --git a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
index 1210f63c243f..001f60ca2b81 100644
--- a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
@@ -2,12 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include <sstream>
 #include <stdint.h>
 #include <stdio.h>
 
 #include "ClearKeyDecryptionManager.h"
 #include "ClearKeyUtils.h"
+#include "ClearKeyStorage.h"
+#include "ClearKeyPersistence.h"
+#include "gmp-task-utils.h"
 
 #include "mozilla/Assertions.h"
 #include "mozilla/NullPtr.h"
@@ -15,7 +17,6 @@
 using namespace mozilla;
 using namespace std;
 
-
 class ClearKeyDecryptor
 {
 public:
@@ -29,6 +30,8 @@ public:
   uint32_t AddRef();
   uint32_t Release();
 
+  const Key& DecryptionKey() const { return mKey; }
+
 private:
   struct DecryptTask : public GMPTask
   {
@@ -79,15 +82,22 @@ private:
   Key mKey;
 };
 
-
 ClearKeyDecryptionManager::ClearKeyDecryptionManager()
 {
   CK_LOGD("ClearKeyDecryptionManager ctor");
+
+  // The ClearKeyDecryptionManager maintains a self reference which is
+  // removed when the host is finished with the interface and calls
+  // DecryptingComplete(). We make ClearKeyDecryptionManager refcounted so
+  // that the tasks to that we dispatch to call functions on it won't end up
+  // derefing a null reference after DecryptingComplete() is called.
+  AddRef();
 }
 
 ClearKeyDecryptionManager::~ClearKeyDecryptionManager()
 {
   CK_LOGD("ClearKeyDecryptionManager dtor");
+  MOZ_ASSERT(mRefCount == 1);
 }
 
 void
@@ -97,19 +107,7 @@ ClearKeyDecryptionManager::Init(GMPDecryptorCallback* aCallback)
   mCallback = aCallback;
   mCallback->SetCapabilities(GMP_EME_CAP_DECRYPT_AUDIO |
                              GMP_EME_CAP_DECRYPT_VIDEO);
-}
-
-static string
-GetNewSessionId()
-{
-  static uint32_t sNextSessionId = 0;
-
-  string sessionId;
-  stringstream ss;
-  ss << ++sNextSessionId;
-  ss >> sessionId;
-
-  return sessionId;
+  ClearKeyPersistence::EnsureInitialized();
 }
 
 void
@@ -129,10 +127,18 @@ ClearKeyDecryptionManager::CreateSession(uint32_t aPromiseId,
     return;
   }
 
-  string sessionId = GetNewSessionId();
+  if (ClearKeyPersistence::DeferCreateSessionIfNotReady(this,
+                                                        aPromiseId,
+                                                        aInitData,
+                                                        aInitDataSize,
+                                                        aSessionType)) {
+    return;
+  }
+
+  string sessionId = ClearKeyPersistence::GetNewSessionId(aSessionType);
   MOZ_ASSERT(mSessions.find(sessionId) == mSessions.end());
 
-  ClearKeySession* session = new ClearKeySession(sessionId, mCallback);
+  ClearKeySession* session = new ClearKeySession(sessionId, mCallback, aSessionType);
   session->Init(aPromiseId, aInitData, aInitDataSize);
   mSessions[sessionId] = session;
 
@@ -157,7 +163,7 @@ ClearKeyDecryptionManager::CreateSession(uint32_t aPromiseId,
 
   // Send a request for needed key data.
   string request;
-  ClearKeyUtils::MakeKeyRequest(neededKeys, request);
+  ClearKeyUtils::MakeKeyRequest(neededKeys, request, aSessionType);
   mCallback->SessionMessage(&sessionId[0], sessionId.length(),
                             (uint8_t*)&request[0], request.length(),
                             "" /* destination url */, 0);
@@ -168,10 +174,73 @@ ClearKeyDecryptionManager::LoadSession(uint32_t aPromiseId,
                                        const char* aSessionId,
                                        uint32_t aSessionIdLength)
 {
-  // TODO implement "persistent" sessions.
-  mCallback->ResolveLoadSessionPromise(aPromiseId, false);
-
   CK_LOGD("ClearKeyDecryptionManager::LoadSession");
+
+  if (!ClearKeyUtils::IsValidSessionId(aSessionId, aSessionIdLength)) {
+    mCallback->ResolveLoadSessionPromise(aPromiseId, false);
+    return;
+  }
+
+  if (ClearKeyPersistence::DeferLoadSessionIfNotReady(this,
+                                                      aPromiseId,
+                                                      aSessionId,
+                                                      aSessionIdLength)) {
+    return;
+  }
+
+  string sid(aSessionId, aSessionId + aSessionIdLength);
+  if (!ClearKeyPersistence::IsPersistentSessionId(sid)) {
+    mCallback->ResolveLoadSessionPromise(aPromiseId, false);
+    return;
+  }
+
+  // Callsback PersistentSessionDataLoaded with results...
+  ClearKeyPersistence::LoadSessionData(this, sid, aPromiseId);
+}
+
+void
+ClearKeyDecryptionManager::PersistentSessionDataLoaded(GMPErr aStatus,
+                                                       uint32_t aPromiseId,
+                                                       const string& aSessionId,
+                                                       const uint8_t* aKeyData,
+                                                       uint32_t aKeyDataSize)
+{
+  if (GMP_FAILED(aStatus) ||
+      Contains(mSessions, aSessionId) ||
+      (aKeyDataSize % (2 * CLEARKEY_KEY_LEN)) != 0) {
+    mCallback->ResolveLoadSessionPromise(aPromiseId, false);
+    return;
+  }
+
+  ClearKeySession* session = new ClearKeySession(aSessionId,
+                                                 mCallback,
+                                                 kGMPPersistentSession);
+  mSessions[aSessionId] = session;
+
+  // TODO: currently we have to resolve the load-session promise before we
+  // can mark the keys as usable. We should really do this before marking
+  // the keys usable, but we need to fix Gecko first.
+  mCallback->ResolveLoadSessionPromise(aPromiseId, true);
+
+  uint32_t numKeys = aKeyDataSize / (2 * CLEARKEY_KEY_LEN);
+  for (uint32_t i = 0; i < numKeys; i ++) {
+    const uint8_t* base = aKeyData + 2 * CLEARKEY_KEY_LEN * i;
+
+    KeyId keyId(base, base + CLEARKEY_KEY_LEN);
+    MOZ_ASSERT(keyId.size() == CLEARKEY_KEY_LEN);
+
+    Key key(base + CLEARKEY_KEY_LEN, base + 2 * CLEARKEY_KEY_LEN);
+    MOZ_ASSERT(key.size() == CLEARKEY_KEY_LEN);
+
+    session->AddKeyId(keyId);
+
+    if (!Contains(mDecryptors, keyId)) {
+      mDecryptors[keyId] = new ClearKeyDecryptor(mCallback, key);
+    }
+    mDecryptors[keyId]->AddRef();
+    mCallback->KeyIdUsable(aSessionId.c_str(), aSessionId.size(),
+                           &keyId[0], keyId.size());
+  }
 }
 
 void
@@ -184,20 +253,21 @@ ClearKeyDecryptionManager::UpdateSession(uint32_t aPromiseId,
   CK_LOGD("ClearKeyDecryptionManager::UpdateSession");
   string sessionId(aSessionId, aSessionId + aSessionIdLength);
 
-  if (mSessions.find(sessionId) == mSessions.end() || !mSessions[sessionId]) {
+  auto itr = mSessions.find(sessionId);
+  if (itr == mSessions.end() || !(itr->second)) {
     CK_LOGW("ClearKey CDM couldn't resolve session ID in UpdateSession.");
     mCallback->RejectPromise(aPromiseId, kGMPNotFoundError, nullptr, 0);
     return;
   }
+  ClearKeySession* session = itr->second;
 
   // Parse the response for any (key ID, key) pairs.
   vector<KeyIdPair> keyPairs;
-  if (!ClearKeyUtils::ParseJWK(aResponse, aResponseSize, keyPairs)) {
+  if (!ClearKeyUtils::ParseJWK(aResponse, aResponseSize, keyPairs, session->Type())) {
     CK_LOGW("ClearKey CDM failed to parse JSON Web Key.");
     mCallback->RejectPromise(aPromiseId, kGMPInvalidAccessError, nullptr, 0);
     return;
   }
-  mCallback->ResolvePromise(aPromiseId);
 
   for (auto it = keyPairs.begin(); it != keyPairs.end(); it++) {
     KeyId& keyId = it->mKeyId;
@@ -210,6 +280,43 @@ ClearKeyDecryptionManager::UpdateSession(uint32_t aPromiseId,
 
     mDecryptors[keyId]->AddRef();
   }
+
+  if (session->Type() != kGMPPersistentSession) {
+    mCallback->ResolvePromise(aPromiseId);
+    return;
+  }
+
+  // Store the keys on disk. We store a record whose name is the sessionId,
+  // and simply append each keyId followed by its key.
+  vector<uint8_t> keydata;
+  Serialize(session, keydata);
+  GMPTask* resolve = WrapTask(mCallback, &GMPDecryptorCallback::ResolvePromise, aPromiseId);
+  static const char* message = "Couldn't store cenc key init data";
+  GMPTask* reject = WrapTask(mCallback,
+                             &GMPDecryptorCallback::RejectPromise,
+                             aPromiseId,
+                             kGMPInvalidStateError,
+                             message,
+                             strlen(message));
+  StoreData(sessionId, keydata, resolve, reject);
+}
+
+void
+ClearKeyDecryptionManager::Serialize(const ClearKeySession* aSession,
+                                     std::vector<uint8_t>& aOutKeyData)
+{
+  const std::vector<KeyId>& keyIds = aSession->GetKeyIds();
+  for (size_t i = 0; i < keyIds.size(); i++) {
+    const KeyId& keyId = keyIds[i];
+    if (!Contains(mDecryptors, keyId)) {
+      continue;
+    }
+    MOZ_ASSERT(keyId.size() == CLEARKEY_KEY_LEN);
+    aOutKeyData.insert(aOutKeyData.end(), keyId.begin(), keyId.end());
+    const Key& key = mDecryptors[keyId]->DecryptionKey();
+    MOZ_ASSERT(key.size() == CLEARKEY_KEY_LEN);
+    aOutKeyData.insert(aOutKeyData.end(), key.begin(), key.end());
+  }
 }
 
 void
@@ -220,25 +327,39 @@ ClearKeyDecryptionManager::CloseSession(uint32_t aPromiseId,
   CK_LOGD("ClearKeyDecryptionManager::CloseSession");
 
   string sessionId(aSessionId, aSessionId + aSessionIdLength);
-  ClearKeySession* session = mSessions[sessionId];
+  auto itr = mSessions.find(sessionId);
+  if (itr == mSessions.end()) {
+    CK_LOGW("ClearKey CDM couldn't close non-existent session.");
+    mCallback->RejectPromise(aPromiseId, kGMPNotFoundError, nullptr, 0);
+    return;
+  }
 
+  ClearKeySession* session = itr->second;
   MOZ_ASSERT(session);
 
-  const vector<KeyId>& keyIds = session->GetKeyIds();
+  ClearInMemorySessionData(session);
+  mCallback->ResolvePromise(aPromiseId);
+  mCallback->SessionClosed(aSessionId, aSessionIdLength);
+}
+
+void
+ClearKeyDecryptionManager::ClearInMemorySessionData(ClearKeySession* aSession)
+{
+  MOZ_ASSERT(aSession);
+
+  const vector<KeyId>& keyIds = aSession->GetKeyIds();
   for (auto it = keyIds.begin(); it != keyIds.end(); it++) {
     MOZ_ASSERT(mDecryptors.find(*it) != mDecryptors.end());
 
     if (!mDecryptors[*it]->Release()) {
       mDecryptors.erase(*it);
-      mCallback->KeyIdNotUsable(aSessionId, aSessionIdLength,
+      mCallback->KeyIdNotUsable(aSession->Id().c_str(), aSession->Id().size(),
                                 &(*it)[0], it->size());
     }
   }
 
-  mSessions.erase(sessionId);
-  delete session;
-
-  mCallback->ResolvePromise(aPromiseId);
+  mSessions.erase(aSession->Id());
+  delete aSession;
 }
 
 void
@@ -246,10 +367,39 @@ ClearKeyDecryptionManager::RemoveSession(uint32_t aPromiseId,
                                          const char* aSessionId,
                                          uint32_t aSessionIdLength)
 {
-  // TODO implement "persistent" sessions.
-  CK_LOGD("ClearKeyDecryptionManager::RemoveSession");
-  mCallback->RejectPromise(aPromiseId, kGMPInvalidAccessError,
-                           nullptr /* message */, 0 /* messageLen */);
+  string sessionId(aSessionId, aSessionId + aSessionIdLength);
+  auto itr = mSessions.find(sessionId);
+  if (itr == mSessions.end()) {
+    CK_LOGW("ClearKey CDM couldn't remove non-existent session.");
+    mCallback->RejectPromise(aPromiseId, kGMPNotFoundError, nullptr, 0);
+    return;
+  }
+
+  ClearKeySession* session = itr->second;
+  MOZ_ASSERT(session);
+  string sid = session->Id();
+  bool isPersistent = session->Type() == kGMPPersistentSession;
+  ClearInMemorySessionData(session);
+
+  if (!isPersistent) {
+    mCallback->ResolvePromise(aPromiseId);
+    return;
+  }
+
+  ClearKeyPersistence::PersistentSessionRemoved(sid);
+
+  // Overwrite the record storing the sessionId's key data with a zero
+  // length record to delete it.
+  vector<uint8_t> emptyKeydata;
+  GMPTask* resolve = WrapTask(mCallback, &GMPDecryptorCallback::ResolvePromise, aPromiseId);
+  static const char* message = "Could not remove session";
+  GMPTask* reject = WrapTask(mCallback,
+                             &GMPDecryptorCallback::RejectPromise,
+                             aPromiseId,
+                             kGMPInvalidAccessError,
+                             message,
+                             strlen(message));
+  StoreData(sessionId, emptyKeydata, resolve, reject);
 }
 
 void
@@ -270,8 +420,11 @@ ClearKeyDecryptionManager::Decrypt(GMPBuffer* aBuffer,
   CK_LOGD("ClearKeyDecryptionManager::Decrypt");
   KeyId keyId(aMetadata->KeyId(), aMetadata->KeyId() + aMetadata->KeyIdSize());
 
-  if (mDecryptors.find(keyId) == mDecryptors.end() || !mDecryptors[keyId]) {
+  auto itr = mDecryptors.find(keyId);
+  if (itr == mDecryptors.end() || !(itr->second)) {
+    CK_LOGD("ClearKeyDecryptionManager::Decrypt GMPNoKeyErr");
     mCallback->Decrypted(aBuffer, GMPNoKeyErr);
+    return;
   }
 
   mDecryptors[keyId]->QueueDecrypt(aBuffer, aMetadata);
@@ -290,7 +443,7 @@ ClearKeyDecryptionManager::DecryptingComplete()
     delete it->second;
   }
 
-  delete this;
+  Release();
 }
 
 void
diff --git a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.h b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.h
index 7dbe92e21b6d..542c87d8ae9a 100644
--- a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.h
+++ b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.h
@@ -13,14 +13,14 @@
 #include "ClearKeyUtils.h"
 #include "gmp-api/gmp-decryption.h"
 #include "ScopedNSSTypes.h"
+#include "RefCounted.h"
 
 class ClearKeyDecryptor;
-
 class ClearKeyDecryptionManager MOZ_FINAL : public GMPDecryptor
+                                          , public RefCounted
 {
 public:
   ClearKeyDecryptionManager();
-  ~ClearKeyDecryptionManager();
 
   virtual void Init(GMPDecryptorCallback* aCallback) MOZ_OVERRIDE;
 
@@ -58,7 +58,18 @@ public:
 
   virtual void DecryptingComplete() MOZ_OVERRIDE;
 
+  void PersistentSessionDataLoaded(GMPErr aStatus,
+                                   uint32_t aPromiseId,
+                                   const std::string& aSessionId,
+                                   const uint8_t* aKeyData,
+                                   uint32_t aKeyDataSize);
+
 private:
+  ~ClearKeyDecryptionManager();
+
+  void ClearInMemorySessionData(ClearKeySession* aSession);
+  void Serialize(const ClearKeySession* aSession, std::vector<uint8_t>& aOutKeyData);
+
   GMPDecryptorCallback* mCallback;
 
   std::map<KeyId, ClearKeyDecryptor*> mDecryptors;
diff --git a/media/gmp-clearkey/0.1/ClearKeyPersistence.cpp b/media/gmp-clearkey/0.1/ClearKeyPersistence.cpp
new file mode 100644
index 000000000000..7643de96bf59
--- /dev/null
+++ b/media/gmp-clearkey/0.1/ClearKeyPersistence.cpp
@@ -0,0 +1,236 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ClearKeyPersistence.h"
+#include "ClearKeyUtils.h"
+#include "ClearKeyStorage.h"
+#include "ClearKeyDecryptionManager.h"
+#include "mozilla/RefPtr.h"
+
+#include <stdint.h>
+#include <set>
+#include <vector>
+#include <sstream>
+
+using namespace mozilla;
+using namespace std;
+
+// Whether we've loaded the persistent session ids from GMPStorage yet.
+enum PersistentKeyState {
+  UNINITIALIZED,
+  LOADING,
+  LOADED
+};
+static PersistentKeyState sPersistentKeyState = UNINITIALIZED;
+
+// Set of session Ids of the persistent sessions created or residing in
+// storage.
+static set<uint32_t> sPersistentSessionIds;
+
+static vector<GMPTask*> sTasksBlockedOnSessionIdLoad;
+
+static void
+ReadAllRecordsFromIterator(GMPRecordIterator* aRecordIterator,
+                           void* aUserArg,
+                           GMPErr aStatus)
+{
+  MOZ_ASSERT(sPersistentKeyState == LOADING);
+  if (GMP_SUCCEEDED(aStatus)) {
+    // Extract the record names which are valid uint32_t's; they're
+    // the persistent session ids.
+    const char* name = nullptr;
+    uint32_t len = 0;
+    while (GMP_SUCCEEDED(aRecordIterator->GetName(&name, &len))) {
+      if (ClearKeyUtils::IsValidSessionId(name, len)) {
+        MOZ_ASSERT(name[len] == 0);
+        sPersistentSessionIds.insert(atoi(name));
+      }
+      aRecordIterator->NextRecord();
+    }
+  }
+  sPersistentKeyState = LOADED;
+  aRecordIterator->Close();
+
+  for (size_t i = 0; i < sTasksBlockedOnSessionIdLoad.size(); i++) {
+    sTasksBlockedOnSessionIdLoad[i]->Run();
+    sTasksBlockedOnSessionIdLoad[i]->Destroy();
+  }
+  sTasksBlockedOnSessionIdLoad.clear();
+}
+
+/* static */ void
+ClearKeyPersistence::EnsureInitialized()
+{
+  if (sPersistentKeyState == UNINITIALIZED) {
+    sPersistentKeyState = LOADING;
+    if (GMP_FAILED(EnumRecordNames(&ReadAllRecordsFromIterator))) {
+      sPersistentKeyState = LOADED;
+    }
+  }
+}
+
+/* static */ string
+ClearKeyPersistence::GetNewSessionId(GMPSessionType aSessionType)
+{
+  static uint32_t sNextSessionId = 1;
+
+  // Ensure we don't re-use a session id that was persisted.
+  while (Contains(sPersistentSessionIds, sNextSessionId)) {
+    sNextSessionId++;
+  }
+
+  string sessionId;
+  stringstream ss;
+  ss << sNextSessionId;
+  ss >> sessionId;
+
+  if (aSessionType == kGMPPersistentSession) {
+    sPersistentSessionIds.insert(sNextSessionId);
+  }
+
+  sNextSessionId++;
+
+  return sessionId;
+}
+
+
+class CreateSessionTask : public GMPTask {
+public:
+  CreateSessionTask(ClearKeyDecryptionManager* aTarget,
+                    uint32_t aPromiseId,
+                    const uint8_t* aInitData,
+                    uint32_t aInitDataSize,
+                    GMPSessionType aSessionType)
+    : mTarget(aTarget)
+    , mPromiseId(aPromiseId)
+    , mSessionType(aSessionType)
+  {
+    mInitData.insert(mInitData.end(),
+                     aInitData,
+                     aInitData + aInitDataSize);
+  }
+  virtual void Run() MOZ_OVERRIDE {
+    mTarget->CreateSession(mPromiseId,
+                           "cenc",
+                           strlen("cenc"),
+                           &mInitData.front(),
+                           mInitData.size(),
+                           mSessionType);
+  }
+  virtual void Destroy() MOZ_OVERRIDE {
+    delete this;
+  }
+private:
+  RefPtr<ClearKeyDecryptionManager> mTarget;
+  uint32_t mPromiseId;
+  vector<uint8_t> mInitData;
+  GMPSessionType mSessionType;
+};
+
+
+/* static */ bool
+ClearKeyPersistence::DeferCreateSessionIfNotReady(ClearKeyDecryptionManager* aInstance,
+                                                  uint32_t aPromiseId,
+                                                  const uint8_t* aInitData,
+                                                  uint32_t aInitDataSize,
+                                                  GMPSessionType aSessionType)
+{
+  if (sPersistentKeyState >= LOADED)  {
+    return false;
+  }
+  GMPTask* t = new CreateSessionTask(aInstance,
+                                     aPromiseId,
+                                     aInitData,
+                                     aInitDataSize,
+                                     aSessionType);
+  sTasksBlockedOnSessionIdLoad.push_back(t);
+  return true;
+}
+
+class LoadSessionTask : public GMPTask {
+public:
+  LoadSessionTask(ClearKeyDecryptionManager* aTarget,
+                  uint32_t aPromiseId,
+                  const char* aSessionId,
+                  uint32_t aSessionIdLength)
+    : mTarget(aTarget)
+    , mPromiseId(aPromiseId)
+    , mSessionId(aSessionId, aSessionId + aSessionIdLength)
+  {
+  }
+  virtual void Run() MOZ_OVERRIDE {
+    mTarget->LoadSession(mPromiseId,
+                         mSessionId.c_str(),
+                         mSessionId.size());
+  }
+  virtual void Destroy() MOZ_OVERRIDE {
+    delete this;
+  }
+private:
+  RefPtr<ClearKeyDecryptionManager> mTarget;
+  uint32_t mPromiseId;
+  string mSessionId;
+};
+
+/* static */ bool
+ClearKeyPersistence::DeferLoadSessionIfNotReady(ClearKeyDecryptionManager* aInstance,
+                                                uint32_t aPromiseId,
+                                                const char* aSessionId,
+                                                uint32_t aSessionIdLength)
+{
+  if (sPersistentKeyState >= LOADED)  {
+    return false;
+  }
+  GMPTask* t = new LoadSessionTask(aInstance,
+                                   aPromiseId,
+                                   aSessionId,
+                                   aSessionIdLength);
+  sTasksBlockedOnSessionIdLoad.push_back(t);
+  return true;
+}
+
+/* static */ bool
+ClearKeyPersistence::IsPersistentSessionId(const string& aSessionId)
+{
+  return Contains(sPersistentSessionIds, atoi(aSessionId.c_str()));
+}
+
+class LoadSessionFromKeysTask : public ReadContinuation {
+public:
+  LoadSessionFromKeysTask(ClearKeyDecryptionManager* aTarget,
+                          const string& aSessionId,
+                          uint32_t aPromiseId)
+    : mTarget(aTarget)
+    , mSessionId(aSessionId)
+    , mPromiseId(aPromiseId)
+  {
+  }
+
+  virtual void ReadComplete(GMPErr aStatus,
+                            const uint8_t* aData,
+                            uint32_t aLength) MOZ_OVERRIDE
+  {
+    mTarget->PersistentSessionDataLoaded(aStatus, mPromiseId, mSessionId, aData, aLength);
+  }
+private:
+  RefPtr<ClearKeyDecryptionManager> mTarget;
+  string mSessionId;
+  uint32_t mPromiseId;
+};
+
+/* static */ void
+ClearKeyPersistence::LoadSessionData(ClearKeyDecryptionManager* aInstance,
+                                     const string& aSid,
+                                     uint32_t aPromiseId)
+{
+  LoadSessionFromKeysTask* loadTask =
+    new LoadSessionFromKeysTask(aInstance, aSid, aPromiseId);
+  ReadData(aSid, loadTask);
+}
+
+/* static */ void
+ClearKeyPersistence::PersistentSessionRemoved(const string& aSessionId)
+{
+  sPersistentSessionIds.erase(atoi(aSessionId.c_str()));
+}
diff --git a/media/gmp-clearkey/0.1/ClearKeyPersistence.h b/media/gmp-clearkey/0.1/ClearKeyPersistence.h
new file mode 100644
index 000000000000..05b6a751454e
--- /dev/null
+++ b/media/gmp-clearkey/0.1/ClearKeyPersistence.h
@@ -0,0 +1,39 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __ClearKeyPersistence_h__
+#define __ClearKeyPersistence_h__
+
+#include <string>
+#include "gmp-decryption.h"
+
+class ClearKeyDecryptionManager;
+
+class ClearKeyPersistence {
+public:
+  static void EnsureInitialized();
+
+  static std::string GetNewSessionId(GMPSessionType aSessionType);
+
+  static bool DeferCreateSessionIfNotReady(ClearKeyDecryptionManager* aInstance,
+                                           uint32_t aPromiseId,
+                                           const uint8_t* aInitData,
+                                           uint32_t aInitDataSize,
+                                           GMPSessionType aSessionType);
+
+  static bool DeferLoadSessionIfNotReady(ClearKeyDecryptionManager* aInstance,
+                                         uint32_t aPromiseId,
+                                         const char* aSessionId,
+                                         uint32_t aSessionIdLength);
+
+  static bool IsPersistentSessionId(const std::string& aSid);
+
+  static void LoadSessionData(ClearKeyDecryptionManager* aInstance,
+                              const std::string& aSid,
+                              uint32_t aPromiseId);
+
+  static void PersistentSessionRemoved(const std::string& aSid);
+};
+
+#endif // __ClearKeyPersistence_h__
diff --git a/media/gmp-clearkey/0.1/ClearKeySession.cpp b/media/gmp-clearkey/0.1/ClearKeySession.cpp
index ce1500100624..9a162f715472 100644
--- a/media/gmp-clearkey/0.1/ClearKeySession.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeySession.cpp
@@ -4,6 +4,8 @@
 
 #include "ClearKeySession.h"
 #include "ClearKeyUtils.h"
+#include "ClearKeyStorage.h"
+#include "gmp-task-utils.h"
 
 #include "gmp-api/gmp-decryption.h"
 #include "mozilla/Endian.h"
@@ -12,9 +14,11 @@
 using namespace mozilla;
 
 ClearKeySession::ClearKeySession(const std::string& aSessionId,
-                                 GMPDecryptorCallback* aCallback)
+                                 GMPDecryptorCallback* aCallback,
+                                 GMPSessionType aSessionType)
   : mSessionId(aSessionId)
   , mCallback(aCallback)
+  , mSessionType(aSessionType)
 {
   CK_LOGD("ClearKeySession ctor %p", this);
 }
@@ -36,7 +40,18 @@ ClearKeySession::Init(uint32_t aPromiseId,
     mCallback->RejectPromise(aPromiseId, kGMPAbortError, message, strlen(message));
     return;
   }
-
   mCallback->ResolveNewSessionPromise(aPromiseId,
                                       mSessionId.data(), mSessionId.length());
 }
+
+GMPSessionType
+ClearKeySession::Type() const
+{
+  return mSessionType;
+}
+
+void
+ClearKeySession::AddKeyId(const KeyId& aKeyId)
+{
+  mKeyIds.push_back(aKeyId);
+}
diff --git a/media/gmp-clearkey/0.1/ClearKeySession.h b/media/gmp-clearkey/0.1/ClearKeySession.h
index e551fcdd8da3..32c50386ffb0 100644
--- a/media/gmp-clearkey/0.1/ClearKeySession.h
+++ b/media/gmp-clearkey/0.1/ClearKeySession.h
@@ -6,34 +6,39 @@
 #define __ClearKeySession_h__
 
 #include "ClearKeyUtils.h"
+#include "gmp-decryption.h"
 
 class GMPBuffer;
 class GMPDecryptorCallback;
 class GMPDecryptorHost;
 class GMPEncryptedBufferMetadata;
 
-/**
- * Currently useless; will be fleshed out later with support for persistent
- * key sessions.
- */
-
 class ClearKeySession
 {
 public:
-  ClearKeySession(const std::string& aSessionId,
-                  GMPDecryptorCallback* aCallback);
+  explicit ClearKeySession(const std::string& aSessionId,
+                           GMPDecryptorCallback* aCallback,
+                           GMPSessionType aSessionType);
 
   ~ClearKeySession();
 
-  const std::vector<KeyId>& GetKeyIds() { return mKeyIds; }
+  const std::vector<KeyId>& GetKeyIds() const { return mKeyIds; }
 
   void Init(uint32_t aPromiseId,
             const uint8_t* aInitData, uint32_t aInitDataSize);
+
+  GMPSessionType Type() const;
+
+  void AddKeyId(const KeyId& aKeyId);
+
+  const std::string Id() const { return mSessionId; }
+
 private:
-  std::string mSessionId;
+  const std::string mSessionId;
   std::vector<KeyId> mKeyIds;
 
   GMPDecryptorCallback* mCallback;
+  const GMPSessionType mSessionType;
 };
 
 #endif // __ClearKeySession_h__
diff --git a/media/gmp-clearkey/0.1/ClearKeyStorage.cpp b/media/gmp-clearkey/0.1/ClearKeyStorage.cpp
new file mode 100644
index 000000000000..f3dfa69bfff2
--- /dev/null
+++ b/media/gmp-clearkey/0.1/ClearKeyStorage.cpp
@@ -0,0 +1,174 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ClearKeyStorage.h"
+#include "ClearKeyUtils.h"
+
+#include "gmp-task-utils.h"
+
+#include "mozilla/Assertions.h"
+#include "mozilla/NullPtr.h"
+#include "mozilla/ArrayUtils.h"
+
+#include <vector>
+
+static GMPErr
+RunOnMainThread(GMPTask* aTask)
+{
+  return GetPlatform()->runonmainthread(aTask);
+}
+
+class WriteRecordClient : public GMPRecordClient {
+public:
+  GMPErr Init(GMPRecord* aRecord,
+              GMPTask* aOnSuccess,
+              GMPTask* aOnFailure,
+              const uint8_t* aData,
+              uint32_t aDataSize) {
+    mRecord = aRecord;
+    mOnSuccess = aOnSuccess;
+    mOnFailure = aOnFailure;
+    mData.insert(mData.end(), aData, aData + aDataSize);
+    return mRecord->Open();
+  }
+
+  virtual void OpenComplete(GMPErr aStatus) MOZ_OVERRIDE {
+    if (GMP_FAILED(aStatus) ||
+        GMP_FAILED(mRecord->Write(&mData.front(), mData.size()))) {
+      RunOnMainThread(mOnFailure);
+      mOnSuccess->Destroy();
+    }
+  }
+
+  virtual void ReadComplete(GMPErr aStatus,
+                            const uint8_t* aData,
+                            uint32_t aDataSize) MOZ_OVERRIDE {
+    MOZ_ASSERT(false, "Should not reach here.");
+  }
+
+  virtual void WriteComplete(GMPErr aStatus) MOZ_OVERRIDE {
+    // Note: Call Close() before running continuation, in case the
+    // continuation tries to open the same record; if we call Close()
+    // after running the continuation, the Close() call will arrive
+    // just after the Open() call succeeds, immediately closing the
+    // record we just opened.
+    mRecord->Close();
+    if (GMP_SUCCEEDED(aStatus)) {
+      RunOnMainThread(mOnSuccess);
+      mOnFailure->Destroy();
+    } else {
+      RunOnMainThread(mOnFailure);
+      mOnSuccess->Destroy();
+    }
+    delete this;
+  }
+
+private:
+  GMPRecord* mRecord;
+  GMPTask* mOnSuccess;
+  GMPTask* mOnFailure;
+  std::vector<uint8_t> mData;
+};
+
+GMPErr
+OpenRecord(const char* aName,
+           uint32_t aNameLength,
+           GMPRecord** aOutRecord,
+           GMPRecordClient* aClient)
+{
+  return GetPlatform()->createrecord(aName, aNameLength, aOutRecord, aClient);
+}
+
+void
+StoreData(const std::string& aRecordName,
+          const std::vector<uint8_t>& aData,
+          GMPTask* aOnSuccess,
+          GMPTask* aOnFailure)
+{
+  GMPRecord* record;
+  WriteRecordClient* client = new WriteRecordClient();
+  if (GMP_FAILED(OpenRecord(aRecordName.c_str(),
+                            aRecordName.size(),
+                            &record,
+                            client)) ||
+      GMP_FAILED(client->Init(record,
+                              aOnSuccess,
+                              aOnFailure,
+                              &aData.front(),
+                              aData.size()))) {
+    RunOnMainThread(aOnFailure);
+    aOnSuccess->Destroy();
+  }
+}
+
+class ReadRecordClient : public GMPRecordClient {
+public:
+  ReadRecordClient()
+    : mRecord(nullptr)
+    , mContinuation(nullptr)
+  {}
+  ~ReadRecordClient() {
+    delete mContinuation;
+  }
+
+  GMPErr Init(GMPRecord* aRecord,
+              ReadContinuation* aContinuation) {
+    mRecord = aRecord;
+    mContinuation = aContinuation;
+    return mRecord->Open();
+  }
+
+  virtual void OpenComplete(GMPErr aStatus) MOZ_OVERRIDE {
+    auto err = mRecord->Read();
+    if (GMP_FAILED(err)) {
+      mContinuation->ReadComplete(err, nullptr, 0);
+      delete this;
+    }
+  }
+
+  virtual void ReadComplete(GMPErr aStatus,
+                            const uint8_t* aData,
+                            uint32_t aDataSize) MOZ_OVERRIDE {
+    // Note: Call Close() before running continuation, in case the
+    // continuation tries to open the same record; if we call Close()
+    // after running the continuation, the Close() call will arrive
+    // just after the Open() call succeeds, immediately closing the
+    // record we just opened.
+    mRecord->Close();
+    mContinuation->ReadComplete(GMPNoErr, aData, aDataSize);
+    delete this;
+  }
+
+  virtual void WriteComplete(GMPErr aStatus) MOZ_OVERRIDE {
+    MOZ_ASSERT(false, "Should not reach here.");
+  }
+
+private:
+  GMPRecord* mRecord;
+  ReadContinuation* mContinuation;
+};
+
+void
+ReadData(const std::string& aRecordName,
+         ReadContinuation* aContinuation)
+{
+  MOZ_ASSERT(aContinuation);
+  GMPRecord* record;
+  ReadRecordClient* client = new ReadRecordClient();
+  auto err = OpenRecord(aRecordName.c_str(),
+                        aRecordName.size(),
+                        &record,
+                        client);
+  if (GMP_FAILED(err) ||
+      GMP_FAILED(client->Init(record, aContinuation))) {
+    aContinuation->ReadComplete(err, nullptr, 0);
+    delete aContinuation;
+  }
+}
+
+GMPErr
+EnumRecordNames(RecvGMPRecordIteratorPtr aRecvIteratorFunc)
+{
+  return GetPlatform()->getrecordenumerator(aRecvIteratorFunc, nullptr);
+}
diff --git a/media/gmp-clearkey/0.1/ClearKeyStorage.h b/media/gmp-clearkey/0.1/ClearKeyStorage.h
new file mode 100644
index 000000000000..41f7c865a46f
--- /dev/null
+++ b/media/gmp-clearkey/0.1/ClearKeyStorage.h
@@ -0,0 +1,36 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __ClearKeyStorage_h__
+#define __ClearKeyStorage_h__
+
+#include "gmp-errors.h"
+#include "gmp-platform.h"
+#include <string>
+#include <vector>
+#include <stdint.h>
+
+class GMPTask;
+
+// Responsible for ensuring that both aOnSuccess and aOnFailure are destroyed.
+void StoreData(const std::string& aRecordName,
+               const std::vector<uint8_t>& aData,
+               GMPTask* aOnSuccess,
+               GMPTask* aOnFailure);
+
+class ReadContinuation {
+public:
+  virtual void ReadComplete(GMPErr aStatus,
+                            const uint8_t* aData,
+                            uint32_t aLength) = 0;
+  virtual ~ReadContinuation() {}
+};
+
+// Deletes aContinuation after running it to report the result.
+void ReadData(const std::string& aSessionId,
+              ReadContinuation* aContinuation);
+
+GMPErr EnumRecordNames(RecvGMPRecordIteratorPtr aRecvIteratorFunc);
+
+#endif // __ClearKeyStorage_h__
diff --git a/media/gmp-clearkey/0.1/ClearKeyUtils.cpp b/media/gmp-clearkey/0.1/ClearKeyUtils.cpp
index 47eb16587c39..c173ea6d8754 100644
--- a/media/gmp-clearkey/0.1/ClearKeyUtils.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeyUtils.cpp
@@ -177,7 +177,8 @@ ClearKeyUtils::ParseInitData(const uint8_t* aInitData, uint32_t aInitDataSize,
 
 /* static */ void
 ClearKeyUtils::MakeKeyRequest(const vector<KeyId>& aKeyIDs,
-                              string& aOutRequest)
+                              string& aOutRequest,
+                              GMPSessionType aSessionType)
 {
   MOZ_ASSERT(aKeyIDs.size() && aOutRequest.empty());
 
@@ -195,9 +196,10 @@ ClearKeyUtils::MakeKeyRequest(const vector<KeyId>& aKeyIDs,
     aOutRequest.append("\"");
   }
   aOutRequest.append("], \"type\":");
-  // TODO implement "persistent" session type
-  aOutRequest.append("\"temporary\"");
-  aOutRequest.append("}");
+
+  aOutRequest.append("\"");
+  aOutRequest.append(SessionTypeToString(aSessionType));
+  aOutRequest.append("\"}");
 }
 
 #define EXPECT_SYMBOL(CTX, X) do { \
@@ -509,7 +511,8 @@ ParseKeys(ParserContext& aCtx, vector<KeyIdPair>& aOutKeys)
 
 /* static */ bool
 ClearKeyUtils::ParseJWK(const uint8_t* aKeyData, uint32_t aKeyDataSize,
-                        vector<KeyIdPair>& aOutKeys)
+                        vector<KeyIdPair>& aOutKeys,
+                        GMPSessionType aSessionType)
 {
   ParserContext ctx;
   ctx.mIter = aKeyData;
@@ -531,8 +534,7 @@ ClearKeyUtils::ParseJWK(const uint8_t* aKeyData, uint32_t aKeyDataSize,
       // Consume type string.
       string type;
       if (!GetNextLabel(ctx, type)) return false;
-      // XXX todo support "persistent" session type
-      if (type != "temporary") {
+      if (type != SessionTypeToString(aSessionType)) {
         return false;
       }
     } else {
@@ -553,3 +555,32 @@ ClearKeyUtils::ParseJWK(const uint8_t* aKeyData, uint32_t aKeyDataSize,
 
   return true;
 }
+
+/* static */ const char*
+ClearKeyUtils::SessionTypeToString(GMPSessionType aSessionType)
+{
+  switch (aSessionType) {
+    case kGMPTemporySession: return "temporary";
+    case kGMPPersistentSession: return "persistent";
+    default: {
+      MOZ_ASSERT(false, "Should not reach here.");
+      return "invalid";
+    }
+  }
+}
+
+/* static */ bool
+ClearKeyUtils::IsValidSessionId(const char* aBuff, uint32_t aLength)
+{
+  if (aLength > 10) {
+    // 10 is the max number of characters in UINT32_MAX when
+    // represented as a string; ClearKey session ids are integers.
+    return false;
+  }
+  for (uint32_t i = 0; i < aLength; i++) {
+    if (!isdigit(aBuff[i])) {
+      return false;
+    }
+  }
+  return true;
+}
diff --git a/media/gmp-clearkey/0.1/ClearKeyUtils.h b/media/gmp-clearkey/0.1/ClearKeyUtils.h
index df85d79b77cd..7700e7182e19 100644
--- a/media/gmp-clearkey/0.1/ClearKeyUtils.h
+++ b/media/gmp-clearkey/0.1/ClearKeyUtils.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <string>
 #include <vector>
+#include "gmp-decryption.h"
 
 #define CLEARKEY_KEY_LEN ((size_t)16)
 
@@ -44,10 +45,22 @@ public:
                             std::vector<Key>& aOutKeys);
 
   static void MakeKeyRequest(const std::vector<KeyId>& aKeyIds,
-                             std::string& aOutRequest);
+                             std::string& aOutRequest,
+                             GMPSessionType aSessionType);
 
   static bool ParseJWK(const uint8_t* aKeyData, uint32_t aKeyDataSize,
-                       std::vector<KeyIdPair>& aOutKeys);
+                       std::vector<KeyIdPair>& aOutKeys,
+                       GMPSessionType aSessionType);
+  static const char* SessionTypeToString(GMPSessionType aSessionType);
+
+  static bool IsValidSessionId(const char* aBuff, uint32_t aLength);
 };
 
+template<class Container, class Element>
+inline bool
+Contains(const Container& aContainer, const Element& aElement)
+{
+  return aContainer.find(aElement) != aContainer.end();
+}
+
 #endif // __ClearKeyUtils_h__
diff --git a/media/gmp-clearkey/0.1/RefCounted.h b/media/gmp-clearkey/0.1/RefCounted.h
new file mode 100644
index 000000000000..849c75204b80
--- /dev/null
+++ b/media/gmp-clearkey/0.1/RefCounted.h
@@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef __RefCount_h__
+#define __RefCount_h__
+
+// Note: Not thread safe!
+class RefCounted {
+public:
+  void AddRef() {
+    ++mRefCount;
+  }
+
+  void Release() {
+    if (mRefCount == 1) {
+      delete this;
+    } else {
+      --mRefCount;
+    }
+  }
+
+protected:
+  RefCounted()
+    : mRefCount(0)
+  {
+  }
+  virtual ~RefCounted()
+  {
+  }
+  uint32_t mRefCount;
+};
+
+#endif // __RefCount_h__
diff --git a/media/gmp-clearkey/0.1/gmp-task-utils-generated.h b/media/gmp-clearkey/0.1/gmp-task-utils-generated.h
new file mode 100644
index 000000000000..5eec3374a26a
--- /dev/null
+++ b/media/gmp-clearkey/0.1/gmp-task-utils-generated.h
@@ -0,0 +1,1898 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+// 0 arguments --
+template<typename M> class gmp_task_args_nm_0 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_0(M m) :
+    m_(m)  {}
+
+  void Run() {
+    m_();
+  }
+
+ private:
+  M m_;
+};
+
+
+
+// 0 arguments --
+template<typename M, typename R> class gmp_task_args_nm_0_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_0_ret(M m, R *r) :
+    m_(m), r_(r)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_();
+  }
+
+ private:
+  M m_;
+  R* r_;
+};
+
+
+
+// 0 arguments --
+template<typename C, typename M> class gmp_task_args_m_0 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_0(C o, M m) :
+    o_(o), m_(m)  {}
+
+  void Run() {
+    ((*o_).*m_)();
+  }
+
+ private:
+  C o_;
+  M m_;
+};
+
+
+
+// 0 arguments --
+template<typename C, typename M, typename R> class gmp_task_args_m_0_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_0_ret(C o, M m, R *r) :
+    o_(o), m_(m), r_(r)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)();
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+};
+
+
+
+// 1 arguments --
+template<typename M, typename A0> class gmp_task_args_nm_1 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_1(M m, A0 a0) :
+    m_(m), a0_(a0)  {}
+
+  void Run() {
+    m_(a0_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+};
+
+
+
+// 1 arguments --
+template<typename M, typename A0, typename R> class gmp_task_args_nm_1_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_1_ret(M m, A0 a0, R *r) :
+    m_(m), r_(r), a0_(a0)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+};
+
+
+
+// 1 arguments --
+template<typename C, typename M, typename A0> class gmp_task_args_m_1 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_1(C o, M m, A0 a0) :
+    o_(o), m_(m), a0_(a0)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+};
+
+
+
+// 1 arguments --
+template<typename C, typename M, typename A0, typename R> class gmp_task_args_m_1_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_1_ret(C o, M m, A0 a0, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+};
+
+
+
+// 2 arguments --
+template<typename M, typename A0, typename A1> class gmp_task_args_nm_2 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_2(M m, A0 a0, A1 a1) :
+    m_(m), a0_(a0), a1_(a1)  {}
+
+  void Run() {
+    m_(a0_, a1_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+};
+
+
+
+// 2 arguments --
+template<typename M, typename A0, typename A1, typename R> class gmp_task_args_nm_2_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_2_ret(M m, A0 a0, A1 a1, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+};
+
+
+
+// 2 arguments --
+template<typename C, typename M, typename A0, typename A1> class gmp_task_args_m_2 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_2(C o, M m, A0 a0, A1 a1) :
+    o_(o), m_(m), a0_(a0), a1_(a1)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+};
+
+
+
+// 2 arguments --
+template<typename C, typename M, typename A0, typename A1, typename R> class gmp_task_args_m_2_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_2_ret(C o, M m, A0 a0, A1 a1, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+};
+
+
+
+// 3 arguments --
+template<typename M, typename A0, typename A1, typename A2> class gmp_task_args_nm_3 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_3(M m, A0 a0, A1 a1, A2 a2) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+};
+
+
+
+// 3 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename R> class gmp_task_args_nm_3_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_3_ret(M m, A0 a0, A1 a1, A2 a2, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+};
+
+
+
+// 3 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2> class gmp_task_args_m_3 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_3(C o, M m, A0 a0, A1 a1, A2 a2) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+};
+
+
+
+// 3 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename R> class gmp_task_args_m_3_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_3_ret(C o, M m, A0 a0, A1 a1, A2 a2, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+};
+
+
+
+// 4 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3> class gmp_task_args_nm_4 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_4(M m, A0 a0, A1 a1, A2 a2, A3 a3) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+};
+
+
+
+// 4 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename R> class gmp_task_args_nm_4_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_4_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+};
+
+
+
+// 4 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3> class gmp_task_args_m_4 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_4(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+};
+
+
+
+// 4 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename R> class gmp_task_args_m_4_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_4_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+};
+
+
+
+// 5 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4> class gmp_task_args_nm_5 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_5(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+};
+
+
+
+// 5 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename R> class gmp_task_args_nm_5_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_5_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+};
+
+
+
+// 5 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4> class gmp_task_args_m_5 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_5(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+};
+
+
+
+// 5 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename R> class gmp_task_args_m_5_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_5_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+};
+
+
+
+// 6 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5> class gmp_task_args_nm_6 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_6(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+};
+
+
+
+// 6 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename R> class gmp_task_args_nm_6_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_6_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+};
+
+
+
+// 6 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5> class gmp_task_args_m_6 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_6(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+};
+
+
+
+// 6 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename R> class gmp_task_args_m_6_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_6_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+};
+
+
+
+// 7 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6> class gmp_task_args_nm_7 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_7(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+};
+
+
+
+// 7 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename R> class gmp_task_args_nm_7_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_7_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+};
+
+
+
+// 7 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6> class gmp_task_args_m_7 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_7(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+};
+
+
+
+// 7 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename R> class gmp_task_args_m_7_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_7_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+};
+
+
+
+// 8 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7> class gmp_task_args_nm_8 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_8(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+};
+
+
+
+// 8 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename R> class gmp_task_args_nm_8_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_8_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+};
+
+
+
+// 8 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7> class gmp_task_args_m_8 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_8(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+};
+
+
+
+// 8 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename R> class gmp_task_args_m_8_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_8_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+};
+
+
+
+// 9 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8> class gmp_task_args_nm_9 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_9(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+};
+
+
+
+// 9 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename R> class gmp_task_args_nm_9_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_9_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+};
+
+
+
+// 9 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8> class gmp_task_args_m_9 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_9(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+};
+
+
+
+// 9 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename R> class gmp_task_args_m_9_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_9_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+};
+
+
+
+// 10 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9> class gmp_task_args_nm_10 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_10(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+};
+
+
+
+// 10 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename R> class gmp_task_args_nm_10_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_10_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+};
+
+
+
+// 10 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9> class gmp_task_args_m_10 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_10(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+};
+
+
+
+// 10 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename R> class gmp_task_args_m_10_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_10_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+};
+
+
+
+// 11 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10> class gmp_task_args_nm_11 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_11(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+};
+
+
+
+// 11 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename R> class gmp_task_args_nm_11_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_11_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+};
+
+
+
+// 11 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10> class gmp_task_args_m_11 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_11(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+};
+
+
+
+// 11 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename R> class gmp_task_args_m_11_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_11_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+};
+
+
+
+// 12 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11> class gmp_task_args_nm_12 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_12(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+};
+
+
+
+// 12 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename R> class gmp_task_args_nm_12_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_12_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+};
+
+
+
+// 12 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11> class gmp_task_args_m_12 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_12(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+};
+
+
+
+// 12 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename R> class gmp_task_args_m_12_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_12_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+};
+
+
+
+// 13 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12> class gmp_task_args_nm_13 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_13(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11), a12_(a12)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_, a12_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+  A12 a12_;
+};
+
+
+
+// 13 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename R> class gmp_task_args_nm_13_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_13_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11), a12_(a12)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_, a12_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+  A12 a12_;
+};
+
+
+
+// 13 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12> class gmp_task_args_m_13 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_13(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11), a12_(a12)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_, a12_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+  A12 a12_;
+};
+
+
+
+// 13 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename R> class gmp_task_args_m_13_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_13_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11), a12_(a12)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_, a12_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+  A12 a12_;
+};
+
+
+
+// 14 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13> class gmp_task_args_nm_14 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_14(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13) :
+    m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11), a12_(a12), a13_(a13)  {}
+
+  void Run() {
+    m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_, a12_, a13_);
+  }
+
+ private:
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+  A12 a12_;
+  A13 a13_;
+};
+
+
+
+// 14 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename R> class gmp_task_args_nm_14_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_nm_14_ret(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13, R *r) :
+    m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11), a12_(a12), a13_(a13)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = m_(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_, a12_, a13_);
+  }
+
+ private:
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+  A12 a12_;
+  A13 a13_;
+};
+
+
+
+// 14 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13> class gmp_task_args_m_14 : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_14(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13) :
+    o_(o), m_(m), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11), a12_(a12), a13_(a13)  {}
+
+  void Run() {
+    ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_, a12_, a13_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+  A12 a12_;
+  A13 a13_;
+};
+
+
+
+// 14 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename R> class gmp_task_args_m_14_ret : public gmp_task_args_base {
+ public:
+  explicit gmp_task_args_m_14_ret(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13, R *r) :
+    o_(o), m_(m), r_(r), a0_(a0), a1_(a1), a2_(a2), a3_(a3), a4_(a4), a5_(a5), a6_(a6), a7_(a7), a8_(a8), a9_(a9), a10_(a10), a11_(a11), a12_(a12), a13_(a13)  {}
+  virtual bool returns_value() const { return true; }
+
+  void Run() {
+    *r_ = ((*o_).*m_)(a0_, a1_, a2_, a3_, a4_, a5_, a6_, a7_, a8_, a9_, a10_, a11_, a12_, a13_);
+  }
+
+ private:
+  C o_;
+  M m_;
+  R* r_;
+  A0 a0_;
+  A1 a1_;
+  A2 a2_;
+  A3 a3_;
+  A4 a4_;
+  A5 a5_;
+  A6 a6_;
+  A7 a7_;
+  A8 a8_;
+  A9 a9_;
+  A10 a10_;
+  A11 a11_;
+  A12 a12_;
+  A13 a13_;
+};
+
+
+
+
+
+
+// 0 arguments --
+template<typename M>
+gmp_task_args_nm_0<M>* WrapTaskNM(M m) {
+  return new gmp_task_args_nm_0<M>
+    (m);
+}
+
+// 0 arguments --
+template<typename M, typename R>
+gmp_task_args_nm_0_ret<M, R>* WrapTaskNMRet(M m, R* r) {
+  return new gmp_task_args_nm_0_ret<M, R>
+    (m, r);
+}
+
+// 0 arguments --
+template<typename C, typename M>
+gmp_task_args_m_0<C, M>* WrapTask(C o, M m) {
+  return new gmp_task_args_m_0<C, M>
+    (o, m);
+}
+
+// 0 arguments --
+template<typename C, typename M, typename R>
+gmp_task_args_m_0_ret<C, M, R>* WrapTaskRet(C o, M m, R* r) {
+  return new gmp_task_args_m_0_ret<C, M, R>
+    (o, m, r);
+}
+
+// 1 arguments --
+template<typename M, typename A0>
+gmp_task_args_nm_1<M, A0>* WrapTaskNM(M m, A0 a0) {
+  return new gmp_task_args_nm_1<M, A0>
+    (m, a0);
+}
+
+// 1 arguments --
+template<typename M, typename A0, typename R>
+gmp_task_args_nm_1_ret<M, A0, R>* WrapTaskNMRet(M m, A0 a0, R* r) {
+  return new gmp_task_args_nm_1_ret<M, A0, R>
+    (m, a0, r);
+}
+
+// 1 arguments --
+template<typename C, typename M, typename A0>
+gmp_task_args_m_1<C, M, A0>* WrapTask(C o, M m, A0 a0) {
+  return new gmp_task_args_m_1<C, M, A0>
+    (o, m, a0);
+}
+
+// 1 arguments --
+template<typename C, typename M, typename A0, typename R>
+gmp_task_args_m_1_ret<C, M, A0, R>* WrapTaskRet(C o, M m, A0 a0, R* r) {
+  return new gmp_task_args_m_1_ret<C, M, A0, R>
+    (o, m, a0, r);
+}
+
+// 2 arguments --
+template<typename M, typename A0, typename A1>
+gmp_task_args_nm_2<M, A0, A1>* WrapTaskNM(M m, A0 a0, A1 a1) {
+  return new gmp_task_args_nm_2<M, A0, A1>
+    (m, a0, a1);
+}
+
+// 2 arguments --
+template<typename M, typename A0, typename A1, typename R>
+gmp_task_args_nm_2_ret<M, A0, A1, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, R* r) {
+  return new gmp_task_args_nm_2_ret<M, A0, A1, R>
+    (m, a0, a1, r);
+}
+
+// 2 arguments --
+template<typename C, typename M, typename A0, typename A1>
+gmp_task_args_m_2<C, M, A0, A1>* WrapTask(C o, M m, A0 a0, A1 a1) {
+  return new gmp_task_args_m_2<C, M, A0, A1>
+    (o, m, a0, a1);
+}
+
+// 2 arguments --
+template<typename C, typename M, typename A0, typename A1, typename R>
+gmp_task_args_m_2_ret<C, M, A0, A1, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, R* r) {
+  return new gmp_task_args_m_2_ret<C, M, A0, A1, R>
+    (o, m, a0, a1, r);
+}
+
+// 3 arguments --
+template<typename M, typename A0, typename A1, typename A2>
+gmp_task_args_nm_3<M, A0, A1, A2>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2) {
+  return new gmp_task_args_nm_3<M, A0, A1, A2>
+    (m, a0, a1, a2);
+}
+
+// 3 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename R>
+gmp_task_args_nm_3_ret<M, A0, A1, A2, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, R* r) {
+  return new gmp_task_args_nm_3_ret<M, A0, A1, A2, R>
+    (m, a0, a1, a2, r);
+}
+
+// 3 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2>
+gmp_task_args_m_3<C, M, A0, A1, A2>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2) {
+  return new gmp_task_args_m_3<C, M, A0, A1, A2>
+    (o, m, a0, a1, a2);
+}
+
+// 3 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename R>
+gmp_task_args_m_3_ret<C, M, A0, A1, A2, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, R* r) {
+  return new gmp_task_args_m_3_ret<C, M, A0, A1, A2, R>
+    (o, m, a0, a1, a2, r);
+}
+
+// 4 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3>
+gmp_task_args_nm_4<M, A0, A1, A2, A3>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3) {
+  return new gmp_task_args_nm_4<M, A0, A1, A2, A3>
+    (m, a0, a1, a2, a3);
+}
+
+// 4 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename R>
+gmp_task_args_nm_4_ret<M, A0, A1, A2, A3, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, R* r) {
+  return new gmp_task_args_nm_4_ret<M, A0, A1, A2, A3, R>
+    (m, a0, a1, a2, a3, r);
+}
+
+// 4 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3>
+gmp_task_args_m_4<C, M, A0, A1, A2, A3>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3) {
+  return new gmp_task_args_m_4<C, M, A0, A1, A2, A3>
+    (o, m, a0, a1, a2, a3);
+}
+
+// 4 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename R>
+gmp_task_args_m_4_ret<C, M, A0, A1, A2, A3, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, R* r) {
+  return new gmp_task_args_m_4_ret<C, M, A0, A1, A2, A3, R>
+    (o, m, a0, a1, a2, a3, r);
+}
+
+// 5 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4>
+gmp_task_args_nm_5<M, A0, A1, A2, A3, A4>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4) {
+  return new gmp_task_args_nm_5<M, A0, A1, A2, A3, A4>
+    (m, a0, a1, a2, a3, a4);
+}
+
+// 5 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename R>
+gmp_task_args_nm_5_ret<M, A0, A1, A2, A3, A4, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, R* r) {
+  return new gmp_task_args_nm_5_ret<M, A0, A1, A2, A3, A4, R>
+    (m, a0, a1, a2, a3, a4, r);
+}
+
+// 5 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4>
+gmp_task_args_m_5<C, M, A0, A1, A2, A3, A4>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4) {
+  return new gmp_task_args_m_5<C, M, A0, A1, A2, A3, A4>
+    (o, m, a0, a1, a2, a3, a4);
+}
+
+// 5 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename R>
+gmp_task_args_m_5_ret<C, M, A0, A1, A2, A3, A4, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, R* r) {
+  return new gmp_task_args_m_5_ret<C, M, A0, A1, A2, A3, A4, R>
+    (o, m, a0, a1, a2, a3, a4, r);
+}
+
+// 6 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5>
+gmp_task_args_nm_6<M, A0, A1, A2, A3, A4, A5>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
+  return new gmp_task_args_nm_6<M, A0, A1, A2, A3, A4, A5>
+    (m, a0, a1, a2, a3, a4, a5);
+}
+
+// 6 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename R>
+gmp_task_args_nm_6_ret<M, A0, A1, A2, A3, A4, A5, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, R* r) {
+  return new gmp_task_args_nm_6_ret<M, A0, A1, A2, A3, A4, A5, R>
+    (m, a0, a1, a2, a3, a4, a5, r);
+}
+
+// 6 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5>
+gmp_task_args_m_6<C, M, A0, A1, A2, A3, A4, A5>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
+  return new gmp_task_args_m_6<C, M, A0, A1, A2, A3, A4, A5>
+    (o, m, a0, a1, a2, a3, a4, a5);
+}
+
+// 6 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename R>
+gmp_task_args_m_6_ret<C, M, A0, A1, A2, A3, A4, A5, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, R* r) {
+  return new gmp_task_args_m_6_ret<C, M, A0, A1, A2, A3, A4, A5, R>
+    (o, m, a0, a1, a2, a3, a4, a5, r);
+}
+
+// 7 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6>
+gmp_task_args_nm_7<M, A0, A1, A2, A3, A4, A5, A6>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
+  return new gmp_task_args_nm_7<M, A0, A1, A2, A3, A4, A5, A6>
+    (m, a0, a1, a2, a3, a4, a5, a6);
+}
+
+// 7 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename R>
+gmp_task_args_nm_7_ret<M, A0, A1, A2, A3, A4, A5, A6, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, R* r) {
+  return new gmp_task_args_nm_7_ret<M, A0, A1, A2, A3, A4, A5, A6, R>
+    (m, a0, a1, a2, a3, a4, a5, a6, r);
+}
+
+// 7 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6>
+gmp_task_args_m_7<C, M, A0, A1, A2, A3, A4, A5, A6>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) {
+  return new gmp_task_args_m_7<C, M, A0, A1, A2, A3, A4, A5, A6>
+    (o, m, a0, a1, a2, a3, a4, a5, a6);
+}
+
+// 7 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename R>
+gmp_task_args_m_7_ret<C, M, A0, A1, A2, A3, A4, A5, A6, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, R* r) {
+  return new gmp_task_args_m_7_ret<C, M, A0, A1, A2, A3, A4, A5, A6, R>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, r);
+}
+
+// 8 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7>
+gmp_task_args_nm_8<M, A0, A1, A2, A3, A4, A5, A6, A7>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
+  return new gmp_task_args_nm_8<M, A0, A1, A2, A3, A4, A5, A6, A7>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7);
+}
+
+// 8 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename R>
+gmp_task_args_nm_8_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, R* r) {
+  return new gmp_task_args_nm_8_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, R>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, r);
+}
+
+// 8 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7>
+gmp_task_args_m_8<C, M, A0, A1, A2, A3, A4, A5, A6, A7>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) {
+  return new gmp_task_args_m_8<C, M, A0, A1, A2, A3, A4, A5, A6, A7>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7);
+}
+
+// 8 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename R>
+gmp_task_args_m_8_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, R* r) {
+  return new gmp_task_args_m_8_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, R>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, r);
+}
+
+// 9 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8>
+gmp_task_args_nm_9<M, A0, A1, A2, A3, A4, A5, A6, A7, A8>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) {
+  return new gmp_task_args_nm_9<M, A0, A1, A2, A3, A4, A5, A6, A7, A8>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+}
+
+// 9 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename R>
+gmp_task_args_nm_9_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, R* r) {
+  return new gmp_task_args_nm_9_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, R>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, r);
+}
+
+// 9 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8>
+gmp_task_args_m_9<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) {
+  return new gmp_task_args_m_9<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8);
+}
+
+// 9 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename R>
+gmp_task_args_m_9_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, R* r) {
+  return new gmp_task_args_m_9_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, R>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, r);
+}
+
+// 10 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9>
+gmp_task_args_nm_10<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) {
+  return new gmp_task_args_nm_10<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+}
+
+// 10 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename R>
+gmp_task_args_nm_10_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, R* r) {
+  return new gmp_task_args_nm_10_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, R>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, r);
+}
+
+// 10 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9>
+gmp_task_args_m_10<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) {
+  return new gmp_task_args_m_10<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+}
+
+// 10 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename R>
+gmp_task_args_m_10_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, R* r) {
+  return new gmp_task_args_m_10_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, R>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, r);
+}
+
+// 11 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10>
+gmp_task_args_nm_11<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) {
+  return new gmp_task_args_nm_11<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
+}
+
+// 11 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename R>
+gmp_task_args_nm_11_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, R* r) {
+  return new gmp_task_args_nm_11_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, r);
+}
+
+// 11 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10>
+gmp_task_args_m_11<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) {
+  return new gmp_task_args_m_11<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
+}
+
+// 11 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename R>
+gmp_task_args_m_11_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, R* r) {
+  return new gmp_task_args_m_11_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, r);
+}
+
+// 12 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11>
+gmp_task_args_nm_12<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11) {
+  return new gmp_task_args_nm_12<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
+}
+
+// 12 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename R>
+gmp_task_args_nm_12_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, R* r) {
+  return new gmp_task_args_nm_12_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, R>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, r);
+}
+
+// 12 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11>
+gmp_task_args_m_12<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11) {
+  return new gmp_task_args_m_12<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
+}
+
+// 12 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename R>
+gmp_task_args_m_12_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, R* r) {
+  return new gmp_task_args_m_12_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, R>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, r);
+}
+
+// 13 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12>
+gmp_task_args_nm_13<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12) {
+  return new gmp_task_args_nm_13<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
+}
+
+// 13 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename R>
+gmp_task_args_nm_13_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, R* r) {
+  return new gmp_task_args_nm_13_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, R>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, r);
+}
+
+// 13 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12>
+gmp_task_args_m_13<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12) {
+  return new gmp_task_args_m_13<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
+}
+
+// 13 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename R>
+gmp_task_args_m_13_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, R* r) {
+  return new gmp_task_args_m_13_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, R>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, r);
+}
+
+// 14 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13>
+gmp_task_args_nm_14<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13>* WrapTaskNM(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13) {
+  return new gmp_task_args_nm_14<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13);
+}
+
+// 14 arguments --
+template<typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename R>
+gmp_task_args_nm_14_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, R>* WrapTaskNMRet(M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13, R* r) {
+  return new gmp_task_args_nm_14_ret<M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, R>
+    (m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, r);
+}
+
+// 14 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13>
+gmp_task_args_m_14<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13>* WrapTask(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13) {
+  return new gmp_task_args_m_14<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13);
+}
+
+// 14 arguments --
+template<typename C, typename M, typename A0, typename A1, typename A2, typename A3, typename A4, typename A5, typename A6, typename A7, typename A8, typename A9, typename A10, typename A11, typename A12, typename A13, typename R>
+gmp_task_args_m_14_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, R>* WrapTaskRet(C o, M m, A0 a0, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10, A11 a11, A12 a12, A13 a13, R* r) {
+  return new gmp_task_args_m_14_ret<C, M, A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, R>
+    (o, m, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, r);
+}
+
diff --git a/media/gmp-clearkey/0.1/gmp-task-utils.h b/media/gmp-clearkey/0.1/gmp-task-utils.h
new file mode 100644
index 000000000000..78a1393c64ea
--- /dev/null
+++ b/media/gmp-clearkey/0.1/gmp-task-utils.h
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// Original author: ekr@rtfm.com
+
+#ifndef gmp_task_utils_h_
+#define gmp_task_utils_h_
+
+#include "gmp-platform.h"
+
+class gmp_task_args_base : public GMPTask {
+public:
+  virtual void Destroy() { delete this; }
+  virtual void Run() = 0;
+};
+
+// The generated file contains four major function templates
+// (in variants for arbitrary numbers of arguments up to 10,
+// which is why it is machine generated). The four templates
+// are:
+//
+// WrapTask(o, m, ...) -- wraps a member function m of an object ptr o
+// WrapTaskRet(o, m, ..., r) -- wraps a member function m of an object ptr o
+//                                  the function returns something that can
+//                                  be assigned to *r
+// WrapTaskNM(f, ...) -- wraps a function f
+// WrapTaskNMRet(f, ..., r) -- wraps a function f that returns something
+//                                 that can be assigned to *r
+//
+// All of these template functions return a GMPTask* which can be passed
+// to DispatchXX().
+#include "gmp-task-utils-generated.h"
+
+#endif // gmp_task_utils_h_
diff --git a/media/gmp-clearkey/0.1/moz.build b/media/gmp-clearkey/0.1/moz.build
index f88332b4091e..8a5db291aef3 100644
--- a/media/gmp-clearkey/0.1/moz.build
+++ b/media/gmp-clearkey/0.1/moz.build
@@ -10,7 +10,9 @@ FINAL_TARGET = 'dist/bin/gmp-clearkey/0.1'
 
 UNIFIED_SOURCES += [
     'ClearKeyDecryptionManager.cpp',
+    'ClearKeyPersistence.cpp',
     'ClearKeySession.cpp',
+    'ClearKeyStorage.cpp',
     'ClearKeyUtils.cpp',
     'gmp-clearkey.cpp',
     'openaes/oaes_lib.c',

From 67369e80dde57209c6406b94a8ea621e5168b993 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Fri, 19 Dec 2014 09:55:00 +1300
Subject: [PATCH 020/183] Bug 1109457 - Use Contains instead of std.find to
 detect whether we have keys in gmp-clearkey, and don't overwrite old
 decryptors when we get a new key. r=edwin.

---
 .../gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
index 001f60ca2b81..fb665c62d186 100644
--- a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
@@ -145,10 +145,9 @@ ClearKeyDecryptionManager::CreateSession(uint32_t aPromiseId,
   const vector<KeyId>& sessionKeys = session->GetKeyIds();
   vector<KeyId> neededKeys;
   for (auto it = sessionKeys.begin(); it != sessionKeys.end(); it++) {
-    if (mDecryptors.find(*it) == mDecryptors.end()) {
+    if (!Contains(mDecryptors, *it)) {
       // Need to request this key ID from the client.
       neededKeys.push_back(*it);
-      mDecryptors[*it] = nullptr;
     } else {
       // We already have a key for this key ID. Mark as usable.
       mCallback->KeyIdUsable(sessionId.c_str(), sessionId.length(),
@@ -272,7 +271,7 @@ ClearKeyDecryptionManager::UpdateSession(uint32_t aPromiseId,
   for (auto it = keyPairs.begin(); it != keyPairs.end(); it++) {
     KeyId& keyId = it->mKeyId;
 
-    if (mDecryptors.find(keyId) != mDecryptors.end()) {
+    if (!Contains(mDecryptors, keyId)) {
       mDecryptors[keyId] = new ClearKeyDecryptor(mCallback, it->mKey);
       mCallback->KeyIdUsable(aSessionId, aSessionIdLength,
                              &keyId[0], keyId.size());
@@ -349,8 +348,7 @@ ClearKeyDecryptionManager::ClearInMemorySessionData(ClearKeySession* aSession)
 
   const vector<KeyId>& keyIds = aSession->GetKeyIds();
   for (auto it = keyIds.begin(); it != keyIds.end(); it++) {
-    MOZ_ASSERT(mDecryptors.find(*it) != mDecryptors.end());
-
+    MOZ_ASSERT(Contains(mDecryptors, *it));
     if (!mDecryptors[*it]->Release()) {
       mDecryptors.erase(*it);
       mCallback->KeyIdNotUsable(aSession->Id().c_str(), aSession->Id().size(),
@@ -420,8 +418,7 @@ ClearKeyDecryptionManager::Decrypt(GMPBuffer* aBuffer,
   CK_LOGD("ClearKeyDecryptionManager::Decrypt");
   KeyId keyId(aMetadata->KeyId(), aMetadata->KeyId() + aMetadata->KeyIdSize());
 
-  auto itr = mDecryptors.find(keyId);
-  if (itr == mDecryptors.end() || !(itr->second)) {
+  if (!Contains(mDecryptors, keyId)) {
     CK_LOGD("ClearKeyDecryptionManager::Decrypt GMPNoKeyErr");
     mCallback->Decrypted(aBuffer, GMPNoKeyErr);
     return;
@@ -438,10 +435,12 @@ ClearKeyDecryptionManager::DecryptingComplete()
   for (auto it = mSessions.begin(); it != mSessions.end(); it++) {
     delete it->second;
   }
+  mSessions.clear();
 
   for (auto it = mDecryptors.begin(); it != mDecryptors.end(); it++) {
     delete it->second;
   }
+  mDecryptors.clear();
 
   Release();
 }

From ee2a73fe1cffb4365cc8cbea98de724ad339f48d Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Fri, 19 Dec 2014 09:55:05 +1300
Subject: [PATCH 021/183] Bug 1109457 - Prevent potential for Join()ing a
 pointer held in free'd memory in gmp-clearkey. r=edwin

---
 media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
index fb665c62d186..411241063108 100644
--- a/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeyDecryptionManager.cpp
@@ -516,6 +516,7 @@ ClearKeyDecryptor::ClearKeyDecryptor(GMPDecryptorCallback* aCallback,
                                      const Key& aKey)
   : mRefCnt(0)
   , mCallback(aCallback)
+  , mThread(nullptr)
   , mKey(aKey)
 {
   if (GetPlatform()->createthread(&mThread) != GMPNoErr) {
@@ -542,8 +543,11 @@ ClearKeyDecryptor::Release()
   uint32_t newCount = --mRefCnt;
   if (!newCount) {
     if (mThread) {
-      mThread->Post(new DestroyTask(this));
-      mThread->Join();
+      // Shutdown mThread. We cache a pointer to mThread, as the DestroyTask
+      // may run and delete |this| before Post() returns.
+      GMPThread* thread = mThread;
+      thread->Post(new DestroyTask(this));
+      thread->Join();
     } else {
       delete this;
     }

From 3d7d4af71d045735a43d1eb47b5244aa27a6cdd8 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Dec 2014 15:59:51 -0500
Subject: [PATCH 022/183] Backed out changesets acb4dd16755c and 40768f723990
 (bug 867348) for static analysis bustage. CLOSED TREE

---
 build/clang-plugin/clang-plugin.cpp           | 83 -------------------
 .../tests/TestNoArithmeticExprInArgument.cpp  | 32 -------
 build/clang-plugin/tests/moz.build            |  1 -
 dom/media/ogg/OggCodecState.cpp               |  8 +-
 mfbt/Attributes.h                             |  4 -
 mfbt/CheckedInt.h                             |  3 +-
 mfbt/tests/TestCheckedInt.cpp                 |  2 +-
 7 files changed, 5 insertions(+), 128 deletions(-)
 delete mode 100644 build/clang-plugin/tests/TestNoArithmeticExprInArgument.cpp

diff --git a/build/clang-plugin/clang-plugin.cpp b/build/clang-plugin/clang-plugin.cpp
index c75ce62f3490..f28c9fecbdc2 100644
--- a/build/clang-plugin/clang-plugin.cpp
+++ b/build/clang-plugin/clang-plugin.cpp
@@ -329,49 +329,6 @@ AST_MATCHER(QualType, nonheapClassAggregate) {
 AST_MATCHER(FunctionDecl, heapAllocator) {
   return MozChecker::hasCustomAnnotation(&Node, "moz_heap_allocator");
 }
-
-/// This matcher will match any declaration that is marked as not accepting
-/// arithmetic expressions in its arguments.
-AST_MATCHER(Decl, noArithmeticExprInArgs) {
-  return MozChecker::hasCustomAnnotation(&Node, "moz_no_arith_expr_in_arg");
-}
-
-/// This matcher will match all arithmetic binary operators.
-AST_MATCHER(BinaryOperator, binaryArithmeticOperator) {
-  BinaryOperatorKind opcode = Node.getOpcode();
-  return opcode == BO_Mul ||
-         opcode == BO_Div ||
-         opcode == BO_Rem ||
-         opcode == BO_Add ||
-         opcode == BO_Sub ||
-         opcode == BO_Shl ||
-         opcode == BO_Shr ||
-         opcode == BO_And ||
-         opcode == BO_Xor ||
-         opcode == BO_Or ||
-         opcode == BO_MulAssign ||
-         opcode == BO_DivAssign ||
-         opcode == BO_RemAssign ||
-         opcode == BO_AddAssign ||
-         opcode == BO_SubAssign ||
-         opcode == BO_ShlAssign ||
-         opcode == BO_ShrAssign ||
-         opcode == BO_AndAssign ||
-         opcode == BO_XorAssign ||
-         opcode == BO_OrAssign;
-}
-
-/// This matcher will match all arithmetic unary operators.
-AST_MATCHER(UnaryOperator, unaryArithmeticOperator) {
-  UnaryOperatorKind opcode = Node.getOpcode();
-  return opcode == UO_PostInc ||
-         opcode == UO_PostDec ||
-         opcode == UO_PreInc ||
-         opcode == UO_PreDec ||
-         opcode == UO_Plus ||
-         opcode == UO_Minus ||
-         opcode == UO_Not;
-}
 }
 }
 
@@ -410,33 +367,6 @@ DiagnosticsMatcher::DiagnosticsMatcher() {
   astMatcher.addMatcher(callExpr(callee(functionDecl(allOf(heapAllocator(),
       returns(pointerType(pointee(stackClassAggregate()))))))).bind("node"),
     &stackClassChecker);
-
-  astMatcher.addMatcher(callExpr(allOf(hasDeclaration(noArithmeticExprInArgs()),
-          anyOf(
-              hasDescendant(binaryOperator(allOf(binaryArithmeticOperator(),
-                  hasLHS(hasDescendant(declRefExpr())),
-                  hasRHS(hasDescendant(declRefExpr()))
-              )).bind("node")),
-              hasDescendant(unaryOperator(allOf(unaryArithmeticOperator(),
-                  hasUnaryOperand(allOf(hasType(builtinType()),
-                                        anyOf(hasDescendant(declRefExpr()), declRefExpr())))
-              )).bind("node"))
-          )
-      )).bind("call"),
-    &arithmeticArgChecker);
-  astMatcher.addMatcher(constructExpr(allOf(hasDeclaration(noArithmeticExprInArgs()),
-          anyOf(
-              hasDescendant(binaryOperator(allOf(binaryArithmeticOperator(),
-                  hasLHS(hasDescendant(declRefExpr())),
-                  hasRHS(hasDescendant(declRefExpr()))
-              )).bind("node")),
-              hasDescendant(unaryOperator(allOf(unaryArithmeticOperator(),
-                  hasUnaryOperand(allOf(hasType(builtinType()),
-                                        anyOf(hasDescendant(declRefExpr()), declRefExpr())))
-              )).bind("node"))
-          )
-      )).bind("call"),
-    &arithmeticArgChecker);
 }
 
 void DiagnosticsMatcher::StackClassChecker::run(
@@ -542,19 +472,6 @@ void DiagnosticsMatcher::NonHeapClassChecker::noteInferred(QualType T,
   noteInferred(cast<ValueDecl>(cause)->getType(), Diag);
 }
 
-void DiagnosticsMatcher::ArithmeticArgChecker::run(
-    const MatchFinder::MatchResult &Result) {
-  DiagnosticsEngine &Diag = Result.Context->getDiagnostics();
-  unsigned errorID = Diag.getDiagnosticIDs()->getCustomDiagID(
-      DiagnosticIDs::Error, "cannot pass an arithmetic expression of built-in types to %0");
-  const Expr *expr = Result.Nodes.getNodeAs<Expr>("node");
-  if (const CallExpr *call = Result.Nodes.getNodeAs<CallExpr>("call")) {
-    Diag.Report(expr->getLocStart(), errorID) << call->getDirectCallee();
-  } else if (const CXXConstructExpr *ctr = Result.Nodes.getNodeAs<CXXConstructExpr>("call")) {
-    Diag.Report(expr->getLocStart(), errorID) << ctr->getConstructor();
-  }
-}
-
 class MozCheckAction : public PluginASTAction {
 public:
   ASTConsumerPtr CreateASTConsumer(CompilerInstance &CI, StringRef fileName) override {
diff --git a/build/clang-plugin/tests/TestNoArithmeticExprInArgument.cpp b/build/clang-plugin/tests/TestNoArithmeticExprInArgument.cpp
deleted file mode 100644
index 96f46c2ff41d..000000000000
--- a/build/clang-plugin/tests/TestNoArithmeticExprInArgument.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#define MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT __attribute__((annotate("moz_no_arith_expr_in_arg")))
-
-struct X {
-  explicit X(int) MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT;
-  void baz(int) MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT;
-};
-
-int operator+(int, X);
-int operator+(X, int);
-int operator++(X);
-
-void badArithmeticsInArgs() {
-  int a;
-  typedef int myint;
-  myint b;
-  X goodObj1(a);
-  goodObj1.baz(b);
-  X badObj1(a + b); // expected-error{{cannot pass an arithmetic expression of built-in types to 'X'}}
-  X badObj2 = X(a ? 0 : ++a); // expected-error{{cannot pass an arithmetic expression of built-in types to 'X'}}
-  X badObj3(~a); // expected-error{{cannot pass an arithmetic expression of built-in types to 'X'}}
-  badObj1.baz(a - 1 - b); // expected-error{{cannot pass an arithmetic expression of built-in types to 'baz'}}
-  badObj1.baz(++a); // expected-error{{cannot pass an arithmetic expression of built-in types to 'baz'}}
-  badObj1.baz(a++); // expected-error{{cannot pass an arithmetic expression of built-in types to 'baz'}}
-  badObj1.baz(a || b);
-  badObj1.baz(a + goodObj1);
-  badObj1.baz(goodObj1 + a);
-  badObj1.baz(++goodObj1);
-  badObj1.baz(-1);
-  badObj1.baz(-1.0);
-  badObj1.baz(1 + 2);
-  badObj1.baz(1 << (sizeof(int)/2));
-}
diff --git a/build/clang-plugin/tests/moz.build b/build/clang-plugin/tests/moz.build
index d2c78a93638c..4066642f13e5 100644
--- a/build/clang-plugin/tests/moz.build
+++ b/build/clang-plugin/tests/moz.build
@@ -8,7 +8,6 @@ SOURCES += [
     'TestBadImplicitConversionCtor.cpp',
     'TestCustomHeap.cpp',
     'TestMustOverride.cpp',
-    'TestNoArithmeticExprInArgument.cpp',
     'TestNonHeapClass.cpp',
     'TestStackClass.cpp',
 ]
diff --git a/dom/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp
index acba322a0500..58871bc8af7d 100644
--- a/dom/media/ogg/OggCodecState.cpp
+++ b/dom/media/ogg/OggCodecState.cpp
@@ -936,7 +936,7 @@ int64_t OpusState::Time(int aPreSkip, int64_t aGranulepos)
     return -1;
 
   // Ogg Opus always runs at a granule rate of 48 kHz.
-  CheckedInt64 t = (CheckedInt64(aGranulepos) - aPreSkip) * USECS_PER_S;
+  CheckedInt64 t = CheckedInt64(aGranulepos - aPreSkip) * USECS_PER_S;
   return t.isValid() ? t.value() / 48000 : -1;
 }
 
@@ -1197,8 +1197,7 @@ bool SkeletonState::DecodeIndex(ogg_packet* aPacket)
   }
 
   // Extract the start time.
-  int64_t timeRawInt = LittleEndian::readInt64(p + INDEX_FIRST_NUMER_OFFSET);
-  CheckedInt64 t = CheckedInt64(timeRawInt) * USECS_PER_S;
+  CheckedInt64 t = CheckedInt64(LittleEndian::readInt64(p + INDEX_FIRST_NUMER_OFFSET)) * USECS_PER_S;
   if (!t.isValid()) {
     return (mActive = false);
   } else {
@@ -1206,8 +1205,7 @@ bool SkeletonState::DecodeIndex(ogg_packet* aPacket)
   }
 
   // Extract the end time.
-  timeRawInt = LittleEndian::readInt64(p + INDEX_LAST_NUMER_OFFSET);
-  t = CheckedInt64(timeRawInt) * USECS_PER_S;
+  t = LittleEndian::readInt64(p + INDEX_LAST_NUMER_OFFSET) * USECS_PER_S;
   if (!t.isValid()) {
     return (mActive = false);
   } else {
diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h
index 4e52fe659c92..fa190af92f78 100644
--- a/mfbt/Attributes.h
+++ b/mfbt/Attributes.h
@@ -502,15 +502,12 @@
  *   are disallowed by default unless they are marked as MOZ_IMPLICIT. This
  *   attribute must be used for constructors which intend to provide implicit
  *   conversions.
- * MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT: Applies to functions. Makes it a compile
- *   time error to path arithmetic expressions on variables to the function.
  */
 #ifdef MOZ_CLANG_PLUGIN
 #  define MOZ_MUST_OVERRIDE __attribute__((annotate("moz_must_override")))
 #  define MOZ_STACK_CLASS __attribute__((annotate("moz_stack_class")))
 #  define MOZ_NONHEAP_CLASS __attribute__((annotate("moz_nonheap_class")))
 #  define MOZ_IMPLICIT __attribute__((annotate("moz_implicit")))
-#  define MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT __attribute__((annotate("moz_no_arith_expr_in_arg")))
 /*
  * It turns out that clang doesn't like void func() __attribute__ {} without a
  * warning, so use pragmas to disable the warning. This code won't work on GCC
@@ -526,7 +523,6 @@
 #  define MOZ_STACK_CLASS /* nothing */
 #  define MOZ_NONHEAP_CLASS /* nothing */
 #  define MOZ_IMPLICIT /* nothing */
-#  define MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT /* nothing */
 #  define MOZ_HEAP_ALLOCATOR /* nothing */
 #endif /* MOZ_CLANG_PLUGIN */
 
diff --git a/mfbt/CheckedInt.h b/mfbt/CheckedInt.h
index bed71a430922..e4f08992038b 100644
--- a/mfbt/CheckedInt.h
+++ b/mfbt/CheckedInt.h
@@ -11,7 +11,6 @@
 
 #include <stdint.h>
 #include "mozilla/Assertions.h"
-#include "mozilla/Attributes.h"
 #include "mozilla/IntegerTypeTraits.h"
 
 namespace mozilla {
@@ -526,7 +525,7 @@ public:
    * argument is valid.
    */
   template<typename U>
-  CheckedInt(U aValue) MOZ_NO_ARITHMETIC_EXPR_IN_ARGUMENT
+  CheckedInt(U aValue)
     : mValue(T(aValue)),
       mIsValid(detail::IsInRange<T>(aValue))
   {
diff --git a/mfbt/tests/TestCheckedInt.cpp b/mfbt/tests/TestCheckedInt.cpp
index 7ded8e350a39..cca1821746c0 100644
--- a/mfbt/tests/TestCheckedInt.cpp
+++ b/mfbt/tests/TestCheckedInt.cpp
@@ -521,7 +521,7 @@ void test()
                                                     : sizeof(T) >= sizeof(U)); \
   }
   #define VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE(U) \
-    VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U,U,+zero) \
+    VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U,U,+0) \
     VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE2(U,CheckedInt<U>,.toChecked<T>())
 
   VERIFY_CONSTRUCTION_FROM_INTEGER_TYPE(int8_t)

From 20dba0f8d27bb32e75d2e9180e81f501989030da Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aklotz@mozilla.com>
Date: Thu, 18 Dec 2014 14:38:18 -0700
Subject: [PATCH 023/183] Bug 1112827: Add IPDL's implicit typedefs to the set
 of explicit typedefs, preventing duplicates in generated code; r=bent

---
 ipc/ipdl/ipdl/lower.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py
index 3bb885b11d6e..031b15e14ed1 100644
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -1329,7 +1329,15 @@ with some new IPDL/C++ nodes that are tuned for C++ codegen."""
         # fully-qualified name. e.g. |Foo| rather than |a::b::Foo|.
         self.typedefs = [ ]
         self.typedefSet = set([ Typedef(Type('mozilla::ipc::ActorHandle'),
-                                        'ActorHandle') ])
+                                        'ActorHandle'),
+                                Typedef(Type('base::ProcessId'),
+                                        'ProcessId'),
+                                Typedef(Type('mozilla::ipc::ProtocolId'),
+                                        'ProtocolId'),
+                                Typedef(Type('mozilla::ipc::Transport'),
+                                        'Transport'),
+                                Typedef(Type('mozilla::ipc::TransportDescriptor'),
+                                        'TransportDescriptor') ])
         self.protocolName = None
 
     def visitTranslationUnit(self, tu):
@@ -2787,14 +2795,6 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
             self.cls.addstmt(typedef)
         for typedef in self.includedActorTypedefs:
             self.cls.addstmt(typedef)
-        # XXX these don't really fit in the other lists; just include
-        # them here for now
-        self.cls.addstmts([
-            Typedef(Type('base::ProcessId'), 'ProcessId'),
-            Typedef(Type('mozilla::ipc::ProtocolId'), 'ProtocolId'),
-            Typedef(Type('mozilla::ipc::Transport'), 'Transport'),
-            Typedef(Type('mozilla::ipc::TransportDescriptor'), 'TransportDescriptor')
-        ])
 
         self.cls.addstmt(Whitespace.NL)
 

From b7d74f74607a6ab4da1ce4147deb4133c1f751d0 Mon Sep 17 00:00:00 2001
From: Benoit Girard <b56girard@gmail.com>
Date: Thu, 18 Dec 2014 16:33:10 -0500
Subject: [PATCH 024/183] Bug 1113331 - Make the frame metrics easier to parse.
 r=kats

---
 gfx/layers/LayersLogging.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gfx/layers/LayersLogging.cpp b/gfx/layers/LayersLogging.cpp
index 5156dcccb7fc..65c1bcc20669 100644
--- a/gfx/layers/LayersLogging.cpp
+++ b/gfx/layers/LayersLogging.cpp
@@ -169,35 +169,35 @@ AppendToString(std::stringstream& aStream, const FrameMetrics& m,
                const char* pfx, const char* sfx, bool detailed)
 {
   aStream << pfx;
-  AppendToString(aStream, m.mCompositionBounds, "{ cb=");
-  AppendToString(aStream, m.mScrollableRect, " sr=");
-  AppendToString(aStream, m.GetScrollOffset(), " s=");
+  AppendToString(aStream, m.mCompositionBounds, "{ [cb=");
+  AppendToString(aStream, m.mScrollableRect, "] [sr=");
+  AppendToString(aStream, m.GetScrollOffset(), "] [s=");
   if (m.GetDoSmoothScroll()) {
-    AppendToString(aStream, m.GetSmoothScrollOffset(), " ss=");
+    AppendToString(aStream, m.GetSmoothScrollOffset(), "] [ss=");
   }
-  AppendToString(aStream, m.mDisplayPort, " dp=");
-  AppendToString(aStream, m.mCriticalDisplayPort, " cdp=");
-  AppendToString(aStream, m.GetBackgroundColor(), " color=");
+  AppendToString(aStream, m.mDisplayPort, "] [dp=");
+  AppendToString(aStream, m.mCriticalDisplayPort, "] [cdp=");
+  AppendToString(aStream, m.GetBackgroundColor(), "] [color=");
   if (!detailed) {
-    AppendToString(aStream, m.GetScrollId(), " scrollId=");
+    AppendToString(aStream, m.GetScrollId(), "] [scrollId=");
     if (m.GetScrollParentId() != FrameMetrics::NULL_SCROLL_ID) {
-      AppendToString(aStream, m.GetScrollParentId(), " scrollParent=");
+      AppendToString(aStream, m.GetScrollParentId(), "] [scrollParent=");
     }
-    aStream << nsPrintfCString(" z=%.3f }", m.GetZoom().scale).get();
+    aStream << nsPrintfCString("] [z=%.3f] }", m.GetZoom().scale).get();
   } else {
-    AppendToString(aStream, m.GetDisplayPortMargins(), " dpm=");
-    aStream << nsPrintfCString(" um=%d", m.GetUseDisplayPortMargins()).get();
-    AppendToString(aStream, m.GetRootCompositionSize(), " rcs=");
-    AppendToString(aStream, m.GetViewport(), " v=");
-    aStream << nsPrintfCString(" z=(ld=%.3f r=%.3f cr=%.3f z=%.3f er=%.3f)",
+    AppendToString(aStream, m.GetDisplayPortMargins(), " [dpm=");
+    aStream << nsPrintfCString("] um=%d", m.GetUseDisplayPortMargins()).get();
+    AppendToString(aStream, m.GetRootCompositionSize(), "] [rcs=");
+    AppendToString(aStream, m.GetViewport(), "] [v=");
+    aStream << nsPrintfCString("] [z=(ld=%.3f r=%.3f cr=%.3f z=%.3f er=%.3f)",
             m.GetDevPixelsPerCSSPixel().scale, m.mPresShellResolution,
             m.mCumulativeResolution.scale, m.GetZoom().scale,
             m.GetExtraResolution().scale).get();
-    aStream << nsPrintfCString(" u=(%d %d %lu)",
+    aStream << nsPrintfCString("] [u=(%d %d %lu)",
             m.GetScrollOffsetUpdated(), m.GetDoSmoothScroll(),
             m.GetScrollGeneration()).get();
-    AppendToString(aStream, m.GetScrollParentId(), " p=");
-    aStream << nsPrintfCString(" i=(%ld %lld) }",
+    AppendToString(aStream, m.GetScrollParentId(), "] [p=");
+    aStream << nsPrintfCString("] [i=(%ld %lld)] }",
             m.GetPresShellId(), m.GetScrollId()).get();
   }
   aStream << sfx;

From b9ffdef5688d198649b5c38baad63fadfaa5fa9d Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Date: Wed, 19 Nov 2014 16:03:39 -0800
Subject: [PATCH 025/183] Bug 1080987 - navigator.sendBeacon() needs to sent
 origin header (r=sicking)

---
 dom/base/Navigator.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index 81752c673f46..bafb53ba05f8 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -1200,6 +1200,9 @@ Navigator::SendBeacon(const nsAString& aUrl,
                                                                principal,
                                                                true);
 
+  rv = cors->Init(channel, true);
+  NS_ENSURE_SUCCESS(rv, false);
+
   // Start a preflight if cross-origin and content type is not whitelisted
   rv = secMan->CheckSameOriginURI(documentURI, uri, false);
   bool crossOrigin = NS_FAILED(rv);

From 0071dc50744ed4ecc7bd061bd87bd1920c99d5c3 Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Date: Wed, 19 Nov 2014 16:03:30 -0800
Subject: [PATCH 026/183] Bug 1080987 - navigator.sendBeacon() needs to sent
 origin header - test (r=sicking)

---
 .../beacon/beacon-originheader-handler.sjs    | 41 ++++++++++++
 dom/tests/mochitest/beacon/mochitest.ini      |  2 +
 .../beacon/test_beaconOriginHeader.html       | 64 +++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 dom/tests/mochitest/beacon/beacon-originheader-handler.sjs
 create mode 100644 dom/tests/mochitest/beacon/test_beaconOriginHeader.html

diff --git a/dom/tests/mochitest/beacon/beacon-originheader-handler.sjs b/dom/tests/mochitest/beacon/beacon-originheader-handler.sjs
new file mode 100644
index 000000000000..baed22c9a869
--- /dev/null
+++ b/dom/tests/mochitest/beacon/beacon-originheader-handler.sjs
@@ -0,0 +1,41 @@
+/*
+ * TestSever customized specifically for the needs of:
+ * Bug 1080987 - navigator.sendBeacon() needs to sent origin header
+ */
+
+function handleRequest(request, response)
+{
+  response.setHeader("Cache-Control", "no-cache", false);
+  response.setHeader("Content-Type", "text/plain", false);
+
+  // case XHR-REQUEST: the xhr-request tries to query the
+  // stored header from the beacon request.
+  if (request.queryString == "queryheader") {
+    var header = getState("originHeader");
+    // if the beacon already stored the header - return.
+    if (header) {
+      response.write(header);
+      setState("originHeader", "");
+      return;
+    }
+    // otherwise wait for the beacon request
+    response.processAsync();
+    setObjectState("xhr-response", response);
+    return;
+  }
+
+  // case BEACON-REQUEST: get the beacon header and
+  // store the header on the server.
+  var header = request.getHeader("origin");
+  setState("originHeader", header);
+
+  // if there is an xhr-request waiting, return the header now.
+  getObjectState("xhr-response", function(xhrResponse) {
+    if (!xhrResponse) {
+      return;
+    }
+    setState("originHeader", "");
+    xhrResponse.write(header);
+    xhrResponse.finish();
+  });
+}
diff --git a/dom/tests/mochitest/beacon/mochitest.ini b/dom/tests/mochitest/beacon/mochitest.ini
index f65276e4a99c..6681fa43d646 100644
--- a/dom/tests/mochitest/beacon/mochitest.ini
+++ b/dom/tests/mochitest/beacon/mochitest.ini
@@ -2,8 +2,10 @@
 skip-if = buildapp == 'b2g' || e10s
 support-files = beacon-frame.html
                 beacon-handler.sjs
+                beacon-originheader-handler.sjs
 
 [test_beacon.html]
 [test_beaconFrame.html]
 [test_beaconPreflight.html]
 [test_beaconContentPolicy.html]
+[test_beaconOriginHeader.html]
diff --git a/dom/tests/mochitest/beacon/test_beaconOriginHeader.html b/dom/tests/mochitest/beacon/test_beaconOriginHeader.html
new file mode 100644
index 000000000000..b5684a96f777
--- /dev/null
+++ b/dom/tests/mochitest/beacon/test_beaconOriginHeader.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bug 1080987 - navigator.sendBeacon() needs to sent origin header</title>
+  <!-- Including SimpleTest.js so we can use waitForExplicitFinish !-->
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+  <p id="display"></p>
+  <div id="content" style="visibility: hidden">
+    <iframe style="width:100%;" id="testframe"></iframe>
+  </div>
+
+<script class="testbody" type="text/javascript">
+
+SimpleTest.waitForExplicitFinish();
+
+const BEACON_URL = "http://example.com/tests/dom/tests/mochitest/beacon/beacon-originheader-handler.sjs";
+const ORIGIN_HEADER = "http://mochi.test:8888";
+
+/* Description of the test:
+ *   We call sendBeacon() cross origin and make sure that the
+ *   origin header is actually set in the request.
+ *
+ * Since sendBeacon() does not expect any response, we are storing the
+ * header on the server (*.sjs) and use an XMLHttpRequest to actually
+ * retrieve the header back from the server. We assert that the header
+ * is indeed correct. Since sendBeacon() and also the XMLHttpRequest()
+ * are performed in an asynchronous fashion, there is no guarantee that
+ * the sendBeacon() is actually executed before the XMLHttpRequest().
+ * Hence the xhr-response might be processed asynchronously.
+ */
+
+SpecialPowers.pushPrefEnv({'set': [["beacon.enabled", true]]}, runTest);
+
+function queryHeaderFromServer() {
+  var xhr = new XMLHttpRequest();
+  xhr.open("GET", "beacon-originheader-handler.sjs?queryheader", true);
+  xhr.onload = function() {
+    is(xhr.responseText, ORIGIN_HEADER, "SendBeacon sends right origin header");
+    SimpleTest.finish();
+  };
+  xhr.onerror = function() {
+    ok(false, "xhr request returned error");
+    SimpleTest.finish();
+  };
+  xhr.send();
+}
+
+function runTest() {
+  // generate data and send beacon
+  var formData = new FormData();
+  formData.append('name', 'value');
+  navigator.sendBeacon(BEACON_URL, formData);
+
+  // start quering the result from the server
+  queryHeaderFromServer();
+}
+
+</script>
+</pre>
+</body>
+</html>

From e88593acfd108dfb846d11c9130b69403ca8dffe Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Thu, 18 Dec 2014 20:55:44 +0100
Subject: [PATCH 027/183] Bug 1110837 - [manifestparser] If parents are used,
 the first include in the master manifest is always used to determine
 defaults. r=jmaher

--HG--
extra : rebase_source : a28ecbd99906a54df76a5b74a45af9feac120488
---
 .../manifestparser/manifestparser.py          | 43 +++++++++++++------
 .../tests/parent/include/first/manifest.ini   |  3 ++
 .../tests/parent/include/manifest.ini         |  8 ++++
 .../tests/parent/include/second/manifest.ini  |  3 ++
 .../tests/test_manifestparser.py              | 14 ++++++
 5 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 testing/mozbase/manifestparser/tests/parent/include/first/manifest.ini
 create mode 100644 testing/mozbase/manifestparser/tests/parent/include/manifest.ini
 create mode 100644 testing/mozbase/manifestparser/tests/parent/include/second/manifest.ini

diff --git a/testing/mozbase/manifestparser/manifestparser/manifestparser.py b/testing/mozbase/manifestparser/manifestparser/manifestparser.py
index d5b6b3843f1e..248c8c881b18 100755
--- a/testing/mozbase/manifestparser/manifestparser/manifestparser.py
+++ b/testing/mozbase/manifestparser/manifestparser/manifestparser.py
@@ -288,7 +288,7 @@ def denormalize_path(path):
 
 ### .ini reader
 
-def read_ini(fp, variables=None, default='DEFAULT',
+def read_ini(fp, variables=None, default='DEFAULT', defaults_only=False,
              comments=';#', separators=('=', ':'),
              strict=True):
     """
@@ -296,6 +296,7 @@ def read_ini(fp, variables=None, default='DEFAULT',
     - fp : file pointer or path to read
     - variables : default set of variables
     - default : name of the section for the default section
+    - defaults_only : if True, return the default section only
     - comments : characters that if they start a line denote a comment
     - separators : strings that denote key, value separation in order
     - strict : whether to be strict about parsing
@@ -379,6 +380,17 @@ def read_ini(fp, variables=None, default='DEFAULT',
                 raise Exception("Error parsing manifest file '%s', line %s" %
                                 (filename, linenum))
 
+    # server-root is a special os path declared relative to the manifest file.
+    # inheritance demands we expand it as absolute
+    if 'server-root' in variables:
+        root = os.path.join(os.path.dirname(fp.name),
+                            variables['server-root'])
+        variables['server-root'] = os.path.abspath(root)
+
+    # return the default section only if requested
+    if defaults_only:
+        return [(default, variables)]
+
     # interpret the variables
     def interpret_variables(global_dict, local_dict):
         variables = global_dict.copy()
@@ -386,13 +398,6 @@ def read_ini(fp, variables=None, default='DEFAULT',
             local_dict['skip-if'] = "(%s) || (%s)" % (variables['skip-if'].split('#')[0], local_dict['skip-if'].split('#')[0])
         variables.update(local_dict)
 
-        # server-root is an os path declared relative to the manifest file.
-        # inheritance demands we expand it as absolute
-        if 'server-root' in variables:
-            root = os.path.join(os.path.dirname(fp.name),
-                                variables['server-root'])
-            variables['server-root'] = os.path.abspath(root)
-
         return variables
 
     sections = [(i, interpret_variables(variables, j)) for i, j in sections]
@@ -430,6 +435,7 @@ class ManifestParser(object):
         :param defaults_only: If True will only gather options, not include
                               tests. Used for upstream parent includes
                               (default False)
+        :param parentmanifest: Filename of the parent manifest (default None)
         """
         def read_file(type):
             include_file = section.split(type, 1)[-1]
@@ -467,24 +473,28 @@ class ManifestParser(object):
         sections = read_ini(fp=fp, variables=defaults, strict=self.strict)
         self.manifest_defaults[filename] = defaults
 
+        parent_section_found = False
+
         # get the tests
         for section, data in sections:
             subsuite = ''
             if 'subsuite' in data:
                 subsuite = data['subsuite']
 
+            # In case of defaults only, no other section than parent: has to
+            # be processed.
+            if defaults_only and not section.startswith('parent:'):
+                continue
+
             # read the parent manifest if specified
             if section.startswith('parent:'):
+                parent_section_found = True
+
                 include_file = read_file('parent:')
                 if include_file:
                     self._read(root, include_file, {}, True)
                 continue
 
-            # If this is a parent include we only load the defaults into ancestor
-            if defaults_only:
-                self._ancestor_defaults = dict(data.items() + self._ancestor_defaults.items())
-                break
-
             # a file to include
             # TODO: keep track of included file structure:
             # self.manifests = {'manifest.ini': 'relative/path.ini'}
@@ -544,6 +554,13 @@ class ManifestParser(object):
             # append the item
             self.tests.append(test)
 
+        # if no parent: section was found for defaults-only, only read the
+        # defaults section of the manifest without interpreting variables
+        if defaults_only and not parent_section_found:
+            sections = read_ini(fp=fp, variables=defaults, defaults_only=True,
+                                strict=self.strict)
+            (section, self._ancestor_defaults) = sections[0]
+
     def read(self, *filenames, **defaults):
         """
         read and add manifests from file paths or file-like objects
diff --git a/testing/mozbase/manifestparser/tests/parent/include/first/manifest.ini b/testing/mozbase/manifestparser/tests/parent/include/first/manifest.ini
new file mode 100644
index 000000000000..828525c18f1e
--- /dev/null
+++ b/testing/mozbase/manifestparser/tests/parent/include/first/manifest.ini
@@ -0,0 +1,3 @@
+[parent:../manifest.ini]
+
+[testFirst.js]
diff --git a/testing/mozbase/manifestparser/tests/parent/include/manifest.ini b/testing/mozbase/manifestparser/tests/parent/include/manifest.ini
new file mode 100644
index 000000000000..fb9756d6af4f
--- /dev/null
+++ b/testing/mozbase/manifestparser/tests/parent/include/manifest.ini
@@ -0,0 +1,8 @@
+[DEFAULT]
+top = data
+
+[include:first/manifest.ini]
+disabled = YES
+
+[include:second/manifest.ini]
+disabled = NO
diff --git a/testing/mozbase/manifestparser/tests/parent/include/second/manifest.ini b/testing/mozbase/manifestparser/tests/parent/include/second/manifest.ini
new file mode 100644
index 000000000000..31f05375661c
--- /dev/null
+++ b/testing/mozbase/manifestparser/tests/parent/include/second/manifest.ini
@@ -0,0 +1,3 @@
+[parent:../manifest.ini]
+
+[testSecond.js]
diff --git a/testing/mozbase/manifestparser/tests/test_manifestparser.py b/testing/mozbase/manifestparser/tests/test_manifestparser.py
index eebc6c5d27a0..6ee2234c6bf2 100755
--- a/testing/mozbase/manifestparser/tests/test_manifestparser.py
+++ b/testing/mozbase/manifestparser/tests/test_manifestparser.py
@@ -167,6 +167,20 @@ class TestManifestParser(unittest.TestCase):
         self.assertEqual(buffer.getvalue().strip(),
                          '[DEFAULT]\nx = level_3\n\n[test_3]\nsubsuite =')
 
+    def test_parent_defaults_include(self):
+        parent_example = os.path.join(here, 'parent', 'include', 'manifest.ini')
+        parser = ManifestParser(manifests=(parent_example,))
+
+        # global defaults should inherit all includes
+        self.assertEqual(parser.get('name', top='data'),
+                         ['testFirst.js', 'testSecond.js'])
+
+        # include specific defaults should only inherit the actual include
+        self.assertEqual(parser.get('name', disabled='YES'),
+                         ['testFirst.js'])
+        self.assertEqual(parser.get('name', disabled='NO'),
+                         ['testSecond.js'])
+
     def test_server_root(self):
         """
         Test server_root properly expands as an absolute path

From a46504a0fc32ab2d670b2868891afab445202b86 Mon Sep 17 00:00:00 2001
From: Henrik Skupin <mail@hskupin.info>
Date: Thu, 18 Dec 2014 21:00:35 +0100
Subject: [PATCH 028/183] Bug 1113284 - Bump manifestparser to 0.9. r=ahal

--HG--
extra : rebase_source : aaf0d817aab50e25a2f45c2f3c5e386c366ea056
---
 testing/mozbase/manifestparser/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mozbase/manifestparser/setup.py b/testing/mozbase/manifestparser/setup.py
index 0e555892597d..e380ff31f664 100644
--- a/testing/mozbase/manifestparser/setup.py
+++ b/testing/mozbase/manifestparser/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup
 
 PACKAGE_NAME = "manifestparser"
-PACKAGE_VERSION = '0.8'
+PACKAGE_VERSION = '0.9'
 
 setup(name=PACKAGE_NAME,
       version=PACKAGE_VERSION,

From 8030658f624c20039abb3dc932edfb4fca8f2d87 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 17 Dec 2014 19:10:59 -0800
Subject: [PATCH 029/183] Bug 1112968 - dmd.py: Tweak the --alloc-fns list for
 better effect on Mac. r=mccr8.

--HG--
extra : rebase_source : 03dbab1eeb4e3f99672a174277ba634a39a98292
---
 memory/replace/dmd/dmd.py | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/memory/replace/dmd/dmd.py b/memory/replace/dmd/dmd.py
index e6d839b6cb41..4a48a7c319ec 100755
--- a/memory/replace/dmd/dmd.py
+++ b/memory/replace/dmd/dmd.py
@@ -27,30 +27,17 @@ outputVersion = 3
 # we hit a non-matching frame, any subsequent frames won't be removed even if
 # they do match.)
 allocatorFns = [
-    'replace_malloc',
-    'replace_calloc',
-    'replace_realloc',
-    'replace_memalign',
-    'replace_posix_memalign',
-    'moz_xmalloc',
-    'moz_xcalloc',
-    'moz_xrealloc',
+    # Matches malloc, replace_malloc, moz_xmalloc, vpx_malloc, js_malloc, pod_malloc, malloc_zone_*, g_malloc.
+    'malloc',
+    # Matches calloc, replace_calloc, moz_xcalloc, vpx_calloc, js_calloc, pod_calloc, malloc_zone_calloc, pod_callocCanGC.
+    'calloc',
+    # Matches realloc, replace_realloc, moz_xrealloc, vpx_realloc, js_realloc, pod_realloc, pod_reallocCanGC.
+    'realloc',
+    # Matches memalign, posix_memalign, replace_memalign, replace_posix_memalign, moz_xmemalign, moz_xposix_memalign, vpx_memalign, malloc_zone_memalign.
+    'memalign',
     'operator new(',
     'operator new[](',
-    'g_malloc',
     'g_slice_alloc',
-    'callocCanGC',
-    'reallocCanGC',
-    'vpx_malloc',
-    'vpx_calloc',
-    'vpx_realloc',
-    'vpx_memalign',
-    'js_malloc',
-    'js_calloc',
-    'js_realloc',
-    'pod_malloc',
-    'pod_calloc',
-    'pod_realloc',
     # This one necessary to fully filter some sequences of allocation functions
     # that happen in practice. Note that ??? entries that follow non-allocation
     # functions won't be stripped, as explained above.

From 8f4c80bca3357cd3bb18d4fbcb8c030351f4ee8f Mon Sep 17 00:00:00 2001
From: Chris Cooper <ccooper@deadsquid.com>
Date: Thu, 18 Dec 2014 18:08:50 -0500
Subject: [PATCH 030/183] Bug 882712 - switch from using runtime-binaries host
 to tooltool - r=dustin

---
 js/src/devtools/automation/winbuildenv.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/devtools/automation/winbuildenv.sh b/js/src/devtools/automation/winbuildenv.sh
index 14435925e940..d3e7daebaa97 100644
--- a/js/src/devtools/automation/winbuildenv.sh
+++ b/js/src/devtools/automation/winbuildenv.sh
@@ -34,7 +34,7 @@ export PATH="$(perl -le 'print join ":", grep { -d $_ } split ":", $ENV{PATH}')"
 if ! which mozmake 2>/dev/null; then
     export PATH="$PATH:$SOURCE/.."
     if ! which mozmake 2>/dev/null; then
-	TT_SERVER=${TT_SERVER:-http://runtime-binaries.pvt.build.mozilla.org/tooltool}
+	TT_SERVER=${TT_SERVER:-http://tooltool.pvt.build.mozilla.org/build}
 	( cd $SOURCE/..; ./scripts/scripts/tooltool/tooltool_wrapper.sh $SOURCE/browser/config/tooltool-manifests/${platform:-win32}/releng.manifest $TT_SERVER setup.sh c:/mozilla-build/python27/python.exe C:/mozilla-build/tooltool.py )
     fi
 fi

From 5e64a424188a4c3a6d665e2e48deefb200374a42 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 18 Dec 2014 18:11:13 -0500
Subject: [PATCH 031/183] Backed out changeset 88a15054f99f (bug 794984) for
 suspicion of "causing" Mulet mochitest crashes (and possible Linux32
 mochitest-e10s-dt as well).

---
 .../mozprocess/mozprocess/processhandler.py   | 304 +++++++++---------
 testing/mozbase/mozprocess/tests/manifest.ini |   1 -
 .../mozprocess/tests/test_process_reader.py   |  95 ------
 3 files changed, 155 insertions(+), 245 deletions(-)
 delete mode 100644 testing/mozbase/mozprocess/tests/test_process_reader.py

diff --git a/testing/mozbase/mozprocess/mozprocess/processhandler.py b/testing/mozbase/mozprocess/mozprocess/processhandler.py
index 2aa64c4246de..65f6e5177437 100644
--- a/testing/mozbase/mozprocess/mozprocess/processhandler.py
+++ b/testing/mozbase/mozprocess/mozprocess/processhandler.py
@@ -11,7 +11,7 @@ import sys
 import threading
 import time
 import traceback
-from Queue import Queue, Empty
+from Queue import Queue
 from datetime import datetime
 __all__ = ['ProcessHandlerMixin', 'ProcessHandler']
 
@@ -40,13 +40,7 @@ class ProcessHandlerMixin(object):
     :param env: is the environment to use for the process (defaults to os.environ).
     :param ignore_children: causes system to ignore child processes when True, defaults to False (which tracks child processes).
     :param kill_on_timeout: when True, the process will be killed when a timeout is reached. When False, the caller is responsible for killing the process. Failure to do so could cause a call to wait() to hang indefinitely. (Defaults to True.)
-    :param processOutputLine: function or list of functions to be called for
-        each line of output produced by the process (defaults to an empty
-        list).
-    :param processStderrLine: function or list of functions to be called
-        for each line of error output - stderr - produced by the process
-        (defaults to an empty list). If this is not specified, stderr lines
-        will be sent to the *processOutputLine* callbacks.
+    :param processOutputLine: function or list of functions to be called for each line of output produced by the process (defaults to None).
     :param onTimeout: function or list of functions to be called when the process times out.
     :param onFinish: function or list of functions to be called when the process terminates normally without timing out.
     :param kwargs: additional keyword args to pass directly into Popen.
@@ -600,7 +594,6 @@ falling back to not using job objects for managing child processes"""
                  ignore_children = False,
                  kill_on_timeout = True,
                  processOutputLine=(),
-                 processStderrLine=(),
                  onTimeout=(),
                  onFinish=(),
                  **kwargs):
@@ -609,7 +602,9 @@ falling back to not using job objects for managing child processes"""
         self.cwd = cwd
         self.didTimeout = False
         self._ignore_children = ignore_children
+        self._kill_on_timeout = kill_on_timeout
         self.keywordargs = kwargs
+        self.outThread = None
         self.read_buffer = ''
 
         if env is None:
@@ -617,29 +612,15 @@ falling back to not using job objects for managing child processes"""
         self.env = env
 
         # handlers
-        def to_callable_list(arg):
-            if callable(arg):
-                arg = [arg]
-            return CallableList(arg)
-
-        processOutputLine = to_callable_list(processOutputLine)
-        processStderrLine = to_callable_list(processStderrLine)
-        onTimeout = to_callable_list(onTimeout)
-        onFinish = to_callable_list(onFinish)
-
-        def on_timeout():
-            self.didTimeout = True
-            if kill_on_timeout:
-                self.kill()
-        onTimeout.insert(0, on_timeout)
-
-        self._stderr = subprocess.STDOUT
-        if processStderrLine:
-            self._stderr = subprocess.PIPE
-        self.reader = ProcessReader(stdout_callback=processOutputLine,
-                                    stderr_callback=processStderrLine,
-                                    finished_callback=onFinish,
-                                    timeout_callback=onTimeout)
+        if callable(processOutputLine):
+            processOutputLine = [processOutputLine]
+        self.processOutputLineHandlers = list(processOutputLine)
+        if callable(onTimeout):
+            onTimeout = [onTimeout]
+        self.onTimeoutHandlers = list(onTimeout)
+        if callable(onFinish):
+            onFinish = [onFinish]
+        self.onFinishHandlers = list(onFinish)
 
         # It is common for people to pass in the entire array with the cmd and
         # the args together since this is how Popen uses it.  Allow for that.
@@ -673,10 +654,11 @@ falling back to not using job objects for managing child processes"""
         being killed.
         """
         self.didTimeout = False
+        self.startTime = datetime.now()
 
         # default arguments
         args = dict(stdout=subprocess.PIPE,
-                    stderr=self._stderr,
+                    stderr=subprocess.STDOUT,
                     cwd=self.cwd,
                     env=self.env,
                     ignore_children=self._ignore_children)
@@ -708,7 +690,7 @@ falling back to not using job objects for managing child processes"""
             self.proc.kill(sig=sig)
 
             # When we kill the the managed process we also have to wait for the
-            # reader thread to be finished. Otherwise consumers would have to assume
+            # outThread to be finished. Otherwise consumers would have to assume
             # that it still has not completely shutdown.
             return self.wait()
         except AttributeError:
@@ -718,6 +700,36 @@ falling back to not using job objects for managing child processes"""
             else:
                 raise
 
+    def readWithTimeout(self, f, timeout):
+        """
+        Try to read a line of output from the file object *f*.
+
+        *f* must be a  pipe, like the *stdout* member of a subprocess.Popen
+        object created with stdout=PIPE. If no output
+        is received within *timeout* seconds, return a blank line.
+
+        Returns a tuple (line, did_timeout), where *did_timeout* is True
+        if the read timed out, and False otherwise.
+        """
+        # Calls a private member because this is a different function based on
+        # the OS
+        return self._readWithTimeout(f, timeout)
+
+    def processOutputLine(self, line):
+        """Called for each line of output that a process sends to stdout/stderr."""
+        for handler in self.processOutputLineHandlers:
+            handler(line)
+
+    def onTimeout(self):
+        """Called when a process times out."""
+        for handler in self.onTimeoutHandlers:
+            handler()
+
+    def onFinish(self):
+        """Called when a process finishes without a timeout."""
+        for handler in self.onFinishHandlers:
+            handler()
+
     def poll(self):
         """Check if child process has terminated
 
@@ -727,10 +739,10 @@ falling back to not using job objects for managing child processes"""
         - '0' if the process ended without failures
 
         """
-        # Ensure that we first check for the reader status. Otherwise
+        # Ensure that we first check for the outputThread status. Otherwise
         # we might mark the process as finished while output is still getting
         # processed.
-        if self.reader.is_alive():
+        if self.outThread and self.outThread.isAlive():
             return None
         elif hasattr(self.proc, "returncode"):
             return self.proc.returncode
@@ -748,15 +760,43 @@ falling back to not using job objects for managing child processes"""
         for that number of seconds without producing any output before
         being killed.
         """
-        # this method is kept for backward compatibility
+        def _processOutput():
+            self.didTimeout = False
+            logsource = self.proc.stdout
+
+            lineReadTimeout = None
+            if timeout:
+                lineReadTimeout = timeout - (datetime.now() - self.startTime).seconds
+            elif outputTimeout:
+                lineReadTimeout = outputTimeout
+
+            (lines, self.didTimeout) = self.readWithTimeout(logsource, lineReadTimeout)
+            while lines != "":
+                for line in lines.splitlines():
+                    self.processOutputLine(line.rstrip())
+
+                if self.didTimeout:
+                    break
+
+                if timeout:
+                    lineReadTimeout = timeout - (datetime.now() - self.startTime).seconds
+                (lines, self.didTimeout) = self.readWithTimeout(logsource, lineReadTimeout)
+
+            if self.didTimeout:
+                if self._kill_on_timeout:
+                    self.proc.kill()
+                self.onTimeout()
+            else:
+                self.onFinish()
+
         if not hasattr(self, 'proc'):
-            self.run(timeout=timeout, outputTimeout=outputTimeout)
-            # self.run will call this again
-            return
-        if not self.reader.is_alive():
-            self.reader.timeout = timeout
-            self.reader.output_timeout = outputTimeout
-            self.reader.start(self.proc)
+            self.run()
+
+        if not self.outThread:
+            self.outThread = threading.Thread(target=_processOutput)
+            self.outThread.daemon = True
+            self.outThread.start()
+
 
     def wait(self, timeout=None):
         """
@@ -773,12 +813,12 @@ falling back to not using job objects for managing child processes"""
         - '0' if the process ended without failures
 
         """
-        if self.reader.thread and self.reader.thread is not threading.current_thread():
-            # Thread.join() blocks the main thread until the reader thread is finished
+        if self.outThread and self.outThread is not threading.current_thread():
+            # Thread.join() blocks the main thread until outThread is finished
             # wake up once a second in case a keyboard interrupt is sent
             count = 0
-            while self.reader.is_alive():
-                self.reader.thread.join(timeout=1)
+            while self.outThread.isAlive():
+                self.outThread.join(timeout=1)
                 count += 1
                 if timeout and count > timeout:
                     return None
@@ -792,111 +832,77 @@ falling back to not using job objects for managing child processes"""
                              "use ProcessHandler.wait() instead"
         return self.wait(timeout=timeout)
 
+
+    ### Private methods from here on down. Thar be dragons.
+
+    if isWin:
+        # Windows Specific private functions are defined in this block
+        PeekNamedPipe = ctypes.windll.kernel32.PeekNamedPipe
+        GetLastError = ctypes.windll.kernel32.GetLastError
+
+        @staticmethod
+        def _normalize_newline(line):
+            # adb on windows returns \r\r\n at the end of each line, to get around
+            # this normalize all newlines to have a unix-style '\n'
+            # http://src.chromium.org/viewvc/chrome/trunk/src/build/android/pylib/android_commands.py#l1944
+            return re.sub(r'\r+\n?$', '\n', line)
+
+        def _readWithTimeout(self, f, timeout):
+            if timeout is None:
+                # shortcut to allow callers to pass in "None" for no timeout.
+                return (self._normalize_newline(f.readline()), False)
+            x = msvcrt.get_osfhandle(f.fileno())
+            l = ctypes.c_long()
+            done = time.time() + timeout
+            while time.time() < done:
+                if self.PeekNamedPipe(x, None, 0, None, ctypes.byref(l), None) == 0:
+                    err = self.GetLastError()
+                    if err == 38 or err == 109: # ERROR_HANDLE_EOF || ERROR_BROKEN_PIPE
+                        return ('', False)
+                    else:
+                        raise OSError("readWithTimeout got error: %d", err)
+                if l.value > 0:
+                    # we're assuming that the output is line-buffered,
+                    # which is not unreasonable
+                    return (self._normalize_newline(f.readline()), False)
+                time.sleep(0.01)
+            return ('', True)
+
+    else:
+        # Generic
+        def _readWithTimeout(self, f, timeout):
+            while True:
+                try:
+                    (r, w, e) = select.select([f], [], [], timeout)
+                except:
+                    # return a blank line
+                    return ('', True)
+
+                if len(r) == 0:
+                    return ('', True)
+
+                output = os.read(f.fileno(), 4096)
+                if not output:
+                    output = self.read_buffer
+                    self.read_buffer = ''
+                    return (output, False)
+                self.read_buffer += output
+                if '\n' not in self.read_buffer:
+                    time.sleep(0.01)
+                    continue
+                tmp = self.read_buffer.split('\n')
+                lines, self.read_buffer = tmp[:-1], tmp[-1]
+                real_lines = [x for x in lines if x != '']
+                if not real_lines:
+                    time.sleep(0.01)
+                    continue
+                break
+            return ('\n'.join(lines), False)
+
     @property
     def pid(self):
         return self.proc.pid
 
-class CallableList(list):
-    def __call__(self, *args, **kwargs):
-        for e in self:
-            e(*args, **kwargs)
-
-    def __add__(self, lst):
-        return CallableList(list.__add__(self, lst))
-
-class ProcessReader(object):
-    def __init__(self, stdout_callback=None, stderr_callback=None,
-                 finished_callback=None, timeout_callback=None,
-                 timeout=None, output_timeout=None):
-        self.stdout_callback = stdout_callback or (lambda line: True)
-        self.stderr_callback = stderr_callback or (lambda line: True)
-        self.finished_callback = finished_callback or (lambda: True)
-        self.timeout_callback = timeout_callback or (lambda: True)
-        self.timeout = timeout
-        self.output_timeout = output_timeout
-        self.thread = None
-
-    def _create_stream_reader(self, name, stream, queue, callback):
-        thread = threading.Thread(name=name,
-                                  target=self._read_stream,
-                                  args=(stream, queue, callback))
-        thread.daemon = True
-        thread.start()
-        return thread
-
-    def _read_stream(self, stream, queue, callback):
-        for line in iter(stream.readline, b''):
-            queue.put((line, callback))
-        stream.close()
-
-    def start(self, proc):
-        queue = Queue()
-        stdout_reader = None
-        if proc.stdout:
-            stdout_reader = self._create_stream_reader('ProcessReaderStdout',
-                                                       proc.stdout,
-                                                       queue,
-                                                       self.stdout_callback)
-        stderr_reader = None
-        if proc.stderr and proc.stderr != proc.stdout:
-            stderr_reader = self._create_stream_reader('ProcessReaderStderr',
-                                                       proc.stderr,
-                                                       queue,
-                                                       self.stderr_callback)
-        self.thread = threading.Thread(name='ProcessReader',
-                                       target=self._read,
-                                       args=(stdout_reader,
-                                             stderr_reader,
-                                             queue))
-        self.thread.daemon = True
-        self.thread.start()
-
-    def _read(self, stdout_reader, stderr_reader, queue):
-        start_time = time.time()
-        timed_out = False
-        timeout = self.timeout
-        if timeout is not None:
-            timeout += start_time
-        output_timeout = self.output_timeout
-        if output_timeout is not None:
-            output_timeout += start_time
-
-        while (stdout_reader and stdout_reader.is_alive()) \
-              or (stderr_reader and stderr_reader.is_alive()):
-            has_line = True
-            try:
-                line, callback = queue.get(True, 0.02)
-            except Empty:
-                has_line = False
-            now = time.time()
-            if not has_line:
-                if output_timeout is not None and now > output_timeout:
-                    timed_out = True
-                    break
-            else:
-                if output_timeout is not None:
-                    output_timeout = now + self.output_timeout
-                callback(line.rstrip())
-            if timeout is not None and now > timeout:
-                timed_out = True
-                break
-        # process remaining lines to read
-        while not queue.empty():
-            line, callback = queue.get(False)
-            callback(line.rstrip())
-        if timed_out:
-            self.timeout_callback()
-        if stdout_reader:
-            stdout_reader.join()
-        if stderr_reader:
-            stderr_reader.join()
-        if not timed_out:
-            self.finished_callback()
-
-    def is_alive(self):
-        if self.thread:
-            return self.thread.is_alive()
-        return False
 
 ### default output handlers
 ### these should be callables that take the output line
diff --git a/testing/mozbase/mozprocess/tests/manifest.ini b/testing/mozbase/mozprocess/tests/manifest.ini
index d869952e3f36..a61bdfd2477a 100644
--- a/testing/mozbase/mozprocess/tests/manifest.ini
+++ b/testing/mozbase/mozprocess/tests/manifest.ini
@@ -15,4 +15,3 @@ disabled = bug 921632
 [test_mozprocess_wait.py]
 [test_mozprocess_output.py]
 [test_mozprocess_params.py]
-[test_process_reader.py]
diff --git a/testing/mozbase/mozprocess/tests/test_process_reader.py b/testing/mozbase/mozprocess/tests/test_process_reader.py
deleted file mode 100644
index 5fd17b4be72e..000000000000
--- a/testing/mozbase/mozprocess/tests/test_process_reader.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import unittest
-import subprocess
-import sys
-from mozprocess.processhandler import ProcessReader, StoreOutput
-
-def run_python(str_code, stdout=subprocess.PIPE, stderr=subprocess.PIPE):
-    cmd = [sys.executable, '-c', str_code]
-    return subprocess.Popen(cmd, stdout=stdout, stderr=stderr)
-
-class TestProcessReader(unittest.TestCase):
-    def setUp(self):
-        self.out = StoreOutput()
-        self.err = StoreOutput()
-        self.finished = False
-        def on_finished():
-            self.finished = True
-        self.timeout = False
-        def on_timeout():
-            self.timeout = True
-        self.reader = ProcessReader(stdout_callback=self.out,
-                                    stderr_callback=self.err,
-                                    finished_callback=on_finished,
-                                    timeout_callback=on_timeout)
-
-    def test_stdout_callback(self):
-        proc = run_python('print 1; print 2')
-        self.reader.start(proc)
-        self.reader.thread.join()
-
-        self.assertEqual(self.out.output, ['1', '2'])
-        self.assertEqual(self.err.output, [])
-
-    def test_stderr_callback(self):
-        proc = run_python('import sys; sys.stderr.write("hello world\\n")')
-        self.reader.start(proc)
-        self.reader.thread.join()
-
-        self.assertEqual(self.out.output, [])
-        self.assertEqual(self.err.output, ['hello world'])
-
-    def test_stdout_and_stderr_callbacks(self):
-        proc = run_python('import sys; sys.stderr.write("hello world\\n"); print 1; print 2')
-        self.reader.start(proc)
-        self.reader.thread.join()
-
-        self.assertEqual(self.out.output, ['1', '2'])
-        self.assertEqual(self.err.output, ['hello world'])
-
-    def test_finished_callback(self):
-        self.assertFalse(self.finished)
-        proc = run_python('')
-        self.reader.start(proc)
-        self.reader.thread.join()
-        self.assertTrue(self.finished)
-
-    def test_timeout(self):
-        self.reader.timeout = 0.05
-        self.assertFalse(self.timeout)
-        proc = run_python('import time; time.sleep(0.1)')
-        self.reader.start(proc)
-        self.reader.thread.join()
-        self.assertTrue(self.timeout)
-        self.assertFalse(self.finished)
-
-    def test_output_timeout(self):
-        self.reader.output_timeout = 0.05
-        self.assertFalse(self.timeout)
-        proc = run_python('import time; time.sleep(0.1)')
-        self.reader.start(proc)
-        self.reader.thread.join()
-        self.assertTrue(self.timeout)
-        self.assertFalse(self.finished)
-
-    def test_read_without_eol(self):
-        proc = run_python('import sys; sys.stdout.write("1")')
-        self.reader.start(proc)
-        self.reader.thread.join()
-        self.assertEqual(self.out.output, ['1'])
-
-    def test_read_with_strange_eol(self):
-        proc = run_python('import sys; sys.stdout.write("1\\r\\r\\r\\n")')
-        self.reader.start(proc)
-        self.reader.thread.join()
-        self.assertEqual(self.out.output, ['1'])
-
-    def test_mixed_stdout_stderr(self):
-        proc = run_python('import sys; sys.stderr.write("hello world\\n"); print 1; print 2', stderr=subprocess.STDOUT)
-        self.reader.start(proc)
-        self.reader.thread.join()
-
-        self.assertEqual(sorted(self.out.output), sorted(['1', '2', 'hello world']))
-        self.assertEqual(self.err.output, [])
-
-if __name__ == '__main__':
-    unittest.main()

From 82682ed57656af10857c01adf54a40b6e91f18bf Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Thu, 18 Dec 2014 15:23:39 -0800
Subject: [PATCH 032/183] Add a map from layers to TabParents. (bug 1111873
 part 1, r=smaug)

--HG--
extra : rebase_source : 68d9d718969ddffcfbbf44f03acbfe6c545b0965
---
 dom/ipc/TabParent.cpp | 35 +++++++++++++++++++++++++++++++++++
 dom/ipc/TabParent.h   | 12 ++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index e0dcb057a7a3..b19c97d3b5e8 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -216,6 +216,7 @@ namespace dom {
 TabParent* sEventCapturer;
 
 TabParent *TabParent::mIMETabParent = nullptr;
+TabParent::LayerToTabParentTable* TabParent::sLayerToTabParentTable = nullptr;
 
 NS_IMPL_ISUPPORTS(TabParent,
                   nsITabParent,
@@ -261,6 +262,37 @@ TabParent::~TabParent()
 {
 }
 
+TabParent*
+TabParent::GetTabParentFromLayersId(uint64_t aLayersId)
+{
+  if (!sLayerToTabParentTable) {
+    return nullptr;
+  }
+  return sLayerToTabParentTable->Get(aLayersId);
+}
+
+void
+TabParent::AddTabParentToTable(uint64_t aLayersId, TabParent* aTabParent)
+{
+  if (!sLayerToTabParentTable) {
+    sLayerToTabParentTable = new LayerToTabParentTable();
+  }
+  sLayerToTabParentTable->Put(aLayersId, aTabParent);
+}
+
+void
+TabParent::RemoveTabParentFromTable(uint64_t aLayersId)
+{
+  if (!sLayerToTabParentTable) {
+    return;
+  }
+  sLayerToTabParentTable->Remove(aLayersId);
+  if (sLayerToTabParentTable->Count() == 0) {
+    delete sLayerToTabParentTable;
+    sLayerToTabParentTable = nullptr;
+  }
+}
+
 void
 TabParent::SetOwnerElement(Element* aElement)
 {
@@ -306,6 +338,7 @@ TabParent::Destroy()
   unused << SendDestroy();
 
   if (RenderFrameParent* frame = GetRenderFrame()) {
+    RemoveTabParentFromTable(frame->GetLayersId());
     frame->Destroy();
   }
   mIsDestroyed = true;
@@ -600,6 +633,7 @@ TabParent::Show(const nsIntSize& size)
                                     &layersId,
                                     &success);
           MOZ_ASSERT(success);
+          AddTabParentToTable(layersId, this);
           unused << SendPRenderFrameConstructor(renderFrame);
         }
     }
@@ -2009,6 +2043,7 @@ TabParent::AllocPRenderFrameParent()
                             &layersId,
                             &success);
     MOZ_ASSERT(success);
+    AddTabParentToTable(layersId, this);
     return renderFrame;
   } else {
     return nullptr;
diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h
index 44c02175f3fd..bb0570f8a453 100644
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -461,6 +461,18 @@ private:
     nsCOMPtr<nsILoadContext> mLoadContext;
 
     TabId mTabId;
+
+private:
+    // This is used when APZ needs to find the TabParent associated with a layer
+    // to dispatch events.
+    typedef nsDataHashtable<nsUint64HashKey, TabParent*> LayerToTabParentTable;
+    static LayerToTabParentTable* sLayerToTabParentTable;
+
+    static void AddTabParentToTable(uint64_t aLayersId, TabParent* aTabParent);
+    static void RemoveTabParentFromTable(uint64_t aLayersId);
+
+public:
+    static TabParent* GetTabParentFromLayersId(uint64_t aLayersId);
 };
 
 } // namespace dom

From e2f100731e6f01f427c66a85890edf7c912bec8a Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Thu, 18 Dec 2014 15:25:03 -0800
Subject: [PATCH 033/183] Handle in-process APZ events correctly on Windows.
 (bug 1111873 part 2, r=kats)

--HG--
extra : rebase_source : 8ca5156392705e3a1806fc6a15154dbaa380f438
---
 dom/ipc/TabParent.cpp                   |  5 +++++
 gfx/layers/apz/src/APZCTreeManager.cpp  |  7 +++++++
 gfx/layers/apz/src/APZCTreeManager.h    |  6 ++++++
 gfx/layers/apz/util/InputAPZContext.cpp | 16 ++++++++++++++++
 gfx/layers/apz/util/InputAPZContext.h   |  5 +++++
 widget/nsBaseWidget.cpp                 | 23 +++++++++++++++++++++++
 widget/nsBaseWidget.h                   |  8 ++++++++
 widget/windows/nsWindow.cpp             | 18 +++++++++---------
 8 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
index b19c97d3b5e8..f6f02f443f4e 100644
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -2150,6 +2150,11 @@ TabParent::MaybeForwardEventToRenderFrame(WidgetInputEvent& aEvent,
     if (aOutInputBlockId) {
       *aOutInputBlockId = InputAPZContext::GetInputBlockId();
     }
+
+    // Let the widget know that the event will be sent to the child process,
+    // which will (hopefully) send a confirmation notice back to APZ.
+    InputAPZContext::SetRoutedToChildProcess();
+
     return nsEventStatus_eIgnore;
   }
 
diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp
index 76dfc857a5df..e1e3c60472dc 100644
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -1013,6 +1013,13 @@ APZCTreeManager::SetTargetAPZC(uint64_t aInputBlockId,
   mInputQueue->SetConfirmedTargetApzc(aInputBlockId, target);
 }
 
+void
+APZCTreeManager::SetTargetAPZC(uint64_t aInputBlockId, const ScrollableLayerGuid& aTarget)
+{
+  nsRefPtr<AsyncPanZoomController> target = GetTargetAPZC(aTarget);
+  mInputQueue->SetConfirmedTargetApzc(aInputBlockId, target);
+}
+
 void
 APZCTreeManager::UpdateZoomConstraints(const ScrollableLayerGuid& aGuid,
                                        const ZoomConstraints& aConstraints)
diff --git a/gfx/layers/apz/src/APZCTreeManager.h b/gfx/layers/apz/src/APZCTreeManager.h
index a010fea61839..63b6e0dd44bd 100644
--- a/gfx/layers/apz/src/APZCTreeManager.h
+++ b/gfx/layers/apz/src/APZCTreeManager.h
@@ -228,6 +228,12 @@ public:
   void SetTargetAPZC(uint64_t aInputBlockId,
                      const nsTArray<ScrollableLayerGuid>& aTargets);
 
+  /**
+   * Helper function for SetTargetAPZC when used with single-target events,
+   * such as mouse wheel events.
+   */
+  void SetTargetAPZC(uint64_t aInputBlockId, const ScrollableLayerGuid& aTarget);
+
   /**
    * Updates any zoom constraints contained in the <meta name="viewport"> tag.
    */
diff --git a/gfx/layers/apz/util/InputAPZContext.cpp b/gfx/layers/apz/util/InputAPZContext.cpp
index 0aa48e7bd7df..68aa6a46f73d 100644
--- a/gfx/layers/apz/util/InputAPZContext.cpp
+++ b/gfx/layers/apz/util/InputAPZContext.cpp
@@ -10,6 +10,7 @@ namespace layers {
 
 ScrollableLayerGuid InputAPZContext::sGuid;
 uint64_t InputAPZContext::sBlockId = 0;
+bool InputAPZContext::sRoutedToChildProcess = false;
 
 /*static*/ ScrollableLayerGuid
 InputAPZContext::GetTargetLayerGuid()
@@ -23,19 +24,34 @@ InputAPZContext::GetInputBlockId()
   return sBlockId;
 }
 
+/*static*/ void
+InputAPZContext::SetRoutedToChildProcess()
+{
+  sRoutedToChildProcess = true;
+}
+
 InputAPZContext::InputAPZContext(const ScrollableLayerGuid& aGuid,
                                  const uint64_t& aBlockId)
   : mOldGuid(sGuid)
   , mOldBlockId(sBlockId)
+  , mOldRoutedToChildProcess(sRoutedToChildProcess)
 {
   sGuid = aGuid;
   sBlockId = aBlockId;
+  sRoutedToChildProcess = false;
 }
 
 InputAPZContext::~InputAPZContext()
 {
   sGuid = mOldGuid;
   sBlockId = mOldBlockId;
+  sRoutedToChildProcess = mOldRoutedToChildProcess;
+}
+
+bool
+InputAPZContext::WasRoutedToChildProcess()
+{
+  return sRoutedToChildProcess;
 }
 
 }
diff --git a/gfx/layers/apz/util/InputAPZContext.h b/gfx/layers/apz/util/InputAPZContext.h
index 4f210ac58db8..869066887a78 100644
--- a/gfx/layers/apz/util/InputAPZContext.h
+++ b/gfx/layers/apz/util/InputAPZContext.h
@@ -20,18 +20,23 @@ class MOZ_STACK_CLASS InputAPZContext
 private:
   static ScrollableLayerGuid sGuid;
   static uint64_t sBlockId;
+  static bool sRoutedToChildProcess;
 
 public:
   static ScrollableLayerGuid GetTargetLayerGuid();
   static uint64_t GetInputBlockId();
+  static void SetRoutedToChildProcess();
 
   InputAPZContext(const ScrollableLayerGuid& aGuid,
                     const uint64_t& aBlockId);
   ~InputAPZContext();
 
+  bool WasRoutedToChildProcess();
+
 private:
   ScrollableLayerGuid mOldGuid;
   uint64_t mOldBlockId;
+  bool mOldRoutedToChildProcess;
 };
 
 }
diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
index 0623e91f075e..ae5c60f7a3ff 100644
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -46,6 +46,8 @@
 #include "mozilla/VsyncDispatcher.h"
 #include "mozilla/layers/APZCTreeManager.h"
 #include "mozilla/layers/ChromeProcessController.h"
+#include "mozilla/layers/InputAPZContext.h"
+#include "mozilla/dom/TabParent.h"
 
 #ifdef ACCESSIBILITY
 #include "nsAccessibilityService.h"
@@ -940,6 +942,27 @@ void nsBaseWidget::ConfigureAPZCTreeManager()
   }
 }
 
+nsEventStatus
+nsBaseWidget::DispatchEventForAPZ(WidgetGUIEvent* aEvent,
+                                  const ScrollableLayerGuid& aGuid,
+                                  uint64_t aInputBlockId)
+{
+  InputAPZContext context(aGuid, aInputBlockId);
+
+  nsEventStatus status;
+  DispatchEvent(aEvent, status);
+
+  if (mAPZC && !context.WasRoutedToChildProcess()) {
+    // APZ did not find a dispatch-to-content region in the child process,
+    // and EventStateManager did not route the event into the child process.
+    // It's safe to communicate to APZ that the event has been processed.
+    mAPZC->SetTargetAPZC(aInputBlockId, aGuid);
+    mAPZC->ContentReceivedInputBlock(aInputBlockId, aEvent->mFlags.mDefaultPrevented);
+  }
+
+  return status;
+}
+
 void
 nsBaseWidget::GetPreferredCompositorBackends(nsTArray<LayersBackend>& aHints)
 {
diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h
index 15bf254732c9..1e3c6789f8d5 100644
--- a/widget/nsBaseWidget.h
+++ b/widget/nsBaseWidget.h
@@ -36,6 +36,7 @@ class CompositorChild;
 class CompositorParent;
 class APZCTreeManager;
 class GeckoContentController;
+struct ScrollableLayerGuid;
 }
 
 class VsyncDispatcher;
@@ -88,6 +89,7 @@ protected:
   typedef mozilla::layers::CompositorParent CompositorParent;
   typedef mozilla::layers::APZCTreeManager APZCTreeManager;
   typedef mozilla::layers::GeckoContentController GeckoContentController;
+  typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid;
   typedef mozilla::ScreenRotation ScreenRotation;
 
   virtual ~nsBaseWidget();
@@ -311,6 +313,12 @@ protected:
   virtual void ConfigureAPZCTreeManager();
   virtual already_AddRefed<GeckoContentController> CreateRootContentController();
 
+  // Dispatch an event that has been routed through APZ directly from the
+  // widget.
+  nsEventStatus DispatchEventForAPZ(mozilla::WidgetGUIEvent* aEvent,
+                                    const ScrollableLayerGuid& aGuid,
+                                    uint64_t aInputBlockId);
+
   const nsIntRegion RegionFromArray(const nsTArray<nsIntRect>& aRects);
   void ArrayFromRegion(const nsIntRegion& aRegion, nsTArray<nsIntRect>& aRects);
 
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index 1d56e9533f77..bafa64f5c600 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -3742,20 +3742,20 @@ bool nsWindow::DispatchKeyboardEvent(WidgetGUIEvent* event)
 
 bool nsWindow::DispatchScrollEvent(WidgetGUIEvent* aEvent)
 {
-  uint64_t inputBlockId = 0;
-  ScrollableLayerGuid guid;
+  nsEventStatus status;
 
   if (mAPZC && aEvent->mClass == eWheelEventClass) {
-    nsEventStatus status = mAPZC->ReceiveInputEvent(*aEvent->AsWheelEvent(), &guid, &inputBlockId);
-    if (status == nsEventStatus_eConsumeNoDefault) {
+    uint64_t inputBlockId = 0;
+    ScrollableLayerGuid guid;
+
+    nsEventStatus result = mAPZC->ReceiveInputEvent(*aEvent->AsWheelEvent(), &guid, &inputBlockId);
+    if (result == nsEventStatus_eConsumeNoDefault) {
       return true;
     }
+    status = DispatchEventForAPZ(aEvent, guid, inputBlockId);
+  } else {
+    DispatchEvent(aEvent, status);
   }
-
-  InputAPZContext context(guid, inputBlockId);
-
-  nsEventStatus status;
-  DispatchEvent(aEvent, status);
   return ConvertStatus(status);
 }
 

From 29d0ae087cd742262cb6538559106c546337aba1 Mon Sep 17 00:00:00 2001
From: Milan Sreckovic <milan@mozilla.com>
Date: Mon, 15 Dec 2014 12:10:06 -0500
Subject: [PATCH 034/183] Bug 1072871 - Make sure the targets don't disappear
 under us. r=benwa

---
 gfx/layers/client/TextureClient.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gfx/layers/client/TextureClient.cpp b/gfx/layers/client/TextureClient.cpp
index 793ef3514119..b0702cc12e49 100644
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -531,14 +531,12 @@ bool TextureClient::CopyToTextureClient(TextureClient* aTarget,
     return false;
   }
 
-  DrawTarget* destinationTarget = aTarget->BorrowDrawTarget();
-  DrawTarget* sourceTarget = BorrowDrawTarget();
+  RefPtr<DrawTarget> destinationTarget = aTarget->BorrowDrawTarget();
+  RefPtr<DrawTarget> sourceTarget = BorrowDrawTarget();
   RefPtr<gfx::SourceSurface> source = sourceTarget->Snapshot();
   destinationTarget->CopySurface(source,
                                  aRect ? *aRect : gfx::IntRect(gfx::IntPoint(0, 0), GetSize()),
                                  aPoint ? *aPoint : gfx::IntPoint(0, 0));
-  source = nullptr;
-
   return true;
 }
 

From 8445ba07494db0f7a06a6059fd532a7c4f33c695 Mon Sep 17 00:00:00 2001
From: Milan Sreckovic <milan@mozilla.com>
Date: Wed, 17 Dec 2014 17:54:04 -0500
Subject: [PATCH 035/183] Bug 1101685 - Optionally assert in loggers, default
 to true on gfxCriticalError.  Clean up the calls where large texture sizes
 were triggering the asserts in tests. r=nical

---
 gfx/2d/2D.h                       |  5 +++
 gfx/2d/DrawTargetCairo.cpp        |  2 +-
 gfx/2d/DrawTargetD2D.cpp          |  8 ++---
 gfx/2d/DrawTargetD2D1.cpp         | 16 +++++-----
 gfx/2d/Factory.cpp                | 39 +++++++++++++++--------
 gfx/2d/Logging.h                  | 53 +++++++++++++++++++++++++++++--
 gfx/layers/d3d11/TextureD3D11.cpp |  4 +--
 7 files changed, 96 insertions(+), 31 deletions(-)

diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h
index 6dedea9e6f2d..8c3b1e9ad54d 100644
--- a/gfx/2d/2D.h
+++ b/gfx/2d/2D.h
@@ -1075,6 +1075,11 @@ public:
    */
   static bool CheckSurfaceSize(const IntSize &sz, int32_t limit = 0);
 
+  /** Make sure the given dimension satisfies the CheckSurfaceSize and is
+   * within 8k limit.  The 8k value is chosen a bit randomly.
+   */
+  static bool ReasonableSurfaceSize(const IntSize &aSize);
+
   static TemporaryRef<DrawTarget> CreateDrawTargetForCairoSurface(cairo_surface_t* aSurface, const IntSize& aSize, SurfaceFormat* aFormat = nullptr);
 
   static TemporaryRef<DrawTarget>
diff --git a/gfx/2d/DrawTargetCairo.cpp b/gfx/2d/DrawTargetCairo.cpp
index e4d7ebc6195f..b9586c52092f 100644
--- a/gfx/2d/DrawTargetCairo.cpp
+++ b/gfx/2d/DrawTargetCairo.cpp
@@ -1484,7 +1484,7 @@ DrawTargetCairo::CreateSimilarDrawTarget(const IntSize &aSize, SurfaceFormat aFo
     }
   }
 
-  gfxCriticalError() << "Failed to create similar cairo surface! Size: " << aSize << " Status: " << cairo_surface_status(similar);
+  gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(aSize))) << "Failed to create similar cairo surface! Size: " << aSize << " Status: " << cairo_surface_status(similar);
 
   return nullptr;
 }
diff --git a/gfx/2d/DrawTargetD2D.cpp b/gfx/2d/DrawTargetD2D.cpp
index 0ff00370a524..f1c439f5aabb 100644
--- a/gfx/2d/DrawTargetD2D.cpp
+++ b/gfx/2d/DrawTargetD2D.cpp
@@ -76,7 +76,7 @@ public:
 
     HRESULT hr = mDT->mDevice->CreateTexture2D(&desc, nullptr, byRef(tmpTexture));
     if (FAILED(hr)) {
-      gfxCriticalError() << "[D2D] CreateTexture2D failure " << size << " Code: " << hexa(hr);
+      gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(size))) << "[D2D] 1 CreateTexture2D failure " << size << " Code: " << hexa(hr);
       return;
     }
     mDT->mDevice->CopyResource(tmpTexture, mDT->mTexture);
@@ -531,7 +531,7 @@ DrawTargetD2D::DrawSurfaceWithShadow(SourceSurface *aSurface,
     hr = mDevice->CreateTexture2D(&desc, nullptr, byRef(mipTexture));
 
     if (FAILED(hr)) {
-      gfxCriticalError() << "[D2D] CreateTexture2D failure " << aSurface->GetSize() << " Code: " << hexa(hr);
+      gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(aSurface->GetSize()))) << "[D2D] 2 CreateTexture2D failure " << aSurface->GetSize() << " Code: " << hexa(hr);
       return;
     }
 
@@ -558,7 +558,7 @@ DrawTargetD2D::DrawSurfaceWithShadow(SourceSurface *aSurface,
     hr = mDevice->CreateTexture2D(&desc, nullptr, byRef(tmpDSTexture));
 
     if (FAILED(hr)) {
-      gfxCriticalError() << "[D2D] CreateTexture2D failure " << dsSize << " Code: " << hexa(hr);
+      gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(dsSize))) << "[D2D] 3 CreateTexture2D failure " << dsSize << " Code: " << hexa(hr);
       return;
     }
 
@@ -1361,7 +1361,7 @@ DrawTargetD2D::Init(const IntSize &aSize, SurfaceFormat aFormat)
   hr = mDevice->CreateTexture2D(&desc, nullptr, byRef(mTexture));
 
   if (FAILED(hr)) {
-    gfxCriticalError() << "Failed to init Direct2D DrawTarget. Size: " << mSize << " Code: " << hexa(hr);
+    gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(aSize))) << "Failed to init Direct2D DrawTarget. Size: " << mSize << " Code: " << hexa(hr);
     return false;
   }
 
diff --git a/gfx/2d/DrawTargetD2D1.cpp b/gfx/2d/DrawTargetD2D1.cpp
index 4dc3d5bc36b4..d5e8437cc2a7 100644
--- a/gfx/2d/DrawTargetD2D1.cpp
+++ b/gfx/2d/DrawTargetD2D1.cpp
@@ -653,7 +653,7 @@ DrawTargetD2D1::CreateSourceSurfaceFromData(unsigned char *aData,
                                  byRef(bitmap));
 
   if (FAILED(hr) || !bitmap) {
-    gfxCriticalError() << "[D2D1.1] CreateBitmap failure " << aSize << " Code: " << hexa(hr);
+    gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(aSize))) << "[D2D1.1] 1CreateBitmap failure " << aSize << " Code: " << hexa(hr);
     return nullptr;
   }
 
@@ -742,7 +742,7 @@ DrawTargetD2D1::Init(ID3D11Texture2D* aTexture, SurfaceFormat aFormat)
   hr = Factory::GetD2D1Device()->CreateDeviceContext(D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS, byRef(mDC));
 
   if (FAILED(hr)) {
-    gfxCriticalError() <<"[D2D1.1] Failed to create a DeviceContext, code: " << hexa(hr);
+    gfxCriticalError() <<"[D2D1.1] 1Failed to create a DeviceContext, code: " << hexa(hr);
     return false;
   }
 
@@ -779,7 +779,7 @@ DrawTargetD2D1::Init(ID3D11Texture2D* aTexture, SurfaceFormat aFormat)
   hr = mDC->CreateBitmap(D2DIntSize(mSize), nullptr, 0, props, (ID2D1Bitmap1**)byRef(mTempBitmap));
 
   if (FAILED(hr)) {
-    gfxCriticalError() << "[D2D1.1] CreateBitmap failure " << mSize << " Code: " << hexa(hr);
+    gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(mSize))) << "[D2D1.1] 2CreateBitmap failure " << mSize << " Code: " << hexa(hr);
     return false;
   }
 
@@ -797,14 +797,14 @@ DrawTargetD2D1::Init(const IntSize &aSize, SurfaceFormat aFormat)
   hr = Factory::GetD2D1Device()->CreateDeviceContext(D2D1_DEVICE_CONTEXT_OPTIONS_ENABLE_MULTITHREADED_OPTIMIZATIONS, byRef(mDC));
 
   if (FAILED(hr)) {
-    gfxCriticalError() <<"[D2D1.1] Failed to create a DeviceContext, code: " << hexa(hr);
+    gfxCriticalError() <<"[D2D1.1] 2Failed to create a DeviceContext, code: " << hexa(hr);
     return false;
   }
 
   if (mDC->GetMaximumBitmapSize() < UINT32(aSize.width) ||
       mDC->GetMaximumBitmapSize() < UINT32(aSize.height)) {
-    // This is 'ok'
-    gfxCriticalError() << "[D2D1.1] Attempt to use unsupported surface size " << aSize;
+    // This is 'ok', so don't assert
+    gfxCriticalError(CriticalLog::DefaultOptions(false)) << "[D2D1.1] Attempt to use unsupported surface size " << aSize;
     return false;
   }
 
@@ -817,7 +817,7 @@ DrawTargetD2D1::Init(const IntSize &aSize, SurfaceFormat aFormat)
   hr = mDC->CreateBitmap(D2DIntSize(aSize), nullptr, 0, props, (ID2D1Bitmap1**)byRef(mBitmap));
 
   if (FAILED(hr)) {
-    gfxCriticalError() << "[D2D1.1] CreateBitmap failure " << aSize << " Code: " << hexa(hr);
+    gfxCriticalError() << "[D2D1.1] 3CreateBitmap failure " << aSize << " Code: " << hexa(hr);
     return false;
   }
 
@@ -1345,7 +1345,7 @@ DrawTargetD2D1::OptimizeSourceSurface(SourceSurface* aSurface) const
                                  byRef(bitmap));
 
   if (FAILED(hr)) {
-    gfxCriticalError() << "[D2D1.1] CreateBitmap failure " << data->GetSize() << " Code: " << hexa(hr);
+    gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(data->GetSize()))) << "[D2D1.1] 4CreateBitmap failure " << data->GetSize() << " Code: " << hexa(hr);
   }
 
   data->Unmap();
diff --git a/gfx/2d/Factory.cpp b/gfx/2d/Factory.cpp
index 0cdca099a20b..a2e39aae7354 100644
--- a/gfx/2d/Factory.cpp
+++ b/gfx/2d/Factory.cpp
@@ -216,11 +216,24 @@ Factory::HasSSE2()
 #endif
 }
 
+// If the size is "reasonable", we want gfxCriticalError to assert, so
+// this is the option set up for it.
+inline int LoggerOptionsBasedOnSize(const IntSize& aSize)
+{
+  return CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(aSize));
+}
+
+bool
+Factory::ReasonableSurfaceSize(const IntSize &aSize)
+{
+  return Factory::CheckSurfaceSize(aSize,8192);
+}
+
 bool
 Factory::CheckSurfaceSize(const IntSize &sz, int32_t limit)
 {
-  if (sz.width < 0 || sz.height < 0) {
-    gfxDebug() << "Surface width or height < 0!";
+  if (sz.width <= 0 || sz.height <= 0) {
+    gfxDebug() << "Surface width or height <= 0!";
     return false;
   }
 
@@ -265,7 +278,7 @@ TemporaryRef<DrawTarget>
 Factory::CreateDrawTarget(BackendType aBackend, const IntSize &aSize, SurfaceFormat aFormat)
 {
   if (!CheckSurfaceSize(aSize)) {
-    gfxCriticalError() << "Failed to allocate a surface due to invalid size " << aSize;
+    gfxCriticalError(LoggerOptionsBasedOnSize(aSize)) << "Failed to allocate a surface due to invalid size " << aSize;
     return nullptr;
   }
 
@@ -337,9 +350,9 @@ Factory::CreateDrawTarget(BackendType aBackend, const IntSize &aSize, SurfaceFor
 
   if (!retVal) {
     // Failed
-    gfxCriticalError() << "Failed to create DrawTarget, Type: " << int(aBackend) << " Size: " << aSize;
+    gfxCriticalError(LoggerOptionsBasedOnSize(aSize)) << "Failed to create DrawTarget, Type: " << int(aBackend) << " Size: " << aSize;
   }
-  
+
   return retVal.forget();
 }
 
@@ -350,15 +363,15 @@ Factory::CreateRecordingDrawTarget(DrawEventRecorder *aRecorder, DrawTarget *aDT
 }
 
 TemporaryRef<DrawTarget>
-Factory::CreateDrawTargetForData(BackendType aBackend, 
-                                 unsigned char *aData, 
-                                 const IntSize &aSize, 
-                                 int32_t aStride, 
+Factory::CreateDrawTargetForData(BackendType aBackend,
+                                 unsigned char *aData,
+                                 const IntSize &aSize,
+                                 int32_t aStride,
                                  SurfaceFormat aFormat)
 {
   MOZ_ASSERT(aData);
   if (!CheckSurfaceSize(aSize)) {
-    gfxCriticalError() << "Failed to allocate a surface due to invalid size " << aSize;
+    gfxCriticalError(LoggerOptionsBasedOnSize(aSize)) << "Failed to allocate a surface due to invalid size " << aSize;
     return nullptr;
   }
 
@@ -786,7 +799,7 @@ Factory::CreateDataSourceSurface(const IntSize &aSize,
                                  bool aZero)
 {
   if (!CheckSurfaceSize(aSize)) {
-    gfxCriticalError() << "Failed to allocate a surface due to invalid size " << aSize;
+    gfxCriticalError(LoggerOptionsBasedOnSize(aSize)) << "Failed to allocate a surface due to invalid size " << aSize;
     return nullptr;
   }
 
@@ -806,7 +819,7 @@ Factory::CreateDataSourceSurfaceWithStride(const IntSize &aSize,
                                            bool aZero)
 {
   if (aStride < aSize.width * BytesPerPixel(aFormat)) {
-    gfxCriticalError() << "CreateDataSourceSurfaceWithStride failed with bad stride";
+    gfxCriticalError(LoggerOptionsBasedOnSize(aSize)) << "CreateDataSourceSurfaceWithStride failed with bad stride " << aStride << ", " << aSize << ", " << aFormat;
     return nullptr;
   }
 
@@ -815,7 +828,7 @@ Factory::CreateDataSourceSurfaceWithStride(const IntSize &aSize,
     return newSurf.forget();
   }
 
-  gfxCriticalError() << "CreateDataSourceSurfaceWithStride failed to initialize";
+  gfxCriticalError(LoggerOptionsBasedOnSize(aSize)) << "CreateDataSourceSurfaceWithStride failed to initialize " << aSize << ", " << aFormat << ", " << aStride << ", " << aZero;
   return nullptr;
 }
 
diff --git a/gfx/2d/Logging.h b/gfx/2d/Logging.h
index 75bb02fc5fba..9c1ef644f24f 100644
--- a/gfx/2d/Logging.h
+++ b/gfx/2d/Logging.h
@@ -112,6 +112,34 @@ private:
   static PreferenceAccess* sAccess;
 };
 
+/// Graphics logging is available in both debug and release builds and is
+/// controlled with a gfx.logging.level preference. If not set, the default
+/// for the preference is 5 in the debug builds, 1 in the release builds.
+///
+/// gfxDebug only works in the debug builds, and is used for information
+/// level messages, helping with debugging.  In addition to only working
+/// in the debug builds, the value of the above preference of 3 or higher
+/// is required.
+///
+/// gfxWarning messages are available in both debug and release builds,
+/// on by default in the debug builds, and off by default in the release builds.
+/// Setting the preference gfx.logging.level to a value of 2 or higher will
+/// show the warnings.
+///
+/// gfxCriticalError is available in debug and release builds by default.
+/// It is only unavailable if gfx.logging.level is set to 0 (or less.)
+/// It outputs the message to stderr or equivalent, like gfxWarning.
+/// In the event of a crash, the crash report is annotated with first and
+/// the last few of these errors, under the key GraphicsCriticalError.
+/// The total number of errors stored in the crash report is controlled
+/// by preference gfx.logging.crash.length (default is six, so by default,
+/// the first as well as the last five would show up in the crash log.)
+///
+/// On platforms that support PR_LOGGING, the story is slightly more involved.
+/// In that case, unless gfx.logging.level is set to 4 or higher, the output
+/// is further controlled by "gfx2d" PR logging module.  However, in the case
+/// where such module would disable the output, in all but gfxDebug cases,
+/// we will still send a printf.
 struct BasicLogger
 {
   // For efficiency, this method exists and copies the logic of the
@@ -192,7 +220,8 @@ public:
 
 MOZ_BEGIN_ENUM_CLASS(LogOptions, int)
   NoNewline = 0x01,
-  AutoPrefix = 0x02
+  AutoPrefix = 0x02,
+  AssertOnCall = 0x04
 MOZ_END_ENUM_CLASS(LogOptions)
 
 template<typename T>
@@ -207,12 +236,27 @@ template<int L, typename Logger = BasicLogger>
 class Log
 {
 public:
-  explicit Log(int aOptions = (int)LogOptions::AutoPrefix)
+  // The default is to have the prefix, have the new line, and for critical
+  // logs assert on each call.
+  static int DefaultOptions(bool aWithAssert = true) {
+    return (int(LogOptions::AutoPrefix) |
+            (aWithAssert ? int(LogOptions::AssertOnCall) : 0));
+  }
+
+  // Note that we're calling BasicLogger::ShouldOutputMessage, rather than
+  // Logger::ShouldOutputMessage.  Since we currently don't have a different
+  // version of that method for different loggers, this is OK. Once we do,
+  // change BasicLogger::ShouldOutputMessage to Logger::ShouldOutputMessage.
+  explicit Log(int aOptions = Log::DefaultOptions(L == LOG_CRITICAL))
     : mOptions(aOptions)
     , mLogIt(BasicLogger::ShouldOutputMessage(L))
   {
     if (mLogIt && AutoPrefix()) {
-      mMessage << "[GFX" << L << "]: ";
+      if (mOptions & int(LogOptions::AssertOnCall)) {
+        mMessage << "[GFX" << L << "]: ";
+      } else {
+        mMessage << "[GFX" << L << "-]: ";
+      }
     }
   }
   ~Log() {
@@ -433,6 +477,9 @@ private:
   void WriteLog(const std::string &aString) {
     if (MOZ_UNLIKELY(LogIt())) {
       Logger::OutputMessage(aString, L, NoNewline());
+      if (mOptions & int(LogOptions::AssertOnCall)) {
+        MOZ_ASSERT(false, "An assert from the graphics logger");
+      }
     }
   }
 
diff --git a/gfx/layers/d3d11/TextureD3D11.cpp b/gfx/layers/d3d11/TextureD3D11.cpp
index caa7774536c3..db751944b4e9 100644
--- a/gfx/layers/d3d11/TextureD3D11.cpp
+++ b/gfx/layers/d3d11/TextureD3D11.cpp
@@ -306,7 +306,7 @@ TextureClientD3D11::Unlock()
     HRESULT hr = device->CreateTexture2D(&desc, nullptr, byRef(tex));
 
     if (FAILED(hr)) {
-      gfxCriticalError() << "[D3D11] CreateTexture2D failure " << mSize << " Code: " << gfx::hexa(hr);
+      gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(mSize))) << "[D3D11] CreateTexture2D failure " << mSize << " Code: " << gfx::hexa(hr);
       return;
     }
 
@@ -394,7 +394,7 @@ TextureClientD3D11::AllocateForSurface(gfx::IntSize aSize, TextureAllocationFlag
   }
 
   if (FAILED(hr)) {
-    gfxCriticalError() << "[D3D11] CreateTexture2D failure " << aSize << " Code: " << gfx::hexa(hr);
+    gfxCriticalError(CriticalLog::DefaultOptions(Factory::ReasonableSurfaceSize(aSize))) << "[D3D11] 2 CreateTexture2D failure " << aSize << " Code: " << gfx::hexa(hr);
     return false;
   }
 

From e876dbbe917315b02634bb2d2f3af8f211474428 Mon Sep 17 00:00:00 2001
From: R Kent James <kent@caspia.com>
Date: Fri, 12 Dec 2014 16:33:00 -0500
Subject: [PATCH 036/183] Bug 1111063 - Support XPCOMBinary with msvcrt=static.
 r=glandium

---
 build/gecko_templates.mozbuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/gecko_templates.mozbuild b/build/gecko_templates.mozbuild
index d8855520a349..9d07947ce412 100644
--- a/build/gecko_templates.mozbuild
+++ b/build/gecko_templates.mozbuild
@@ -154,12 +154,11 @@ def GeckoFramework(name, **kwargs):
 
 
 @template
-def XPCOMBinaryComponent(name):
+def XPCOMBinaryComponent(name, **kwargs):
     '''Template defining an XPCOM binary component for Gecko.
 
     `name` is the name of the component.
     '''
-    GeckoSharedLibrary(name)
+    GeckoSharedLibrary(name, **kwargs)
 
     IS_COMPONENT = True
-

From 0b6566fff11b83c82abb0600d0995b6396b3755c Mon Sep 17 00:00:00 2001
From: Andreas Pehrson <pehrsons@gmail.com>
Date: Mon, 15 Dec 2014 14:45:00 -0500
Subject: [PATCH 037/183] Bug 1111831 - Play the video element in
 test_multiple_mediastreamtracks.html to ensure metadata gets loaded. r=roc

---
 dom/media/test/test_multiple_mediastreamtracks.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom/media/test/test_multiple_mediastreamtracks.html b/dom/media/test/test_multiple_mediastreamtracks.html
index c79252bd9313..11d67ae00867 100644
--- a/dom/media/test/test_multiple_mediastreamtracks.html
+++ b/dom/media/test/test_multiple_mediastreamtracks.html
@@ -22,6 +22,7 @@ function startTest() {
 
     mStream = stream;
     element.mozSrcObject = mStream;
+    element.play();
   })
   .catch(function(reason) {
     ok(false, "unexpected error = " + reason.message);

From d717b20a54e6c7bf601373f2fedc1eb6421265c2 Mon Sep 17 00:00:00 2001
From: Kaustabh Datta Choudhury <kaustabh93@gmail.com>
Date: Thu, 18 Dec 2014 11:09:00 -0500
Subject: [PATCH 038/183] Bug 1112609 - Bisect Chunk does not run. r=jmaher

---
 testing/mochitest/runtests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index 7107b926ea7d..d7201c696468 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1712,7 +1712,7 @@ class Mochitest(MochitestUtilsMixin):
         testsToRun = bisect.pre_test(options, testsToRun, status)
         # To inform that we are in the process of bisection, and to look for bleedthrough
         if options.bisectChunk != "default" and not bisection_log:
-            log.info("TEST-UNEXPECTED-FAIL | Bisection | Please ignore repeats and look for 'Bleedthrough' (if any) at the end of the failure list")
+            self.log.info("TEST-UNEXPECTED-FAIL | Bisection | Please ignore repeats and look for 'Bleedthrough' (if any) at the end of the failure list")
             bisection_log = 1
 
       result = self.doTests(options, onLaunch, testsToRun)

From 36a71afb6f50dad4442cc45cbc04a43519a1d0bc Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 17 Dec 2014 16:33:28 -0500
Subject: [PATCH 039/183] Bug 1112765 - Add an overridable trace hook to
 BaseProxyHandler. r=efaust

---
 js/src/jsproxy.h                  | 1 +
 js/src/proxy/BaseProxyHandler.cpp | 5 +++++
 js/src/proxy/Proxy.cpp            | 9 +++++++++
 js/src/proxy/Proxy.h              | 2 ++
 4 files changed, 17 insertions(+)

diff --git a/js/src/jsproxy.h b/js/src/jsproxy.h
index 33e8c423a710..f7e54dd6ff69 100644
--- a/js/src/jsproxy.h
+++ b/js/src/jsproxy.h
@@ -320,6 +320,7 @@ class JS_FRIEND_API(BaseProxyHandler)
     virtual bool regexp_toShared(JSContext *cx, HandleObject proxy, RegExpGuard *g) const;
     virtual bool boxedValue_unbox(JSContext *cx, HandleObject proxy, MutableHandleValue vp) const;
     virtual bool defaultValue(JSContext *cx, HandleObject obj, JSType hint, MutableHandleValue vp) const;
+    virtual void trace(JSTracer *trc, JSObject *proxy) const;
     virtual void finalize(JSFreeOp *fop, JSObject *proxy) const;
     virtual void objectMoved(JSObject *proxy, const JSObject *old) const;
 
diff --git a/js/src/proxy/BaseProxyHandler.cpp b/js/src/proxy/BaseProxyHandler.cpp
index f58551b7002c..cdfaea894909 100644
--- a/js/src/proxy/BaseProxyHandler.cpp
+++ b/js/src/proxy/BaseProxyHandler.cpp
@@ -317,6 +317,11 @@ BaseProxyHandler::objectClassIs(HandleObject proxy, ESClassValue classValue, JSC
     return false;
 }
 
+void
+BaseProxyHandler::trace(JSTracer *trc, JSObject *proxy) const
+{
+}
+
 void
 BaseProxyHandler::finalize(JSFreeOp *fop, JSObject *proxy) const
 {
diff --git a/js/src/proxy/Proxy.cpp b/js/src/proxy/Proxy.cpp
index ae8a0c5d6488..d79f9c54a097 100644
--- a/js/src/proxy/Proxy.cpp
+++ b/js/src/proxy/Proxy.cpp
@@ -537,6 +537,13 @@ Proxy::getElements(JSContext *cx, HandleObject proxy, uint32_t begin, uint32_t e
     return handler->getElements(cx, proxy, begin, end, adder);
 }
 
+/* static */ void
+Proxy::trace(JSTracer *trc, JSObject *proxy)
+{
+    const BaseProxyHandler *handler = proxy->as<ProxyObject>().handler();
+    handler->trace(trc, proxy);
+}
+
 JSObject *
 js::proxy_innerObject(JSObject *obj)
 {
@@ -730,6 +737,8 @@ ProxyObject::trace(JSTracer *trc, JSObject *obj)
      */
     if (!proxy->is<CrossCompartmentWrapperObject>())
         MarkValue(trc, proxy->slotOfExtra(1), "extra1");
+
+    Proxy::trace(trc, obj);
 }
 
 JSObject *
diff --git a/js/src/proxy/Proxy.h b/js/src/proxy/Proxy.h
index e72f2a22716c..eb0bd5a55b06 100644
--- a/js/src/proxy/Proxy.h
+++ b/js/src/proxy/Proxy.h
@@ -71,6 +71,8 @@ class Proxy
     static bool getElements(JSContext *cx, HandleObject obj, uint32_t begin, uint32_t end,
                             ElementAdder *adder);
 
+    static void trace(JSTracer *trc, JSObject *obj);
+
     /* IC entry path for handling __noSuchMethod__ on access. */
     static bool callProp(JSContext *cx, HandleObject proxy, HandleObject reveiver, HandleId id,
                          MutableHandleValue vp);

From 41de67c5046cd440408842a9a3b7628c548e3187 Mon Sep 17 00:00:00 2001
From: "Byron Campen [:bwc]" <docfaraday@gmail.com>
Date: Thu, 4 Dec 2014 09:26:59 -0800
Subject: [PATCH 040/183] Bug 1107307: Teach JsepSessionImpl to handle
 rtcp-fb:* r=drno

---
 .../signaling/src/jsep/JsepCodecDescription.h |  2 +-
 .../src/sdp/SipccSdpAttributeList.cpp         |  6 +++-
 .../signaling/test/jsep_session_unittest.cpp  | 35 +++++++++++++++++++
 media/webrtc/signaling/test/sdp_unittests.cpp |  4 ++-
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/media/webrtc/signaling/src/jsep/JsepCodecDescription.h b/media/webrtc/signaling/src/jsep/JsepCodecDescription.h
index 5d1835454a85..72649a334d5b 100644
--- a/media/webrtc/signaling/src/jsep/JsepCodecDescription.h
+++ b/media/webrtc/signaling/src/jsep/JsepCodecDescription.h
@@ -131,7 +131,7 @@ struct JsepCodecDescription {
       if (attrs.HasAttribute(SdpAttribute::kRtcpFbAttribute)) {
         auto& rtcpfbs = attrs.GetRtcpFb().mFeedbacks;
         for (auto i = rtcpfbs.begin(); i != rtcpfbs.end(); ++i) {
-          if (i->pt == negotiated->mDefaultPt) {
+          if (i->pt == negotiated->mDefaultPt || i->pt == "*") {
             if (!negotiated->LoadRtcpFbs(*i)) {
               // Remote parameters were invalid
               return nullptr;
diff --git a/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp b/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
index 7fb309765f79..750320aa1819 100644
--- a/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
+++ b/media/webrtc/signaling/src/sdp/SipccSdpAttributeList.cpp
@@ -777,7 +777,11 @@ SipccSdpAttributeList::LoadRtcpFb(sdp_t* sdp, uint16_t level,
     }
 
     std::stringstream osPayloadType;
-    osPayloadType << rtcpfb->payload_num;
+    if (rtcpfb->payload_num == UINT16_MAX) {
+      osPayloadType << "*";
+    } else {
+      osPayloadType << rtcpfb->payload_num;
+    }
 
     std::string pt(osPayloadType.str());
     std::string extra(rtcpfb->extra);
diff --git a/media/webrtc/signaling/test/jsep_session_unittest.cpp b/media/webrtc/signaling/test/jsep_session_unittest.cpp
index e90925c8d930..94fb858c9cd6 100644
--- a/media/webrtc/signaling/test/jsep_session_unittest.cpp
+++ b/media/webrtc/signaling/test/jsep_session_unittest.cpp
@@ -1165,6 +1165,41 @@ TEST_F(JsepSessionTest, TestExtmap)
   ASSERT_EQ(3U, answerExtmap[1].entry);
 }
 
+TEST_F(JsepSessionTest, TestRtcpFbStar)
+{
+  AddTracks(&mSessionOff, "video");
+  AddTracks(&mSessionAns, "video");
+
+  std::string offer = CreateOffer();
+
+  SipccSdpParser parser;
+  UniquePtr<Sdp> parsedOffer = parser.Parse(offer);
+  auto* rtcpfbs = new SdpRtcpFbAttributeList;
+  rtcpfbs->PushEntry("*", SdpRtcpFbAttributeList::kNack);
+  parsedOffer->GetMediaSection(0).GetAttributeList().SetAttribute(rtcpfbs);
+  offer = parsedOffer->ToString();
+
+  SetLocalOffer(offer, CHECK_SUCCESS);
+  SetRemoteOffer(offer, CHECK_SUCCESS);
+  std::string answer = CreateAnswer();
+  SetLocalAnswer(answer, CHECK_SUCCESS);
+  SetRemoteAnswer(answer, CHECK_SUCCESS);
+
+  ASSERT_EQ(1U, mSessionAns.GetRemoteTrackCount());
+  RefPtr<JsepTrack> track;
+  ASSERT_EQ(NS_OK, mSessionAns.GetRemoteTrack(0, &track));
+  ASSERT_TRUE(track->GetNegotiatedDetails());
+  auto* details = track->GetNegotiatedDetails();
+  for (size_t i = 0; i < details->GetCodecCount(); ++i) {
+    const JsepCodecDescription* codec;
+    ASSERT_EQ(NS_OK, details->GetCodec(i, &codec));
+    const JsepVideoCodecDescription* videoCodec =
+      static_cast<const JsepVideoCodecDescription*>(codec);
+    ASSERT_EQ(1U, videoCodec->mNackFbTypes.size());
+    ASSERT_EQ("", videoCodec->mNackFbTypes[0]);
+  }
+}
+
 } // namespace mozilla
 
 int
diff --git a/media/webrtc/signaling/test/sdp_unittests.cpp b/media/webrtc/signaling/test/sdp_unittests.cpp
index 379930b8a6ff..790021ea6636 100644
--- a/media/webrtc/signaling/test/sdp_unittests.cpp
+++ b/media/webrtc/signaling/test/sdp_unittests.cpp
@@ -1782,6 +1782,7 @@ const std::string kBasicAudioVideoDataOffer =
 "a=rtcp-fb:97 nack" CRLF
 "a=rtcp-fb:97 nack pli" CRLF
 "a=rtcp-fb:97 ccm fir" CRLF
+"a=rtcp-fb:* ccm tmmbr" CRLF
 "a=setup:actpass" CRLF
 "a=rtcp-mux" CRLF
 "m=application 9 DTLS/SCTP 5000" CRLF
@@ -1868,7 +1869,7 @@ TEST_P(NewSdpTest, CheckRtcpFb) {
   auto& video_attrs = mSdp->GetMediaSection(1).GetAttributeList();
   ASSERT_TRUE(video_attrs.HasAttribute(SdpAttribute::kRtcpFbAttribute));
   auto& rtcpfbs = video_attrs.GetRtcpFb().mFeedbacks;
-  ASSERT_EQ(18U, rtcpfbs.size());
+  ASSERT_EQ(19U, rtcpfbs.size());
   CheckRtcpFb(rtcpfbs[0], "120", SdpRtcpFbAttributeList::kAck, "rpsi");
   CheckRtcpFb(rtcpfbs[1], "120", SdpRtcpFbAttributeList::kAck, "app", "foo");
   CheckRtcpFb(rtcpfbs[2], "120", SdpRtcpFbAttributeList::kNack, "");
@@ -1887,6 +1888,7 @@ TEST_P(NewSdpTest, CheckRtcpFb) {
   CheckRtcpFb(rtcpfbs[15], "97",  SdpRtcpFbAttributeList::kNack, "");
   CheckRtcpFb(rtcpfbs[16], "97",  SdpRtcpFbAttributeList::kNack, "pli");
   CheckRtcpFb(rtcpfbs[17], "97", SdpRtcpFbAttributeList::kCcm, "fir");
+  CheckRtcpFb(rtcpfbs[18], "*", SdpRtcpFbAttributeList::kCcm, "tmmbr");
 }
 
 TEST_P(NewSdpTest, CheckSctpmap) {

From 70a39485f7d7881cd7ce103080249e9a00d6f632 Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Date: Thu, 18 Dec 2014 13:14:54 -0800
Subject: [PATCH 041/183] Bug 1113323 - Make sure loadInfo exists before
 dereferencing the object (r=sicking)

---
 netwerk/base/src/nsIOService.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
index ff7cc17a26af..031c13838d81 100644
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -688,7 +688,7 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI,
 
       // If we're sandboxed, make sure to clear any owner the channel
       // might already have.
-      if (loadInfo->GetLoadingSandboxed()) {
+      if (loadInfo && loadInfo->GetLoadingSandboxed()) {
         (*result)->SetOwner(nullptr);
       }
     }

From 5b4f44abc678ced78f09ed82e4bc3c6289ec451d Mon Sep 17 00:00:00 2001
From: "Byron Campen [:bwc]" <docfaraday@gmail.com>
Date: Thu, 18 Dec 2014 16:05:12 -0800
Subject: [PATCH 042/183] Bug 1111299: Make sure we don't prioritize random
 codecs. r=jesup

---
 .../webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
index be329b446f8b..ea4ca47d9bdd 100644
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -902,7 +902,7 @@ PeerConnectionImpl::ConfigureJsepSessionCodecs() {
   }
 
   // Sort by priority
-  int32_t preferredCodec;
+  int32_t preferredCodec = 0;
   branch->GetIntPref("media.navigator.video.preferred_codec",
                      &preferredCodec);
 

From 0de35ab99f9b794b11363beb6d829496a25eae35 Mon Sep 17 00:00:00 2001
From: Prabhjyot Singh Sodhi <prabhjyotsingh95@gmail.com>
Date: Thu, 18 Dec 2014 19:33:18 -0500
Subject: [PATCH 043/183] Bug 1112830 - Changed mCumulativeResolution of
 FrameMetrics.h to private and all correspondings files using this variable
 using getters and setters;r=kats

---
 dom/ipc/TabChild.cpp                          | 11 +++++-----
 gfx/layers/FrameMetrics.h                     | 22 ++++++++++++++-----
 gfx/layers/LayersLogging.cpp                  |  2 +-
 gfx/layers/apz/src/APZCTreeManager.cpp        |  4 ++--
 gfx/layers/apz/src/AsyncPanZoomController.cpp |  8 +++----
 .../composite/AsyncCompositionManager.cpp     |  4 ++--
 .../gtest/TestAsyncPanZoomController.cpp      |  2 +-
 layout/base/nsDisplayList.cpp                 | 10 ++++-----
 layout/base/nsLayoutUtils.cpp                 |  2 +-
 9 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 0803ddc0e534..768da386a521 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -248,11 +248,10 @@ TabChildBase::InitializeRootMetrics()
   mLastRootMetrics.SetDevPixelsPerCSSPixel(WebWidget()->GetDefaultScale());
   // We use ParentLayerToLayerScale(1) below in order to turn the
   // async zoom amount into the gecko zoom amount.
-  mLastRootMetrics.mCumulativeResolution =
-    mLastRootMetrics.GetZoom() / mLastRootMetrics.GetDevPixelsPerCSSPixel() * ParentLayerToLayerScale(1);
+  mLastRootMetrics.SetCumulativeResolution(mLastRootMetrics.GetZoom() / mLastRootMetrics.GetDevPixelsPerCSSPixel() * ParentLayerToLayerScale(1));
   // This is the root layer, so the cumulative resolution is the same
   // as the resolution.
-  mLastRootMetrics.mPresShellResolution = mLastRootMetrics.mCumulativeResolution.scale;
+  mLastRootMetrics.mPresShellResolution = mLastRootMetrics.GetCumulativeResolution().scale;
   mLastRootMetrics.SetScrollOffset(CSSPoint(0, 0));
 
   TABC_LOG("After InitializeRootMetrics, mLastRootMetrics is %s\n",
@@ -430,12 +429,12 @@ TabChildBase::HandlePossibleViewportChange(const ScreenIntSize& aOldScreenSize)
     }
   }
 
-  metrics.mCumulativeResolution = metrics.GetZoom()
+  metrics.SetCumulativeResolution(metrics.GetZoom()
                                 / metrics.GetDevPixelsPerCSSPixel()
-                                * ParentLayerToLayerScale(1);
+                                * ParentLayerToLayerScale(1));
   // This is the root layer, so the cumulative resolution is the same
   // as the resolution.
-  metrics.mPresShellResolution = metrics.mCumulativeResolution.scale;
+  metrics.mPresShellResolution = metrics.GetCumulativeResolution().scale;
   utils->SetResolution(metrics.mPresShellResolution, metrics.mPresShellResolution);
 
   CSSSize scrollPort = metrics.CalculateCompositedSizeInCssPixels();
diff --git a/gfx/layers/FrameMetrics.h b/gfx/layers/FrameMetrics.h
index 5ee30c1ee5af..ac5c0d6c5c55 100644
--- a/gfx/layers/FrameMetrics.h
+++ b/gfx/layers/FrameMetrics.h
@@ -303,13 +303,17 @@ public:
   // it does not convert between any coordinate spaces for which we have names.
   float mPresShellResolution;
 
-  // The cumulative resolution that the current frame has been painted at.
-  // This is the product of the pres-shell resolutions of the document
-  // containing this scroll frame and its ancestors, and any css-driven
-  // resolution. This information is provided by Gecko at layout/paint time.
-  LayoutDeviceToLayerScale mCumulativeResolution;
-
 public:
+  void SetCumulativeResolution(const LayoutDeviceToLayerScale& aCumulativeResolution)
+  {
+    mCumulativeResolution = aCumulativeResolution;
+  }
+
+  LayoutDeviceToLayerScale GetCumulativeResolution() const
+  {
+    return mCumulativeResolution;
+  }
+
   void SetDevPixelsPerCSSPixel(const CSSToLayoutDeviceScale& aDevPixelsPerCSSPixel)
   {
     mDevPixelsPerCSSPixel = aDevPixelsPerCSSPixel;
@@ -528,6 +532,12 @@ public:
   }
 
 private:
+  // The cumulative resolution that the current frame has been painted at.
+  // This is the product of the pres-shell resolutions of the document
+  // containing this scroll frame and its ancestors, and any css-driven
+  // resolution. This information is provided by Gecko at layout/paint time.
+  LayoutDeviceToLayerScale mCumulativeResolution;
+
   // New fields from now on should be made private and old fields should
   // be refactored to be private.
 
diff --git a/gfx/layers/LayersLogging.cpp b/gfx/layers/LayersLogging.cpp
index 65c1bcc20669..b98b1ec8ed25 100644
--- a/gfx/layers/LayersLogging.cpp
+++ b/gfx/layers/LayersLogging.cpp
@@ -191,7 +191,7 @@ AppendToString(std::stringstream& aStream, const FrameMetrics& m,
     AppendToString(aStream, m.GetViewport(), "] [v=");
     aStream << nsPrintfCString("] [z=(ld=%.3f r=%.3f cr=%.3f z=%.3f er=%.3f)",
             m.GetDevPixelsPerCSSPixel().scale, m.mPresShellResolution,
-            m.mCumulativeResolution.scale, m.GetZoom().scale,
+            m.GetCumulativeResolution().scale, m.GetZoom().scale,
             m.GetExtraResolution().scale).get();
     aStream << nsPrintfCString("] [u=(%d %d %lu)",
             m.GetScrollOffsetUpdated(), m.GetDoSmoothScroll(),
diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp
index e1e3c60472dc..6d6392bb8753 100644
--- a/gfx/layers/apz/src/APZCTreeManager.cpp
+++ b/gfx/layers/apz/src/APZCTreeManager.cpp
@@ -214,7 +214,7 @@ ComputeTouchSensitiveRegion(GeckoContentController* aController,
     // this approximation may not be accurate in the presence of a css-driven
     // resolution.
     LayoutDeviceToParentLayerScale parentCumulativeResolution =
-          aMetrics.mCumulativeResolution
+          aMetrics.GetCumulativeResolution()
         / ParentLayerToLayerScale(aMetrics.mPresShellResolution);
     visible = visible.Intersect(touchSensitiveRegion
                                 * aMetrics.GetDevPixelsPerCSSPixel()
@@ -561,7 +561,7 @@ APZCTreeManager::UpdatePanZoomControllerTree(TreeBuildingState& aState,
         // resolution; this approximation may not be accurate in the presence of
         // a css-driven resolution.
         LayoutDeviceToParentLayerScale parentCumulativeResolution =
-            aLayer.Metrics().mCumulativeResolution
+            aLayer.Metrics().GetCumulativeResolution()
             / ParentLayerToLayerScale(aLayer.Metrics().mPresShellResolution);
         subtreeEventRegions.AndWith(ParentLayerIntRect::ToUntyped(
             RoundedIn(touchSensitiveRegion
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index f7f0fe4b55ac..42a0f3ad7f55 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -2656,7 +2656,7 @@ Matrix4x4 AsyncPanZoomController::GetTransformToLastDispatchedPaint() const {
   LayerPoint scrollChange =
     (mLastContentPaintMetrics.GetScrollOffset() - mLastDispatchedPaintMetrics.GetScrollOffset())
     * mLastContentPaintMetrics.GetDevPixelsPerCSSPixel()
-    * mLastContentPaintMetrics.mCumulativeResolution
+    * mLastContentPaintMetrics.GetCumulativeResolution()
       // This transform ("LD" in the terminology of the comment above
       // GetScreenToApzcTransform() in APZCTreeManager.h) is applied in a
       // coordinate space that includes the APZC's CSS transform ("LC").
@@ -2765,8 +2765,8 @@ void AsyncPanZoomController::NotifyLayersUpdated(const FrameMetrics& aLayerMetri
       // our zoom to reflect that. Note that we can't just take
       // aLayerMetrics.mZoom because the APZ may have additional async zoom
       // since the repaint request.
-      float totalResolutionChange = aLayerMetrics.mCumulativeResolution.scale
-                                  / mFrameMetrics.mCumulativeResolution.scale;
+      float totalResolutionChange = aLayerMetrics.GetCumulativeResolution().scale
+                                  / mFrameMetrics.GetCumulativeResolution().scale;
       float presShellResolutionChange = aLayerMetrics.mPresShellResolution
                                       / mFrameMetrics.mPresShellResolution;
       mFrameMetrics.ZoomBy(totalResolutionChange / presShellResolutionChange);
@@ -2783,7 +2783,7 @@ void AsyncPanZoomController::NotifyLayersUpdated(const FrameMetrics& aLayerMetri
     mFrameMetrics.mCompositionBounds = aLayerMetrics.mCompositionBounds;
     mFrameMetrics.SetRootCompositionSize(aLayerMetrics.GetRootCompositionSize());
     mFrameMetrics.mPresShellResolution = aLayerMetrics.mPresShellResolution;
-    mFrameMetrics.mCumulativeResolution = aLayerMetrics.mCumulativeResolution;
+    mFrameMetrics.SetCumulativeResolution(aLayerMetrics.GetCumulativeResolution());
     mFrameMetrics.SetHasScrollgrab(aLayerMetrics.GetHasScrollgrab());
 
     if (scrollOffsetUpdated) {
diff --git a/gfx/layers/composite/AsyncCompositionManager.cpp b/gfx/layers/composite/AsyncCompositionManager.cpp
index c5d0d9395d62..0a22a8eea501 100644
--- a/gfx/layers/composite/AsyncCompositionManager.cpp
+++ b/gfx/layers/composite/AsyncCompositionManager.cpp
@@ -636,7 +636,7 @@ AsyncCompositionManager::ApplyAsyncContentTransformToTree(Layer *aLayer)
     // doesn't have the necessary transform to display correctly. We use the
     // bottom-most scrollable metrics because that should have the most accurate
     // cumulative resolution for aLayer.
-    LayoutDeviceToLayerScale resolution = bottom.mCumulativeResolution;
+    LayoutDeviceToLayerScale resolution = bottom.GetCumulativeResolution();
     oldTransform.PreScale(resolution.scale, resolution.scale, 1);
 
     // For the purpose of aligning fixed and sticky layers, we disregard
@@ -871,7 +871,7 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer)
   // appears to be that metrics.mZoom is poorly initialized in some scenarios. In these scenarios,
   // however, we can assume there is no async zooming in progress and so the following statement
   // works fine.
-  CSSToParentLayerScale userZoom(metrics.GetDevPixelsPerCSSPixel() * metrics.mCumulativeResolution * LayerToParentLayerScale(1));
+  CSSToParentLayerScale userZoom(metrics.GetDevPixelsPerCSSPixel() * metrics.GetCumulativeResolution() * LayerToParentLayerScale(1));
   ParentLayerPoint userScroll = metrics.GetScrollOffset() * userZoom;
   SyncViewportInfo(displayPort, geckoZoom, mLayersUpdated,
                    userScroll, userZoom, fixedLayerMargins,
diff --git a/gfx/tests/gtest/TestAsyncPanZoomController.cpp b/gfx/tests/gtest/TestAsyncPanZoomController.cpp
index 57cab48de004..ebb193e8130a 100644
--- a/gfx/tests/gtest/TestAsyncPanZoomController.cpp
+++ b/gfx/tests/gtest/TestAsyncPanZoomController.cpp
@@ -819,7 +819,7 @@ TEST_F(APZCBasicTester, ComplexTransform) {
   metrics.mDisplayPort = CSSRect(-1, -1, 6, 6);
   metrics.SetScrollOffset(CSSPoint(10, 10));
   metrics.mScrollableRect = CSSRect(0, 0, 50, 50);
-  metrics.mCumulativeResolution = LayoutDeviceToLayerScale(2);
+  metrics.SetCumulativeResolution(LayoutDeviceToLayerScale(2));
   metrics.mPresShellResolution = 2.0f;
   metrics.SetZoom(CSSToParentLayerScale(6));
   metrics.SetDevPixelsPerCSSPixel(CSSToLayoutDeviceScale(3));
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index 0e811952a53e..6ccee26693ac 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -750,13 +750,13 @@ nsDisplayScrollLayer::ComputeFrameMetrics(nsIFrame* aForFrame,
   // all the pres shells from here up to the root, as well as any css-driven
   // resolution. We don't need to compute it as it's already stored in the
   // container parameters.
-  metrics.mCumulativeResolution = LayoutDeviceToLayerScale(aContainerParameters.mXScale,
-                                                           aContainerParameters.mYScale);
+  metrics.SetCumulativeResolution(LayoutDeviceToLayerScale(aContainerParameters.mXScale,
+                                                           aContainerParameters.mYScale));
 
   LayoutDeviceToScreenScale resolutionToScreen(
       presShell->GetCumulativeResolution().width
     * nsLayoutUtils::GetTransformToAncestorScale(aScrollFrame ? aScrollFrame : aForFrame).width);
-  metrics.SetExtraResolution(metrics.mCumulativeResolution / resolutionToScreen);
+  metrics.SetExtraResolution(metrics.GetCumulativeResolution() / resolutionToScreen);
 
   metrics.SetDevPixelsPerCSSPixel(CSSToLayoutDeviceScale(
     (float)nsPresContext::AppUnitsPerCSSPixel() / auPerDevPixel));
@@ -764,7 +764,7 @@ nsDisplayScrollLayer::ComputeFrameMetrics(nsIFrame* aForFrame,
   // Initially, AsyncPanZoomController should render the content to the screen
   // at the painted resolution.
   const LayerToParentLayerScale layerToParentLayerScale(1.0f);
-  metrics.SetZoom(metrics.mCumulativeResolution * metrics.GetDevPixelsPerCSSPixel()
+  metrics.SetZoom(metrics.GetCumulativeResolution() * metrics.GetDevPixelsPerCSSPixel()
                   * layerToParentLayerScale);
 
   if (presShell) {
@@ -787,7 +787,7 @@ nsDisplayScrollLayer::ComputeFrameMetrics(nsIFrame* aForFrame,
   nsRect compositionBounds(frameForCompositionBoundsCalculation->GetOffsetToCrossDoc(aReferenceFrame),
                            frameForCompositionBoundsCalculation->GetSize());
   ParentLayerRect frameBounds = LayoutDeviceRect::FromAppUnits(compositionBounds, auPerDevPixel)
-                              * metrics.mCumulativeResolution
+                              * metrics.GetCumulativeResolution()
                               * layerToParentLayerScale;
   metrics.mCompositionBounds = frameBounds;
 
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
index 1b5c24acad5b..8b4191545bcb 100644
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -2808,7 +2808,7 @@ CalculateFrameMetricsForDisplayPort(nsIScrollableFrame* aScrollFrame) {
   LayerToParentLayerScale layerToParentLayerScale(1.0f);
   metrics.SetDevPixelsPerCSSPixel(deviceScale);
   metrics.mPresShellResolution = resolution;
-  metrics.mCumulativeResolution = cumulativeResolution;
+  metrics.SetCumulativeResolution(cumulativeResolution);
   metrics.SetZoom(deviceScale * cumulativeResolution * layerToParentLayerScale);
 
   // Only the size of the composition bounds is relevant to the

From 229b02249f5740ffc66b73b84266b1bf54cd78d5 Mon Sep 17 00:00:00 2001
From: Christoph Kerschbaumer <mozilla@christophkerschbaumer.com>
Date: Thu, 18 Dec 2014 13:14:54 -0800
Subject: [PATCH 044/183] Bug 1113323 - Revert change to make sure loadInfo
 exists before dereferencing the object (r=sicking)

---
 netwerk/base/src/nsIOService.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
index 031c13838d81..ff7cc17a26af 100644
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -688,7 +688,7 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI,
 
       // If we're sandboxed, make sure to clear any owner the channel
       // might already have.
-      if (loadInfo && loadInfo->GetLoadingSandboxed()) {
+      if (loadInfo->GetLoadingSandboxed()) {
         (*result)->SetOwner(nullptr);
       }
     }

From aacd3e15537a2cf587a4b9cd90679562a953b6fc Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:23 -0800
Subject: [PATCH 045/183] Bug 1072980 - Don't allow CPOWs to be passed to C++
 functions (r=mrbkap)

---
 js/xpconnect/src/XPCWrappedNative.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
index e4ed25ce049d..b9ecb51a482f 100644
--- a/js/xpconnect/src/XPCWrappedNative.cpp
+++ b/js/xpconnect/src/XPCWrappedNative.cpp
@@ -10,6 +10,7 @@
 #include "nsWrapperCacheInlines.h"
 #include "XPCLog.h"
 #include "jsprf.h"
+#include "JavaScriptParent.h"
 #include "AccessCheck.h"
 #include "WrapperFactory.h"
 #include "XrayWrapper.h"
@@ -2173,6 +2174,21 @@ CallMethodHelper::ConvertIndependentParam(uint8_t i)
         return false;
     }
 
+    // Don't allow CPOWs to be passed to native code (in case they try to cast
+    // to a concrete type).
+    if (src.isObject() &&
+        jsipc::IsWrappedCPOW(&src.toObject()) &&
+        type_tag == nsXPTType::T_INTERFACE &&
+        !param_iid.Equals(NS_GET_IID(nsISupports)))
+    {
+        // Allow passing CPOWs to XPCWrappedJS.
+        nsCOMPtr<nsIXPConnectWrappedJS> wrappedJS(do_QueryInterface(mCallee));
+        if (!wrappedJS) {
+            ThrowBadParam(NS_ERROR_XPC_CANT_PASS_CPOW_TO_NATIVE, i, mCallContext);
+            return false;
+        }
+    }
+
     nsresult err;
     if (!XPCConvert::JSData2Native(&dp->val, src, type, &param_iid, &err)) {
         ThrowBadParam(err, i, mCallContext);

From 727e608675a0c16c0360daeea158c33fe563286b Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:23 -0800
Subject: [PATCH 046/183] Bug 1072980 - Don't pass CPOW as
 notificationCallbacks in nsIAboutProtocol shim (r=ally)

---
 toolkit/components/addoncompat/RemoteAddonsChild.jsm  | 3 ---
 toolkit/components/addoncompat/RemoteAddonsParent.jsm | 8 ++------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/toolkit/components/addoncompat/RemoteAddonsChild.jsm b/toolkit/components/addoncompat/RemoteAddonsChild.jsm
index d39e3821c690..4c1a93e5e9a9 100644
--- a/toolkit/components/addoncompat/RemoteAddonsChild.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsChild.jsm
@@ -202,9 +202,6 @@ AboutProtocolChannel.prototype = {
     let rval = cpmm.sendRpcMessage("Addons:AboutProtocol:OpenChannel", {
       uri: this.URI.spec,
       contractID: this._contractID
-    }, {
-      notificationCallbacks: this.notificationCallbacks,
-      loadGroupNotificationCallbacks: this.loadGroup ? this.loadGroup.notificationCallbacks : null,
     });
 
     if (rval.length != 1) {
diff --git a/toolkit/components/addoncompat/RemoteAddonsParent.jsm b/toolkit/components/addoncompat/RemoteAddonsParent.jsm
index d8cd9e96f04e..638e227e5762 100644
--- a/toolkit/components/addoncompat/RemoteAddonsParent.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsParent.jsm
@@ -240,12 +240,8 @@ let AboutProtocolParent = {
     let module = Cc[contractID].getService(Ci.nsIAboutModule);
     try {
       let channel = module.newChannel(uri, null);
-      channel.notificationCallbacks = msg.objects.notificationCallbacks;
-      if (msg.objects.loadGroupNotificationCallbacks) {
-        channel.loadGroup = {notificationCallbacks: msg.objects.loadGroupNotificationCallbacks};
-      } else {
-        channel.loadGroup = null;
-      }
+      channel.notificationCallbacks = null;
+      channel.loadGroup = null;
       let stream = channel.open();
       let data = NetUtil.readInputStreamToString(stream, stream.available(), {});
       return {

From f14fdf73f11dc0076d80f533796af94e600f0f1a Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:23 -0800
Subject: [PATCH 047/183] Bug 1072980 - Add test for passing CPOWs to C++
 (r=mrbkap)

---
 dom/base/test/chrome/cpows_parent.xul | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dom/base/test/chrome/cpows_parent.xul b/dom/base/test/chrome/cpows_parent.xul
index 38f76f88ade7..556ce2738e40 100644
--- a/dom/base/test/chrome/cpows_parent.xul
+++ b/dom/base/test/chrome/cpows_parent.xul
@@ -197,6 +197,24 @@
     let savedElement = null;
     function recvDomTest(message) {
       savedElement = message.objects.element;
+
+      // Test to ensure that we don't pass CPOWs to C++-implemented interfaces.
+      // See bug 1072980.
+      if (test_state == "remote") {
+        let walker = Components.classes["@mozilla.org/inspector/deep-tree-walker;1"]
+                               .createInstance(Components.interfaces.inIDeepTreeWalker);
+        const SHOW_ELEMENT = Components.interfaces.nsIDOMNodeFilter.SHOW_ELEMENT;
+        walker.showAnonymousContent = true;
+        walker.showSubDocuments = false;
+
+        try {
+          walker.init(savedElement, SHOW_ELEMENT);
+          ok(false, "expected exception passing CPOW to C++");
+        } catch (e) {
+          is(e.result, Components.results.NS_ERROR_XPC_CANT_PASS_CPOW_TO_NATIVE,
+             "got exception when passing CPOW to C++");
+        }
+      }
     }
 
     function recvDomTestAfterGC(message) {

From eba54da7111bcc3706da026c6fd3c28bd54398bf Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:23 -0800
Subject: [PATCH 048/183] Bug 1072980 - Don't use CPOW in special powers
 (r=ally)

---
 testing/specialpowers/content/specialpowersAPI.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/specialpowers/content/specialpowersAPI.js b/testing/specialpowers/content/specialpowersAPI.js
index 8d6c6b611841..2bb67a2e98d5 100644
--- a/testing/specialpowers/content/specialpowersAPI.js
+++ b/testing/specialpowers/content/specialpowersAPI.js
@@ -1587,10 +1587,10 @@ SpecialPowersAPI.prototype = {
 
     var xferable = Components.classes["@mozilla.org/widget/transferable;1"].
                    createInstance(Components.interfaces.nsITransferable);
-    // in e10s b-c tests |content.window| is null whereas |window| works fine.
+    // in e10s b-c tests |content.window| is a CPOW whereas |window| works fine.
     // for some non-e10s mochi tests, |window| is null whereas |content.window|
     // works fine.  So we take whatever is non-null!
-    xferable.init(this._getDocShell(content.window || window)
+    xferable.init(this._getDocShell(typeof(window) == "undefined" ? content.window : window)
                       .QueryInterface(Components.interfaces.nsILoadContext));
     xferable.addDataFlavor(flavor);
     this._cb.getData(xferable, whichClipboard);

From b17fddbc37551fb518172d5ea0bcb28c0d197387 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:24 -0800
Subject: [PATCH 049/183] Bug 1072980 - Ensure event.currentTarget is correct
 in event shim (r=ally)

---
 .../sessionstore/test/browser_500328.js       |  6 ++--
 .../addoncompat/RemoteAddonsParent.jsm        | 31 ++++++++++++++-----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/browser/components/sessionstore/test/browser_500328.js b/browser/components/sessionstore/test/browser_500328.js
index 767099bd8f3b..45f784bdc02a 100644
--- a/browser/components/sessionstore/test/browser_500328.js
+++ b/browser/components/sessionstore/test/browser_500328.js
@@ -42,9 +42,9 @@ function checkState(tab) {
       // deserialized in the content scope. And in this case, since RegExps are
       // not currently Xrayable (see bug 1014991), trying to pull |obj3| (a RegExp)
       // off of an Xrayed Object won't work. So we need to waive.
-      runInContent(tab.linkedBrowser, function(win, event) {
-        return Cu.waiveXrays(event.state).obj3.toString();
-      }, aEvent).then(function(stateStr) {
+      runInContent(tab.linkedBrowser, function(win, state) {
+        return Cu.waiveXrays(state).obj3.toString();
+      }, aEvent.state).then(function(stateStr) {
         is(stateStr, '/^a$/', "second popstate object.");
 
         // Make sure that the new-elem node is present in the document.  If it's
diff --git a/toolkit/components/addoncompat/RemoteAddonsParent.jsm b/toolkit/components/addoncompat/RemoteAddonsParent.jsm
index 638e227e5762..8f9ce55a0b08 100644
--- a/toolkit/components/addoncompat/RemoteAddonsParent.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsParent.jsm
@@ -421,13 +421,17 @@ let EventTargetParent = {
     // If there's already an identical listener, don't do anything.
     for (let i = 0; i < forType.length; i++) {
       if (forType[i].listener === listener &&
+          forType[i].target === target &&
           forType[i].useCapture === useCapture &&
           forType[i].wantsUntrusted === wantsUntrusted) {
         return;
       }
     }
 
-    forType.push({listener: listener, wantsUntrusted: wantsUntrusted, useCapture: useCapture});
+    forType.push({listener: listener,
+                  target: target,
+                  wantsUntrusted: wantsUntrusted,
+                  useCapture: useCapture});
   },
 
   removeEventListener: function(target, type, listener, useCapture) {
@@ -445,7 +449,9 @@ let EventTargetParent = {
     let forType = setDefault(listeners, type, []);
 
     for (let i = 0; i < forType.length; i++) {
-      if (forType[i].listener === listener && forType[i].useCapture === useCapture) {
+      if (forType[i].listener === listener &&
+          forType[i].target === target &&
+          forType[i].useCapture === useCapture) {
         forType.splice(i, 1);
         NotificationTracker.remove(["event", type, useCapture]);
         break;
@@ -473,18 +479,29 @@ let EventTargetParent = {
 
       // Make a copy in case they call removeEventListener in the listener.
       let handlers = [];
-      for (let {listener, wantsUntrusted, useCapture} of forType) {
+      for (let {listener, target, wantsUntrusted, useCapture} of forType) {
         if ((wantsUntrusted || isTrusted) && useCapture == capturing) {
-          handlers.push(listener);
+          handlers.push([listener, target]);
         }
       }
 
-      for (let handler of handlers) {
+      for (let [handler, target] of handlers) {
+        let EventProxy = {
+          get: function(actualEvent, name) {
+            if (name == "currentTarget") {
+              return target;
+            } else {
+              return actualEvent[name];
+            }
+          }
+        };
+        let proxyEvent = new Proxy(event, EventProxy);
+
         try {
           if ("handleEvent" in handler) {
-            handler.handleEvent(event);
+            handler.handleEvent(proxyEvent);
           } else {
-            handler.call(event.target, event);
+            handler.call(event.target, proxyEvent);
           }
         } catch (e) {
           Cu.reportError(e);

From 55f6a4416595f8839bd7cca3c42c63cbe0d46f27 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:24 -0800
Subject: [PATCH 050/183] Bug 1072980 - Don't pass document CPOW to context
 menu (r=ally)

---
 browser/base/content/nsContextMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 2911189c8295..4dc54af0cdcc 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1067,7 +1067,7 @@ nsContextMenu.prototype = {
       mm.removeMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage);
       let dataURL = message.data.dataURL;
       saveImageURL(dataURL, name, "SaveImageTitle", true, false,
-                   document.documentURIObject, this.target.ownerDocument);
+                   document.documentURIObject, document);
     };
     mm.addMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage);
   },

From 39f8f8baaf7ccc245fbead21087f3e2102d535e0 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:24 -0800
Subject: [PATCH 051/183] Bug 1102643 - Track add-on ID in e10s shims
 (r=mconley)

---
 .../addoncompat/RemoteAddonsChild.jsm         | 30 ++++++++++--
 .../addoncompat/RemoteAddonsParent.jsm        | 48 +++++++++----------
 2 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/toolkit/components/addoncompat/RemoteAddonsChild.jsm b/toolkit/components/addoncompat/RemoteAddonsChild.jsm
index 4c1a93e5e9a9..8ed8c836970f 100644
--- a/toolkit/components/addoncompat/RemoteAddonsChild.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsChild.jsm
@@ -80,14 +80,17 @@ let NotificationTracker = {
     }
   },
 
-  watch: function(component1, watcher) {
-    setDefault(this._watchers, component1, []).push(watcher);
-    this._registered.set(watcher, new Set());
+  findPaths: function(prefix) {
+    let tracked = this._paths;
+    for (let component of prefix) {
+      tracked = setDefault(tracked, component, {});
+    }
 
+    let result = [];
     let enumerate = (tracked, curPath) => {
       for (let component in tracked) {
         if (component == "_count") {
-          this.runCallback(watcher, curPath, tracked._count);
+          result.push([curPath, tracked._count]);
         } else {
           let path = curPath.slice();
           if (component === "true") {
@@ -100,7 +103,24 @@ let NotificationTracker = {
         }
       }
     }
-    enumerate(this._paths[component1] || {}, [component1]);
+    enumerate(tracked, prefix);
+
+    return result;
+  },
+
+  findSuffixes: function(prefix) {
+    let paths = this.findPaths(prefix);
+    return paths.map(([path, count]) => path[path.length - 1]);
+  },
+
+  watch: function(component1, watcher) {
+    setDefault(this._watchers, component1, []).push(watcher);
+    this._registered.set(watcher, new Set());
+
+    let paths = this.findPaths([component1]);
+    for (let [path, count] of paths) {
+      this.runCallback(watcher, path, count);
+    }
   },
 
   unwatch: function(component1, watcher) {
diff --git a/toolkit/components/addoncompat/RemoteAddonsParent.jsm b/toolkit/components/addoncompat/RemoteAddonsParent.jsm
index 8f9ce55a0b08..82411523ab29 100644
--- a/toolkit/components/addoncompat/RemoteAddonsParent.jsm
+++ b/toolkit/components/addoncompat/RemoteAddonsParent.jsm
@@ -112,14 +112,14 @@ let ContentPolicyParent = {
     this._policies = new Map();
   },
 
-  addContentPolicy: function(name, cid) {
+  addContentPolicy: function(addon, name, cid) {
     this._policies.set(name, cid);
-    NotificationTracker.add(["content-policy"]);
+    NotificationTracker.add(["content-policy", addon]);
   },
 
-  removeContentPolicy: function(name) {
+  removeContentPolicy: function(addon, name) {
     this._policies.delete(name);
-    NotificationTracker.remove(["content-policy"]);
+    NotificationTracker.remove(["content-policy", addon]);
   },
 
   receiveMessage: function (aMessage) {
@@ -169,7 +169,7 @@ let CategoryManagerInterposition = new Interposition("CategoryManagerInterpositi
 CategoryManagerInterposition.methods.addCategoryEntry =
   function(addon, target, category, entry, value, persist, replace) {
     if (category == "content-policy") {
-      ContentPolicyParent.addContentPolicy(entry, value);
+      ContentPolicyParent.addContentPolicy(addon, entry, value);
     }
 
     target.addCategoryEntry(category, entry, value, persist, replace);
@@ -178,7 +178,7 @@ CategoryManagerInterposition.methods.addCategoryEntry =
 CategoryManagerInterposition.methods.deleteCategoryEntry =
   function(addon, target, category, entry, persist) {
     if (category == "content-policy") {
-      ContentPolicyParent.removeContentPolicy(entry);
+      ContentPolicyParent.removeContentPolicy(addon, entry);
     }
 
     target.deleteCategoryEntry(category, entry, persist);
@@ -196,15 +196,15 @@ let AboutProtocolParent = {
     this._protocols = [];
   },
 
-  registerFactory: function(class_, className, contractID, factory) {
+  registerFactory: function(addon, class_, className, contractID, factory) {
     this._protocols.push({contractID: contractID, factory: factory});
-    NotificationTracker.add(["about-protocol", contractID]);
+    NotificationTracker.add(["about-protocol", contractID, addon]);
   },
 
-  unregisterFactory: function(class_, factory) {
+  unregisterFactory: function(addon, class_, factory) {
     for (let i = 0; i < this._protocols.length; i++) {
       if (this._protocols[i].factory == factory) {
-        NotificationTracker.remove(["about-protocol", this._protocols[i].contractID]);
+        NotificationTracker.remove(["about-protocol", this._protocols[i].contractID, addon]);
         this._protocols.splice(i, 1);
         break;
       }
@@ -260,7 +260,7 @@ let ComponentRegistrarInterposition = new Interposition("ComponentRegistrarInter
 ComponentRegistrarInterposition.methods.registerFactory =
   function(addon, target, class_, className, contractID, factory) {
     if (contractID && contractID.startsWith("@mozilla.org/network/protocol/about;1?")) {
-      AboutProtocolParent.registerFactory(class_, className, contractID, factory);
+      AboutProtocolParent.registerFactory(addon, class_, className, contractID, factory);
     }
 
     target.registerFactory(class_, className, contractID, factory);
@@ -268,7 +268,7 @@ ComponentRegistrarInterposition.methods.registerFactory =
 
 ComponentRegistrarInterposition.methods.unregisterFactory =
   function(addon, target, class_, factory) {
-    AboutProtocolParent.unregisterFactory(class_, factory);
+    AboutProtocolParent.unregisterFactory(addon, class_, factory);
     target.unregisterFactory(class_, factory);
   };
 
@@ -288,14 +288,14 @@ let ObserverParent = {
     ppmm.addMessageListener("Addons:Observer:Run", this);
   },
 
-  addObserver: function(observer, topic, ownsWeak) {
+  addObserver: function(addon, observer, topic, ownsWeak) {
     Services.obs.addObserver(observer, "e10s-" + topic, ownsWeak);
-    NotificationTracker.add(["observer", topic]);
+    NotificationTracker.add(["observer", topic, addon]);
   },
 
-  removeObserver: function(observer, topic) {
+  removeObserver: function(addon, observer, topic) {
     Services.obs.removeObserver(observer, "e10s-" + topic);
-    NotificationTracker.remove(["observer", topic]);
+    NotificationTracker.remove(["observer", topic, addon]);
   },
 
   receiveMessage: function(msg) {
@@ -331,7 +331,7 @@ let ObserverInterposition = new Interposition("ObserverInterposition");
 ObserverInterposition.methods.addObserver =
   function(addon, target, observer, topic, ownsWeak) {
     if (TOPIC_WHITELIST.indexOf(topic) >= 0) {
-      ObserverParent.addObserver(observer, topic);
+      ObserverParent.addObserver(addon, observer, topic);
     }
 
     target.addObserver(observer, topic, ownsWeak);
@@ -340,7 +340,7 @@ ObserverInterposition.methods.addObserver =
 ObserverInterposition.methods.removeObserver =
   function(addon, target, observer, topic) {
     if (TOPIC_WHITELIST.indexOf(topic) >= 0) {
-      ObserverParent.removeObserver(observer, topic);
+      ObserverParent.removeObserver(addon, observer, topic);
     }
 
     target.removeObserver(observer, topic);
@@ -400,7 +400,7 @@ let EventTargetParent = {
     return [browser, window];
   },
 
-  addEventListener: function(target, type, listener, useCapture, wantsUntrusted) {
+  addEventListener: function(addon, target, type, listener, useCapture, wantsUntrusted) {
     let newTarget = this.redirectEventTarget(target);
     if (!newTarget) {
       return;
@@ -409,7 +409,7 @@ let EventTargetParent = {
     useCapture = useCapture || false;
     wantsUntrusted = wantsUntrusted || false;
 
-    NotificationTracker.add(["event", type, useCapture]);
+    NotificationTracker.add(["event", type, useCapture, addon]);
 
     let listeners = this._listeners.get(newTarget);
     if (!listeners) {
@@ -434,7 +434,7 @@ let EventTargetParent = {
                   useCapture: useCapture});
   },
 
-  removeEventListener: function(target, type, listener, useCapture) {
+  removeEventListener: function(addon, target, type, listener, useCapture) {
     let newTarget = this.redirectEventTarget(target);
     if (!newTarget) {
       return;
@@ -453,7 +453,7 @@ let EventTargetParent = {
           forType[i].target === target &&
           forType[i].useCapture === useCapture) {
         forType.splice(i, 1);
-        NotificationTracker.remove(["event", type, useCapture]);
+        NotificationTracker.remove(["event", type, useCapture, addon]);
         break;
       }
     }
@@ -554,13 +554,13 @@ let EventTargetInterposition = new Interposition("EventTargetInterposition");
 
 EventTargetInterposition.methods.addEventListener =
   function(addon, target, type, listener, useCapture, wantsUntrusted) {
-    EventTargetParent.addEventListener(target, type, listener, useCapture, wantsUntrusted);
+    EventTargetParent.addEventListener(addon, target, type, listener, useCapture, wantsUntrusted);
     target.addEventListener(type, makeFilteringListener(type, listener), useCapture, wantsUntrusted);
   };
 
 EventTargetInterposition.methods.removeEventListener =
   function(addon, target, type, listener, useCapture) {
-    EventTargetParent.removeEventListener(target, type, listener, useCapture);
+    EventTargetParent.removeEventListener(addon, target, type, listener, useCapture);
     target.removeEventListener(type, makeFilteringListener(type, listener), useCapture);
   };
 

From 7b93042a28737a4f1fa6767225bc18f64f5f6bbd Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:24 -0800
Subject: [PATCH 052/183] Bug 1102636 - Unwrap objects before returning their
 address in objectAddress (r=sfink)

---
 js/src/builtin/TestingFunctions.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index d14a042e2359..12f4e6d0aaf1 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -1724,8 +1724,9 @@ ObjectAddress(JSContext *cx, unsigned argc, jsval *vp)
 #ifdef JS_MORE_DETERMINISTIC
     args.rval().setInt32(0);
 #else
+    void *ptr = js::UncheckedUnwrap(&args[0].toObject(), true);
     char buffer[64];
-    JS_snprintf(buffer, sizeof(buffer), "%p", &args[0].toObject());
+    JS_snprintf(buffer, sizeof(buffer), "%p", ptr);
 
     JSString *str = JS_NewStringCopyZ(cx, buffer);
     if (!str)

From 35ea98153d476c26493b1f8cd8d86493d3b6199b Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:24 -0800
Subject: [PATCH 053/183] Bug 1102637 - [e10s] Log the address of objects sent
 using CPOWs (r=mrbkap)

---
 js/ipc/JavaScriptLogging.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/js/ipc/JavaScriptLogging.h b/js/ipc/JavaScriptLogging.h
index 68c9cb1cad4e..5b25c9800419 100644
--- a/js/ipc/JavaScriptLogging.h
+++ b/js/ipc/JavaScriptLogging.h
@@ -11,6 +11,7 @@
 #include "nsString.h"
 #include "nsPrintfCString.h"
 #include "jsfriendapi.h"
+#include "jswrapper.h"
 
 namespace mozilla {
 namespace jsipc {
@@ -98,6 +99,7 @@ class Logging
 
     void formatObject(bool incoming, bool local, ObjectId id, nsCString &out) {
         const char *side, *objDesc;
+        void *ptr;
 
         if (local == incoming) {
             JS::RootedObject obj(cx);
@@ -110,12 +112,14 @@ class Logging
             }
 
             side = shared->isParent() ? "parent" : "child";
+            ptr = js::UncheckedUnwrap(obj, true);
         } else {
             objDesc = "<cpow>";
             side = shared->isParent() ? "child" : "parent";
+            ptr = nullptr;
         }
 
-        out = nsPrintfCString("<%s %s:%d>", side, objDesc, id);
+        out = nsPrintfCString("<%s %s:%d:%p>", side, objDesc, id, ptr);
     }
 
 

From 478530b3a3aef636cb8da50177774f1d2bb4ddf0 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:24 -0800
Subject: [PATCH 054/183] Bug 1102637 - [e10s] Control CPOW logging with env
 var (r=mrbkap)

---
 js/ipc/JavaScriptShared.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/ipc/JavaScriptShared.cpp b/js/ipc/JavaScriptShared.cpp
index 24940c453a62..b8e7abb3f60f 100644
--- a/js/ipc/JavaScriptShared.cpp
+++ b/js/ipc/JavaScriptShared.cpp
@@ -171,7 +171,7 @@ JavaScriptShared::JavaScriptShared(JSRuntime *rt)
 
         if (PR_GetEnv("MOZ_CPOW_LOG")) {
             sLoggingEnabled = true;
-            sStackLoggingEnabled = true;
+            sStackLoggingEnabled = strstr(PR_GetEnv("MOZ_CPOW_LOG"), "stacks");
         } else {
             Preferences::AddBoolVarCache(&sLoggingEnabled,
                                          "dom.ipc.cpows.log.enabled", false);

From a58a3e462195b06f2693cb644d3c204c4c13d80b Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:24 -0800
Subject: [PATCH 055/183] Bug 1102640 - [e10s] Shouldn't be able to create
 CPOWs to the inner window (r=mrbkap)

---
 js/ipc/WrapperOwner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/ipc/WrapperOwner.cpp b/js/ipc/WrapperOwner.cpp
index 71b27e59a5c9..4b04532250f3 100644
--- a/js/ipc/WrapperOwner.cpp
+++ b/js/ipc/WrapperOwner.cpp
@@ -932,7 +932,7 @@ WrapperOwner::toObjectVariant(JSContext *cx, JSObject *objArg, ObjectVariant *ob
     // Whenever operating on an object that comes from the table, we wrap it
     // in findObjectById.
     unsigned wrapperFlags = 0;
-    obj = js::UncheckedUnwrap(obj, false, &wrapperFlags);
+    obj = js::UncheckedUnwrap(obj, true, &wrapperFlags);
     if (obj && IsCPOW(obj) && OwnerOf(obj) == this) {
         *objVarp = LocalObject(idOf(obj).serialize());
         return true;

From a2ac0904776fcd42c8290b08135542b1020ca765 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:25 -0800
Subject: [PATCH 056/183] Bug 1109372 - Stop using CPOWs for isTabEmpty (r=dao)

---
 browser/base/content/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index f46a9ec5fc62..692f008f8f0c 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6746,7 +6746,7 @@ function isTabEmpty(aTab) {
   if (!gMultiProcessBrowser && browser.contentWindow.opener)
     return false;
 
-  if (browser.sessionHistory && browser.sessionHistory.count >= 2)
+  if (browser.canGoForward || browser.canGoBack)
     return false;
 
   return true;

From ac2be68f9481307ad672a1e3dbcaf42fad7a2600 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:34:25 -0800
Subject: [PATCH 057/183] Bug 1110938 - Use message sequence number for
 transaction ID in MessageChannel (r=dvander)

---
 ipc/glue/MessageChannel.cpp | 25 ++++++++-----------------
 ipc/glue/MessageChannel.h   | 18 ++----------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
index 14d99a2db82b..5681468796ec 100644
--- a/ipc/glue/MessageChannel.cpp
+++ b/ipc/glue/MessageChannel.cpp
@@ -704,23 +704,6 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
     IPC_ASSERT(mAwaitingSyncReplyPriority <= aMsg->priority(),
                "nested sync message sends must be of increasing priority");
 
-    AutoSetValue<bool> replies(mAwaitingSyncReply, true);
-    AutoSetValue<int> prio(mAwaitingSyncReplyPriority, aMsg->priority());
-    AutoEnterTransaction transact(this);
-    aMsg->set_transaction_id(mCurrentTransaction);
-
-    if (!SendAndWait(aMsg, aReply))
-        return false;
-
-    NS_ABORT_IF_FALSE(aReply->is_sync(), "reply is not sync");
-    return true;
-}
-
-bool
-MessageChannel::SendAndWait(Message* aMsg, Message* aReply)
-{
-    mMonitor->AssertCurrentThreadOwns();
-
     nsAutoPtr<Message> msg(aMsg);
 
     if (!Connected()) {
@@ -733,6 +716,13 @@ MessageChannel::SendAndWait(Message* aMsg, Message* aReply)
     DebugOnly<int32_t> replySeqno = msg->seqno();
     DebugOnly<msgid_t> replyType = msg->type() + 1;
 
+    AutoSetValue<bool> replies(mAwaitingSyncReply, true);
+    AutoSetValue<int> prio(mAwaitingSyncReplyPriority, msg->priority());
+    AutoEnterTransaction transact(this, msg->seqno());
+
+    int32_t transaction = mCurrentTransaction;
+    msg->set_transaction_id(transaction);
+
     mLink->SendMessage(msg.forget());
 
     while (true) {
@@ -770,6 +760,7 @@ MessageChannel::SendAndWait(Message* aMsg, Message* aReply)
 
             MOZ_ASSERT(mRecvd->type() == replyType, "wrong reply type");
             MOZ_ASSERT(mRecvd->seqno() == replySeqno);
+            MOZ_ASSERT(mRecvd->is_sync());
 
             *aReply = Move(*mRecvd);
             mRecvd = nullptr;
diff --git a/ipc/glue/MessageChannel.h b/ipc/glue/MessageChannel.h
index af770a7b5106..323e0450bc19 100644
--- a/ipc/glue/MessageChannel.h
+++ b/ipc/glue/MessageChannel.h
@@ -211,20 +211,6 @@ class MessageChannel : HasResultCodes
     // Send OnChannelConnected notification to listeners.
     void DispatchOnChannelConnected();
 
-    // Any protocol that requires blocking until a reply arrives, will send its
-    // outgoing message through this function. Currently, two protocols do this:
-    //
-    //  sync, which can only initiate messages from child to parent.
-    //  urgent, which can only initiate messages from parent to child.
-    //
-    // SendAndWait() expects that the worker thread owns the monitor, and that
-    // the message has been prepared to be sent over the link. It returns as
-    // soon as a reply has been received, or an error has occurred.
-    //
-    // Note that while the child is blocked waiting for a sync reply, it can wake
-    // up to process urgent calls from the parent.
-    bool SendAndWait(Message* aMsg, Message* aReply);
-
     bool InterruptEventOccurred();
 
     bool ProcessPendingRequest(const Message &aUrgent);
@@ -501,13 +487,13 @@ class MessageChannel : HasResultCodes
     class AutoEnterTransaction
     {
       public:
-       explicit AutoEnterTransaction(MessageChannel *aChan)
+       explicit AutoEnterTransaction(MessageChannel *aChan, int32_t aMsgSeqno)
         : mChan(aChan),
           mOldTransaction(mChan->mCurrentTransaction)
        {
            mChan->mMonitor->AssertCurrentThreadOwns();
            if (mChan->mCurrentTransaction == 0)
-               mChan->mCurrentTransaction = mChan->NextSeqno();
+               mChan->mCurrentTransaction = aMsgSeqno;
        }
        explicit AutoEnterTransaction(MessageChannel *aChan, const Message &aMessage)
         : mChan(aChan),

From 73c276ef13e6acc13125e34108bf9d2c21d2e617 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:35:44 -0800
Subject: [PATCH 058/183] Bug 1110938 - Add timeout for CPOWs (default to 0)
 (r=dvander)

---
 browser/app/profile/firefox.js          |   3 +
 dom/ipc/ContentParent.cpp               |   3 +
 dom/plugins/ipc/PluginModuleParent.cpp  |   1 +
 ipc/glue/MessageChannel.cpp             |  99 ++++++++++----
 ipc/glue/MessageChannel.h               |  21 +++
 ipc/ipdl/test/cxx/PTestUrgentHangs.ipdl |  24 ++++
 ipc/ipdl/test/cxx/TestUrgentHangs.cpp   | 170 ++++++++++++++++++++++++
 ipc/ipdl/test/cxx/TestUrgentHangs.h     |  66 +++++++++
 ipc/ipdl/test/cxx/moz.build             |   2 +
 testing/mochitest/mochitest_options.py  |   2 +-
 10 files changed, 363 insertions(+), 28 deletions(-)
 create mode 100644 ipc/ipdl/test/cxx/PTestUrgentHangs.ipdl
 create mode 100644 ipc/ipdl/test/cxx/TestUrgentHangs.cpp
 create mode 100644 ipc/ipdl/test/cxx/TestUrgentHangs.h

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 734d867923e4..101065afc3a2 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1849,3 +1849,6 @@ pref("extensions.interposition.enabled", true);
 #endif
 
 pref("browser.defaultbrowser.notificationbar", false);
+
+// How many milliseconds to wait for a CPOW response from the child process.
+pref("dom.ipc.cpow.timeout", 0);
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 76f854b7018e..892817723465 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2011,6 +2011,9 @@ ContentParent::ContentParent(mozIApplication* aApp,
                  true  /* Send registered chrome */);
 
     ContentProcessManager::GetSingleton()->AddContentProcess(this);
+
+    // Set a reply timeout for CPOWs.
+    SetReplyTimeoutMs(Preferences::GetInt("dom.ipc.cpow.timeout", 0));
 }
 
 #ifdef MOZ_NUWA_PROCESS
diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp
index ad7ef6f79fb1..63bfd58de221 100755
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -571,6 +571,7 @@ PluginModuleChromeParent::ShouldContinueFromReplyTimeout()
     FinishHangUI();
 #endif // XP_WIN
     TerminateChildProcess(MessageLoop::current());
+    GetIPCChannel()->CloseWithTimeout();
     return false;
 }
 
diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
index 5681468796ec..dcf0ae4ae050 100644
--- a/ipc/glue/MessageChannel.cpp
+++ b/ipc/glue/MessageChannel.cpp
@@ -292,6 +292,8 @@ MessageChannel::MessageChannel(MessageListener *aListener)
     mDispatchingSyncMessage(false),
     mDispatchingSyncMessagePriority(0),
     mCurrentTransaction(0),
+    mTimedOutMessageSeqno(0),
+    mRecvdErrors(0),
     mRemoteStackDepthGuess(false),
     mSawInterruptOutMsg(false),
     mAbortOnError(false),
@@ -611,8 +613,30 @@ MessageChannel::OnMessageReceivedFromLink(const Message& aMsg)
 
     // Regardless of the Interrupt stack, if we're awaiting a sync reply,
     // we know that it needs to be immediately handled to unblock us.
-    if (AwaitingSyncReply() && aMsg.is_sync() && aMsg.is_reply()) {
+    if (aMsg.is_sync() && aMsg.is_reply()) {
+        if (aMsg.seqno() == mTimedOutMessageSeqno) {
+            // Drop the message, but allow future sync messages to be sent.
+            mTimedOutMessageSeqno = 0;
+            return;
+        }
+
+        MOZ_ASSERT(AwaitingSyncReply());
         MOZ_ASSERT(!mRecvd);
+
+        // Rather than storing errors in mRecvd, we mark them in
+        // mRecvdErrors. We need a counter because multiple replies can arrive
+        // when a timeout happens, as in the following example. Imagine the
+        // child is running slowly. The parent sends a sync message P1. It times
+        // out. The child eventually sends a sync message C1. While waiting for
+        // the C1 response, the child dispatches P1. In doing so, it sends sync
+        // message C2. At that point, it's valid for the parent to send error
+        // responses for both C1 and C2.
+        if (aMsg.is_reply_error()) {
+            mRecvdErrors++;
+            NotifyWorkerThread();
+            return;
+        }
+
         mRecvd = new Message(aMsg);
         NotifyWorkerThread();
         return;
@@ -698,6 +722,14 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
 
     MonitorAutoLock lock(*mMonitor);
 
+    if (mTimedOutMessageSeqno) {
+        // Don't bother sending another sync message if a previous one timed out
+        // and we haven't received a reply for it. Once the original timed-out
+        // message receives a reply, we'll be able to send more sync messages
+        // again.
+        return false;
+    }
+
     IPC_ASSERT(aMsg->is_sync(), "can only Send() sync messages here");
     IPC_ASSERT(aMsg->priority() >= DispatchingSyncMessagePriority(),
                "can't send sync message of a lesser priority than what's being dispatched");
@@ -713,12 +745,12 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
 
     msg->set_seqno(NextSeqno());
 
-    DebugOnly<int32_t> replySeqno = msg->seqno();
+    int32_t seqno = msg->seqno();
     DebugOnly<msgid_t> replyType = msg->type() + 1;
 
     AutoSetValue<bool> replies(mAwaitingSyncReply, true);
     AutoSetValue<int> prio(mAwaitingSyncReplyPriority, msg->priority());
-    AutoEnterTransaction transact(this, msg->seqno());
+    AutoEnterTransaction transact(this, seqno);
 
     int32_t transaction = mCurrentTransaction;
     msg->set_transaction_id(transaction);
@@ -750,16 +782,16 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
         }
 
         // See if we've received a reply.
+        if (mRecvdErrors) {
+            mRecvdErrors--;
+            return false;
+        }
+
         if (mRecvd) {
             MOZ_ASSERT(mRecvd->is_reply(), "expected reply");
-
-            if (mRecvd->is_reply_error()) {
-                mRecvd = nullptr;
-                return false;
-            }
-
+            MOZ_ASSERT(!mRecvd->is_reply_error());
             MOZ_ASSERT(mRecvd->type() == replyType, "wrong reply type");
-            MOZ_ASSERT(mRecvd->seqno() == replySeqno);
+            MOZ_ASSERT(mRecvd->seqno() == seqno);
             MOZ_ASSERT(mRecvd->is_sync());
 
             *aReply = Move(*mRecvd);
@@ -767,6 +799,8 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
             return true;
         }
 
+        MOZ_ASSERT(!mTimedOutMessageSeqno);
+
         bool maybeTimedOut = !WaitForSyncNotify();
 
         if (!Connected()) {
@@ -774,8 +808,13 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
             return false;
         }
 
-        if (maybeTimedOut && !ShouldContinueFromTimeout())
+        // We only time out a message if it initiated a new transaction (i.e.,
+        // if neither side has any other message Sends on the stack).
+        bool canTimeOut = transaction == seqno;
+        if (maybeTimedOut && canTimeOut && !ShouldContinueFromTimeout()) {
+            mTimedOutMessageSeqno = seqno;
             return false;
+        }
     }
 
     return true;
@@ -1089,7 +1128,14 @@ MessageChannel::DispatchSyncMessage(const Message& aMsg)
     bool& blockingVar = ShouldBlockScripts() ? gParentIsBlocked : dummy;
 
     Result rv;
-    {
+    if (mTimedOutMessageSeqno) {
+        // If the other side sends a message in response to one of our messages
+        // that we've timed out, then we reply with an error.
+        //
+        // We even reject messages that were sent before the other side even got
+        // to our timed out message.
+        rv = MsgNotAllowed;
+    } else {
         AutoSetValue<bool> blocked(blockingVar, true);
         AutoSetValue<bool> sync(mDispatchingSyncMessage, true);
         AutoSetValue<int> prioSet(mDispatchingSyncMessagePriority, prio);
@@ -1104,6 +1150,7 @@ MessageChannel::DispatchSyncMessage(const Message& aMsg)
         reply->set_reply_error();
     }
     reply->set_seqno(aMsg.seqno());
+    reply->set_transaction_id(aMsg.transaction_id());
 
     MonitorAutoLock lock(*mMonitor);
     if (ChannelConnected == mChannelState) {
@@ -1361,21 +1408,6 @@ MessageChannel::ShouldContinueFromTimeout()
         return true;
     }
 
-    if (!cont) {
-        // NB: there's a sublety here.  If parents were allowed to send sync
-        // messages to children, then it would be possible for this
-        // synchronous close-on-timeout to race with async |OnMessageReceived|
-        // tasks arriving from the child, posted to the worker thread's event
-        // loop.  This would complicate cleanup of the *Channel.  But since
-        // IPDL forbids this (and since it doesn't support children timing out
-        // on parents), the parent can only block on interrupt messages to the child,
-        // and in that case arriving async messages are enqueued to the interrupt 
-        // channel's special queue.  They're then ignored because the channel
-        // state changes to ChannelTimeout (i.e. !Connected).
-        SynchronouslyClose();
-        mChannelState = ChannelTimeout;
-    }
-
     return cont;
 }
 
@@ -1618,6 +1650,19 @@ MessageChannel::CloseWithError()
     PostErrorNotifyTask();
 }
 
+void
+MessageChannel::CloseWithTimeout()
+{
+    AssertWorkerThread();
+
+    MonitorAutoLock lock(*mMonitor);
+    if (ChannelConnected != mChannelState) {
+        return;
+    }
+    SynchronouslyClose();
+    mChannelState = ChannelTimeout;
+}
+
 void
 MessageChannel::BlockScripts()
 {
diff --git a/ipc/glue/MessageChannel.h b/ipc/glue/MessageChannel.h
index 323e0450bc19..68c46302d96d 100644
--- a/ipc/glue/MessageChannel.h
+++ b/ipc/glue/MessageChannel.h
@@ -84,6 +84,8 @@ class MessageChannel : HasResultCodes
     // for process links only, not thread links.
     void CloseWithError();
 
+    void CloseWithTimeout();
+
     void SetAbortOnError(bool abort)
     {
         mAbortOnError = true;
@@ -518,10 +520,29 @@ class MessageChannel : HasResultCodes
        int32_t mOldTransaction;
     };
 
+    // If a sync message times out, we store its sequence number here. Any
+    // future sync messages will fail immediately. Once the reply for original
+    // sync message is received, we allow sync messages again.
+    //
+    // When a message times out, nothing is done to inform the other side. The
+    // other side will eventually dispatch the message and send a reply. Our
+    // side is responsible for replying to all sync messages sent by the other
+    // side when it dispatches the timed out message. The response is always an
+    // error.
+    //
+    // A message is only timed out if it initiated a transaction. This avoids
+    // hitting a lot of corner cases with message nesting that we don't really
+    // care about.
+    int32_t mTimedOutMessageSeqno;
+
     // If waiting for the reply to a sync out-message, it will be saved here
     // on the I/O thread and then read and cleared by the worker thread.
     nsAutoPtr<Message> mRecvd;
 
+    // If a sync message reply that is an error arrives, we increment this
+    // counter rather than storing it in mRecvd.
+    size_t mRecvdErrors;
+
     // Queue of all incoming messages, except for replies to sync and urgent
     // messages, which are delivered directly to mRecvd, and any pending urgent
     // incall, which is stored in mPendingUrgentRequest.
diff --git a/ipc/ipdl/test/cxx/PTestUrgentHangs.ipdl b/ipc/ipdl/test/cxx/PTestUrgentHangs.ipdl
new file mode 100644
index 000000000000..07fc403e97fb
--- /dev/null
+++ b/ipc/ipdl/test/cxx/PTestUrgentHangs.ipdl
@@ -0,0 +1,24 @@
+namespace mozilla {
+namespace _ipdltest {
+
+prio(normal upto high) sync protocol PTestUrgentHangs
+{
+parent:
+    prio(high) sync Test1_2();
+
+    prio(high) sync TestInner();
+
+child:
+    prio(high) sync Test1_1();
+    prio(high) sync Test1_3();
+
+    prio(high) sync Test2();
+
+    prio(high) sync Test3();
+
+    async Test4();
+    prio(high) sync Test4_1();
+};
+
+} // namespace _ipdltest
+} // namespace mozilla
diff --git a/ipc/ipdl/test/cxx/TestUrgentHangs.cpp b/ipc/ipdl/test/cxx/TestUrgentHangs.cpp
new file mode 100644
index 000000000000..743597593b03
--- /dev/null
+++ b/ipc/ipdl/test/cxx/TestUrgentHangs.cpp
@@ -0,0 +1,170 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: sw=4 ts=4 et :
+ */
+#include "TestUrgentHangs.h"
+
+#include "IPDLUnitTests.h"      // fail etc.
+#if defined(OS_POSIX)
+#include <unistd.h>
+#else
+#include <windows.h>
+#endif
+
+template<>
+struct RunnableMethodTraits<mozilla::_ipdltest::TestUrgentHangsParent>
+{
+    static void RetainCallee(mozilla::_ipdltest::TestUrgentHangsParent* obj) { }
+    static void ReleaseCallee(mozilla::_ipdltest::TestUrgentHangsParent* obj) { }
+};
+
+namespace mozilla {
+namespace _ipdltest {
+
+//-----------------------------------------------------------------------------
+// parent
+
+TestUrgentHangsParent::TestUrgentHangsParent()
+{
+    MOZ_COUNT_CTOR(TestUrgentHangsParent);
+}
+
+TestUrgentHangsParent::~TestUrgentHangsParent()
+{
+    MOZ_COUNT_DTOR(TestUrgentHangsParent);
+}
+
+void
+TestUrgentHangsParent::Main()
+{
+    SetReplyTimeoutMs(1000);
+
+    // Should succeed despite the nested sleep call because the content process
+    // responded to the transaction.
+    if (!SendTest1_1())
+        fail("sending Test1_1");
+
+    // Fails with a timeout.
+    if (SendTest2())
+        fail("sending Test2");
+
+    // Also fails since we haven't gotten a response for Test2 yet.
+    if (SendTest3())
+        fail("sending Test3");
+
+    // Do a second round of testing once the reply to Test2 comes back.
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        NewRunnableMethod(this, &TestUrgentHangsParent::FinishTesting),
+        3000);
+}
+
+void
+TestUrgentHangsParent::FinishTesting()
+{
+    // Send an async message that waits 2 seconds and then sends a sync message
+    // (which should be processed).
+    if (!SendTest4())
+        fail("sending Test4");
+
+    // Send a sync message that will time out because the child is waiting
+    // inside RecvTest4.
+    if (SendTest4_1())
+        fail("sending Test4_1");
+
+    // Close the channel after the child finishes its work in RecvTest4.
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        NewRunnableMethod(this, &TestUrgentHangsParent::Close),
+        3000);
+}
+
+bool
+TestUrgentHangsParent::RecvTest1_2()
+{
+    if (!SendTest1_3())
+        fail("sending Test1_3");
+    return true;
+}
+
+bool
+TestUrgentHangsParent::RecvTestInner()
+{
+    fail("TestInner should never be dispatched");
+    return true;
+}
+
+//-----------------------------------------------------------------------------
+// child
+
+bool
+TestUrgentHangsChild::RecvTest1_1()
+{
+    if (!SendTest1_2())
+        fail("sending Test1_2");
+
+    return true;
+}
+
+bool
+TestUrgentHangsChild::RecvTest1_3()
+{
+    sleep(2);
+
+    return true;
+}
+
+bool
+TestUrgentHangsChild::RecvTest2()
+{
+    sleep(2);
+
+    // Should fail because of the timeout.
+    if (SendTestInner())
+        fail("sending TestInner");
+
+    return true;
+}
+
+bool
+TestUrgentHangsChild::RecvTest3()
+{
+    fail("RecvTest3 should never be called");
+    return true;
+}
+
+bool
+TestUrgentHangsChild::RecvTest4()
+{
+    sleep(2);
+
+    // This should fail because Test4_1 timed out and hasn't gotten a response
+    // yet.
+    if (SendTestInner())
+        fail("sending TestInner");
+
+    return true;
+}
+
+bool
+TestUrgentHangsChild::RecvTest4_1()
+{
+    // This should fail because Test4_1 timed out and hasn't gotten a response
+    // yet.
+    if (SendTestInner())
+        fail("sending TestInner");
+
+    return true;
+}
+
+TestUrgentHangsChild::TestUrgentHangsChild()
+{
+    MOZ_COUNT_CTOR(TestUrgentHangsChild);
+}
+
+TestUrgentHangsChild::~TestUrgentHangsChild()
+{
+    MOZ_COUNT_DTOR(TestUrgentHangsChild);
+}
+
+} // namespace _ipdltest
+} // namespace mozilla
diff --git a/ipc/ipdl/test/cxx/TestUrgentHangs.h b/ipc/ipdl/test/cxx/TestUrgentHangs.h
new file mode 100644
index 000000000000..55379f0be395
--- /dev/null
+++ b/ipc/ipdl/test/cxx/TestUrgentHangs.h
@@ -0,0 +1,66 @@
+#ifndef mozilla__ipdltest_TestUrgentHangs_h
+#define mozilla__ipdltest_TestUrgentHangs_h 1
+
+#include "mozilla/_ipdltest/IPDLUnitTests.h"
+
+#include "mozilla/_ipdltest/PTestUrgentHangsParent.h"
+#include "mozilla/_ipdltest/PTestUrgentHangsChild.h"
+
+namespace mozilla {
+namespace _ipdltest {
+
+
+class TestUrgentHangsParent :
+    public PTestUrgentHangsParent
+{
+public:
+    TestUrgentHangsParent();
+    virtual ~TestUrgentHangsParent();
+
+    static bool RunTestInProcesses() { return true; }
+    static bool RunTestInThreads() { return false; }
+
+    void Main();
+    void FinishTesting();
+
+    bool RecvTest1_2();
+    bool RecvTestInner();
+
+    bool ShouldContinueFromReplyTimeout() MOZ_OVERRIDE
+    {
+      return false;
+    }
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
+    {
+        passed("ok");
+        QuitParent();
+    }
+};
+
+
+class TestUrgentHangsChild :
+    public PTestUrgentHangsChild
+{
+public:
+    TestUrgentHangsChild();
+    virtual ~TestUrgentHangsChild();
+
+    bool RecvTest1_1();
+    bool RecvTest1_3();
+    bool RecvTest2();
+    bool RecvTest3();
+    bool RecvTest4();
+    bool RecvTest4_1();
+
+    virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE
+    {
+        QuitChild();
+    }
+};
+
+
+} // namespace _ipdltest
+} // namespace mozilla
+
+
+#endif // ifndef mozilla__ipdltest_TestUrgentHangs_h
diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build
index d25759b9c4db..12797434c66f 100644
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -46,6 +46,7 @@ SOURCES += [
     'TestSyncHang.cpp',
     'TestSyncWakeup.cpp',
     'TestUrgency.cpp',
+    'TestUrgentHangs.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'Linux':
@@ -120,6 +121,7 @@ IPDL_SOURCES += [
     'PTestSyncWakeup.ipdl',
     'PTestSysVShmem.ipdl',
     'PTestUrgency.ipdl',
+    'PTestUrgentHangs.ipdl',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff --git a/testing/mochitest/mochitest_options.py b/testing/mochitest/mochitest_options.py
index ec5153bb9128..c9f901123eaa 100644
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -809,7 +809,7 @@ class B2GOptions(MochitestOptions):
         defaults["testPath"] = ""
         defaults["extensionsToExclude"] = ["specialpowers"]
         # See dependencies of bug 1038943.
-        defaults["defaultLeakThreshold"] = 5308
+        defaults["defaultLeakThreshold"] = 5404
         self.set_defaults(**defaults)
 
     def verifyRemoteOptions(self, options):

From 2d185c32026a55ee3f4ea096b6fea13b09ef1a76 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:35:48 -0800
Subject: [PATCH 059/183] Bug 1109883 - Allow urgent prio messages to be sent
 to child (r=dvander)

---
 ipc/glue/MessageChannel.cpp | 20 ++++++++++++++++----
 ipc/glue/MessageChannel.h   | 13 +++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/ipc/glue/MessageChannel.cpp b/ipc/glue/MessageChannel.cpp
index dcf0ae4ae050..ae7259b4721f 100644
--- a/ipc/glue/MessageChannel.cpp
+++ b/ipc/glue/MessageChannel.cpp
@@ -291,6 +291,8 @@ MessageChannel::MessageChannel(MessageListener *aListener)
     mAwaitingSyncReplyPriority(0),
     mDispatchingSyncMessage(false),
     mDispatchingSyncMessagePriority(0),
+    mDispatchingAsyncMessage(false),
+    mDispatchingAsyncMessagePriority(0),
     mCurrentTransaction(0),
     mTimedOutMessageSeqno(0),
     mRecvdErrors(0),
@@ -554,10 +556,8 @@ MessageChannel::ShouldDeferMessage(const Message& aMsg)
     // Never defer messages that have the highest priority, even async
     // ones. This is safe because only the child can send these messages, so
     // they can never nest.
-    if (aMsg.priority() == IPC::Message::PRIORITY_URGENT) {
-        MOZ_ASSERT(mSide == ParentSide);
+    if (aMsg.priority() == IPC::Message::PRIORITY_URGENT)
         return false;
-    }
 
     // Unless they're urgent, we always defer async messages.
     if (!aMsg.is_sync()) {
@@ -736,6 +736,11 @@ MessageChannel::Send(Message* aMsg, Message* aReply)
     IPC_ASSERT(mAwaitingSyncReplyPriority <= aMsg->priority(),
                "nested sync message sends must be of increasing priority");
 
+    IPC_ASSERT(DispatchingSyncMessagePriority() != IPC::Message::PRIORITY_URGENT,
+               "not allowed to send messages while dispatching urgent messages");
+    IPC_ASSERT(DispatchingAsyncMessagePriority() != IPC::Message::PRIORITY_URGENT,
+               "not allowed to send messages while dispatching urgent messages");
+
     nsAutoPtr<Message> msg(aMsg);
 
     if (!Connected()) {
@@ -1168,7 +1173,14 @@ MessageChannel::DispatchAsyncMessage(const Message& aMsg)
         NS_RUNTIMEABORT("unhandled special message!");
     }
 
-    MaybeHandleError(mListener->OnMessageReceived(aMsg), aMsg, "DispatchAsyncMessage");
+    Result rv;
+    {
+        int prio = aMsg.priority();
+        AutoSetValue<bool> async(mDispatchingAsyncMessage, true);
+        AutoSetValue<int> prioSet(mDispatchingAsyncMessagePriority, prio);
+        rv = mListener->OnMessageReceived(aMsg);
+    }
+    MaybeHandleError(rv, aMsg, "DispatchAsyncMessage");
 }
 
 void
diff --git a/ipc/glue/MessageChannel.h b/ipc/glue/MessageChannel.h
index 68c46302d96d..3c7def888cfb 100644
--- a/ipc/glue/MessageChannel.h
+++ b/ipc/glue/MessageChannel.h
@@ -331,6 +331,16 @@ class MessageChannel : HasResultCodes
         return mDispatchingSyncMessagePriority;
     }
 
+    bool DispatchingAsyncMessage() const {
+        AssertWorkerThread();
+        return mDispatchingAsyncMessage;
+    }
+
+    int DispatchingAsyncMessagePriority() const {
+        AssertWorkerThread();
+        return mDispatchingAsyncMessagePriority;
+    }
+
     bool Connected() const;
 
   private:
@@ -465,6 +475,9 @@ class MessageChannel : HasResultCodes
     bool mDispatchingSyncMessage;
     int mDispatchingSyncMessagePriority;
 
+    bool mDispatchingAsyncMessage;
+    int mDispatchingAsyncMessagePriority;
+
     // When we send an urgent request from the parent process, we could race
     // with an RPC message that was issued by the child beforehand. In this
     // case, if the parent were to wake up while waiting for the urgent reply,

From 51b3cbac31f49a19f0f209f27a158e0b1555e36b Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:35:48 -0800
Subject: [PATCH 060/183] Bug 1109883 - Use urgent messages for protocol
 bridging (r=bent)

---
 dom/ipc/ContentParent.cpp              |  6 +++---
 dom/ipc/ContentParent.h                |  4 ++--
 dom/ipc/PContent.ipdl                  |  4 ++--
 dom/plugins/ipc/PluginModuleParent.cpp |  2 +-
 ipc/glue/ProtocolUtils.cpp             | 11 +++++++----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 892817723465..b982e3a37d30 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -927,7 +927,7 @@ ContentParent::RecvCreateChildProcess(const IPCTabContext& aContext,
 }
 
 bool
-ContentParent::AnswerBridgeToChildProcess(const ContentParentId& aCpId)
+ContentParent::RecvBridgeToChildProcess(const ContentParentId& aCpId)
 {
     ContentProcessManager *cpm = ContentProcessManager::GetSingleton();
     ContentParent* cp = cpm->GetContentProcessById(aCpId);
@@ -966,7 +966,7 @@ static nsIDocShell* GetOpenerDocShellHelper(Element* aFrameElement)
 }
 
 bool
-ContentParent::AnswerLoadPlugin(const uint32_t& aPluginId)
+ContentParent::RecvLoadPlugin(const uint32_t& aPluginId)
 {
     return mozilla::plugins::SetupBridge(aPluginId, this);
 }
@@ -1219,7 +1219,7 @@ ContentParent::CreateContentBridgeParent(const TabContext& aContext,
     if (cpId == 0) {
         return nullptr;
     }
-    if (!child->CallBridgeToChildProcess(cpId)) {
+    if (!child->SendBridgeToChildProcess(cpId)) {
         return nullptr;
     }
     ContentBridgeParent* parent = child->GetLastBridge();
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 91c73b1acf8c..38b2016c7f2e 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -150,9 +150,9 @@ public:
                                         bool* aIsForApp,
                                         bool* aIsForBrowser,
                                         TabId* aTabId) MOZ_OVERRIDE;
-    virtual bool AnswerBridgeToChildProcess(const ContentParentId& aCpId) MOZ_OVERRIDE;
+    virtual bool RecvBridgeToChildProcess(const ContentParentId& aCpId) MOZ_OVERRIDE;
 
-    virtual bool AnswerLoadPlugin(const uint32_t& aPluginId) MOZ_OVERRIDE;
+    virtual bool RecvLoadPlugin(const uint32_t& aPluginId) MOZ_OVERRIDE;
     virtual bool RecvFindPlugins(const uint32_t& aPluginEpoch,
                                  nsTArray<PluginTag>* aPlugins,
                                  uint32_t* aNewPluginEpoch) MOZ_OVERRIDE;
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index 67637dda0f4d..fc751b7e4d89 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -557,7 +557,7 @@ parent:
                             ProcessPriority priority,
                             TabId openerTabId)
         returns (ContentParentId cpId, bool isForApp, bool isForBrowser, TabId tabId);
-    intr BridgeToChildProcess(ContentParentId cpId);
+    sync BridgeToChildProcess(ContentParentId cpId);
 
     /**
      * This call connects the content process to a plugin process. While this
@@ -566,7 +566,7 @@ parent:
      * process. We use intr semantics here to ensure that the PluginModuleParent
      * allocation message is dispatched before LoadPlugin returns.
      */
-    intr LoadPlugin(uint32_t pluginId);
+    sync LoadPlugin(uint32_t pluginId);
 
     /**
      * This call returns the set of plugins loaded in the chrome
diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp
index 63bfd58de221..9ed9a9ab6e2f 100755
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -115,7 +115,7 @@ PluginModuleContentParent::LoadModule(uint32_t aPluginId)
      * sSavedModuleParent. We fetch it from there after LoadPlugin finishes.
      */
     dom::ContentChild* cp = dom::ContentChild::GetSingleton();
-    if (!cp->CallLoadPlugin(aPluginId)) {
+    if (!cp->SendLoadPlugin(aPluginId)) {
         return nullptr;
     }
 
diff --git a/ipc/glue/ProtocolUtils.cpp b/ipc/glue/ProtocolUtils.cpp
index 5a08ad97a928..d9481531f940 100644
--- a/ipc/glue/ProtocolUtils.cpp
+++ b/ipc/glue/ProtocolUtils.cpp
@@ -79,10 +79,11 @@ class ChannelOpened : public IPC::Message
 public:
   ChannelOpened(TransportDescriptor aDescriptor,
                 ProcessId aOtherProcess,
-                ProtocolId aProtocol)
+                ProtocolId aProtocol,
+                PriorityValue aPriority = PRIORITY_NORMAL)
     : IPC::Message(MSG_ROUTING_CONTROL, // these only go to top-level actors
                    CHANNEL_OPENED_MESSAGE_TYPE,
-                   PRIORITY_NORMAL)
+                   aPriority)
   {
     IPC::WriteParam(this, aDescriptor);
     IPC::WriteParam(this, aOtherProcess);
@@ -125,10 +126,12 @@ Bridge(const PrivateIPDLInterface&,
 
   if (!aParentChannel->Send(new ChannelOpened(parentSide,
                                               childId,
-                                              aProtocol)) ||
+                                              aProtocol,
+                                              IPC::Message::PRIORITY_URGENT)) ||
       !aChildChannel->Send(new ChannelOpened(childSide,
                                              parentId,
-                                             aChildProtocol))) {
+                                             aChildProtocol,
+                                             IPC::Message::PRIORITY_URGENT))) {
     CloseDescriptor(parentSide);
     CloseDescriptor(childSide);
     return false;

From 1c06e285f6069482cc4f170ee444c1c2c57d571c Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:36:17 -0800
Subject: [PATCH 061/183] Bug 1105039 - Use high prio messages rather than intr
 for profiling (r=mconley)

---
 dom/ipc/ContentChild.cpp  | 2 +-
 dom/ipc/ContentChild.h    | 2 +-
 dom/ipc/ContentParent.cpp | 2 +-
 dom/ipc/PContent.ipdl     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 791adf40d106..b0f9ae79eb37 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -2458,7 +2458,7 @@ ContentChild::RecvStopProfiler()
 }
 
 bool
-ContentChild::AnswerGetProfile(nsCString* aProfile)
+ContentChild::RecvGetProfile(nsCString* aProfile)
 {
     char* profile = profiler_get_profile();
     if (profile) {
diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
index 303142066cf2..8315b6f180fa 100644
--- a/dom/ipc/ContentChild.h
+++ b/dom/ipc/ContentChild.h
@@ -365,7 +365,7 @@ public:
                                    const nsTArray<nsCString>& aFeatures,
                                    const nsTArray<nsCString>& aThreadNameFilters) MOZ_OVERRIDE;
     virtual bool RecvStopProfiler() MOZ_OVERRIDE;
-    virtual bool AnswerGetProfile(nsCString* aProfile) MOZ_OVERRIDE;
+    virtual bool RecvGetProfile(nsCString* aProfile) MOZ_OVERRIDE;
 
 #ifdef ANDROID
     gfxIntSize GetScreenSize() { return mScreenSize; }
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index b982e3a37d30..6fba7bf4e462 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2869,7 +2869,7 @@ ContentParent::Observe(nsISupports* aSubject,
         nsCOMPtr<nsIProfileSaveEvent> pse = do_QueryInterface(aSubject);
         if (pse) {
             nsCString result;
-            unused << CallGetProfile(&result);
+            unused << SendGetProfile(&result);
             if (!result.IsEmpty()) {
                 pse->AddSubProfile(result.get());
             }
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index fc751b7e4d89..4ee89e32db55 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -521,7 +521,7 @@ child:
     async StartProfiler(uint32_t aEntries, double aInterval, nsCString[] aFeatures,
                         nsCString[] aThreadNameFilters);
     async StopProfiler();
-    intr GetProfile()
+    prio(high) sync GetProfile()
       returns (nsCString aProfile);
 
     NuwaFreeze();

From 93dadf555164042b4b4088f9994de15a78727bf2 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:36:20 -0800
Subject: [PATCH 062/183] Bug 1111412 - Make sure slow script timeout is
 initialized when event starts running (r=bholley)

---
 js/xpconnect/src/nsXPConnect.cpp | 3 +++
 js/xpconnect/src/xpcprivate.h    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index 4b803ad7bb49..ed3c44d3bf0a 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -1033,6 +1033,9 @@ nsXPConnect::OnProcessNextEvent(nsIThreadInternal *aThread, bool aMayWait,
     // Record this event.
     mEventDepth++;
 
+    // Start the slow script timer.
+    mRuntime->OnProcessNextEvent();
+
     // Push a null JSContext so that we don't see any script during
     // event processing.
     bool ok = PushJSContextNoScriptContext(nullptr);
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 78d0f716aad0..689765e9c10a 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -622,6 +622,8 @@ public:
     void DeleteSingletonScopes();
 
     PRTime GetWatchdogTimestamp(WatchdogTimestampCategory aCategory);
+
+    void OnProcessNextEvent() { mSlowScriptCheckpoint = mozilla::TimeStamp::NowLoRes(); }
     void OnAfterProcessNextEvent() { mSlowScriptCheckpoint = mozilla::TimeStamp(); }
 
     nsTArray<nsXPCWrappedJS*>& WrappedJSToReleaseArray() { return mWrappedJSToReleaseArray; }

From 559c57d4554862727b66199329305207b1edf709 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Thu, 18 Dec 2014 17:36:20 -0800
Subject: [PATCH 063/183] Bug 1113006 - Screen manager ScreenForBrowser message
 should return primary screen as fallback (r=mconley)

---
 dom/ipc/ScreenManagerParent.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/dom/ipc/ScreenManagerParent.cpp b/dom/ipc/ScreenManagerParent.cpp
index cc460ef4ac20..19c7f42235fb 100644
--- a/dom/ipc/ScreenManagerParent.cpp
+++ b/dom/ipc/ScreenManagerParent.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set sw=4 ts=8 et tw=80 : */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -131,14 +131,18 @@ ScreenManagerParent::RecvScreenForBrowser(PBrowserParent* aBrowser,
   // the nsIScreen it's on.
   TabParent* tabParent = static_cast<TabParent*>(aBrowser);
   nsCOMPtr<nsIWidget> widget = tabParent->GetWidget();
-  if (!widget) {
-    return true;
-  }
 
   nsCOMPtr<nsIScreen> screen;
-  if (widget->GetNativeData(NS_NATIVE_WINDOW)) {
-    mScreenMgr->ScreenForNativeWidget(widget->GetNativeData(NS_NATIVE_WINDOW),
-                                      getter_AddRefs(screen));
+  if (widget) {
+    if (widget->GetNativeData(NS_NATIVE_WINDOW)) {
+      mScreenMgr->ScreenForNativeWidget(widget->GetNativeData(NS_NATIVE_WINDOW),
+                                        getter_AddRefs(screen));
+    }
+  } else {
+    nsresult rv = mScreenMgr->GetPrimaryScreen(getter_AddRefs(screen));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return true;
+    }
   }
 
   NS_ENSURE_TRUE(screen, true);

From fbabe54826b9f99f1052c4d0796041622ea2e3b1 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Tue, 9 Dec 2014 16:45:59 -0500
Subject: [PATCH 064/183] Bug 1109302 - make moz.build *SOURCES variables emit
 proper objects; r=gps

Having SOURCES and its close relatives go through VariablePassthru
objects clutters the handling of VariablePassthru in build backends and
makes it less obvious how to handle things that actually get compiled.

Therefore, this patch introduces four new moz.build objects
corresponding to the major variants of SOURCES.  It looks like a large
patch, but there's an ample amount of new tests included, which accounts
for about half of the changes.
---
 .../mozbuild/backend/recursivemake.py         |  94 ++++++++++------
 .../mozbuild/mozbuild/backend/visualstudio.py |  25 ++++-
 python/mozbuild/mozbuild/frontend/data.py     |  49 ++++++++
 python/mozbuild/mozbuild/frontend/emitter.py  | 103 ++++++++++-------
 .../data/{variable_passthru => sources}/bar.c |   0
 .../{variable_passthru => sources}/bar.cpp    |   0
 .../{variable_passthru => sources}/bar.mm     |   0
 .../data/{variable_passthru => sources}/bar.s |   0
 .../data/{variable_passthru => sources}/baz.S |   0
 .../data/{variable_passthru => sources}/foo.S |   0
 .../{variable_passthru => sources}/foo.asm    |   0
 .../data/{variable_passthru => sources}/foo.c |   0
 .../{variable_passthru => sources}/foo.cpp    |   0
 .../{variable_passthru => sources}/foo.mm     |   0
 .../test/backend/data/sources/moz.build       |  14 +++
 .../backend/data/variable_passthru/moz.build  |  11 --
 .../test/backend/test_recursivemake.py        |  62 ++++++----
 .../fans.S => generated-sources/a.cpp}        |   0
 .../fans.asm => generated-sources/b.cc}       |   0
 .../fans.c => generated-sources/c.cxx}        |   0
 .../fans.cpp => generated-sources/d.c}        |   0
 .../fans.mm => generated-sources/e.m}         |   0
 .../tans.c => generated-sources/f.mm}         |   0
 .../tans.cpp => generated-sources/g.S}        |   0
 .../tans.mm => generated-sources/h.s}         |   0
 .../tans.s => generated-sources/i.asm}        |   0
 .../frontend/data/generated-sources/moz.build |  30 +++++
 .../test/frontend/data/host-sources/a.cpp     |   0
 .../test/frontend/data/host-sources/b.cc      |   0
 .../test/frontend/data/host-sources/c.cxx     |   0
 .../test/frontend/data/host-sources/d.c       |   0
 .../test/frontend/data/host-sources/e.mm      |   0
 .../test/frontend/data/host-sources/f.mm      |   0
 .../test/frontend/data/host-sources/moz.build |  18 +++
 .../mozbuild/test/frontend/data/sources/a.cpp |   0
 .../mozbuild/test/frontend/data/sources/b.cc  |   0
 .../mozbuild/test/frontend/data/sources/c.cxx |   0
 .../mozbuild/test/frontend/data/sources/d.c   |   0
 .../mozbuild/test/frontend/data/sources/e.m   |   0
 .../mozbuild/test/frontend/data/sources/f.mm  |   0
 .../mozbuild/test/frontend/data/sources/g.S   |   0
 .../mozbuild/test/frontend/data/sources/h.s   |   0
 .../mozbuild/test/frontend/data/sources/i.asm |   0
 .../test/frontend/data/sources/moz.build      |  30 +++++
 .../frontend/data/unified-sources/bar.cxx     |   0
 .../test/frontend/data/unified-sources/c1.c   |   0
 .../test/frontend/data/unified-sources/c2.c   |   0
 .../frontend/data/unified-sources/foo.cpp     |   0
 .../frontend/data/unified-sources/moz.build   |  21 ++++
 .../frontend/data/unified-sources/objc1.mm    |   0
 .../frontend/data/unified-sources/objc2.mm    |   0
 .../frontend/data/unified-sources/quux.cc     |   0
 .../frontend/data/variable-passthru/moz.build |  11 --
 .../mozbuild/test/frontend/test_emitter.py    | 106 +++++++++++++++++-
 54 files changed, 441 insertions(+), 133 deletions(-)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/bar.c (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/bar.cpp (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/bar.mm (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/bar.s (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/baz.S (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/foo.S (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/foo.asm (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/foo.c (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/foo.cpp (100%)
 rename python/mozbuild/mozbuild/test/backend/data/{variable_passthru => sources}/foo.mm (100%)
 create mode 100644 python/mozbuild/mozbuild/test/backend/data/sources/moz.build
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/fans.S => generated-sources/a.cpp} (100%)
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/fans.asm => generated-sources/b.cc} (100%)
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/fans.c => generated-sources/c.cxx} (100%)
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/fans.cpp => generated-sources/d.c} (100%)
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/fans.mm => generated-sources/e.m} (100%)
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/tans.c => generated-sources/f.mm} (100%)
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/tans.cpp => generated-sources/g.S} (100%)
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/tans.mm => generated-sources/h.s} (100%)
 rename python/mozbuild/mozbuild/test/frontend/data/{variable-passthru/tans.s => generated-sources/i.asm} (100%)
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/generated-sources/moz.build
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/host-sources/a.cpp
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/host-sources/b.cc
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/host-sources/c.cxx
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/host-sources/d.c
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/host-sources/e.mm
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/host-sources/f.mm
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/host-sources/moz.build
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/a.cpp
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/b.cc
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/c.cxx
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/d.c
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/e.m
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/f.mm
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/g.S
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/h.s
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/i.asm
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/sources/moz.build
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/unified-sources/bar.cxx
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/unified-sources/c1.c
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/unified-sources/c2.c
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/unified-sources/foo.cpp
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/unified-sources/moz.build
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/unified-sources/objc1.mm
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/unified-sources/objc2.mm
 create mode 100644 python/mozbuild/mozbuild/test/frontend/data/unified-sources/quux.cc

diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 9be54bdd0268..809407badb59 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -38,9 +38,11 @@ from ..frontend.data import (
     ExternalLibrary,
     FinalTargetFiles,
     GeneratedInclude,
+    GeneratedSources,
     HostLibrary,
     HostProgram,
     HostSimpleProgram,
+    HostSources,
     InstallationTarget,
     IPDLFile,
     JARManifest,
@@ -53,9 +55,11 @@ from ..frontend.data import (
     Resources,
     SharedLibrary,
     SimpleProgram,
+    Sources,
     StaticLibrary,
     TestHarnessFiles,
     TestManifest,
+    UnifiedSources,
     VariablePassthru,
     XPIDLFile,
 )
@@ -359,46 +363,70 @@ class RecursiveMakeBackend(CommonBackend):
             # CommonBackend.
             assert os.path.basename(obj.output_path) == 'Makefile'
             self._create_makefile(obj)
-        elif isinstance(obj, VariablePassthru):
-            unified_suffixes = dict(
-                UNIFIED_CSRCS='c',
-                UNIFIED_CMMSRCS='mm',
-                UNIFIED_CPPSRCS='cpp',
-            )
+        elif isinstance(obj, (Sources, GeneratedSources)):
+            suffix_map = {
+                '.s': 'ASFILES',
+                '.c': 'CSRCS',
+                '.m': 'CMSRCS',
+                '.mm': 'CMMSRCS',
+                '.cpp': 'CPPSRCS',
+                '.S': 'SSRCS',
+            }
+            var = suffix_map[obj.canonical_suffix]
+            for f in sorted(obj.files):
+                backend_file.write('%s += %s\n' % (var, f))
+        elif isinstance(obj, HostSources):
+            suffix_map = {
+                '.c': 'HOST_CSRCS',
+                '.mm': 'HOST_CMMSRCS',
+                '.cpp': 'HOST_CPPSRCS',
+            }
+            var = suffix_map[obj.canonical_suffix]
+            for f in sorted(obj.files):
+                backend_file.write('%s += %s\n' % (var, f))
+        elif isinstance(obj, UnifiedSources):
+            suffix_map = {
+                '.c': 'UNIFIED_CSRCS',
+                '.mm': 'UNIFIED_CMMSRCS',
+                '.cpp': 'UNIFIED_CPPSRCS',
+            }
 
-            files_per_unification = 16
-            if 'FILES_PER_UNIFIED_FILE' in obj.variables.keys():
-                files_per_unification = obj.variables['FILES_PER_UNIFIED_FILE']
+            var = suffix_map[obj.canonical_suffix]
+            non_unified_var = var[len('UNIFIED_'):]
 
+            files_per_unification = obj.files_per_unified_file
             do_unify = not self.environment.substs.get(
                 'MOZ_DISABLE_UNIFIED_COMPILATION') and files_per_unification > 1
+            # Sorted so output is consistent and we don't bump mtimes.
+            source_files = list(sorted(obj.files))
 
+            if do_unify:
+                # On Windows, path names have a maximum length of 255 characters,
+                # so avoid creating extremely long path names.
+                unified_prefix = mozpath.relpath(backend_file.objdir,
+                    backend_file.environment.topobjdir)
+                if len(unified_prefix) > 20:
+                    unified_prefix = unified_prefix[-20:].split('/', 1)[-1]
+                unified_prefix = unified_prefix.replace('/', '_')
+
+                suffix = obj.canonical_suffix[1:]
+                self._add_unified_build_rules(backend_file, source_files,
+                    backend_file.objdir,
+                    unified_prefix='Unified_%s_%s' % (
+                        suffix,
+                        unified_prefix),
+                    unified_suffix=suffix,
+                    unified_files_makefile_variable=var,
+                    include_curdir_build_rules=False,
+                    files_per_unified_file=files_per_unification)
+                backend_file.write('%s += $(%s)\n' % (non_unified_var, var))
+            else:
+                backend_file.write('%s += %s\n' % (
+                    non_unified_var, ' '.join(source_files)))
+        elif isinstance(obj, VariablePassthru):
             # Sorted so output is consistent and we don't bump mtimes.
             for k, v in sorted(obj.variables.items()):
-                if k in unified_suffixes:
-                    if do_unify:
-                        # On Windows, path names have a maximum length of 255 characters,
-                        # so avoid creating extremely long path names.
-                        unified_prefix = mozpath.relpath(backend_file.objdir,
-                            backend_file.environment.topobjdir)
-                        if len(unified_prefix) > 20:
-                            unified_prefix = unified_prefix[-20:].split('/', 1)[-1]
-                        unified_prefix = unified_prefix.replace('/', '_')
-
-                        self._add_unified_build_rules(backend_file, v,
-                            backend_file.objdir,
-                            unified_prefix='Unified_%s_%s' % (
-                                unified_suffixes[k],
-                                unified_prefix),
-                            unified_suffix=unified_suffixes[k],
-                            unified_files_makefile_variable=k,
-                            include_curdir_build_rules=False,
-                            files_per_unified_file=files_per_unification)
-                        backend_file.write('%s += $(%s)\n' % (k[len('UNIFIED_'):], k))
-                    else:
-                        backend_file.write('%s += %s\n' % (
-                            k[len('UNIFIED_'):], ' '.join(sorted(v))))
-                elif isinstance(v, list):
+                if isinstance(v, list):
                     for item in v:
                         backend_file.write('%s += %s\n' % (k, item))
                 elif isinstance(v, bool):
diff --git a/python/mozbuild/mozbuild/backend/visualstudio.py b/python/mozbuild/mozbuild/backend/visualstudio.py
index b3df063df118..3aec1342e536 100644
--- a/python/mozbuild/mozbuild/backend/visualstudio.py
+++ b/python/mozbuild/mozbuild/backend/visualstudio.py
@@ -20,9 +20,12 @@ from mozpack.files import FileFinder
 from .common import CommonBackend
 from ..frontend.data import (
     Defines,
+    GeneratedSources,
+    HostSources,
     Library,
     LocalInclude,
-    VariablePassthru,
+    Sources,
+    UnifiedSources,
 )
 
 
@@ -97,11 +100,17 @@ class VisualStudioBackend(CommonBackend):
         if hasattr(obj, 'config') and reldir not in self._paths_to_configs:
             self._paths_to_configs[reldir] = obj.config
 
-        if isinstance(obj, VariablePassthru):
-            for k, v in obj.variables.items():
-                if k.endswith('SRCS'):
-                    s = self._paths_to_sources.setdefault(reldir, set())
-                    s.update(v)
+        if isinstance(obj, Sources):
+            self._add_sources(self, reldir, obj)
+
+        elif isinstance(obj, HostSources):
+            self._add_sources(self, reldir, obj)
+
+        elif isinstance(obj, GeneratedSources):
+            self._add_sources(self, reldir, obj)
+
+        elif isinstance(obj, UnifiedSources):
+            self._addr_sources(self, reldir, obj)
 
         elif isinstance(obj, Library):
             self._libs_to_paths[obj.basename] = reldir
@@ -118,6 +127,10 @@ class VisualStudioBackend(CommonBackend):
             else:
                 includes.append(os.path.join('$(TopSrcDir)', reldir, p))
 
+    def _add_sources(self, reldir, obj):
+        s = self._paths_to_sources.setdefault(reldir, set())
+        s.update(obj.files)
+
     def consume_finished(self):
         out_dir = self._out_dir
         try:
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
index d9dc8d0c3e1a..ddb17920e548 100644
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@@ -726,6 +726,55 @@ class JavaJarData(object):
         self.javac_flags = list(javac_flags)
 
 
+class BaseSources(ContextDerived):
+    """Base class for files to be compiled during the build."""
+
+    __slots__ = (
+        'files',
+        'canonical_suffix',
+    )
+
+    def __init__(self, context, files, canonical_suffix):
+        ContextDerived.__init__(self, context)
+
+        self.files = files
+        self.canonical_suffix = canonical_suffix
+
+
+class Sources(BaseSources):
+    """Represents files to be compiled during the build."""
+
+    def __init__(self, context, files, canonical_suffix):
+        BaseSources.__init__(self, context, files, canonical_suffix)
+
+
+class GeneratedSources(BaseSources):
+    """Represents generated files to be compiled during the build."""
+
+    def __init__(self, context, files, canonical_suffix):
+        BaseSources.__init__(self, context, files, canonical_suffix)
+
+
+class HostSources(BaseSources):
+    """Represents files to be compiled for the host during the build."""
+
+    def __init__(self, context, files, canonical_suffix):
+        BaseSources.__init__(self, context, files, canonical_suffix)
+
+
+class UnifiedSources(BaseSources):
+    """Represents files to be compiled in a unified fashion during the build."""
+
+    __slots__ = (
+        'files_per_unified_file',
+    )
+
+    def __init__(self, context, files, canonical_suffix, files_per_unified_file=16):
+        BaseSources.__init__(self, context, files, canonical_suffix)
+
+        self.files_per_unified_file = files_per_unified_file
+
+
 class InstallationTarget(ContextDerived):
     """Describes the rules that affect where files get installed to."""
 
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 413162fe1965..f3f087e31dcc 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -33,6 +33,7 @@ from .data import (
     FinalTargetFiles,
     GeneratedEventWebIDLFile,
     GeneratedInclude,
+    GeneratedSources,
     GeneratedWebIDLFile,
     ExampleWebIDLInterface,
     ExternalStaticLibrary,
@@ -41,6 +42,7 @@ from .data import (
     HostLibrary,
     HostProgram,
     HostSimpleProgram,
+    HostSources,
     InstallationTarget,
     IPDLFile,
     JARManifest,
@@ -57,10 +59,12 @@ from .data import (
     Resources,
     SharedLibrary,
     SimpleProgram,
+    Sources,
     StaticLibrary,
     TestHarnessFiles,
     TestWebIDLFile,
     TestManifest,
+    UnifiedSources,
     VariablePassthru,
     WebIDLFile,
     XPIDLFile,
@@ -396,7 +400,6 @@ class TreeMetadataEmitter(LoggingMixin):
             'EXTRA_DSO_LDOPTS',
             'EXTRA_PP_COMPONENTS',
             'FAIL_ON_WARNINGS',
-            'FILES_PER_UNIFIED_FILE',
             'USE_STATIC_LIBS',
             'GENERATED_FILES',
             'IS_GYP_DIR',
@@ -428,47 +431,6 @@ class TreeMetadataEmitter(LoggingMixin):
         if context['NO_VISIBILITY_FLAGS']:
             passthru.variables['VISIBILITY_FLAGS'] = ''
 
-        varmap = dict(
-            SOURCES={
-                '.s': 'ASFILES',
-                '.asm': 'ASFILES',
-                '.c': 'CSRCS',
-                '.m': 'CMSRCS',
-                '.mm': 'CMMSRCS',
-                '.cc': 'CPPSRCS',
-                '.cpp': 'CPPSRCS',
-                '.cxx': 'CPPSRCS',
-                '.S': 'SSRCS',
-            },
-            HOST_SOURCES={
-                '.c': 'HOST_CSRCS',
-                '.mm': 'HOST_CMMSRCS',
-                '.cc': 'HOST_CPPSRCS',
-                '.cpp': 'HOST_CPPSRCS',
-                '.cxx': 'HOST_CPPSRCS',
-            },
-            UNIFIED_SOURCES={
-                '.c': 'UNIFIED_CSRCS',
-                '.mm': 'UNIFIED_CMMSRCS',
-                '.cc': 'UNIFIED_CPPSRCS',
-                '.cpp': 'UNIFIED_CPPSRCS',
-                '.cxx': 'UNIFIED_CPPSRCS',
-            }
-        )
-        varmap.update(dict(('GENERATED_%s' % k, v) for k, v in varmap.items()
-                           if k in ('SOURCES', 'UNIFIED_SOURCES')))
-        for variable, mapping in varmap.items():
-            for f in context[variable]:
-                ext = mozpath.splitext(f)[1]
-                if ext not in mapping:
-                    raise SandboxValidationError(
-                        '%s has an unknown file type.' % f, context)
-                l = passthru.variables.setdefault(mapping[ext], [])
-                l.append(f)
-                if variable.startswith('GENERATED_'):
-                    l = passthru.variables.setdefault('GARBAGE', [])
-                    l.append(f)
-
         no_pgo = context.get('NO_PGO')
         sources = context.get('SOURCES', [])
         no_pgo_sources = [f for f in sources if sources[f].no_pgo]
@@ -480,6 +442,63 @@ class TreeMetadataEmitter(LoggingMixin):
         if no_pgo_sources:
             passthru.variables['NO_PROFILE_GUIDED_OPTIMIZE'] = no_pgo_sources
 
+        # A map from "canonical suffixes" for a particular source file
+        # language to the range of suffixes associated with that language.
+        #
+        # We deliberately don't list the canonical suffix in the suffix list
+        # in the definition; we'll add it in programmatically after defining
+        # things.
+        suffix_map = {
+            '.s': set(['.asm']),
+            '.c': set(),
+            '.m': set(),
+            '.mm': set(),
+            '.cpp': set(['.cc', '.cxx']),
+            '.S': set(),
+        }
+
+        # The inverse of the above, mapping suffixes to their canonical suffix.
+        canonicalized_suffix_map = {}
+        for suffix, alternatives in suffix_map.iteritems():
+            alternatives.add(suffix)
+            for a in alternatives:
+                canonicalized_suffix_map[a] = suffix
+
+        def canonical_suffix_for_file(f):
+            return canonicalized_suffix_map[mozpath.splitext(f)[1]]
+
+        # A map from moz.build variables to the canonical suffixes of file
+        # kinds that can be listed therein.
+        all_suffixes = list(suffix_map.keys())
+        varmap = dict(
+            SOURCES=(Sources, all_suffixes),
+            HOST_SOURCES=(HostSources, ['.c', '.mm', '.cpp']),
+            UNIFIED_SOURCES=(UnifiedSources, ['.c', '.mm', '.cpp']),
+            GENERATED_SOURCES=(GeneratedSources, all_suffixes),
+        )
+
+        for variable, (klass, suffixes) in varmap.items():
+            allowed_suffixes = set().union(*[suffix_map[s] for s in suffixes])
+
+            # First ensure that we haven't been given filetypes that we don't
+            # recognize.
+            for f in context[variable]:
+                ext = mozpath.splitext(f)[1]
+                if ext not in allowed_suffixes:
+                    raise SandboxValidationError(
+                        '%s has an unknown file type.' % f, context)
+                if variable.startswith('GENERATED_'):
+                    l = passthru.variables.setdefault('GARBAGE', [])
+                    l.append(f)
+
+            # Now sort the files to let groupby work.
+            sorted_files = sorted(context[variable], key=canonical_suffix_for_file)
+            for canonical_suffix, files in itertools.groupby(sorted_files, canonical_suffix_for_file):
+                arglist = [context, list(files), canonical_suffix]
+                if variable.startswith('UNIFIED_') and 'FILES_PER_UNIFIED_FILE' in context:
+                    arglist.append(context['FILES_PER_UNIFIED_FILE'])
+                yield klass(*arglist)
+
         sources_with_flags = [f for f in sources if sources[f].flags]
         for f in sources_with_flags:
             ext = mozpath.splitext(f)[1]
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.c b/python/mozbuild/mozbuild/test/backend/data/sources/bar.c
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.c
rename to python/mozbuild/mozbuild/test/backend/data/sources/bar.c
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.cpp b/python/mozbuild/mozbuild/test/backend/data/sources/bar.cpp
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.cpp
rename to python/mozbuild/mozbuild/test/backend/data/sources/bar.cpp
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.mm b/python/mozbuild/mozbuild/test/backend/data/sources/bar.mm
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.mm
rename to python/mozbuild/mozbuild/test/backend/data/sources/bar.mm
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.s b/python/mozbuild/mozbuild/test/backend/data/sources/bar.s
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/bar.s
rename to python/mozbuild/mozbuild/test/backend/data/sources/bar.s
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/baz.S b/python/mozbuild/mozbuild/test/backend/data/sources/baz.S
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/baz.S
rename to python/mozbuild/mozbuild/test/backend/data/sources/baz.S
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.S b/python/mozbuild/mozbuild/test/backend/data/sources/foo.S
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.S
rename to python/mozbuild/mozbuild/test/backend/data/sources/foo.S
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.asm b/python/mozbuild/mozbuild/test/backend/data/sources/foo.asm
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.asm
rename to python/mozbuild/mozbuild/test/backend/data/sources/foo.asm
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.c b/python/mozbuild/mozbuild/test/backend/data/sources/foo.c
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.c
rename to python/mozbuild/mozbuild/test/backend/data/sources/foo.c
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.cpp b/python/mozbuild/mozbuild/test/backend/data/sources/foo.cpp
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.cpp
rename to python/mozbuild/mozbuild/test/backend/data/sources/foo.cpp
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.mm b/python/mozbuild/mozbuild/test/backend/data/sources/foo.mm
similarity index 100%
rename from python/mozbuild/mozbuild/test/backend/data/variable_passthru/foo.mm
rename to python/mozbuild/mozbuild/test/backend/data/sources/foo.mm
diff --git a/python/mozbuild/mozbuild/test/backend/data/sources/moz.build b/python/mozbuild/mozbuild/test/backend/data/sources/moz.build
new file mode 100644
index 000000000000..cf998764148a
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/backend/data/sources/moz.build
@@ -0,0 +1,14 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+SOURCES += ['bar.s', 'foo.asm']
+
+HOST_SOURCES += ['bar.cpp', 'foo.cpp']
+HOST_SOURCES += ['bar.c', 'foo.c']
+
+SOURCES += ['bar.c', 'foo.c']
+
+SOURCES += ['bar.mm', 'foo.mm']
+
+SOURCES += ['baz.S', 'foo.S']
diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
index c5e2d03d6ab9..f4f5bf23430e 100644
--- a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
@@ -2,20 +2,9 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-SOURCES += ['bar.s', 'foo.asm']
-
 EXTRA_COMPONENTS = ['bar.js', 'foo.js']
 EXTRA_PP_COMPONENTS = ['bar.pp.js', 'foo.pp.js']
 
-HOST_SOURCES += ['bar.cpp', 'foo.cpp']
-HOST_SOURCES += ['bar.c', 'foo.c']
-
-SOURCES += ['bar.c', 'foo.c']
-
-SOURCES += ['bar.mm', 'foo.mm']
-
-SOURCES += ['baz.S', 'foo.S']
-
 FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 NO_VISIBILITY_FLAGS = True
diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
index 32f9d5c90ff4..08dada9a8803 100644
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ -260,18 +260,6 @@ class TestRecursiveMakeBackend(BackendTester):
         lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
 
         expected = {
-            'ASFILES': [
-                'ASFILES += bar.s',
-                'ASFILES += foo.asm',
-            ],
-            'CMMSRCS': [
-                'CMMSRCS += bar.mm',
-                'CMMSRCS += foo.mm',
-            ],
-            'CSRCS': [
-                'CSRCS += bar.c',
-                'CSRCS += foo.c',
-            ],
             'DISABLE_STL_WRAPPING': [
                 'DISABLE_STL_WRAPPING := 1',
             ],
@@ -286,21 +274,9 @@ class TestRecursiveMakeBackend(BackendTester):
             'FAIL_ON_WARNINGS': [
                 'FAIL_ON_WARNINGS := 1',
             ],
-            'HOST_CPPSRCS': [
-                'HOST_CPPSRCS += bar.cpp',
-                'HOST_CPPSRCS += foo.cpp',
-            ],
-            'HOST_CSRCS': [
-                'HOST_CSRCS += bar.c',
-                'HOST_CSRCS += foo.c',
-            ],
             'MSVC_ENABLE_PGO': [
                 'MSVC_ENABLE_PGO := 1',
             ],
-            'SSRCS': [
-                'SSRCS += baz.S',
-                'SSRCS += foo.S',
-            ],
             'VISIBILITY_FLAGS': [
                 'VISIBILITY_FLAGS :=',
             ],
@@ -343,6 +319,44 @@ class TestRecursiveMakeBackend(BackendTester):
             found = [str for str in lines if str.startswith(var)]
             self.assertEqual(found, val)
 
+    def test_sources(self):
+        """Ensure SOURCES and HOST_SOURCES are handled properly."""
+        env = self._consume('sources', RecursiveMakeBackend)
+
+        backend_path = mozpath.join(env.topobjdir, 'backend.mk')
+        lines = [l.strip() for l in open(backend_path, 'rt').readlines()[2:]]
+
+        expected = {
+            'ASFILES': [
+                'ASFILES += bar.s',
+                'ASFILES += foo.asm',
+            ],
+            'CMMSRCS': [
+                'CMMSRCS += bar.mm',
+                'CMMSRCS += foo.mm',
+            ],
+            'CSRCS': [
+                'CSRCS += bar.c',
+                'CSRCS += foo.c',
+            ],
+            'HOST_CPPSRCS': [
+                'HOST_CPPSRCS += bar.cpp',
+                'HOST_CPPSRCS += foo.cpp',
+            ],
+            'HOST_CSRCS': [
+                'HOST_CSRCS += bar.c',
+                'HOST_CSRCS += foo.c',
+            ],
+            'SSRCS': [
+                'SSRCS += baz.S',
+                'SSRCS += foo.S',
+            ],
+        }
+
+        for var, val in expected.items():
+            found = [str for str in lines if str.startswith(var)]
+            self.assertEqual(found, val)
+
     def test_exports(self):
         """Ensure EXPORTS is handled properly."""
         env = self._consume('exports', RecursiveMakeBackend)
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.S b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/a.cpp
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.S
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/a.cpp
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.asm b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/b.cc
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.asm
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/b.cc
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.c b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/c.cxx
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.c
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/c.cxx
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.cpp b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/d.c
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.cpp
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/d.c
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.mm b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/e.m
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/fans.mm
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/e.m
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.c b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/f.mm
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.c
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/f.mm
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.cpp b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/g.S
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.cpp
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/g.S
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.mm b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/h.s
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.mm
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/h.s
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.s b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/i.asm
similarity index 100%
rename from python/mozbuild/mozbuild/test/frontend/data/variable-passthru/tans.s
rename to python/mozbuild/mozbuild/test/frontend/data/generated-sources/i.asm
diff --git a/python/mozbuild/mozbuild/test/frontend/data/generated-sources/moz.build b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/moz.build
new file mode 100644
index 000000000000..b07448f2dab2
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/frontend/data/generated-sources/moz.build
@@ -0,0 +1,30 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+GENERATED_SOURCES += [
+    'a.cpp',
+    'b.cc',
+    'c.cxx',
+]
+
+GENERATED_SOURCES += [
+    'd.c',
+]
+
+GENERATED_SOURCES += [
+    'e.m',
+]
+
+GENERATED_SOURCES += [
+    'f.mm',
+]
+
+GENERATED_SOURCES += [
+    'g.S',
+]
+
+GENERATED_SOURCES += [
+    'h.s',
+    'i.asm',
+]
diff --git a/python/mozbuild/mozbuild/test/frontend/data/host-sources/a.cpp b/python/mozbuild/mozbuild/test/frontend/data/host-sources/a.cpp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/host-sources/b.cc b/python/mozbuild/mozbuild/test/frontend/data/host-sources/b.cc
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/host-sources/c.cxx b/python/mozbuild/mozbuild/test/frontend/data/host-sources/c.cxx
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/host-sources/d.c b/python/mozbuild/mozbuild/test/frontend/data/host-sources/d.c
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/host-sources/e.mm b/python/mozbuild/mozbuild/test/frontend/data/host-sources/e.mm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/host-sources/f.mm b/python/mozbuild/mozbuild/test/frontend/data/host-sources/f.mm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/host-sources/moz.build b/python/mozbuild/mozbuild/test/frontend/data/host-sources/moz.build
new file mode 100644
index 000000000000..97be75b38775
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/frontend/data/host-sources/moz.build
@@ -0,0 +1,18 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+HOST_SOURCES += [
+    'a.cpp',
+    'b.cc',
+    'c.cxx',
+]
+
+HOST_SOURCES += [
+    'd.c',
+]
+
+HOST_SOURCES += [
+    'e.mm',
+    'f.mm',
+]
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/a.cpp b/python/mozbuild/mozbuild/test/frontend/data/sources/a.cpp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/b.cc b/python/mozbuild/mozbuild/test/frontend/data/sources/b.cc
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/c.cxx b/python/mozbuild/mozbuild/test/frontend/data/sources/c.cxx
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/d.c b/python/mozbuild/mozbuild/test/frontend/data/sources/d.c
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/e.m b/python/mozbuild/mozbuild/test/frontend/data/sources/e.m
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/f.mm b/python/mozbuild/mozbuild/test/frontend/data/sources/f.mm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/g.S b/python/mozbuild/mozbuild/test/frontend/data/sources/g.S
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/h.s b/python/mozbuild/mozbuild/test/frontend/data/sources/h.s
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/i.asm b/python/mozbuild/mozbuild/test/frontend/data/sources/i.asm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/sources/moz.build b/python/mozbuild/mozbuild/test/frontend/data/sources/moz.build
new file mode 100644
index 000000000000..1063a3989a5a
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/frontend/data/sources/moz.build
@@ -0,0 +1,30 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+SOURCES += [
+    'a.cpp',
+    'b.cc',
+    'c.cxx',
+]
+
+SOURCES += [
+    'd.c',
+]
+
+SOURCES += [
+    'e.m',
+]
+
+SOURCES += [
+    'f.mm',
+]
+
+SOURCES += [
+    'g.S',
+]
+
+SOURCES += [
+    'h.s',
+    'i.asm',
+]
diff --git a/python/mozbuild/mozbuild/test/frontend/data/unified-sources/bar.cxx b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/bar.cxx
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/unified-sources/c1.c b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/c1.c
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/unified-sources/c2.c b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/c2.c
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/unified-sources/foo.cpp b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/foo.cpp
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/unified-sources/moz.build b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/moz.build
new file mode 100644
index 000000000000..872c32cae091
--- /dev/null
+++ b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/moz.build
@@ -0,0 +1,21 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+UNIFIED_SOURCES += [
+    'bar.cxx',
+    'foo.cpp',
+    'quux.cc',
+]
+
+UNIFIED_SOURCES += [
+    'objc1.mm',
+    'objc2.mm',
+]
+
+UNIFIED_SOURCES += [
+    'c1.c',
+    'c2.c',
+]
+
+FILES_PER_UNIFIED_FILE = 32
diff --git a/python/mozbuild/mozbuild/test/frontend/data/unified-sources/objc1.mm b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/objc1.mm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/unified-sources/objc2.mm b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/objc2.mm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/unified-sources/quux.cc b/python/mozbuild/mozbuild/test/frontend/data/unified-sources/quux.cc
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
index d1264a95287e..b88099196d4f 100644
--- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
@@ -2,20 +2,9 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-SOURCES += ['fans.asm', 'tans.s']
-
 EXTRA_COMPONENTS=['fans.js', 'tans.js']
 EXTRA_PP_COMPONENTS=['fans.pp.js', 'tans.pp.js']
 
-HOST_SOURCES += ['fans.cpp', 'tans.cpp']
-HOST_SOURCES += ['fans.c', 'tans.c']
-
-SOURCES += ['fans.c', 'tans.c']
-
-SOURCES += ['fans.mm', 'tans.mm']
-
-SOURCES += ['bans.S', 'fans.S']
-
 FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
index 1400a8048725..862d0f5171ce 100644
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@@ -15,6 +15,8 @@ from mozbuild.frontend.data import (
     DirectoryTraversal,
     Exports,
     GeneratedInclude,
+    GeneratedSources,
+    HostSources,
     IPDLFile,
     JARManifest,
     LocalInclude,
@@ -22,9 +24,11 @@ from mozbuild.frontend.data import (
     ReaderSummary,
     Resources,
     SimpleProgram,
+    Sources,
     StaticLibrary,
     TestHarnessFiles,
     TestManifest,
+    UnifiedSources,
     VariablePassthru,
 )
 from mozbuild.frontend.emitter import TreeMetadataEmitter
@@ -152,18 +156,12 @@ class TestEmitterBasic(unittest.TestCase):
         self.assertIsInstance(objs[0], VariablePassthru)
 
         wanted = {
-            'ASFILES': ['fans.asm', 'tans.s'],
-            'CMMSRCS': ['fans.mm', 'tans.mm'],
-            'CSRCS': ['fans.c', 'tans.c'],
             'DISABLE_STL_WRAPPING': True,
             'EXTRA_COMPONENTS': ['fans.js', 'tans.js'],
             'EXTRA_PP_COMPONENTS': ['fans.pp.js', 'tans.pp.js'],
             'FAIL_ON_WARNINGS': True,
-            'HOST_CPPSRCS': ['fans.cpp', 'tans.cpp'],
-            'HOST_CSRCS': ['fans.c', 'tans.c'],
             'MSVC_ENABLE_PGO': True,
             'NO_DIST_INSTALL': True,
-            'SSRCS': ['bans.S', 'fans.S'],
             'VISIBILITY_FLAGS': '',
             'RCFILE': 'foo.rc',
             'RESFILE': 'bar.res',
@@ -617,5 +615,101 @@ class TestEmitterBasic(unittest.TestCase):
             defines[lib.basename] = ' '.join(lib.defines.get_defines())
         self.assertEqual(expected, defines)
 
+    def test_sources(self):
+        """Test that SOURCES works properly."""
+        reader = self.reader('sources')
+        objs = self.read_topsrcdir(reader)
+
+        self.assertEqual(len(objs), 6)
+        for o in objs:
+            self.assertIsInstance(o, Sources)
+
+        suffix_map = {obj.canonical_suffix: obj for obj in objs}
+        self.assertEqual(len(suffix_map), 6)
+
+        expected = {
+            '.cpp': ['a.cpp', 'b.cc', 'c.cxx'],
+            '.c': ['d.c'],
+            '.m': ['e.m'],
+            '.mm': ['f.mm'],
+            '.S': ['g.S'],
+            '.s': ['h.s', 'i.asm'],
+        }
+        for suffix, files in expected.items():
+            sources = suffix_map[suffix]
+            self.assertEqual(sources.files, files)
+
+    def test_sources(self):
+        """Test that GENERATED_SOURCES works properly."""
+        reader = self.reader('generated-sources')
+        objs = self.read_topsrcdir(reader)
+
+        self.assertEqual(len(objs), 7)
+
+        # GENERATED_SOURCES automatically generate GARBAGE definitions.
+        garbage = [o for o in objs if isinstance(o, VariablePassthru)]
+        self.assertEqual(len(garbage), 1)
+
+        generated_sources = [o for o in objs if isinstance(o, GeneratedSources)]
+        self.assertEqual(len(generated_sources), 6)
+
+        suffix_map = {obj.canonical_suffix: obj for obj in generated_sources}
+        self.assertEqual(len(suffix_map), 6)
+
+        expected = {
+            '.cpp': ['a.cpp', 'b.cc', 'c.cxx'],
+            '.c': ['d.c'],
+            '.m': ['e.m'],
+            '.mm': ['f.mm'],
+            '.S': ['g.S'],
+            '.s': ['h.s', 'i.asm'],
+        }
+        for suffix, files in expected.items():
+            sources = suffix_map[suffix]
+            self.assertEqual(sources.files, files)
+
+    def test_host_sources(self):
+        """Test that HOST_SOURCES works properly."""
+        reader = self.reader('host-sources')
+        objs = self.read_topsrcdir(reader)
+
+        self.assertEqual(len(objs), 3)
+        for o in objs:
+            self.assertIsInstance(o, HostSources)
+
+        suffix_map = {obj.canonical_suffix: obj for obj in objs}
+        self.assertEqual(len(suffix_map), 3)
+
+        expected = {
+            '.cpp': ['a.cpp', 'b.cc', 'c.cxx'],
+            '.c': ['d.c'],
+            '.mm': ['e.mm', 'f.mm'],
+        }
+        for suffix, files in expected.items():
+            sources = suffix_map[suffix]
+            self.assertEqual(sources.files, files)
+
+    def test_unified_sources(self):
+        """Test that UNIFIED_SOURCES works properly."""
+        reader = self.reader('unified-sources')
+        objs = self.read_topsrcdir(reader)
+
+        self.assertEqual(len(objs), 3)
+        for o in objs:
+            self.assertIsInstance(o, UnifiedSources)
+
+        suffix_map = {obj.canonical_suffix: obj for obj in objs}
+        self.assertEqual(len(suffix_map), 3)
+
+        expected = {
+            '.cpp': ['bar.cxx', 'foo.cpp', 'quux.cc'],
+            '.mm': ['objc1.mm', 'objc2.mm'],
+            '.c': ['c1.c', 'c2.c'],
+        }
+        for suffix, files in expected.items():
+            sources = suffix_map[suffix]
+            self.assertEqual(sources.files, files)
+            self.assertEqual(sources.files_per_unified_file, 32)
+
 if __name__ == '__main__':
     main()

From 6b5de8498e455b53e349b1f071221f7fed363165 Mon Sep 17 00:00:00 2001
From: Xidorn Quan <quanxunzhen@gmail.com>
Date: Fri, 19 Dec 2014 09:50:20 +1100
Subject: [PATCH 065/183] Bug 1103644 - Try default browser for "mach
 resource-usage" if the specified one doesn't work. r=gps DONTBUILD

--HG--
extra : rebase_source : 78aa8c5f3e89dae0680f5688d0b0c80093e7549b
extra : amend_source : bd2dfce52c1647831dba1b3fbb2790bfce0beae0
extra : histedit_source : 2f0640e53e7ac359e4c050f73f86546518211e1e
---
 python/mozbuild/mozbuild/mach_commands.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index c58d708cb2a0..5d88585e1d34 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -547,7 +547,11 @@ class Build(MachCommandBase):
         try:
             webbrowser.get(browser).open_new_tab(server.url)
         except Exception:
-            print('Please open %s in a browser.' % server.url)
+            print('Cannot get browser specified, trying the default instead.')
+            try:
+                browser = webbrowser.get().open_new_tab(server.url)
+            except Exception:
+                print('Please open %s in a browser.' % server.url)
 
         print('Hit CTRL+c to stop server.')
         server.run()

From 208ab0c4e1acae010771b5269120965aeee407a7 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 18 Dec 2014 14:14:31 -0800
Subject: [PATCH 066/183] Bug 1113010 (part 0) - Remove impossible path in
 AddFrameConstruct(). r=dholbert.

Infallible new ensures that |item| is always non-null. And even if it didn't,
AppendItem() dereferences |item| before this code is reached.

--HG--
extra : rebase_source : 9abb8704ba03f455d6b77c5735fcb6cde4f8fef8
---
 layout/base/nsCSSFrameConstructor.cpp | 7 -------
 layout/base/nsCSSFrameConstructor.h   | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index b0257d19b282..3015551325ed 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -5691,13 +5691,6 @@ nsCSSFrameConstructor::AddFrameConstructionItemsInternal(nsFrameConstructorState
     aItems.AppendItem(data, aContent, aTag, aNameSpaceID,
                       pendingBinding, styleContext.forget(),
                       aSuppressWhiteSpaceOptimizations, aAnonChildren);
-  if (!item) {
-    if (isGeneratedContent) {
-      aContent->UnbindFromTree();
-    }
-    return;
-  }
-
   item->mIsText = isText;
   item->mIsGeneratedContent = isGeneratedContent;
   item->mIsAnonymousContentCreatorContent =
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 12706f0cb8fb..1f45ba4fe644 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -831,6 +831,7 @@ private:
     // aSuppressWhiteSpaceOptimizations is true if optimizations that
     // skip constructing whitespace frames for this item or items
     // around it cannot be performed.
+    // Also, the return value is always non-null, thanks to infallible 'new'.
     FrameConstructionItem* AppendItem(const FrameConstructionData* aFCData,
                                       nsIContent* aContent,
                                       nsIAtom* aTag,

From 77cbf48a56fd4f0db89471f45adb2d6f01b0cc31 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 18 Dec 2014 14:14:58 -0800
Subject: [PATCH 067/183] Bug 1113010 (part 1) - Shrink FrameConstructionItem
 by reordering some fields. r=dholbert.

This reduces its size from 176 bytes to 168 bytes on 64-bit platforms.

--HG--
extra : rebase_source : 89b4f1c6e618eb1ab75989162c26308753a59d56
---
 layout/base/nsCSSFrameConstructor.h | 44 ++++++++++++++---------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 1f45ba4fe644..d6a5b740cdc2 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -1043,8 +1043,8 @@ private:
                           bool aSuppressWhiteSpaceOptimizations,
                           nsTArray<nsIAnonymousContentCreator::ContentInfo>* aAnonChildren) :
       mFCData(aFCData), mContent(aContent), mTag(aTag),
-      mNameSpaceID(aNameSpaceID),
       mPendingBinding(aPendingBinding), mStyleContext(aStyleContext),
+      mNameSpaceID(aNameSpaceID),
       mSuppressWhiteSpaceOptimizations(aSuppressWhiteSpaceOptimizations),
       mIsText(false), mIsGeneratedContent(false),
       mIsAnonymousContentCreatorContent(false),
@@ -1088,14 +1088,31 @@ private:
       return mIsBlock || (mFCData->mBits & FCDATA_IS_LINE_BREAK);
     }
 
+    // Child frame construction items.
+    FrameConstructionItemList mChildItems;
+
+    // ContentInfo list for children that have yet to have
+    // FrameConstructionItem objects created for them. This exists because
+    // AddFrameConstructionItemsInternal needs a valid frame, but in the case
+    // that nsIAnonymousContentCreator::CreateAnonymousContent returns items
+    // that have their own children (so we have a tree of ContentInfo objects
+    // rather than a flat list) we don't yet have a frame to provide to
+    // AddFrameConstructionItemsInternal in order to create the items for the
+    // grandchildren. That prevents FrameConstructionItems from being created
+    // for these grandchildren (and any descendants that they may have),
+    // otherwise they could have been added to the mChildItems member of their
+    // parent FrameConstructionItem. As it is, the grandchildren ContentInfo
+    // list has to be stored in this mAnonChildren member in order to delay
+    // construction of the FrameConstructionItems for the grandchildren until
+    // a frame has been created for their parent item.
+    nsTArray<nsIAnonymousContentCreator::ContentInfo> mAnonChildren;
+
     // The FrameConstructionData to use.
     const FrameConstructionData* mFCData;
     // The nsIContent node to use when initializing the new frame.
     nsIContent* mContent;
     // The XBL-resolved tag name to use for frame construction.
     nsIAtom* mTag;
-    // The XBL-resolved namespace to use for frame construction.
-    int32_t mNameSpaceID;
     // The PendingBinding for this frame construction item, if any.  May be
     // null.  We maintain a list of PendingBindings in the frame construction
     // state in the order in which AddToAttachedQueue should be called on them:
@@ -1107,6 +1124,8 @@ private:
     PendingBinding* mPendingBinding;
     // The style context to use for creating the new frame.
     nsRefPtr<nsStyleContext> mStyleContext;
+    // The XBL-resolved namespace to use for frame construction.
+    int32_t mNameSpaceID;
     // Whether optimizations to skip constructing textframes around
     // this content need to be suppressed.
     bool mSuppressWhiteSpaceOptimizations;
@@ -1143,25 +1162,6 @@ private:
     // Whether this item is for an SVG <a> element
     bool mIsForSVGAElement;
 
-    // Child frame construction items.
-    FrameConstructionItemList mChildItems;
-
-    // ContentInfo list for children that have yet to have
-    // FrameConstructionItem objects created for them. This exists because
-    // AddFrameConstructionItemsInternal needs a valid frame, but in the case
-    // that nsIAnonymousContentCreator::CreateAnonymousContent returns items
-    // that have their own children (so we have a tree of ContentInfo objects
-    // rather than a flat list) we don't yet have a frame to provide to
-    // AddFrameConstructionItemsInternal in order to create the items for the
-    // grandchildren. That prevents FrameConstructionItems from being created
-    // for these grandchildren (and any descendants that they may have),
-    // otherwise they could have been added to the mChildItems member of their
-    // parent FrameConstructionItem. As it is, the grandchildren ContentInfo
-    // list has to be stored in this mAnonChildren member in order to delay
-    // construction of the FrameConstructionItems for the grandchildren until
-    // a frame has been created for their parent item.
-    nsTArray<nsIAnonymousContentCreator::ContentInfo> mAnonChildren;
-
   private:
     FrameConstructionItem(const FrameConstructionItem& aOther) MOZ_DELETE; /* not implemented */
   };

From c7fe36c3692ae2c042f2166018562ee114444881 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 18 Dec 2014 14:15:18 -0800
Subject: [PATCH 068/183] Bug 1113010 (part 2) - Shrink FrameConstructionItem
 by using bitfields. r=dholbert.

This reduces its size from 168 bytes to 160 bytes on 64-bit platforms.

--HG--
extra : rebase_source : de9bb482ccbdb85efa79f82083fa8f35bb629078
---
 layout/base/nsCSSFrameConstructor.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index d6a5b740cdc2..5de8869f9f76 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -1128,39 +1128,39 @@ private:
     int32_t mNameSpaceID;
     // Whether optimizations to skip constructing textframes around
     // this content need to be suppressed.
-    bool mSuppressWhiteSpaceOptimizations;
+    bool mSuppressWhiteSpaceOptimizations:1;
     // Whether this is a text content item.
-    bool mIsText;
+    bool mIsText:1;
     // Whether this is a generated content container.
     // If it is, mContent is a strong pointer.
-    bool mIsGeneratedContent;
+    bool mIsGeneratedContent:1;
     // Whether this is an item for nsIAnonymousContentCreator content.
-    bool mIsAnonymousContentCreatorContent;
+    bool mIsAnonymousContentCreatorContent:1;
     // Whether this is an item for the root popupgroup.
-    bool mIsRootPopupgroup;
+    bool mIsRootPopupgroup:1;
     // Whether construction from this item will create only frames that are
     // IsInlineOutside() in the principal child list.  This is not precise, but
     // conservative: if true the frames will really be inline, whereas if false
     // they might still all be inline.
-    bool mIsAllInline;
+    bool mIsAllInline:1;
     // Whether construction from this item will create only frames that are
     // IsBlockOutside() in the principal child list.  This is not precise, but
     // conservative: if true the frames will really be blocks, whereas if false
     // they might still be blocks (and in particular, out-of-flows that didn't
     // find a containing block).
-    bool mIsBlock;
+    bool mIsBlock:1;
     // Whether construction from this item will give leading and trailing
     // inline frames.  This is equal to mIsAllInline, except for inline frame
     // items, where it's always true, whereas mIsAllInline might be false due
     // to {ib} splits.
-    bool mHasInlineEnds;
+    bool mHasInlineEnds:1;
     // Whether construction from this item will create a popup that needs to
     // go into the global popup items.
-    bool mIsPopup;
+    bool mIsPopup:1;
     // Whether this item should be treated as a line participant
-    bool mIsLineParticipant;
+    bool mIsLineParticipant:1;
     // Whether this item is for an SVG <a> element
-    bool mIsForSVGAElement;
+    bool mIsForSVGAElement:1;
 
   private:
     FrameConstructionItem(const FrameConstructionItem& aOther) MOZ_DELETE; /* not implemented */

From ddd94333b7372211457eb50e34e07f7b960dd816 Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Fri, 19 Dec 2014 14:32:34 +1100
Subject: [PATCH 069/183] Bug 649145 - Store properties on
 nsCSSCompressedDataBlocks in declaration order. r=dbaron

---
 layout/style/Declaration.h      |  3 +-
 layout/style/nsCSSDataBlock.cpp | 66 ++++++++++++++++++++++-----------
 layout/style/nsCSSDataBlock.h   |  6 ++-
 3 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/layout/style/Declaration.h b/layout/style/Declaration.h
index da79d8171739..99e419371d83 100644
--- a/layout/style/Declaration.h
+++ b/layout/style/Declaration.h
@@ -146,7 +146,8 @@ public:
     NS_ABORT_IF_FALSE(!mData, "oops");
     NS_ABORT_IF_FALSE(!mImportantData, "oops");
     aExpandedData->Compress(getter_Transfers(mData),
-                            getter_Transfers(mImportantData));
+                            getter_Transfers(mImportantData),
+                            mOrder);
     aExpandedData->AssertInitialState();
   }
 
diff --git a/layout/style/nsCSSDataBlock.cpp b/layout/style/nsCSSDataBlock.cpp
index bc6f3ab60f93..2191bf513a37 100644
--- a/layout/style/nsCSSDataBlock.cpp
+++ b/layout/style/nsCSSDataBlock.cpp
@@ -395,7 +395,8 @@ nsCSSExpandedDataBlock::ComputeNumProps(uint32_t* aNumPropsNormal,
 
 void
 nsCSSExpandedDataBlock::Compress(nsCSSCompressedDataBlock **aNormalBlock,
-                                 nsCSSCompressedDataBlock **aImportantBlock)
+                                 nsCSSCompressedDataBlock **aImportantBlock,
+                                 const nsTArray<uint32_t>& aOrder)
 {
     nsAutoPtr<nsCSSCompressedDataBlock> result_normal, result_important;
     uint32_t i_normal = 0, i_important = 0;
@@ -418,29 +419,29 @@ nsCSSExpandedDataBlock::Compress(nsCSSCompressedDataBlock **aNormalBlock,
      * corresponding to the stored data in the expanded block, and then
      * clearing the data in the expanded block.
      */
-    for (size_t iHigh = 0; iHigh < nsCSSPropertySet::kChunkCount; ++iHigh) {
-        if (!mPropertiesSet.HasPropertyInChunk(iHigh))
+    for (size_t i = 0; i < aOrder.Length(); i++) {
+        nsCSSProperty iProp = static_cast<nsCSSProperty>(aOrder[i]);
+        if (iProp >= eCSSProperty_COUNT) {
+            // a custom property
             continue;
-        for (size_t iLow = 0; iLow < nsCSSPropertySet::kBitsInChunk; ++iLow) {
-            if (!mPropertiesSet.HasPropertyAt(iHigh, iLow))
-                continue;
-            nsCSSProperty iProp = nsCSSPropertySet::CSSPropertyAt(iHigh, iLow);
-            NS_ABORT_IF_FALSE(!nsCSSProps::IsShorthand(iProp), "out of range");
-            bool important =
-                mPropertiesImportant.HasPropertyAt(iHigh, iLow);
-            nsCSSCompressedDataBlock *result =
-                important ? result_important : result_normal;
-            uint32_t* ip = important ? &i_important : &i_normal;
-            nsCSSValue* val = PropertyAt(iProp);
-            NS_ABORT_IF_FALSE(val->GetUnit() != eCSSUnit_Null,
-                              "Null value while compressing");
-            result->SetPropertyAtIndex(*ip, iProp);
-            result->RawCopyValueToIndex(*ip, val);
-            new (val) nsCSSValue();
-            (*ip)++;
-            result->mStyleBits |=
-                nsCachedStyleData::GetBitForSID(nsCSSProps::kSIDTable[iProp]);
         }
+        NS_ABORT_IF_FALSE(mPropertiesSet.HasProperty(iProp),
+                          "aOrder identifies a property not in the expanded "
+                          "data block");
+        NS_ABORT_IF_FALSE(!nsCSSProps::IsShorthand(iProp), "out of range");
+        bool important = mPropertiesImportant.HasProperty(iProp);
+        nsCSSCompressedDataBlock *result =
+            important ? result_important : result_normal;
+        uint32_t* ip = important ? &i_important : &i_normal;
+        nsCSSValue* val = PropertyAt(iProp);
+        NS_ABORT_IF_FALSE(val->GetUnit() != eCSSUnit_Null,
+                          "Null value while compressing");
+        result->SetPropertyAtIndex(*ip, iProp);
+        result->RawCopyValueToIndex(*ip, val);
+        new (val) nsCSSValue();
+        (*ip)++;
+        result->mStyleBits |=
+            nsCachedStyleData::GetBitForSID(nsCSSProps::kSIDTable[iProp]);
     }
 
     NS_ABORT_IF_FALSE(numPropsNormal == i_normal, "bad numProps");
@@ -449,6 +450,27 @@ nsCSSExpandedDataBlock::Compress(nsCSSCompressedDataBlock **aNormalBlock,
         NS_ABORT_IF_FALSE(numPropsImportant == i_important, "bad numProps");
     }
 
+#ifdef DEBUG
+    {
+      // assert that we didn't have any other properties on this expanded data
+      // block that we didn't find in aOrder
+      uint32_t numPropsInSet = 0;
+      for (size_t iHigh = 0; iHigh < nsCSSPropertySet::kChunkCount; iHigh++) {
+          if (!mPropertiesSet.HasPropertyInChunk(iHigh)) {
+              continue;
+          }
+          for (size_t iLow = 0; iLow < nsCSSPropertySet::kBitsInChunk; iLow++) {
+              if (mPropertiesSet.HasPropertyAt(iHigh, iLow)) {
+                  numPropsInSet++;
+              }
+          }
+      }
+      NS_ABORT_IF_FALSE(numPropsNormal + numPropsImportant == numPropsInSet,
+                        "aOrder missing properties from the expanded data "
+                        "block");
+    }
+#endif
+
     ClearSets();
     AssertInitialState();
     *aNormalBlock = result_normal.forget();
diff --git a/layout/style/nsCSSDataBlock.h b/layout/style/nsCSSDataBlock.h
index 5417840c2fad..e09692d10d55 100644
--- a/layout/style/nsCSSDataBlock.h
+++ b/layout/style/nsCSSDataBlock.h
@@ -207,9 +207,13 @@ public:
      * an important block will only be allocated if there are
      * !important properties in the expanded block; otherwise
      * |*aImportantBlock| will be set to null.
+     *
+     * aOrder is an array of nsCSSProperty values specifying the order
+     * to store values in the two data blocks.
      */
     void Compress(nsCSSCompressedDataBlock **aNormalBlock,
-                  nsCSSCompressedDataBlock **aImportantBlock);
+                  nsCSSCompressedDataBlock **aImportantBlock,
+                  const nsTArray<uint32_t>& aOrder);
 
     /**
      * Copy a value into this expanded block.  This does NOT destroy

From f789afa81c1e527ebc9c7565f6f27aedb20391e9 Mon Sep 17 00:00:00 2001
From: Seth Fowler <seth@mozilla.com>
Date: Thu, 18 Dec 2014 19:50:56 -0800
Subject: [PATCH 070/183] Bug 1111041 - Detect PR_GetPhysicalMemorySize failure
 in SurfaceCache. r=dholbert

---
 image/src/SurfaceCache.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/image/src/SurfaceCache.cpp b/image/src/SurfaceCache.cpp
index 56c4979c8160..6034d534b888 100644
--- a/image/src/SurfaceCache.cpp
+++ b/image/src/SurfaceCache.cpp
@@ -10,6 +10,7 @@
 #include "SurfaceCache.h"
 
 #include <algorithm>
+#include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"  // for MOZ_THIS_IN_INITIALIZER_LIST
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Likely.h"
@@ -752,7 +753,12 @@ SurfaceCache::Initialize()
     max(gfxPrefs::ImageMemSurfaceCacheSizeFactor(), 1u);
 
   // Compute the size of the surface cache.
-  uint64_t proposedSize = PR_GetPhysicalMemorySize() / surfaceCacheSizeFactor;
+  uint64_t memorySize = PR_GetPhysicalMemorySize();
+  if (memorySize == 0) {
+    MOZ_ASSERT_UNREACHABLE("PR_GetPhysicalMemorySize not implemented here");
+    memorySize = 256 * 1024 * 1024;  // Fall back to 256MB.
+  }
+  uint64_t proposedSize = memorySize / surfaceCacheSizeFactor;
   uint64_t surfaceCacheSizeBytes = min(proposedSize, surfaceCacheMaxSizeKB * 1024);
   uint32_t finalSurfaceCacheSizeBytes =
     min(surfaceCacheSizeBytes, uint64_t(UINT32_MAX));

From 097e391f9bebf866b685842ecadff5393a36b818 Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Thu, 18 Dec 2014 12:17:53 -0800
Subject: [PATCH 071/183] Bug 1113210 - Suppress -Wunused-function clang
 warning about AtkSocketAccessible.cpp's gobject RTTI macros. r=tbsaunde

---
 accessible/atk/moz.build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/accessible/atk/moz.build b/accessible/atk/moz.build
index f5abe301fd55..9b945da81a41 100644
--- a/accessible/atk/moz.build
+++ b/accessible/atk/moz.build
@@ -52,4 +52,8 @@ if CONFIG['MOZ_ENABLE_DBUS']:
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+if CONFIG['CLANG_CXX']:
+    # Suppress clang warning about unused function from gobject's RTTI macros.
+    CXXFLAGS += ['-Wno-unused-function']
+
 FAIL_ON_WARNINGS = True

From 0f26945357e72138a9fbbdae0550738ef862defd Mon Sep 17 00:00:00 2001
From: Jordan Lund <jlund@mozilla.com>
Date: Thu, 18 Dec 2014 20:58:50 -0800
Subject: [PATCH 072/183] Bug 1073772 - Releng work for two ARMv7 APKs - nonuni
 mozconfig fix for api 11, r=rnewman

---
 .../android/config/mozconfigs/android-api-11/debug-nonunified   | 2 +-
 .../android/config/mozconfigs/android-api-11/nightly-nonunified | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/config/mozconfigs/android-api-11/debug-nonunified b/mobile/android/config/mozconfigs/android-api-11/debug-nonunified
index 4aee2b10df03..13f7d49cc831 100644
--- a/mobile/android/config/mozconfigs/android-api-11/debug-nonunified
+++ b/mobile/android/config/mozconfigs/android-api-11/debug-nonunified
@@ -1,4 +1,4 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/android-api-10/debug"
+. "$topsrcdir/mobile/android/config/mozconfigs/android-api-11/debug"
 
 ac_add_options --disable-unified-compilation
 
diff --git a/mobile/android/config/mozconfigs/android-api-11/nightly-nonunified b/mobile/android/config/mozconfigs/android-api-11/nightly-nonunified
index d4f72ea8a3e1..8229a4d5ab13 100644
--- a/mobile/android/config/mozconfigs/android-api-11/nightly-nonunified
+++ b/mobile/android/config/mozconfigs/android-api-11/nightly-nonunified
@@ -1,4 +1,4 @@
-. "$topsrcdir/mobile/android/config/mozconfigs/android-api-10/nightly"
+. "$topsrcdir/mobile/android/config/mozconfigs/android-api-11/nightly"
 
 ac_add_options --disable-unified-compilation
 

From 53da6fb716f40bbb2f0b3b69cdaf16c2536056a7 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 18 Dec 2014 18:59:53 -0800
Subject: [PATCH 073/183] Bug 1112968 - dmd.py: Tweak the --alloc-fns list for
 better effect on Windows. r=mccr8.

--HG--
extra : rebase_source : 3dc8a09f9a22bf234406c0ff89d7b4050c7908e7
---
 memory/replace/dmd/dmd.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/memory/replace/dmd/dmd.py b/memory/replace/dmd/dmd.py
index 4a48a7c319ec..8ce6fb85033a 100755
--- a/memory/replace/dmd/dmd.py
+++ b/memory/replace/dmd/dmd.py
@@ -37,6 +37,8 @@ allocatorFns = [
     'memalign',
     'operator new(',
     'operator new[](',
+    'NS_Alloc',
+    'NS_Realloc',
     'g_slice_alloc',
     # This one necessary to fully filter some sequences of allocation functions
     # that happen in practice. Note that ??? entries that follow non-allocation

From dee00140c084a355fb5bc399d138eb6e26e823ac Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 18 Dec 2014 21:23:28 -0800
Subject: [PATCH 074/183] Bug 1113037 - Use stack allocation in
 DrawTargetCairo::FillGlyphs() in the common case. r=mattwoodrow.

--HG--
extra : rebase_source : f6270322664121cec3c82a7448c80963df6b0e5f
---
 gfx/2d/DrawTargetCairo.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gfx/2d/DrawTargetCairo.cpp b/gfx/2d/DrawTargetCairo.cpp
index b9586c52092f..61dc9da1616d 100644
--- a/gfx/2d/DrawTargetCairo.cpp
+++ b/gfx/2d/DrawTargetCairo.cpp
@@ -12,6 +12,7 @@
 #include "BorrowedContext.h"
 #include "FilterNodeSoftware.h"
 #include "mozilla/Scoped.h"
+#include "mozilla/Vector.h"
 
 #include "cairo.h"
 #include "cairo-tee.h"
@@ -1148,8 +1149,16 @@ DrawTargetCairo::FillGlyphs(ScaledFont *aFont,
 
   cairo_set_antialias(mContext, GfxAntialiasToCairoAntialias(aOptions.mAntialiasMode));
 
-  // Convert our GlyphBuffer into an array of Cairo glyphs.
-  std::vector<cairo_glyph_t> glyphs(aBuffer.mNumGlyphs);
+  // Convert our GlyphBuffer into a vector of Cairo glyphs. This code can
+  // execute millions of times in short periods, so we want to avoid heap
+  // allocation whenever possible. So we use an inline vector capacity of 1024
+  // bytes (the maximum allowed by mozilla::Vector), which gives an inline
+  // length of 1024 / 24 = 42 elements, which is enough to typically avoid heap
+  // allocation in ~99% of cases.
+  Vector<cairo_glyph_t, 1024 / sizeof(cairo_glyph_t)> glyphs;
+  if (!glyphs.resizeUninitialized(aBuffer.mNumGlyphs)) {
+    MOZ_CRASH("glyphs allocation failed");
+  }
   for (uint32_t i = 0; i < aBuffer.mNumGlyphs; ++i) {
     glyphs[i].index = aBuffer.mGlyphs[i].mIndex;
     glyphs[i].x = aBuffer.mGlyphs[i].mPosition.x;

From d5ae4983a3a47c8889b3caab98e78d8fae85f579 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Thu, 18 Dec 2014 21:23:30 -0800
Subject: [PATCH 075/183] Bug 1113037 - Use stack allocation in
 DrawTargetCG::FillGlyphs() in the common case. r=mattwoodrow.

When viewing about:memory in verbose mode this reduces the number of heap
allocations by over 10%.

--HG--
extra : rebase_source : 954962295dcd90d66d0e02f782998884de879f17
---
 gfx/2d/DrawTargetCG.cpp | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/gfx/2d/DrawTargetCG.cpp b/gfx/2d/DrawTargetCG.cpp
index d0e4ba404e75..761f28eb43ba 100644
--- a/gfx/2d/DrawTargetCG.cpp
+++ b/gfx/2d/DrawTargetCG.cpp
@@ -2,6 +2,7 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 #include "BorrowedContext.h"
 #include "DataSurfaceHelpers.h"
 #include "DrawTargetCG.h"
@@ -15,8 +16,9 @@
 #include "MacIOSurface.h"
 #include "FilterNodeSoftware.h"
 #include "mozilla/Assertions.h"
-#include "mozilla/Types.h" // for decltype
 #include "mozilla/FloatingPoint.h"
+#include "mozilla/Types.h" // for decltype
+#include "mozilla/Vector.h"
 
 using namespace std;
 
@@ -1343,11 +1345,16 @@ DrawTargetCG::FillGlyphs(ScaledFont *aFont, const GlyphBuffer &aBuffer, const Pa
 
   ScaledFontMac* macFont = static_cast<ScaledFontMac*>(aFont);
 
-  //XXX: we should use a stack vector here when we have a class like that
-  std::vector<CGGlyph> glyphs;
-  std::vector<CGPoint> positions;
-  glyphs.resize(aBuffer.mNumGlyphs);
-  positions.resize(aBuffer.mNumGlyphs);
+  // This code can execute millions of times in short periods, so we want to
+  // avoid heap allocation whenever possible. So we use an inline vector
+  // capacity of 64 elements, which is enough to typically avoid heap
+  // allocation in ~99% of cases.
+  Vector<CGGlyph, 64> glyphs;
+  Vector<CGPoint, 64> positions;
+  if (!glyphs.resizeUninitialized(aBuffer.mNumGlyphs) ||
+      !positions.resizeUninitialized(aBuffer.mNumGlyphs)) {
+    MOZ_CRASH("glyphs/positions allocation failed");
+  }
 
   // Handle the flip
   CGContextScaleCTM(cg, 1, -1);
@@ -1370,19 +1377,19 @@ DrawTargetCG::FillGlyphs(ScaledFont *aFont, const GlyphBuffer &aBuffer, const Pa
     if (ScaledFontMac::CTFontDrawGlyphsPtr != nullptr) {
       CGRect *bboxes = new CGRect[aBuffer.mNumGlyphs];
       CTFontGetBoundingRectsForGlyphs(macFont->mCTFont, kCTFontDefaultOrientation,
-                                      &glyphs.front(), bboxes, aBuffer.mNumGlyphs);
-      extents = ComputeGlyphsExtents(bboxes, &positions.front(), aBuffer.mNumGlyphs, 1.0f);
-      ScaledFontMac::CTFontDrawGlyphsPtr(macFont->mCTFont, &glyphs.front(),
-                                         &positions.front(), aBuffer.mNumGlyphs, cg);
+                                      glyphs.begin(), bboxes, aBuffer.mNumGlyphs);
+      extents = ComputeGlyphsExtents(bboxes, positions.begin(), aBuffer.mNumGlyphs, 1.0f);
+      ScaledFontMac::CTFontDrawGlyphsPtr(macFont->mCTFont, glyphs.begin(),
+                                         positions.begin(), aBuffer.mNumGlyphs, cg);
       delete[] bboxes;
     } else {
       CGRect *bboxes = new CGRect[aBuffer.mNumGlyphs];
-      CGFontGetGlyphBBoxes(macFont->mFont, &glyphs.front(), aBuffer.mNumGlyphs, bboxes);
-      extents = ComputeGlyphsExtents(bboxes, &positions.front(), aBuffer.mNumGlyphs, macFont->mSize);
+      CGFontGetGlyphBBoxes(macFont->mFont, glyphs.begin(), aBuffer.mNumGlyphs, bboxes);
+      extents = ComputeGlyphsExtents(bboxes, positions.begin(), aBuffer.mNumGlyphs, macFont->mSize);
 
       CGContextSetFont(cg, macFont->mFont);
       CGContextSetFontSize(cg, macFont->mSize);
-      CGContextShowGlyphsAtPositions(cg, &glyphs.front(), &positions.front(),
+      CGContextShowGlyphsAtPositions(cg, glyphs.begin(), positions.begin(),
                                      aBuffer.mNumGlyphs);
       delete[] bboxes;
     }
@@ -1394,13 +1401,13 @@ DrawTargetCG::FillGlyphs(ScaledFont *aFont, const GlyphBuffer &aBuffer, const Pa
     CGContextSetTextDrawingMode(cg, kCGTextFill);
     SetFillFromPattern(cg, mColorSpace, aPattern);
     if (ScaledFontMac::CTFontDrawGlyphsPtr != nullptr) {
-      ScaledFontMac::CTFontDrawGlyphsPtr(macFont->mCTFont, &glyphs.front(),
-                                         &positions.front(),
+      ScaledFontMac::CTFontDrawGlyphsPtr(macFont->mCTFont, glyphs.begin(),
+                                         positions.begin(),
                                          aBuffer.mNumGlyphs, cg);
     } else {
       CGContextSetFont(cg, macFont->mFont);
       CGContextSetFontSize(cg, macFont->mSize);
-      CGContextShowGlyphsAtPositions(cg, &glyphs.front(), &positions.front(),
+      CGContextShowGlyphsAtPositions(cg, glyphs.begin(), positions.begin(),
                                      aBuffer.mNumGlyphs);
     }
   }

From a6dc11c7e31063a4b7f77cb3aeb3a60bcd22952e Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Dec 2014 22:26:52 -0800
Subject: [PATCH 076/183] Bug 1113282 - Check during async TrackBuffer decoder
 initialization to make sure we haven't been shut down. r=cajbir

---
 dom/media/mediasource/MediaSourceReader.cpp |  1 +
 dom/media/mediasource/TrackBuffer.cpp       | 38 +++++++++++++++++----
 dom/media/mediasource/TrackBuffer.h         |  1 +
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/dom/media/mediasource/MediaSourceReader.cpp b/dom/media/mediasource/MediaSourceReader.cpp
index 0818e9f9d8f5..58815262cf6a 100644
--- a/dom/media/mediasource/MediaSourceReader.cpp
+++ b/dom/media/mediasource/MediaSourceReader.cpp
@@ -327,6 +327,7 @@ MediaSourceReader::Shutdown()
 void
 MediaSourceReader::ContinueShutdown()
 {
+  ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
   if (mTrackBuffers.Length()) {
     mTrackBuffers[0]->Shutdown()->Then(GetTaskQueue(), __func__, this,
                                        &MediaSourceReader::ContinueShutdown,
diff --git a/dom/media/mediasource/TrackBuffer.cpp b/dom/media/mediasource/TrackBuffer.cpp
index d8ec425aef9a..a1ed3ce53ea2 100644
--- a/dom/media/mediasource/TrackBuffer.cpp
+++ b/dom/media/mediasource/TrackBuffer.cpp
@@ -39,12 +39,14 @@ TrackBuffer::TrackBuffer(MediaSourceDecoder* aParentDecoder, const nsACString& a
   : mParentDecoder(aParentDecoder)
   , mType(aType)
   , mLastStartTimestamp(0)
+  , mShutdown(false)
 {
   MOZ_COUNT_CTOR(TrackBuffer);
   mParser = ContainerParser::CreateForMIMEType(aType);
   mTaskQueue = new MediaTaskQueue(GetMediaDecodeThreadPool());
   aParentDecoder->AddTrackBuffer(this);
   mDecoderPerSegment = Preferences::GetBool("media.mediasource.decoder-per-segment", false);
+  MSE_DEBUG("TrackBuffer(%p) created for parent decoder %p", this, aParentDecoder);
 }
 
 TrackBuffer::~TrackBuffer()
@@ -101,6 +103,9 @@ private:
 nsRefPtr<ShutdownPromise>
 TrackBuffer::Shutdown()
 {
+  mParentDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+  mShutdown = true;
+
   MOZ_ASSERT(mShutdownPromise.IsEmpty());
   nsRefPtr<ShutdownPromise> p = mShutdownPromise.Ensure(__func__);
 
@@ -370,23 +375,42 @@ TrackBuffer::QueueInitializeDecoder(SourceBufferDecoder* aDecoder)
 void
 TrackBuffer::InitializeDecoder(SourceBufferDecoder* aDecoder)
 {
-  MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-
-  // ReadMetadata may block the thread waiting on data, so it must not be
-  // called with the monitor held.
+  // ReadMetadata may block the thread waiting on data, so we must be able
+  // to leave the monitor while we call it. For the rest of this function
+  // we want to hold the monitor though, since we run on a different task queue
+  // from the reader and interact heavily with it.
   mParentDecoder->GetReentrantMonitor().AssertNotCurrentThreadIn();
+  ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
 
+  // We may be shut down at any time by the reader on another thread. So we need
+  // to check for this each time we acquire the monitor. If that happens, we
+  // need to abort immediately, because the reader has forgotten about us, and
+  // important pieces of our state (like mTaskQueue) have also been torn down.
+  if (mShutdown) {
+    MSE_DEBUG("TrackBuffer(%p) was shut down. Aborting initialization.", this);
+    return;
+  }
+
+  MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
   MediaDecoderReader* reader = aDecoder->GetReader();
   MSE_DEBUG("TrackBuffer(%p): Initializing subdecoder %p reader %p",
             this, aDecoder, reader);
 
   MediaInfo mi;
   nsAutoPtr<MetadataTags> tags; // TODO: Handle metadata.
-  nsresult rv = reader->ReadMetadata(&mi, getter_Transfers(tags));
+  nsresult rv;
+  {
+    ReentrantMonitorAutoExit mon(mParentDecoder->GetReentrantMonitor());
+    rv = reader->ReadMetadata(&mi, getter_Transfers(tags));
+  }
+
   reader->SetIdle();
+  if (mShutdown) {
+    MSE_DEBUG("TrackBuffer(%p) was shut down while reading metadata. Aborting initialization.", this);
+    return;
+  }
 
   if (NS_SUCCEEDED(rv) && reader->IsWaitingOnCDMResource()) {
-    ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
     mWaitingDecoders.AppendElement(aDecoder);
     return;
   }
@@ -442,7 +466,7 @@ TrackBuffer::ValidateTrackFormats(const MediaInfo& aInfo)
 bool
 TrackBuffer::RegisterDecoder(SourceBufferDecoder* aDecoder)
 {
-  ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
+  mParentDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
   const MediaInfo& info = aDecoder->GetReader()->GetMediaInfo();
   // Initialize the track info since this is the first decoder.
   if (mInitializedDecoders.IsEmpty()) {
diff --git a/dom/media/mediasource/TrackBuffer.h b/dom/media/mediasource/TrackBuffer.h
index b7f416efd4e0..ecb40daff8b1 100644
--- a/dom/media/mediasource/TrackBuffer.h
+++ b/dom/media/mediasource/TrackBuffer.h
@@ -163,6 +163,7 @@ private:
   void ContinueShutdown();
   MediaPromiseHolder<ShutdownPromise> mShutdownPromise;
   bool mDecoderPerSegment;
+  bool mShutdown;
 };
 
 } // namespace mozilla

From fa9389fcece52a5dacba63d301f4f24ecf74bea7 Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Thu, 18 Dec 2014 17:06:08 -0800
Subject: [PATCH 077/183] Bug 1113308 - Further fixes for Windows builds via
 autospider.sh, r=terrence

--HG--
extra : rebase_source : c18239800e95ec9837fdf5334675abe9744cd2ed
---
 js/src/devtools/automation/winbuildenv.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/devtools/automation/winbuildenv.sh b/js/src/devtools/automation/winbuildenv.sh
index d3e7daebaa97..78030a9b8983 100644
--- a/js/src/devtools/automation/winbuildenv.sh
+++ b/js/src/devtools/automation/winbuildenv.sh
@@ -10,7 +10,7 @@ topsrcdir="$SOURCE"
 # When running on a developer machine, several variables will already
 # have the right settings and we will need to keep them since the
 # Windows mozconfigs overwrite them.
-export OLD_INCLUDE="$INCLUDE"
+export OLD_INCLUDE=$(IFS=';'; for d in $INCLUDE; do ( cd "$d" && echo -n $(pwd): ); done)
 export OLD_LIB=$(IFS=';'; for d in $LIB; do ( cd "$d" && echo -n $(pwd): ); done)
 export OLD_LIBPATH=$(IFS=';'; for d in $LIBPATH; do ( cd "$d" && echo -n $(pwd): ); done)
 
@@ -46,6 +46,6 @@ fi
 #
 # Note that the mozconfig will use msys-style paths and OLD_INCLUDE will use
 # Windows-style paths, but perl and cl.exe both seem ok with either.
-export INCLUDE="$(perl -le 'print join ":", grep { -d $_ } split(":", $ENV{INCLUDE}),split(";", $ENV{OLD_INCLUDE})')"
+export INCLUDE="$(perl -le 'print join ":", grep { -d $_ } split(":", $ENV{INCLUDE}),split(":", $ENV{OLD_INCLUDE})')"
 export LIB="$(perl -le 'print join ":", grep { -d $_ } split(":", $ENV{LIB}),split(":", $ENV{OLD_LIB})')"
 export LIBPATH="$(perl -le 'print join ":", grep { -d $_ } split(":", $ENV{LIBPATH}),split(":", $ENV{OLD_LIBPATH})')"

From 2faecc65b476081fe9077c6acab8e55f0a789692 Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Tue, 16 Dec 2014 19:42:45 -0800
Subject: [PATCH 078/183] Bug 1113031 - Replace deprecated expression closures
 in about:sessionrestore with real functions. r=ttaubert

---
 .../sessionstore/content/aboutSessionRestore.js           | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser/components/sessionstore/content/aboutSessionRestore.js b/browser/components/sessionstore/content/aboutSessionRestore.js
index 3cdaa1981635..bc9aea8aee52 100644
--- a/browser/components/sessionstore/content/aboutSessionRestore.js
+++ b/browser/components/sessionstore/content/aboutSessionRestore.js
@@ -124,7 +124,7 @@ function restoreSession() {
         if (gTreeData[t].checked === 0)
           // this window will be restored partially
           gStateObject.windows[ix].tabs =
-            gStateObject.windows[ix].tabs.filter(function(aTabData, aIx)
+            gStateObject.windows[ix].tabs.filter((aTabData, aIx) =>
                                                    gTreeData[t].tabs[aIx].checked);
         else if (!gTreeData[t].checked)
           // this window won't be restored at all
@@ -218,12 +218,14 @@ function getBrowserWindow() {
 }
 
 function toggleRowChecked(aIx) {
+  function isChecked(aItem) {
+    return aItem.checked;
+  }
+
   var item = gTreeData[aIx];
   item.checked = !item.checked;
   treeView.treeBox.invalidateRow(aIx);
 
-  function isChecked(aItem) aItem.checked;
-
   if (treeView.isContainer(aIx)) {
     // (un)check all tabs of this window as well
     for (let tab of item.tabs) {

From 2451d54e60948139d5b68bc9d516e8ef3f92bc30 Mon Sep 17 00:00:00 2001
From: Chris Peterson <cpeterson@mozilla.com>
Date: Tue, 16 Dec 2014 19:14:12 -0800
Subject: [PATCH 079/183] Bug 1113032 - Replace deprecated expression closures
 in about:newtab with real functions. r=ttaubert

---
 browser/base/content/newtab/cells.js |  2 +-
 browser/base/content/newtab/drag.js  |  8 ++++----
 browser/base/content/newtab/drop.js  |  2 +-
 browser/base/content/newtab/grid.js  | 10 +++++-----
 browser/base/content/newtab/sites.js |  8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/browser/base/content/newtab/cells.js b/browser/base/content/newtab/cells.js
index 23cbd23bfdbc..47d4ef52d7d8 100644
--- a/browser/base/content/newtab/cells.js
+++ b/browser/base/content/newtab/cells.js
@@ -29,7 +29,7 @@ Cell.prototype = {
   /**
    * The cell's DOM node.
    */
-  get node() this._node,
+  get node() { return this._node; },
 
   /**
    * The cell's offset in the grid.
diff --git a/browser/base/content/newtab/drag.js b/browser/base/content/newtab/drag.js
index dfbe8199a95c..8f0bf674ee92 100644
--- a/browser/base/content/newtab/drag.js
+++ b/browser/base/content/newtab/drag.js
@@ -18,15 +18,15 @@ let gDrag = {
    * The site that is dragged.
    */
   _draggedSite: null,
-  get draggedSite() this._draggedSite,
+  get draggedSite() { return this._draggedSite; },
 
   /**
    * The cell width/height at the point the drag started.
    */
   _cellWidth: null,
   _cellHeight: null,
-  get cellWidth() this._cellWidth,
-  get cellHeight() this._cellHeight,
+  get cellWidth() { return this._cellWidth; },
+  get cellHeight() { return this._cellHeight; },
 
   /**
    * Start a new drag operation.
@@ -146,6 +146,6 @@ let gDrag = {
 
     // After the 'dragstart' event has been processed we can remove the
     // temporary drag element from the DOM.
-    setTimeout(function () scrollbox.removeChild(dragElement), 0);
+    setTimeout(() => scrollbox.removeChild(dragElement), 0);
   }
 };
diff --git a/browser/base/content/newtab/drop.js b/browser/base/content/newtab/drop.js
index 7363396e81e4..d7bf30506881 100644
--- a/browser/base/content/newtab/drop.js
+++ b/browser/base/content/newtab/drop.js
@@ -73,7 +73,7 @@ let gDrop = {
     });
 
     // Re-pin all shifted pinned cells.
-    pinnedSites.forEach(function (aSite) aSite.pin(sites.indexOf(aSite)), this);
+    pinnedSites.forEach(aSite => aSite.pin(sites.indexOf(aSite)));
   },
 
   /**
diff --git a/browser/base/content/newtab/grid.js b/browser/base/content/newtab/grid.js
index 74b63d2d52e0..bdf9ab54aa92 100644
--- a/browser/base/content/newtab/grid.js
+++ b/browser/base/content/newtab/grid.js
@@ -18,7 +18,7 @@ let gGrid = {
    * The DOM node of the grid.
    */
   _node: null,
-  get node() this._node,
+  get node() { return this._node; },
 
   /**
    * The cached DOM fragment for sites.
@@ -29,18 +29,18 @@ let gGrid = {
    * All cells contained in the grid.
    */
   _cells: [],
-  get cells() this._cells,
+  get cells() { return this._cells; },
 
   /**
    * All sites contained in the grid's cells. Sites may be empty.
    */
-  get sites() [for (cell of this.cells) cell.site],
+  get sites() { return [for (cell of this.cells) cell.site]; },
 
   // Tells whether the grid has already been initialized.
-  get ready() !!this._ready,
+  get ready() { return !!this._ready; },
 
   // Returns whether the page has finished loading yet.
-  get isDocumentLoaded() document.readyState == "complete",
+  get isDocumentLoaded() { return document.readyState == "complete"; },
 
   /**
    * Initializes the grid.
diff --git a/browser/base/content/newtab/sites.js b/browser/base/content/newtab/sites.js
index d7ba6124d3f7..9ee9f62d9979 100644
--- a/browser/base/content/newtab/sites.js
+++ b/browser/base/content/newtab/sites.js
@@ -22,22 +22,22 @@ Site.prototype = {
   /**
    * The site's DOM node.
    */
-  get node() this._node,
+  get node() { return this._node; },
 
   /**
    * The site's link.
    */
-  get link() this._link,
+  get link() { return this._link; },
 
   /**
    * The url of the site's link.
    */
-  get url() this.link.url,
+  get url() { return this.link.url; },
 
   /**
    * The title of the site's link.
    */
-  get title() this.link.title,
+  get title() { return this.link.title; },
 
   /**
    * The site's parent cell.

From 449657cc1a1f2aaec70de09780dd91df078a7bd6 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Mon, 6 Oct 2014 16:45:14 +0100
Subject: [PATCH 080/183] Bug 1065366 - Implement ServiceWorkerGlobalScope
 update(), r=nsm

--HG--
extra : rebase_source : abdca619a27b46693ead93a6f468a40b2eeab2cf
---
 .../base/nsIServiceWorkerManager.idl          |  7 ++-
 dom/workers/ServiceWorkerManager.cpp          | 62 +++++++++++++------
 dom/workers/ServiceWorkerManager.h            |  7 +--
 dom/workers/WorkerScope.cpp                   | 41 ++++++++++++
 dom/workers/WorkerScope.h                     |  5 +-
 5 files changed, 93 insertions(+), 29 deletions(-)

diff --git a/dom/interfaces/base/nsIServiceWorkerManager.idl b/dom/interfaces/base/nsIServiceWorkerManager.idl
index 22616d20249f..f0aa315177fb 100644
--- a/dom/interfaces/base/nsIServiceWorkerManager.idl
+++ b/dom/interfaces/base/nsIServiceWorkerManager.idl
@@ -17,7 +17,7 @@ interface nsIServiceWorkerUnregisterCallback : nsISupports
   [noscript] void UnregisterFailed();
 };
 
-[builtinclass, uuid(79ad5b57-d65d-46d3-b5e9-32d27e16052d)]
+[builtinclass, uuid(78fdfe7c-0e2c-4157-ac6e-3952b61df36a)]
 interface nsIServiceWorkerManager : nsISupports
 {
   /**
@@ -83,6 +83,11 @@ interface nsIServiceWorkerManager : nsISupports
    */
   [noscript] nsISupports GetDocumentController(in nsIDOMWindow aWindow);
 
+  /*
+   * This implements the update algorithm.
+   */
+  void update(in DOMString aScope);
+
   // Testing
   DOMString getScopeForUrl(in DOMString path);
 };
diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index d68137104ab4..a0ff04d39849 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -259,7 +259,6 @@ class ServiceWorkerUpdateInstance MOZ_FINAL : public nsISupports
 {
   nsRefPtr<ServiceWorkerRegistrationInfo> mRegistration;
   nsCString mScriptSpec;
-  nsCOMPtr<nsPIDOMWindow> mWindow;
 
   bool mAborted;
 
@@ -268,12 +267,10 @@ class ServiceWorkerUpdateInstance MOZ_FINAL : public nsISupports
 public:
   NS_DECL_ISUPPORTS
 
-  ServiceWorkerUpdateInstance(ServiceWorkerRegistrationInfo *aRegistration,
-                              nsPIDOMWindow* aWindow)
+  explicit ServiceWorkerUpdateInstance(ServiceWorkerRegistrationInfo *aRegistration)
     : mRegistration(aRegistration),
       // Capture the current script spec in case register() gets called.
       mScriptSpec(aRegistration->mScriptSpec),
-      mWindow(aWindow),
       mAborted(false)
   {
     AssertIsOnMainThread();
@@ -300,10 +297,8 @@ public:
     MOZ_ASSERT(swm);
 
     nsRefPtr<ServiceWorker> serviceWorker;
-    nsresult rv = swm->CreateServiceWorkerForWindow(mWindow,
-                                                    mScriptSpec,
-                                                    mRegistration->mScope,
-                                                    getter_AddRefs(serviceWorker));
+    nsresult rv = swm->CreateServiceWorker(mScriptSpec, mRegistration->mScope,
+                                           getter_AddRefs(serviceWorker));
     if (NS_WARN_IF(NS_FAILED(rv))) {
       swm->RejectUpdatePromiseObservers(mRegistration, rv);
       return;
@@ -332,7 +327,7 @@ public:
 
     nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
     MOZ_ASSERT(swm);
-    swm->FinishFetch(mRegistration, mWindow);
+    swm->FinishFetch(mRegistration);
   }
 };
 
@@ -477,7 +472,7 @@ public:
 
     registration->mScriptSpec = spec;
 
-    rv = swm->Update(registration, mWindow);
+    rv = swm->Update(registration);
     MOZ_ASSERT(registration->HasUpdatePromise());
 
     // We append this register() call's promise after calling Update() because
@@ -950,9 +945,8 @@ ServiceWorkerManager::RejectUpdatePromiseObservers(ServiceWorkerRegistrationInfo
  * Update() does not return the Promise that the spec says it should. Callers
  * may access the registration's (new) Promise after calling this method.
  */
-NS_IMETHODIMP
-ServiceWorkerManager::Update(ServiceWorkerRegistrationInfo* aRegistration,
-                             nsPIDOMWindow* aWindow)
+nsresult
+ServiceWorkerManager::Update(ServiceWorkerRegistrationInfo* aRegistration)
 {
   if (aRegistration->HasUpdatePromise()) {
     NS_WARNING("Already had a UpdatePromise. Aborting that one!");
@@ -977,7 +971,7 @@ ServiceWorkerManager::Update(ServiceWorkerRegistrationInfo* aRegistration,
   // FIXME(nsm): Bug 931249. Force cache update if > 1 day.
 
   aRegistration->mUpdateInstance =
-    new ServiceWorkerUpdateInstance(aRegistration, aWindow);
+    new ServiceWorkerUpdateInstance(aRegistration);
   aRegistration->mUpdateInstance->Update();
 
   return NS_OK;
@@ -1101,8 +1095,7 @@ ServiceWorkerManager::ResolveRegisterPromises(ServiceWorkerRegistrationInfo* aRe
 
 // Must NS_Free() aString
 void
-ServiceWorkerManager::FinishFetch(ServiceWorkerRegistrationInfo* aRegistration,
-                                  nsPIDOMWindow* aWindow)
+ServiceWorkerManager::FinishFetch(ServiceWorkerRegistrationInfo* aRegistration)
 {
   AssertIsOnMainThread();
 
@@ -1117,10 +1110,9 @@ ServiceWorkerManager::FinishFetch(ServiceWorkerRegistrationInfo* aRegistration,
   // We have skipped Steps 3-8.3 of the Update algorithm here!
 
   nsRefPtr<ServiceWorker> worker;
-  nsresult rv = CreateServiceWorkerForWindow(aWindow,
-                                             aRegistration->mScriptSpec,
-                                             aRegistration->mScope,
-                                             getter_AddRefs(worker));
+  nsresult rv = CreateServiceWorker(aRegistration->mScriptSpec,
+                                    aRegistration->mScope,
+                                    getter_AddRefs(worker));
 
   if (NS_WARN_IF(NS_FAILED(rv))) {
     RejectUpdatePromiseObservers(aRegistration, rv);
@@ -2164,6 +2156,36 @@ ServiceWorkerManager::InvalidateServiceWorkerRegistrationWorker(ServiceWorkerReg
   }
 }
 
+NS_IMETHODIMP
+ServiceWorkerManager::Update(const nsAString& aScope)
+{
+  NS_ConvertUTF16toUTF8 scope(aScope);
+
+  nsRefPtr<ServiceWorkerManager::ServiceWorkerDomainInfo> domainInfo =
+    GetDomainInfo(scope);
+  if (NS_WARN_IF(!domainInfo)) {
+    return NS_OK;
+  }
+
+  nsRefPtr<ServiceWorkerRegistrationInfo> registration;
+  domainInfo->mServiceWorkerRegistrationInfos.Get(scope,
+                                                  getter_AddRefs(registration));
+  if (NS_WARN_IF(!registration)) {
+    return NS_OK;
+  }
+
+  if (registration->mPendingUninstall) {
+    return NS_OK;
+  }
+
+  if (registration->mInstallingWorker) {
+    return NS_OK;
+  }
+
+  Update(registration);
+  return NS_OK;
+}
+
 namespace {
 
 class MOZ_STACK_CLASS FilterRegistrationData
diff --git a/dom/workers/ServiceWorkerManager.h b/dom/workers/ServiceWorkerManager.h
index f58b24ecdecb..5c8a448c77c6 100644
--- a/dom/workers/ServiceWorkerManager.h
+++ b/dom/workers/ServiceWorkerManager.h
@@ -297,8 +297,7 @@ public:
                                const ErrorEventInit& aErrorDesc);
 
   void
-  FinishFetch(ServiceWorkerRegistrationInfo* aRegistration,
-              nsPIDOMWindow* aWindow);
+  FinishFetch(ServiceWorkerRegistrationInfo* aRegistration);
 
   void
   FinishInstall(ServiceWorkerRegistrationInfo* aRegistration);
@@ -331,8 +330,8 @@ private:
   void
   AbortCurrentUpdate(ServiceWorkerRegistrationInfo* aRegistration);
 
-  NS_IMETHOD
-  Update(ServiceWorkerRegistrationInfo* aRegistration, nsPIDOMWindow* aWindow);
+  nsresult
+  Update(ServiceWorkerRegistrationInfo* aRegistration);
 
   void
   Install(ServiceWorkerRegistrationInfo* aRegistration,
diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
index ae09764e01d3..93eedceebb22 100644
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -639,4 +639,45 @@ ServiceWorkerGlobalScope::Unregister(ErrorResult& aRv)
   return promise.forget();
 }
 
+namespace {
+
+class UpdateRunnable MOZ_FINAL : public nsRunnable
+{
+  nsString mScope;
+
+public:
+  explicit UpdateRunnable(const nsAString& aScope)
+    : mScope(aScope)
+  { }
+
+  NS_IMETHODIMP
+  Run()
+  {
+    AssertIsOnMainThread();
+
+    nsresult rv;
+    nsCOMPtr<nsIServiceWorkerManager> swm =
+      do_GetService(SERVICEWORKERMANAGER_CONTRACTID, &rv);
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return NS_OK;
+    }
+
+    swm->Update(mScope);
+    return NS_OK;
+  }
+};
+
+} //anonymous namespace
+
+void
+ServiceWorkerGlobalScope::Update()
+{
+  mWorkerPrivate->AssertIsOnWorkerThread();
+  MOZ_ASSERT(mWorkerPrivate->IsServiceWorker());
+
+  nsRefPtr<UpdateRunnable> runnable =
+    new UpdateRunnable(mScope);
+  NS_DispatchToMainThread(runnable);
+}
+
 END_WORKERS_NAMESPACE
diff --git a/dom/workers/WorkerScope.h b/dom/workers/WorkerScope.h
index cfeec7de7a86..72d981aa0896 100644
--- a/dom/workers/WorkerScope.h
+++ b/dom/workers/WorkerScope.h
@@ -210,10 +210,7 @@ public:
   }
 
   void
-  Update()
-  {
-    // FIXME(nsm): Bug 982728
-  }
+  Update();
 
   already_AddRefed<Promise>
   Unregister(ErrorResult& aRv);

From eacfeed59fb03f5b9cc30fe776356cb084d46d19 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 19 Dec 2014 09:00:07 +0100
Subject: [PATCH 081/183] Backed out changeset 4757a1d4a23e (bug 1113282) for
 e10s M1 test failures

---
 dom/media/mediasource/MediaSourceReader.cpp |  1 -
 dom/media/mediasource/TrackBuffer.cpp       | 40 +++++----------------
 dom/media/mediasource/TrackBuffer.h         |  1 -
 3 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/dom/media/mediasource/MediaSourceReader.cpp b/dom/media/mediasource/MediaSourceReader.cpp
index 58815262cf6a..0818e9f9d8f5 100644
--- a/dom/media/mediasource/MediaSourceReader.cpp
+++ b/dom/media/mediasource/MediaSourceReader.cpp
@@ -327,7 +327,6 @@ MediaSourceReader::Shutdown()
 void
 MediaSourceReader::ContinueShutdown()
 {
-  ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
   if (mTrackBuffers.Length()) {
     mTrackBuffers[0]->Shutdown()->Then(GetTaskQueue(), __func__, this,
                                        &MediaSourceReader::ContinueShutdown,
diff --git a/dom/media/mediasource/TrackBuffer.cpp b/dom/media/mediasource/TrackBuffer.cpp
index a1ed3ce53ea2..d8ec425aef9a 100644
--- a/dom/media/mediasource/TrackBuffer.cpp
+++ b/dom/media/mediasource/TrackBuffer.cpp
@@ -39,14 +39,12 @@ TrackBuffer::TrackBuffer(MediaSourceDecoder* aParentDecoder, const nsACString& a
   : mParentDecoder(aParentDecoder)
   , mType(aType)
   , mLastStartTimestamp(0)
-  , mShutdown(false)
 {
   MOZ_COUNT_CTOR(TrackBuffer);
   mParser = ContainerParser::CreateForMIMEType(aType);
   mTaskQueue = new MediaTaskQueue(GetMediaDecodeThreadPool());
   aParentDecoder->AddTrackBuffer(this);
   mDecoderPerSegment = Preferences::GetBool("media.mediasource.decoder-per-segment", false);
-  MSE_DEBUG("TrackBuffer(%p) created for parent decoder %p", this, aParentDecoder);
 }
 
 TrackBuffer::~TrackBuffer()
@@ -103,9 +101,6 @@ private:
 nsRefPtr<ShutdownPromise>
 TrackBuffer::Shutdown()
 {
-  mParentDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
-  mShutdown = true;
-
   MOZ_ASSERT(mShutdownPromise.IsEmpty());
   nsRefPtr<ShutdownPromise> p = mShutdownPromise.Ensure(__func__);
 
@@ -375,42 +370,23 @@ TrackBuffer::QueueInitializeDecoder(SourceBufferDecoder* aDecoder)
 void
 TrackBuffer::InitializeDecoder(SourceBufferDecoder* aDecoder)
 {
-  // ReadMetadata may block the thread waiting on data, so we must be able
-  // to leave the monitor while we call it. For the rest of this function
-  // we want to hold the monitor though, since we run on a different task queue
-  // from the reader and interact heavily with it.
-  mParentDecoder->GetReentrantMonitor().AssertNotCurrentThreadIn();
-  ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
-
-  // We may be shut down at any time by the reader on another thread. So we need
-  // to check for this each time we acquire the monitor. If that happens, we
-  // need to abort immediately, because the reader has forgotten about us, and
-  // important pieces of our state (like mTaskQueue) have also been torn down.
-  if (mShutdown) {
-    MSE_DEBUG("TrackBuffer(%p) was shut down. Aborting initialization.", this);
-    return;
-  }
-
   MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
+
+  // ReadMetadata may block the thread waiting on data, so it must not be
+  // called with the monitor held.
+  mParentDecoder->GetReentrantMonitor().AssertNotCurrentThreadIn();
+
   MediaDecoderReader* reader = aDecoder->GetReader();
   MSE_DEBUG("TrackBuffer(%p): Initializing subdecoder %p reader %p",
             this, aDecoder, reader);
 
   MediaInfo mi;
   nsAutoPtr<MetadataTags> tags; // TODO: Handle metadata.
-  nsresult rv;
-  {
-    ReentrantMonitorAutoExit mon(mParentDecoder->GetReentrantMonitor());
-    rv = reader->ReadMetadata(&mi, getter_Transfers(tags));
-  }
-
+  nsresult rv = reader->ReadMetadata(&mi, getter_Transfers(tags));
   reader->SetIdle();
-  if (mShutdown) {
-    MSE_DEBUG("TrackBuffer(%p) was shut down while reading metadata. Aborting initialization.", this);
-    return;
-  }
 
   if (NS_SUCCEEDED(rv) && reader->IsWaitingOnCDMResource()) {
+    ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
     mWaitingDecoders.AppendElement(aDecoder);
     return;
   }
@@ -466,7 +442,7 @@ TrackBuffer::ValidateTrackFormats(const MediaInfo& aInfo)
 bool
 TrackBuffer::RegisterDecoder(SourceBufferDecoder* aDecoder)
 {
-  mParentDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+  ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
   const MediaInfo& info = aDecoder->GetReader()->GetMediaInfo();
   // Initialize the track info since this is the first decoder.
   if (mInitializedDecoders.IsEmpty()) {
diff --git a/dom/media/mediasource/TrackBuffer.h b/dom/media/mediasource/TrackBuffer.h
index ecb40daff8b1..b7f416efd4e0 100644
--- a/dom/media/mediasource/TrackBuffer.h
+++ b/dom/media/mediasource/TrackBuffer.h
@@ -163,7 +163,6 @@ private:
   void ContinueShutdown();
   MediaPromiseHolder<ShutdownPromise> mShutdownPromise;
   bool mDecoderPerSegment;
-  bool mShutdown;
 };
 
 } // namespace mozilla

From e2cfd977a2e4bb36b9bc203eeefdebf861d6c7cb Mon Sep 17 00:00:00 2001
From: Richard Marti <richard.marti@gmail.com>
Date: Tue, 16 Dec 2014 17:59:38 +0100
Subject: [PATCH 082/183] Bug 1112263 - Remove the border around
 checkbox-label-box and radio-label-box. r=jaws

---
 toolkit/themes/windows/global/in-content/common.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/toolkit/themes/windows/global/in-content/common.css b/toolkit/themes/windows/global/in-content/common.css
index b087b290d757..429d2e0cef36 100644
--- a/toolkit/themes/windows/global/in-content/common.css
+++ b/toolkit/themes/windows/global/in-content/common.css
@@ -61,3 +61,10 @@ xul|*.text-link:-moz-focusring,
 xul|*.inline-link:-moz-focusring {
   border: 1px dotted -moz-DialogText;
 }
+
+xul|radio:not([focused="true"]) > xul|*.radio-label-box,
+xul|checkbox:not(:-moz-focusring) > xul|*.checkbox-label-box {
+  border-width: 0;
+  margin: 1px;
+  -moz-margin-start: 0;
+}

From cab354fdd1a2b4144e2554cb442b791eb12dc9ca Mon Sep 17 00:00:00 2001
From: ziyunfei <446240525@qq.com>
Date: Thu, 18 Dec 2014 21:36:00 +0100
Subject: [PATCH 083/183] Bug 1111516 - Implement
 %TypedArray%.prototype.reverse. r=evilpie

---
 js/src/builtin/TypedArray.js                | 38 +++++++++++++++
 js/src/tests/ecma_6/TypedArray/reverse.js   | 52 +++++++++++++++++++++
 js/src/vm/TypedArrayObject.cpp              |  1 +
 js/xpconnect/tests/chrome/test_xrayToJS.xul |  2 +-
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 js/src/tests/ecma_6/TypedArray/reverse.js

diff --git a/js/src/builtin/TypedArray.js b/js/src/builtin/TypedArray.js
index efbe03abf65b..f51081d84f40 100644
--- a/js/src/builtin/TypedArray.js
+++ b/js/src/builtin/TypedArray.js
@@ -158,3 +158,41 @@ function TypedArrayLastIndexOf(searchElement, fromIndex = undefined) {
     // Step 12.
     return -1;
 }
+
+// ES6 draft rev29 (2014/12/06) 22.2.3.21 %TypedArray%.prototype.reverse().
+function TypedArrayReverse() {
+    // This function is not generic.
+    if (!IsObject(this) || !IsTypedArray(this)) {
+        return callFunction(CallTypedArrayMethodIfWrapped, this, "TypedArrayReverse");
+    }
+
+    // Steps 1-2.
+    var O = this;
+
+    // Steps 3-5.
+    var len = TypedArrayLength(O);
+
+    // Step 6.
+    var middle = std_Math_floor(len / 2);
+
+    // Steps 7-8.
+    // Omit some steps, since there are no holes in typed arrays.
+    // Especially all the HasProperty/*exists checks always succeed.
+    for (var lower = 0; lower !== middle; lower++) {
+        // Step 8.a.
+        var upper = len - lower - 1;
+
+        // Step 8.f.i.
+        var lowerValue = O[lower];
+
+        // Step 8.i.i.
+        var upperValue = O[upper];
+
+        // We always end up in the step 8.j. case.
+        O[lower] = upperValue;
+        O[upper] = lowerValue;
+    }
+
+    // Step 9.
+    return O;
+}
diff --git a/js/src/tests/ecma_6/TypedArray/reverse.js b/js/src/tests/ecma_6/TypedArray/reverse.js
new file mode 100644
index 000000000000..48775f3032a8
--- /dev/null
+++ b/js/src/tests/ecma_6/TypedArray/reverse.js
@@ -0,0 +1,52 @@
+const constructors = [
+    Int8Array,
+    Uint8Array,
+    Uint8ClampedArray,
+    Int16Array,
+    Uint16Array,
+    Int32Array,
+    Uint32Array,
+    Float32Array,
+    Float64Array
+];
+
+for (var constructor of constructors) {
+
+    assertDeepEq(constructor.prototype.reverse.length, 0);
+
+    assertDeepEq(new constructor().reverse(), new constructor());
+    assertDeepEq(new constructor(10).reverse(), new constructor(10));
+    assertDeepEq(new constructor([]).reverse(), new constructor([]));
+    assertDeepEq(new constructor([1]).reverse(), new constructor([1]));
+    assertDeepEq(new constructor([1, 2]).reverse(), new constructor([2, 1]));
+    assertDeepEq(new constructor([1, 2, 3]).reverse(), new constructor([3, 2, 1]));
+    assertDeepEq(new constructor([1, 2, 3, 4]).reverse(), new constructor([4, 3, 2, 1]));
+    assertDeepEq(new constructor([1, 2, 3, 4, 5]).reverse(), new constructor([5, 4, 3, 2, 1]));
+    assertDeepEq(new constructor([.1, .2, .3]).reverse(), new constructor([.3, .2, .1]));
+
+    // called from other globals
+    if (typeof newGlobal === "function") {
+        var reverse = newGlobal()[constructor.name].prototype.reverse;
+        assertDeepEq(reverse.call(new constructor([3, 2, 1])), new constructor([1, 2, 3]));
+    }
+
+    // throws if `this` isn't a TypedArray
+    var nonTypedArrays = [undefined, null, 1, false, "", Symbol(), [], {}, /./,
+                         /* new Proxy(new constructor(), {}) // this probably should throw */
+                         ];
+    nonTypedArrays.forEach(nonTypedArray => {
+        assertThrowsInstanceOf(function() {
+            constructor.prototype.reverse.call(nonTypedArray);
+        }, TypeError, "Assert that reverse fails if this value is not a TypedArray");
+    });
+
+    // test that this.length is never called
+    Object.defineProperty(new constructor([1, 2, 3]), "length", {
+        get() {
+            throw new Error("length accessor called");
+        }
+    }).reverse();
+}
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);
diff --git a/js/src/vm/TypedArrayObject.cpp b/js/src/vm/TypedArrayObject.cpp
index ca84f8ef7a83..5c1b7c16b321 100644
--- a/js/src/vm/TypedArrayObject.cpp
+++ b/js/src/vm/TypedArrayObject.cpp
@@ -785,6 +785,7 @@ TypedArrayObject::protoFunctions[] = {
     JS_SELF_HOSTED_FN("findIndex", "TypedArrayFindIndex", 2, 0),
     JS_SELF_HOSTED_FN("indexOf", "TypedArrayIndexOf", 2, 0),
     JS_SELF_HOSTED_FN("lastIndexOf", "TypedArrayLastIndexOf", 2, 0),
+    JS_SELF_HOSTED_FN("reverse", "TypedArrayReverse", 0, 0),
     JS_FS_END
 };
 
diff --git a/js/xpconnect/tests/chrome/test_xrayToJS.xul b/js/xpconnect/tests/chrome/test_xrayToJS.xul
index 9d787118d037..4c674b70c253 100644
--- a/js/xpconnect/tests/chrome/test_xrayToJS.xul
+++ b/js/xpconnect/tests/chrome/test_xrayToJS.xul
@@ -180,7 +180,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=933681
   }
   gPrototypeProperties['TypedArray'] =
     ["length", "buffer", "byteLength", "byteOffset", kIteratorSymbol, "subarray",
-     "set", "copyWithin", "find", "findIndex", "indexOf", "lastIndexOf"];
+     "set", "copyWithin", "find", "findIndex", "indexOf", "lastIndexOf", "reverse"];
 
   for (var c of errorObjectClasses) {
       gPrototypeProperties[c] = ["constructor", "name",

From 1e0e97bfcf522728743a6bdbfd9ca52fe089f45a Mon Sep 17 00:00:00 2001
From: Jamin Liu <jaliu@mozilla.com>
Date: Thu, 18 Dec 2014 17:51:00 +0100
Subject: [PATCH 084/183] Bug 1065751 - Support AGPS with roaming cell by
 retrieving mcc & mnc from nsIMobileNetworkInfo. r=kchen

---
 .../gonk/GonkGPSGeolocationProvider.cpp       | 95 ++++++++++---------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/dom/system/gonk/GonkGPSGeolocationProvider.cpp b/dom/system/gonk/GonkGPSGeolocationProvider.cpp
index 00b6e3c7d110..fbb098062f33 100644
--- a/dom/system/gonk/GonkGPSGeolocationProvider.cpp
+++ b/dom/system/gonk/GonkGPSGeolocationProvider.cpp
@@ -41,6 +41,7 @@
 #include "nsIMobileConnectionInfo.h"
 #include "nsIMobileConnectionService.h"
 #include "nsIMobileCellInfo.h"
+#include "nsIMobileNetworkInfo.h"
 #include "nsIRadioInterfaceLayer.h"
 #endif
 
@@ -502,23 +503,35 @@ GonkGPSGeolocationProvider::SetReferenceLocation()
     return;
   }
 
-  nsCOMPtr<nsIRilContext> rilCtx;
-  mRadioInterface->GetRilContext(getter_AddRefs(rilCtx));
-
   AGpsRefLocation location;
 
   // TODO: Bug 772750 - get mobile connection technology from rilcontext
   location.type = AGPS_REF_LOCATION_TYPE_UMTS_CELLID;
 
-  if (rilCtx) {
-    nsCOMPtr<nsIIccInfo> iccInfo;
-    rilCtx->GetIccInfo(getter_AddRefs(iccInfo));
-    if (iccInfo) {
+  nsCOMPtr<nsIMobileConnectionService> service =
+    do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID);
+  if (!service) {
+    NS_WARNING("Cannot get MobileConnectionService");
+    return;
+  }
+
+  nsCOMPtr<nsIMobileConnection> connection;
+  // TODO: Bug 878748 - B2G GPS: acquire correct RadioInterface instance in
+  // MultiSIM configuration
+  service->GetItemByServiceId(0 /* Client Id */, getter_AddRefs(connection));
+  NS_ENSURE_TRUE_VOID(connection);
+
+  nsCOMPtr<nsIMobileConnectionInfo> voice;
+  connection->GetVoice(getter_AddRefs(voice));
+  if (voice) {
+    nsCOMPtr<nsIMobileNetworkInfo> networkInfo;
+    voice->GetNetwork(getter_AddRefs(networkInfo));
+    if (networkInfo) {
       nsresult result;
       nsAutoString mcc, mnc;
 
-      iccInfo->GetMcc(mcc);
-      iccInfo->GetMnc(mnc);
+      networkInfo->GetMcc(mcc);
+      networkInfo->GetMnc(mnc);
 
       location.u.cellID.mcc = mcc.ToInteger(&result);
       if (result != NS_OK) {
@@ -531,47 +544,41 @@ GonkGPSGeolocationProvider::SetReferenceLocation()
         NS_WARNING("Cannot parse mnc to integer");
         location.u.cellID.mnc = 0;
       }
+    } else {
+      NS_WARNING("Cannot get mobile network info.");
+      location.u.cellID.mcc = 0;
+      location.u.cellID.mnc = 0;
     }
 
-    nsCOMPtr<nsIMobileConnectionService> service =
-      do_GetService(NS_MOBILE_CONNECTION_SERVICE_CONTRACTID);
-    if (!service) {
-      NS_WARNING("Cannot get MobileConnectionService");
-      return;
-    }
+    nsCOMPtr<nsIMobileCellInfo> cell;
+    voice->GetCell(getter_AddRefs(cell));
+    if (cell) {
+      int32_t lac;
+      int64_t cid;
 
-    nsCOMPtr<nsIMobileConnection> connection;
-    // TODO: Bug 878748 - B2G GPS: acquire correct RadioInterface instance in
-    // MultiSIM configuration
-    service->GetItemByServiceId(0 /* Client Id */, getter_AddRefs(connection));
-    NS_ENSURE_TRUE_VOID(connection);
-
-    nsCOMPtr<nsIMobileConnectionInfo> voice;
-    connection->GetVoice(getter_AddRefs(voice));
-    if (voice) {
-      nsCOMPtr<nsIMobileCellInfo> cell;
-      voice->GetCell(getter_AddRefs(cell));
-      if (cell) {
-        int32_t lac;
-        int64_t cid;
-
-        cell->GetGsmLocationAreaCode(&lac);
-        // The valid range of LAC is 0x0 to 0xffff which is defined in
-        // hardware/ril/include/telephony/ril.h
-        if (lac >= 0x0 && lac <= 0xffff) {
-          location.u.cellID.lac = lac;
-        }
-
-        cell->GetGsmCellId(&cid);
-        // The valid range of cell id is 0x0 to 0xffffffff which is defined in
-        // hardware/ril/include/telephony/ril.h
-        if (cid >= 0x0 && cid <= 0xffffffff) {
-          location.u.cellID.cid = cid;
-        }
+      cell->GetGsmLocationAreaCode(&lac);
+      // The valid range of LAC is 0x0 to 0xffff which is defined in
+      // hardware/ril/include/telephony/ril.h
+      if (lac >= 0x0 && lac <= 0xffff) {
+        location.u.cellID.lac = lac;
       }
+
+      cell->GetGsmCellId(&cid);
+      // The valid range of cell id is 0x0 to 0xffffffff which is defined in
+      // hardware/ril/include/telephony/ril.h
+      if (cid >= 0x0 && cid <= 0xffffffff) {
+        location.u.cellID.cid = cid;
+      }
+    } else {
+      NS_WARNING("Cannot get mobile gell info.");
+      location.u.cellID.lac = -1;
+      location.u.cellID.cid = -1;
     }
-    mAGpsRilInterface->set_ref_location(&location, sizeof(location));
+  } else {
+    NS_WARNING("Cannot get mobile connection info.");
+    return;
   }
+  mAGpsRilInterface->set_ref_location(&location, sizeof(location));
 }
 
 #endif // MOZ_B2G_RIL

From 8714b58302bbc2d3b75470beb6e2a7f76dfc2ea8 Mon Sep 17 00:00:00 2001
From: Ted Clancy <tclancy@mozilla.com>
Date: Thu, 18 Dec 2014 17:40:41 -0500
Subject: [PATCH 085/183] Bug 1000305 - Part 1 - Add a getIcon() method.
 r=fabrice r=ehsan

---
 dom/apps/Webapps.js    | 30 +++++++++++++++-
 dom/apps/Webapps.jsm   | 80 ++++++++++++++++++++++++++++++++++++++++--
 dom/webidl/Apps.webidl |  2 ++
 3 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/dom/apps/Webapps.js b/dom/apps/Webapps.js
index 0d3c6c361704..ee06bd30e74e 100644
--- a/dom/apps/Webapps.js
+++ b/dom/apps/Webapps.js
@@ -748,6 +748,7 @@ WebappsApplicationMgmt.prototype = {
                                         "Webapps:Uninstall:Return:KO",
                                         "Webapps:Install:Return:OK",
                                         "Webapps:GetNotInstalled:Return:OK",
+                                        "Webapps:GetIcon:Return",
                                         "Webapps:Import:Return",
                                         "Webapps:ExtractManifest:Return",
                                         "Webapps:SetEnabled:Return"]);
@@ -813,6 +814,21 @@ WebappsApplicationMgmt.prototype = {
     return request;
   },
 
+  getIcon: function(aApp, aIconID, aEntryPoint) {
+    return this.createPromise(function(aResolve, aReject) {
+      cpmm.sendAsyncMessage("Webapps:GetIcon", {
+        oid: this._id,
+        manifestURL: aApp.manifestURL,
+        iconID: aIconID,
+        entryPoint: aEntryPoint,
+        requestID: this.getPromiseResolverId({
+          resolve: aResolve,
+          reject: aReject
+        })
+      });
+    }.bind(this));
+  },
+
   getNotInstalled: function() {
     let request = this.createRequest();
     let principal = this._window.document.nodePrincipal;
@@ -887,7 +903,8 @@ WebappsApplicationMgmt.prototype = {
     let msg = aMessage.data;
     let req;
 
-    if (["Webapps:Import:Return",
+    if (["Webapps:GetIcon:Return",
+         "Webapps:Import:Return",
          "Webapps:ExtractManifest:Return"]
          .indexOf(aMessage.name) != -1) {
       req = this.takePromiseResolver(msg.requestID);
@@ -953,7 +970,18 @@ WebappsApplicationMgmt.prototype = {
           this.__DOM_IMPL__.dispatchEvent(event);
         }
         break;
+      case "Webapps:GetIcon:Return":
+        if (msg.blob) {
+          req.resolve(Cu.cloneInto(msg.blob, this._window));
+        } else if (msg.error && msg.error == "NETWORK_ERROR"
+                             && !this._window.navigator.onLine) {
+          req.reject(new this._window.DOMError("NETWORK_OFFLINE"));
+        } else {
+          req.reject(new this._window.DOMError(msg.error || ""));
+        }
+        break;
     }
+
     if (aMessage.name !== "Webapps:Uninstall:Broadcast:Return:OK") {
       this.removeRequest(msg.requestID);
     }
diff --git a/dom/apps/Webapps.jsm b/dom/apps/Webapps.jsm
index 432dfb3adb8d..c48fa1e0b22c 100755
--- a/dom/apps/Webapps.jsm
+++ b/dom/apps/Webapps.jsm
@@ -221,6 +221,7 @@ this.DOMApplicationRegistry = {
                      "Webapps:RegisterBEP",
                      "Webapps:Export",
                      "Webapps:Import",
+                     "Webapps:GetIcon",
                      "Webapps:ExtractManifest",
                      "Webapps:SetEnabled",
                      "child-process-shutdown"];
@@ -1405,6 +1406,9 @@ this.DOMApplicationRegistry = {
         case "Webapps:RegisterBEP":
           this.registerBrowserElementParentForApp(msg, mm);
           break;
+        case "Webapps:GetIcon":
+          this.getIcon(msg, mm);
+          break;
         case "Webapps:Export":
           this.doExport(msg, mm);
           break;
@@ -4213,6 +4217,74 @@ this.DOMApplicationRegistry = {
     });
   },
 
+  getIcon: function(aData, aMm) {
+    function sendError(aError) {
+      debug("getIcon error: " + aError);
+      aData.error = aError;
+      aMm.sendAsyncMessage("Webapps:GetIcon:Return", aData);
+    }
+
+    let app = this.getAppByManifestURL(aData.manifestURL);
+    if (!app) {
+      sendError("NO_APP");
+      return;
+    }
+
+    function loadIcon(aUrl) {
+      let fallbackMimeType = aUrl.indexOf('.') >= 0 ?
+                             "image/" + aUrl.split(".").reverse()[0] : "";
+      // Set up an xhr to download a blob.
+      let xhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
+                  .createInstance(Ci.nsIXMLHttpRequest);
+      xhr.mozBackgroundRequest = true;
+      xhr.open("GET", aUrl, true);
+      xhr.responseType = "blob";
+      xhr.addEventListener("load", function() {
+        debug("Got http status=" + xhr.status + " for " + aUrl);
+        if (xhr.status == 200) {
+          let blob = xhr.response;
+          // Reusing aData with sendAsyncMessage() leads to an empty blob in
+          // the child.
+          let payload = {
+            "oid": aData.oid,
+            "requestID": aData.requestID,
+            "blob": blob,
+            "type": xhr.getResponseHeader("Content-Type") || fallbackMimeType
+          };
+          aMm.sendAsyncMessage("Webapps:GetIcon:Return", payload);
+        } else if (xhr.status === 0) {
+          sendError("NETWORK_ERROR");
+        } else {
+          sendError("FETCH_ICON_FAILED");
+        }
+      });
+      xhr.addEventListener("error", function() {
+        sendError("FETCH_ICON_FAILED");
+      });
+      xhr.send();
+    }
+
+    // Get the manifest, to find the icon url in the current locale.
+    this.getManifestFor(aData.manifestURL, aData.entryPoint)
+        .then((aManifest) => {
+      if (!aManifest) {
+        sendError("FETCH_ICON_FAILED");
+        return;
+      }
+
+      let manifest = new ManifestHelper(aManifest, app.origin, app.manifestURL);
+      let url = manifest.iconURLForSize(aData.iconID);
+      if (!url) {
+        sendError("NO_ICON");
+        return;
+      }
+      loadIcon(url);
+    }).catch(() => {
+      sendError("FETCH_ICON_FAILED");
+      return;
+    });
+  },
+
   getAll: function(aCallback) {
     debug("getAll");
     let apps = [];
@@ -4446,7 +4518,7 @@ this.DOMApplicationRegistry = {
     });
   },
 
-  getManifestFor: function(aManifestURL) {
+  getManifestFor: function(aManifestURL, aEntryPoint) {
     let id = this._appIdForManifestURL(aManifestURL);
     let app = this.webapps[id];
     if (!id || (app.installState == "pending" && !app.retryingDownload)) {
@@ -4454,7 +4526,11 @@ this.DOMApplicationRegistry = {
     }
 
     return this._readManifests([{ id: id }]).then((aResult) => {
-      return aResult[0].manifest;
+      if (aEntryPoint) {
+        return aResult[0].manifest.entry_points[aEntryPoint];
+      } else {
+        return aResult[0].manifest;
+      }
     });
   },
 
diff --git a/dom/webidl/Apps.webidl b/dom/webidl/Apps.webidl
index 212ac8a415ec..b1180e262730 100644
--- a/dom/webidl/Apps.webidl
+++ b/dom/webidl/Apps.webidl
@@ -98,6 +98,8 @@ interface DOMApplicationsManager : EventTarget {
   Promise<any> extractManifest(Blob blob);
 
   void setEnabled(DOMApplication app, boolean state);
+  Promise<Blob> getIcon(DOMApplication app, DOMString iconID,
+                        optional DOMString entryPoint);
 
   attribute EventHandler oninstall;
   attribute EventHandler onuninstall;

From cca78a3e59588ce2cc182cce24f1da21685faa6c Mon Sep 17 00:00:00 2001
From: Ted Clancy <tclancy@mozilla.com>
Date: Thu, 18 Dec 2014 17:42:25 -0500
Subject: [PATCH 086/183] Bug 1000305 - Part 2 - Tests for getIcon(). r=ferjm
 r=waldo

---
 dom/apps/tests/file_manifest.json             |  24 +++++----
 dom/apps/tests/file_packaged_app.sjs          |  10 ++++
 .../tests/file_packaged_app.template.webapp   |   3 ++
 dom/apps/tests/icon15.png                     | Bin 0 -> 281 bytes
 dom/apps/tests/icon15alternate.png            | Bin 0 -> 224 bytes
 dom/apps/tests/icon48.png                     | Bin 0 -> 4762 bytes
 dom/apps/tests/mochitest.ini                  |   3 ++
 dom/apps/tests/test_packaged_app_install.html |  29 ++++++++++
 dom/apps/tests/test_web_app_install.html      |  51 ++++++++++++++++++
 dom/tests/mochitest/webapps/test_list_api.xul |   1 +
 netwerk/test/httpserver/httpd.js              |   2 +
 11 files changed, 114 insertions(+), 9 deletions(-)
 create mode 100644 dom/apps/tests/icon15.png
 create mode 100644 dom/apps/tests/icon15alternate.png
 create mode 100644 dom/apps/tests/icon48.png

diff --git a/dom/apps/tests/file_manifest.json b/dom/apps/tests/file_manifest.json
index 1569a1efe691..42a3f553fda8 100644
--- a/dom/apps/tests/file_manifest.json
+++ b/dom/apps/tests/file_manifest.json
@@ -1,13 +1,19 @@
 {
   "name": "My W3C Web App",
   "short_name": "My App",
-  "icons": [
-    {
-      "src": "/favicon.ico",
-      "sizes": "64x64",
-      "type": "image/png"
-    }
-  ],
+  "icons": {
+    "15": "/tests/dom/apps/tests/icon15.png",
+    "48": "/tests/dom/apps/tests/icon48.png"
+  },
   "start_url": "/index.html",
-  "display": "standalone"
-}
\ No newline at end of file
+  "display": "standalone",
+  "entry_points": {
+    "ep1": {
+      "name": "This is an entry point",
+      "icons": {
+        "15": "/tests/dom/apps/tests/icon15alternate.png",
+        "48": "/tests/dom/apps/tests/icon48.png"
+      }
+    }
+  }
+}
diff --git a/dom/apps/tests/file_packaged_app.sjs b/dom/apps/tests/file_packaged_app.sjs
index 788ff22b85f0..4bda60a7fe10 100644
--- a/dom/apps/tests/file_packaged_app.sjs
+++ b/dom/apps/tests/file_packaged_app.sjs
@@ -17,6 +17,13 @@ var gAppName = "appname";
 var gDevName = "devname";
 var gDevUrl = "http://dev.url";
 
+var gIconData =
+"iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAABGdBTUEAANbY1E9YMgAAABl0RVh0" +
+"U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA5UExURbVCQs6UlM6EhJwhIa0hIc5zc5wQ" +
+"EL1SUu/W1rVjY6UQELUAAOfGxue1tZwAAIwAAP///3sAAK0AAOytg2MAAABmSURBVHjabIkLEsJA" +
+"CEOz249aIUDvf1ihVWe208ADQvDeh8I+6s7zSw0wJ6vPA5z7o+u8LbrUD4SXnkln5XSHJnAhDWau" +
+"tia1jeXlz7SeeRy5TC6wkBaWhLZoL4RF9Q/EqKv/CDAAFpEM3avxBREAAAAASUVORK5CYII=";
+
 function handleRequest(request, response) {
   var query = getQuery(request);
 
@@ -87,6 +94,9 @@ function handleRequest(request, response) {
                              appName, devName, devUrl);
       addZipEntry(zipWriter, app, "index.html");
 
+      var iconString = atob(gIconData);
+      addZipEntry(zipWriter, iconString, "icon.png");
+
       zipWriter.close();
     }
 
diff --git a/dom/apps/tests/file_packaged_app.template.webapp b/dom/apps/tests/file_packaged_app.template.webapp
index 6d4bc0c7480f..14510b36b3f6 100644
--- a/dom/apps/tests/file_packaged_app.template.webapp
+++ b/dom/apps/tests/file_packaged_app.template.webapp
@@ -12,6 +12,9 @@
      "downloads": {}
    },
   "launch_path": "tests/dom/apps/tests/file_packaged_app.sjs",
+  "icons": {
+    "15": "icon.png"
+  },
   "developer": {
     "name": "DEVELOPERTOKEN",
     "url": "DEVELOPERURLTOKEN"
diff --git a/dom/apps/tests/icon15.png b/dom/apps/tests/icon15.png
new file mode 100644
index 0000000000000000000000000000000000000000..f752986b7e13a7a2f6eba78c031245d6d5619883
GIT binary patch
literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K13?z9tQY(NIOS+@4BLl;=8&~`zjDUQ}64!{5
z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6y|0X`wFTb-QFO__48rDcwy;#x(;
zbH&AT1O)a51--v^ZEJG!QUQUj3=GeY9eciY>l_A#9tMX0|NmDrFsx-@c(b-S8E8nF
zr;B4q#jTu9ZlOaC9L}3>_eUu@yswW~7@EHA@&RV25BJ&+*}XdV*_+ouef4?fIlmXb
z-lMzg3V+M=d7kM{OWM^66nWFuZByIY`}FDgE%Pd6cKYaTm>@Q-Wm|@Ri|beZBP&+_
b=P+Opo5*u_^+#4gpp6Wku6{1-oD!M<-aKpU

literal 0
HcmV?d00001

diff --git a/dom/apps/tests/icon15alternate.png b/dom/apps/tests/icon15alternate.png
new file mode 100644
index 0000000000000000000000000000000000000000..a85552b240fbde0ace475e0727267e611f8bb8ec
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11SGd?VUh(>%ROBjLo`H_Q>M;6;9!!V6s79%
zFd+0S)5oXl-G83AS6lhGZATlMOG<wF?B^kQ9MVUpbJxV=zrVvag+YsTQzOTTu%dz{
z4c18kn;Uf&?25kLZ*zWsNabVI7T&-w&ktMg$ZEN%!{p>}@%(;!Mo$juMI5cX*Vzpp
zAAY~zK``aB0#}3F?)pzGS5zIYZT`*Q;Kdp-^I^^cs|AxA9yuI4D0x{f-sZeT#wAXM
Y;tX$h%O9_#fKF!cboFyt=akR{0Q6Q@KL7v#

literal 0
HcmV?d00001

diff --git a/dom/apps/tests/icon48.png b/dom/apps/tests/icon48.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4307fc8418436bb6b2fd3a6afc702c2db28aa77
GIT binary patch
literal 4762
zcmV;L5@qd)P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R000g#Nkl<ZXx{Bv3vg8Dc|G^FckjMeyOLH<gaAoM
zARa68vIC+RYEjza+M>-k(>h5*rk*jGY3h=s;}LS}gf>m4rQ@{NxQSg49;C!L*x`|w
zT469C%NXh+KmxsxSiN8S-uvu#7YS3_U>R%bwDq06v%B}+{r_{m?|kR`?_S0*4E%52
zn9m9PUnRiM2HY5%rZ9fv2@qUn*RFczwNMVXJ-8j)w?hMN0_W-*FS4y@)f#GRb(5Ph
zOB2r`fo+^&G-w}p-TL|_zG+vrHd|S_YXWJB>@pbC0oCi9*zTfkzLd+cUB2A2Bx^z0
z%HZ<cMFF2^_c{d)tT5R0?nJXO)_Wp%LDon!pGZ0TBL)%CX?p!LB2dqwww%cvhUCt0
zc#Qtedy?Mbug!gM@zTdv`drJh1>Rvz7Xnm@_xS-e^@CrHggmW7hZrCCe0(TA(h-`7
z<tN_OnwskFIwPNm0D)m@w>7fE_Lz`RA{Iw+up*|&Vn@?~dsFJluP=PC#`o3V^;oJh
zST4`WLEy}v+$iFN0^?MlqBmcRB$e>Qg;QrjFXj9Aqp;gXC%VrktBZQ%U3GOP8e`T8
zOgl<#E!ek`uZ!MD!llc+pL5Lr*2F+pX*_zNz`f`}@7(eLZ;csj<?maut<(aim5P;q
z8Bu}3gn^%r=xBdW)q`$Xx!O7szR-02)q=U)Gls4Xj)mk%se4nhv4JGT%-p$VNZ>{!
zgTZI{&T+5JBXS;C`8la!`))3fRqieGiy3Z7jCQMx%yHOJXUF0I3oFM!rQv(x27Wqb
zpnXz@{gR4RdAi}1*yPazJxNv>eL-?^&xeO1qw`#)<FQza(%4WtV-g=r;HIC`D_Hd`
zKOD$&aH7|RM6#5z_`mNg&MuZ5qD>ELER!<8($$rf0v47CnCD|*cW_9MHw`9%-lTyG
z*EPgDWNcm|>X)u3<9%%-9RVkH4n>vAF1s{ov5m&|ZV#%=tP`khWQ&Gl0+T3k8<OVb
zc<;kp!m`7a>G3cIE9m_?bdH58YbYq<A$cr_EE3=kN=T881{Gi=q9gK#0;V^Gn%@(V
zQ)E%DbtQ&{cx?B?c<P8FWlRo4uY_0nYLs1dH0ccb#S92gGL5uVa_{9ywhX`}s#;DQ
z8GmE3TUUEB9d=Enz>^v35{Jwz3)Yq~=$_Cpu5-w6u^0^-=;~D<D>@QAafosXrIk*U
zSK9UAA$cO)AKB-!F#E@%T*xjbBeB+*%jk{-ZbqLvZ1A-$oE%6vl$h$~Y+{+rx^|0<
zeSuxDN}7Z4$5}8$Age;a5dEe<$-?7jkQ~>bw8mj{$H1rxw3LjB<u)v=@q@7m#@K)y
zfA6)PQ)}0{{^`Wq1Men7!{MBbu0&H^wKls1LR+}xxa`yv#>H5L3d8F9JBwhQYqJQF
z!Wxh}!qB1#z%Rlma6)%j({>^!b+DsR7{hcvCet+$%q`DF@ON^dS~zrFiY2eSalUoy
zgL9u5A5FBJJ^yZ>BG}`t4YkUw5~ye_=e0nFGoDJiMXR_>QC#1ZG<ShB*Dfi#f>=ig
zykvt);1dyA{O}wMjfKT-I*|r-cnnNp9BO<Vf$|b8*)j*R!J+$VG?^Ogd#k!C`zLM}
zKk(AAcbaoLDFfBN*0HP3_*4WwWTAjfN@crvYpRfAy}K<4EcX`rBn3K?7>I%QTEP_(
zfeAp94Ok==fjLwg(Ky=Qz6Q1L666F~Y2kV-`U5|BKM)F~Qr7T9<JwBc;ml0CY_&1}
z(e$HZU8n^bx7F&iK;V5B%IzE%W!T(Si|Chi_Hmmn_YeJZ3mv+~vy4LBN+QV&%Tx<2
zIJ*UUQh`G0P}DF|;bF)_=Maw+!%=WQ+yx?ZD)Kp{1|C`&IX5yEdEV~N>GgW}2;+>s
z-FYyZ^jMF&x;lM!2%w(cM+Ju?$Hge{^053CYmw?Q{6U{h@(Zk+Cx4=K4`hUUx(M)P
zssRnUJVpdUP}L!Df*(06z6@*rd<>jd;q-Etn;F55uSqD#^F)Utv7cU>5Pxp-_%44j
zh&Gy(28A+fO9@ohbN+rwvRVa~#&H3GaeWWSTH`C6FR?xsYuGrz!a`4^5DQ(yWY0+?
z2986E4}f=-K=5sbE3X`q&p~~{O(SwxoIim=oYgBAEnrtvEk#mMJ30npFLq7(fB0B6
zq8Bg1(%Ran)z;Q(pOS#N?K0nar!(S`W!7!8IaV>c@?D<yWM%l)i-P207&`|=P?3ly
z5$W%Mp^t)N1#lJ*SeHcAO#=`~UJ?)}%fdIm9Kc*R(AIWIrxw7JmX$G?*|~_tB8TPC
z&K<#Eu*01B?AfzIRaKSx!NxY@)#&?D+QwpjfUgjJUTQqv)MRQiYnT4ql~I;y^#+8L
z$RQGmr8_dqTd2daRK;ZJDs?-DNSUzFaUx(uvACcYt1GNnd*2Ea7UW`VY#irXTQxFX
zZuQDF5R~!pvHsBRKYsL!|8U{L1^N9&@%x4S$(GZ!H8dE6=py%>@B9lhG~}~?^Dmcw
zK{XstzxuP*imt8}Qaukrte_}ogC$#KXnDb~v>RzhgGR;f^602qI*1HM7%Z#8OG~T8
zODb{i7pgIG>NI*oA;Y?Sxz^V5CjV#Kw}LF;-P0}q`B$s&x$o$wy`d4zqB4oJw)T1@
zN&9wtd*_bh$4^*}96gEQLDonren!(X2y}o5WP%m#1d^k^K+@q-w8V~}bWRwVWHMHf
zfncG+S7a!15_yIBD6v@Zz~%?Q7Zu{)j~!Qsdsnh<yPvJz5=B?{`M<5Iy6;<`m_TD=
zBS%GKeoPnA`1trEeSLlPq|15x_wUE`(17a6$lye)lZk0wL{lzk3^g^w4w158C0n&w
z6apWGn;Qnlki5vF%$=j<H!lc8jzcPyqT4$+7B5<YKYC~*dO8C5(gS10y8B(qQ_m=t
z_V)AY#f$yrk3Ra)l^GGJudipxhgtKk(ENVw+O;4}_}AyoovR^IIDPuGYPZ{2r_;%r
z!*C=Qmc6l?z|8%F-)|h_>7BXd7*DFFu1)DM1s<j4hRrTvTkW5qWWh2RY`=EBub;bk
z@rrWd#IM)y+qdtnI}$J@LdUsj;Ez4_nD>b%p7=IJeaE3ghs5K@k0Y5(Dg<0G0hnV<
zgJBppEg7EYZW3bBfK3_k6lo@1*yg!ug66x0q+@Q1qQK>H(LKcytX^{u9f#I>p@SV6
z9%H(?JFf2E|MJ!=SFW_)mcSHvGZ5(xc;?KRM=~-po+>FRDL#4fBzErHsSXSba6X@p
zF(=kE?Iws1zMEutp1(=t)^pRJ1yeqBjVT}V*usSiv3~t}WM^mV-Q7Lt?CfR-2m3KN
zIM96R)T!?^H#h%^@Wnrpz!doOfg?wbEGsH1dO9yJuf~iBO`w@hIy5xIz4X$4G&D4(
zQ|<M-(-WK9tsp-vn-3o|!Rxx7247fMm<GOh@nVB&OmA;*=V&fmzka=sKEL?NE3f<;
zO>vdrX}7h}Db4E#4jg!-yuADc8jPcq8Z@z{swz*iq4c`bcG%Y5f<1fo;*DRPghjN#
z?RH_h-`xuOqX?M5&1=o^NQPLqZXMRFSp!iNwab?;a|9Zc<y22k&%tBIj_srGr>CO+
z-+I7pYoMW_;pD1StL`P~#3{Wt0-x5oBuSKR9fNfH7>`)t&jwC4zk)sg_#8Srdf;+9
z)7MO8^F!cG;O2K(mec2#E?tV6ni}Nf<mjPL2&8S2%OI^#L(L@Jy(E{zH1FU?HLyF?
zfcwcOpM0~jvT_-vH8p3>9MR|VPib1gi+iKk^R!OB9YMuX9*^(LM|p4%&pr2J{H*a1
z;)xhM9?wmAOp~DKrVG>rPh(>9=FPN34;m8_6Z+MwS2>daMZJ$Q@WR1^2lo?{cEYCK
z4*2bAz_d&|dH$Z#($Yu$em|%VG%8@WprDX(IBa<8FB16sA6&(<H9v&gKY*UI-@wKV
zHTeFIf%h()#XtY(d9<`NrwN$yNV^b4J06dd%-q<pVFNa9+-PP>yL9PN8aTOIl4SBK
zZO@I4j-Ht=(pzhCrmIo&Hyl}72~G5k{QUec(QYG0!2J0Oh{!xPFRzgK<?9pp*L}Z0
zPiGi?tsCfEF%C582;_-WkSbn#{Z+iY|7DPd(+*?qD^{$))~#F3fanAmRG92kk)C<y
zop+ukhq)=2>BZwr{=vRoA22iFU9e!mCerEGNu%p>b90cNUucw;78^^KEo3J~+<5Z{
zc`Yr}Hf+)0&*CsS8BaGThr^KuZ#FxMaysg(SFbjr(Wq_~sTp<BdLNzp2}S*7nyYQf
zUG6BCySXPe{jr!FVjGe9N+1v@&dJFoA_dygWhLyq;v$;Rp6+*(ld-f^1dEVvRMXNK
z85u!19M(EJJ2~p)W`QOt1JiP8ruk#jLBE@42Dc?}tN!Stm1Gdyv}x0y=H=x+OavU6
znc0{(Z=P0KTE@AlPk_<W9dz2)W3d>Kn$&xHdrg_JrZx8W_fN~^7c}(Ho!n*C{@k4+
zl9nWW^p%yB{q~|oi?-+H=8~*(QBY8zFI-rLtgLK?oF;uO6|6yyLY=gmGc!OW`r6vs
zOu0<Ei}q=vez(hMW{QMaAM>bB)RL^eN+gQSE=s#WE|VT?Y-}uDpcL^WkvMqx@Zo)=
z`Du4yKC?$mAIOF@C9AIxiHFH@ou+M?o^N(oS`M5csqAfOX*u$7&FHguLUR)c5y_xF
zv6dEL_mlhN5~(<WZ=qG|(OcFovl{hTdqy^$jj8YEUm#Y~lIVEyqs-tp@-gcNiQM`h
ofbl=@6#erj^`8^?|4!h)0J^zP3jf7M-2eap07*qoM6N<$f*<W+VgLXD

literal 0
HcmV?d00001

diff --git a/dom/apps/tests/mochitest.ini b/dom/apps/tests/mochitest.ini
index 798a32bd9617..793675e2b8ee 100644
--- a/dom/apps/tests/mochitest.ini
+++ b/dom/apps/tests/mochitest.ini
@@ -28,6 +28,9 @@ support-files =
   test_packaged_app_common.js
   marketplace/*
   pkg_install_iframe.html
+  icon15.png
+  icon15alternate.png
+  icon48.png
 
 [test_app_addons.html]
 skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app
diff --git a/dom/apps/tests/test_packaged_app_install.html b/dom/apps/tests/test_packaged_app_install.html
index 1eca12f8bfb5..3065b3e77be0 100644
--- a/dom/apps/tests/test_packaged_app_install.html
+++ b/dom/apps/tests/test_packaged_app_install.html
@@ -76,6 +76,15 @@ function checkInstalledApp(aMiniManifestURL,
   };
 }
 
+var gIconData =
+"iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAABGdBTUEAANbY1E9YMgAAABl0RVh0" +
+"U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA5UExURbVCQs6UlM6EhJwhIa0hIc5zc5wQ" +
+"EL1SUu/W1rVjY6UQELUAAOfGxue1tZwAAIwAAP///3sAAK0AAOytg2MAAABmSURBVHjabIkLEsJA" +
+"CEOz249aIUDvf1ihVWe208ADQvDeh8I+6s7zSw0wJ6vPA5z7o+u8LbrUD4SXnkln5XSHJnAhDWau" +
+"tia1jeXlz7SeeRy5TC6wkBaWhLZoL4RF9Q/EqKv/CDAAFpEM3avxBREAAAAASUVORK5CYII=";
+
+var gIconSize = 15;
+
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
@@ -195,6 +204,7 @@ var steps = [
     info("== TEST == Install packaged app");
     var miniManifestURL = PackagedTestHelper.gSJS +
                           "?getManifest=true";
+
     navigator.mozApps.mgmt.oninstall = function(evt) {
       info("Got oninstall event");
       PackagedTestHelper.gApp = evt.application;
@@ -231,6 +241,25 @@ var steps = [
   function() {
     PackagedTestHelper.setAppVersion(3, PackagedTestHelper.next, false, true);
   },
+  function() {
+    info("== TEST == Get icon");
+    var app = PackagedTestHelper.gApp;
+
+    navigator.mozApps.mgmt.getIcon(app, gIconSize).then((blob) => {
+      var reader = new FileReader();
+
+      reader.onloadend = function() {
+        var success = btoa(reader.result) == gIconData;
+        ok(success, "== TEST == Icon matches expected icon");
+        PackagedTestHelper.next();
+      }
+
+      reader.readAsBinaryString(blob);
+    }, (err) => {
+      ok(false, "Can't get icon: " + err);
+      PackagedTestHelper.finish();
+    });
+  },
   function() {
     info("== TEST == Install packaged app with a cancel/resume");
     var miniManifestURL = PackagedTestHelper.gSJS +
diff --git a/dom/apps/tests/test_web_app_install.html b/dom/apps/tests/test_web_app_install.html
index c57f08b5e8ef..071aecb25301 100644
--- a/dom/apps/tests/test_web_app_install.html
+++ b/dom/apps/tests/test_web_app_install.html
@@ -19,6 +19,19 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={1075716}
 <pre id="test">
 <script class="testbody" type="application/javascript;version=1.7">
 
+var gIconData =
+"iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAABGdBTUEAANbY1E9YMgAAABl0RVh0" +
+"U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA5UExURbVCQs6UlM6EhJwhIa0hIc5zc5wQ" +
+"EL1SUu/W1rVjY6UQELUAAOfGxue1tZwAAIwAAP///3sAAK0AAOytg2MAAABmSURBVHjabIkLEsJA" +
+"CEOz249aIUDvf1ihVWe208ADQvDeh8I+6s7zSw0wJ6vPA5z7o+u8LbrUD4SXnkln5XSHJnAhDWau" +
+"tia1jeXlz7SeeRy5TC6wkBaWhLZoL4RF9Q/EqKv/CDAAFpEM3avxBREAAAAASUVORK5CYII=";
+
+var gAlternateIconData =
+"iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAAp0lEQVQoFWNklZ3AQDRgIlolSOFQ" +
+"Vc0C8eWvR/nI3n1544a4hgZEZG9nm+dUbggbxZcLfFxv79wGlAAqBbKBCMhWcnCCKAWSULOBLKC6" +
+"W9ePPM+/VHnjJYQNUfTnwzu4aoTZLAJCQNHPvz8BSQgbogiFDdcHMePD779AEWTzIAqAHrt/8gTU" +
+"JUDWs/sPgEoFWJnhbKA6oJOA4kDGwRnTHl88zzho0gkAc2hLRzn46hoAAAAASUVORK5CYII=";
+
 var gGenerator = runTest();
 
 function go() {
@@ -45,6 +58,20 @@ function cbError(aEvent) {
   finish();
 }
 
+function iconTest(app, iconSize, entryPoint, testFunction) {
+  navigator.mozApps.mgmt.getIcon(app, iconSize, entryPoint).then((blob) => {
+    var reader = new FileReader();
+    reader.onloadend = function() {
+      testFunction(reader.result);
+      continueTest();
+    }
+    reader.readAsBinaryString(blob);
+  }, (err) => {
+    ok(false, "Couldn't get icon.");
+    finish();
+  });
+}
+
 SimpleTest.waitForExplicitFinish();
 
 /**
@@ -77,6 +104,30 @@ function runTest() {
   ok(app, "App is non-null");
   is(app.manifestURL, manifestURL, "App manifest url is correct.");
 
+  info("Fetching 15x15 icon");
+  iconTest(app, 15, undefined, (iconData) => {
+    is(btoa(iconData), gIconData, "Fetches 15x15 icon successfully.")
+  });
+  yield undefined;
+
+  info("Fetching 48x48 icon");
+  iconTest(app, 48, "ep1", (iconData) => {
+    ok(iconData.length == 4762, "Fetches 48x48 icon successfully.")
+  });
+  yield undefined;
+
+  info("Fetching 30x30 icon");
+  iconTest(app, 30, undefined, (iconData) => {
+    is(btoa(iconData), gIconData, "Fetches 15x15 icon as best fit for 30x30.")
+  });
+  yield undefined;
+
+  info("Fetching entry-point icon");
+  iconTest(app, 15, "ep1", (iconData) => {
+    is(btoa(iconData), gAlternateIconData, "Entry-point Icon fetched successfully.")
+  });
+  yield undefined;
+
   request = navigator.mozApps.mgmt.uninstall(app);
   request.onerror = cbError;
   request.onsuccess = continueTest;
diff --git a/dom/tests/mochitest/webapps/test_list_api.xul b/dom/tests/mochitest/webapps/test_list_api.xul
index f5a4c9ee86af..f06e90dd0c8a 100644
--- a/dom/tests/mochitest/webapps/test_list_api.xul
+++ b/dom/tests/mochitest/webapps/test_list_api.xul
@@ -40,6 +40,7 @@ var mgmtProps = {
   dispatchEvent: "function",
   getEventHandler: "function",
   getAll: "function",
+  getIcon: "function",
   getNotInstalled: "function",
   uninstall: "function",
   oninstall: "object",
diff --git a/netwerk/test/httpserver/httpd.js b/netwerk/test/httpserver/httpd.js
index 21d725280ec3..c72e47f50b8d 100644
--- a/netwerk/test/httpserver/httpd.js
+++ b/netwerk/test/httpserver/httpd.js
@@ -2741,6 +2741,8 @@ ServerHandler.prototype =
         var sis = new ScriptableInputStream(fis);
         var s = Cu.Sandbox(gGlobalObject);
         s.importFunction(dump, "dump");
+        s.importFunction(atob, "atob");
+        s.importFunction(btoa, "btoa");
 
         // Define a basic key-value state-preservation API across requests, with
         // keys initially corresponding to the empty string.

From 442ee5b598aaef37dc12ecbc8b4208b28e147c9e Mon Sep 17 00:00:00 2001
From: "Nils Ohlmeier [:drno]" <drno@ohlmeier.org>
Date: Wed, 17 Dec 2014 19:09:00 +0100
Subject: [PATCH 087/183] Bug 1112967 - consolidate all 50 calls to
 requestFlkayTimeout in WebRTC tests into one. r=bwc

---
 dom/media/tests/mochitest/head.js                              | 1 +
 .../tests/mochitest/identity/test_getIdentityAssertion.html    | 3 ---
 .../mochitest/identity/test_peerConnection_peerIdentity.html   | 3 ---
 .../tests/mochitest/identity/test_setIdentityProvider.html     | 3 ---
 .../mochitest/identity/test_setIdentityProviderWithErrors.html | 3 ---
 dom/media/tests/mochitest/ipc/test_ipc.html                    | 1 -
 dom/media/tests/mochitest/test_dataChannel_basicAudio.html     | 2 --
 .../tests/mochitest/test_dataChannel_basicAudioVideo.html      | 2 --
 .../mochitest/test_dataChannel_basicAudioVideoCombined.html    | 2 --
 dom/media/tests/mochitest/test_dataChannel_basicDataOnly.html  | 2 --
 dom/media/tests/mochitest/test_dataChannel_basicVideo.html     | 2 --
 dom/media/tests/mochitest/test_dataChannel_bug1013809.html     | 2 --
 dom/media/tests/mochitest/test_getUserMedia_basicAudio.html    | 2 --
 .../tests/mochitest/test_getUserMedia_basicScreenshare.html    | 2 --
 dom/media/tests/mochitest/test_getUserMedia_basicVideo.html    | 2 --
 .../tests/mochitest/test_getUserMedia_basicVideoAudio.html     | 2 --
 .../tests/mochitest/test_getUserMedia_basicWindowshare.html    | 2 --
 dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html  | 2 --
 dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html  | 2 --
 .../tests/mochitest/test_getUserMedia_playAudioTwice.html      | 2 --
 .../tests/mochitest/test_getUserMedia_playVideoAudioTwice.html | 2 --
 .../tests/mochitest/test_getUserMedia_playVideoTwice.html      | 2 --
 .../tests/mochitest/test_getUserMedia_stopAudioStream.html     | 2 --
 .../test_getUserMedia_stopAudioStreamWithFollowupAudio.html    | 2 --
 .../mochitest/test_getUserMedia_stopVideoAudioStream.html      | 2 --
 ...etUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html | 2 --
 .../tests/mochitest/test_getUserMedia_stopVideoStream.html     | 2 --
 .../test_getUserMedia_stopVideoStreamWithFollowupVideo.html    | 2 --
 .../test_peerConnection_addCandidateInHaveLocalOffer.html      | 2 --
 dom/media/tests/mochitest/test_peerConnection_basicAudio.html  | 2 --
 .../tests/mochitest/test_peerConnection_basicAudioVideo.html   | 2 --
 .../mochitest/test_peerConnection_basicAudioVideoCombined.html | 2 --
 .../tests/mochitest/test_peerConnection_basicH264Video.html    | 2 --
 .../tests/mochitest/test_peerConnection_basicScreenshare.html  | 2 --
 dom/media/tests/mochitest/test_peerConnection_basicVideo.html  | 2 --
 .../tests/mochitest/test_peerConnection_basicWindowshare.html  | 2 --
 dom/media/tests/mochitest/test_peerConnection_bug1013809.html  | 2 --
 dom/media/tests/mochitest/test_peerConnection_bug1042791.html  | 2 --
 dom/media/tests/mochitest/test_peerConnection_bug827843.html   | 2 --
 .../tests/mochitest/test_peerConnection_capturedVideo.html     | 2 --
 dom/media/tests/mochitest/test_peerConnection_close.html       | 2 --
 .../tests/mochitest/test_peerConnection_noTrickleAnswer.html   | 2 --
 .../tests/mochitest/test_peerConnection_noTrickleOffer.html    | 2 --
 .../mochitest/test_peerConnection_noTrickleOfferAnswer.html    | 2 --
 .../test_peerConnection_offerRequiresReceiveAudio.html         | 2 --
 .../test_peerConnection_offerRequiresReceiveVideo.html         | 2 --
 .../test_peerConnection_offerRequiresReceiveVideoAudio.html    | 2 --
 .../tests/mochitest/test_peerConnection_replaceTrack.html      | 2 --
 .../test_peerConnection_setLocalAnswerInHaveLocalOffer.html    | 2 --
 .../mochitest/test_peerConnection_setLocalAnswerInStable.html  | 2 --
 .../test_peerConnection_setLocalOfferInHaveRemoteOffer.html    | 2 --
 .../test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html  | 2 --
 .../mochitest/test_peerConnection_setRemoteAnswerInStable.html | 2 --
 .../test_peerConnection_setRemoteOfferInHaveLocalOffer.html    | 2 --
 .../mochitest/test_peerConnection_syncSetDescription.html      | 2 --
 55 files changed, 1 insertion(+), 111 deletions(-)

diff --git a/dom/media/tests/mochitest/head.js b/dom/media/tests/mochitest/head.js
index 2fdd741501a2..4753e379c7e0 100644
--- a/dom/media/tests/mochitest/head.js
+++ b/dom/media/tests/mochitest/head.js
@@ -128,6 +128,7 @@ function runTest(aCallback) {
   if (window.SimpleTest) {
     // Running as a Mochitest.
     SimpleTest.waitForExplicitFinish();
+    SimpleTest.requestFlakyTimeout("WebRTC inherently depends on timeouts");
     SpecialPowers.pushPrefEnv({'set': [
       ['dom.messageChannel.enabled', true],
       ['media.peerconnection.enabled', true],
diff --git a/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html b/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
index 968f0dbf3eaa..a51823bd4670 100644
--- a/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
+++ b/dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
@@ -10,9 +10,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-
-SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     title: "getIdentityAssertion Tests"
   });
diff --git a/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html b/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
index 445d1e67d441..f2eb201a5bb3 100644
--- a/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
+++ b/dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
@@ -14,9 +14,6 @@
 <div id="display"></div>
 <pre id="test">
 <script type="application/javascript">
-
-SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     title: "setIdentityProvider leads to peerIdentity and assertions in SDP"
   });
diff --git a/dom/media/tests/mochitest/identity/test_setIdentityProvider.html b/dom/media/tests/mochitest/identity/test_setIdentityProvider.html
index 0862358c8585..735bfc97de49 100644
--- a/dom/media/tests/mochitest/identity/test_setIdentityProvider.html
+++ b/dom/media/tests/mochitest/identity/test_setIdentityProvider.html
@@ -12,9 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-
-SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     title: "setIdentityProvider leads to peerIdentity and assertions in SDP"
   });
diff --git a/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html b/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
index 174decaba545..45b798ff5300 100644
--- a/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
+++ b/dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
@@ -11,9 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-
-SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     title: "Identity Provider returning errors is handled correctly"
   });
diff --git a/dom/media/tests/mochitest/ipc/test_ipc.html b/dom/media/tests/mochitest/ipc/test_ipc.html
index e342c0409ec7..c510dbf417e9 100644
--- a/dom/media/tests/mochitest/ipc/test_ipc.html
+++ b/dom/media/tests/mochitest/ipc/test_ipc.html
@@ -11,7 +11,6 @@
     "use strict";
 
     SimpleTest.waitForExplicitFinish();
-    SimpleTest.requestFlakyTimeout("untriaged");
 
     // This isn't a single test. It runs the entirety of the PeerConnection
     // tests. Each of those has a normal timeout handler, so there's no point in
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicAudio.html b/dom/media/tests/mochitest/test_dataChannel_basicAudio.html
index c19419ba31cb..f1306105da48 100644
--- a/dom/media/tests/mochitest/test_dataChannel_basicAudio.html
+++ b/dom/media/tests/mochitest/test_dataChannel_basicAudio.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796895",
     title: "Basic data channel audio connection"
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicAudioVideo.html b/dom/media/tests/mochitest/test_dataChannel_basicAudioVideo.html
index 19f6543b91c6..19f11868401e 100644
--- a/dom/media/tests/mochitest/test_dataChannel_basicAudioVideo.html
+++ b/dom/media/tests/mochitest/test_dataChannel_basicAudioVideo.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796891",
     title: "Basic data channel audio/video connection"
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicAudioVideoCombined.html b/dom/media/tests/mochitest/test_dataChannel_basicAudioVideoCombined.html
index ffd3dbe857c5..26c14e90dbc7 100644
--- a/dom/media/tests/mochitest/test_dataChannel_basicAudioVideoCombined.html
+++ b/dom/media/tests/mochitest/test_dataChannel_basicAudioVideoCombined.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796891",
     title: "Basic data channel audio/video connection"
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicDataOnly.html b/dom/media/tests/mochitest/test_dataChannel_basicDataOnly.html
index d793eeadf792..42a745d3e7a5 100644
--- a/dom/media/tests/mochitest/test_dataChannel_basicDataOnly.html
+++ b/dom/media/tests/mochitest/test_dataChannel_basicDataOnly.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796894",
     title: "Basic datachannel only connection"
diff --git a/dom/media/tests/mochitest/test_dataChannel_basicVideo.html b/dom/media/tests/mochitest/test_dataChannel_basicVideo.html
index 922424e2ec13..fc8692b68e82 100644
--- a/dom/media/tests/mochitest/test_dataChannel_basicVideo.html
+++ b/dom/media/tests/mochitest/test_dataChannel_basicVideo.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796889",
     title: "Basic data channel video connection"
diff --git a/dom/media/tests/mochitest/test_dataChannel_bug1013809.html b/dom/media/tests/mochitest/test_dataChannel_bug1013809.html
index 30e1c487a4ce..3f64b1e16c32 100644
--- a/dom/media/tests/mochitest/test_dataChannel_bug1013809.html
+++ b/dom/media/tests/mochitest/test_dataChannel_bug1013809.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796895",
     title: "Basic data channel audio connection"
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html b/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
index 6f049ec37c02..79c48ef34c55 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicAudio.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that we can complete a start and stop media playback
    * cycle for an audio LocalMediaStream on an audio HTMLMediaElement.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html b/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html
index eff6347d837e..58bd42f61e06 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicScreenshare.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=983504
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that we can complete a start and stop media playback
    * cycle for an screenshare LocalMediaStream on a video HTMLMediaElement.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html b/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
index 3afa5a50b56c..cd9b1be42b4f 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicVideo.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that we can complete a start and stop media playback
    * cycle for an video LocalMediaStream on a video HTMLMediaElement.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html b/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
index 98800fbe7618..65ae59b3a079 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicVideoAudio.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=781534
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that we can complete a start and stop media playback
    * cycle for a video and audio LocalMediaStream on a video HTMLMediaElement.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html b/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html
index 12816f0c5be1..0c4aac42abd9 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicWindowshare.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=983504
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that we can complete a start and stop media playback
    * cycle for an screenshare LocalMediaStream on a video HTMLMediaElement.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html b/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html
index b127ddad35ee..d6965c8cc29e 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_gumWithinGum.html
@@ -20,8 +20,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test that we can complete a playback cycle for a video,
    * then upon completion, do a playback cycle with audio, such that
diff --git a/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html b/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html
index d933d284c2a1..0a3b7dee0612 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_peerIdentity.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=942367
 </div>
 <pre id="test">
 <script type="application/javascript">
-SimpleTest.requestFlakyTimeout("untriaged");
-
 function theTest() {
   function testPeerIdentityConstraint(withConstraint, done) {
     var config = { audio: true, video: true, fake: true };
diff --git a/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html b/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html
index df9b64936b88..ce9b531d8257 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_playAudioTwice.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test that we can complete an audio playback cycle twice in a row.
    */
diff --git a/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html b/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html
index b51f96f34576..13be683cba80 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_playVideoAudioTwice.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test that we can complete a video playback cycle twice in a row.
    */
diff --git a/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html b/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html
index 690245091190..af1c24a4f91d 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_playVideoTwice.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test that we can complete a video playback cycle twice in a row.
    */
diff --git a/dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html b/dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html
index 2112e8a16c52..f6c06d7739ea 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_stopAudioStream.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that we can start an audio stream in a media element,
    * call stop() on the stream, and successfully get an ended event fired.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html b/dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html
index e92f12f8919f..39fe06cebe4f 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_stopAudioStreamWithFollowupAudio.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that I can complete an audio gum playback in a media
    * element, stop the stream, and then complete another audio gum playback
diff --git a/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html b/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html
index 981d664c639d..bc183079bf71 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStream.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that we can start a video+audio stream in a
    * media element, call stop() on the stream, and successfully get an
diff --git a/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html b/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html
index ba00dc4b814d..2a133bb5c933 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_stopVideoAudioStreamWithFollowupVideoAudio.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that I can complete an video+audio gum playback in a
    * media element, stop the stream, and then complete another video+audio gum
diff --git a/dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html b/dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html
index c9d0c41dc2b5..3a41d8204923 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_stopVideoStream.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that we can start a video stream in a media element,
    * call stop() on the stream, and successfully get an ended event fired.
diff --git a/dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html b/dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html
index 7738ae94d490..4d602c9b92b3 100644
--- a/dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_stopVideoStreamWithFollowupVideo.html
@@ -19,8 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=822109
 </div>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   /**
    * Run a test to verify that I can complete an audio gum playback in a media
    * element, stop the stream, and then complete another audio gum playback
diff --git a/dom/media/tests/mochitest/test_peerConnection_addCandidateInHaveLocalOffer.html b/dom/media/tests/mochitest/test_peerConnection_addCandidateInHaveLocalOffer.html
index 1976777aead2..95579a16ce66 100644
--- a/dom/media/tests/mochitest/test_peerConnection_addCandidateInHaveLocalOffer.html
+++ b/dom/media/tests/mochitest/test_peerConnection_addCandidateInHaveLocalOffer.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "784519",
     title: "addCandidate (answer) in 'have-local-offer'"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudio.html b/dom/media/tests/mochitest/test_peerConnection_basicAudio.html
index 7a0dabba5ff2..acfe7c0a6645 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicAudio.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicAudio.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796892",
     title: "Basic audio-only peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html
index b1c50e71a396..6caef1f69564 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideo.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796890",
     title: "Basic audio/video (separate) peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
index 94d0b4c36cee..37471c634ebf 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796890",
     title: "Basic audio/video (combined) peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicH264Video.html b/dom/media/tests/mochitest/test_peerConnection_basicH264Video.html
index 9565466a6648..68f8ed12ea85 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicH264Video.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicH264Video.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript;version=1.8">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1040346",
     title: "Basic H.264 GMP video-only peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicScreenshare.html b/dom/media/tests/mochitest/test_peerConnection_basicScreenshare.html
index ad40d6960d60..0e1c93fc8d7b 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicScreenshare.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicScreenshare.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1039666",
     title: "Basic screenshare-only peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicVideo.html b/dom/media/tests/mochitest/test_peerConnection_basicVideo.html
index 273eb46803d3..9b36db061ea0 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicVideo.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicVideo.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "796888",
     title: "Basic video-only peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_basicWindowshare.html b/dom/media/tests/mochitest/test_peerConnection_basicWindowshare.html
index fc40da6e3ef2..ae8369c06b7c 100644
--- a/dom/media/tests/mochitest/test_peerConnection_basicWindowshare.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicWindowshare.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1038926",
     title: "Basic windowshare-only peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug1013809.html b/dom/media/tests/mochitest/test_peerConnection_bug1013809.html
index 3504e13525e1..3877f9b95f18 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug1013809.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug1013809.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1013809",
     title: "Audio-only peer connection with swapped setLocal and setRemote steps"
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug1042791.html b/dom/media/tests/mochitest/test_peerConnection_bug1042791.html
index e39544b82a94..d82421e91120 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug1042791.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug1042791.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript;version=1.8">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1040346",
     title: "Basic H.264 GMP video-only peer connection"
diff --git a/dom/media/tests/mochitest/test_peerConnection_bug827843.html b/dom/media/tests/mochitest/test_peerConnection_bug827843.html
index cf64eae6d4df..5928d6002d13 100644
--- a/dom/media/tests/mochitest/test_peerConnection_bug827843.html
+++ b/dom/media/tests/mochitest/test_peerConnection_bug827843.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "827843",
     title: "Ensure that localDescription and remoteDescription are null after close"
diff --git a/dom/media/tests/mochitest/test_peerConnection_capturedVideo.html b/dom/media/tests/mochitest/test_peerConnection_capturedVideo.html
index 06f5ed642b9c..9640b943fa95 100644
--- a/dom/media/tests/mochitest/test_peerConnection_capturedVideo.html
+++ b/dom/media/tests/mochitest/test_peerConnection_capturedVideo.html
@@ -13,8 +13,6 @@
 <video id="v1" src="../../test/vp9cake.webm" height="120" width="160" autoplay muted></video>
 <pre id="test">
 <script type="application/javascript;version=1.8">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1081409",
     title: "Captured video-only over peer connection",
diff --git a/dom/media/tests/mochitest/test_peerConnection_close.html b/dom/media/tests/mochitest/test_peerConnection_close.html
index 4ba128e9e7f5..d5118c4f81d4 100644
--- a/dom/media/tests/mochitest/test_peerConnection_close.html
+++ b/dom/media/tests/mochitest/test_peerConnection_close.html
@@ -9,8 +9,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "991877",
     title: "Basic RTCPeerConnection.close() tests"
diff --git a/dom/media/tests/mochitest/test_peerConnection_noTrickleAnswer.html b/dom/media/tests/mochitest/test_peerConnection_noTrickleAnswer.html
index b89ba01d2df3..def81f23b8e4 100644
--- a/dom/media/tests/mochitest/test_peerConnection_noTrickleAnswer.html
+++ b/dom/media/tests/mochitest/test_peerConnection_noTrickleAnswer.html
@@ -13,8 +13,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1060102",
     title: "Basic audio only SDP answer without trickle ICE"
diff --git a/dom/media/tests/mochitest/test_peerConnection_noTrickleOffer.html b/dom/media/tests/mochitest/test_peerConnection_noTrickleOffer.html
index 4ecf4ccefc30..0114b46696d7 100644
--- a/dom/media/tests/mochitest/test_peerConnection_noTrickleOffer.html
+++ b/dom/media/tests/mochitest/test_peerConnection_noTrickleOffer.html
@@ -13,8 +13,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1060102",
     title: "Basic audio only SDP offer without trickle ICE"
diff --git a/dom/media/tests/mochitest/test_peerConnection_noTrickleOfferAnswer.html b/dom/media/tests/mochitest/test_peerConnection_noTrickleOfferAnswer.html
index 90e6fb97a402..10fc60d47d6e 100644
--- a/dom/media/tests/mochitest/test_peerConnection_noTrickleOfferAnswer.html
+++ b/dom/media/tests/mochitest/test_peerConnection_noTrickleOfferAnswer.html
@@ -13,8 +13,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1060102",
     title: "Basic audio only SDP offer and answer without trickle ICE"
diff --git a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveAudio.html b/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveAudio.html
index a0222a32ee5d..9e53abbe81d5 100644
--- a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveAudio.html
+++ b/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveAudio.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "850275",
     title: "Simple offer media constraint test with audio"
diff --git a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html b/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html
index f4c6ea500673..7d2c2c98ea15 100644
--- a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html
+++ b/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideo.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "850275",
     title: "Simple offer media constraint test with video"
diff --git a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html b/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html
index 71efc14999f4..25c0ec428a09 100644
--- a/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html
+++ b/dom/media/tests/mochitest/test_peerConnection_offerRequiresReceiveVideoAudio.html
@@ -11,8 +11,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "850275",
     title: "Simple offer media constraint test with video/audio"
diff --git a/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html b/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html
index bb73e3ed6ea1..5cd88c1d6644 100644
--- a/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html
+++ b/dom/media/tests/mochitest/test_peerConnection_replaceTrack.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript;version=1.8">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1032839",
     title: "Replace video track",
diff --git a/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInHaveLocalOffer.html b/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInHaveLocalOffer.html
index 60e78731caca..5caa02939034 100644
--- a/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInHaveLocalOffer.html
+++ b/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInHaveLocalOffer.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "784519",
     title: "setLocalDescription (answer) in 'have-local-offer'"
diff --git a/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInStable.html b/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInStable.html
index d25d8472b67c..f31f2a7087e6 100644
--- a/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInStable.html
+++ b/dom/media/tests/mochitest/test_peerConnection_setLocalAnswerInStable.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "784519",
     title: "setLocalDescription (answer) in 'stable'"
diff --git a/dom/media/tests/mochitest/test_peerConnection_setLocalOfferInHaveRemoteOffer.html b/dom/media/tests/mochitest/test_peerConnection_setLocalOfferInHaveRemoteOffer.html
index d2816764e3c9..24234280350b 100644
--- a/dom/media/tests/mochitest/test_peerConnection_setLocalOfferInHaveRemoteOffer.html
+++ b/dom/media/tests/mochitest/test_peerConnection_setLocalOfferInHaveRemoteOffer.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "784519",
     title: "setLocalDescription (offer) in 'have-remote-offer'"
diff --git a/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html b/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html
index 52302f118ed4..75b2ffea49a3 100644
--- a/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html
+++ b/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInHaveRemoteOffer.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "784519",
     title: "setRemoteDescription (answer) in 'have-remote-offer'"
diff --git a/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInStable.html b/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInStable.html
index 76c9794e17be..d6face27a214 100644
--- a/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInStable.html
+++ b/dom/media/tests/mochitest/test_peerConnection_setRemoteAnswerInStable.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "784519",
     title: "setRemoteDescription (answer) in 'stable'"
diff --git a/dom/media/tests/mochitest/test_peerConnection_setRemoteOfferInHaveLocalOffer.html b/dom/media/tests/mochitest/test_peerConnection_setRemoteOfferInHaveLocalOffer.html
index 465ef0e23785..e62427c2e127 100644
--- a/dom/media/tests/mochitest/test_peerConnection_setRemoteOfferInHaveLocalOffer.html
+++ b/dom/media/tests/mochitest/test_peerConnection_setRemoteOfferInHaveLocalOffer.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "784519",
     title: "setRemoteDescription (offer) in 'have-local-offer'"
diff --git a/dom/media/tests/mochitest/test_peerConnection_syncSetDescription.html b/dom/media/tests/mochitest/test_peerConnection_syncSetDescription.html
index d83a8f826c41..69274227b5d3 100644
--- a/dom/media/tests/mochitest/test_peerConnection_syncSetDescription.html
+++ b/dom/media/tests/mochitest/test_peerConnection_syncSetDescription.html
@@ -12,8 +12,6 @@
 <body>
 <pre id="test">
 <script type="application/javascript;version=1.8">
-  SimpleTest.requestFlakyTimeout("untriaged");
-
   createHTML({
     bug: "1063971",
     title: "Legacy sync setDescription calls",

From 0eebb24cd137095161ab63c01bae9226fb1624b7 Mon Sep 17 00:00:00 2001
From: Jed Davis <jld@mozilla.com>
Date: Thu, 18 Dec 2014 19:49:00 +0100
Subject: [PATCH 088/183] Bug 1113463 - Remove a lot of unused/unneeded
 ParamTraits instances. rs=bent

---
 .../src/chrome/common/ipc_message_utils.h     | 436 ------------------
 1 file changed, 436 deletions(-)

diff --git a/ipc/chromium/src/chrome/common/ipc_message_utils.h b/ipc/chromium/src/chrome/common/ipc_message_utils.h
index 2c1af33b10c8..fc09584b1136 100644
--- a/ipc/chromium/src/chrome/common/ipc_message_utils.h
+++ b/ipc/chromium/src/chrome/common/ipc_message_utils.h
@@ -384,98 +384,6 @@ struct ParamTraitsStd<std::wstring> {
   }
 };
 
-template <>
-struct ParamTraitsStd<std::vector<unsigned char> > {
-  typedef std::vector<unsigned char> param_type;
-  static void Write(Message* m, const param_type& p) {
-    if (p.size() == 0) {
-      m->WriteData(NULL, 0);
-    } else {
-      m->WriteData(reinterpret_cast<const char*>(&p.front()),
-                   static_cast<int>(p.size()));
-    }
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    const char *data;
-    int data_size = 0;
-    if (!m->ReadData(iter, &data, &data_size) || data_size < 0)
-      return false;
-    r->resize(data_size);
-    if (data_size)
-      memcpy(&r->front(), data, data_size);
-    return true;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    for (size_t i = 0; i < p.size(); ++i)
-      l->push_back(p[i]);
-  }
-};
-
-template <>
-struct ParamTraitsStd<std::vector<char> > {
-  typedef std::vector<char> param_type;
-  static void Write(Message* m, const param_type& p) {
-    if (p.size() == 0) {
-      m->WriteData(NULL, 0);
-    } else {
-      m->WriteData(&p.front(), static_cast<int>(p.size()));
-    }
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    const char *data;
-    int data_size = 0;
-    if (!m->ReadData(iter, &data, &data_size) || data_size < 0)
-      return false;
-    r->resize(data_size);
-    if (data_size)
-      memcpy(&r->front(), data, data_size);
-    return true;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    for (size_t i = 0; i < p.size(); ++i)
-      l->push_back(p[i]);
-  }
-};
-
-template <class P>
-struct ParamTraitsStd<std::vector<P> > {
-  typedef std::vector<P> param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, static_cast<int>(p.size()));
-    for (size_t i = 0; i < p.size(); i++)
-      WriteParam(m, p[i]);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    int size;
-    if (!m->ReadLength(iter, &size))
-      return false;
-    // Resizing beforehand is not safe, see BUG 1006367 for details.
-    if (m->IteratorHasRoomFor(*iter, size * sizeof(P))) {
-      r->resize(size);
-      for (int i = 0; i < size; i++) {
-        if (!ReadParam(m, iter, &(*r)[i]))
-          return false;
-      }
-    } else {
-      for (int i = 0; i < size; i++) {
-        P element;
-        if (!ReadParam(m, iter, &element))
-          return false;
-        r->push_back(element);
-      }
-    }
-    return true;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    for (size_t i = 0; i < p.size(); ++i) {
-      if (i != 0)
-        l->append(L" ");
-
-      LogParam((p[i]), l);
-    }
-  }
-};
-
 template <class K, class V>
 struct ParamTraitsStd<std::map<K, V> > {
   typedef std::map<K, V> param_type;
@@ -512,51 +420,6 @@ template <class P>
 struct ParamTraitsWindows : ParamTraitsStd<P> {};
 
 #if defined(OS_WIN)
-template <>
-struct ParamTraitsWindows<LOGFONT> {
-  typedef LOGFONT param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteData(reinterpret_cast<const char*>(&p), sizeof(LOGFONT));
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    const char *data;
-    int data_size = 0;
-    bool result = m->ReadData(iter, &data, &data_size);
-    if (result && data_size == sizeof(LOGFONT)) {
-      memcpy(r, data, sizeof(LOGFONT));
-    } else {
-      result = false;
-      NOTREACHED();
-    }
-
-    return result;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    l->append(StringPrintf(L"<LOGFONT>"));
-  }
-};
-
-template <>
-struct ParamTraitsWindows<MSG> {
-  typedef MSG param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteData(reinterpret_cast<const char*>(&p), sizeof(MSG));
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    const char *data;
-    int data_size = 0;
-    bool result = m->ReadData(iter, &data, &data_size);
-    if (result && data_size == sizeof(MSG)) {
-      memcpy(r, data, sizeof(MSG));
-    } else {
-      result = false;
-      NOTREACHED();
-    }
-
-    return result;
-  }
-};
-
 template <>
 struct ParamTraitsWindows<HANDLE> {
   typedef HANDLE param_type;
@@ -572,21 +435,6 @@ struct ParamTraitsWindows<HANDLE> {
   }
 };
 
-template <>
-struct ParamTraitsWindows<HCURSOR> {
-  typedef HCURSOR param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteIntPtr(reinterpret_cast<intptr_t>(p));
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    DCHECK_EQ(sizeof(param_type), sizeof(intptr_t));
-    return m->ReadIntPtr(iter, reinterpret_cast<intptr_t*>(r));
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    l->append(StringPrintf(L"0x%X", p));
-  }
-};
-
 template <>
 struct ParamTraitsWindows<HWND> {
   typedef HWND param_type;
@@ -601,62 +449,6 @@ struct ParamTraitsWindows<HWND> {
     l->append(StringPrintf(L"0x%X", p));
   }
 };
-
-template <>
-struct ParamTraitsWindows<HACCEL> {
-  typedef HACCEL param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteIntPtr(reinterpret_cast<intptr_t>(p));
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    DCHECK_EQ(sizeof(param_type), sizeof(intptr_t));
-    return m->ReadIntPtr(iter, reinterpret_cast<intptr_t*>(r));
-  }
-};
-
-template <>
-struct ParamTraitsWindows<POINT> {
-  typedef POINT param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteInt(p.x);
-    m->WriteInt(p.y);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    int x, y;
-    if (!m->ReadInt(iter, &x) || !m->ReadInt(iter, &y))
-      return false;
-    r->x = x;
-    r->y = y;
-    return true;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    l->append(StringPrintf(L"(%d, %d)", p.x, p.y));
-  }
-};
-
-template <>
-struct ParamTraitsWindows<XFORM> {
-  typedef XFORM param_type;
-  static void Write(Message* m, const param_type& p) {
-    m->WriteData(reinterpret_cast<const char*>(&p), sizeof(XFORM));
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    const char *data;
-    int data_size = 0;
-    bool result = m->ReadData(iter, &data, &data_size);
-    if (result && data_size == sizeof(XFORM)) {
-      memcpy(r, data, sizeof(XFORM));
-    } else {
-      result = false;
-      NOTREACHED();
-    }
-
-    return result;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    l->append(L"<XFORM>");
-  }
-};
 #endif  // defined(OS_WIN)
 
 // Various ipc/chromium types.
@@ -664,14 +456,6 @@ struct ParamTraitsWindows<XFORM> {
 template <class P>
 struct ParamTraitsIPC : ParamTraitsWindows<P> {};
 
-template <>
-struct ParamTraitsIPC<base::Time> {
-  typedef base::Time param_type;
-  static inline void Write(Message* m, const param_type& p);
-  static inline bool Read(const Message* m, void** iter, param_type* r);
-  static inline void Log(const param_type& p, std::wstring* l);
-};
-
 #if defined(OS_POSIX)
 // FileDescriptors may be serialised over IPC channels on POSIX. On the
 // receiving side, the FileDescriptor is a valid duplicate of the file
@@ -724,14 +508,6 @@ struct ParamTraitsIPC<base::FileDescriptor> {
 };
 #endif // defined(OS_POSIX)
 
-template <>
-struct ParamTraitsIPC<FilePath> {
-  typedef FilePath param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, void** iter, param_type* r);
-  static void Log(const param_type& p, std::wstring* l);
-};
-
 #if defined(OS_WIN)
 template<>
 struct ParamTraitsIPC<TransportDIB::Id> {
@@ -754,183 +530,6 @@ struct ParamTraitsIPC<TransportDIB::Id> {
 };
 #endif
 
-template <>
-struct ParamTraitsIPC<Message> {
-  static void Write(Message* m, const Message& p) {
-    m->WriteInt(p.size());
-    m->WriteData(reinterpret_cast<const char*>(p.data()), p.size());
-  }
-  static bool Read(const Message* m, void** iter, Message* r) {
-    int size;
-    if (!m->ReadInt(iter, &size))
-      return false;
-    const char* data;
-    if (!m->ReadData(iter, &data, &size))
-      return false;
-    *r = Message(data, size);
-    return true;
-  }
-  static void Log(const Message& p, std::wstring* l) {
-    l->append(L"<IPC::Message>");
-  }
-};
-
-template <>
-struct ParamTraitsIPC<Tuple0> {
-  typedef Tuple0 param_type;
-  static void Write(Message* m, const param_type& p) {
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    return true;
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-  }
-};
-
-template <class A>
-struct ParamTraitsIPC< Tuple1<A> > {
-  typedef Tuple1<A> param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    return ReadParam(m, iter, &r->a);
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    LogParam(p.a, l);
-  }
-};
-
-template <class A, class B>
-struct ParamTraitsIPC< Tuple2<A, B> > {
-  typedef Tuple2<A, B> param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b));
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    LogParam(p.a, l);
-    l->append(L", ");
-    LogParam(p.b, l);
-  }
-};
-
-template <class A, class B, class C>
-struct ParamTraitsIPC< Tuple3<A, B, C> > {
-  typedef Tuple3<A, B, C> param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
-    WriteParam(m, p.c);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b) &&
-            ReadParam(m, iter, &r->c));
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    LogParam(p.a, l);
-    l->append(L", ");
-    LogParam(p.b, l);
-    l->append(L", ");
-    LogParam(p.c, l);
-  }
-};
-
-template <class A, class B, class C, class D>
-struct ParamTraitsIPC< Tuple4<A, B, C, D> > {
-  typedef Tuple4<A, B, C, D> param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
-    WriteParam(m, p.c);
-    WriteParam(m, p.d);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b) &&
-            ReadParam(m, iter, &r->c) &&
-            ReadParam(m, iter, &r->d));
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    LogParam(p.a, l);
-    l->append(L", ");
-    LogParam(p.b, l);
-    l->append(L", ");
-    LogParam(p.c, l);
-    l->append(L", ");
-    LogParam(p.d, l);
-  }
-};
-
-template <class A, class B, class C, class D, class E>
-struct ParamTraitsIPC< Tuple5<A, B, C, D, E> > {
-  typedef Tuple5<A, B, C, D, E> param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
-    WriteParam(m, p.c);
-    WriteParam(m, p.d);
-    WriteParam(m, p.e);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b) &&
-            ReadParam(m, iter, &r->c) &&
-            ReadParam(m, iter, &r->d) &&
-            ReadParam(m, iter, &r->e));
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    LogParam(p.a, l);
-    l->append(L", ");
-    LogParam(p.b, l);
-    l->append(L", ");
-    LogParam(p.c, l);
-    l->append(L", ");
-    LogParam(p.d, l);
-    l->append(L", ");
-    LogParam(p.e, l);
-  }
-};
-
-template <class A, class B, class C, class D, class E, class F>
-struct ParamTraitsIPC< Tuple6<A, B, C, D, E, F> > {
-  typedef Tuple6<A, B, C, D, E, F> param_type;
-  static void Write(Message* m, const param_type& p) {
-    WriteParam(m, p.a);
-    WriteParam(m, p.b);
-    WriteParam(m, p.c);
-    WriteParam(m, p.d);
-    WriteParam(m, p.e);
-    WriteParam(m, p.f);
-  }
-  static bool Read(const Message* m, void** iter, param_type* r) {
-    return (ReadParam(m, iter, &r->a) &&
-            ReadParam(m, iter, &r->b) &&
-            ReadParam(m, iter, &r->c) &&
-            ReadParam(m, iter, &r->d) &&
-            ReadParam(m, iter, &r->e) &&
-            ReadParam(m, iter, &r->f));
-  }
-  static void Log(const param_type& p, std::wstring* l) {
-    LogParam(p.a, l);
-    l->append(L", ");
-    LogParam(p.b, l);
-    l->append(L", ");
-    LogParam(p.c, l);
-    l->append(L", ");
-    LogParam(p.d, l);
-    l->append(L", ");
-    LogParam(p.e, l);
-    l->append(L", ");
-    LogParam(p.f, l);
-  }
-};
-
 // Mozilla-specific types.
 
 template <class P>
@@ -954,41 +553,6 @@ struct ParamTraitsMozilla<nsresult> {
 
 template <class P> struct ParamTraits : ParamTraitsMozilla<P> {};
 
-// Now go back and define inlines dependent upon various ParamTraits<P>.
-inline void
-ParamTraitsIPC<base::Time>::Write(Message* m, const param_type& p) {
-  ParamTraits<int64_t>::Write(m, p.ToInternalValue());
-}
-inline bool
-ParamTraitsIPC<base::Time>::Read(const Message* m, void** iter, param_type* r) {
-  int64_t value;
-  if (!ParamTraits<int64_t>::Read(m, iter, &value))
-    return false;
-  *r = base::Time::FromInternalValue(value);
-  return true;
-}
-inline void
-ParamTraitsIPC<base::Time>::Log(const param_type& p, std::wstring* l) {
-  ParamTraits<int64_t>::Log(p.ToInternalValue(), l);
-}
-
-inline void
-ParamTraitsIPC<FilePath>::Write(Message* m, const param_type& p) {
-  ParamTraits<FilePath::StringType>::Write(m, p.value());
-}
-inline bool
-ParamTraitsIPC<FilePath>::Read(const Message* m, void** iter, param_type* r) {
-  FilePath::StringType value;
-  if (!ParamTraits<FilePath::StringType>::Read(m, iter, &value))
-    return false;
-  *r = FilePath(value);
-  return true;
-}
-inline void
-ParamTraitsIPC<FilePath>::Log(const param_type& p, std::wstring* l) {
-  ParamTraits<FilePath::StringType>::Log(p.value(), l);
-}
-
 //-----------------------------------------------------------------------------
 // Generic message subclasses
 

From 6de0fd24fbc5a068fe7752027cd633354d12faca Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Thu, 18 Dec 2014 13:59:00 +0100
Subject: [PATCH 089/183] Bug 1113282 - Check during async TrackBuffer decoder
 initialization to make sure we haven't been shut down. r=cajbir

---
 dom/media/mediasource/MediaSourceReader.cpp |  1 +
 dom/media/mediasource/TrackBuffer.cpp       | 38 +++++++++++++++++----
 dom/media/mediasource/TrackBuffer.h         |  1 +
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/dom/media/mediasource/MediaSourceReader.cpp b/dom/media/mediasource/MediaSourceReader.cpp
index 0818e9f9d8f5..58815262cf6a 100644
--- a/dom/media/mediasource/MediaSourceReader.cpp
+++ b/dom/media/mediasource/MediaSourceReader.cpp
@@ -327,6 +327,7 @@ MediaSourceReader::Shutdown()
 void
 MediaSourceReader::ContinueShutdown()
 {
+  ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
   if (mTrackBuffers.Length()) {
     mTrackBuffers[0]->Shutdown()->Then(GetTaskQueue(), __func__, this,
                                        &MediaSourceReader::ContinueShutdown,
diff --git a/dom/media/mediasource/TrackBuffer.cpp b/dom/media/mediasource/TrackBuffer.cpp
index d8ec425aef9a..a1ed3ce53ea2 100644
--- a/dom/media/mediasource/TrackBuffer.cpp
+++ b/dom/media/mediasource/TrackBuffer.cpp
@@ -39,12 +39,14 @@ TrackBuffer::TrackBuffer(MediaSourceDecoder* aParentDecoder, const nsACString& a
   : mParentDecoder(aParentDecoder)
   , mType(aType)
   , mLastStartTimestamp(0)
+  , mShutdown(false)
 {
   MOZ_COUNT_CTOR(TrackBuffer);
   mParser = ContainerParser::CreateForMIMEType(aType);
   mTaskQueue = new MediaTaskQueue(GetMediaDecodeThreadPool());
   aParentDecoder->AddTrackBuffer(this);
   mDecoderPerSegment = Preferences::GetBool("media.mediasource.decoder-per-segment", false);
+  MSE_DEBUG("TrackBuffer(%p) created for parent decoder %p", this, aParentDecoder);
 }
 
 TrackBuffer::~TrackBuffer()
@@ -101,6 +103,9 @@ private:
 nsRefPtr<ShutdownPromise>
 TrackBuffer::Shutdown()
 {
+  mParentDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+  mShutdown = true;
+
   MOZ_ASSERT(mShutdownPromise.IsEmpty());
   nsRefPtr<ShutdownPromise> p = mShutdownPromise.Ensure(__func__);
 
@@ -370,23 +375,42 @@ TrackBuffer::QueueInitializeDecoder(SourceBufferDecoder* aDecoder)
 void
 TrackBuffer::InitializeDecoder(SourceBufferDecoder* aDecoder)
 {
-  MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-
-  // ReadMetadata may block the thread waiting on data, so it must not be
-  // called with the monitor held.
+  // ReadMetadata may block the thread waiting on data, so we must be able
+  // to leave the monitor while we call it. For the rest of this function
+  // we want to hold the monitor though, since we run on a different task queue
+  // from the reader and interact heavily with it.
   mParentDecoder->GetReentrantMonitor().AssertNotCurrentThreadIn();
+  ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
 
+  // We may be shut down at any time by the reader on another thread. So we need
+  // to check for this each time we acquire the monitor. If that happens, we
+  // need to abort immediately, because the reader has forgotten about us, and
+  // important pieces of our state (like mTaskQueue) have also been torn down.
+  if (mShutdown) {
+    MSE_DEBUG("TrackBuffer(%p) was shut down. Aborting initialization.", this);
+    return;
+  }
+
+  MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
   MediaDecoderReader* reader = aDecoder->GetReader();
   MSE_DEBUG("TrackBuffer(%p): Initializing subdecoder %p reader %p",
             this, aDecoder, reader);
 
   MediaInfo mi;
   nsAutoPtr<MetadataTags> tags; // TODO: Handle metadata.
-  nsresult rv = reader->ReadMetadata(&mi, getter_Transfers(tags));
+  nsresult rv;
+  {
+    ReentrantMonitorAutoExit mon(mParentDecoder->GetReentrantMonitor());
+    rv = reader->ReadMetadata(&mi, getter_Transfers(tags));
+  }
+
   reader->SetIdle();
+  if (mShutdown) {
+    MSE_DEBUG("TrackBuffer(%p) was shut down while reading metadata. Aborting initialization.", this);
+    return;
+  }
 
   if (NS_SUCCEEDED(rv) && reader->IsWaitingOnCDMResource()) {
-    ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
     mWaitingDecoders.AppendElement(aDecoder);
     return;
   }
@@ -442,7 +466,7 @@ TrackBuffer::ValidateTrackFormats(const MediaInfo& aInfo)
 bool
 TrackBuffer::RegisterDecoder(SourceBufferDecoder* aDecoder)
 {
-  ReentrantMonitorAutoEnter mon(mParentDecoder->GetReentrantMonitor());
+  mParentDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
   const MediaInfo& info = aDecoder->GetReader()->GetMediaInfo();
   // Initialize the track info since this is the first decoder.
   if (mInitializedDecoders.IsEmpty()) {
diff --git a/dom/media/mediasource/TrackBuffer.h b/dom/media/mediasource/TrackBuffer.h
index b7f416efd4e0..ecb40daff8b1 100644
--- a/dom/media/mediasource/TrackBuffer.h
+++ b/dom/media/mediasource/TrackBuffer.h
@@ -163,6 +163,7 @@ private:
   void ContinueShutdown();
   MediaPromiseHolder<ShutdownPromise> mShutdownPromise;
   bool mDecoderPerSegment;
+  bool mShutdown;
 };
 
 } // namespace mozilla

From 8f811ab17286f98c495a8807fbd455a9fb7cc073 Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nsilva@mozilla.com>
Date: Thu, 18 Dec 2014 22:23:53 +0100
Subject: [PATCH 090/183] Bug 1112170 - Don't disable tiles for the basic
 backend on Linux. r=Bas

---
 gfx/layers/client/ClientPaintedLayer.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gfx/layers/client/ClientPaintedLayer.cpp b/gfx/layers/client/ClientPaintedLayer.cpp
index 7096f5f3be2d..0f58479a6d9c 100644
--- a/gfx/layers/client/ClientPaintedLayer.cpp
+++ b/gfx/layers/client/ClientPaintedLayer.cpp
@@ -162,10 +162,13 @@ ClientLayerManager::CreatePaintedLayerWithHint(PaintedLayerCreationHint aHint)
 #ifdef MOZ_B2G
       aHint == SCROLLABLE &&
 #endif
-      gfxPlatform::GetPlatform()->UseTiling() &&
-      (AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_OPENGL ||
-       AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D9 ||
-       AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D11)) {
+      gfxPlatform::GetPlatform()->UseTiling()
+#ifndef MOZ_X11
+      && (AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_OPENGL ||
+          AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D9 ||
+          AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D11)
+#endif
+  ) {
     nsRefPtr<ClientTiledPaintedLayer> layer = new ClientTiledPaintedLayer(this, aHint);
     CREATE_SHADOW(Painted);
     return layer.forget();

From c1b3e5deb91e1fb3c81fac7261a4092dad51e04c Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Thu, 18 Dec 2014 23:48:00 +0100
Subject: [PATCH 091/183] Bug 1108960 - notify all steams for the resource ID
 when any stream get closed/suspended/resumed. r=roc.

---
 dom/media/MediaCache.cpp    | 30 ++++++++++++++++++++++++++++++
 dom/media/MediaResource.cpp | 11 +++++++----
 dom/media/MediaResource.h   |  2 ++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/dom/media/MediaCache.cpp b/dom/media/MediaCache.cpp
index 927b2af0cbbe..aa29dd9ce81b 100644
--- a/dom/media/MediaCache.cpp
+++ b/dom/media/MediaCache.cpp
@@ -194,6 +194,10 @@ public:
   // This queues a call to Update() on the main thread.
   void QueueUpdate();
 
+  // Notify all streams for the resource ID that the suspended status changed
+  // at the end of MediaCache::Update.
+  void QueueSuspendedStatusUpdate(int64_t aResourceID);
+
   // Updates the cache state asynchronously on the main thread:
   // -- try to trim the cache back to its desired size, if necessary
   // -- suspend channels that are going to read data that's lower priority
@@ -347,6 +351,8 @@ protected:
 #ifdef DEBUG
   bool            mInUpdate;
 #endif
+  // A list of resource IDs to notify about the change in suspended status.
+  nsTArray<int64_t> mSuspendedStatusToNotify;
 };
 
 NS_IMETHODIMP
@@ -1351,10 +1357,12 @@ MediaCache::Update()
     case RESUME:
       CACHE_LOG(PR_LOG_DEBUG, ("Stream %p Resumed", stream));
       rv = stream->mClient->CacheClientResume();
+      QueueSuspendedStatusUpdate(stream->mResourceID);
       break;
     case SUSPEND:
       CACHE_LOG(PR_LOG_DEBUG, ("Stream %p Suspended", stream));
       rv = stream->mClient->CacheClientSuspend();
+      QueueSuspendedStatusUpdate(stream->mResourceID);
       break;
     default:
       rv = NS_OK;
@@ -1369,6 +1377,15 @@ MediaCache::Update()
       stream->CloseInternal(mon);
     }
   }
+
+  // Notify streams about the suspended status changes.
+  for (uint32_t i = 0; i < mSuspendedStatusToNotify.Length(); ++i) {
+    MediaCache::ResourceStreamIterator iter(mSuspendedStatusToNotify[i]);
+    while (MediaCacheStream* stream = iter.Next()) {
+      stream->mClient->CacheClientNotifySuspendedStatusChanged();
+    }
+  }
+  mSuspendedStatusToNotify.Clear();
 }
 
 class UpdateEvent : public nsRunnable
@@ -1399,6 +1416,15 @@ MediaCache::QueueUpdate()
   NS_DispatchToMainThread(event);
 }
 
+void
+MediaCache::QueueSuspendedStatusUpdate(int64_t aResourceID)
+{
+  NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
+  if (!mSuspendedStatusToNotify.Contains(aResourceID)) {
+    mSuspendedStatusToNotify.AppendElement(aResourceID);
+  }
+}
+
 #ifdef DEBUG_VERIFY_CACHE
 void
 MediaCache::Verify()
@@ -1980,6 +2006,10 @@ MediaCacheStream::CloseInternal(ReentrantMonitorAutoEnter& aReentrantMonitor)
   if (mClosed)
     return;
   mClosed = true;
+  // Closing a stream will change the return value of
+  // MediaCacheStream::AreAllStreamsForResourceSuspended as well as
+  // ChannelMediaResource::IsSuspendedByCache. Let's notify it.
+  gMediaCache->QueueSuspendedStatusUpdate(mResourceID);
   gMediaCache->ReleaseStreamBlocks(this);
   // Wake up any blocked readers
   aReentrantMonitor.NotifyAll();
diff --git a/dom/media/MediaResource.cpp b/dom/media/MediaResource.cpp
index 18e6e3933d23..a56100f9b455 100644
--- a/dom/media/MediaResource.cpp
+++ b/dom/media/MediaResource.cpp
@@ -1009,6 +1009,13 @@ ChannelMediaResource::CacheClientNotifyPrincipalChanged()
   mDecoder->NotifyPrincipalChanged();
 }
 
+void
+ChannelMediaResource::CacheClientNotifySuspendedStatusChanged()
+{
+  NS_ASSERTION(NS_IsMainThread(), "Don't call on non-main thread");
+  mDecoder->NotifySuspendedStatusChanged();
+}
+
 nsresult
 ChannelMediaResource::CacheClientSeek(int64_t aOffset, bool aResume)
 {
@@ -1067,8 +1074,6 @@ nsresult
 ChannelMediaResource::CacheClientSuspend()
 {
   Suspend(false);
-
-  mDecoder->NotifySuspendedStatusChanged();
   return NS_OK;
 }
 
@@ -1076,8 +1081,6 @@ nsresult
 ChannelMediaResource::CacheClientResume()
 {
   Resume();
-
-  mDecoder->NotifySuspendedStatusChanged();
   return NS_OK;
 }
 
diff --git a/dom/media/MediaResource.h b/dom/media/MediaResource.h
index 4ee81e041f5d..379ab6cebacc 100644
--- a/dom/media/MediaResource.h
+++ b/dom/media/MediaResource.h
@@ -538,6 +538,8 @@ public:
   void CacheClientNotifyDataEnded(nsresult aStatus);
   // Notify that the principal for the cached resource changed.
   void CacheClientNotifyPrincipalChanged();
+  // Notify the decoder that the cache suspended status changed.
+  void CacheClientNotifySuspendedStatusChanged();
 
   // These are called on the main thread by MediaCache. These shouldn't block,
   // but they may grab locks --- the media cache is not holding its lock

From d92e123dc4d8b3a6bd77c023737eac266309fe91 Mon Sep 17 00:00:00 2001
From: Andreas Pehrson <pehrsons@gmail.com>
Date: Wed, 26 Nov 2014 18:29:00 +0100
Subject: [PATCH 092/183] Bug 879717 - Part 1 - Delay entering
 HAVE_CURRENT_DATA state until a video frame has been stored in the image
 container. r=roc

---
 dom/html/HTMLMediaElement.cpp              | 118 +++++++++++++++++----
 dom/html/HTMLMediaElement.h                |   9 ++
 dom/media/test/test_streams_srcObject.html |   2 +
 3 files changed, 109 insertions(+), 20 deletions(-)

diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index 27d7e88c1e75..91650070698b 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -71,6 +71,8 @@
 #include "mozilla/dom/MediaSource.h"
 #include "MediaMetadataManager.h"
 #include "MediaSourceDecoder.h"
+#include "AudioStreamTrack.h"
+#include "VideoStreamTrack.h"
 
 #include "AudioChannelService.h"
 
@@ -663,7 +665,10 @@ void HTMLMediaElement::AbortExistingLoads()
   mHaveQueuedSelectResource = false;
   mSuspendedForPreloadNone = false;
   mDownloadSuspendedByCache = false;
+  mHasAudio = false;
+  mHasVideo = false;
   mSourcePointer = nullptr;
+  mLastNextFrameStatus = NEXT_FRAME_UNINITIALIZED;
 
   mTags = nullptr;
 
@@ -897,6 +902,30 @@ void HTMLMediaElement::NotifyMediaTrackEnabled(MediaTrack* aTrack)
   }
 }
 
+void HTMLMediaElement::NotifyMediaStreamTracksAvailable(DOMMediaStream* aStream)
+{
+  if (!mSrcStream || mSrcStream != aStream) {
+    return;
+  }
+
+  bool oldHasVideo = mHasVideo;
+
+  nsAutoTArray<nsRefPtr<AudioStreamTrack>,1> audioTracks;
+  mSrcStream->GetAudioTracks(audioTracks);
+  nsAutoTArray<nsRefPtr<VideoStreamTrack>,1> videoTracks;
+  mSrcStream->GetVideoTracks(videoTracks);
+
+  mHasAudio = !audioTracks.IsEmpty();
+  mHasVideo = !videoTracks.IsEmpty();
+
+  if (IsVideo() && oldHasVideo != mHasVideo) {
+    // We are a video element and mHasVideo changed so update the screen wakelock
+    NotifyOwnerDocumentActivityChanged();
+  }
+
+  UpdateReadyStateForData(mLastNextFrameStatus);
+}
+
 void HTMLMediaElement::LoadFromSourceChildren()
 {
   NS_ASSERTION(mDelayingLoadEvent,
@@ -1981,6 +2010,7 @@ HTMLMediaElement::HTMLMediaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNo
     mCurrentLoadID(0),
     mNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY),
     mReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING),
+    mLastNextFrameStatus(NEXT_FRAME_UNINITIALIZED),
     mLoadWaitStatus(NOT_WAITING),
     mVolume(1.0),
     mPreloadAction(PRELOAD_UNDEFINED),
@@ -2818,6 +2848,25 @@ private:
   bool mPendingNotifyOutput;
 };
 
+class HTMLMediaElement::MediaStreamTracksAvailableCallback:
+    public DOMMediaStream::OnTracksAvailableCallback
+{
+public:
+  explicit MediaStreamTracksAvailableCallback(HTMLMediaElement* aElement,
+                                              DOMMediaStream::TrackTypeHints aExpectedTracks = 0):
+      DOMMediaStream::OnTracksAvailableCallback(aExpectedTracks),
+      mElement(aElement)
+    {}
+  virtual void NotifyTracksAvailable(DOMMediaStream* aStream)
+  {
+    NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
+
+    mElement->NotifyMediaStreamTracksAvailable(aStream);
+  }
+private:
+  HTMLMediaElement* mElement;
+};
+
 void HTMLMediaElement::SetupSrcMediaStreamPlayback(DOMMediaStream* aStream)
 {
   NS_ASSERTION(!mSrcStream && !mSrcStreamListener, "Should have been ended already");
@@ -2839,22 +2888,26 @@ void HTMLMediaElement::SetupSrcMediaStreamPlayback(DOMMediaStream* aStream)
   if (mPausedForInactiveDocumentOrChannel) {
     GetSrcMediaStream()->ChangeExplicitBlockerCount(1);
   }
+
+  mSrcStream->OnTracksAvailable(new MediaStreamTracksAvailableCallback(this, DOMMediaStream::HINT_CONTENTS_AUDIO));
+  mSrcStream->OnTracksAvailable(new MediaStreamTracksAvailableCallback(this, DOMMediaStream::HINT_CONTENTS_VIDEO));
+
+  ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_IDLE);
+
   ChangeDelayLoadStatus(false);
   GetSrcMediaStream()->AddAudioOutput(this);
-  GetSrcMediaStream()->SetAudioOutputVolume(this, float(mMuted ? 0.0 : mVolume));
+  SetVolumeInternal();
   VideoFrameContainer* container = GetVideoFrameContainer();
   if (container) {
     GetSrcMediaStream()->AddVideoOutput(container);
   }
 
+  CheckAutoplayDataReady();
+
   // Note: we must call DisconnectTrackListListeners(...)  before dropping
   // mSrcStream
   mSrcStream->ConstructMediaTracks(AudioTracks(), VideoTracks());
 
-  ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
-  DispatchAsyncEvent(NS_LITERAL_STRING("durationchange"));
-  DispatchAsyncEvent(NS_LITERAL_STRING("loadedmetadata"));
-  ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_IDLE);
   AddRemoveSelfReference();
   // FirstFrameLoaded() will be called when the stream has current data.
 }
@@ -2935,6 +2988,11 @@ void HTMLMediaElement::MetadataLoaded(const MediaInfo* aInfo,
   } else {
     UpdateMediaSize(aInfo->mVideo.mDisplay);
   }
+
+  if (IsVideo() && aInfo->HasVideo()) {
+    // We are a video element playing video so update the screen wakelock
+    NotifyOwnerDocumentActivityChanged();
+  }
 }
 
 void HTMLMediaElement::FirstFrameLoaded()
@@ -3195,18 +3253,47 @@ bool HTMLMediaElement::ShouldCheckAllowOrigin()
 
 void HTMLMediaElement::UpdateReadyStateForData(MediaDecoderOwner::NextFrameStatus aNextFrame)
 {
-  if (mReadyState < nsIDOMHTMLMediaElement::HAVE_METADATA) {
+  mLastNextFrameStatus = aNextFrame;
+
+  if (mDecoder && mReadyState < nsIDOMHTMLMediaElement::HAVE_METADATA) {
     // aNextFrame might have a next frame because the decoder can advance
     // on its own thread before MetadataLoaded gets a chance to run.
     // The arrival of more data can't change us out of this readyState.
     return;
   }
 
+  if (mSrcStream && mReadyState < nsIDOMHTMLMediaElement::HAVE_METADATA) {
+    if ((!mHasAudio && !mHasVideo) ||
+        (IsVideo() && mHasVideo && mMediaSize == nsIntSize(-1, -1))) {
+      return;
+    }
+
+    // We are playing a stream that has video and a video frame is now set.
+    // This means we have all metadata needed to change ready state.
+    MediaInfo mediaInfo;
+    mediaInfo.mAudio.mHasAudio = mHasAudio;
+    mediaInfo.mVideo.mHasVideo = mHasVideo;
+    if (mHasVideo) {
+      mediaInfo.mVideo.mDisplay = mMediaSize;
+    }
+    MetadataLoaded(&mediaInfo, nsAutoPtr<const MetadataTags>(nullptr));
+  }
+
   if (aNextFrame == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_SEEKING) {
     ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
     return;
   }
 
+  if (IsVideo() && mHasVideo && !IsPlaybackEnded() &&
+        GetImageContainer() && !GetImageContainer()->HasCurrentImage()) {
+    // Don't advance if we are playing video, but don't have a video frame.
+    // Also, if video became available after advancing to HAVE_CURRENT_DATA
+    // while we are still playing, we need to revert to HAVE_METADATA until
+    // a video frame is available.
+    ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
+    return;
+  }
+
   if (mDownloadSuspendedByCache && mDecoder && !mDecoder->IsEnded()) {
     // The decoder has signaled that the download has been suspended by the
     // media cache. So move readyState into HAVE_ENOUGH_DATA, in case there's
@@ -3354,14 +3441,14 @@ void HTMLMediaElement::ChangeNetworkState(nsMediaNetworkState aState)
 
 bool HTMLMediaElement::CanActivateAutoplay()
 {
-  // For stream inputs, we activate autoplay on HAVE_CURRENT_DATA because
+  // For stream inputs, we activate autoplay on HAVE_NOTHING because
   // this element itself might be blocking the stream from making progress by
   // being paused.
   return !mPausedForInactiveDocumentOrChannel &&
          mAutoplaying &&
          mPaused &&
          ((mDecoder && mReadyState >= nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA) ||
-          (mSrcStream && mReadyState >= nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA)) &&
+          mSrcStream) &&
          HasAttr(kNameSpaceID_None, nsGkAtoms::autoplay) &&
          mAutoplayEnabled &&
          !IsEditable();
@@ -3390,24 +3477,14 @@ void HTMLMediaElement::CheckAutoplayDataReady()
 
 VideoFrameContainer* HTMLMediaElement::GetVideoFrameContainer()
 {
-  // If we have loaded the metadata, and the size of the video is still
-  // (-1, -1), the media has no video. Don't go a create a video frame
-  // container.
-  if (mReadyState >= nsIDOMHTMLMediaElement::HAVE_METADATA &&
-      mMediaSize == nsIntSize(-1, -1)) {
-    return nullptr;
-  }
+  if (mVideoFrameContainer)
+    return mVideoFrameContainer;
 
   // Only video frames need an image container.
   if (!IsVideo()) {
     return nullptr;
   }
 
-  mHasVideo = true;
-
-  if (mVideoFrameContainer)
-    return mVideoFrameContainer;
-
   mVideoFrameContainer =
     new VideoFrameContainer(this, LayerManager::CreateAsynchronousImageContainer());
 
@@ -3520,6 +3597,7 @@ void HTMLMediaElement::NotifyDecoderPrincipalChanged()
 void HTMLMediaElement::UpdateMediaSize(nsIntSize size)
 {
   mMediaSize = size;
+  UpdateReadyStateForData(mLastNextFrameStatus);
 }
 
 void HTMLMediaElement::SuspendOrResumeElement(bool aPauseElement, bool aSuspendEvents)
diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h
index 413424d088ed..ace9f320852e 100644
--- a/dom/html/HTMLMediaElement.h
+++ b/dom/html/HTMLMediaElement.h
@@ -281,6 +281,11 @@ public:
 
   void NotifyMediaTrackEnabled(MediaTrack* aTrack);
 
+  /**
+   * Called when tracks become available to the source media stream.
+   */
+  void NotifyMediaStreamTracksAvailable(DOMMediaStream* aStream);
+
   virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
 
   /**
@@ -612,6 +617,7 @@ protected:
   virtual ~HTMLMediaElement();
 
   class MediaLoadListener;
+  class MediaStreamTracksAvailableCallback;
   class StreamListener;
 
   virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
@@ -1036,6 +1042,9 @@ protected:
   nsMediaNetworkState mNetworkState;
   nsMediaReadyState mReadyState;
 
+  // Last value passed from codec or stream source to UpdateReadyStateForData.
+  NextFrameStatus mLastNextFrameStatus;
+
   enum LoadAlgorithmState {
     // No load algorithm instance is waiting for a source to be added to the
     // media in order to continue loading.
diff --git a/dom/media/test/test_streams_srcObject.html b/dom/media/test/test_streams_srcObject.html
index 446c5466b41a..ed9c5866783e 100644
--- a/dom/media/test/test_streams_srcObject.html
+++ b/dom/media/test/test_streams_srcObject.html
@@ -45,6 +45,8 @@ function doTest() {
     }
     ++step;
   });
+  a.play();
+  b.play();
 }
 </script>
 </pre>

From a670bb9fa6e7126622366c28d7b73876ee432c2c Mon Sep 17 00:00:00 2001
From: Andreas Pehrson <pehrsons@gmail.com>
Date: Wed, 26 Nov 2014 18:30:00 +0100
Subject: [PATCH 093/183] Bug 879717 - Part 2 - Test that drawing a video
 element to canvas never throws. r=roc

---
 dom/media/test/mochitest.ini       |   1 +
 dom/media/test/test_bug879717.html | 119 +++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 dom/media/test/test_bug879717.html

diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini
index 0b242c697c95..6479cc42ad61 100644
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -332,6 +332,7 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_bug726904.html]
 [test_bug874897.html]
+[test_bug879717.html]
 [test_bug883173.html]
 [test_bug895091.html]
 [test_bug895305.html]
diff --git a/dom/media/test/test_bug879717.html b/dom/media/test/test_bug879717.html
new file mode 100644
index 000000000000..35e68fb2860f
--- /dev/null
+++ b/dom/media/test/test_bug879717.html
@@ -0,0 +1,119 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for bug 879717, check that a video element can be drawn into a canvas at various states of playback</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+var manager = new MediaTestManager;
+
+var canvas = document.createElement('canvas');
+document.body.appendChild(canvas);
+
+var checkDrawImage = function(eventName, videoElement) {
+  var exception = null;
+  var exceptionName = "nothing";
+  try {
+    var ctx = canvas.getContext('2d');
+    ctx.drawImage(videoElement, 0, 0, canvas.width, canvas.height);
+  } catch (e) {
+    exception = e;
+    exceptionName = e.name;
+  }
+  ok(exception === null,
+    "drawImage shouldn't throw an exception on " + eventName +
+    " of " + videoElement.testName + ", got " + exceptionName);
+};
+
+var checkDrawImageEventHandler = function(ev) {
+  checkDrawImage(ev.type, ev.target);
+};
+var startTest = function(media, token) {
+  manager.started(token);
+
+  // File playback
+  var v1 = document.createElement("video");
+  v1.autoplay = true;
+
+  // Captured file playback
+  var v2 = document.createElement("video");
+  v2.autoplay = true;
+
+  // Stream playback
+  var v3 = document.createElement("video");
+  v3.autoplay = true;
+
+  v1.gotLoadeddata = false;
+  v2.gotLoadeddata = false;
+  v3.gotLoadeddata = false;
+
+  v1.testName = "v1 (" + media.name + ")";
+  v2.testName = "v2 (Captured " + media.name + ")";
+  v3.testName = "v3 (Stream of " + media.name + ")";
+
+  checkDrawImage("beforeplay", v1);
+  checkDrawImage("beforeplay", v2);
+  checkDrawImage("beforeplay", v3);
+
+  v1.onloadedmetadata = checkDrawImageEventHandler;
+  v2.onloadedmetadata = checkDrawImageEventHandler;
+  v3.onloadedmetadata = checkDrawImageEventHandler;
+
+  v1.onplay = checkDrawImageEventHandler;
+  v2.onplay = checkDrawImageEventHandler;
+  v3.onplay = checkDrawImageEventHandler;
+
+  v1.onplaying = checkDrawImageEventHandler;
+  v2.onplaying = checkDrawImageEventHandler;
+  v3.onplaying = checkDrawImageEventHandler;
+
+  var onloadeddata = function(ev) {
+    ev.target.gotLoadeddata = true;
+    checkDrawImageEventHandler(ev);
+  };
+
+  v1.onloadeddata = onloadeddata;
+  v2.onloadeddata = onloadeddata;
+  v3.onloadeddata = onloadeddata;
+
+  var checkFinished = function() {
+    if (!v1.testFinished || !v2.testFinished || !v3.testFinished) {
+      return;
+    }
+
+    ok(v1.gotLoadeddata, v1.testName + " should have gotten the 'loadeddata' event callback");
+    ok(v2.gotLoadeddata, v2.testName + " should have gotten the 'loadeddata' event callback");
+    ok(v3.gotLoadeddata, v3.testName + " should have gotten the 'loadeddata' event callback");
+
+    manager.finished(token);
+  };
+
+  var onended = function(ev) {
+    checkDrawImageEventHandler(ev);
+    removeNodeAndSource(ev.target);
+    ev.target.testFinished = true;
+    checkFinished();
+  };
+
+  v1.onended = onended;
+  v2.onended = onended;
+  v3.onended = onended;
+
+  document.body.appendChild(v1);
+  document.body.appendChild(v2);
+  document.body.appendChild(v3);
+
+  v1.src = media.name;
+  v2.src = media.name;
+  v3.mozSrcObject = v2.mozCaptureStreamUntilEnded();
+}
+
+manager.runTests(getPlayableVideos(gSmallTests), startTest);
+</script>
+</pre>
+</body>
+</html>

From 099c1c9b788f8b3438f78f919ba8eea8b7b3c3ec Mon Sep 17 00:00:00 2001
From: Andreas Pehrson <pehrsons@gmail.com>
Date: Fri, 19 Dec 2014 01:25:00 +0100
Subject: [PATCH 094/183] Bug 879717 - Part 3 - Test video dimensions set on
 loadedmetadata event. r=roc

---
 dom/media/test/manifest.js                |  2 +-
 dom/media/test/mochitest.ini              |  1 +
 dom/media/test/test_video_dimensions.html | 67 +++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 dom/media/test/test_video_dimensions.html

diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js
index 28c25f261640..973bb3a8c21e 100644
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -14,7 +14,7 @@ var gSmallTests = [
   { name:"seek.webm", type:"video/webm", width:320, height:240, duration:3.966 },
   { name:"vp9.webm", type:"video/webm", width:320, height:240, duration:4 },
   { name:"detodos.opus", type:"audio/ogg; codecs=opus", duration:2.9135 },
-  { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
+  { name:"gizmo.mp4", type:"video/mp4", width:560, height:320, duration:5.56 },
   { name:"bogus.duh", type:"bogus/duh" }
 ];
 
diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini
index 6479cc42ad61..236fe8a5490c 100644
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -470,6 +470,7 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_reset_events_async.html]
 [test_reset_src.html]
+[test_video_dimensions.html]
 [test_resume.html]
 skip-if = true # bug 1021673
 [test_seek_out_of_range.html]
diff --git a/dom/media/test/test_video_dimensions.html b/dom/media/test/test_video_dimensions.html
new file mode 100644
index 000000000000..30cb959c9bc6
--- /dev/null
+++ b/dom/media/test/test_video_dimensions.html
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test that a video element has set video dimensions on loadedmetadata</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <script type="text/javascript" src="manifest.js"></script>
+</head>
+<body>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+var manager = new MediaTestManager;
+
+var startTest = function(test, token) {
+  manager.started(token);
+  var v1 = document.createElement('video');
+  var v2 = document.createElement('video');
+  var vout = document.createElement('video');
+
+  var numVideoElementsFinished = 0;
+
+  var onloadedmetadata = function(ev) {
+    var v = ev.target;
+    ok(!v.loadedmetadata, v.testName + " should only fire loadedmetadata once");
+    v.loadedmetadata = true;
+    is(v.videoWidth, test.width, v.testName + " video width should be set on loadedmetadata");
+    is(v.videoHeight, test.height, v.testName + " video height should be set on loadedmetadata");
+
+    numVideoElementsFinished += 1;
+    if (v === v1) {
+      removeNodeAndSource(v1);
+      v2.play();
+      vout.play();
+    }
+
+    if (numVideoElementsFinished === 3) {
+      removeNodeAndSource(v2);
+      removeNodeAndSource(vout);
+      manager.finished(token);
+    }
+  };
+  var setupElement = function(v, id) {
+    v.loadedmetadata = false;
+    v.onloadedmetadata = onloadedmetadata;
+    document.body.appendChild(v);
+  };
+
+  v1.testName = test.name;
+  v2.testName = test.name + " (Captured)";
+  vout.testName = test.name + " (Stream)";
+
+  v1.src = test.name;
+  v2.src = test.name;
+  vout.src = URL.createObjectURL(v2.mozCaptureStreamUntilEnded());
+
+  setupElement(v1, "v1");
+  setupElement(v2, "v2");
+  setupElement(vout, "vout");
+
+  v1.play();
+};
+
+manager.runTests(getPlayableVideos(gSmallTests), startTest);
+</script>
+</pre>
+</body>
+</html>

From be6a4e2137796937665f9776592275f8d6ba0857 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 19 Dec 2014 10:47:41 +0100
Subject: [PATCH 095/183] Backed out changeset 2996cc51cb0d (bug 1000305)

---
 dom/apps/tests/file_manifest.json             |  24 ++++-----
 dom/apps/tests/file_packaged_app.sjs          |  10 ----
 .../tests/file_packaged_app.template.webapp   |   3 --
 dom/apps/tests/icon15.png                     | Bin 281 -> 0 bytes
 dom/apps/tests/icon15alternate.png            | Bin 224 -> 0 bytes
 dom/apps/tests/icon48.png                     | Bin 4762 -> 0 bytes
 dom/apps/tests/mochitest.ini                  |   3 --
 dom/apps/tests/test_packaged_app_install.html |  29 ----------
 dom/apps/tests/test_web_app_install.html      |  51 ------------------
 dom/tests/mochitest/webapps/test_list_api.xul |   1 -
 netwerk/test/httpserver/httpd.js              |   2 -
 11 files changed, 9 insertions(+), 114 deletions(-)
 delete mode 100644 dom/apps/tests/icon15.png
 delete mode 100644 dom/apps/tests/icon15alternate.png
 delete mode 100644 dom/apps/tests/icon48.png

diff --git a/dom/apps/tests/file_manifest.json b/dom/apps/tests/file_manifest.json
index 42a3f553fda8..1569a1efe691 100644
--- a/dom/apps/tests/file_manifest.json
+++ b/dom/apps/tests/file_manifest.json
@@ -1,19 +1,13 @@
 {
   "name": "My W3C Web App",
   "short_name": "My App",
-  "icons": {
-    "15": "/tests/dom/apps/tests/icon15.png",
-    "48": "/tests/dom/apps/tests/icon48.png"
-  },
-  "start_url": "/index.html",
-  "display": "standalone",
-  "entry_points": {
-    "ep1": {
-      "name": "This is an entry point",
-      "icons": {
-        "15": "/tests/dom/apps/tests/icon15alternate.png",
-        "48": "/tests/dom/apps/tests/icon48.png"
-      }
+  "icons": [
+    {
+      "src": "/favicon.ico",
+      "sizes": "64x64",
+      "type": "image/png"
     }
-  }
-}
+  ],
+  "start_url": "/index.html",
+  "display": "standalone"
+}
\ No newline at end of file
diff --git a/dom/apps/tests/file_packaged_app.sjs b/dom/apps/tests/file_packaged_app.sjs
index 4bda60a7fe10..788ff22b85f0 100644
--- a/dom/apps/tests/file_packaged_app.sjs
+++ b/dom/apps/tests/file_packaged_app.sjs
@@ -17,13 +17,6 @@ var gAppName = "appname";
 var gDevName = "devname";
 var gDevUrl = "http://dev.url";
 
-var gIconData =
-"iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAABGdBTUEAANbY1E9YMgAAABl0RVh0" +
-"U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA5UExURbVCQs6UlM6EhJwhIa0hIc5zc5wQ" +
-"EL1SUu/W1rVjY6UQELUAAOfGxue1tZwAAIwAAP///3sAAK0AAOytg2MAAABmSURBVHjabIkLEsJA" +
-"CEOz249aIUDvf1ihVWe208ADQvDeh8I+6s7zSw0wJ6vPA5z7o+u8LbrUD4SXnkln5XSHJnAhDWau" +
-"tia1jeXlz7SeeRy5TC6wkBaWhLZoL4RF9Q/EqKv/CDAAFpEM3avxBREAAAAASUVORK5CYII=";
-
 function handleRequest(request, response) {
   var query = getQuery(request);
 
@@ -94,9 +87,6 @@ function handleRequest(request, response) {
                              appName, devName, devUrl);
       addZipEntry(zipWriter, app, "index.html");
 
-      var iconString = atob(gIconData);
-      addZipEntry(zipWriter, iconString, "icon.png");
-
       zipWriter.close();
     }
 
diff --git a/dom/apps/tests/file_packaged_app.template.webapp b/dom/apps/tests/file_packaged_app.template.webapp
index 14510b36b3f6..6d4bc0c7480f 100644
--- a/dom/apps/tests/file_packaged_app.template.webapp
+++ b/dom/apps/tests/file_packaged_app.template.webapp
@@ -12,9 +12,6 @@
      "downloads": {}
    },
   "launch_path": "tests/dom/apps/tests/file_packaged_app.sjs",
-  "icons": {
-    "15": "icon.png"
-  },
   "developer": {
     "name": "DEVELOPERTOKEN",
     "url": "DEVELOPERURLTOKEN"
diff --git a/dom/apps/tests/icon15.png b/dom/apps/tests/icon15.png
deleted file mode 100644
index f752986b7e13a7a2f6eba78c031245d6d5619883..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 281
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K13?z9tQY(NIOS+@4BLl;=8&~`zjDUQ}64!{5
z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6y|0X`wFTb-QFO__48rDcwy;#x(;
zbH&AT1O)a51--v^ZEJG!QUQUj3=GeY9eciY>l_A#9tMX0|NmDrFsx-@c(b-S8E8nF
zr;B4q#jTu9ZlOaC9L}3>_eUu@yswW~7@EHA@&RV25BJ&+*}XdV*_+ouef4?fIlmXb
z-lMzg3V+M=d7kM{OWM^66nWFuZByIY`}FDgE%Pd6cKYaTm>@Q-Wm|@Ri|beZBP&+_
b=P+Opo5*u_^+#4gpp6Wku6{1-oD!M<-aKpU

diff --git a/dom/apps/tests/icon15alternate.png b/dom/apps/tests/icon15alternate.png
deleted file mode 100644
index a85552b240fbde0ace475e0727267e611f8bb8ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11SGd?VUh(>%ROBjLo`H_Q>M;6;9!!V6s79%
zFd+0S)5oXl-G83AS6lhGZATlMOG<wF?B^kQ9MVUpbJxV=zrVvag+YsTQzOTTu%dz{
z4c18kn;Uf&?25kLZ*zWsNabVI7T&-w&ktMg$ZEN%!{p>}@%(;!Mo$juMI5cX*Vzpp
zAAY~zK``aB0#}3F?)pzGS5zIYZT`*Q;Kdp-^I^^cs|AxA9yuI4D0x{f-sZeT#wAXM
Y;tX$h%O9_#fKF!cboFyt=akR{0Q6Q@KL7v#

diff --git a/dom/apps/tests/icon48.png b/dom/apps/tests/icon48.png
deleted file mode 100644
index c4307fc8418436bb6b2fd3a6afc702c2db28aa77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4762
zcmV;L5@qd)P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R000g#Nkl<ZXx{Bv3vg8Dc|G^FckjMeyOLH<gaAoM
zARa68vIC+RYEjza+M>-k(>h5*rk*jGY3h=s;}LS}gf>m4rQ@{NxQSg49;C!L*x`|w
zT469C%NXh+KmxsxSiN8S-uvu#7YS3_U>R%bwDq06v%B}+{r_{m?|kR`?_S0*4E%52
zn9m9PUnRiM2HY5%rZ9fv2@qUn*RFczwNMVXJ-8j)w?hMN0_W-*FS4y@)f#GRb(5Ph
zOB2r`fo+^&G-w}p-TL|_zG+vrHd|S_YXWJB>@pbC0oCi9*zTfkzLd+cUB2A2Bx^z0
z%HZ<cMFF2^_c{d)tT5R0?nJXO)_Wp%LDon!pGZ0TBL)%CX?p!LB2dqwww%cvhUCt0
zc#Qtedy?Mbug!gM@zTdv`drJh1>Rvz7Xnm@_xS-e^@CrHggmW7hZrCCe0(TA(h-`7
z<tN_OnwskFIwPNm0D)m@w>7fE_Lz`RA{Iw+up*|&Vn@?~dsFJluP=PC#`o3V^;oJh
zST4`WLEy}v+$iFN0^?MlqBmcRB$e>Qg;QrjFXj9Aqp;gXC%VrktBZQ%U3GOP8e`T8
zOgl<#E!ek`uZ!MD!llc+pL5Lr*2F+pX*_zNz`f`}@7(eLZ;csj<?maut<(aim5P;q
z8Bu}3gn^%r=xBdW)q`$Xx!O7szR-02)q=U)Gls4Xj)mk%se4nhv4JGT%-p$VNZ>{!
zgTZI{&T+5JBXS;C`8la!`))3fRqieGiy3Z7jCQMx%yHOJXUF0I3oFM!rQv(x27Wqb
zpnXz@{gR4RdAi}1*yPazJxNv>eL-?^&xeO1qw`#)<FQza(%4WtV-g=r;HIC`D_Hd`
zKOD$&aH7|RM6#5z_`mNg&MuZ5qD>ELER!<8($$rf0v47CnCD|*cW_9MHw`9%-lTyG
z*EPgDWNcm|>X)u3<9%%-9RVkH4n>vAF1s{ov5m&|ZV#%=tP`khWQ&Gl0+T3k8<OVb
zc<;kp!m`7a>G3cIE9m_?bdH58YbYq<A$cr_EE3=kN=T881{Gi=q9gK#0;V^Gn%@(V
zQ)E%DbtQ&{cx?B?c<P8FWlRo4uY_0nYLs1dH0ccb#S92gGL5uVa_{9ywhX`}s#;DQ
z8GmE3TUUEB9d=Enz>^v35{Jwz3)Yq~=$_Cpu5-w6u^0^-=;~D<D>@QAafosXrIk*U
zSK9UAA$cO)AKB-!F#E@%T*xjbBeB+*%jk{-ZbqLvZ1A-$oE%6vl$h$~Y+{+rx^|0<
zeSuxDN}7Z4$5}8$Age;a5dEe<$-?7jkQ~>bw8mj{$H1rxw3LjB<u)v=@q@7m#@K)y
zfA6)PQ)}0{{^`Wq1Men7!{MBbu0&H^wKls1LR+}xxa`yv#>H5L3d8F9JBwhQYqJQF
z!Wxh}!qB1#z%Rlma6)%j({>^!b+DsR7{hcvCet+$%q`DF@ON^dS~zrFiY2eSalUoy
zgL9u5A5FBJJ^yZ>BG}`t4YkUw5~ye_=e0nFGoDJiMXR_>QC#1ZG<ShB*Dfi#f>=ig
zykvt);1dyA{O}wMjfKT-I*|r-cnnNp9BO<Vf$|b8*)j*R!J+$VG?^Ogd#k!C`zLM}
zKk(AAcbaoLDFfBN*0HP3_*4WwWTAjfN@crvYpRfAy}K<4EcX`rBn3K?7>I%QTEP_(
zfeAp94Ok==fjLwg(Ky=Qz6Q1L666F~Y2kV-`U5|BKM)F~Qr7T9<JwBc;ml0CY_&1}
z(e$HZU8n^bx7F&iK;V5B%IzE%W!T(Si|Chi_Hmmn_YeJZ3mv+~vy4LBN+QV&%Tx<2
zIJ*UUQh`G0P}DF|;bF)_=Maw+!%=WQ+yx?ZD)Kp{1|C`&IX5yEdEV~N>GgW}2;+>s
z-FYyZ^jMF&x;lM!2%w(cM+Ju?$Hge{^053CYmw?Q{6U{h@(Zk+Cx4=K4`hUUx(M)P
zssRnUJVpdUP}L!Df*(06z6@*rd<>jd;q-Etn;F55uSqD#^F)Utv7cU>5Pxp-_%44j
zh&Gy(28A+fO9@ohbN+rwvRVa~#&H3GaeWWSTH`C6FR?xsYuGrz!a`4^5DQ(yWY0+?
z2986E4}f=-K=5sbE3X`q&p~~{O(SwxoIim=oYgBAEnrtvEk#mMJ30npFLq7(fB0B6
zq8Bg1(%Ran)z;Q(pOS#N?K0nar!(S`W!7!8IaV>c@?D<yWM%l)i-P207&`|=P?3ly
z5$W%Mp^t)N1#lJ*SeHcAO#=`~UJ?)}%fdIm9Kc*R(AIWIrxw7JmX$G?*|~_tB8TPC
z&K<#Eu*01B?AfzIRaKSx!NxY@)#&?D+QwpjfUgjJUTQqv)MRQiYnT4ql~I;y^#+8L
z$RQGmr8_dqTd2daRK;ZJDs?-DNSUzFaUx(uvACcYt1GNnd*2Ea7UW`VY#irXTQxFX
zZuQDF5R~!pvHsBRKYsL!|8U{L1^N9&@%x4S$(GZ!H8dE6=py%>@B9lhG~}~?^Dmcw
zK{XstzxuP*imt8}Qaukrte_}ogC$#KXnDb~v>RzhgGR;f^602qI*1HM7%Z#8OG~T8
zODb{i7pgIG>NI*oA;Y?Sxz^V5CjV#Kw}LF;-P0}q`B$s&x$o$wy`d4zqB4oJw)T1@
zN&9wtd*_bh$4^*}96gEQLDonren!(X2y}o5WP%m#1d^k^K+@q-w8V~}bWRwVWHMHf
zfncG+S7a!15_yIBD6v@Zz~%?Q7Zu{)j~!Qsdsnh<yPvJz5=B?{`M<5Iy6;<`m_TD=
zBS%GKeoPnA`1trEeSLlPq|15x_wUE`(17a6$lye)lZk0wL{lzk3^g^w4w158C0n&w
z6apWGn;Qnlki5vF%$=j<H!lc8jzcPyqT4$+7B5<YKYC~*dO8C5(gS10y8B(qQ_m=t
z_V)AY#f$yrk3Ra)l^GGJudipxhgtKk(ENVw+O;4}_}AyoovR^IIDPuGYPZ{2r_;%r
z!*C=Qmc6l?z|8%F-)|h_>7BXd7*DFFu1)DM1s<j4hRrTvTkW5qWWh2RY`=EBub;bk
z@rrWd#IM)y+qdtnI}$J@LdUsj;Ez4_nD>b%p7=IJeaE3ghs5K@k0Y5(Dg<0G0hnV<
zgJBppEg7EYZW3bBfK3_k6lo@1*yg!ug66x0q+@Q1qQK>H(LKcytX^{u9f#I>p@SV6
z9%H(?JFf2E|MJ!=SFW_)mcSHvGZ5(xc;?KRM=~-po+>FRDL#4fBzErHsSXSba6X@p
zF(=kE?Iws1zMEutp1(=t)^pRJ1yeqBjVT}V*usSiv3~t}WM^mV-Q7Lt?CfR-2m3KN
zIM96R)T!?^H#h%^@Wnrpz!doOfg?wbEGsH1dO9yJuf~iBO`w@hIy5xIz4X$4G&D4(
zQ|<M-(-WK9tsp-vn-3o|!Rxx7247fMm<GOh@nVB&OmA;*=V&fmzka=sKEL?NE3f<;
zO>vdrX}7h}Db4E#4jg!-yuADc8jPcq8Z@z{swz*iq4c`bcG%Y5f<1fo;*DRPghjN#
z?RH_h-`xuOqX?M5&1=o^NQPLqZXMRFSp!iNwab?;a|9Zc<y22k&%tBIj_srGr>CO+
z-+I7pYoMW_;pD1StL`P~#3{Wt0-x5oBuSKR9fNfH7>`)t&jwC4zk)sg_#8Srdf;+9
z)7MO8^F!cG;O2K(mec2#E?tV6ni}Nf<mjPL2&8S2%OI^#L(L@Jy(E{zH1FU?HLyF?
zfcwcOpM0~jvT_-vH8p3>9MR|VPib1gi+iKk^R!OB9YMuX9*^(LM|p4%&pr2J{H*a1
z;)xhM9?wmAOp~DKrVG>rPh(>9=FPN34;m8_6Z+MwS2>daMZJ$Q@WR1^2lo?{cEYCK
z4*2bAz_d&|dH$Z#($Yu$em|%VG%8@WprDX(IBa<8FB16sA6&(<H9v&gKY*UI-@wKV
zHTeFIf%h()#XtY(d9<`NrwN$yNV^b4J06dd%-q<pVFNa9+-PP>yL9PN8aTOIl4SBK
zZO@I4j-Ht=(pzhCrmIo&Hyl}72~G5k{QUec(QYG0!2J0Oh{!xPFRzgK<?9pp*L}Z0
zPiGi?tsCfEF%C582;_-WkSbn#{Z+iY|7DPd(+*?qD^{$))~#F3fanAmRG92kk)C<y
zop+ukhq)=2>BZwr{=vRoA22iFU9e!mCerEGNu%p>b90cNUucw;78^^KEo3J~+<5Z{
zc`Yr}Hf+)0&*CsS8BaGThr^KuZ#FxMaysg(SFbjr(Wq_~sTp<BdLNzp2}S*7nyYQf
zUG6BCySXPe{jr!FVjGe9N+1v@&dJFoA_dygWhLyq;v$;Rp6+*(ld-f^1dEVvRMXNK
z85u!19M(EJJ2~p)W`QOt1JiP8ruk#jLBE@42Dc?}tN!Stm1Gdyv}x0y=H=x+OavU6
znc0{(Z=P0KTE@AlPk_<W9dz2)W3d>Kn$&xHdrg_JrZx8W_fN~^7c}(Ho!n*C{@k4+
zl9nWW^p%yB{q~|oi?-+H=8~*(QBY8zFI-rLtgLK?oF;uO6|6yyLY=gmGc!OW`r6vs
zOu0<Ei}q=vez(hMW{QMaAM>bB)RL^eN+gQSE=s#WE|VT?Y-}uDpcL^WkvMqx@Zo)=
z`Du4yKC?$mAIOF@C9AIxiHFH@ou+M?o^N(oS`M5csqAfOX*u$7&FHguLUR)c5y_xF
zv6dEL_mlhN5~(<WZ=qG|(OcFovl{hTdqy^$jj8YEUm#Y~lIVEyqs-tp@-gcNiQM`h
ofbl=@6#erj^`8^?|4!h)0J^zP3jf7M-2eap07*qoM6N<$f*<W+VgLXD

diff --git a/dom/apps/tests/mochitest.ini b/dom/apps/tests/mochitest.ini
index 793675e2b8ee..798a32bd9617 100644
--- a/dom/apps/tests/mochitest.ini
+++ b/dom/apps/tests/mochitest.ini
@@ -28,9 +28,6 @@ support-files =
   test_packaged_app_common.js
   marketplace/*
   pkg_install_iframe.html
-  icon15.png
-  icon15alternate.png
-  icon48.png
 
 [test_app_addons.html]
 skip-if = os == "android" || toolkit == "gonk" # embed-apps doesn't work in mochitest app
diff --git a/dom/apps/tests/test_packaged_app_install.html b/dom/apps/tests/test_packaged_app_install.html
index 3065b3e77be0..1eca12f8bfb5 100644
--- a/dom/apps/tests/test_packaged_app_install.html
+++ b/dom/apps/tests/test_packaged_app_install.html
@@ -76,15 +76,6 @@ function checkInstalledApp(aMiniManifestURL,
   };
 }
 
-var gIconData =
-"iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAABGdBTUEAANbY1E9YMgAAABl0RVh0" +
-"U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA5UExURbVCQs6UlM6EhJwhIa0hIc5zc5wQ" +
-"EL1SUu/W1rVjY6UQELUAAOfGxue1tZwAAIwAAP///3sAAK0AAOytg2MAAABmSURBVHjabIkLEsJA" +
-"CEOz249aIUDvf1ihVWe208ADQvDeh8I+6s7zSw0wJ6vPA5z7o+u8LbrUD4SXnkln5XSHJnAhDWau" +
-"tia1jeXlz7SeeRy5TC6wkBaWhLZoL4RF9Q/EqKv/CDAAFpEM3avxBREAAAAASUVORK5CYII=";
-
-var gIconSize = 15;
-
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
@@ -204,7 +195,6 @@ var steps = [
     info("== TEST == Install packaged app");
     var miniManifestURL = PackagedTestHelper.gSJS +
                           "?getManifest=true";
-
     navigator.mozApps.mgmt.oninstall = function(evt) {
       info("Got oninstall event");
       PackagedTestHelper.gApp = evt.application;
@@ -241,25 +231,6 @@ var steps = [
   function() {
     PackagedTestHelper.setAppVersion(3, PackagedTestHelper.next, false, true);
   },
-  function() {
-    info("== TEST == Get icon");
-    var app = PackagedTestHelper.gApp;
-
-    navigator.mozApps.mgmt.getIcon(app, gIconSize).then((blob) => {
-      var reader = new FileReader();
-
-      reader.onloadend = function() {
-        var success = btoa(reader.result) == gIconData;
-        ok(success, "== TEST == Icon matches expected icon");
-        PackagedTestHelper.next();
-      }
-
-      reader.readAsBinaryString(blob);
-    }, (err) => {
-      ok(false, "Can't get icon: " + err);
-      PackagedTestHelper.finish();
-    });
-  },
   function() {
     info("== TEST == Install packaged app with a cancel/resume");
     var miniManifestURL = PackagedTestHelper.gSJS +
diff --git a/dom/apps/tests/test_web_app_install.html b/dom/apps/tests/test_web_app_install.html
index 071aecb25301..c57f08b5e8ef 100644
--- a/dom/apps/tests/test_web_app_install.html
+++ b/dom/apps/tests/test_web_app_install.html
@@ -19,19 +19,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={1075716}
 <pre id="test">
 <script class="testbody" type="application/javascript;version=1.7">
 
-var gIconData =
-"iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAABGdBTUEAANbY1E9YMgAAABl0RVh0" +
-"U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA5UExURbVCQs6UlM6EhJwhIa0hIc5zc5wQ" +
-"EL1SUu/W1rVjY6UQELUAAOfGxue1tZwAAIwAAP///3sAAK0AAOytg2MAAABmSURBVHjabIkLEsJA" +
-"CEOz249aIUDvf1ihVWe208ADQvDeh8I+6s7zSw0wJ6vPA5z7o+u8LbrUD4SXnkln5XSHJnAhDWau" +
-"tia1jeXlz7SeeRy5TC6wkBaWhLZoL4RF9Q/EqKv/CDAAFpEM3avxBREAAAAASUVORK5CYII=";
-
-var gAlternateIconData =
-"iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAAp0lEQVQoFWNklZ3AQDRgIlolSOFQ" +
-"Vc0C8eWvR/nI3n1544a4hgZEZG9nm+dUbggbxZcLfFxv79wGlAAqBbKBCMhWcnCCKAWSULOBLKC6" +
-"W9ePPM+/VHnjJYQNUfTnwzu4aoTZLAJCQNHPvz8BSQgbogiFDdcHMePD779AEWTzIAqAHrt/8gTU" +
-"JUDWs/sPgEoFWJnhbKA6oJOA4kDGwRnTHl88zzho0gkAc2hLRzn46hoAAAAASUVORK5CYII=";
-
 var gGenerator = runTest();
 
 function go() {
@@ -58,20 +45,6 @@ function cbError(aEvent) {
   finish();
 }
 
-function iconTest(app, iconSize, entryPoint, testFunction) {
-  navigator.mozApps.mgmt.getIcon(app, iconSize, entryPoint).then((blob) => {
-    var reader = new FileReader();
-    reader.onloadend = function() {
-      testFunction(reader.result);
-      continueTest();
-    }
-    reader.readAsBinaryString(blob);
-  }, (err) => {
-    ok(false, "Couldn't get icon.");
-    finish();
-  });
-}
-
 SimpleTest.waitForExplicitFinish();
 
 /**
@@ -104,30 +77,6 @@ function runTest() {
   ok(app, "App is non-null");
   is(app.manifestURL, manifestURL, "App manifest url is correct.");
 
-  info("Fetching 15x15 icon");
-  iconTest(app, 15, undefined, (iconData) => {
-    is(btoa(iconData), gIconData, "Fetches 15x15 icon successfully.")
-  });
-  yield undefined;
-
-  info("Fetching 48x48 icon");
-  iconTest(app, 48, "ep1", (iconData) => {
-    ok(iconData.length == 4762, "Fetches 48x48 icon successfully.")
-  });
-  yield undefined;
-
-  info("Fetching 30x30 icon");
-  iconTest(app, 30, undefined, (iconData) => {
-    is(btoa(iconData), gIconData, "Fetches 15x15 icon as best fit for 30x30.")
-  });
-  yield undefined;
-
-  info("Fetching entry-point icon");
-  iconTest(app, 15, "ep1", (iconData) => {
-    is(btoa(iconData), gAlternateIconData, "Entry-point Icon fetched successfully.")
-  });
-  yield undefined;
-
   request = navigator.mozApps.mgmt.uninstall(app);
   request.onerror = cbError;
   request.onsuccess = continueTest;
diff --git a/dom/tests/mochitest/webapps/test_list_api.xul b/dom/tests/mochitest/webapps/test_list_api.xul
index f06e90dd0c8a..f5a4c9ee86af 100644
--- a/dom/tests/mochitest/webapps/test_list_api.xul
+++ b/dom/tests/mochitest/webapps/test_list_api.xul
@@ -40,7 +40,6 @@ var mgmtProps = {
   dispatchEvent: "function",
   getEventHandler: "function",
   getAll: "function",
-  getIcon: "function",
   getNotInstalled: "function",
   uninstall: "function",
   oninstall: "object",
diff --git a/netwerk/test/httpserver/httpd.js b/netwerk/test/httpserver/httpd.js
index c72e47f50b8d..21d725280ec3 100644
--- a/netwerk/test/httpserver/httpd.js
+++ b/netwerk/test/httpserver/httpd.js
@@ -2741,8 +2741,6 @@ ServerHandler.prototype =
         var sis = new ScriptableInputStream(fis);
         var s = Cu.Sandbox(gGlobalObject);
         s.importFunction(dump, "dump");
-        s.importFunction(atob, "atob");
-        s.importFunction(btoa, "btoa");
 
         // Define a basic key-value state-preservation API across requests, with
         // keys initially corresponding to the empty string.

From 00daf9587213bab5e14805e1189ca53503dfc3b4 Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 19 Dec 2014 10:47:57 +0100
Subject: [PATCH 096/183] Backed out changeset 45940d63b0c7 (bug 1000305) for
 Android Test failures

---
 dom/apps/Webapps.js    | 30 +---------------
 dom/apps/Webapps.jsm   | 80 ++----------------------------------------
 dom/webidl/Apps.webidl |  2 --
 3 files changed, 3 insertions(+), 109 deletions(-)

diff --git a/dom/apps/Webapps.js b/dom/apps/Webapps.js
index ee06bd30e74e..0d3c6c361704 100644
--- a/dom/apps/Webapps.js
+++ b/dom/apps/Webapps.js
@@ -748,7 +748,6 @@ WebappsApplicationMgmt.prototype = {
                                         "Webapps:Uninstall:Return:KO",
                                         "Webapps:Install:Return:OK",
                                         "Webapps:GetNotInstalled:Return:OK",
-                                        "Webapps:GetIcon:Return",
                                         "Webapps:Import:Return",
                                         "Webapps:ExtractManifest:Return",
                                         "Webapps:SetEnabled:Return"]);
@@ -814,21 +813,6 @@ WebappsApplicationMgmt.prototype = {
     return request;
   },
 
-  getIcon: function(aApp, aIconID, aEntryPoint) {
-    return this.createPromise(function(aResolve, aReject) {
-      cpmm.sendAsyncMessage("Webapps:GetIcon", {
-        oid: this._id,
-        manifestURL: aApp.manifestURL,
-        iconID: aIconID,
-        entryPoint: aEntryPoint,
-        requestID: this.getPromiseResolverId({
-          resolve: aResolve,
-          reject: aReject
-        })
-      });
-    }.bind(this));
-  },
-
   getNotInstalled: function() {
     let request = this.createRequest();
     let principal = this._window.document.nodePrincipal;
@@ -903,8 +887,7 @@ WebappsApplicationMgmt.prototype = {
     let msg = aMessage.data;
     let req;
 
-    if (["Webapps:GetIcon:Return",
-         "Webapps:Import:Return",
+    if (["Webapps:Import:Return",
          "Webapps:ExtractManifest:Return"]
          .indexOf(aMessage.name) != -1) {
       req = this.takePromiseResolver(msg.requestID);
@@ -970,18 +953,7 @@ WebappsApplicationMgmt.prototype = {
           this.__DOM_IMPL__.dispatchEvent(event);
         }
         break;
-      case "Webapps:GetIcon:Return":
-        if (msg.blob) {
-          req.resolve(Cu.cloneInto(msg.blob, this._window));
-        } else if (msg.error && msg.error == "NETWORK_ERROR"
-                             && !this._window.navigator.onLine) {
-          req.reject(new this._window.DOMError("NETWORK_OFFLINE"));
-        } else {
-          req.reject(new this._window.DOMError(msg.error || ""));
-        }
-        break;
     }
-
     if (aMessage.name !== "Webapps:Uninstall:Broadcast:Return:OK") {
       this.removeRequest(msg.requestID);
     }
diff --git a/dom/apps/Webapps.jsm b/dom/apps/Webapps.jsm
index c48fa1e0b22c..432dfb3adb8d 100755
--- a/dom/apps/Webapps.jsm
+++ b/dom/apps/Webapps.jsm
@@ -221,7 +221,6 @@ this.DOMApplicationRegistry = {
                      "Webapps:RegisterBEP",
                      "Webapps:Export",
                      "Webapps:Import",
-                     "Webapps:GetIcon",
                      "Webapps:ExtractManifest",
                      "Webapps:SetEnabled",
                      "child-process-shutdown"];
@@ -1406,9 +1405,6 @@ this.DOMApplicationRegistry = {
         case "Webapps:RegisterBEP":
           this.registerBrowserElementParentForApp(msg, mm);
           break;
-        case "Webapps:GetIcon":
-          this.getIcon(msg, mm);
-          break;
         case "Webapps:Export":
           this.doExport(msg, mm);
           break;
@@ -4217,74 +4213,6 @@ this.DOMApplicationRegistry = {
     });
   },
 
-  getIcon: function(aData, aMm) {
-    function sendError(aError) {
-      debug("getIcon error: " + aError);
-      aData.error = aError;
-      aMm.sendAsyncMessage("Webapps:GetIcon:Return", aData);
-    }
-
-    let app = this.getAppByManifestURL(aData.manifestURL);
-    if (!app) {
-      sendError("NO_APP");
-      return;
-    }
-
-    function loadIcon(aUrl) {
-      let fallbackMimeType = aUrl.indexOf('.') >= 0 ?
-                             "image/" + aUrl.split(".").reverse()[0] : "";
-      // Set up an xhr to download a blob.
-      let xhr = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
-                  .createInstance(Ci.nsIXMLHttpRequest);
-      xhr.mozBackgroundRequest = true;
-      xhr.open("GET", aUrl, true);
-      xhr.responseType = "blob";
-      xhr.addEventListener("load", function() {
-        debug("Got http status=" + xhr.status + " for " + aUrl);
-        if (xhr.status == 200) {
-          let blob = xhr.response;
-          // Reusing aData with sendAsyncMessage() leads to an empty blob in
-          // the child.
-          let payload = {
-            "oid": aData.oid,
-            "requestID": aData.requestID,
-            "blob": blob,
-            "type": xhr.getResponseHeader("Content-Type") || fallbackMimeType
-          };
-          aMm.sendAsyncMessage("Webapps:GetIcon:Return", payload);
-        } else if (xhr.status === 0) {
-          sendError("NETWORK_ERROR");
-        } else {
-          sendError("FETCH_ICON_FAILED");
-        }
-      });
-      xhr.addEventListener("error", function() {
-        sendError("FETCH_ICON_FAILED");
-      });
-      xhr.send();
-    }
-
-    // Get the manifest, to find the icon url in the current locale.
-    this.getManifestFor(aData.manifestURL, aData.entryPoint)
-        .then((aManifest) => {
-      if (!aManifest) {
-        sendError("FETCH_ICON_FAILED");
-        return;
-      }
-
-      let manifest = new ManifestHelper(aManifest, app.origin, app.manifestURL);
-      let url = manifest.iconURLForSize(aData.iconID);
-      if (!url) {
-        sendError("NO_ICON");
-        return;
-      }
-      loadIcon(url);
-    }).catch(() => {
-      sendError("FETCH_ICON_FAILED");
-      return;
-    });
-  },
-
   getAll: function(aCallback) {
     debug("getAll");
     let apps = [];
@@ -4518,7 +4446,7 @@ this.DOMApplicationRegistry = {
     });
   },
 
-  getManifestFor: function(aManifestURL, aEntryPoint) {
+  getManifestFor: function(aManifestURL) {
     let id = this._appIdForManifestURL(aManifestURL);
     let app = this.webapps[id];
     if (!id || (app.installState == "pending" && !app.retryingDownload)) {
@@ -4526,11 +4454,7 @@ this.DOMApplicationRegistry = {
     }
 
     return this._readManifests([{ id: id }]).then((aResult) => {
-      if (aEntryPoint) {
-        return aResult[0].manifest.entry_points[aEntryPoint];
-      } else {
-        return aResult[0].manifest;
-      }
+      return aResult[0].manifest;
     });
   },
 
diff --git a/dom/webidl/Apps.webidl b/dom/webidl/Apps.webidl
index b1180e262730..212ac8a415ec 100644
--- a/dom/webidl/Apps.webidl
+++ b/dom/webidl/Apps.webidl
@@ -98,8 +98,6 @@ interface DOMApplicationsManager : EventTarget {
   Promise<any> extractManifest(Blob blob);
 
   void setEnabled(DOMApplication app, boolean state);
-  Promise<Blob> getIcon(DOMApplication app, DOMString iconID,
-                        optional DOMString entryPoint);
 
   attribute EventHandler oninstall;
   attribute EventHandler onuninstall;

From de702b2126029c28f3660e0fdf8ff3f1c4a58b72 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 19 Dec 2014 11:25:51 +0100
Subject: [PATCH 097/183] Bug 1113095 - Handle failing reftests in
 machformatter's summarizing code; r=jgraham

---
 .../mozlog/structured/formatters/machformatter.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py b/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py
index ff74fc4a295a..5d650e8079cf 100644
--- a/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py
+++ b/testing/mozbase/mozlog/mozlog/structured/formatters/machformatter.py
@@ -93,6 +93,15 @@ class MachFormatter(base.BaseFormatter):
             test_id = tuple(test_id)
         return test_id
 
+    def _get_file_name(self, test_id):
+        if isinstance(test_id, (str, unicode)):
+            return test_id
+
+        if isinstance(test_id, tuple):
+            return "".join(test_id)
+
+        assert False, "unexpected test_id"
+
     def suite_start(self, data):
         self.summary_values = {"tests": 0,
                                "subtests": 0,
@@ -139,14 +148,16 @@ class MachFormatter(base.BaseFormatter):
             heading = "Unexpected Results"
             rv.extend([heading, "=" * len(heading), ""])
             if has_subtests:
-                for test, results in self.summary_unexpected:
+                for test_id, results in self.summary_unexpected:
+                    test = self._get_file_name(test_id)
                     rv.extend([test, "-" * len(test)])
                     for name, status, expected, message in results:
                         if name is None:
                             name = "[Parent]"
                         rv.append("%s %s" % (self.format_expected(status, expected), name))
             else:
-                for test, results in self.summary_unexpected:
+                for test_id, results in self.summary_unexpected:
+                    test = self._get_file_name(test_id)
                     assert len(results) == 1
                     name, status, expected, messge = results[0]
                     assert name is None

From f2b16bc10f7c2922d5d323f6c573c028e6830140 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Fri, 19 Dec 2014 11:27:28 +0100
Subject: [PATCH 098/183] No bug - Bump the mozlog package version; rs=jgraham

---
 testing/mozbase/mozlog/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/mozbase/mozlog/setup.py b/testing/mozbase/mozlog/setup.py
index 7463b9016af8..1eeccbfe4ca1 100644
--- a/testing/mozbase/mozlog/setup.py
+++ b/testing/mozbase/mozlog/setup.py
@@ -5,7 +5,7 @@
 from setuptools import setup, find_packages
 
 PACKAGE_NAME = 'mozlog'
-PACKAGE_VERSION = '2.8'
+PACKAGE_VERSION = '2.9'
 
 setup(name=PACKAGE_NAME,
       version=PACKAGE_VERSION,

From f80c00200ca0fc673a7000e0d6826b65a8b9ddc5 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Fri, 19 Dec 2014 12:59:17 +0100
Subject: [PATCH 099/183] Bug 1108797 - Add a missing AutoForbidPools to
 callAndPushReturnAddress. r=dougc

---
 js/src/jit/arm/MacroAssembler-arm.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/jit/arm/MacroAssembler-arm.h b/js/src/jit/arm/MacroAssembler-arm.h
index 0c7524e20f93..c0557e246b61 100644
--- a/js/src/jit/arm/MacroAssembler-arm.h
+++ b/js/src/jit/arm/MacroAssembler-arm.h
@@ -591,6 +591,7 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
         append(desc, currentOffset(), framePushed_);
     }
     void callAndPushReturnAddress(Label *label) {
+        AutoForbidPools afp(this, 2);
         ma_push(pc);
         call(label);
     }

From eecace71566673422f7073c5c1f065f63fc89818 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 14:23:04 +0100
Subject: [PATCH 100/183] Bug 1112632 - Flag object/array allocations as
 implictly used as we are removing uses. r=jandem

---
 js/src/jit/ScalarReplacement.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/js/src/jit/ScalarReplacement.cpp b/js/src/jit/ScalarReplacement.cpp
index 7ec69cf861a2..1c03212ac619 100644
--- a/js/src/jit/ScalarReplacement.cpp
+++ b/js/src/jit/ScalarReplacement.cpp
@@ -252,6 +252,9 @@ ObjectMemoryView::ObjectMemoryView(TempAllocator &alloc, MInstruction *obj)
     obj_(obj),
     startBlock_(obj->block())
 {
+    // Annoatte the instruction such that we do not replace it by a
+    // Magic(JS_OPTIMIZED_OUT) in case of removed uses.
+    obj_->setImplicitlyUsedUnchecked();
 }
 
 MBasicBlock *
@@ -699,6 +702,9 @@ ArrayMemoryView::ArrayMemoryView(TempAllocator &alloc, MInstruction *arr)
     startBlock_(arr->block()),
     state_(nullptr)
 {
+    // Annotate the instruction such that we do not replace it by a
+    // Magic(JS_OPTIMIZED_OUT) in case of removed uses.
+    arr_->setImplicitlyUsedUnchecked();
 }
 
 MBasicBlock *

From 7e9f358431b6e4ff8e8f030441f7cdd0560c2d0a Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 14:47:51 +0100
Subject: [PATCH 101/183] Bug 1110939 - Allow recovery of effectful
 instruction. r=jandem

---
 js/src/jit/Sink.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/js/src/jit/Sink.cpp b/js/src/jit/Sink.cpp
index 9afaf0aaed3c..95432fb4ca0a 100644
--- a/js/src/jit/Sink.cpp
+++ b/js/src/jit/Sink.cpp
@@ -60,12 +60,6 @@ Sink(MIRGenerator *mir, MIRGraph &graph)
             if (ins->isGuard() || ins->isRecoveredOnBailout() || !ins->canRecoverOnBailout())
                 continue;
 
-            // To move effectful instruction, we would have to verify that the
-            // side-effect is not observed. In the mean time, we just inhibit
-            // this optimization on effectful instructions.
-            if (ins->isEffectful())
-                continue;
-
             // Compute a common dominator for all uses of the current
             // instruction.
             bool hasLiveUses = false;
@@ -114,6 +108,12 @@ Sink(MIRGenerator *mir, MIRGraph &graph)
             if (!sinkEnabled)
                 continue;
 
+            // To move an effectful instruction, we would have to verify that the
+            // side-effect is not observed. In the mean time, we just inhibit
+            // this optimization on effectful instructions.
+            if (ins->isEffectful())
+                continue;
+
             // If all the uses are under a loop, we might not want to work
             // against LICM by moving everything back into the loop, but if the
             // loop is it-self inside an if, then we still want to move the

From 4d5fd1fd2e2481423d451956749d29a6018076cd Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 14:47:52 +0100
Subject: [PATCH 102/183] Bug 991720 part 0 - Add expected type before
 parenthese to fix clang 3.3 warning. r=jandem

---
 js/src/jsclist.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsclist.h b/js/src/jsclist.h
index 23da9b8cd519..c5d4789bf4eb 100644
--- a/js/src/jsclist.h
+++ b/js/src/jsclist.h
@@ -90,7 +90,7 @@ typedef struct JSCListStr {
 ** circular list is not empty
 */
 #define JS_CLIST_IS_EMPTY(_l) \
-    ((_l)->next == (_l))
+    bool((_l)->next == (_l))
 
 /*
 ** Initialize a circular list

From bf80fc26e6f54be16dc37fd6ed29eff7f8300cef Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 12 Dec 2014 11:59:24 -0500
Subject: [PATCH 103/183] Bug 1109409 - improve mozpack.BaseFile.copy()
 performance on Windows; r=gps

mopack.BaseFile.copy() performs a generic read/write file copy.  Windows
has an explicit CopyFile() call that tests have shown to be
significantly faster.  Let's use that instead via the magic of ctypes.
---
 python/mozbuild/mozpack/files.py | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/python/mozbuild/mozpack/files.py b/python/mozbuild/mozpack/files.py
index 007ea7fbcd9c..a806071e7e47 100644
--- a/python/mozbuild/mozpack/files.py
+++ b/python/mozbuild/mozpack/files.py
@@ -34,6 +34,24 @@ from tempfile import (
     NamedTemporaryFile,
 )
 
+# For clean builds, copying files on win32 using CopyFile through ctypes is
+# ~2x as fast as using shutil.copyfile.
+if platform.system() != 'Windows':
+    _copyfile = shutil.copyfile
+else:
+    import ctypes
+    _kernel32 = ctypes.windll.kernel32
+    _CopyFileA = _kernel32.CopyFileA
+    _CopyFileW = _kernel32.CopyFileW
+
+    def _copyfile(src, dest):
+        # False indicates `dest` should be overwritten if it exists already.
+        if isinstance(src, unicode) and isinstance(dest, unicode):
+            _CopyFileW(src, dest, False)
+        elif isinstance(src, str) and isinstance(dest, str):
+            _CopyFileA(src, dest, False)
+        else:
+            raise TypeError('mismatched path types!')
 
 class Dest(object):
     '''
@@ -135,7 +153,8 @@ class BaseFile(object):
 
         if can_skip_content_check:
             if getattr(self, 'path', None) and getattr(dest, 'path', None):
-                shutil.copy2(self.path, dest.path)
+                _copyfile(self.path, dest.path)
+                shutil.copystat(self.path, dest.path)
             else:
                 # Ensure the file is always created
                 if not dest.exists():

From ad80860b57a6bb26b440302bb29c0e0b9176ea96 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:28 +0100
Subject: [PATCH 104/183] Bug 1073033 part 1 - Enable recovering the scope
 chain. r=shu

---
 js/src/jit/CompileInfo.h      |  4 ++--
 js/src/jit/JitFrameIterator.h | 19 ++++++++++---------
 js/src/jsfriendapi.cpp        |  4 ++--
 js/src/jsobj.cpp              |  2 +-
 js/src/vm/Debugger.cpp        |  4 ++--
 js/src/vm/Stack.cpp           | 18 ++++++++++--------
 js/src/vm/Stack.h             |  6 +++---
 7 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/js/src/jit/CompileInfo.h b/js/src/jit/CompileInfo.h
index 72641594b8cc..8e4ea6c05985 100644
--- a/js/src/jit/CompileInfo.h
+++ b/js/src/jit/CompileInfo.h
@@ -492,8 +492,8 @@ class CompileInfo
         if (!funMaybeLazy())
             return true;
 
-        // The |this| can be recovered.
-        if (slot == thisSlot())
+        // The |this| and the |scopeChain| values can be recovered.
+        if (slot == thisSlot() || slot == scopeChainSlot())
             return true;
 
         if (isObservableFrameSlot(slot))
diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index 666636aa619c..b20d9f6aaaa9 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -303,7 +303,7 @@ struct MaybeReadFallback
 
     JSContext *maybeCx;
     JitActivation *activation;
-    JitFrameIterator *frame;
+    const JitFrameIterator *frame;
     const NoGCValue unreadablePlaceholder_;
     const FallbackConsequence consequence;
 
@@ -316,7 +316,7 @@ struct MaybeReadFallback
     {
     }
 
-    MaybeReadFallback(JSContext *cx, JitActivation *activation, JitFrameIterator *frame,
+    MaybeReadFallback(JSContext *cx, JitActivation *activation, const JitFrameIterator *frame,
                       FallbackConsequence consequence = Fallback_Invalidate)
       : maybeCx(cx),
         activation(activation),
@@ -489,7 +489,7 @@ class SnapshotIterator
 
         if (fallback.canRecoverResults()) {
             if (!initInstructionResults(fallback))
-                return fallback.unreadablePlaceholder();
+                js::CrashAtUnhandlableOOM("Unable to recover allocations.");
 
             if (allocationReadable(a))
                 return allocationValue(a);
@@ -502,9 +502,9 @@ class SnapshotIterator
 
     void traceAllocation(JSTracer *trc);
 
-    void readCommonFrameSlots(Value *scopeChain, Value *rval) {
+    void readCommonFrameSlots(Value *scopeChain, Value *rval, MaybeReadFallback &fallback) {
         if (scopeChain)
-            *scopeChain = read();
+            *scopeChain = maybeRead(fallback);
         else
             skip();
 
@@ -628,7 +628,7 @@ class InlineFrameIterator
 
         // Read frame slots common to both function and global frames.
         Value scopeChainValue;
-        s.readCommonFrameSlots(&scopeChainValue, rval);
+        s.readCommonFrameSlots(&scopeChainValue, rval, fallback);
 
         if (scopeChain)
             *scopeChain = computeScopeChain(scopeChainValue, hasCallObj);
@@ -668,7 +668,8 @@ class InlineFrameIterator
                         parent_s.skip();
 
                     // Get the overflown arguments
-                    parent_s.readCommonFrameSlots(nullptr, nullptr);
+                    MaybeReadFallback unusedFallback;
+                    parent_s.readCommonFrameSlots(nullptr, nullptr, unusedFallback);
                     parent_s.readFunctionFrameArgs(argOp, nullptr, nullptr,
                                                    nformal, nactual, it.script(),
                                                    fallback);
@@ -716,11 +717,11 @@ class InlineFrameIterator
     bool isFunctionFrame() const;
     bool isConstructing() const;
 
-    JSObject *scopeChain() const {
+    JSObject *scopeChain(MaybeReadFallback &fallback) const {
         SnapshotIterator s(si_);
 
         // scopeChain
-        Value v = s.read();
+        Value v = s.maybeRead(fallback);
         return computeScopeChain(v);
     }
 
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index 02c28269b3db..d5335a34eb9c 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -761,7 +761,7 @@ FormatFrame(JSContext *cx, const ScriptFrameIter &iter, char *buf, int num,
     RootedScript script(cx, iter.script());
     jsbytecode* pc = iter.pc();
 
-    RootedObject scopeChain(cx, iter.scopeChain());
+    RootedObject scopeChain(cx, iter.scopeChain(cx));
     JSAutoCompartment ac(cx, scopeChain);
 
     const char *filename = script->filename();
@@ -796,7 +796,7 @@ FormatFrame(JSContext *cx, const ScriptFrameIter &iter, char *buf, int num,
             if (i < iter.numFormalArgs() && script->formalIsAliased(i)) {
                 for (AliasedFormalIter fi(script); ; fi++) {
                     if (fi.frameIndex() == i) {
-                        arg = iter.callObj().aliasedVar(fi);
+                        arg = iter.callObj(cx).aliasedVar(fi);
                         break;
                     }
                 }
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 2d9609c7d3dd..6d86f42ffab4 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -4007,7 +4007,7 @@ js_DumpInterpreterFrame(JSContext *cx, InterpreterFrame *start)
             fprintf(stderr, " eval");
         fputc('\n', stderr);
 
-        fprintf(stderr, "  scopeChain: (JSObject *) %p\n", (void *) i.scopeChain());
+        fprintf(stderr, "  scopeChain: (JSObject *) %p\n", (void *) i.scopeChain(cx));
 
         fputc('\n', stderr);
     }
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 40717c2a87a7..6d6edb239791 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -5322,7 +5322,7 @@ DebuggerFrame_getThis(JSContext *cx, unsigned argc, Value *vp)
     THIS_FRAME_ITER(cx, argc, vp, "get this", args, thisobj, _, iter);
     RootedValue thisv(cx);
     {
-        AutoCompartment ac(cx, iter.scopeChain());
+        AutoCompartment ac(cx, iter.scopeChain(cx));
         if (!iter.computeThis(cx))
             return false;
         thisv = iter.computedThisValue();
@@ -5726,7 +5726,7 @@ DebuggerGenericEval(JSContext *cx, const char *fullMethodName, const Value &code
 
     Maybe<AutoCompartment> ac;
     if (iter)
-        ac.emplace(cx, iter->scopeChain());
+        ac.emplace(cx, iter->scopeChain(cx));
     else
         ac.emplace(cx, scope);
 
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index b63ab556c761..4d0656b89071 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1129,15 +1129,17 @@ FrameIter::unaliasedActual(unsigned i, MaybeCheckAliasing checkAliasing) const
 }
 
 JSObject *
-FrameIter::scopeChain() const
+FrameIter::scopeChain(JSContext *cx) const
 {
     switch (data_.state_) {
       case DONE:
       case ASMJS:
         break;
       case JIT:
-        if (data_.jitFrames_.isIonScripted())
-            return ionInlineFrames_.scopeChain();
+        if (data_.jitFrames_.isIonScripted()) {
+            jit::MaybeReadFallback recover(cx, activation()->asJit(), &data_.jitFrames_);
+            return ionInlineFrames_.scopeChain(recover);
+        }
         return data_.jitFrames_.baselineFrame()->scopeChain();
       case INTERP:
         return interpFrame()->scopeChain();
@@ -1146,11 +1148,11 @@ FrameIter::scopeChain() const
 }
 
 CallObject &
-FrameIter::callObj() const
+FrameIter::callObj(JSContext *cx) const
 {
     MOZ_ASSERT(callee()->isHeavyweight());
 
-    JSObject *pobj = scopeChain();
+    JSObject *pobj = scopeChain(cx);
     while (!pobj->is<CallObject>())
         pobj = pobj->enclosingScope();
     return pobj->as<CallObject>();
@@ -1173,7 +1175,7 @@ bool
 FrameIter::computeThis(JSContext *cx) const
 {
     MOZ_ASSERT(!done() && !isAsmJS());
-    assertSameCompartment(cx, scopeChain());
+    assertSameCompartment(cx, scopeChain(cx));
     return ComputeThis(cx, abstractFramePtr());
 }
 
@@ -1184,7 +1186,7 @@ FrameIter::computedThisValue() const
 }
 
 Value
-FrameIter::thisv(JSContext *cx)
+FrameIter::thisv(JSContext *cx) const
 {
     switch (data_.state_) {
       case DONE:
@@ -1326,7 +1328,7 @@ AbstractFramePtr::evalPrevScopeChain(JSContext *cx) const
     while (iter.isIon() || iter.abstractFramePtr() != *this)
         ++iter;
     ++iter;
-    return iter.scopeChain();
+    return iter.scopeChain(cx);
 }
 
 bool
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index 68a5b5be7bf1..2d4154393990 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1605,8 +1605,8 @@ class FrameIter
     Value       unaliasedActual(unsigned i, MaybeCheckAliasing = CHECK_ALIASING) const;
     template <class Op> inline void unaliasedForEachActual(JSContext *cx, Op op);
 
-    JSObject   *scopeChain() const;
-    CallObject &callObj() const;
+    JSObject   *scopeChain(JSContext *cx) const;
+    CallObject &callObj(JSContext *cx) const;
 
     bool        hasArgsObj() const;
     ArgumentsObject &argsObj() const;
@@ -1621,7 +1621,7 @@ class FrameIter
     // Both methods exist because of speed. thisv() will never rematerialize
     // an Ion frame, whereas computedThisValue() will.
     Value       computedThisValue() const;
-    Value       thisv(JSContext *cx);
+    Value       thisv(JSContext *cx) const;
 
     Value       returnValue() const;
     void        setReturnValue(const Value &v);

From a820b1f0ec28e6c2da4cdf5aee04f24b4e95f516 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:28 +0100
Subject: [PATCH 105/183] Bug 1073033 part 2.0 - Snapshot: Add Recover
 instruction with default value. r=bbouvier

---
 js/src/jit/JitFrameIterator.h | 24 ++++++++++++++++++++++--
 js/src/jit/JitFrames.cpp      | 30 ++++++++++++++++++++++++------
 js/src/jit/Snapshots.cpp      | 13 +++++++++++++
 js/src/jit/Snapshots.h        | 12 ++++++++++++
 4 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index b20d9f6aaaa9..a83050fdd545 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -356,6 +356,18 @@ class SnapshotIterator
     IonScript *ionScript_;
     RInstructionResults *instructionResults_;
 
+    enum ReadMethod {
+        // Read the normal value.
+        RM_Normal          = 1 << 0,
+
+        // Read the default value, or the normal value if there is no default.
+        RM_AlwaysDefault   = 1 << 1,
+
+        // Try to read the normal value if it is readable, otherwise default to
+        // the Default value.
+        RM_NormalOrDefault = RM_Normal | RM_AlwaysDefault,
+    };
+
   private:
     // Read a spilled register from the machine state.
     bool hasRegister(Register reg) const {
@@ -383,8 +395,8 @@ class SnapshotIterator
     }
     Value fromInstructionResult(uint32_t index) const;
 
-    Value allocationValue(const RValueAllocation &a);
-    bool allocationReadable(const RValueAllocation &a);
+    Value allocationValue(const RValueAllocation &a, ReadMethod rm = RM_Normal);
+    bool allocationReadable(const RValueAllocation &a, ReadMethod rm = RM_Normal);
     void writeAllocationValuePayload(const RValueAllocation &a, Value v);
     void warnUnreadableAllocation();
 
@@ -482,6 +494,14 @@ class SnapshotIterator
         return allocationValue(readAllocation());
     }
 
+    // Read the |Normal| value unless it is not available and that the snapshot
+    // provides a |Default| value. This is useful to avoid invalidations of the
+    // frame while we are only interested in a few properties which are provided
+    // by the |Default| value.
+    Value readWithDefault() {
+        return allocationValue(readAllocation(), RM_NormalOrDefault);
+    }
+
     Value maybeRead(MaybeReadFallback &fallback) {
         RValueAllocation a = readAllocation();
         if (allocationReadable(a))
diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index ee08f43f4156..f594e11070f5 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -1749,7 +1749,7 @@ FromTypedPayload(JSValueType type, uintptr_t payload)
 }
 
 bool
-SnapshotIterator::allocationReadable(const RValueAllocation &alloc)
+SnapshotIterator::allocationReadable(const RValueAllocation &alloc, ReadMethod rm)
 {
     switch (alloc.mode()) {
       case RValueAllocation::DOUBLE_REG:
@@ -1776,6 +1776,8 @@ SnapshotIterator::allocationReadable(const RValueAllocation &alloc)
 
       case RValueAllocation::RECOVER_INSTRUCTION:
         return hasInstructionResult(alloc.index());
+      case RValueAllocation::RI_WITH_DEFAULT_CST:
+        return rm & RM_AlwaysDefault || hasInstructionResult(alloc.index());
 
       default:
         return true;
@@ -1783,7 +1785,7 @@ SnapshotIterator::allocationReadable(const RValueAllocation &alloc)
 }
 
 Value
-SnapshotIterator::allocationValue(const RValueAllocation &alloc)
+SnapshotIterator::allocationValue(const RValueAllocation &alloc, ReadMethod rm)
 {
     switch (alloc.mode()) {
       case RValueAllocation::CONSTANT:
@@ -1887,6 +1889,12 @@ SnapshotIterator::allocationValue(const RValueAllocation &alloc)
       case RValueAllocation::RECOVER_INSTRUCTION:
         return fromInstructionResult(alloc.index());
 
+      case RValueAllocation::RI_WITH_DEFAULT_CST:
+        if (rm & RM_Normal && hasInstructionResult(alloc.index()))
+            return fromInstructionResult(alloc.index());
+        MOZ_ASSERT(rm & RM_AlwaysDefault);
+        return ionScript_->getConstant(alloc.index2());
+
       default:
         MOZ_CRASH("huh?");
     }
@@ -1956,6 +1964,12 @@ SnapshotIterator::writeAllocationValuePayload(const RValueAllocation &alloc, Val
         MOZ_CRASH("Recover instructions are handled by the JitActivation.");
         break;
 
+      case RValueAllocation::RI_WITH_DEFAULT_CST:
+        // Assume that we are always going to be writing on the default value
+        // while tracing.
+        ionScript_->getConstant(alloc.index2()) = v;
+        break;
+
       default:
         MOZ_CRASH("huh?");
     }
@@ -1965,10 +1979,10 @@ void
 SnapshotIterator::traceAllocation(JSTracer *trc)
 {
     RValueAllocation alloc = readAllocation();
-    if (!allocationReadable(alloc))
+    if (!allocationReadable(alloc, RM_AlwaysDefault))
         return;
 
-    Value v = allocationValue(alloc);
+    Value v = allocationValue(alloc, RM_AlwaysDefault);
     if (!v.isMarkable())
         return;
 
@@ -2313,8 +2327,12 @@ InlineFrameIterator::findNextFrame()
         for (unsigned j = 0; j < skipCount; j++)
             si_.skip();
 
-        // The JSFunction is a constant, otherwise we would not have inlined it.
-        Value funval = si_.read();
+        // This value should correspond to the function which is being inlined.
+        // The value must be readable to iterate over the inline frame. Most of
+        // the time, these functions are stored as JSFunction constants,
+        // register which are holding the JSFunction pointer, or recover
+        // instruction with Default value.
+        Value funval = si_.readWithDefault();
 
         // Skip extra value allocations.
         while (si_.moreAllocations())
diff --git a/js/src/jit/Snapshots.cpp b/js/src/jit/Snapshots.cpp
index 726d30faa12e..de4aeb54adc8 100644
--- a/js/src/jit/Snapshots.cpp
+++ b/js/src/jit/Snapshots.cpp
@@ -79,6 +79,11 @@ using namespace js::jit;
 //         RECOVER_INSTRUCTION [INDEX]
 //           Index into the list of recovered instruction results.
 //
+//         RI_WITH_DEFAULT_CST [INDEX] [INDEX]
+//           The first payload is the index into the list of recovered
+//           instruction results.  The second payload is the index in the
+//           constant pool.
+//
 //         TYPED_REG [PACKED_TAG, GPR_REG]:
 //           Value with statically known type, which payload is stored in a
 //           register.
@@ -231,6 +236,14 @@ RValueAllocation::layoutFromMode(Mode mode)
         };
         return layout;
       }
+      case RI_WITH_DEFAULT_CST: {
+        static const RValueAllocation::Layout layout = {
+            PAYLOAD_INDEX,
+            PAYLOAD_INDEX,
+            "instruction with default"
+        };
+        return layout;
+      }
 
       default: {
         static const RValueAllocation::Layout regLayout = {
diff --git a/js/src/jit/Snapshots.h b/js/src/jit/Snapshots.h
index a59024d69be6..0853c4d9cf36 100644
--- a/js/src/jit/Snapshots.h
+++ b/js/src/jit/Snapshots.h
@@ -54,7 +54,10 @@ class RValueAllocation
         UNTYPED_REG         = 0x06,
         UNTYPED_STACK       = 0x07,
 #endif
+
+        // Recover instructions.
         RECOVER_INSTRUCTION = 0x0a,
+        RI_WITH_DEFAULT_CST = 0x0b,
 
         // The JSValueType is packed in the Mode.
         TYPED_REG_MIN       = 0x10,
@@ -260,6 +263,11 @@ class RValueAllocation
     static RValueAllocation RecoverInstruction(uint32_t index) {
         return RValueAllocation(RECOVER_INSTRUCTION, payloadOfIndex(index));
     }
+    static RValueAllocation RecoverInstruction(uint32_t riIndex, uint32_t cstIndex) {
+        return RValueAllocation(RI_WITH_DEFAULT_CST,
+                                payloadOfIndex(riIndex),
+                                payloadOfIndex(cstIndex));
+    }
 
     void writeHeader(CompactBufferWriter &writer, JSValueType type, uint32_t regCode) const;
   public:
@@ -293,6 +301,10 @@ class RValueAllocation
         return arg1_.type;
     }
 
+    uint32_t index2() const {
+        MOZ_ASSERT(layoutFromMode(mode()).type2 == PAYLOAD_INDEX);
+        return arg2_.index;
+    }
     int32_t stackOffset2() const {
         MOZ_ASSERT(layoutFromMode(mode()).type2 == PAYLOAD_STACK_OFFSET);
         return arg2_.stackOffset;

From f2bcdf60144e00c56f284a0283f36171852a27b7 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:29 +0100
Subject: [PATCH 106/183] Bug 1073033 part 2.1 - InlineFrameIterator: Recover
 the non-default value of a function. r=shu

---
 js/src/jit/JitFrameIterator.h | 55 ++++++++++++++++++++++-------------
 js/src/jit/JitFrames.cpp      | 52 ++++++++++++++++++++++++++++-----
 js/src/jsfun.cpp              | 12 ++++++--
 js/src/jsfun.h                |  7 ++++-
 js/src/vm/Stack.cpp           | 50 ++++++++++++++++++++++++++-----
 js/src/vm/Stack.h             | 22 ++++++++++----
 6 files changed, 152 insertions(+), 46 deletions(-)

diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index a83050fdd545..1c6a0d0d301a 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -498,26 +498,20 @@ class SnapshotIterator
     // provides a |Default| value. This is useful to avoid invalidations of the
     // frame while we are only interested in a few properties which are provided
     // by the |Default| value.
-    Value readWithDefault() {
-        return allocationValue(readAllocation(), RM_NormalOrDefault);
-    }
-
-    Value maybeRead(MaybeReadFallback &fallback) {
+    Value readWithDefault(RValueAllocation *alloc) {
+        *alloc = RValueAllocation();
         RValueAllocation a = readAllocation();
         if (allocationReadable(a))
             return allocationValue(a);
 
-        if (fallback.canRecoverResults()) {
-            if (!initInstructionResults(fallback))
-                js::CrashAtUnhandlableOOM("Unable to recover allocations.");
+        *alloc = a;
+        return allocationValue(a, RM_AlwaysDefault);
+    }
 
-            if (allocationReadable(a))
-                return allocationValue(a);
-
-            MOZ_ASSERT_UNREACHABLE("All allocations should be readable.");
-        }
-
-        return fallback.unreadablePlaceholder();
+    Value maybeRead(const RValueAllocation &a, MaybeReadFallback &fallback);
+    Value maybeRead(MaybeReadFallback &fallback) {
+        RValueAllocation a = readAllocation();
+        return maybeRead(a, fallback);
     }
 
     void traceAllocation(JSTracer *trc);
@@ -596,7 +590,16 @@ class InlineFrameIterator
     // frames contained in the recover buffer.
     uint32_t frameCount_;
 
-    RootedFunction callee_;
+    // The |calleeTemplate_| fields contains either the JSFunction or the
+    // template from which it is supposed to be cloned. The |calleeRVA_| is an
+    // Invalid value allocation, if the |calleeTemplate_| field is the effective
+    // JSFunction, and not its template. On the other hand, any other value
+    // allocation implies that the |calleeTemplate_| is the template JSFunction
+    // from which the effective one would be derived and cached by the Recover
+    // instruction result.
+    RootedFunction calleeTemplate_;
+    RValueAllocation calleeRVA_;
+
     RootedScript script_;
     jsbytecode *pc_;
     uint32_t numActualArgs_;
@@ -617,14 +620,24 @@ class InlineFrameIterator
     bool more() const {
         return frame_ && framesRead_ < frameCount_;
     }
-    JSFunction *callee() const {
-        MOZ_ASSERT(callee_);
-        return callee_;
+
+    // Due to optimizations, we are not always capable of reading the callee of
+    // inlined frames without invalidating the IonCode. This function might
+    // return either the effective callee of the JSFunction which might be used
+    // to create it.
+    //
+    // As such, the |calleeTemplate()| can be used to read most of the metadata
+    // which are conserved across clones.
+    JSFunction *calleeTemplate() const {
+        MOZ_ASSERT(isFunctionFrame());
+        return calleeTemplate_;
     }
-    JSFunction *maybeCallee() const {
-        return callee_;
+    JSFunction *maybeCalleeTemplate() const {
+        return calleeTemplate_;
     }
 
+    JSFunction *callee(MaybeReadFallback &fallback) const;
+
     unsigned numActualArgs() const {
         // The number of actual arguments of inline frames is recovered by the
         // iteration process. It is recovered from the bytecode because this
diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index f594e11070f5..4713b6c6672d 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -1900,6 +1900,25 @@ SnapshotIterator::allocationValue(const RValueAllocation &alloc, ReadMethod rm)
     }
 }
 
+Value
+SnapshotIterator::maybeRead(const RValueAllocation &a, MaybeReadFallback &fallback)
+{
+    if (allocationReadable(a))
+        return allocationValue(a);
+
+    if (fallback.canRecoverResults()) {
+        if (!initInstructionResults(fallback))
+            js::CrashAtUnhandlableOOM("Unable to recover allocations.");
+
+        if (allocationReadable(a))
+            return allocationValue(a);
+
+        MOZ_ASSERT_UNREACHABLE("All allocations should be readable.");
+    }
+
+    return fallback.unreadablePlaceholder();
+}
+
 void
 SnapshotIterator::writeAllocationValuePayload(const RValueAllocation &alloc, Value v)
 {
@@ -2232,14 +2251,16 @@ JitFrameIterator::osiIndex() const
 }
 
 InlineFrameIterator::InlineFrameIterator(ThreadSafeContext *cx, const JitFrameIterator *iter)
-  : callee_(cx),
+  : calleeTemplate_(cx),
+    calleeRVA_(),
     script_(cx)
 {
     resetOn(iter);
 }
 
 InlineFrameIterator::InlineFrameIterator(JSRuntime *rt, const JitFrameIterator *iter)
-  : callee_(rt),
+  : calleeTemplate_(rt),
+    calleeRVA_(),
     script_(rt)
 {
     resetOn(iter);
@@ -2249,7 +2270,8 @@ InlineFrameIterator::InlineFrameIterator(ThreadSafeContext *cx, const InlineFram
   : frame_(iter ? iter->frame_ : nullptr),
     framesRead_(0),
     frameCount_(iter ? iter->frameCount_ : UINT32_MAX),
-    callee_(cx),
+    calleeTemplate_(cx),
+    calleeRVA_(),
     script_(cx)
 {
     if (frame_) {
@@ -2283,7 +2305,8 @@ InlineFrameIterator::findNextFrame()
     si_ = start_;
 
     // Read the initial frame out of the C stack.
-    callee_ = frame_->maybeCallee();
+    calleeTemplate_ = frame_->maybeCallee();
+    calleeRVA_ = RValueAllocation();
     script_ = frame_->script();
     MOZ_ASSERT(script_->hasBaselineScript());
 
@@ -2332,7 +2355,7 @@ InlineFrameIterator::findNextFrame()
         // the time, these functions are stored as JSFunction constants,
         // register which are holding the JSFunction pointer, or recover
         // instruction with Default value.
-        Value funval = si_.readWithDefault();
+        Value funval = si_.readWithDefault(&calleeRVA_);
 
         // Skip extra value allocations.
         while (si_.moreAllocations())
@@ -2340,12 +2363,12 @@ InlineFrameIterator::findNextFrame()
 
         si_.nextFrame();
 
-        callee_ = &funval.toObject().as<JSFunction>();
+        calleeTemplate_ = &funval.toObject().as<JSFunction>();
 
         // Inlined functions may be clones that still point to the lazy script
         // for the executed script, if they are clones. The actual script
         // exists though, just make sure the function points to it.
-        script_ = callee_->existingScriptForInlinedFunction();
+        script_ = calleeTemplate_->existingScriptForInlinedFunction();
         MOZ_ASSERT(script_->hasBaselineScript());
 
         pc_ = script_->offsetToPC(si_.pcOffset());
@@ -2362,6 +2385,19 @@ InlineFrameIterator::findNextFrame()
     framesRead_++;
 }
 
+JSFunction *
+InlineFrameIterator::callee(MaybeReadFallback &fallback) const
+{
+    MOZ_ASSERT(isFunctionFrame());
+    if (calleeRVA_.mode() == RValueAllocation::INVALID || !fallback.canRecoverResults())
+        return calleeTemplate_;
+
+    SnapshotIterator s(si_);
+    // :TODO: Handle allocation failures from recover instruction.
+    Value funval = s.maybeRead(calleeRVA_, fallback);
+    return &funval.toObject().as<JSFunction>();
+}
+
 JSObject *
 InlineFrameIterator::computeScopeChain(Value scopeChainValue, bool *hasCallObj) const
 {
@@ -2386,7 +2422,7 @@ InlineFrameIterator::computeScopeChain(Value scopeChainValue, bool *hasCallObj)
 bool
 InlineFrameIterator::isFunctionFrame() const
 {
-    return !!callee_;
+    return !!calleeTemplate_;
 }
 
 MachineState
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index 03bfdde219cc..d09eb8a772a5 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -1999,6 +1999,14 @@ js::NewFunctionWithProto(ExclusiveContext *cx, HandleObject funobjArg, Native na
     return fun;
 }
 
+bool
+js::CloneFunctionObjectUseSameScript(JSCompartment *compartment, HandleFunction fun)
+{
+    return compartment == fun->compartment() &&
+           !fun->hasSingletonType() &&
+           !types::UseNewTypeForClone(fun);
+}
+
 JSFunction *
 js::CloneFunctionObject(JSContext *cx, HandleFunction fun, HandleObject parent, gc::AllocKind allocKind,
                         NewObjectKind newKindArg /* = GenericObject */)
@@ -2006,9 +2014,7 @@ js::CloneFunctionObject(JSContext *cx, HandleFunction fun, HandleObject parent,
     MOZ_ASSERT(parent);
     MOZ_ASSERT(!fun->isBoundFunction());
 
-    bool useSameScript = cx->compartment() == fun->compartment() &&
-                         !fun->hasSingletonType() &&
-                         !types::UseNewTypeForClone(fun);
+    bool useSameScript = CloneFunctionObjectUseSameScript(cx->compartment(), fun);
 
     if (!useSameScript && fun->isInterpretedLazy() && !fun->getOrCreateScript(cx))
         return nullptr;
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index b8f8577cda9d..574ec86e48e2 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -55,7 +55,9 @@ class JSFunction : public js::NativeObject
         ASMJS_CTOR = ASMJS | NATIVE_CTOR,
         ASMJS_LAMBDA_CTOR = ASMJS | NATIVE_CTOR | LAMBDA,
         INTERPRETED_LAMBDA = INTERPRETED | LAMBDA,
-        INTERPRETED_LAMBDA_ARROW = INTERPRETED | LAMBDA | ARROW
+        INTERPRETED_LAMBDA_ARROW = INTERPRETED | LAMBDA | ARROW,
+        STABLE_ACROSS_CLONES = NATIVE_CTOR | IS_FUN_PROTO | EXPR_CLOSURE | HAS_GUESSED_ATOM |
+                               LAMBDA | SELF_HOSTED | SELF_HOSTED_CTOR | HAS_REST | ASMJS | ARROW
     };
 
     static_assert(INTERPRETED == JS_FUNCTION_INTERPRETED_BIT,
@@ -578,6 +580,9 @@ class FunctionExtended : public JSFunction
     HeapValue extendedSlots[NUM_EXTENDED_SLOTS];
 };
 
+extern bool
+CloneFunctionObjectUseSameScript(JSCompartment *compartment, HandleFunction fun);
+
 extern JSFunction *
 CloneFunctionObject(JSContext *cx, HandleFunction fun, HandleObject parent,
                     gc::AllocKind kind = JSFunction::FinalizeKind,
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 4d0656b89071..79b7733dbf08 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -1062,7 +1062,7 @@ FrameIter::updatePcQuadratic()
 }
 
 JSFunction *
-FrameIter::callee() const
+FrameIter::calleeTemplate() const
 {
     switch (data_.state_) {
       case DONE:
@@ -1075,27 +1075,63 @@ FrameIter::callee() const
         if (data_.jitFrames_.isBaselineJS())
             return data_.jitFrames_.callee();
         MOZ_ASSERT(data_.jitFrames_.isIonScripted());
-        return ionInlineFrames_.callee();
+        return ionInlineFrames_.calleeTemplate();
     }
     MOZ_CRASH("Unexpected state");
 }
 
-Value
-FrameIter::calleev() const
+JSFunction *
+FrameIter::callee(JSContext *cx) const
 {
     switch (data_.state_) {
       case DONE:
       case ASMJS:
         break;
       case INTERP:
-        MOZ_ASSERT(isFunctionFrame());
-        return interpFrame()->calleev();
+        return calleeTemplate();
       case JIT:
-        return ObjectValue(*callee());
+        if (data_.jitFrames_.isIonScripted()) {
+            jit::MaybeReadFallback recover(cx, activation()->asJit(), &data_.jitFrames_);
+            return ionInlineFrames_.callee(recover);
+        }
+        MOZ_ASSERT(data_.jitFrames_.isBaselineJS());
+        return calleeTemplate();
     }
     MOZ_CRASH("Unexpected state");
 }
 
+bool
+FrameIter::matchCallee(JSContext *cx, HandleFunction fun) const
+{
+    RootedFunction currentCallee(cx, calleeTemplate());
+
+    // As we do not know if the calleeTemplate is the real function, or the
+    // template from which it would be cloned, we compare properties which are
+    // stable across the cloning of JSFunctions.
+    if (((currentCallee->flags() ^ fun->flags()) & JSFunction::STABLE_ACROSS_CLONES) != 0 ||
+        currentCallee->nargs() != fun->nargs())
+    {
+        return false;
+    }
+
+    // Only some lambdas are optimized in a way which cannot be recovered without
+    // invalidating the frame. Thus, if one of the function is not a lambda we can just
+    // compare it against the calleeTemplate.
+    if (!fun->isLambda() || !currentCallee->isLambda())
+        return currentCallee == fun;
+
+    // Use the same condition as |js::CloneFunctionObject|, to know if we should
+    // expect both functions to have the same JSScript. If so, and if they are
+    // different, then they cannot be equal.
+    bool useSameScript = CloneFunctionObjectUseSameScript(fun->compartment(), currentCallee);
+    if (useSameScript && currentCallee->nonLazyScript() != fun->nonLazyScript())
+        return false;
+
+    // If none of the previous filters worked, then take the risk of
+    // invalidating the frame to identify the JSFunction.
+    return callee(cx) == fun;
+}
+
 unsigned
 FrameIter::numActualArgs() const
 {
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index 2d4154393990..74906f9ccef8 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -1598,8 +1598,22 @@ class FrameIter
     bool        isConstructing() const;
     jsbytecode *pc() const { MOZ_ASSERT(!done()); return data_.pc_; }
     void        updatePcQuadratic();
-    JSFunction *callee() const;
-    Value       calleev() const;
+
+    // The function |calleeTemplate()| returns either the function from which
+    // the current |callee| was cloned or the |callee| if it can be read. As
+    // long as we do not have to investigate the scope chain or build a new
+    // frame, we should prefer to use |calleeTemplate| instead of |callee|, as
+    // requesting the |callee| might cause the invalidation of the frame. (see
+    // js::Lambda)
+    JSFunction *calleeTemplate() const;
+    JSFunction *callee(JSContext *cx) const;
+
+    JSFunction *maybeCallee(JSContext *cx) const {
+        return isFunctionFrame() ? callee(cx) : nullptr;
+    }
+
+    bool        matchCallee(JSContext *cx, HandleFunction fun) const;
+
     unsigned    numActualArgs() const;
     unsigned    numFormalArgs() const;
     Value       unaliasedActual(unsigned i, MaybeCheckAliasing = CHECK_ALIASING) const;
@@ -1626,10 +1640,6 @@ class FrameIter
     Value       returnValue() const;
     void        setReturnValue(const Value &v);
 
-    JSFunction *maybeCallee() const {
-        return isFunctionFrame() ? callee() : nullptr;
-    }
-
     // These are only valid for the top frame.
     size_t      numFrameSlots() const;
     Value       frameSlotValue(size_t index) const;

From 43cb54f7232890741ff251fc8cea8dc79aff3c54 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:29 +0100
Subject: [PATCH 107/183] Bug 1073033 part 2.2 - Update callee uses, extract
 information form the calleeTemplate. r=shu

---
 js/src/jit/JitFrameIterator.h      |  2 +-
 js/src/jit/JitFrames.cpp           | 15 ++++++++-------
 js/src/jit/RematerializedFrame.cpp |  2 +-
 js/src/jsopcode.cpp                |  6 +++---
 js/src/vm/ArgumentsObject.cpp      |  2 +-
 js/src/vm/Stack.cpp                |  4 ++--
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index 1c6a0d0d301a..0d82b5069913 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -669,7 +669,7 @@ class InlineFrameIterator
         // Read arguments, which only function frames have.
         if (isFunctionFrame()) {
             unsigned nactual = numActualArgs();
-            unsigned nformal = callee()->nargs();
+            unsigned nformal = calleeTemplate()->nargs();
 
             // Get the non overflown arguments, which are taken from the inlined
             // frame, because it will have the updated value when JSOP_SETARG is
diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index 4713b6c6672d..7b3481bd8393 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -395,7 +395,7 @@ CloseLiveIterator(JSContext *cx, const InlineFrameIterator &frame, uint32_t loca
     SnapshotIterator si = frame.snapshotIterator();
 
     // Skip stack slots until we reach the iterator object.
-    uint32_t base = CountArgSlots(frame.script(), frame.maybeCallee()) + frame.script()->nfixed();
+    uint32_t base = CountArgSlots(frame.script(), frame.maybeCalleeTemplate()) + frame.script()->nfixed();
     uint32_t skipSlots = base + localSlot - 1;
 
     for (unsigned i = 0; i < skipSlots; i++)
@@ -2560,6 +2560,8 @@ JitFrameIterator::dumpBaseline() const
 void
 InlineFrameIterator::dump() const
 {
+    MaybeReadFallback fallback(UndefinedValue());
+
     if (more())
         fprintf(stderr, " JS frame (inlined)\n");
     else
@@ -2570,7 +2572,7 @@ InlineFrameIterator::dump() const
         isFunction = true;
         fprintf(stderr, "  callee fun: ");
 #ifdef DEBUG
-        js_DumpObject(callee());
+        js_DumpObject(callee(fallback));
 #else
         fprintf(stderr, "?\n");
 #endif
@@ -2589,7 +2591,6 @@ InlineFrameIterator::dump() const
     }
 
     SnapshotIterator si = snapshotIterator();
-    MaybeReadFallback fallback(UndefinedValue());
     fprintf(stderr, "  slots: %u\n", si.numAllocations() - 1);
     for (unsigned i = 0; i < si.numAllocations() - 1; i++) {
         if (isFunction) {
@@ -2597,15 +2598,15 @@ InlineFrameIterator::dump() const
                 fprintf(stderr, "  scope chain: ");
             else if (i == 1)
                 fprintf(stderr, "  this: ");
-            else if (i - 2 < callee()->nargs())
+            else if (i - 2 < calleeTemplate()->nargs())
                 fprintf(stderr, "  formal (arg %d): ", i - 2);
             else {
-                if (i - 2 == callee()->nargs() && numActualArgs() > callee()->nargs()) {
-                    DumpOp d(callee()->nargs());
+                if (i - 2 == calleeTemplate()->nargs() && numActualArgs() > calleeTemplate()->nargs()) {
+                    DumpOp d(calleeTemplate()->nargs());
                     unaliasedForEachActual(GetJSContextFromJitCode(), d, ReadFrame_Overflown, fallback);
                 }
 
-                fprintf(stderr, "  slot %d: ", int(i - 2 - callee()->nargs()));
+                fprintf(stderr, "  slot %d: ", int(i - 2 - calleeTemplate()->nargs()));
             }
         } else
             fprintf(stderr, "  slot %u: ", i);
diff --git a/js/src/jit/RematerializedFrame.cpp b/js/src/jit/RematerializedFrame.cpp
index cdfa639eeae9..937d310867c9 100644
--- a/js/src/jit/RematerializedFrame.cpp
+++ b/js/src/jit/RematerializedFrame.cpp
@@ -48,7 +48,7 @@ RematerializedFrame::RematerializedFrame(JSContext *cx, uint8_t *top, unsigned n
 /* static */ RematerializedFrame *
 RematerializedFrame::New(JSContext *cx, uint8_t *top, InlineFrameIterator &iter)
 {
-    unsigned numFormals = iter.isFunctionFrame() ? iter.callee()->nargs() : 0;
+    unsigned numFormals = iter.isFunctionFrame() ? iter.calleeTemplate()->nargs() : 0;
     unsigned argSlots = Max(numFormals, iter.numActualArgs());
     size_t numBytes = sizeof(RematerializedFrame) +
         (argSlots + iter.script()->nfixed()) * sizeof(Value) -
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 4271fc3fd6b4..9ed9c4013841 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -1809,7 +1809,7 @@ DecompileExpressionFromStack(JSContext *cx, int spindex, int skipStackHits, Hand
     AutoCompartment ac(cx, &script->global());
     jsbytecode *valuepc = frameIter.pc();
     RootedFunction fun(cx, frameIter.isFunctionFrame()
-                           ? frameIter.callee()
+                           ? frameIter.calleeTemplate()
                            : nullptr);
 
     MOZ_ASSERT(script->containsPC(valuepc));
@@ -1889,8 +1889,8 @@ DecompileArgumentFromStack(JSContext *cx, int formalIndex, char **res)
     AutoCompartment ac(cx, &script->global());
     jsbytecode *current = frameIter.pc();
     RootedFunction fun(cx, frameIter.isFunctionFrame()
-                       ? frameIter.callee()
-                       : nullptr);
+                           ? frameIter.calleeTemplate()
+                           : nullptr);
 
     MOZ_ASSERT(script->containsPC(current));
 
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index 0e6bf2313912..1bd7fdebeed3 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -133,7 +133,7 @@ struct CopyScriptFrameIterArgs
 
         /* Define formals which are not part of the actuals. */
         unsigned numActuals = iter_.numActualArgs();
-        unsigned numFormals = iter_.callee()->nargs();
+        unsigned numFormals = iter_.calleeTemplate()->nargs();
         MOZ_ASSERT(numActuals <= totalArgs);
         MOZ_ASSERT(numFormals <= totalArgs);
         MOZ_ASSERT(Max(numActuals, numFormals) == totalArgs);
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 79b7733dbf08..e9e92c2b9f68 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -864,7 +864,7 @@ FrameIter::functionDisplayAtom() const
         break;
       case INTERP:
       case JIT:
-        return callee()->displayAtom();
+        return calleeTemplate()->displayAtom();
       case ASMJS:
         return data_.asmJSFrames_.functionDisplayAtom();
     }
@@ -1186,7 +1186,7 @@ FrameIter::scopeChain(JSContext *cx) const
 CallObject &
 FrameIter::callObj(JSContext *cx) const
 {
-    MOZ_ASSERT(callee()->isHeavyweight());
+    MOZ_ASSERT(calleeTemplate()->isHeavyweight());
 
     JSObject *pobj = scopeChain(cx);
     while (!pobj->is<CallObject>())

From 25b330bbb27d625b555e3a8ae97074e5034bbae7 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:29 +0100
Subject: [PATCH 108/183] Bug 1073033 part 2.3 - Update callee uses, extract
 information form the maybe-recovered callee. r=shu

---
 js/src/builtin/TestingFunctions.cpp |  2 +-
 js/src/jit/Ion.cpp                  |  2 +-
 js/src/jit/JitFrameIterator.h       |  7 ++++---
 js/src/jit/JitFrames.cpp            |  7 ++++---
 js/src/jsfriendapi.cpp              |  4 ++--
 js/src/jsfun.cpp                    | 14 +++++++-------
 js/src/jsinfer.cpp                  |  3 ++-
 js/src/jsobj.cpp                    |  5 ++++-
 js/src/vm/ArgumentsObject.cpp       |  2 +-
 js/src/vm/Stack.cpp                 |  2 +-
 10 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index 12f4e6d0aaf1..726403c63cfa 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -1222,7 +1222,7 @@ ShellObjectMetadataCallback(JSContext *cx, JSObject **pmetadata)
     for (NonBuiltinScriptFrameIter iter(cx); !iter.done(); ++iter) {
         if (iter.isFunctionFrame() && iter.compartment() == cx->compartment()) {
             id = INT_TO_JSID(stackIndex);
-            RootedObject callee(cx, iter.callee());
+            RootedObject callee(cx, iter.callee(cx));
             if (!JS_DefinePropertyById(cx, stack, id, callee, 0,
                                        JS_STUBGETTER, JS_STUBSETTER))
             {
diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp
index 537b95538222..c98e7dab1154 100644
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -2508,7 +2508,7 @@ jit::SetEnterJitData(JSContext *cx, EnterJitData &data, RunState &state, AutoVal
         {
             ScriptFrameIter iter(cx);
             if (iter.isFunctionFrame())
-                data.calleeToken = CalleeToToken(iter.callee(), /* constructing = */ false);
+                data.calleeToken = CalleeToToken(iter.callee(cx), /* constructing = */ false);
         }
     }
 
diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index 0d82b5069913..c0b43ee44f56 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -610,7 +610,8 @@ class InlineFrameIterator
 
   private:
     void findNextFrame();
-    JSObject *computeScopeChain(Value scopeChainValue, bool *hasCallObj = nullptr) const;
+    JSObject *computeScopeChain(Value scopeChainValue, MaybeReadFallback &fallback,
+                                bool *hasCallObj = nullptr) const;
 
   public:
     InlineFrameIterator(ThreadSafeContext *cx, const JitFrameIterator *iter);
@@ -664,7 +665,7 @@ class InlineFrameIterator
         s.readCommonFrameSlots(&scopeChainValue, rval, fallback);
 
         if (scopeChain)
-            *scopeChain = computeScopeChain(scopeChainValue, hasCallObj);
+            *scopeChain = computeScopeChain(scopeChainValue, hasCallObj, fallback);
 
         // Read arguments, which only function frames have.
         if (isFunctionFrame()) {
@@ -755,7 +756,7 @@ class InlineFrameIterator
 
         // scopeChain
         Value v = s.maybeRead(fallback);
-        return computeScopeChain(v);
+        return computeScopeChain(v, fallback);
     }
 
     Value thisValue(MaybeReadFallback &fallback) const {
diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index 7b3481bd8393..ab2b66f563a0 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -2399,11 +2399,12 @@ InlineFrameIterator::callee(MaybeReadFallback &fallback) const
 }
 
 JSObject *
-InlineFrameIterator::computeScopeChain(Value scopeChainValue, bool *hasCallObj) const
+InlineFrameIterator::computeScopeChain(Value scopeChainValue, MaybeReadFallback &fallback,
+                                       bool *hasCallObj) const
 {
     if (scopeChainValue.isObject()) {
         if (hasCallObj)
-            *hasCallObj = isFunctionFrame() && callee()->isHeavyweight();
+            *hasCallObj = isFunctionFrame() && callee(fallback)->isHeavyweight();
         return &scopeChainValue.toObject();
     }
 
@@ -2411,7 +2412,7 @@ InlineFrameIterator::computeScopeChain(Value scopeChainValue, bool *hasCallObj)
     // are walking the frame during the function prologue, before the scope
     // chain has been initialized.
     if (isFunctionFrame())
-        return callee()->environment();
+        return callee(fallback)->environment();
 
     // Ion does not handle scripts that are not compile-and-go.
     MOZ_ASSERT(!script()->isForEval());
diff --git a/js/src/jsfriendapi.cpp b/js/src/jsfriendapi.cpp
index d5335a34eb9c..f8078c9dfa6e 100644
--- a/js/src/jsfriendapi.cpp
+++ b/js/src/jsfriendapi.cpp
@@ -460,7 +460,7 @@ js::GetOutermostEnclosingFunctionOfScriptedCaller(JSContext *cx)
     if (!iter.isFunctionFrame())
         return nullptr;
 
-    RootedFunction curr(cx, iter.callee());
+    RootedFunction curr(cx, iter.callee(cx));
     for (StaticScopeIter<NoGC> i(curr); !i.done(); i++) {
         if (i.type() == StaticScopeIter<NoGC>::FUNCTION)
             curr = &i.fun();
@@ -766,7 +766,7 @@ FormatFrame(JSContext *cx, const ScriptFrameIter &iter, char *buf, int num,
 
     const char *filename = script->filename();
     unsigned lineno = PCToLineNumber(script, pc);
-    RootedFunction fun(cx, iter.maybeCallee());
+    RootedFunction fun(cx, iter.maybeCallee(cx));
     RootedString funname(cx);
     if (fun)
         funname = fun->atom();
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index d09eb8a772a5..90a80d11e669 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -88,7 +88,7 @@ IsFunction(HandleValue v)
 }
 
 static bool
-AdvanceToActiveCallLinear(NonBuiltinScriptFrameIter &iter, HandleFunction fun)
+AdvanceToActiveCallLinear(JSContext *cx, NonBuiltinScriptFrameIter &iter, HandleFunction fun)
 {
     MOZ_ASSERT(!fun->isBuiltin());
     MOZ_ASSERT(!fun->isBoundFunction(), "all bound functions are currently native (ergo builtin)");
@@ -96,7 +96,7 @@ AdvanceToActiveCallLinear(NonBuiltinScriptFrameIter &iter, HandleFunction fun)
     for (; !iter.done(); ++iter) {
         if (!iter.isFunctionFrame() || iter.isEvalFrame())
             continue;
-        if (iter.callee() == fun)
+        if (iter.matchCallee(cx, fun))
             return true;
     }
     return false;
@@ -159,7 +159,7 @@ ArgumentsGetterImpl(JSContext *cx, CallArgs args)
 
     // Return null if this function wasn't found on the stack.
     NonBuiltinScriptFrameIter iter(cx);
-    if (!AdvanceToActiveCallLinear(iter, fun)) {
+    if (!AdvanceToActiveCallLinear(cx, iter, fun)) {
         args.rval().setNull();
         return true;
     }
@@ -252,7 +252,7 @@ CallerGetterImpl(JSContext *cx, CallArgs args)
 
     // Also return null if this function wasn't found on the stack.
     NonBuiltinScriptFrameIter iter(cx);
-    if (!AdvanceToActiveCallLinear(iter, fun)) {
+    if (!AdvanceToActiveCallLinear(cx, iter, fun)) {
         args.rval().setNull();
         return true;
     }
@@ -268,7 +268,7 @@ CallerGetterImpl(JSContext *cx, CallArgs args)
     // only call site-clonable scripts are for builtin, self-hosted functions
     // (see assertions in js::CloneFunctionAtCallsite).  So the callee can't be
     // a call site clone.
-    JSFunction *maybeClone = iter.callee();
+    JSFunction *maybeClone = iter.callee(cx);
     MOZ_ASSERT(!maybeClone->nonLazyScript()->isCallsiteClone(),
                "non-builtin functions aren't call site-clonable");
 
@@ -329,7 +329,7 @@ CallerSetterImpl(JSContext *cx, CallArgs args)
     // and throwing a TypeError if the resulting caller is strict.
 
     NonBuiltinScriptFrameIter iter(cx);
-    if (!AdvanceToActiveCallLinear(iter, fun))
+    if (!AdvanceToActiveCallLinear(cx, iter, fun))
         return true;
 
     ++iter;
@@ -341,7 +341,7 @@ CallerSetterImpl(JSContext *cx, CallArgs args)
     // only call site-clonable scripts are for builtin, self-hosted functions
     // (see assertions in js::CloneFunctionAtCallsite).  So the callee can't be
     // a call site clone.
-    JSFunction *maybeClone = iter.callee();
+    JSFunction *maybeClone = iter.callee(cx);
     MOZ_ASSERT(!maybeClone->nonLazyScript()->isCallsiteClone(),
                "non-builtin functions aren't call site-clonable");
 
diff --git a/js/src/jsinfer.cpp b/js/src/jsinfer.cpp
index 24dfbff2dcae..834b3669c88d 100644
--- a/js/src/jsinfer.cpp
+++ b/js/src/jsinfer.cpp
@@ -4120,12 +4120,13 @@ TypeNewScript::rollbackPartiallyInitializedObjects(JSContext *cx, TypeObject *ty
     if (!initializerList)
         return;
 
+    RootedFunction function(cx, fun);
     Vector<uint32_t, 32> pcOffsets(cx);
     for (ScriptFrameIter iter(cx); !iter.done(); ++iter) {
         pcOffsets.append(iter.script()->pcToOffset(iter.pc()));
 
         // This frame has no this.
-        if (!iter.isConstructing() || iter.callee() != fun)
+        if (!iter.isConstructing() || iter.matchCallee(cx, function))
             continue;
 
         Value thisv = iter.thisv(cx);
diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 6d86f42ffab4..3109b20dc787 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -3977,7 +3977,10 @@ js_DumpInterpreterFrame(JSContext *cx, InterpreterFrame *start)
 
         if (i.isFunctionFrame()) {
             fprintf(stderr, "callee fun: ");
-            dumpValue(i.calleev());
+            RootedValue v(cx);
+            JSObject *fun = i.callee(cx);
+            v.setObject(*fun);
+            dumpValue(v);
         } else {
             fprintf(stderr, "global frame, no callee");
         }
diff --git a/js/src/vm/ArgumentsObject.cpp b/js/src/vm/ArgumentsObject.cpp
index 1bd7fdebeed3..9b142380de27 100644
--- a/js/src/vm/ArgumentsObject.cpp
+++ b/js/src/vm/ArgumentsObject.cpp
@@ -249,7 +249,7 @@ ArgumentsObject *
 ArgumentsObject::createUnexpected(JSContext *cx, ScriptFrameIter &iter)
 {
     RootedScript script(cx, iter.script());
-    RootedFunction callee(cx, iter.callee());
+    RootedFunction callee(cx, iter.callee(cx));
     CopyScriptFrameIterArgs copy(iter);
     return create(cx, script, callee, iter.numActualArgs(), copy);
 }
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index e9e92c2b9f68..d0879bb5ac70 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -55,7 +55,7 @@ InterpreterFrame::initExecuteFrame(JSContext *cx, JSScript *script, AbstractFram
             MOZ_ASSERT(iter.isFunctionFrame() || iter.isGlobalFrame());
             MOZ_ASSERT(!iter.isAsmJS());
             if (iter.isFunctionFrame()) {
-                callee = iter.callee();
+                callee = iter.callee(cx);
                 flags_ |= FUNCTION;
             } else {
                 flags_ |= GLOBAL;

From efa6d4d97993f27503d7e9493133b63b6593c667 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:30 +0100
Subject: [PATCH 109/183] Bug 1073033 part 2.4 - ScopeChain & Callee: Remove
 new rooting hazards. r=shu

---
 js/src/jit/JitFrameIterator.h | 34 ++++++++++++++++------------------
 js/src/vm/Stack.cpp           |  8 ++++----
 js/src/vm/Stack.h             |  4 ++--
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index c0b43ee44f56..6fd56a63b89f 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -516,18 +516,6 @@ class SnapshotIterator
 
     void traceAllocation(JSTracer *trc);
 
-    void readCommonFrameSlots(Value *scopeChain, Value *rval, MaybeReadFallback &fallback) {
-        if (scopeChain)
-            *scopeChain = maybeRead(fallback);
-        else
-            skip();
-
-        if (rval)
-            *rval = read();
-        else
-            skip();
-    }
-
     template <class Op>
     void readFunctionFrameArgs(Op &op, ArgumentsObject **argsObj, Value *thisv,
                                unsigned start, unsigned end, JSScript *script,
@@ -660,12 +648,21 @@ class InlineFrameIterator
     {
         SnapshotIterator s(si_);
 
-        // Read frame slots common to both function and global frames.
-        Value scopeChainValue;
-        s.readCommonFrameSlots(&scopeChainValue, rval, fallback);
+        // Read the scope chain.
+        if (scopeChain) {
+            MOZ_ASSERT(!fallback.canRecoverResults());
+            JS::AutoSuppressGCAnalysis nogc; // If we cannot recover then we cannot GC.
+            Value scopeChainValue = s.maybeRead(fallback);
+            *scopeChain = computeScopeChain(scopeChainValue, fallback, hasCallObj);
+        } else {
+            s.skip();
+        }
 
-        if (scopeChain)
-            *scopeChain = computeScopeChain(scopeChainValue, hasCallObj, fallback);
+        // Read return value.
+        if (rval)
+            *rval = s.read();
+        else
+            s.skip();
 
         // Read arguments, which only function frames have.
         if (isFunctionFrame()) {
@@ -703,7 +700,8 @@ class InlineFrameIterator
 
                     // Get the overflown arguments
                     MaybeReadFallback unusedFallback;
-                    parent_s.readCommonFrameSlots(nullptr, nullptr, unusedFallback);
+                    parent_s.skip(); // scope chain
+                    parent_s.skip(); // return value
                     parent_s.readFunctionFrameArgs(argOp, nullptr, nullptr,
                                                    nformal, nactual, it.script(),
                                                    fallback);
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index d0879bb5ac70..7b57984d8839 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -30,8 +30,8 @@ using mozilla::PodCopy;
 /*****************************************************************************/
 
 void
-InterpreterFrame::initExecuteFrame(JSContext *cx, JSScript *script, AbstractFramePtr evalInFramePrev,
-                                   const Value &thisv, JSObject &scopeChain, ExecuteType type)
+InterpreterFrame::initExecuteFrame(JSContext *cx, HandleScript script, AbstractFramePtr evalInFramePrev,
+                                   const Value &thisv, HandleObject scopeChain, ExecuteType type)
 {
     /*
      * See encoding of ExecuteType. When GLOBAL isn't set, we are executing a
@@ -79,7 +79,7 @@ InterpreterFrame::initExecuteFrame(JSContext *cx, JSScript *script, AbstractFram
 #endif
     }
 
-    scopeChain_ = &scopeChain;
+    scopeChain_ = scopeChain.get();
     prev_ = nullptr;
     prevpc_ = nullptr;
     prevsp_ = nullptr;
@@ -458,7 +458,7 @@ InterpreterStack::pushExecuteFrame(JSContext *cx, HandleScript script, const Val
 
     InterpreterFrame *fp = reinterpret_cast<InterpreterFrame *>(buffer + 2 * sizeof(Value));
     fp->mark_ = mark;
-    fp->initExecuteFrame(cx, script, evalInFrame, thisv, *scopeChain, type);
+    fp->initExecuteFrame(cx, script, evalInFrame, thisv, scopeChain, type);
     fp->initLocals();
 
     return fp;
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index 74906f9ccef8..8eeef7fc5776 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -385,8 +385,8 @@ class InterpreterFrame
                        InterpreterFrame::Flags flags);
 
     /* Used for global and eval frames. */
-    void initExecuteFrame(JSContext *cx, JSScript *script, AbstractFramePtr prev,
-                          const Value &thisv, JSObject &scopeChain, ExecuteType type);
+    void initExecuteFrame(JSContext *cx, HandleScript script, AbstractFramePtr prev,
+                          const Value &thisv, HandleObject scopeChain, ExecuteType type);
 
   public:
     /*

From e925e5f0da7da4766d89b9fcfe1c72e78b433b12 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:30 +0100
Subject: [PATCH 110/183] Bug 1073033 part 3 - Recover MLambda on bailouts.
 r=shu

---
 js/src/jit-test/tests/ion/recover-lambdas.js | 53 ++++++++++++++++++++
 js/src/jit/IonBuilder.cpp                    |  4 +-
 js/src/jit/MIR.h                             | 19 ++++---
 js/src/jit/Recover.cpp                       | 28 +++++++++++
 js/src/jit/Recover.h                         | 13 +++++
 js/src/jit/shared/CodeGenerator-shared.cpp   | 11 ++++
 6 files changed, 121 insertions(+), 7 deletions(-)
 create mode 100644 js/src/jit-test/tests/ion/recover-lambdas.js

diff --git a/js/src/jit-test/tests/ion/recover-lambdas.js b/js/src/jit-test/tests/ion/recover-lambdas.js
new file mode 100644
index 000000000000..8264567c5fd4
--- /dev/null
+++ b/js/src/jit-test/tests/ion/recover-lambdas.js
@@ -0,0 +1,53 @@
+
+var max = 40;
+setJitCompilerOption("ion.warmup.trigger", max - 10);
+
+// This function is used to escape "g" which is a non-escaped inner function.
+// As it is not escaped within "f", the lambda for "g" would be computed on the
+// bailout path. Resolving the first ".caller" implies that we have to recover
+// the lambda. Resolving the second ".caller" is needed such as we can build the
+// test case without explicitly escaping "g", which would prevent this
+// optimization.
+
+function return_f(i) {
+  if (i != max - 1)
+    return f;
+
+  // return_f.caller == g
+  // return_f.caller.caller == f
+  return return_f.caller.caller;
+}
+
+function f(i) {
+  function g() {
+    return return_f(i);
+  }
+
+  return g();
+}
+
+// This function is used to cause an invalidation after having removed a branch.
+// These functions are used to check if we correctly recover the lambda
+// and its environment during a bailout.
+var uceFault = function (i) {
+    if (i == max - 1)
+        uceFault = function (i) { return true; };
+    return false;
+};
+
+var uceFault_lambdaCall = eval(uneval(uceFault).replace('uceFault', 'uceFault_lambdaCall'));
+function lambdaCall(i) {
+    function g() {
+        return i;
+    }
+
+    if (uceFault_lambdaCall(i) || uceFault_lambdaCall(i))
+        assertEq(g(), i);
+};
+
+
+
+for (var i = 0; i < max; i++) {
+  assertEq(f(i), f);
+  lambdaCall(i);
+}
diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index b0ffcbffaba5..9f18033e1de5 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -10623,7 +10623,9 @@ IonBuilder::jsop_lambda(JSFunction *fun)
     if (fun->isNative() && IsAsmJSModuleNative(fun->native()))
         return abort("asm.js module function");
 
-    MLambda *ins = MLambda::New(alloc(), constraints(), current->scopeChain(), fun);
+    MConstant *cst = MConstant::NewConstraintlessObject(alloc(), fun);
+    current->add(cst);
+    MLambda *ins = MLambda::New(alloc(), constraints(), current->scopeChain(), cst);
     current->add(ins);
     current->push(ins);
 
diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h
index 39ae280f1787..1759ee56d464 100644
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -7040,33 +7040,40 @@ struct LambdaFunctionInfo
 };
 
 class MLambda
-  : public MUnaryInstruction,
+  : public MBinaryInstruction,
     public SingleObjectPolicy::Data
 {
     LambdaFunctionInfo info_;
 
-    MLambda(types::CompilerConstraintList *constraints, MDefinition *scopeChain, JSFunction *fun)
-      : MUnaryInstruction(scopeChain), info_(fun)
+    MLambda(types::CompilerConstraintList *constraints, MDefinition *scopeChain, MConstant *cst)
+      : MBinaryInstruction(scopeChain, cst), info_(&cst->value().toObject().as<JSFunction>())
     {
         setResultType(MIRType_Object);
-        if (!fun->hasSingletonType() && !types::UseNewTypeForClone(fun))
-            setResultTypeSet(MakeSingletonTypeSet(constraints, fun));
+        if (!info().fun->hasSingletonType() && !types::UseNewTypeForClone(info().fun))
+            setResultTypeSet(MakeSingletonTypeSet(constraints, info().fun));
     }
 
   public:
     INSTRUCTION_HEADER(Lambda)
 
     static MLambda *New(TempAllocator &alloc, types::CompilerConstraintList *constraints,
-                        MDefinition *scopeChain, JSFunction *fun)
+                        MDefinition *scopeChain, MConstant *fun)
     {
         return new(alloc) MLambda(constraints, scopeChain, fun);
     }
     MDefinition *scopeChain() const {
         return getOperand(0);
     }
+    MConstant *functionOperand() const {
+        return getOperand(1)->toConstant();
+    }
     const LambdaFunctionInfo &info() const {
         return info_;
     }
+    bool writeRecoverData(CompactBufferWriter &writer) const;
+    bool canRecoverOnBailout() const {
+        return true;
+    }
 };
 
 class MLambdaArrow
diff --git a/js/src/jit/Recover.cpp b/js/src/jit/Recover.cpp
index 0745d18673be..d75db9121958 100644
--- a/js/src/jit/Recover.cpp
+++ b/js/src/jit/Recover.cpp
@@ -1218,6 +1218,34 @@ RCreateThisWithTemplate::recover(JSContext *cx, SnapshotIterator &iter) const
     return true;
 }
 
+bool
+MLambda::writeRecoverData(CompactBufferWriter &writer) const
+{
+    MOZ_ASSERT(canRecoverOnBailout());
+    writer.writeUnsigned(uint32_t(RInstruction::Recover_Lambda));
+    return true;
+}
+
+RLambda::RLambda(CompactBufferReader &reader)
+{
+}
+
+bool
+RLambda::recover(JSContext *cx, SnapshotIterator &iter) const
+{
+    RootedObject scopeChain(cx, &iter.read().toObject());
+    RootedFunction fun(cx, &iter.read().toObject().as<JSFunction>());
+
+    JSObject *resultObject = js::Lambda(cx, fun, scopeChain);
+    if (!resultObject)
+        return false;
+
+    RootedValue result(cx);
+    result.setObject(*resultObject);
+    iter.storeInstructionResult(result);
+    return true;
+}
+
 bool
 MObjectState::writeRecoverData(CompactBufferWriter &writer) const
 {
diff --git a/js/src/jit/Recover.h b/js/src/jit/Recover.h
index 46c80e607b08..b6fcf4e696b7 100644
--- a/js/src/jit/Recover.h
+++ b/js/src/jit/Recover.h
@@ -60,6 +60,7 @@ namespace jit {
     _(NewArray)                                 \
     _(NewDerivedTypedObject)                    \
     _(CreateThisWithTemplate)                   \
+    _(Lambda)                                   \
     _(ObjectState)                              \
     _(ArrayState)
 
@@ -641,6 +642,18 @@ class RCreateThisWithTemplate MOZ_FINAL : public RInstruction
     bool recover(JSContext *cx, SnapshotIterator &iter) const;
 };
 
+class RLambda MOZ_FINAL : public RInstruction
+{
+  public:
+    RINSTRUCTION_HEADER_(Lambda)
+
+    virtual uint32_t numOperands() const {
+        return 2;
+    }
+
+    bool recover(JSContext *cx, SnapshotIterator &iter) const;
+};
+
 class RObjectState MOZ_FINAL : public RInstruction
 {
   private:
diff --git a/js/src/jit/shared/CodeGenerator-shared.cpp b/js/src/jit/shared/CodeGenerator-shared.cpp
index 1096460b0f45..4e606a109672 100644
--- a/js/src/jit/shared/CodeGenerator-shared.cpp
+++ b/js/src/jit/shared/CodeGenerator-shared.cpp
@@ -307,6 +307,17 @@ CodeGeneratorShared::encodeAllocation(LSnapshot *snapshot, MDefinition *mir,
         // This MDefinition is recovered, thus it should be listed in the
         // LRecoverInfo.
         MOZ_ASSERT(it != end && mir == *it);
+
+        // Lambda should have a default value readable for iterating over the
+        // inner frames.
+        if (mir->isLambda()) {
+            MConstant *constant = mir->toLambda()->functionOperand();
+            uint32_t cstIndex;
+            masm.propagateOOM(graph.addConstantToPool(constant->value(), &cstIndex));
+            alloc = RValueAllocation::RecoverInstruction(index, cstIndex);
+            break;
+        }
+
         alloc = RValueAllocation::RecoverInstruction(index);
         break;
       }

From ef2b0d42c31ac5f3d82f270c09d2a9749e2413ee Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:30 +0100
Subject: [PATCH 111/183] Bug 1073033 part 4 - Emulate states of NewCallObject.
 r=h4writer

---
 js/src/jit/MIR.cpp               |  6 ++--
 js/src/jit/Recover.cpp           |  2 +-
 js/src/jit/ScalarReplacement.cpp | 62 ++++++++++++++++++++++++++++----
 3 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp
index a9f7a2657fdc..b79aeb698148 100644
--- a/js/src/jit/MIR.cpp
+++ b/js/src/jit/MIR.cpp
@@ -3404,11 +3404,13 @@ MObjectState::MObjectState(MDefinition *obj)
     // This instruction is only used as a summary for bailout paths.
     setResultType(MIRType_Object);
     setRecoveredOnBailout();
-    PlainObject *templateObject = nullptr;
+    NativeObject *templateObject = nullptr;
     if (obj->isNewObject())
         templateObject = obj->toNewObject()->templateObject();
-    else
+    else if (obj->isCreateThisWithTemplate())
         templateObject = obj->toCreateThisWithTemplate()->templateObject();
+    else
+        templateObject = obj->toNewCallObject()->templateObject();
     numSlots_ = templateObject->slotSpan();
     numFixedSlots_ = templateObject->numFixedSlots();
 }
diff --git a/js/src/jit/Recover.cpp b/js/src/jit/Recover.cpp
index d75db9121958..e269741a3816 100644
--- a/js/src/jit/Recover.cpp
+++ b/js/src/jit/Recover.cpp
@@ -1263,7 +1263,7 @@ RObjectState::RObjectState(CompactBufferReader &reader)
 bool
 RObjectState::recover(JSContext *cx, SnapshotIterator &iter) const
 {
-    RootedPlainObject object(cx, &iter.read().toObject().as<PlainObject>());
+    RootedNativeObject object(cx, &iter.read().toObject().as<NativeObject>());
     MOZ_ASSERT(object->slotSpan() == numSlots());
 
     RootedValue val(cx);
diff --git a/js/src/jit/ScalarReplacement.cpp b/js/src/jit/ScalarReplacement.cpp
index 1c03212ac619..c0218c822a16 100644
--- a/js/src/jit/ScalarReplacement.cpp
+++ b/js/src/jit/ScalarReplacement.cpp
@@ -132,16 +132,21 @@ EmulateStateOf<MemoryView>::run(MemoryView &view)
 // For the moment, this code is dumb as it only supports objects which are not
 // changing shape, and which are known by TI at the object creation.
 static bool
-IsObjectEscaped(MInstruction *ins)
+IsObjectEscaped(MInstruction *ins, JSObject *objDefault = nullptr)
 {
     MOZ_ASSERT(ins->type() == MIRType_Object);
-    MOZ_ASSERT(ins->isNewObject() || ins->isGuardShape() || ins->isCreateThisWithTemplate());
+    MOZ_ASSERT(ins->isNewObject() || ins->isGuardShape() || ins->isCreateThisWithTemplate() ||
+               ins->isNewCallObject() || ins->isFunctionEnvironment());
 
     JSObject *obj = nullptr;
     if (ins->isNewObject())
         obj = ins->toNewObject()->templateObject();
     else if (ins->isCreateThisWithTemplate())
         obj = ins->toCreateThisWithTemplate()->templateObject();
+    else if (ins->isNewCallObject())
+        obj = ins->toNewCallObject()->templateObject();
+    else
+        obj = objDefault;
 
     // Check if the object is escaped. If the object is not the first argument
     // of either a known Store / Load, then we consider it as escaped. This is a
@@ -193,10 +198,37 @@ IsObjectEscaped(MInstruction *ins)
                 JitSpewDef(JitSpew_Escape, "  has a non-matching guard shape\n", guard);
                 return true;
             }
-            if (IsObjectEscaped(def->toInstruction()))
+            if (IsObjectEscaped(def->toInstruction(), obj))
                 return true;
             break;
           }
+
+          case MDefinition::Op_Lambda: {
+            MLambda *lambda = def->toLambda();
+            // The scope chain is not escaped if none of the Lambdas which are
+            // capturing it are escaped.
+            for (MUseIterator i(lambda->usesBegin()); i != lambda->usesEnd(); i++) {
+                MNode *consumer = (*i)->consumer();
+                if (!consumer->isDefinition()) {
+                    // Cannot optimize if it is observable from fun.arguments or others.
+                    if (!consumer->toResumePoint()->isRecoverableOperand(*i)) {
+                        JitSpewDef(JitSpew_Escape, "Observable object cannot be recovered\n", ins);
+                        return true;
+                    }
+                    continue;
+                }
+
+                MDefinition *def = consumer->toDefinition();
+                if (!def->isFunctionEnvironment() || IsObjectEscaped(def->toInstruction(), obj)) {
+                    JitSpewDef(JitSpew_Escape, "Object ", ins);
+                    JitSpewDef(JitSpew_Escape, "  is escaped through a lambda by\n", def);
+                    return true;
+                }
+            }
+
+            break;
+          }
+
           default:
             JitSpewDef(JitSpew_Escape, "Object ", ins);
             JitSpewDef(JitSpew_Escape, "  is escaped by\n", def);
@@ -243,6 +275,7 @@ class ObjectMemoryView : public MDefinitionVisitorDefaultNoop
     void visitStoreSlot(MStoreSlot *ins);
     void visitLoadSlot(MLoadSlot *ins);
     void visitGuardShape(MGuardShape *ins);
+    void visitFunctionEnvironment(MFunctionEnvironment *ins);
 };
 
 const char *ObjectMemoryView::phaseName = "Scalar Replacement of Object";
@@ -383,8 +416,8 @@ ObjectMemoryView::assertSuccess()
 
         // The only remaining uses would be removed by DCE, which will also
         // recover the object on bailouts.
-        MOZ_ASSERT(def->isSlots());
-        MOZ_ASSERT(!def->hasOneUse());
+        MOZ_ASSERT(def->isSlots() || def->isLambda());
+        MOZ_ASSERT(!def->hasDefUses());
     }
 }
 #endif
@@ -477,6 +510,21 @@ ObjectMemoryView::visitGuardShape(MGuardShape *ins)
     ins->block()->discard(ins);
 }
 
+void
+ObjectMemoryView::visitFunctionEnvironment(MFunctionEnvironment *ins)
+{
+    // Skip function environment which are not aliases of the NewCallObject.
+    MDefinition *input = ins->input();
+    if (!input->isLambda() || input->toLambda()->scopeChain() != obj_)
+        return;
+
+    // Replace the function environment by the scope chain of the lambda.
+    ins->replaceAllUsesWith(obj_);
+
+    // Remove original instruction.
+    ins->block()->discard(ins);
+}
+
 static bool
 IndexOf(MDefinition *ins, int32_t *res)
 {
@@ -952,7 +1000,9 @@ ScalarReplacement(MIRGenerator *mir, MIRGraph &graph)
             return false;
 
         for (MInstructionIterator ins = block->begin(); ins != block->end(); ins++) {
-            if ((ins->isNewObject() || ins->isCreateThisWithTemplate()) && !IsObjectEscaped(*ins)) {
+            if ((ins->isNewObject() || ins->isCreateThisWithTemplate() || ins->isNewCallObject()) &&
+                !IsObjectEscaped(*ins))
+            {
                 ObjectMemoryView view(graph.alloc(), *ins);
                 if (!replaceObject.run(view))
                     return false;

From e2ec961ab9f22d450e8b169717fa4e0e25b1d477 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:30 +0100
Subject: [PATCH 112/183] Bug 991720 part 1 - Add Spaghetti stack. r=h4writer.

---
 js/src/jit/InlineList.h | 100 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/js/src/jit/InlineList.h b/js/src/jit/InlineList.h
index 4739ffcb9219..161fe7ec0990 100644
--- a/js/src/jit/InlineList.h
+++ b/js/src/jit/InlineList.h
@@ -544,6 +544,106 @@ class InlineConcatListIterator
     Node *iter;
 };
 
+template <typename T> class InlineSpaghettiStack;
+template <typename T> class InlineSpaghettiStackNode;
+template <typename T> class InlineSpaghettiStackIterator;
+
+template <typename T>
+class InlineSpaghettiStackNode : public InlineForwardListNode<T>
+{
+    typedef InlineForwardListNode<T> Parent;
+
+  public:
+    InlineSpaghettiStackNode() : Parent()
+    { }
+
+    explicit InlineSpaghettiStackNode(InlineSpaghettiStackNode<T> *n)
+      : Parent(n)
+    { }
+
+    InlineSpaghettiStackNode(const InlineSpaghettiStackNode<T> &) MOZ_DELETE;
+
+  protected:
+    friend class InlineSpaghettiStack<T>;
+    friend class InlineSpaghettiStackIterator<T>;
+};
+
+template <typename T>
+class InlineSpaghettiStack : protected InlineSpaghettiStackNode<T>
+{
+    friend class InlineSpaghettiStackIterator<T>;
+
+    typedef InlineSpaghettiStackNode<T> Node;
+
+  public:
+    InlineSpaghettiStack()
+    { }
+
+  public:
+    typedef InlineSpaghettiStackIterator<T> iterator;
+
+  public:
+    iterator begin() const {
+        return iterator(this);
+    }
+    iterator end() const {
+        return iterator(nullptr);
+    }
+
+    void push(Node *t) {
+        MOZ_ASSERT(t->next == nullptr);
+        t->next = this->next;
+        this->next = t;
+    }
+
+    void copy(const InlineSpaghettiStack<T> &stack) {
+        this->next = stack.next;
+    }
+
+    bool empty() const {
+        return this->next == nullptr;
+    }
+};
+
+template <typename T>
+class InlineSpaghettiStackIterator
+{
+  private:
+    friend class InlineSpaghettiStack<T>;
+
+    typedef InlineSpaghettiStackNode<T> Node;
+
+    explicit InlineSpaghettiStackIterator<T>(const InlineSpaghettiStack<T> *owner)
+      : iter(owner ? static_cast<Node *>(owner->next) : nullptr)
+    { }
+
+  public:
+    InlineSpaghettiStackIterator<T> & operator ++() {
+        iter = static_cast<Node *>(iter->next);
+        return *this;
+    }
+    InlineSpaghettiStackIterator<T> operator ++(int) {
+        InlineSpaghettiStackIterator<T> old(*this);
+        operator++();
+        return old;
+    }
+    T *operator *() const {
+        return static_cast<T *>(iter);
+    }
+    T *operator ->() const {
+        return static_cast<T *>(iter);
+    }
+    bool operator !=(const InlineSpaghettiStackIterator<T> &where) const {
+        return iter != where.iter;
+    }
+    bool operator ==(const InlineSpaghettiStackIterator<T> &where) const {
+        return iter == where.iter;
+    }
+
+  private:
+    Node *iter;
+};
+
 } // namespace js
 
 #endif /* jit_InlineList_h */

From 669929b8ef1b9a420bb8ff49cfe68cd3ceeab4e1 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:31 +0100
Subject: [PATCH 113/183] Bug 991720 part 2 - Add a spaghetti stack of stores
 on resume points. r=h4writer

---
 js/src/jit/IonBuilder.cpp   | 14 +++---
 js/src/jit/LIR.cpp          |  7 +++
 js/src/jit/LoopUnroller.cpp |  4 +-
 js/src/jit/MIR.cpp          | 91 ++++++++++++++++++++++++++++++++++---
 js/src/jit/MIR.h            | 88 ++++++++++++++++++-----------------
 js/src/jit/MIRGraph.cpp     |  9 ++--
 js/src/jit/MIRGraph.h       |  2 +-
 7 files changed, 152 insertions(+), 63 deletions(-)

diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp
index 9f18033e1de5..13e01f190b65 100644
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -451,7 +451,7 @@ IonBuilder::analyzeNewLoopTypes(MBasicBlock *entry, jsbytecode *start, jsbytecod
             // already discarded their operands.
             if (!oldEntry->isDead()) {
                 MResumePoint *oldEntryRp = oldEntry->entryResumePoint();
-                size_t stackDepth = oldEntryRp->numOperands();
+                size_t stackDepth = oldEntryRp->stackDepth();
                 for (size_t slot = 0; slot < stackDepth; slot++) {
                     MDefinition *oldDef = oldEntryRp->getOperand(slot);
                     if (!oldDef->isPhi()) {
@@ -901,11 +901,11 @@ IonBuilder::buildInline(IonBuilder *callerBuilder, MResumePoint *callerResumePoi
 
     initLocals();
 
-    JitSpew(JitSpew_Inlining, "Inline entry block MResumePoint %p, %u operands",
-            (void *) current->entryResumePoint(), current->entryResumePoint()->numOperands());
+    JitSpew(JitSpew_Inlining, "Inline entry block MResumePoint %p, %u stack slots",
+            (void *) current->entryResumePoint(), current->entryResumePoint()->stackDepth());
 
     // +2 for the scope chain and |this|, maybe another +1 for arguments object slot.
-    MOZ_ASSERT(current->entryResumePoint()->numOperands() == info().totalSlots());
+    MOZ_ASSERT(current->entryResumePoint()->stackDepth() == info().totalSlots());
 
     if (script_->argumentsHasVarBinding()) {
         lazyArguments_ = MConstant::New(alloc(), MagicValue(JS_OPTIMIZED_ARGUMENTS));
@@ -1208,7 +1208,7 @@ IonBuilder::maybeAddOsrTypeBarriers()
     MOZ_ASSERT(preheader->getPredecessor(OSR_PHI_POSITION) == osrBlock);
 
     MResumePoint *headerRp = header->entryResumePoint();
-    size_t stackDepth = headerRp->numOperands();
+    size_t stackDepth = headerRp->stackDepth();
     MOZ_ASSERT(stackDepth == osrBlock->stackDepth());
     for (uint32_t slot = info().startArgSlot(); slot < stackDepth; slot++) {
         // Aliased slots are never accessed, since they need to go through
@@ -4910,7 +4910,7 @@ IonBuilder::inlineTypeObjectFallback(CallInfo &callInfo, MBasicBlock *dispatchBl
     if (!preCallResumePoint)
         return false;
 
-    DebugOnly<size_t> preCallFuncIndex = preCallResumePoint->numOperands() - callInfo.numFormals();
+    DebugOnly<size_t> preCallFuncIndex = preCallResumePoint->stackDepth() - callInfo.numFormals();
     MOZ_ASSERT(preCallResumePoint->getOperand(preCallFuncIndex) == fallbackInfo.fun());
 
     // In the dispatch block, replace the function's slot entry with Undefined.
@@ -5075,7 +5075,7 @@ IonBuilder::inlineCalls(CallInfo &callInfo, ObjectVector &targets,
         dispatchBlock->add(funcDef);
 
         // Use the MConstant in the inline resume point and on stack.
-        int funIndex = inlineBlock->entryResumePoint()->numOperands() - callInfo.numFormals();
+        int funIndex = inlineBlock->entryResumePoint()->stackDepth() - callInfo.numFormals();
         inlineBlock->entryResumePoint()->replaceOperand(funIndex, funcDef);
         inlineBlock->rewriteSlot(funIndex, funcDef);
 
diff --git a/js/src/jit/LIR.cpp b/js/src/jit/LIR.cpp
index d4b62c02bb44..1d454232664c 100644
--- a/js/src/jit/LIR.cpp
+++ b/js/src/jit/LIR.cpp
@@ -223,6 +223,7 @@ LRecoverInfo::appendDefinition(MDefinition *def)
 {
     MOZ_ASSERT(def->isRecoveredOnBailout());
     def->setInWorklist();
+
     if (!appendOperands(def))
         return false;
     return instructions_.append(def);
@@ -231,6 +232,12 @@ LRecoverInfo::appendDefinition(MDefinition *def)
 bool
 LRecoverInfo::appendResumePoint(MResumePoint *rp)
 {
+    // Stores should be recovered first.
+    for (auto iter(rp->storesBegin()), end(rp->storesEnd()); iter != end; ++iter) {
+        if (!appendDefinition(iter->operand))
+            return false;
+    }
+
     if (rp->caller() && !appendResumePoint(rp->caller()))
         return false;
 
diff --git a/js/src/jit/LoopUnroller.cpp b/js/src/jit/LoopUnroller.cpp
index a139ef6921be..a6e1599a6eaa 100644
--- a/js/src/jit/LoopUnroller.cpp
+++ b/js/src/jit/LoopUnroller.cpp
@@ -101,14 +101,14 @@ MResumePoint *
 LoopUnroller::makeReplacementResumePoint(MBasicBlock *block, MResumePoint *rp)
 {
     MDefinitionVector inputs(alloc);
-    for (size_t i = 0; i < rp->stackDepth(); i++) {
+    for (size_t i = 0; i < rp->numOperands(); i++) {
         MDefinition *old = rp->getOperand(i);
         MDefinition *replacement = old->isUnused() ? old : getReplacementDefinition(old);
         if (!inputs.append(replacement))
             CrashAtUnhandlableOOM("LoopUnroller::makeReplacementResumePoint");
     }
 
-    MResumePoint *clone = MResumePoint::New(alloc, block, rp->pc(), rp->caller(), rp->mode(), inputs);
+    MResumePoint *clone = MResumePoint::New(alloc, block, rp, inputs);
     if (!clone)
         CrashAtUnhandlableOOM("LoopUnroller::makeReplacementResumePoint");
 
diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp
index b79aeb698148..ca19104a0798 100644
--- a/js/src/jit/MIR.cpp
+++ b/js/src/jit/MIR.cpp
@@ -2722,13 +2722,18 @@ MResumePoint::New(TempAllocator &alloc, MBasicBlock *block, jsbytecode *pc, MRes
 }
 
 MResumePoint *
-MResumePoint::New(TempAllocator &alloc, MBasicBlock *block, jsbytecode *pc, MResumePoint *parent,
-                  Mode mode, const MDefinitionVector &operands)
+MResumePoint::New(TempAllocator &alloc, MBasicBlock *block, MResumePoint *model,
+                  const MDefinitionVector &operands)
 {
-    MResumePoint *resume = new(alloc) MResumePoint(block, pc, parent, mode);
+    MResumePoint *resume = new(alloc) MResumePoint(block, model->pc(), model->caller(), model->mode());
 
-    if (!resume->operands_.init(alloc, operands.length()))
+    // Allocate the same number of operands as the original resume point, and
+    // copy operands from the operands vector and not the not from the current
+    // block stack.
+    if (!resume->operands_.init(alloc, model->numAllocatedOperands()))
         return nullptr;
+
+    // Copy the operands.
     for (size_t i = 0; i < operands.length(); i++)
         resume->initOperand(i, operands[i]);
 
@@ -2742,9 +2747,11 @@ MResumePoint::Copy(TempAllocator &alloc, MResumePoint *src)
                                                    src->caller(), src->mode());
     // Copy the operands from the original resume point, and not from the
     // current block stack.
-    if (!resume->operands_.init(alloc, src->stackDepth()))
+    if (!resume->operands_.init(alloc, src->numAllocatedOperands()))
         return nullptr;
-    for (size_t i = 0; i < resume->stackDepth(); i++)
+
+    // Copy the operands.
+    for (size_t i = 0; i < resume->numOperands(); i++)
         resume->initOperand(i, src->getOperand(i));
     return resume;
 }
@@ -2760,7 +2767,8 @@ MResumePoint::MResumePoint(MBasicBlock *block, jsbytecode *pc, MResumePoint *cal
     block->addResumePoint(this);
 }
 
-bool MResumePoint::init(TempAllocator &alloc)
+bool
+MResumePoint::init(TempAllocator &alloc)
 {
     return operands_.init(alloc, block()->stackDepth());
 }
@@ -2773,6 +2781,29 @@ MResumePoint::inherit(MBasicBlock *block)
         initOperand(i, block->getSlot(i));
 }
 
+void
+MResumePoint::addStore(TempAllocator &alloc, MDefinition *store, const MResumePoint *cache)
+{
+    MOZ_ASSERT(block()->outerResumePoint() != this);
+    MOZ_ASSERT_IF(cache, !cache->stores_.empty());
+
+    if (cache && cache->stores_.begin()->operand == store) {
+        // If the last resume point had the same side-effect stack, then we can
+        // reuse the current side effect without cloning it. This is a simple
+        // way to share common context by making a spaghetti stack.
+        if (++cache->stores_.begin() == stores_.begin()) {
+            stores_.copy(cache->stores_);
+            return;
+        }
+    }
+
+    // Ensure that the store would not be deleted by DCE.
+    MOZ_ASSERT(store->isEffectful());
+
+    MStoreToRecover *top = new(alloc) MStoreToRecover(store);
+    stores_.push(top);
+}
+
 void
 MResumePoint::dump(FILE *fp) const
 {
@@ -3420,6 +3451,7 @@ MObjectState::init(TempAllocator &alloc, MDefinition *obj)
 {
     if (!MVariadicInstruction::init(alloc, numSlots() + 1))
         return false;
+    // +1, for the Object.
     initOperand(0, obj);
     return true;
 }
@@ -3447,6 +3479,51 @@ MObjectState::Copy(TempAllocator &alloc, MObjectState *state)
     return res;
 }
 
+MArrayState::MArrayState(MDefinition *arr)
+{
+    // This instruction is only used as a summary for bailout paths.
+    setResultType(MIRType_Object);
+    setRecoveredOnBailout();
+    numElements_ = arr->toNewArray()->count();
+}
+
+bool
+MArrayState::init(TempAllocator &alloc, MDefinition *obj, MDefinition *len)
+{
+    if (!MVariadicInstruction::init(alloc, numElements() + 2))
+        return false;
+    // +1, for the Array object.
+    initOperand(0, obj);
+    // +1, for the length value of the array.
+    initOperand(1, len);
+    return true;
+}
+
+MArrayState *
+MArrayState::New(TempAllocator &alloc, MDefinition *arr, MDefinition *undefinedVal,
+                 MDefinition *initLength)
+{
+    MArrayState *res = new(alloc) MArrayState(arr);
+    if (!res || !res->init(alloc, arr, initLength))
+        return nullptr;
+    for (size_t i = 0; i < res->numElements(); i++)
+        res->initElement(i, undefinedVal);
+    return res;
+}
+
+MArrayState *
+MArrayState::Copy(TempAllocator &alloc, MArrayState *state)
+{
+    MDefinition *arr = state->array();
+    MDefinition *len = state->initializedLength();
+    MArrayState *res = new(alloc) MArrayState(arr);
+    if (!res || !res->init(alloc, arr, len))
+        return nullptr;
+    for (size_t i = 0; i < res->numElements(); i++)
+        res->initElement(i, state->getElement(i));
+    return res;
+}
+
 bool
 MNewArray::shouldUseVM() const
 {
diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h
index 1759ee56d464..7810f9cff6cf 100644
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -2999,21 +2999,9 @@ class MArrayState
   private:
     uint32_t numElements_;
 
-    explicit MArrayState(MDefinition *arr)
-    {
-        // This instruction is only used as a summary for bailout paths.
-        setResultType(MIRType_Object);
-        setRecoveredOnBailout();
-        numElements_ = arr->toNewArray()->count();
-    }
+    explicit MArrayState(MDefinition *arr);
 
-    bool init(TempAllocator &alloc, MDefinition *obj, MDefinition *len) {
-        if (!MVariadicInstruction::init(alloc, numElements() + 2))
-            return false;
-        initOperand(0, obj);
-        initOperand(1, len);
-        return true;
-    }
+    bool init(TempAllocator &alloc, MDefinition *obj, MDefinition *len);
 
     void initElement(uint32_t index, MDefinition *def) {
         initOperand(index + 2, def);
@@ -3023,27 +3011,8 @@ class MArrayState
     INSTRUCTION_HEADER(ArrayState)
 
     static MArrayState *New(TempAllocator &alloc, MDefinition *arr, MDefinition *undefinedVal,
-                            MDefinition *initLength)
-    {
-        MArrayState *res = new(alloc) MArrayState(arr);
-        if (!res || !res->init(alloc, arr, initLength))
-            return nullptr;
-        for (size_t i = 0; i < res->numElements(); i++)
-            res->initElement(i, undefinedVal);
-        return res;
-    }
-
-    static MArrayState *Copy(TempAllocator &alloc, MArrayState *state)
-    {
-        MDefinition *arr = state->array();
-        MDefinition *len = state->initializedLength();
-        MArrayState *res = new(alloc) MArrayState(arr);
-        if (!res || !res->init(alloc, arr, len))
-            return nullptr;
-        for (size_t i = 0; i < res->numElements(); i++)
-            res->initElement(i, state->getElement(i));
-        return res;
-    }
+                            MDefinition *initLength);
+    static MArrayState *Copy(TempAllocator &alloc, MArrayState *state);
 
     MDefinition *array() const {
         return getOperand(0);
@@ -11695,6 +11664,19 @@ class MNewDenseArrayPar : public MBinaryInstruction
     }
 };
 
+// This is an element of a spaghetti stack which is used to represent the memory
+// context which has to be restored in case of a bailout.
+struct MStoreToRecover : public TempObject, public InlineSpaghettiStackNode<MStoreToRecover>
+{
+    MDefinition *operand;
+
+    explicit MStoreToRecover(MDefinition *operand)
+      : operand(operand)
+    { }
+};
+
+typedef InlineSpaghettiStack<MStoreToRecover> MStoresToRecoverList;
+
 // A resume point contains the information needed to reconstruct the Baseline
 // state from a position in the JIT. See the big comment near resumeAfter() in
 // IonBuilder.cpp.
@@ -11715,7 +11697,14 @@ class MResumePoint MOZ_FINAL :
     friend class MBasicBlock;
     friend void AssertBasicGraphCoherency(MIRGraph &graph);
 
+    // List of stack slots needed to reconstruct the frame corresponding to the
+    // function which is compiled by IonBuilder.
     FixedList<MUse> operands_;
+
+    // List of stores needed to reconstruct the content of objects which are
+    // emulated by EmulateStateOf variants.
+    MStoresToRecoverList stores_;
+
     jsbytecode *pc_;
     MResumePoint *caller_;
     MInstruction *instruction_;
@@ -11744,17 +11733,22 @@ class MResumePoint MOZ_FINAL :
   public:
     static MResumePoint *New(TempAllocator &alloc, MBasicBlock *block, jsbytecode *pc,
                              MResumePoint *parent, Mode mode);
-    static MResumePoint *New(TempAllocator &alloc, MBasicBlock *block, jsbytecode *pc,
-                             MResumePoint *parent, Mode mode,
+    static MResumePoint *New(TempAllocator &alloc, MBasicBlock *block, MResumePoint *model,
                              const MDefinitionVector &operands);
     static MResumePoint *Copy(TempAllocator &alloc, MResumePoint *src);
 
     MNode::Kind kind() const {
         return MNode::ResumePoint;
     }
-    size_t numOperands() const {
+    size_t numAllocatedOperands() const {
         return operands_.length();
     }
+    uint32_t stackDepth() const {
+        return numAllocatedOperands();
+    }
+    size_t numOperands() const {
+        return numAllocatedOperands();
+    }
     size_t indexOf(const MUse *u) const MOZ_FINAL MOZ_OVERRIDE {
         MOZ_ASSERT(u >= &operands_[0]);
         MOZ_ASSERT(u <= &operands_[numOperands() - 1]);
@@ -11778,9 +11772,6 @@ class MResumePoint MOZ_FINAL :
     jsbytecode *pc() const {
         return pc_;
     }
-    uint32_t stackDepth() const {
-        return operands_.length();
-    }
     MResumePoint *caller() const {
         return caller_;
     }
@@ -11814,7 +11805,7 @@ class MResumePoint MOZ_FINAL :
     }
 
     void releaseUses() {
-        for (size_t i = 0; i < operands_.length(); i++) {
+        for (size_t i = 0, e = numOperands(); i < e; i++) {
             if (operands_[i].hasProducer())
                 operands_[i].releaseProducer();
         }
@@ -11822,6 +11813,19 @@ class MResumePoint MOZ_FINAL :
 
     bool writeRecoverData(CompactBufferWriter &writer) const;
 
+    // Register a store instruction on the current resume point. This
+    // instruction would be recovered when we are bailing out. The |cache|
+    // argument can be any resume point, it is used to share memory if we are
+    // doing the same modification.
+    void addStore(TempAllocator &alloc, MDefinition *store, const MResumePoint *cache = nullptr);
+
+    MStoresToRecoverList::iterator storesBegin() const {
+        return stores_.begin();
+    }
+    MStoresToRecoverList::iterator storesEnd() const {
+        return stores_.end();
+    }
+
     virtual void dump(FILE *fp) const;
     virtual void dump() const;
 };
diff --git a/js/src/jit/MIRGraph.cpp b/js/src/jit/MIRGraph.cpp
index 6273d51843ee..b78f8125dc8e 100644
--- a/js/src/jit/MIRGraph.cpp
+++ b/js/src/jit/MIRGraph.cpp
@@ -439,7 +439,8 @@ MBasicBlock::inherit(TempAllocator &alloc, BytecodeAnalysis *analysis, MBasicBlo
     MResumePoint *callerResumePoint = pred ? pred->callerResumePoint() : nullptr;
 
     // Create a resume point using our initial stack state.
-    entryResumePoint_ = new(alloc) MResumePoint(this, pc(), callerResumePoint, MResumePoint::ResumeAt);
+    entryResumePoint_ = new(alloc) MResumePoint(this, pc(), callerResumePoint,
+                                                MResumePoint::ResumeAt);
     if (!entryResumePoint_->init(alloc))
         return false;
 
@@ -496,7 +497,7 @@ bool
 MBasicBlock::inheritResumePoint(MBasicBlock *pred)
 {
     // Copy slots from the resume point.
-    stackPosition_ = entryResumePoint_->numOperands();
+    stackPosition_ = entryResumePoint_->stackDepth();
     for (uint32_t i = 0; i < stackPosition_; i++)
         slots_[i] = entryResumePoint_->getOperand(i);
 
@@ -1404,7 +1405,7 @@ void
 MBasicBlock::inheritPhis(MBasicBlock *header)
 {
     MResumePoint *headerRp = header->entryResumePoint();
-    size_t stackDepth = headerRp->numOperands();
+    size_t stackDepth = headerRp->stackDepth();
     for (size_t slot = 0; slot < stackDepth; slot++) {
         MDefinition *exitDef = getSlot(slot);
         MDefinition *loopDef = headerRp->getOperand(slot);
@@ -1437,7 +1438,7 @@ MBasicBlock::inheritPhisFromBackedge(MBasicBlock *backedge, bool *hadTypeChange)
     // We must be a pending loop header
     MOZ_ASSERT(kind_ == PENDING_LOOP_HEADER);
 
-    size_t stackDepth = entryResumePoint()->numOperands();
+    size_t stackDepth = entryResumePoint()->stackDepth();
     for (size_t slot = 0; slot < stackDepth; slot++) {
         // Get the value stack-slot of the back edge.
         MDefinition *exitDef = backedge->getSlot(slot);
diff --git a/js/src/jit/MIRGraph.h b/js/src/jit/MIRGraph.h
index 1aa2b9b46963..57f2c0a10eb3 100644
--- a/js/src/jit/MIRGraph.h
+++ b/js/src/jit/MIRGraph.h
@@ -553,7 +553,7 @@ class MBasicBlock : public TempObject, public InlineListNode<MBasicBlock>
         entryResumePoint()->setCaller(caller);
     }
     size_t numEntrySlots() const {
-        return entryResumePoint()->numOperands();
+        return entryResumePoint()->stackDepth();
     }
     MDefinition *getEntrySlot(size_t i) const {
         MOZ_ASSERT(i < numEntrySlots());

From b2cbcdb3ff10b3bf2f02db1d0d5ef806384aa5b4 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:31 +0100
Subject: [PATCH 114/183] Bug 991720 part 3 - Enforce recovery of stores before
 reading object values. r=h4writer

---
 js/src/jit/JitFrameIterator.h              |  3 +++
 js/src/jit/JitFrames.cpp                   |  8 ++++++++
 js/src/jit/MIR.h                           |  9 +++++++++
 js/src/jit/Snapshots.cpp                   |  2 +-
 js/src/jit/Snapshots.h                     | 21 ++++++++++++++++++++-
 js/src/jit/shared/CodeGenerator-shared.cpp |  6 ++++++
 6 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/js/src/jit/JitFrameIterator.h b/js/src/jit/JitFrameIterator.h
index 6fd56a63b89f..1a9a1e4fa2b3 100644
--- a/js/src/jit/JitFrameIterator.h
+++ b/js/src/jit/JitFrameIterator.h
@@ -393,6 +393,9 @@ class SnapshotIterator
     bool hasInstructionResult(uint32_t index) const {
         return instructionResults_;
     }
+    bool hasInstructionResults() const {
+        return instructionResults_;
+    }
     Value fromInstructionResult(uint32_t index) const;
 
     Value allocationValue(const RValueAllocation &a, ReadMethod rm = RM_Normal);
diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index ab2b66f563a0..f02a555d576e 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -1751,6 +1751,14 @@ FromTypedPayload(JSValueType type, uintptr_t payload)
 bool
 SnapshotIterator::allocationReadable(const RValueAllocation &alloc, ReadMethod rm)
 {
+    // If we have to recover stores, and if we are not interested in the
+    // default value of the instruction, then we have to check if the recover
+    // instruction results are available.
+    if (alloc.needSideEffect() && !(rm & RM_AlwaysDefault)) {
+        if (!hasInstructionResults())
+            return false;
+    }
+
     switch (alloc.mode()) {
       case RValueAllocation::DOUBLE_REG:
         return hasRegister(alloc.fpuReg());
diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h
index 7810f9cff6cf..909e114f04a0 100644
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -101,6 +101,15 @@ MIRType MIRTypeFromValue(const js::Value &vp)
      */                                                                         \
     _(RecoveredOnBailout)                                                       \
                                                                                 \
+    /* Some instructions might represent an object, but the memory of these
+     * objects might be incomplete if we have not recovered all the stores which
+     * were supposed to happen before. This flag is used to annotate
+     * instructions which might return a pointer to a memory area which is not
+     * yet fully initialized. This flag is used to ensure that stores are
+     * executed before returning the value.
+     */                                                                         \
+    _(IncompleteObject)                                                         \
+                                                                                \
     /* The current instruction got discarded from the MIR Graph. This is useful
      * when we want to iterate over resume points and instructions, while
      * handling instructions which are discarded without reporting to the
diff --git a/js/src/jit/Snapshots.cpp b/js/src/jit/Snapshots.cpp
index de4aeb54adc8..4cc97dc609f9 100644
--- a/js/src/jit/Snapshots.cpp
+++ b/js/src/jit/Snapshots.cpp
@@ -313,7 +313,7 @@ RValueAllocation
 RValueAllocation::read(CompactBufferReader &reader)
 {
     uint8_t mode = reader.readByte();
-    const Layout &layout = layoutFromMode(Mode(mode));
+    const Layout &layout = layoutFromMode(Mode(mode & MODE_MASK));
     Payload arg1, arg2;
 
     readPayload(reader, layout.type1, &mode, &arg1);
diff --git a/js/src/jit/Snapshots.h b/js/src/jit/Snapshots.h
index 0853c4d9cf36..e6124276c1c9 100644
--- a/js/src/jit/Snapshots.h
+++ b/js/src/jit/Snapshots.h
@@ -69,6 +69,17 @@ class RValueAllocation
         TYPED_STACK_MAX     = 0x2f,
         TYPED_STACK = TYPED_STACK_MIN,
 
+        // This mask can be used with any other valid mode. When this flag is
+        // set on the mode, this inform the snapshot iterator that even if the
+        // allocation is readable, the content of if might be incomplete unless
+        // all side-effects are executed.
+        RECOVER_SIDE_EFFECT_MASK = 0x80,
+
+        // This mask represents the set of bits which can be used to encode a
+        // value in a snapshot. The mode is used to determine how to interpret
+        // the union of values and how to pack the value in memory.
+        MODE_MASK           = 0x17f,
+
         INVALID = 0x100,
     };
 
@@ -269,6 +280,11 @@ class RValueAllocation
                                 payloadOfIndex(cstIndex));
     }
 
+    void setNeedSideEffect() {
+        MOZ_ASSERT(!needSideEffect() && mode_ != INVALID);
+        mode_ = Mode(mode_ | RECOVER_SIDE_EFFECT_MASK);
+    }
+
     void writeHeader(CompactBufferWriter &writer, JSValueType type, uint32_t regCode) const;
   public:
     static RValueAllocation read(CompactBufferReader &reader);
@@ -276,7 +292,10 @@ class RValueAllocation
 
   public:
     Mode mode() const {
-        return mode_;
+        return Mode(mode_ & MODE_MASK);
+    }
+    bool needSideEffect() const {
+        return mode_ & RECOVER_SIDE_EFFECT_MASK;
     }
 
     uint32_t index() const {
diff --git a/js/src/jit/shared/CodeGenerator-shared.cpp b/js/src/jit/shared/CodeGenerator-shared.cpp
index 4e606a109672..8f2f0bff4fc1 100644
--- a/js/src/jit/shared/CodeGenerator-shared.cpp
+++ b/js/src/jit/shared/CodeGenerator-shared.cpp
@@ -399,6 +399,12 @@ CodeGeneratorShared::encodeAllocation(LSnapshot *snapshot, MDefinition *mir,
       }
     }
 
+    // This set an extra bit as part of the RValueAllocation, such that we know
+    // that recover instruction have to be executed without wrapping the
+    // instruction in a no-op recover instruction.
+    if (mir->isIncompleteObject())
+        alloc.setNeedSideEffect();
+
     snapshots_.add(alloc);
     *allocIndex += mir->isRecoveredOnBailout() ? 0 : 1;
 }

From d004eabe7cd9393c18daaed31ccbaa83bdc2f0c1 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 15:28:31 +0100
Subject: [PATCH 115/183] Bug 991720 part 4 - Scalar replacement registers the
 state instead of replacing resume points operands. r=h4writer

---
 js/src/jit/ScalarReplacement.cpp | 118 ++++++++++++++++++-------------
 1 file changed, 70 insertions(+), 48 deletions(-)

diff --git a/js/src/jit/ScalarReplacement.cpp b/js/src/jit/ScalarReplacement.cpp
index c0218c822a16..2900fc54f0d4 100644
--- a/js/src/jit/ScalarReplacement.cpp
+++ b/js/src/jit/ScalarReplacement.cpp
@@ -17,42 +17,6 @@
 namespace js {
 namespace jit {
 
-// Scan resume point operands in search of a local variable which captures the
-// current object, and replace it by the current object with its state.
-static void
-ReplaceResumePointOperands(MResumePoint *resumePoint, MDefinition *object, MDefinition *state)
-{
-    // Note: This function iterates over the caller as well, this is wrong
-    // because if the object appears in one of the caller, we want to correctly
-    // recover the object value from any block having the same caller.  In
-    // practice, this is correct for 2 reasons:
-    //
-    // 1. We replace resume point operands in RPO, this implies that the caller
-    // would first be updated when we update the resume point of entry block of
-    // the inner function.  This implies that the object state would only hold
-    // valid data for the caller resume point.
-    //
-    // 2. The caller resume point will have no reference of the new object
-    // allocation if the object allocation is done within the callee.
-    //
-    // A side-effect of this implementation is that we would be restoring and
-    // keeping tracks of the content of the object at the entry of the function,
-    // in addition to the content of the object within the function.
-    for (MResumePoint *rp = resumePoint; rp; rp = rp->caller()) {
-        for (size_t op = 0; op < rp->numOperands(); op++) {
-            if (rp->getOperand(op) == object) {
-                rp->replaceOperand(op, state);
-
-                // This assertion verifies the comment which is above still
-                // holds.  Note, this is not true if rp == resumePoint, as the
-                // object state can be a new one created at the beginning of the
-                // block to keep track of the merge state.
-                MOZ_ASSERT_IF(rp != resumePoint, state->block()->dominates(rp->block()));
-            }
-        }
-    }
-}
-
 template <typename MemoryView>
 class EmulateStateOf
 {
@@ -253,6 +217,9 @@ class ObjectMemoryView : public MDefinitionVisitorDefaultNoop
     MBasicBlock *startBlock_;
     BlockState *state_;
 
+    // Used to improve the memory usage by sharing common modification.
+    const MResumePoint *lastResumePoint_;
+
   public:
     ObjectMemoryView(TempAllocator &alloc, MInstruction *obj);
 
@@ -270,12 +237,14 @@ class ObjectMemoryView : public MDefinitionVisitorDefaultNoop
 
   public:
     void visitResumePoint(MResumePoint *rp);
+    void visitObjectState(MObjectState *ins);
     void visitStoreFixedSlot(MStoreFixedSlot *ins);
     void visitLoadFixedSlot(MLoadFixedSlot *ins);
     void visitStoreSlot(MStoreSlot *ins);
     void visitLoadSlot(MLoadSlot *ins);
     void visitGuardShape(MGuardShape *ins);
     void visitFunctionEnvironment(MFunctionEnvironment *ins);
+    void visitLambda(MLambda *ins);
 };
 
 const char *ObjectMemoryView::phaseName = "Scalar Replacement of Object";
@@ -283,9 +252,14 @@ const char *ObjectMemoryView::phaseName = "Scalar Replacement of Object";
 ObjectMemoryView::ObjectMemoryView(TempAllocator &alloc, MInstruction *obj)
   : alloc_(alloc),
     obj_(obj),
-    startBlock_(obj->block())
+    startBlock_(obj->block()),
+    state_(nullptr),
+    lastResumePoint_(nullptr)
 {
-    // Annoatte the instruction such that we do not replace it by a
+    // Annotate snapshots RValue such that we recover the store first.
+    obj_->setIncompleteObject();
+
+    // Annotate the instruction such that we do not replace it by a
     // Magic(JS_OPTIMIZED_OUT) in case of removed uses.
     obj_->setImplicitlyUsedUnchecked();
 }
@@ -307,6 +281,9 @@ ObjectMemoryView::initStartingState(BlockState **pState)
     BlockState *state = BlockState::New(alloc_, obj_, undefinedVal_);
     startBlock_->insertAfter(obj_, state);
 
+    // Hold out of resume point until it is visited.
+    state->setInWorklist();
+
     *pState = state;
     return true;
 }
@@ -369,7 +346,7 @@ ObjectMemoryView::mergeIntoSuccessorState(MBasicBlock *curr, MBasicBlock *succ,
         // of the successor block, after all the phi nodes.  Note that it
         // would be captured by the entry resume point of the successor
         // block.
-        succ->insertBefore(*succ->begin(), succState);
+        succ->insertBefore(succ->safeInsertTop(), succState);
         *pSuccState = succState;
     }
 
@@ -405,14 +382,13 @@ ObjectMemoryView::assertSuccess()
 {
     for (MUseIterator i(obj_->usesBegin()); i != obj_->usesEnd(); i++) {
         MNode *ins = (*i)->consumer();
+        MDefinition *def = nullptr;
 
         // Resume points have been replaced by the object state.
-        MOZ_ASSERT(!ins->isResumePoint());
-
-        MDefinition *def = ins->toDefinition();
-
-        if (def->isRecoveredOnBailout())
+        if (ins->isResumePoint() || (def = ins->toDefinition())->isRecoveredOnBailout()) {
+            MOZ_ASSERT(obj_->isIncompleteObject());
             continue;
+        }
 
         // The only remaining uses would be removed by DCE, which will also
         // recover the object on bailouts.
@@ -425,7 +401,19 @@ ObjectMemoryView::assertSuccess()
 void
 ObjectMemoryView::visitResumePoint(MResumePoint *rp)
 {
-    ReplaceResumePointOperands(rp, obj_, state_);
+    // As long as the MObjectState is not yet seen next to the allocation, we do
+    // not patch the resume point to recover the side effects.
+    if (!state_->isInWorklist()) {
+        rp->addStore(alloc_, state_, lastResumePoint_);
+        lastResumePoint_ = rp;
+    }
+}
+
+void
+ObjectMemoryView::visitObjectState(MObjectState *ins)
+{
+    if (ins->isInWorklist())
+        ins->setNotInWorklist();
 }
 
 void
@@ -525,6 +513,17 @@ ObjectMemoryView::visitFunctionEnvironment(MFunctionEnvironment *ins)
     ins->block()->discard(ins);
 }
 
+void
+ObjectMemoryView::visitLambda(MLambda *ins)
+{
+    if (ins->scopeChain() != obj_)
+        return;
+
+    // In order to recover the lambda we need to recover the scope chain, as the
+    // lambda is holding it.
+    ins->setIncompleteObject();
+}
+
 static bool
 IndexOf(MDefinition *ins, int32_t *res)
 {
@@ -712,6 +711,9 @@ class ArrayMemoryView : public MDefinitionVisitorDefaultNoop
     MBasicBlock *startBlock_;
     BlockState *state_;
 
+    // Used to improve the memory usage by sharing common modification.
+    const MResumePoint *lastResumePoint_;
+
   public:
     ArrayMemoryView(TempAllocator &alloc, MInstruction *arr);
 
@@ -733,6 +735,7 @@ class ArrayMemoryView : public MDefinitionVisitorDefaultNoop
 
   public:
     void visitResumePoint(MResumePoint *rp);
+    void visitArrayState(MArrayState *ins);
     void visitStoreElement(MStoreElement *ins);
     void visitLoadElement(MLoadElement *ins);
     void visitSetInitializedLength(MSetInitializedLength *ins);
@@ -748,8 +751,12 @@ ArrayMemoryView::ArrayMemoryView(TempAllocator &alloc, MInstruction *arr)
     length_(nullptr),
     arr_(arr),
     startBlock_(arr->block()),
-    state_(nullptr)
+    state_(nullptr),
+    lastResumePoint_(nullptr)
 {
+    // Annotate snapshots RValue such that we recover the store first.
+    arr_->setIncompleteObject();
+
     // Annotate the instruction such that we do not replace it by a
     // Magic(JS_OPTIMIZED_OUT) in case of removed uses.
     arr_->setImplicitlyUsedUnchecked();
@@ -774,6 +781,9 @@ ArrayMemoryView::initStartingState(BlockState **pState)
     BlockState *state = BlockState::New(alloc_, arr_, undefinedVal_, initLength);
     startBlock_->insertAfter(arr_, state);
 
+    // Hold out of resume point until it is visited.
+    state->setInWorklist();
+
     *pState = state;
     return true;
 }
@@ -836,7 +846,7 @@ ArrayMemoryView::mergeIntoSuccessorState(MBasicBlock *curr, MBasicBlock *succ,
         // of the successor block, after all the phi nodes.  Note that it
         // would be captured by the entry resume point of the successor
         // block.
-        succ->insertBefore(*succ->begin(), succState);
+        succ->insertBefore(succ->safeInsertTop(), succState);
         *pSuccState = succState;
     }
 
@@ -877,7 +887,19 @@ ArrayMemoryView::assertSuccess()
 void
 ArrayMemoryView::visitResumePoint(MResumePoint *rp)
 {
-    ReplaceResumePointOperands(rp, arr_, state_);
+    // As long as the MArrayState is not yet seen next to the allocation, we do
+    // not patch the resume point to recover the side effects.
+    if (!state_->isInWorklist()) {
+        rp->addStore(alloc_, state_, lastResumePoint_);
+        lastResumePoint_ = rp;
+    }
+}
+
+void
+ArrayMemoryView::visitArrayState(MArrayState *ins)
+{
+    if (ins->isInWorklist())
+        ins->setNotInWorklist();
 }
 
 bool

From 8e3bc159b88041623176a30aec3de4ac1eb86c66 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew@mozilla.com>
Date: Fri, 19 Dec 2014 14:55:30 +0000
Subject: [PATCH 116/183] Bug 1111525 - Remove unused lineFlags returned by
 nsILineIterator. r=roc

---
 layout/base/nsPresShell.cpp            |  3 +--
 layout/generic/nsFrame.cpp             | 14 +++++---------
 layout/generic/nsFrameList.cpp         | 10 ++++------
 layout/generic/nsILineIterator.h       | 15 +--------------
 layout/generic/nsLineBox.cpp           | 14 +-------------
 layout/generic/nsLineBox.h             |  3 +--
 layout/tables/nsTableRowGroupFrame.cpp |  5 +----
 layout/tables/nsTableRowGroupFrame.h   |  4 +---
 8 files changed, 15 insertions(+), 53 deletions(-)

diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 521372350e57..1ad2cc8da9f0 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -3422,10 +3422,9 @@ AccumulateFrameBounds(nsIFrame* aContainerFrame,
           nsIFrame *trash1;
           int32_t trash2;
           nsRect lineBounds;
-          uint32_t trash3;
 
           if (NS_SUCCEEDED(aLines->GetLine(index, &trash1, &trash2,
-                                           lineBounds, &trash3))) {
+                                           lineBounds))) {
             frameBounds += frame->GetOffsetTo(f);
             frame = f;
             if (lineBounds.y < frameBounds.y) {
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 45030ffd44ea..7b37d0f6958e 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -6085,9 +6085,8 @@ nsFrame::GetNextPrevLineFromeBlockFrame(nsPresContext* aPresContext,
       //we need to jump to new block frame.
       return NS_ERROR_FAILURE;
     }
-    uint32_t lineFlags;
     result = it->GetLine(searchingLine, &firstFrame, &lineFrameCount,
-                         rect, &lineFlags);
+                         rect);
     if (!lineFrameCount) 
       continue;
     if (NS_SUCCEEDED(result)){
@@ -6723,7 +6722,6 @@ nsIFrame::PeekOffset(nsPeekOffsetStruct* aPos)
       int32_t lineFrameCount;
       nsIFrame *firstFrame;
       nsRect usedRect;
-      uint32_t lineFlags;
       nsIFrame* baseFrame = nullptr;
       bool endOfLine = (eSelectEndLine == aPos->mAmount);
 
@@ -6744,7 +6742,7 @@ nsIFrame::PeekOffset(nsPeekOffsetStruct* aPos)
           }
         }
       } else {
-        it->GetLine(thisLine, &firstFrame, &lineFrameCount, usedRect, &lineFlags);
+        it->GetLine(thisLine, &firstFrame, &lineFrameCount, usedRect);
 
         nsIFrame* frame = firstFrame;
         for (int32_t count = lineFrameCount; count;
@@ -6976,9 +6974,8 @@ nsIFrame::GetFrameFromDirection(nsDirection aDirection, bool aVisual,
     } else {
       nsRect  nonUsedRect;
       int32_t lineFrameCount;
-      uint32_t lineFlags;
-      result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,nonUsedRect,
-                           &lineFlags);
+      result = it->GetLine(thisLine, &firstFrame, &lineFrameCount,
+                           nonUsedRect);
       if (NS_FAILED(result))
         return result;
 
@@ -8113,10 +8110,9 @@ nsFrame::RefreshSizeCache(nsBoxLayoutState& aState)
       nsIFrame* firstFrame = nullptr;
       int32_t framesOnLine;
       nsRect lineBounds;
-      uint32_t lineFlags;
 
       do {
-         lines->GetLine(count, &firstFrame, &framesOnLine, lineBounds, &lineFlags);
+         lines->GetLine(count, &firstFrame, &framesOnLine, lineBounds);
 
          if (lineBounds.height > metrics->mBlockMinSize.height)
            metrics->mBlockMinSize.height = lineBounds.height;
diff --git a/layout/generic/nsFrameList.cpp b/layout/generic/nsFrameList.cpp
index f075257c42e6..57d34f7301fb 100644
--- a/layout/generic/nsFrameList.cpp
+++ b/layout/generic/nsFrameList.cpp
@@ -390,10 +390,9 @@ nsFrameList::GetPrevVisualFor(nsIFrame* aFrame) const
   nsIFrame* firstFrameOnLine;
   int32_t numFramesOnLine;
   nsRect lineBounds;
-  uint32_t lineFlags;
 
   if (aFrame) {
-    iter->GetLine(thisLine, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
+    iter->GetLine(thisLine, &firstFrameOnLine, &numFramesOnLine, lineBounds);
 
     if (paraDir == NSBIDI_LTR) {
       frame = nsBidiPresUtils::GetFrameToLeftOf(aFrame, firstFrameOnLine, numFramesOnLine);
@@ -404,7 +403,7 @@ nsFrameList::GetPrevVisualFor(nsIFrame* aFrame) const
 
   if (!frame && thisLine > 0) {
     // Get the last frame of the previous line
-    iter->GetLine(thisLine - 1, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
+    iter->GetLine(thisLine - 1, &firstFrameOnLine, &numFramesOnLine, lineBounds);
 
     if (paraDir == NSBIDI_LTR) {
       frame = nsBidiPresUtils::GetFrameToLeftOf(nullptr, firstFrameOnLine, numFramesOnLine);
@@ -463,10 +462,9 @@ nsFrameList::GetNextVisualFor(nsIFrame* aFrame) const
   nsIFrame* firstFrameOnLine;
   int32_t numFramesOnLine;
   nsRect lineBounds;
-  uint32_t lineFlags;
 
   if (aFrame) {
-    iter->GetLine(thisLine, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
+    iter->GetLine(thisLine, &firstFrameOnLine, &numFramesOnLine, lineBounds);
 
     if (paraDir == NSBIDI_LTR) {
       frame = nsBidiPresUtils::GetFrameToRightOf(aFrame, firstFrameOnLine, numFramesOnLine);
@@ -478,7 +476,7 @@ nsFrameList::GetNextVisualFor(nsIFrame* aFrame) const
   int32_t numLines = iter->GetNumLines();
   if (!frame && thisLine < numLines - 1) {
     // Get the first frame of the next line
-    iter->GetLine(thisLine + 1, &firstFrameOnLine, &numFramesOnLine, lineBounds, &lineFlags);
+    iter->GetLine(thisLine + 1, &firstFrameOnLine, &numFramesOnLine, lineBounds);
 
     if (paraDir == NSBIDI_LTR) {
       frame = nsBidiPresUtils::GetFrameToRightOf(nullptr, firstFrameOnLine, numFramesOnLine);
diff --git a/layout/generic/nsILineIterator.h b/layout/generic/nsILineIterator.h
index 65a0243782e0..7d20691f4b24 100644
--- a/layout/generic/nsILineIterator.h
+++ b/layout/generic/nsILineIterator.h
@@ -12,15 +12,6 @@
 class nsIFrame;
 struct nsRect;
 
-// Line Flags (see GetLine below)
-
-// This bit is set when the line is wrapping up a block frame. When
-// clear, it means that the line contains inline elements.
-#define NS_LINE_FLAG_IS_BLOCK           0x1
-
-// This bit is set when the line ends in some sort of break.
-#define NS_LINE_FLAG_ENDS_IN_BREAK      0x4
-
 /**
  * Line iterator API.
  *
@@ -64,14 +55,10 @@ public:
   // the line (which is based on the in-flow position of the frames on
   // the line; if a frame was moved because of relative positioning
   // then its coordinates may be outside the line bounds).
-  //
-  // In addition, aLineFlags will contain flag information about the
-  // line.
   NS_IMETHOD GetLine(int32_t aLineNumber,
                      nsIFrame** aFirstFrameOnLine,
                      int32_t* aNumFramesOnLine,
-                     nsRect& aLineBounds,
-                     uint32_t* aLineFlags) = 0;
+                     nsRect& aLineBounds) = 0;
 
   /**
    * Given a frame that's a child of the block, find which line its on
diff --git a/layout/generic/nsLineBox.cpp b/layout/generic/nsLineBox.cpp
index b006c6e4e745..d279d2fdaa8b 100644
--- a/layout/generic/nsLineBox.cpp
+++ b/layout/generic/nsLineBox.cpp
@@ -639,12 +639,10 @@ NS_IMETHODIMP
 nsLineIterator::GetLine(int32_t aLineNumber,
                         nsIFrame** aFirstFrameOnLine,
                         int32_t* aNumFramesOnLine,
-                        nsRect& aLineBounds,
-                        uint32_t* aLineFlags)
+                        nsRect& aLineBounds)
 {
   NS_ENSURE_ARG_POINTER(aFirstFrameOnLine);
   NS_ENSURE_ARG_POINTER(aNumFramesOnLine);
-  NS_ENSURE_ARG_POINTER(aLineFlags);
 
   if ((aLineNumber < 0) || (aLineNumber >= mNumLines)) {
     *aFirstFrameOnLine = nullptr;
@@ -657,16 +655,6 @@ nsLineIterator::GetLine(int32_t aLineNumber,
   *aNumFramesOnLine = line->GetChildCount();
   aLineBounds = line->GetPhysicalBounds();
 
-  uint32_t flags = 0;
-  if (line->IsBlock()) {
-    flags |= NS_LINE_FLAG_IS_BLOCK;
-  }
-  else {
-    if (line->HasBreakAfter())
-      flags |= NS_LINE_FLAG_ENDS_IN_BREAK;
-  }
-  *aLineFlags = flags;
-
   return NS_OK;
 }
 
diff --git a/layout/generic/nsLineBox.h b/layout/generic/nsLineBox.h
index e68a2099cf72..9e818361dd20 100644
--- a/layout/generic/nsLineBox.h
+++ b/layout/generic/nsLineBox.h
@@ -1721,8 +1721,7 @@ public:
   NS_IMETHOD GetLine(int32_t aLineNumber,
                      nsIFrame** aFirstFrameOnLine,
                      int32_t* aNumFramesOnLine,
-                     nsRect& aLineBounds,
-                     uint32_t* aLineFlags) MOZ_OVERRIDE;
+                     nsRect& aLineBounds) MOZ_OVERRIDE;
   virtual int32_t FindLineContaining(nsIFrame* aFrame, int32_t aStartLine = 0) MOZ_OVERRIDE;
   NS_IMETHOD FindFrameAt(int32_t aLineNumber,
                          nsPoint aPos,
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index 30591e12f657..2082ad9231a0 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -1668,17 +1668,14 @@ NS_IMETHODIMP
 nsTableRowGroupFrame::GetLine(int32_t    aLineNumber, 
                               nsIFrame** aFirstFrameOnLine, 
                               int32_t*   aNumFramesOnLine,
-                              nsRect&    aLineBounds, 
-                              uint32_t*  aLineFlags)
+                              nsRect&    aLineBounds)
 {
   NS_ENSURE_ARG_POINTER(aFirstFrameOnLine);
   NS_ENSURE_ARG_POINTER(aNumFramesOnLine);
-  NS_ENSURE_ARG_POINTER(aLineFlags);
 
   nsTableFrame* table = nsTableFrame::GetTableFrame(this);
   nsTableCellMap* cellMap = table->GetCellMap();
 
-  *aLineFlags = 0;
   *aFirstFrameOnLine = nullptr;
   *aNumFramesOnLine = 0;
   aLineBounds.SetRect(0, 0, 0, 0);
diff --git a/layout/tables/nsTableRowGroupFrame.h b/layout/tables/nsTableRowGroupFrame.h
index 06345a8f7713..07a5704fc282 100644
--- a/layout/tables/nsTableRowGroupFrame.h
+++ b/layout/tables/nsTableRowGroupFrame.h
@@ -210,13 +210,11 @@ public:
     * @param aNumFramesOnLine  - return the numbers of cells originating in
     *                            this row
     * @param aLineBounds       - rect of the row
-    * @param aLineFlags        - unused set to 0
     */
   NS_IMETHOD GetLine(int32_t aLineNumber,
                      nsIFrame** aFirstFrameOnLine,
                      int32_t* aNumFramesOnLine,
-                     nsRect& aLineBounds,
-                     uint32_t* aLineFlags) MOZ_OVERRIDE;
+                     nsRect& aLineBounds) MOZ_OVERRIDE;
   
   /** Given a frame that's a child of the rowgroup, find which line its on.
     * @param aFrame       - frame, should be a row

From 74f329b42b9fa1fbb986642a72fe3b867cde622f Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 16:06:40 +0100
Subject: [PATCH 117/183] Bug 1112153 - Verify that all resume points / recover
 instructions operands can be encoded in snapshots. r=bbouvier

---
 js/src/jit/IonAnalysis.cpp | 71 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 68 insertions(+), 3 deletions(-)

diff --git a/js/src/jit/IonAnalysis.cpp b/js/src/jit/IonAnalysis.cpp
index 3d804b38f829..a19b39d5d84c 100644
--- a/js/src/jit/IonAnalysis.cpp
+++ b/js/src/jit/IonAnalysis.cpp
@@ -2036,6 +2036,64 @@ jit::AssertGraphCoherency(MIRGraph &graph)
 }
 
 #ifdef DEBUG
+static bool
+IsResumableMIRType(MIRType type)
+{
+    // see CodeGeneratorShared::encodeAllocation
+    switch (type) {
+      case MIRType_Undefined:
+      case MIRType_Null:
+      case MIRType_Boolean:
+      case MIRType_Int32:
+      case MIRType_Double:
+      case MIRType_Float32:
+      case MIRType_String:
+      case MIRType_Symbol:
+      case MIRType_Object:
+      case MIRType_MagicOptimizedArguments:
+      case MIRType_MagicOptimizedOut:
+      case MIRType_MagicUninitializedLexical:
+      case MIRType_Value:
+        return true;
+
+      case MIRType_MagicHole:
+      case MIRType_MagicIsConstructing:
+      case MIRType_ObjectOrNull:
+      case MIRType_None:
+      case MIRType_Slots:
+      case MIRType_Elements:
+      case MIRType_Pointer:
+      case MIRType_Shape:
+      case MIRType_TypeObject:
+      case MIRType_ForkJoinContext:
+      case MIRType_Float32x4:
+      case MIRType_Int32x4:
+      case MIRType_Doublex2:
+        return false;
+    }
+    MOZ_CRASH("Unknown MIRType.");
+}
+
+static void
+AssertResumableOperands(MNode *node)
+{
+    for (size_t i = 0, e = node->numOperands(); i < e; ++i) {
+        MDefinition *op = node->getOperand(i);
+        if (op->isRecoveredOnBailout())
+            continue;
+        MOZ_ASSERT(IsResumableMIRType(op->type()),
+                   "Resume point cannot encode its operands");
+    }
+}
+
+static void
+AssertIfResumableInstruction(MDefinition *def)
+{
+    if (!def->isRecoveredOnBailout())
+        return;
+    AssertResumableOperands(def);
+}
+
 static void
 AssertResumePointDominatedByOperands(MResumePoint *resume)
 {
@@ -2133,15 +2191,22 @@ jit::AssertExtendedGraphCoherency(MIRGraph &graph)
                     } while (*opIter != ins);
                 }
             }
-            if (MResumePoint *resume = ins->resumePoint())
+            AssertIfResumableInstruction(ins);
+            if (MResumePoint *resume = ins->resumePoint()) {
                 AssertResumePointDominatedByOperands(resume);
+                AssertResumableOperands(resume);
+            }
         }
 
         // Verify that the block resume points are dominated by their operands.
-        if (MResumePoint *resume = block->entryResumePoint())
+        if (MResumePoint *resume = block->entryResumePoint()) {
             AssertResumePointDominatedByOperands(resume);
-        if (MResumePoint *resume = block->outerResumePoint())
+            AssertResumableOperands(resume);
+        }
+        if (MResumePoint *resume = block->outerResumePoint()) {
             AssertResumePointDominatedByOperands(resume);
+            AssertResumableOperands(resume);
+        }
     }
 #endif
 }

From f9bd6e4af394c9855c986751e70857b3a263c99c Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 16:06:42 +0100
Subject: [PATCH 118/183] Bug 1113179 - SIMD types are now created as Singleton
 objects. r=bbouvier

---
 js/src/builtin/SIMD.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/js/src/builtin/SIMD.cpp b/js/src/builtin/SIMD.cpp
index 4989ef9a6643..91aa10a58785 100644
--- a/js/src/builtin/SIMD.cpp
+++ b/js/src/builtin/SIMD.cpp
@@ -241,9 +241,7 @@ const JSFunctionSpec js::Int32x4Defn::TypedObjectMethods[] = {
 
 template<typename T>
 static JSObject *
-CreateSimdClass(JSContext *cx,
-              Handle<GlobalObject*> global,
-              HandlePropertyName stringRepr)
+CreateSimdClass(JSContext *cx, Handle<GlobalObject*> global, HandlePropertyName stringRepr)
 {
     const SimdTypeDescr::Type type = T::type;
 
@@ -254,7 +252,7 @@ CreateSimdClass(JSContext *cx,
     // Create type constructor itself and initialize its reserved slots.
 
     Rooted<SimdTypeDescr*> typeDescr(cx);
-    typeDescr = NewObjectWithProto<SimdTypeDescr>(cx, funcProto, global, TenuredObject);
+    typeDescr = NewObjectWithProto<SimdTypeDescr>(cx, funcProto, global, SingletonObject);
     if (!typeDescr)
         return nullptr;
 
@@ -274,7 +272,7 @@ CreateSimdClass(JSContext *cx,
     if (!objProto)
         return nullptr;
     Rooted<TypedProto*> proto(cx);
-    proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject);
+    proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, SingletonObject);
     if (!proto)
         return nullptr;
     typeDescr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto));

From ab927f07555bd4dcf87cac2338446d0f22c29435 Mon Sep 17 00:00:00 2001
From: ziyunfei <446240525@qq.com>
Date: Fri, 19 Dec 2014 16:51:41 +0100
Subject: [PATCH 119/183] Bug 1078975 - %TypedArray%.prototype.{find,
 findIndex} Test. r=till

---
 .../ecma_6/TypedArray/find-and-findIndex.js   | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 js/src/tests/ecma_6/TypedArray/find-and-findIndex.js

diff --git a/js/src/tests/ecma_6/TypedArray/find-and-findIndex.js b/js/src/tests/ecma_6/TypedArray/find-and-findIndex.js
new file mode 100644
index 000000000000..1e1b70fea264
--- /dev/null
+++ b/js/src/tests/ecma_6/TypedArray/find-and-findIndex.js
@@ -0,0 +1,70 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * https://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+var BUGNUMBER = 1078975;
+var summary = "Implement %TypedArray%.prototype.{find, findIndex}";
+print(BUGNUMBER + ": " + summary);
+
+const constructors = [
+  Int8Array,
+  Uint8Array,
+  Uint8ClampedArray,
+  Int16Array,
+  Uint16Array,
+  Int32Array,
+  Uint32Array,
+  Float32Array,
+  Float64Array
+];
+
+const methods = ["find", "findIndex"];
+
+constructors.forEach(constructor => {
+    methods.forEach(method => {
+        var arr = new constructor([0, 1, 2, 3, 4, 5]);
+        // test that this.length is never called
+        Object.defineProperty(arr, "length", {
+            get() {
+                throw new Error("length accessor called");
+            }
+        });
+        assertEq(arr[method].length, 1);
+        assertEq(arr[method](v => v === 3), 3);
+        assertEq(arr[method](v => v === 6), method === "find" ? undefined : -1);
+
+        var thisValues = [undefined, null, true, 1, "foo", [], {}];
+        if (typeof Symbol == "function")
+            thisValues.push(Symbol());
+
+        thisValues.forEach(thisArg =>
+            assertThrowsInstanceOf(() => arr[method].call(thisArg, () => true), TypeError)
+        );
+
+        assertThrowsInstanceOf(() => arr[method](), TypeError);
+        assertThrowsInstanceOf(() => arr[method](1), TypeError);
+
+        // ToDo neutering
+        arr = new constructor([1, 2, 3]);
+        assertEq(arr[method](v => v === 2), method === "find" ? 2 : 1);
+        neuter(arr.buffer, "change-data");
+        assertEq(arr[method](v => v === 2), method === "find" ? undefined : -1);
+    });
+});
+
+[Float32Array, Float64Array].forEach(constructor => {
+    var arr = new constructor([-0, 0, 1, 5, NaN, 6]);
+    assertEq(arr.find(v => Number.isNaN(v)), NaN);
+    assertEq(arr.findIndex(v => Number.isNaN(v)), 4);
+
+    assertEq(arr.find(v => Object.is(v, 0)), 0);
+    assertEq(arr.findIndex(v => Object.is(v, 0)), 1);
+
+    assertEq(arr.find(v => Object.is(v, -0)), -0);
+    assertEq(arr.findIndex(v => Object.is(v, -0)), 0);
+})
+
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);

From 18d594a471efd46e6e9cb6399f39429f54fac093 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:06 -0700
Subject: [PATCH 120/183] Bug 1105795 - Avoid ClassCastException in
 testAboutHomeVisibility; r=mcomella

---
 mobile/android/base/tests/components/ToolbarComponent.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/tests/components/ToolbarComponent.java b/mobile/android/base/tests/components/ToolbarComponent.java
index 62cc32cacd8e..5365441d5326 100644
--- a/mobile/android/base/tests/components/ToolbarComponent.java
+++ b/mobile/android/base/tests/components/ToolbarComponent.java
@@ -122,8 +122,8 @@ public class ToolbarComponent extends BaseComponent {
     /**
      * Returns the View for the edit cancel button in the browser toolbar.
      */
-    private ImageButton getEditCancelButton() {
-        return (ImageButton) getToolbarView().findViewById(R.id.edit_cancel);
+    private View getEditCancelButton() {
+        return getToolbarView().findViewById(R.id.edit_cancel);
     }
 
     private String getTitle() {

From aa15f056c48a1cfd28aae081f13518ee5bb7f4c4 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:06 -0700
Subject: [PATCH 121/183] Bug 1105887 - Wait for panel in
 testAboutHomeVisibility; r=mcomella

---
 mobile/android/base/tests/components/AboutHomeComponent.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mobile/android/base/tests/components/AboutHomeComponent.java b/mobile/android/base/tests/components/AboutHomeComponent.java
index 1d6fa0af00f1..15d1d8b92030 100644
--- a/mobile/android/base/tests/components/AboutHomeComponent.java
+++ b/mobile/android/base/tests/components/AboutHomeComponent.java
@@ -205,6 +205,8 @@ public class AboutHomeComponent extends BaseComponent {
      */
     public AboutHomeComponent navigateToBuiltinPanelType(PanelType panelType) throws IllegalArgumentException {
         Tabs.getInstance().loadUrl(AboutPages.getURLForBuiltinPanelType(panelType));
+        final int expectedPanelIndex = getPanelIndexForDevice(panelType);
+        waitForPanelIndex(expectedPanelIndex);
         return this;
     }
 }

From bfc1dc28baade58393a45f09fc23d044ca01fa08 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:06 -0700
Subject: [PATCH 122/183] Bug 1105792 - Avoid assertions in testHomeBanner;
 r=margaret

---
 .../android/base/tests/components/AboutHomeComponent.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/tests/components/AboutHomeComponent.java b/mobile/android/base/tests/components/AboutHomeComponent.java
index 15d1d8b92030..871393439a78 100644
--- a/mobile/android/base/tests/components/AboutHomeComponent.java
+++ b/mobile/android/base/tests/components/AboutHomeComponent.java
@@ -68,7 +68,10 @@ public class AboutHomeComponent extends BaseComponent {
     }
 
     private View getHomeBannerView() {
-        return mSolo.getView(R.id.home_banner);
+        if (mSolo.waitForView(R.id.home_banner)) {
+            return mSolo.getView(R.id.home_banner);
+        }
+        return null;
     }
 
     public AboutHomeComponent assertCurrentPanel(final PanelType expectedPanel) {
@@ -98,6 +101,7 @@ public class AboutHomeComponent extends BaseComponent {
         View banner = getHomeBannerView();
         fAssertTrue("The HomeBanner is not visible",
                     getHomePagerContainer().getVisibility() != View.VISIBLE ||
+                    banner == null ||
                     banner.getVisibility() != View.VISIBLE ||
                     banner.getTranslationY() == banner.getHeight());
         return this;

From 3e9248c4b3bb4c588db407d6953725f296454703 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 9 Dec 2014 17:58:45 -0800
Subject: [PATCH 123/183] Bug 1105792 - Simplify testHomeBanner to account for
 the fact that banner view is removed when banner is dismissed; r=gbrown

---
 .../roboextender/robocop_home_banner.html     |  8 ---
 mobile/android/base/tests/testHomeBanner.java | 72 +++++--------------
 2 files changed, 18 insertions(+), 62 deletions(-)

diff --git a/mobile/android/base/tests/roboextender/robocop_home_banner.html b/mobile/android/base/tests/roboextender/robocop_home_banner.html
index 5bec706d5b75..9a94566040be 100644
--- a/mobile/android/base/tests/roboextender/robocop_home_banner.html
+++ b/mobile/android/base/tests/roboextender/robocop_home_banner.html
@@ -20,9 +20,6 @@ var messageId;
 function addMessage() {
   messageId = Home.banner.add({
     text: TEXT,
-    onclick: function() {
-      Messaging.sendRequest({ type: "TestHomeBanner:MessageClicked" });
-    },
     onshown: function() {
       Messaging.sendRequest({ type: "TestHomeBanner:MessageShown" });
     },
@@ -33,11 +30,6 @@ function addMessage() {
   Messaging.sendRequest({ type: "TestHomeBanner:MessageAdded" });
 }
 
-function removeMessage() {
-  Home.banner.remove(messageId);
-  Messaging.sendRequest({ type: "TestHomeBanner:MessageRemoved" });
-}
-
     </script>
   </head>
   <body onload="start();">
diff --git a/mobile/android/base/tests/testHomeBanner.java b/mobile/android/base/tests/testHomeBanner.java
index f8345ef80321..bce3ecf5462c 100644
--- a/mobile/android/base/tests/testHomeBanner.java
+++ b/mobile/android/base/tests/testHomeBanner.java
@@ -22,10 +22,6 @@ public class testHomeBanner extends UITest {
         // Make sure the banner hides when the user starts interacting with the url bar.
         hideOnToolbarFocusTest();
 
-        // TODO: API doesn't actually support this but it used to work due to how the banner was
-        // part of TopSitesPanel's lifecycle
-        // removeBannerTest();
-
         // Make sure to test dismissing the banner after everything else, since dismissing
         // the banner will prevent it from showing up again.
         dismissBannerTest();
@@ -47,53 +43,12 @@ public class testHomeBanner extends UITest {
         // Verify that the banner is visible with the correct text.
         mAboutHome.assertBannerText(TEXT);
 
-        // Test to make sure the onclick handler is called.
-        eventExpecter = getActions().expectGeckoEvent("TestHomeBanner:MessageClicked");
-        mAboutHome.clickOnBanner();
-        eventExpecter.blockForEvent();
-
         // Verify that the banner isn't visible after navigating away from about:home.
         NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_FIREFOX_URL);
-
         mAboutHome.assertBannerNotVisible();
     }
 
 
-    /**
-     * Removes a banner message, and verifies that it no longer appears on about:home.
-     *
-     * Note: This test expects for a message to have been added before it runs.
-     */
-    private void removeBannerTest() {
-        removeBannerMessage();
-
-        // Verify that the banner no longer appears.
-        NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_HOME_URL);
-        mAboutHome.assertVisible()
-                  .assertBannerNotVisible();
-    }
-
-    /**
-     * Adds a banner message, verifies that its ondismiss handler is called in JS,
-     * and verifies that the banner is no longer shown after it is dismissed.
-     *
-     * Note: This test does not remove the message after it is done.
-     */
-    private void dismissBannerTest() {
-        // Add back the banner message to test the dismiss functionality.
-        addBannerMessage();
-
-        NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_HOME_URL);
-        mAboutHome.assertVisible();
-
-        // Test to make sure the ondismiss handler is called when the close button is clicked.
-        final Actions.EventExpecter eventExpecter = getActions().expectGeckoEvent("TestHomeBanner:MessageDismissed");
-        mAboutHome.dismissBanner();
-        eventExpecter.blockForEvent();
-
-        mAboutHome.assertBannerNotVisible();
-    }
-
     private void hideOnToolbarFocusTest() {
         NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_HOME_URL);
         mAboutHome.assertVisible()
@@ -106,6 +61,24 @@ public class testHomeBanner extends UITest {
         mAboutHome.assertBannerVisible();
     }
 
+    /**
+     * Adds a banner message, verifies that its ondismiss handler is called in JS,
+     * and verifies that the banner is no longer shown after it is dismissed.
+     *
+     * Note: This test does not remove the message after it is done.
+     */
+    private void dismissBannerTest() {
+        NavigationHelper.enterAndLoadUrl(StringHelper.ABOUT_HOME_URL);
+        mAboutHome.assertVisible();
+
+        // Test to make sure the ondismiss handler is called when the close button is clicked.
+        final Actions.EventExpecter eventExpecter = getActions().expectGeckoEvent("TestHomeBanner:MessageDismissed");
+        mAboutHome.dismissBanner();
+        eventExpecter.blockForEvent();
+
+        mAboutHome.assertBannerNotVisible();
+    }
+
     /**
      * Loads the roboextender page to add a message to the banner.
      */
@@ -114,13 +87,4 @@ public class testHomeBanner extends UITest {
         NavigationHelper.enterAndLoadUrl(TEST_URL + "#addMessage");
         eventExpecter.blockForEvent();
     }
-
-    /**
-     * Loads the roboextender page to remove the message from the banner.
-     */
-    private void removeBannerMessage() {
-        final Actions.EventExpecter eventExpecter = getActions().expectGeckoEvent("TestHomeBanner:MessageRemoved");
-        NavigationHelper.enterAndLoadUrl(TEST_URL + "#removeMessage");
-        eventExpecter.blockForEvent();
-    }
 }

From fc37f6f0196908167414198a9776a866532b045d Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:07 -0700
Subject: [PATCH 124/183] Bug 1090927 - Rename private test... functions in
 testGeckoProfile; r=mfinkle

---
 .../android/base/tests/testGeckoProfile.java  | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/mobile/android/base/tests/testGeckoProfile.java b/mobile/android/base/tests/testGeckoProfile.java
index ada10ae00b6c..d891fd24dedf 100644
--- a/mobile/android/base/tests/testGeckoProfile.java
+++ b/mobile/android/base/tests/testGeckoProfile.java
@@ -37,12 +37,12 @@ public class testGeckoProfile extends PixelTest {
             return;
         }
 
-        testProfileCreationDeletion();
-        testGuestProfile();
+        checkProfileCreationDeletion();
+        checkGuestProfile();
     }
 
     // This getter just passes an activity. Passing null should throw.
-    private void testDefaultGetter() {
+    private void checkDefaultGetter() {
         mAsserter.info("Test using the default profile", GeckoProfile.DEFAULT_PROFILE);
         GeckoProfile profile = GeckoProfile.get(getActivity());
         // This profile has been forced into something strange by the test harness, but its name is still right...
@@ -57,7 +57,7 @@ public class testGeckoProfile extends PixelTest {
     }
 
     // Test get(Context, String) methods
-    private void testNamedGetter(String name) {
+    private void checkNamedGetter(String name) {
         mAsserter.info("Test using a named profile", name);
         GeckoProfile profile = GeckoProfile.get(getActivity(), name);
         if (!TextUtils.isEmpty(name)) {
@@ -71,16 +71,16 @@ public class testGeckoProfile extends PixelTest {
     }
 
     // Test get(Context, String, String) methods
-    private void testNameAndPathGetter(String name, boolean createBefore) {
+    private void checkNameAndPathGetter(String name, boolean createBefore) {
         if (TextUtils.isEmpty(name)) {
-            testNameAndPathGetter(name, null, createBefore);
+            checkNameAndPathGetter(name, null, createBefore);
         } else {
-            testNameAndPathGetter(name, name + "_FORCED_DIR", createBefore);
+            checkNameAndPathGetter(name, name + "_FORCED_DIR", createBefore);
         }
     }
 
     // Test get(Context, String, String) methods
-    private void testNameAndPathGetter(String name, String path, boolean createBefore) {
+    private void checkNameAndPathGetter(String name, String path, boolean createBefore) {
         mAsserter.info("Test using a named profile and path", name + ", " + path);
 
         File f = null;
@@ -109,15 +109,15 @@ public class testGeckoProfile extends PixelTest {
         }
     }
 
-    private void testNameAndFileGetter(String name, boolean createBefore) {
+    private void checkNameAndFileGetter(String name, boolean createBefore) {
         if (TextUtils.isEmpty(name)) {
-            testNameAndFileGetter(name, null, createBefore);
+            checkNameAndFileGetter(name, null, createBefore);
         } else {
-            testNameAndFileGetter(name, new File(mozDir, name + "_FORCED_DIR"), createBefore);
+            checkNameAndFileGetter(name, new File(mozDir, name + "_FORCED_DIR"), createBefore);
         }
     }
 
-    private void testNameAndFileGetter(String name, File f, boolean createBefore) {
+    private void checkNameAndFileGetter(String name, File f, boolean createBefore) {
         mAsserter.info("Test using a named profile and path", name + ", " + f);
         if (f != null && createBefore) {
             f.mkdir();
@@ -139,48 +139,48 @@ public class testGeckoProfile extends PixelTest {
         }
     }
 
-    private void testProfileCreationDeletion() {
+    private void checkProfileCreationDeletion() {
         // Test
-        testDefaultGetter();
+        checkDefaultGetter();
 
         int index = 0;
-        testNamedGetter(TEST_PROFILE_NAME + (index++)); // 0
-        testNamedGetter("");
-        testNamedGetter(null);
+        checkNamedGetter(TEST_PROFILE_NAME + (index++)); // 0
+        checkNamedGetter("");
+        checkNamedGetter(null);
 
         // name and path
-        testNameAndPathGetter(TEST_PROFILE_NAME + (index++), true); // 1
-        testNameAndPathGetter(TEST_PROFILE_NAME + (index++), false); // 2
+        checkNameAndPathGetter(TEST_PROFILE_NAME + (index++), true); // 1
+        checkNameAndPathGetter(TEST_PROFILE_NAME + (index++), false); // 2
         // null name and path
-        testNameAndPathGetter(null, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR", true); // 3
-        testNameAndPathGetter(null, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR", false); // 4
-        testNameAndPathGetter("", TEST_PROFILE_NAME + (index++) + "_FORCED_DIR", true); // 5
-        testNameAndPathGetter("", TEST_PROFILE_NAME + (index++) + "_FORCED_DIR", false); // 6
+        checkNameAndPathGetter(null, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR", true); // 3
+        checkNameAndPathGetter(null, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR", false); // 4
+        checkNameAndPathGetter("", TEST_PROFILE_NAME + (index++) + "_FORCED_DIR", true); // 5
+        checkNameAndPathGetter("", TEST_PROFILE_NAME + (index++) + "_FORCED_DIR", false); // 6
         // name and null path
-        testNameAndPathGetter(TEST_PROFILE_NAME + (index++), null, false); // 7
-        testNameAndPathGetter(TEST_PROFILE_NAME + (index++), "", false); // 8
+        checkNameAndPathGetter(TEST_PROFILE_NAME + (index++), null, false); // 7
+        checkNameAndPathGetter(TEST_PROFILE_NAME + (index++), "", false); // 8
         // null name and null path
-        testNameAndPathGetter(null, null, false);
-        testNameAndPathGetter("", null, false);
-        testNameAndPathGetter(null, "", false);
-        testNameAndPathGetter("", "", false);
+        checkNameAndPathGetter(null, null, false);
+        checkNameAndPathGetter("", null, false);
+        checkNameAndPathGetter(null, "", false);
+        checkNameAndPathGetter("", "", false);
 
         // name and path
-        testNameAndFileGetter(TEST_PROFILE_NAME + (index++), true); // 9
-        testNameAndFileGetter(TEST_PROFILE_NAME + (index++), false); // 10
+        checkNameAndFileGetter(TEST_PROFILE_NAME + (index++), true); // 9
+        checkNameAndFileGetter(TEST_PROFILE_NAME + (index++), false); // 10
         // null name and path
-        testNameAndFileGetter(null, new File(mozDir, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR"), true); // 11
-        testNameAndFileGetter(null, new File(mozDir, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR"), false); // 12
-        testNameAndFileGetter("", new File(mozDir, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR"), true); // 13
-        testNameAndFileGetter("", new File(mozDir, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR"), false); // 14
+        checkNameAndFileGetter(null, new File(mozDir, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR"), true); // 11
+        checkNameAndFileGetter(null, new File(mozDir, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR"), false); // 12
+        checkNameAndFileGetter("", new File(mozDir, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR"), true); // 13
+        checkNameAndFileGetter("", new File(mozDir, TEST_PROFILE_NAME + (index++) + "_FORCED_DIR"), false); // 14
         // name and null path
-        testNameAndFileGetter(TEST_PROFILE_NAME + (index++), null, false); // 16
+        checkNameAndFileGetter(TEST_PROFILE_NAME + (index++), null, false); // 16
         // null name and null path
-        testNameAndFileGetter(null, null, false);
+        checkNameAndFileGetter(null, null, false);
     }
 
     // Tests of Guest profile methods
-    private void testGuestProfile() {
+    private void checkGuestProfile() {
         mAsserter.info("Test getting a guest profile", "");
         GeckoProfile profile = GeckoProfile.createGuestProfile(getActivity());
         verifyProfile(profile, GeckoProfile.GUEST_PROFILE, getActivity().getFileStreamPath("guest"), true);

From 8bd4181821341969c607f0e55ed7fd94a55f0356 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:07 -0700
Subject: [PATCH 125/183] Bug 1105522 - Copy Robocop exception handling into
 UITest; r=jmaher

---
 mobile/android/base/tests/UITest.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/mobile/android/base/tests/UITest.java b/mobile/android/base/tests/UITest.java
index 14376ae760d8..925ab2ad2e32 100644
--- a/mobile/android/base/tests/UITest.java
+++ b/mobile/android/base/tests/UITest.java
@@ -88,6 +88,23 @@ abstract class UITest extends BaseRobocopTest
         super.tearDown();
     }
 
+    @Override
+    protected void runTest() throws Throwable {
+        try {
+            super.runTest();
+        } catch (Throwable t) {
+            // save screenshot -- written to /mnt/sdcard/Robotium-Screenshots
+            // as <filename>.jpg
+            mSolo.takeScreenshot("robocop-screenshot");
+            if (mAsserter != null) {
+                mAsserter.dumpLog("Exception caught during test!", t);
+                mAsserter.ok(false, "Exception caught", t.toString());
+            }
+            // re-throw to continue bail-out
+            throw t;
+        }
+    }
+
     private void initComponents() {
         mAboutHome = new AboutHomeComponent(this);
         mAppMenu = new AppMenuComponent(this);

From 47b8d3e1e9e9d3afc04a59e7fa24c2543b146324 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:07 -0700
Subject: [PATCH 126/183] Bug 1107002 - Update robocop dismissEditingMode for
 tablets; r=mcomella

---
 .../base/tests/components/ToolbarComponent.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/tests/components/ToolbarComponent.java b/mobile/android/base/tests/components/ToolbarComponent.java
index 5365441d5326..984f09debcff 100644
--- a/mobile/android/base/tests/components/ToolbarComponent.java
+++ b/mobile/android/base/tests/components/ToolbarComponent.java
@@ -185,7 +185,15 @@ public class ToolbarComponent extends BaseComponent {
     public ToolbarComponent dismissEditingMode() {
         assertIsEditing();
 
-        mSolo.clickOnView(getEditCancelButton());
+        if (DeviceHelper.isTablet()) {
+            final EditText urlEditText = getUrlEditText();
+            if (urlEditText.isFocused()) {
+                mSolo.goBack();
+            }
+            mSolo.goBack();
+        } else {
+            mSolo.clickOnView(getEditCancelButton());
+        }
 
         waitForNotEditing();
 

From 3590998fe3bcc8bd0a8f95c9dab753c682fa4ff3 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Fri, 31 Oct 2014 17:08:30 -0700
Subject: [PATCH 127/183] Bug 1085837 - Open legacy "More" menu before
 asserting menu item is disabled; r=liuche

---
 .../tests/components/AppMenuComponent.java    | 41 +++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/tests/components/AppMenuComponent.java b/mobile/android/base/tests/components/AppMenuComponent.java
index 47a3aed5215b..a45868998c0d 100644
--- a/mobile/android/base/tests/components/AppMenuComponent.java
+++ b/mobile/android/base/tests/components/AppMenuComponent.java
@@ -123,10 +123,19 @@ public class AppMenuComponent extends BaseComponent {
                 fAssertEquals("The parent 'page' menu item is visible", View.VISIBLE, parentMenuItemView.getVisibility());
             }
         } else {
-            // Legacy devices don't have parent menu item "page", check for menu item represented by pageMenuItem.
+            // Legacy devices (Android 2.3 and earlier) don't have the parent menu, "Page", so check directly for the menu
+            // item represented by pageMenuItem.
+            //
+            // We need to make sure the appropriate menu view is constructed
+            // so open the "More" menu to additionally construct those views.
+            openLegacyMoreMenu();
+
             final View pageMenuItemView = findAppMenuItemView(pageMenuItem.getString(mSolo));
             fAssertFalse("The page menu item is not enabled", pageMenuItemView.isEnabled());
             fAssertEquals("The page menu item is visible", View.VISIBLE, pageMenuItemView.getVisibility());
+
+            // Close the "More" menu.
+            mSolo.goBack();
         }
 
         // Close the App Menu.
@@ -140,7 +149,9 @@ public class AppMenuComponent extends BaseComponent {
     /**
      * Try to find a MenuItemActionBar/MenuItemDefault with the given text set as contentDescription / text.
      *
-     * Will return null when the Android legacy menu is in use.
+     * When using legacy menus, make sure the menu has been opened to the appropriate level
+     * (i.e. base menu or "More" menu) to ensure the appropriate menu views are in memory.
+     * TODO: ^ Maybe we just need to have opened the "More" menu and the current one doesn't matter.
      *
      * This method is dependent on not having two views with equivalent contentDescription / text.
      */
@@ -229,6 +240,25 @@ public class AppMenuComponent extends BaseComponent {
         waitForMenuOpen();
     }
 
+    /**
+     * Opens the "More" options menu on legacy Android devices. Assumes the base menu
+     * (i.e. {@link #openAppMenu()}) has already been called and thus the menu is open.
+     */
+    private void openLegacyMoreMenu() {
+        fAssertTrue("The base menu is already open", isMenuOpen());
+
+        // Since there may be more views with "More" on the screen,
+        // this is not robust. However, there may not be a better way.
+        mSolo.clickOnText("^More$");
+
+        WaitHelper.waitFor("legacy \"More\" menu to open", new Condition() {
+            @Override
+            public boolean isSatisfied() {
+                return isLegacyMoreMenuOpen();
+            }
+        });
+    }
+
     private void pressOverflowMenuButton() {
         final View overflowMenuButton = getOverflowMenuButtonView();
 
@@ -247,6 +277,11 @@ public class AppMenuComponent extends BaseComponent {
         return isMenuOpen(MenuItem.NEW_TAB.getString(mSolo));
     }
 
+    private boolean isLegacyMoreMenuOpen() {
+        // Check if the first menu option is visible.
+        return mSolo.searchText(mSolo.getString(R.string.share), true);
+    }
+
     /**
      * Determines whether the app menu is open by searching for the text in menuItemTitle.
      *
@@ -255,7 +290,7 @@ public class AppMenuComponent extends BaseComponent {
      * @return true if app menu is open.
      */
     private boolean isMenuOpen(String menuItemTitle) {
-        return mSolo.searchText(menuItemTitle);
+        return mSolo.searchText(menuItemTitle, true);
     }
 
     private void waitForMenuOpen() {

From a3b10ea1489b893e7f5eb282a339bb258bfe81f1 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 00:17:21 -0800
Subject: [PATCH 128/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/5ec3ded83868
Author: Sean Lee <weilonge@gmail.com>
Desc: Merge pull request #26869 from weilonge/seanlee/STK/master/Bug1112978

Bug 1112978 - Add mozbehavior.showOnlyOnce attribute for creating IDLE MODE TEXT notifications. r=frsela

========

https://hg.mozilla.org/integration/gaia-central/rev/eb9186a403cd
Author: Sean Lee <selee@mozilla.com>
Desc: Bug 1112978 - Add mozbehavior.showOnlyOnce attribute for creating IDLE MODE TEXT notifications.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 886d361032fc..c4ebb32a8f4e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "20dd907f42986f522233b523edd12064991a09ea", 
+    "revision": "5ec3ded83868cfc6904e0ad11714f7c3b9dc20f1", 
     "repo_path": "integration/gaia-central"
 }

From 01d8f7c3cdf1ac03160490e662bf481c36a15987 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 00:22:00 -0800
Subject: [PATCH 129/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 64bcfb4b8866..b8907569aaa5 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 02ace38d61db..ef494c3c51b8 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 2403ca196315..3f71896321f8 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index e73808620e65..fde362480852 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 02ace38d61db..ef494c3c51b8 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 5538776ba0f9..f3e85af2cf17 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2864961c1da2..1b356ef8763d 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 31b488a8101d..9e7b329decd7 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 82395ad39781..8b3a37fac7d5 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 1c109efe4aeb..ee217d9d9c48 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index b0a7faf39a2d..63eae9191343 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From d1dc43ad38bc673425ba0548b57e074f9af7adc7 Mon Sep 17 00:00:00 2001
From: Bevis Tseng <btseng@mozilla.com>
Date: Mon, 24 Nov 2014 18:43:54 +0800
Subject: [PATCH 130/183] Bug 873351 - Part 1: Re-write SmsService in
 JavaScript. r=echen

---
 b2g/installer/package-manifest.in             |   2 +
 dom/mobilemessage/MobileMessageManager.cpp    |   4 +-
 dom/mobilemessage/gonk/SmsService.cpp         | 159 ------------------
 dom/mobilemessage/gonk/SmsService.h           |  40 -----
 dom/mobilemessage/gonk/SmsService.js          | 154 +++++++++++++++++
 dom/mobilemessage/gonk/SmsService.manifest    |   6 +
 dom/mobilemessage/interfaces/moz.build        |   1 +
 .../interfaces/nsIGonkSmsService.idl          |  18 ++
 .../interfaces/nsISmsService.idl              |   2 +-
 dom/mobilemessage/moz.build                   |   5 +-
 dom/system/gonk/RadioInterfaceLayer.js        |   4 +-
 11 files changed, 188 insertions(+), 207 deletions(-)
 delete mode 100644 dom/mobilemessage/gonk/SmsService.cpp
 delete mode 100644 dom/mobilemessage/gonk/SmsService.h
 create mode 100644 dom/mobilemessage/gonk/SmsService.js
 create mode 100644 dom/mobilemessage/gonk/SmsService.manifest
 create mode 100644 dom/mobilemessage/interfaces/nsIGonkSmsService.idl

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
index 5f62bbc9fa7c..59ace3c21438 100644
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -451,6 +451,8 @@
 @BINPATH@/components/RILContentHelper.js
 @BINPATH@/components/RILSystemMessengerHelper.js
 @BINPATH@/components/RILSystemMessengerHelper.manifest
+@BINPATH@/components/SmsService.js
+@BINPATH@/components/SmsService.manifest
 @BINPATH@/components/TelephonyAudioService.js
 @BINPATH@/components/TelephonyAudioService.manifest
 @BINPATH@/components/TelephonyService.js
diff --git a/dom/mobilemessage/MobileMessageManager.cpp b/dom/mobilemessage/MobileMessageManager.cpp
index d6bbdd8ec7ed..6b1238f4bada 100644
--- a/dom/mobilemessage/MobileMessageManager.cpp
+++ b/dom/mobilemessage/MobileMessageManager.cpp
@@ -36,7 +36,7 @@
 #include "android/SmsService.h"
 #elif defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
 #include "nsIRilMobileMessageDatabaseService.h"
-#include "gonk/SmsService.h"
+#include "nsIGonkSmsService.h"
 #endif
 #include "nsXULAppAPI.h" // For XRE_GetProcessType()
 
@@ -711,7 +711,7 @@ NS_CreateSmsService()
 #ifdef MOZ_WIDGET_ANDROID
     smsService = new SmsService();
 #elif defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
-    smsService = new SmsService();
+    smsService = do_GetService(GONK_SMSSERVICE_CONTRACTID);
 #endif
   }
 
diff --git a/dom/mobilemessage/gonk/SmsService.cpp b/dom/mobilemessage/gonk/SmsService.cpp
deleted file mode 100644
index 36597f120444..000000000000
--- a/dom/mobilemessage/gonk/SmsService.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "SmsMessage.h"
-#include "SmsService.h"
-#include "mozilla/Preferences.h"
-#include "nsServiceManagerUtils.h"
-
-namespace {
-
-#define kPrefDefaultServiceId "dom.sms.defaultServiceId"
-
-uint32_t
-getDefaultServiceId()
-{
-  static const char* kPrefRilNumRadioInterfaces = "ril.numRadioInterfaces";
-  int32_t id = mozilla::Preferences::GetInt(kPrefDefaultServiceId, 0);
-  int32_t numRil = mozilla::Preferences::GetInt(kPrefRilNumRadioInterfaces, 1);
-
-  if (id >= numRil || id < 0) {
-    id = 0;
-  }
-
-  return id;
-}
-
-} // Anonymous namespace
-
-namespace mozilla {
-namespace dom {
-namespace mobilemessage {
-
-NS_IMPL_ISUPPORTS(SmsService,
-                  nsISmsService,
-                  nsIObserver)
-
-SmsService::SmsService()
-{
-  mRil = do_GetService("@mozilla.org/ril;1");
-  NS_WARN_IF_FALSE(mRil, "This shouldn't fail!");
-
-  // Initialize observer.
-  static const char* kObservedPrefs[] = {
-    kPrefDefaultServiceId,
-    nullptr
-  };
-  Preferences::AddStrongObservers(this, kObservedPrefs);
-  mDefaultServiceId = getDefaultServiceId();
-}
-
-/*
- * Implementation of nsIObserver.
- */
-
-NS_IMETHODIMP
-SmsService::Observe(nsISupports* aSubject,
-                    const char* aTopic,
-                    const char16_t* aData)
-{
-  if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) {
-    nsDependentString data(aData);
-    if (data.EqualsLiteral(kPrefDefaultServiceId)) {
-      mDefaultServiceId = getDefaultServiceId();
-    }
-    return NS_OK;
-  }
-
-  MOZ_ASSERT(false, "SmsService got unexpected topic!");
-  return NS_ERROR_UNEXPECTED;
-}
-
-/*
- * Implementation of nsISmsService.
- */
-
-NS_IMETHODIMP
-SmsService::GetSmsDefaultServiceId(uint32_t* aServiceId)
-{
-  *aServiceId = mDefaultServiceId;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-SmsService::GetSegmentInfoForText(const nsAString& aText,
-                                  nsIMobileMessageCallback* aRequest)
-{
-  nsCOMPtr<nsIRadioInterface> radioInterface;
-  if (mRil) {
-    mRil->GetRadioInterface(0, getter_AddRefs(radioInterface));
-  }
-  NS_ENSURE_TRUE(radioInterface, NS_ERROR_FAILURE);
-
-  return radioInterface->GetSegmentInfoForText(aText, aRequest);
-}
-
-NS_IMETHODIMP
-SmsService::Send(uint32_t aServiceId,
-                 const nsAString& aNumber,
-                 const nsAString& aMessage,
-                 bool aSilent,
-                 nsIMobileMessageCallback* aRequest)
-{
-  nsCOMPtr<nsIRadioInterface> radioInterface;
-  if (mRil) {
-    mRil->GetRadioInterface(aServiceId, getter_AddRefs(radioInterface));
-  }
-  NS_ENSURE_TRUE(radioInterface, NS_ERROR_FAILURE);
-
-  return radioInterface->SendSMS(aNumber, aMessage, aSilent, aRequest);
-}
-
-NS_IMETHODIMP
-SmsService::IsSilentNumber(const nsAString& aNumber,
-                           bool*            aIsSilent)
-{
-  *aIsSilent = mSilentNumbers.Contains(aNumber);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-SmsService::AddSilentNumber(const nsAString& aNumber)
-{
-  if (mSilentNumbers.Contains(aNumber)) {
-    return NS_ERROR_UNEXPECTED;
-  }
-
-  NS_ENSURE_TRUE(mSilentNumbers.AppendElement(aNumber), NS_ERROR_FAILURE);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-SmsService::RemoveSilentNumber(const nsAString& aNumber)
-{
-  if (!mSilentNumbers.Contains(aNumber)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  NS_ENSURE_TRUE(mSilentNumbers.RemoveElement(aNumber), NS_ERROR_FAILURE);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-SmsService::GetSmscAddress(uint32_t aServiceId,
-                           nsIMobileMessageCallback *aRequest)
-{
-  nsCOMPtr<nsIRadioInterface> radioInterface;
-  if (mRil) {
-    mRil->GetRadioInterface(aServiceId, getter_AddRefs(radioInterface));
-  }
-  NS_ENSURE_TRUE(radioInterface, NS_ERROR_FAILURE);
-
-  return radioInterface->GetSmscAddress(aRequest);
-}
-
-} // namespace mobilemessage
-} // namespace dom
-} // namespace mozilla
diff --git a/dom/mobilemessage/gonk/SmsService.h b/dom/mobilemessage/gonk/SmsService.h
deleted file mode 100644
index 4badee30ea47..000000000000
--- a/dom/mobilemessage/gonk/SmsService.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef mozilla_dom_mobilemessage_SmsService_h
-#define mozilla_dom_mobilemessage_SmsService_h
-
-#include "nsISmsService.h"
-#include "nsCOMPtr.h"
-#include "nsIObserver.h"
-#include "nsIRadioInterfaceLayer.h"
-#include "nsTArray.h"
-#include "nsString.h"
-#include "mozilla/Attributes.h"
-
-namespace mozilla {
-namespace dom {
-namespace mobilemessage {
-
-class SmsService MOZ_FINAL : public nsISmsService
-                           , public nsIObserver
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSISMSSERVICE
-  NS_DECL_NSIOBSERVER
-
-  SmsService();
-
-protected:
-  nsCOMPtr<nsIRadioInterfaceLayer> mRil;
-  nsTArray<nsString> mSilentNumbers;
-  uint32_t mDefaultServiceId;
-};
-
-} // namespace mobilemessage
-} // namespace dom
-} // namespace mozilla
-
-#endif // mozilla_dom_mobilemessage_SmsService_h
diff --git a/dom/mobilemessage/gonk/SmsService.js b/dom/mobilemessage/gonk/SmsService.js
new file mode 100644
index 000000000000..455833388333
--- /dev/null
+++ b/dom/mobilemessage/gonk/SmsService.js
@@ -0,0 +1,154 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+let RIL = {};
+Cu.import("resource://gre/modules/ril_consts.js", RIL);
+
+const GONK_SMSSERVICE_CONTRACTID = "@mozilla.org/sms/gonksmsservice;1";
+const GONK_SMSSERVICE_CID = Components.ID("{f9b9b5e2-73b4-11e4-83ff-a33e27428c86}");
+
+const NS_XPCOM_SHUTDOWN_OBSERVER_ID      = "xpcom-shutdown";
+const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID  = "nsPref:changed";
+
+const kPrefDefaultServiceId = "dom.sms.defaultServiceId";
+const kPrefRilDebuggingEnabled = "ril.debugging.enabled";
+const kPrefRilNumRadioInterfaces = "ril.numRadioInterfaces";
+
+XPCOMUtils.defineLazyGetter(this, "gRadioInterfaces", function() {
+  let ril = Cc["@mozilla.org/ril;1"].getService(Ci.nsIRadioInterfaceLayer);
+
+  let interfaces = [];
+  for (let i = 0; i < ril.numRadioInterfaces; i++) {
+    interfaces.push(ril.getRadioInterface(i));
+  }
+  return interfaces;
+});
+
+let DEBUG = RIL.DEBUG_RIL;
+function debug(s) {
+  dump("SmsService: " + s);
+}
+
+function SmsService() {
+  this._silentNumbers = [];
+  this.smsDefaultServiceId = this._getDefaultServiceId();
+
+  Services.prefs.addObserver(kPrefRilDebuggingEnabled, this, false);
+  Services.prefs.addObserver(kPrefDefaultServiceId, this, false);
+  Services.obs.addObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
+}
+SmsService.prototype = {
+  classID: GONK_SMSSERVICE_CID,
+
+  classInfo: XPCOMUtils.generateCI({classID: GONK_SMSSERVICE_CID,
+                                    contractID: GONK_SMSSERVICE_CONTRACTID,
+                                    classDescription: "SmsService",
+                                    interfaces: [Ci.nsISmsService,
+                                                 Ci.nsIGonkSmsService],
+                                    flags: Ci.nsIClassInfo.SINGLETON}),
+
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsISmsService,
+                                         Ci.nsIGonkSmsService,
+                                         Ci.nsIObserver]),
+
+  _updateDebugFlag: function() {
+    try {
+      DEBUG = RIL.DEBUG_RIL ||
+              Services.prefs.getBoolPref(kPrefRilDebuggingEnabled);
+    } catch (e) {}
+  },
+
+  _getDefaultServiceId: function() {
+    let id = Services.prefs.getIntPref(kPrefDefaultServiceId);
+    let numRil = Services.prefs.getIntPref(kPrefRilNumRadioInterfaces);
+
+    if (id >= numRil || id < 0) {
+      id = 0;
+    }
+
+    return id;
+  },
+
+  /**
+   * nsISmsService interface
+   */
+  smsDefaultServiceId: 0,
+
+  getSegmentInfoForText: function(aText, aRequest) {
+    gRadioInterfaces[0].getSegmentInfoForText(aText, aRequest);
+  },
+
+  send: function(aServiceId, aNumber, aMessage, aSilent, aRequest) {
+    if (aServiceId > (gRadioInterfaces.length - 1)) {
+      throw Cr.NS_ERROR_INVALID_ARG;
+    }
+
+    gRadioInterfaces[aServiceId].sendSMS(aNumber, aMessage, aSilent, aRequest);
+  },
+
+  // An array of slient numbers.
+  _silentNumbers: null,
+  isSilentNumber: function(aNumber) {
+    return this._silentNumbers.indexOf(aNumber) >= 0;
+  },
+
+  addSilentNumber: function(aNumber) {
+    if (this.isSilentNumber(aNumber)) {
+      throw Cr.NS_ERROR_UNEXPECTED;
+    }
+
+    this._silentNumbers.push(aNumber);
+  },
+
+  removeSilentNumber: function(aNumber) {
+   let index = this._silentNumbers.indexOf(aNumber);
+   if (index < 0) {
+     throw Cr.NS_ERROR_INVALID_ARG;
+   }
+
+   this._silentNumbers.splice(index, 1);
+  },
+
+  getSmscAddress: function(aServiceId, aRequest) {
+    if (aServiceId > (gRadioInterfaces.length - 1)) {
+      throw Cr.NS_ERROR_INVALID_ARG;
+    }
+
+    gRadioInterfaces[aServiceId].getSmscAddress(aRequest);
+  },
+
+  /**
+   * TODO: nsIGonkSmsService interface
+   */
+
+  /**
+   * nsIObserver interface.
+   */
+  observe: function(aSubject, aTopic, aData) {
+    switch (aTopic) {
+      case NS_PREFBRANCH_PREFCHANGE_TOPIC_ID:
+        if (aData === kPrefRilDebuggingEnabled) {
+          this._updateDebugFlag();
+        }
+        else if (aData === kPrefDefaultServiceId) {
+          this.smsDefaultServiceId = this._getDefaultServiceId();
+        }
+        break;
+      case NS_XPCOM_SHUTDOWN_OBSERVER_ID:
+        Services.prefs.removeObserver(kPrefRilDebuggingEnabled, this);
+        Services.prefs.removeObserver(kPrefDefaultServiceId, this);
+        Services.obs.removeObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
+        break;
+    }
+  }
+};
+
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory([SmsService]);
diff --git a/dom/mobilemessage/gonk/SmsService.manifest b/dom/mobilemessage/gonk/SmsService.manifest
new file mode 100644
index 000000000000..8d86800feb43
--- /dev/null
+++ b/dom/mobilemessage/gonk/SmsService.manifest
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+component {f9b9b5e2-73b4-11e4-83ff-a33e27428c86} SmsService.js
+contract @mozilla.org/sms/gonksmsservice;1 {f9b9b5e2-73b4-11e4-83ff-a33e27428c86}
\ No newline at end of file
diff --git a/dom/mobilemessage/interfaces/moz.build b/dom/mobilemessage/interfaces/moz.build
index dc35b6db0357..dd7cedfd9bfc 100644
--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -20,6 +20,7 @@ XPIDL_SOURCES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
+        'nsIGonkSmsService.idl',
         'nsIRilMobileMessageDatabaseService.idl',
         'nsISmsMessenger.idl',
     ]
diff --git a/dom/mobilemessage/interfaces/nsIGonkSmsService.idl b/dom/mobilemessage/interfaces/nsIGonkSmsService.idl
new file mode 100644
index 000000000000..a3c0a53492ea
--- /dev/null
+++ b/dom/mobilemessage/interfaces/nsIGonkSmsService.idl
@@ -0,0 +1,18 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsISmsService.idl"
+
+%{C++
+#define GONK_SMSSERVICE_CONTRACTID \
+        "@mozilla.org/sms/gonksmsservice;1"
+%}
+
+[scriptable, uuid(63fab75e-73b4-11e4-a10d-dbfa9d05a4f4)]
+interface nsIGonkSmsService : nsISmsService
+{
+  /**
+   * TODO: define callback to receive message from the network.
+   */
+};
\ No newline at end of file
diff --git a/dom/mobilemessage/interfaces/nsISmsService.idl b/dom/mobilemessage/interfaces/nsISmsService.idl
index 27615018d581..4d33dfa5ee5d 100644
--- a/dom/mobilemessage/interfaces/nsISmsService.idl
+++ b/dom/mobilemessage/interfaces/nsISmsService.idl
@@ -12,7 +12,7 @@ interface nsIMobileMessageCallback;
 #define SMS_SERVICE_CONTRACTID "@mozilla.org/sms/smsservice;1"
 %}
 
-[scriptable, builtinclass, uuid(8f86d068-698e-11e4-9470-8f75a088b84a)]
+[scriptable, uuid(31626940-73b4-11e4-8b03-1724e1d8a6a1)]
 interface nsISmsService : nsISupports
 {
   /**
diff --git a/dom/mobilemessage/moz.build b/dom/mobilemessage/moz.build
index 51e9c3e0415d..71ded4d211f8 100644
--- a/dom/mobilemessage/moz.build
+++ b/dom/mobilemessage/moz.build
@@ -34,9 +34,8 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
         'gonk/MmsService.manifest',
         'gonk/MobileMessageDatabaseService.js',
         'gonk/MobileMessageDatabaseService.manifest',
-    ]
-    UNIFIED_SOURCES += [
-        'gonk/SmsService.cpp',
+        'gonk/SmsService.js',
+        'gonk/SmsService.manifest',
     ]
 
 EXPORTS.mozilla.dom += [
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index c256f8983cb7..068d188404fc 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -145,8 +145,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageService",
                                    "nsIMobileMessageService");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gSmsService",
-                                   "@mozilla.org/sms/smsservice;1",
-                                   "nsISmsService");
+                                   "@mozilla.org/sms/gonksmsservice;1",
+                                   "nsIGonkSmsService");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageDatabaseService",
                                    "@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1",

From 75a73fbbfdc014322695ad85b530937a9c194ede Mon Sep 17 00:00:00 2001
From: Bevis Tseng <btseng@mozilla.com>
Date: Wed, 26 Nov 2014 20:02:54 +0800
Subject: [PATCH 131/183] Bug 873351 - Part 2: Refactor SMS Requests from
 RadioInterfaceLayer to SmsService. r=echen

---
 dom/mobilemessage/gonk/SmsSegmentHelper.jsm   | 426 +++++++++++
 dom/mobilemessage/gonk/SmsService.js          | 428 ++++++++++-
 dom/mobilemessage/moz.build                   |   1 +
 .../tests/xpcshell/test_sms_segment_helper.js | 191 +++++
 dom/mobilemessage/tests/xpcshell/xpcshell.ini |   2 +
 dom/system/gonk/RadioInterfaceLayer.js        | 702 ------------------
 dom/system/gonk/nsIRadioInterfaceLayer.idl    |  15 +-
 dom/system/gonk/tests/header_helpers.js       |  17 +-
 dom/system/gonk/tests/test_ril_worker_sms.js  |  16 +-
 .../tests/test_ril_worker_sms_segment_info.js | 200 +----
 10 files changed, 1073 insertions(+), 925 deletions(-)
 create mode 100644 dom/mobilemessage/gonk/SmsSegmentHelper.jsm
 create mode 100644 dom/mobilemessage/tests/xpcshell/test_sms_segment_helper.js

diff --git a/dom/mobilemessage/gonk/SmsSegmentHelper.jsm b/dom/mobilemessage/gonk/SmsSegmentHelper.jsm
new file mode 100644
index 000000000000..ba5e0a4fd10a
--- /dev/null
+++ b/dom/mobilemessage/gonk/SmsSegmentHelper.jsm
@@ -0,0 +1,426 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+
+let RIL = {};
+Cu.import("resource://gre/modules/ril_consts.js", RIL);
+
+/**
+ * SmsSegmentHelper
+ */
+this.SmsSegmentHelper = {
+  /**
+   * Get valid SMS concatenation reference number.
+   */
+  _segmentRef: 0,
+  get nextSegmentRef() {
+    let ref = this._segmentRef++;
+
+    this._segmentRef %= (this.segmentRef16Bit ? 65535 : 255);
+
+    // 0 is not a valid SMS concatenation reference number.
+    return ref + 1;
+  },
+
+  /**
+   * Calculate encoded length using specified locking/single shift table
+   *
+   * @param aMessage
+   *        message string to be encoded.
+   * @param aLangTable
+   *        locking shift table string.
+   * @param aLangShiftTable
+   *        single shift table string.
+   * @param aStrict7BitEncoding [Optional]
+   *        Enable Latin characters replacement with corresponding
+   *        ones in GSM SMS 7-bit default alphabet.
+   *
+   * @return encoded length in septets.
+   *
+   * @note The algorithm used in this function must match exactly with
+   *       GsmPDUHelper#writeStringAsSeptets.
+   */
+  countGsm7BitSeptets: function(aMessage, aLangTable, aLangShiftTable, aStrict7BitEncoding) {
+    let length = 0;
+    for (let msgIndex = 0; msgIndex < aMessage.length; msgIndex++) {
+      let c = aMessage.charAt(msgIndex);
+      if (aStrict7BitEncoding) {
+        c = RIL.GSM_SMS_STRICT_7BIT_CHARMAP[c] || c;
+      }
+
+      let septet = aLangTable.indexOf(c);
+
+      // According to 3GPP TS 23.038, section 6.1.1 General notes, "The
+      // characters marked '1)' are not used but are displayed as a space."
+      if (septet == RIL.PDU_NL_EXTENDED_ESCAPE) {
+        continue;
+      }
+
+      if (septet >= 0) {
+        length++;
+        continue;
+      }
+
+      septet = aLangShiftTable.indexOf(c);
+      if (septet < 0) {
+        if (!aStrict7BitEncoding) {
+          return -1;
+        }
+
+        // Bug 816082, when aStrict7BitEncoding is enabled, we should replace
+        // characters that can't be encoded with GSM 7-Bit alphabets with '*'.
+        c = "*";
+        if (aLangTable.indexOf(c) >= 0) {
+          length++;
+        } else if (aLangShiftTable.indexOf(c) >= 0) {
+          length += 2;
+        } else {
+          // We can't even encode a '*' character with current configuration.
+          return -1;
+        }
+
+        continue;
+      }
+
+      // According to 3GPP TS 23.038 B.2, "This code represents a control
+      // character and therefore must not be used for language specific
+      // characters."
+      if (septet == RIL.PDU_NL_RESERVED_CONTROL) {
+        continue;
+      }
+
+      // The character is not found in locking shfit table, but could be
+      // encoded as <escape><char> with single shift table. Note that it's
+      // still possible for septet to has the value of PDU_NL_EXTENDED_ESCAPE,
+      // but we can display it as a space in this case as said in previous
+      // comment.
+      length += 2;
+    }
+
+    return length;
+  },
+
+  /**
+   * Calculate user data length of specified message string encoded in GSM 7Bit
+   * alphabets.
+   *
+   * @param aMessage
+   *        a message string to be encoded.
+   * @param aStrict7BitEncoding [Optional]
+   *        Enable Latin characters replacement with corresponding
+   *        ones in GSM SMS 7-bit default alphabet.
+   *
+   * @return null or an options object with attributes `dcs`,
+   *         `userDataHeaderLength`, `encodedFullBodyLength`, `langIndex`,
+   *         `langShiftIndex`, `segmentMaxSeq` set.
+   *
+   * @see #calculateUserDataLength().
+   *
+   * |enabledGsmTableTuples|:
+   *   List of tuples of national language identifier pairs.
+   *   TODO: Support static/runtime settings, see bug 733331.
+   * |segmentRef16Bit|:
+   *   Use 16-bit reference number for concatenated outgoint messages.
+   *   TODO: Support static/runtime settings, see bug 733331.
+   */
+  enabledGsmTableTuples: [
+    [RIL.PDU_NL_IDENTIFIER_DEFAULT, RIL.PDU_NL_IDENTIFIER_DEFAULT],
+  ],
+  segmentRef16Bit: false,
+  calculateUserDataLength7Bit: function(aMessage, aStrict7BitEncoding) {
+    let options = null;
+    let minUserDataSeptets = Number.MAX_VALUE;
+    for (let i = 0; i < this.enabledGsmTableTuples.length; i++) {
+      let [langIndex, langShiftIndex] = this.enabledGsmTableTuples[i];
+
+      const langTable = RIL.PDU_NL_LOCKING_SHIFT_TABLES[langIndex];
+      const langShiftTable = RIL.PDU_NL_SINGLE_SHIFT_TABLES[langShiftIndex];
+
+      let bodySeptets = this.countGsm7BitSeptets(aMessage,
+                                                  langTable,
+                                                  langShiftTable,
+                                                  aStrict7BitEncoding);
+      if (bodySeptets < 0) {
+        continue;
+      }
+
+      let headerLen = 0;
+      if (langIndex != RIL.PDU_NL_IDENTIFIER_DEFAULT) {
+        headerLen += 3; // IEI + len + langIndex
+      }
+      if (langShiftIndex != RIL.PDU_NL_IDENTIFIER_DEFAULT) {
+        headerLen += 3; // IEI + len + langShiftIndex
+      }
+
+      // Calculate full user data length, note the extra byte is for header len
+      let headerSeptets = Math.ceil((headerLen ? headerLen + 1 : 0) * 8 / 7);
+      let segmentSeptets = RIL.PDU_MAX_USER_DATA_7BIT;
+      if ((bodySeptets + headerSeptets) > segmentSeptets) {
+        headerLen += this.segmentRef16Bit ? 6 : 5;
+        headerSeptets = Math.ceil((headerLen + 1) * 8 / 7);
+        segmentSeptets -= headerSeptets;
+      }
+
+      let segments = Math.ceil(bodySeptets / segmentSeptets);
+      let userDataSeptets = bodySeptets + headerSeptets * segments;
+      if (userDataSeptets >= minUserDataSeptets) {
+        continue;
+      }
+
+      minUserDataSeptets = userDataSeptets;
+
+      options = {
+        dcs: RIL.PDU_DCS_MSG_CODING_7BITS_ALPHABET,
+        encodedFullBodyLength: bodySeptets,
+        userDataHeaderLength: headerLen,
+        langIndex: langIndex,
+        langShiftIndex: langShiftIndex,
+        segmentMaxSeq: segments,
+        segmentChars: segmentSeptets,
+      };
+    }
+
+    return options;
+  },
+
+  /**
+   * Calculate user data length of specified message string encoded in UCS2.
+   *
+   * @param aMessage
+   *        a message string to be encoded.
+   *
+   * @return an options object with attributes `dcs`, `userDataHeaderLength`,
+   *         `encodedFullBodyLength`, `segmentMaxSeq` set.
+   *
+   * @see #calculateUserDataLength().
+   */
+  calculateUserDataLengthUCS2: function(aMessage) {
+    let bodyChars = aMessage.length;
+    let headerLen = 0;
+    let headerChars = Math.ceil((headerLen ? headerLen + 1 : 0) / 2);
+    let segmentChars = RIL.PDU_MAX_USER_DATA_UCS2;
+    if ((bodyChars + headerChars) > segmentChars) {
+      headerLen += this.segmentRef16Bit ? 6 : 5;
+      headerChars = Math.ceil((headerLen + 1) / 2);
+      segmentChars -= headerChars;
+    }
+
+    let segments = Math.ceil(bodyChars / segmentChars);
+
+    return {
+      dcs: RIL.PDU_DCS_MSG_CODING_16BITS_ALPHABET,
+      encodedFullBodyLength: bodyChars * 2,
+      userDataHeaderLength: headerLen,
+      segmentMaxSeq: segments,
+      segmentChars: segmentChars,
+    };
+  },
+
+  /**
+   * Calculate user data length and its encoding.
+   *
+   * @param aMessage
+   *        a message string to be encoded.
+   * @param aStrict7BitEncoding [Optional]
+   *        Enable Latin characters replacement with corresponding
+   *        ones in GSM SMS 7-bit default alphabet.
+   *
+   * @return an options object with some or all of following attributes set:
+   *
+   * @param dcs
+   *        Data coding scheme. One of the PDU_DCS_MSG_CODING_*BITS_ALPHABET
+   *        constants.
+   * @param userDataHeaderLength
+   *        Length of embedded user data header, in bytes. The whole header
+   *        size will be userDataHeaderLength + 1; 0 for no header.
+   * @param encodedFullBodyLength
+   *        Length of the message body when encoded with the given DCS. For
+   *        UCS2, in bytes; for 7-bit, in septets.
+   * @param langIndex
+   *        Table index used for normal 7-bit encoded character lookup.
+   * @param langShiftIndex
+   *        Table index used for escaped 7-bit encoded character lookup.
+   * @param segmentMaxSeq
+   *        Max sequence number of a multi-part messages, or 1 for single one.
+   *        This number might not be accurate for a multi-part message until
+   *        it's processed by #fragmentText() again.
+   */
+  calculateUserDataLength: function(aMessage, aStrict7BitEncoding) {
+    let options = this.calculateUserDataLength7Bit(aMessage, aStrict7BitEncoding);
+    if (!options) {
+      options = this.calculateUserDataLengthUCS2(aMessage);
+    }
+
+    return options;
+  },
+
+  /**
+   * Fragment GSM 7-Bit encodable string for transmission.
+   *
+   * @param aText
+   *        text string to be fragmented.
+   * @param aLangTable
+   *        locking shift table string.
+   * @param aLangShiftTable
+   *        single shift table string.
+   * @param aSegmentSeptets
+   *        Number of available spetets per segment.
+   * @param aStrict7BitEncoding [Optional]
+   *        Enable Latin characters replacement with corresponding
+   *        ones in GSM SMS 7-bit default alphabet.
+   *
+   * @return an array of objects. See #fragmentText() for detailed definition.
+   */
+  fragmentText7Bit: function(aText, aLangTable, aLangShiftTable, aSegmentSeptets, aStrict7BitEncoding) {
+    let ret = [];
+    let body = "", len = 0;
+    // If the message is empty, we only push the empty message to ret.
+    if (aText.length === 0) {
+      ret.push({
+        body: aText,
+        encodedBodyLength: aText.length,
+      });
+      return ret;
+    }
+
+    for (let i = 0, inc = 0; i < aText.length; i++) {
+      let c = aText.charAt(i);
+      if (aStrict7BitEncoding) {
+        c = RIL.GSM_SMS_STRICT_7BIT_CHARMAP[c] || c;
+      }
+
+      let septet = aLangTable.indexOf(c);
+      if (septet == RIL.PDU_NL_EXTENDED_ESCAPE) {
+        continue;
+      }
+
+      if (septet >= 0) {
+        inc = 1;
+      } else {
+        septet = aLangShiftTable.indexOf(c);
+        if (septet == RIL.PDU_NL_RESERVED_CONTROL) {
+          continue;
+        }
+
+        inc = 2;
+        if (septet < 0) {
+          if (!aStrict7BitEncoding) {
+            throw new Error("Given text cannot be encoded with GSM 7-bit Alphabet!");
+          }
+
+          // Bug 816082, when aStrict7BitEncoding is enabled, we should replace
+          // characters that can't be encoded with GSM 7-Bit alphabets with '*'.
+          c = "*";
+          if (aLangTable.indexOf(c) >= 0) {
+            inc = 1;
+          }
+        }
+      }
+
+      if ((len + inc) > aSegmentSeptets) {
+        ret.push({
+          body: body,
+          encodedBodyLength: len,
+        });
+        body = c;
+        len = inc;
+      } else {
+        body += c;
+        len += inc;
+      }
+    }
+
+    if (len) {
+      ret.push({
+        body: body,
+        encodedBodyLength: len,
+      });
+    }
+
+    return ret;
+  },
+
+  /**
+   * Fragment UCS2 encodable string for transmission.
+   *
+   * @param aText
+   *        text string to be fragmented.
+   * @param aSegmentChars
+   *        Number of available characters per segment.
+   *
+   * @return an array of objects. See #fragmentText() for detailed definition.
+   */
+  fragmentTextUCS2: function(aText, aSegmentChars) {
+    let ret = [];
+    // If the message is empty, we only push the empty message to ret.
+    if (aText.length === 0) {
+      ret.push({
+        body: aText,
+        encodedBodyLength: aText.length,
+      });
+      return ret;
+    }
+
+    for (let offset = 0; offset < aText.length; offset += aSegmentChars) {
+      let str = aText.substr(offset, aSegmentChars);
+      ret.push({
+        body: str,
+        encodedBodyLength: str.length * 2,
+      });
+    }
+
+    return ret;
+  },
+
+  /**
+   * Fragment string for transmission.
+   *
+   * Fragment input text string into an array of objects that contains
+   * attributes `body`, substring for this segment, `encodedBodyLength`,
+   * length of the encoded segment body in septets.
+   *
+   * @param aText
+   *        Text string to be fragmented.
+   * @param aOptions [Optional]
+   *        Optional pre-calculated option object. The output array will be
+   *        stored at aOptions.segments if there are multiple segments.
+   * @param aStrict7BitEncoding [Optional]
+   *        Enable Latin characters replacement with corresponding
+   *        ones in GSM SMS 7-bit default alphabet.
+   *
+   * @return Populated options object.
+   */
+  fragmentText: function(aText, aOptions, aStrict7BitEncoding) {
+    if (!aOptions) {
+      aOptions = this.calculateUserDataLength(aText, aStrict7BitEncoding);
+    }
+
+    if (aOptions.dcs == RIL.PDU_DCS_MSG_CODING_7BITS_ALPHABET) {
+      const langTable = RIL.PDU_NL_LOCKING_SHIFT_TABLES[aOptions.langIndex];
+      const langShiftTable = RIL.PDU_NL_SINGLE_SHIFT_TABLES[aOptions.langShiftIndex];
+      aOptions.segments = this.fragmentText7Bit(aText,
+                                                langTable, langShiftTable,
+                                                aOptions.segmentChars,
+                                                aStrict7BitEncoding);
+    } else {
+      aOptions.segments = this.fragmentTextUCS2(aText,
+                                                aOptions.segmentChars);
+    }
+
+    // Re-sync aOptions.segmentMaxSeq with actual length of returning array.
+    aOptions.segmentMaxSeq = aOptions.segments.length;
+
+    if (aOptions.segmentMaxSeq > 1) {
+      aOptions.segmentRef16Bit = this.segmentRef16Bit;
+      aOptions.segmentRef = this.nextSegmentRef;
+    }
+
+    return aOptions;
+  }
+};
+
+this.EXPORTED_SYMBOLS = [ 'SmsSegmentHelper' ];
\ No newline at end of file
diff --git a/dom/mobilemessage/gonk/SmsService.js b/dom/mobilemessage/gonk/SmsService.js
index 455833388333..8adf1b0df5a8 100644
--- a/dom/mobilemessage/gonk/SmsService.js
+++ b/dom/mobilemessage/gonk/SmsService.js
@@ -22,6 +22,19 @@ const kPrefDefaultServiceId = "dom.sms.defaultServiceId";
 const kPrefRilDebuggingEnabled = "ril.debugging.enabled";
 const kPrefRilNumRadioInterfaces = "ril.numRadioInterfaces";
 
+const kSmsReceivedObserverTopic          = "sms-received";
+const kSilentSmsReceivedObserverTopic    = "silent-sms-received";
+const kSmsSendingObserverTopic           = "sms-sending";
+const kSmsSentObserverTopic              = "sms-sent";
+const kSmsFailedObserverTopic            = "sms-failed";
+const kSmsDeliverySuccessObserverTopic   = "sms-delivery-success";
+const kSmsDeliveryErrorObserverTopic     = "sms-delivery-error";
+
+const DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED = "received";
+const DOM_MOBILE_MESSAGE_DELIVERY_SENDING  = "sending";
+const DOM_MOBILE_MESSAGE_DELIVERY_SENT     = "sent";
+const DOM_MOBILE_MESSAGE_DELIVERY_ERROR    = "error";
+
 XPCOMUtils.defineLazyGetter(this, "gRadioInterfaces", function() {
   let ril = Cc["@mozilla.org/ril;1"].getService(Ci.nsIRadioInterfaceLayer);
 
@@ -32,6 +45,34 @@ XPCOMUtils.defineLazyGetter(this, "gRadioInterfaces", function() {
   return interfaces;
 });
 
+XPCOMUtils.defineLazyGetter(this, "gSmsSegmentHelper", function() {
+  let ns = {};
+  Cu.import("resource://gre/modules/SmsSegmentHelper.jsm", ns);
+  return ns.SmsSegmentHelper;
+});
+
+XPCOMUtils.defineLazyGetter(this, "gPhoneNumberUtils", function() {
+  let ns = {};
+  Cu.import("resource://gre/modules/PhoneNumberUtils.jsm", ns);
+  return ns.PhoneNumberUtils;
+});
+
+XPCOMUtils.defineLazyServiceGetter(this, "gMobileConnectionService",
+                                   "@mozilla.org/mobileconnection/mobileconnectionservice;1",
+                                   "nsIMobileConnectionService");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageDatabaseService",
+                                   "@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1",
+                                   "nsIRilMobileMessageDatabaseService");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageService",
+                                   "@mozilla.org/mobilemessage/mobilemessageservice;1",
+                                   "nsIMobileMessageService");
+
+XPCOMUtils.defineLazyServiceGetter(this, "gSmsMessenger",
+                                   "@mozilla.org/ril/system-messenger-helper;1",
+                                   "nsISmsMessenger");
+
 let DEBUG = RIL.DEBUG_RIL;
 function debug(s) {
   dump("SmsService: " + s);
@@ -77,13 +118,279 @@ SmsService.prototype = {
     return id;
   },
 
+  _getPhoneNumber: function(aServiceId) {
+    let number;
+    // Get the proper IccInfo based on the current card type.
+    try {
+      let iccInfo = null;
+      let baseIccInfo = gRadioInterfaces[aServiceId].rilContext.iccInfo;
+      if (baseIccInfo.iccType === 'ruim' || baseIccInfo.iccType === 'csim') {
+        iccInfo = baseIccInfo.QueryInterface(Ci.nsICdmaIccInfo);
+        number = iccInfo.mdn;
+      } else {
+        iccInfo = baseIccInfo.QueryInterface(Ci.nsIGsmIccInfo);
+        number = iccInfo.msisdn;
+      }
+    } catch (e) {
+      if (DEBUG) {
+       debug("Exception - QueryInterface failed on iccinfo for GSM/CDMA info");
+      }
+      return null;
+    }
+
+    return number;
+  },
+
+  _getIccId: function(aServiceId) {
+    let iccInfo = gRadioInterfaces[aServiceId].rilContext.iccInfo;
+
+    if (!iccInfo) {
+      return null;
+    }
+
+    return iccInfo.iccid;
+  },
+
+  _convertSmsMessageClass: function(aMessageClass) {
+    let index = RIL.GECKO_SMS_MESSAGE_CLASSES.indexOf(aMessageClass);
+
+    if (index < 0) {
+      throw new Error("Invalid MessageClass: " + aMessageClass);
+    }
+
+    return index;
+  },
+
+  _convertSmsDelivery: function(aDelivery) {
+    let index = [DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED,
+                 DOM_MOBILE_MESSAGE_DELIVERY_SENDING,
+                 DOM_MOBILE_MESSAGE_DELIVERY_SENT,
+                 DOM_MOBILE_MESSAGE_DELIVERY_ERROR].indexOf(aDelivery);
+
+    if (index < 0) {
+      throw new Error("Invalid Delivery: " + aDelivery);
+    }
+
+    return index;
+  },
+
+  _convertSmsDeliveryStatus: function(aDeliveryStatus) {
+    let index = [RIL.GECKO_SMS_DELIVERY_STATUS_NOT_APPLICABLE,
+                 RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS,
+                 RIL.GECKO_SMS_DELIVERY_STATUS_PENDING,
+                 RIL.GECKO_SMS_DELIVERY_STATUS_ERROR].indexOf(aDeliveryStatus);
+
+    if (index < 0) {
+      throw new Error("Invalid DeliveryStatus: " + aDeliveryStatus);
+    }
+
+    return index;
+  },
+
+  _sendToTheAir: function(aServiceId, aDomMessage, aSilent, aOptions, aRequest) {
+    // Keep current SMS message info for sent/delivered notifications
+    let sentMessage = aDomMessage;
+    let requestStatusReport = aOptions.requestStatusReport;
+
+    gRadioInterfaces[aServiceId].sendWorkerMessage("sendSMS",
+                                                   aOptions,
+                                                   (aResponse) => {
+      // Failed to send SMS out.
+      if (aResponse.errorMsg) {
+        let error = Ci.nsIMobileMessageCallback.UNKNOWN_ERROR;
+        switch (aResponse.errorMsg) {
+          case RIL.ERROR_RADIO_NOT_AVAILABLE:
+            error = Ci.nsIMobileMessageCallback.NO_SIGNAL_ERROR;
+            break;
+          case RIL.ERROR_FDN_CHECK_FAILURE:
+            error = Ci.nsIMobileMessageCallback.FDN_CHECK_ERROR;
+            break;
+        }
+
+        if (aSilent) {
+          // There is no way to modify nsIDOMMozSmsMessage attributes as they
+          // are read only so we just create a new sms instance to send along
+          // with the notification.
+          aRequest.notifySendMessageFailed(
+            error,
+            gMobileMessageService.createSmsMessage(sentMessage.id,
+                                                   sentMessage.threadId,
+                                                   sentMessage.iccId,
+                                                   DOM_MOBILE_MESSAGE_DELIVERY_ERROR,
+                                                   RIL.GECKO_SMS_DELIVERY_STATUS_ERROR,
+                                                   sentMessage.sender,
+                                                   sentMessage.receiver,
+                                                   sentMessage.body,
+                                                   sentMessage.messageClass,
+                                                   sentMessage.timestamp,
+                                                   0,
+                                                   0,
+                                                   sentMessage.read));
+          return false;
+        }
+
+        gMobileMessageDatabaseService
+          .setMessageDeliveryByMessageId(aDomMessage.id,
+                                         null,
+                                         DOM_MOBILE_MESSAGE_DELIVERY_ERROR,
+                                         RIL.GECKO_SMS_DELIVERY_STATUS_ERROR,
+                                         null,
+                                         (aRv, aDomMessage) => {
+          // TODO bug 832140 handle !Components.isSuccessCode(aRv)
+          aRequest.notifySendMessageFailed(error, aDomMessage);
+          Services.obs.notifyObservers(aDomMessage, kSmsFailedObserverTopic, null);
+        });
+        return false;
+      } // End of send failure.
+
+      // Message was sent to SMSC.
+      if (!aResponse.deliveryStatus) {
+        if (aSilent) {
+          // There is no way to modify nsIDOMMozSmsMessage attributes as they
+          // are read only so we just create a new sms instance to send along
+          // with the notification.
+          aRequest.notifyMessageSent(
+            gMobileMessageService.createSmsMessage(sentMessage.id,
+                                                   sentMessage.threadId,
+                                                   sentMessage.iccId,
+                                                   DOM_MOBILE_MESSAGE_DELIVERY_SENT,
+                                                   sentMessage.deliveryStatus,
+                                                   sentMessage.sender,
+                                                   sentMessage.receiver,
+                                                   sentMessage.body,
+                                                   sentMessage.messageClass,
+                                                   sentMessage.timestamp,
+                                                   Date.now(),
+                                                   0,
+                                                   sentMessage.read));
+          // We don't wait for SMS-STATUS-REPORT for silent one.
+          return false;
+        }
+
+        gMobileMessageDatabaseService
+          .setMessageDeliveryByMessageId(sentMessage.id,
+                                         null,
+                                         DOM_MOBILE_MESSAGE_DELIVERY_SENT,
+                                         sentMessage.deliveryStatus,
+                                         null,
+                                         (aRv, aDomMessage) => {
+          // TODO bug 832140 handle !Components.isSuccessCode(aRv)
+
+          if (requestStatusReport) {
+            // Update the sentMessage and wait for the status report.
+            sentMessage = aDomMessage;
+          }
+
+          this._broadcastSmsSystemMessage(
+            Ci.nsISmsMessenger.NOTIFICATION_TYPE_SENT, aDomMessage);
+          aRequest.notifyMessageSent(aDomMessage);
+          Services.obs.notifyObservers(aDomMessage, kSmsSentObserverTopic, null);
+        });
+
+        // Keep this callback if we have status report waiting.
+        return requestStatusReport;
+      } // End of Message Sent to SMSC.
+
+      // Got valid deliveryStatus for the delivery to the remote party when
+      // the status report is requested.
+      gMobileMessageDatabaseService
+        .setMessageDeliveryByMessageId(sentMessage.id,
+                                       null,
+                                       sentMessage.delivery,
+                                       aResponse.deliveryStatus,
+                                       null,
+                                       (aRv, aDomMessage) => {
+        // TODO bug 832140 handle !Components.isSuccessCode(aRv)
+
+        let topic = (aResponse.deliveryStatus ==
+                     RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS)
+                    ? kSmsDeliverySuccessObserverTopic
+                    : kSmsDeliveryErrorObserverTopic;
+
+        // Broadcasting a "sms-delivery-success" system message to open apps.
+        if (topic == kSmsDeliverySuccessObserverTopic) {
+          this._broadcastSmsSystemMessage(
+            Ci.nsISmsMessenger.NOTIFICATION_TYPE_DELIVERY_SUCCESS, aDomMessage);
+        }
+
+        // Notifying observers the delivery status is updated.
+        Services.obs.notifyObservers(aDomMessage, topic, null);
+      });
+
+      // Send transaction has ended completely.
+      return false;
+    });
+  },
+
+  /**
+   * A helper to broadcast the system message to launch registered apps
+   * like Costcontrol, Notification and Message app... etc.
+   *
+   * @param aNotificationType
+   *        Ci.nsISmsMessenger.NOTIFICATION_TYPE_*.
+   * @param aDomMessage
+   *        The nsIDOMMozSmsMessage object.
+   */
+  _broadcastSmsSystemMessage: function(aNotificationType, aDomMessage) {
+    if (DEBUG) debug("Broadcasting the SMS system message: " + aNotificationType);
+
+    // Sadly we cannot directly broadcast the aDomMessage object
+    // because the system message mechamism will rewrap the object
+    // based on the content window, which needs to know the properties.
+    try {
+      gSmsMessenger.notifySms(aNotificationType,
+                              aDomMessage.id,
+                              aDomMessage.threadId,
+                              aDomMessage.iccId,
+                              this._convertSmsDelivery(
+                                aDomMessage.delivery),
+                              this._convertSmsDeliveryStatus(
+                                aDomMessage.deliveryStatus),
+                              aDomMessage.sender,
+                              aDomMessage.receiver,
+                              aDomMessage.body,
+                              this._convertSmsMessageClass(
+                                aDomMessage.messageClass),
+                              aDomMessage.timestamp,
+                              aDomMessage.sentTimestamp,
+                              aDomMessage.deliveryTimestamp,
+                              aDomMessage.read);
+    } catch (e) {
+      if (DEBUG) {
+        debug("Failed to _broadcastSmsSystemMessage: " + e);
+      }
+    }
+  },
+
   /**
    * nsISmsService interface
    */
   smsDefaultServiceId: 0,
 
   getSegmentInfoForText: function(aText, aRequest) {
-    gRadioInterfaces[0].getSegmentInfoForText(aText, aRequest);
+    let strict7BitEncoding;
+    try {
+      strict7BitEncoding = Services.prefs.getBoolPref("dom.sms.strict7BitEncoding");
+    } catch (e) {
+      strict7BitEncoding = false;
+    }
+
+    let options = gSmsSegmentHelper.fragmentText(aText, null, strict7BitEncoding);
+    let charsInLastSegment;
+    if (options.segmentMaxSeq) {
+      let lastSegment = options.segments[options.segmentMaxSeq - 1];
+      charsInLastSegment = lastSegment.encodedBodyLength;
+      if (options.dcs == RIL.PDU_DCS_MSG_CODING_16BITS_ALPHABET) {
+        // In UCS2 encoding, encodedBodyLength is in octets.
+        charsInLastSegment /= 2;
+      }
+    } else {
+      charsInLastSegment = 0;
+    }
+
+    aRequest.notifySegmentInfoForTextGot(options.segmentMaxSeq,
+                                         options.segmentChars,
+                                         options.segmentChars - charsInLastSegment);
   },
 
   send: function(aServiceId, aNumber, aMessage, aSilent, aRequest) {
@@ -91,7 +398,113 @@ SmsService.prototype = {
       throw Cr.NS_ERROR_INVALID_ARG;
     }
 
-    gRadioInterfaces[aServiceId].sendSMS(aNumber, aMessage, aSilent, aRequest);
+    let strict7BitEncoding;
+    try {
+      strict7BitEncoding = Services.prefs.getBoolPref("dom.sms.strict7BitEncoding");
+    } catch (e) {
+      strict7BitEncoding = false;
+    }
+
+    let options = gSmsSegmentHelper.fragmentText(aMessage, null, strict7BitEncoding);
+    options.number = gPhoneNumberUtils.normalize(aNumber);
+    let requestStatusReport;
+    try {
+      requestStatusReport =
+        Services.prefs.getBoolPref("dom.sms.requestStatusReport");
+    } catch (e) {
+      requestStatusReport = true;
+    }
+    options.requestStatusReport = requestStatusReport && !aSilent;
+
+    let sendingMessage = {
+      type: "sms",
+      sender: this._getPhoneNumber(aServiceId),
+      receiver: aNumber,
+      body: aMessage,
+      deliveryStatusRequested: options.requestStatusReport,
+      timestamp: Date.now(),
+      iccId: this._getIccId(aServiceId)
+    };
+
+    let saveSendingMessageCallback = (aRv, aSendingMessage) => {
+      if (!Components.isSuccessCode(aRv)) {
+        if (DEBUG) debug("Error! Fail to save sending message! aRv = " + aRv);
+        aRequest.notifySendMessageFailed(
+          gMobileMessageDatabaseService.translateCrErrorToMessageCallbackError(aRv),
+          aSendingMessage);
+        Services.obs.notifyObservers(aSendingMessage, kSmsFailedObserverTopic, null);
+        return;
+      }
+
+      if (!aSilent) {
+        Services.obs.notifyObservers(aSendingMessage, kSmsSendingObserverTopic, null);
+      }
+
+      let connection =
+        gMobileConnectionService.getItemByServiceId(aServiceId);
+      // If the radio is disabled or the SIM card is not ready, just directly
+      // return with the corresponding error code.
+      let errorCode;
+      let radioState = connection && connection.radioState;
+      if (!gPhoneNumberUtils.isPlainPhoneNumber(options.number)) {
+        if (DEBUG) debug("Error! Address is invalid when sending SMS: " + options.number);
+        errorCode = Ci.nsIMobileMessageCallback.INVALID_ADDRESS_ERROR;
+      } else if (radioState == Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN ||
+                 radioState == Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED) {
+        if (DEBUG) debug("Error! Radio is disabled when sending SMS.");
+        errorCode = Ci.nsIMobileMessageCallback.RADIO_DISABLED_ERROR;
+      } else if (gRadioInterfaces[aServiceId].rilContext.cardState !=
+                 Ci.nsIIccProvider.CARD_STATE_READY) {
+        if (DEBUG) debug("Error! SIM card is not ready when sending SMS.");
+        errorCode = Ci.nsIMobileMessageCallback.NO_SIM_CARD_ERROR;
+      }
+      if (errorCode) {
+        if (aSilent) {
+          aRequest.notifySendMessageFailed(errorCode, aSendingMessage);
+          return;
+        }
+
+        gMobileMessageDatabaseService
+          .setMessageDeliveryByMessageId(aSendingMessage.id,
+                                         null,
+                                         DOM_MOBILE_MESSAGE_DELIVERY_ERROR,
+                                         RIL.GECKO_SMS_DELIVERY_STATUS_ERROR,
+                                         null,
+                                         (aRv, aDomMessage) => {
+          // TODO bug 832140 handle !Components.isSuccessCode(aRv)
+          aRequest.notifySendMessageFailed(errorCode, aDomMessage);
+          Services.obs.notifyObservers(aDomMessage, kSmsFailedObserverTopic, null);
+        });
+        return;
+      }
+
+      this._sendToTheAir(aServiceId, aSendingMessage, aSilent, options, aRequest);
+    }; // End of |saveSendingMessageCallback|.
+
+    // Don't save message into DB for silent SMS.
+    if (aSilent) {
+      let delivery = DOM_MOBILE_MESSAGE_DELIVERY_SENDING;
+      let deliveryStatus = RIL.GECKO_SMS_DELIVERY_STATUS_PENDING;
+      let domMessage =
+        gMobileMessageService.createSmsMessage(-1, // id
+                                               0,  // threadId
+                                               sendingMessage.iccId,
+                                               delivery,
+                                               deliveryStatus,
+                                               sendingMessage.sender,
+                                               sendingMessage.receiver,
+                                               sendingMessage.body,
+                                               "normal", // message class
+                                               sendingMessage.timestamp,
+                                               0,
+                                               0,
+                                               false);
+      saveSendingMessageCallback(Cr.NS_OK, domMessage);
+      return;
+    }
+
+    gMobileMessageDatabaseService.saveSendingMessage(
+      sendingMessage, saveSendingMessageCallback);
   },
 
   // An array of slient numbers.
@@ -122,7 +535,16 @@ SmsService.prototype = {
       throw Cr.NS_ERROR_INVALID_ARG;
     }
 
-    gRadioInterfaces[aServiceId].getSmscAddress(aRequest);
+    gRadioInterfaces[aServiceId].sendWorkerMessage("getSmscAddress",
+                                                   null,
+                                                   (aResponse) => {
+      if (!aResponse.errorMsg) {
+        aRequest.notifyGetSmscAddress(aResponse.smscAddress);
+      } else {
+        aRequest.notifyGetSmscAddressFailed(
+          Ci.nsIMobileMessageCallback.NOT_FOUND_ERROR);
+      }
+    });
   },
 
   /**
diff --git a/dom/mobilemessage/moz.build b/dom/mobilemessage/moz.build
index 71ded4d211f8..7e73a8239fa7 100644
--- a/dom/mobilemessage/moz.build
+++ b/dom/mobilemessage/moz.build
@@ -26,6 +26,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
         'gonk/mms_consts.js',
         'gonk/MmsPduHelper.jsm',
         'gonk/MobileMessageDB.jsm',
+        'gonk/SmsSegmentHelper.jsm',
         'gonk/wap_consts.js',
         'gonk/WspPduHelper.jsm',
     ]
diff --git a/dom/mobilemessage/tests/xpcshell/test_sms_segment_helper.js b/dom/mobilemessage/tests/xpcshell/test_sms_segment_helper.js
new file mode 100644
index 000000000000..6b710a819061
--- /dev/null
+++ b/dom/mobilemessage/tests/xpcshell/test_sms_segment_helper.js
@@ -0,0 +1,191 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+subscriptLoader.loadSubScript("resource://gre/modules/ril_consts.js", this);
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "gSmsSegmentHelper", function() {
+  let ns = {};
+  Cu.import("resource://gre/modules/SmsSegmentHelper.jsm", ns);
+  return ns.SmsSegmentHelper;
+});
+
+const ESCAPE = "\uffff";
+const RESCTL = "\ufffe";
+const SP = " ";
+
+function run_test() {
+  run_next_test();
+}
+
+/**
+ * Verify SmsSegmentHelper#calculateUserDataLength handles national language
+ * selection correctly.
+ */
+add_test(function test_SmsSegmentHelper_calculateUserDataLength() {
+  function test_calc(str, expected, enabledGsmTableTuples, strict7BitEncoding) {
+    gSmsSegmentHelper.enabledGsmTableTuples = enabledGsmTableTuples;
+    let options = gSmsSegmentHelper.calculateUserDataLength(str, strict7BitEncoding);
+
+    do_check_eq(expected[0], options.dcs);
+    do_check_eq(expected[1], options.encodedFullBodyLength);
+    do_check_eq(expected[2], options.userDataHeaderLength);
+    do_check_eq(expected[3], options.langIndex);
+    do_check_eq(expected[4], options.langShiftIndex);
+  }
+
+  // Test UCS fallback
+  // - No any default enabled nl tables
+  test_calc("A", [PDU_DCS_MSG_CODING_16BITS_ALPHABET, 2, 0,], []);
+  // - Character not defined in enabled nl tables
+  test_calc("A", [PDU_DCS_MSG_CODING_16BITS_ALPHABET, 2, 0,], [[2, 2]]);
+
+  // With GSM default nl tables
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 0, 0, 0], [[0, 0]]);
+  // - SP is defined in both locking/single shift tables, should be directly
+  //   encoded.
+  test_calc(SP, [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 0, 0, 0], [[0, 0]]);
+  // - '^' is only defined in single shift table, should be encoded as
+  //   <escape>^.
+  test_calc("^", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 0, 0, 0], [[0, 0]]);
+
+  // Test userDataHeaderLength calculation
+  // - Header contains both IEIs
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 6, 1, 1], [[1, 1]]);
+  // - Header contains only locking shift table IEI
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[1, 0]]);
+  // - Header contains only single shift table IEI
+  test_calc("^", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 3, 0, 1], [[0, 1]]);
+
+  // Test minimum cost nl tables selection
+  // - 'A' is defined in locking shift table
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[1, 0], [2, 0]]);
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[2, 0], [1, 0]]);
+  // - 'A' is defined in single shift table
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 6, 2, 4], [[2, 0], [2, 4]]);
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 6, 2, 4], [[2, 4], [2, 0]]);
+  // - 'A' is defined in locking shift table of one tuple and in single shift
+  //   table of another.
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[1, 0], [2, 4]]);
+  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[2, 4], [1, 0]]);
+
+  // Test Bug 733981
+  // - Case 1, headerLen is in octets, not septets. "\\" is defined in default
+  //   single shift table and Portuguese locking shift table. The original code
+  //   will add headerLen 7(octets), which should be 8(septets), to calculated
+  //   cost and gets 14, which should be 15 in total for the first run. As for
+  //   the second run, it will be undoubtedly 14 in total. With correct fix,
+  //   the best choice should be the second one.
+  test_calc("\\\\\\\\\\\\\\",
+            [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 14, 0, 0, 0], [[3, 1], [0, 0]]);
+  // - Case 2, possible early return non-best choice. The original code will
+  //   get total cost 6 in the first run and returns immediately. With correct
+  //   fix, the best choice should be the second one.
+  test_calc(ESCAPE + ESCAPE + ESCAPE + ESCAPE + ESCAPE + "\\",
+            [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 0, 0, 0], [[3, 0], [0, 0]]);
+
+  // Test Bug 790192: support strict GSM SMS 7-Bit encoding
+  let str = "", gsmLen = 0, udhl = 0;
+  for (let c in GSM_SMS_STRICT_7BIT_CHARMAP) {
+    str += c;
+    if (PDU_NL_LOCKING_SHIFT_TABLES.indexOf(GSM_SMS_STRICT_7BIT_CHARMAP[c])) {
+      gsmLen += 1;
+    } else {
+      gsmLen += 2;
+    }
+  }
+  if (str.length > PDU_MAX_USER_DATA_UCS2) {
+    udhl = 5;
+  }
+  test_calc(str, [PDU_DCS_MSG_CODING_7BITS_ALPHABET, gsmLen, 0, 0, 0], [[0, 0]], true);
+  test_calc(str, [PDU_DCS_MSG_CODING_16BITS_ALPHABET, str.length * 2, udhl], [[0, 0]]);
+
+  run_next_test();
+});
+
+function generateStringOfLength(str, length) {
+  while (str.length < length) {
+    if (str.length < (length / 2)) {
+      str = str + str;
+    } else {
+      str = str + str.substr(0, length - str.length);
+    }
+  }
+
+  return str;
+}
+
+/**
+ * Verify SmsSegmentHelper#calculateUserDataLength7Bit multipart handling.
+ */
+add_test(function test_SmsSegmentHelper_calculateUserDataLength7Bit_multipart() {
+  function test_calc(str, expected) {
+    let options = gSmsSegmentHelper.calculateUserDataLength7Bit(str);
+
+    do_check_eq(expected[0], options.encodedFullBodyLength);
+    do_check_eq(expected[1], options.userDataHeaderLength);
+    do_check_eq(expected[2], options.segmentMaxSeq);
+  }
+
+  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT),
+            [PDU_MAX_USER_DATA_7BIT, 0, 1]);
+  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT + 1),
+            [PDU_MAX_USER_DATA_7BIT + 1, 5, 2]);
+
+  run_next_test();
+});
+
+/**
+ * Verify SmsSegmentHelper#fragmentText().
+ */
+add_test(function test_SmsSegmentHelper_fragmentText7Bit() {
+  function test_calc(str, strict7BitEncoding, expectedSegments) {
+    expectedSegments = expectedSegments || 1;
+    let options = gSmsSegmentHelper.fragmentText(str, null, strict7BitEncoding);
+    do_check_eq(expectedSegments, options.segments.length);
+  }
+
+  // 7-Bit
+
+  // Boundary checks
+  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT), false);
+  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT), true);
+  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT + 1), false, 2);
+  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT + 1), true, 2);
+
+  // Escaped character
+  test_calc(generateStringOfLength("{", PDU_MAX_USER_DATA_7BIT / 2), false);
+  test_calc(generateStringOfLength("{", PDU_MAX_USER_DATA_7BIT / 2 + 1), false, 2);
+  // Escaped character cannot be separated
+  test_calc(generateStringOfLength("{", (PDU_MAX_USER_DATA_7BIT - 7) * 2 / 2), false, 3);
+
+  // Test headerLen, 7 = Math.ceil(6 * 8 / 7), 6 = headerLen + 1
+  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT - 7));
+  test_calc(generateStringOfLength("A", (PDU_MAX_USER_DATA_7BIT - 7) * 2), false, 2);
+  test_calc(generateStringOfLength("A", (PDU_MAX_USER_DATA_7BIT - 7) * 3), false, 3);
+
+  // UCS-2
+
+  // Boundary checks
+  test_calc(generateStringOfLength("\ua2db", PDU_MAX_USER_DATA_UCS2));
+  test_calc(generateStringOfLength("\ua2db", PDU_MAX_USER_DATA_UCS2), true);
+  test_calc(generateStringOfLength("\ua2db", PDU_MAX_USER_DATA_UCS2 + 1), false, 2);
+  // Bug 816082: when strict GSM SMS 7-Bit encoding is enabled, replace unicode
+  // chars with '*'.
+  test_calc(generateStringOfLength("\ua2db", PDU_MAX_USER_DATA_UCS2 + 1), true, 1);
+
+  // UCS2 character cannot be separated
+  gSmsSegmentHelper.segmentRef16Bit = true;
+  test_calc(generateStringOfLength("\ua2db", (PDU_MAX_USER_DATA_UCS2 * 2 - 7) * 2 / 2), false, 3);
+  gSmsSegmentHelper.segmentRef16Bit = false;
+
+  // Test Bug 790192: support strict GSM SMS 7-Bit encoding
+  for (let c in GSM_SMS_STRICT_7BIT_CHARMAP) {
+    test_calc(generateStringOfLength(c, PDU_MAX_USER_DATA_7BIT), false, 3);
+    test_calc(generateStringOfLength(c, PDU_MAX_USER_DATA_7BIT), true);
+    test_calc(generateStringOfLength(c, PDU_MAX_USER_DATA_UCS2), false);
+  }
+
+  run_next_test();
+});
diff --git a/dom/mobilemessage/tests/xpcshell/xpcshell.ini b/dom/mobilemessage/tests/xpcshell/xpcshell.ini
index 66492edfcc83..1b440ed5b3eb 100644
--- a/dom/mobilemessage/tests/xpcshell/xpcshell.ini
+++ b/dom/mobilemessage/tests/xpcshell/xpcshell.ini
@@ -17,3 +17,5 @@ run-if = toolkit == "gonk"
 run-if = toolkit == "gonk"
 [test_mms_service.js]
 run-if = toolkit == "gonk"
+[test_sms_segment_helper.js]
+run-if = toolkit == "gonk"
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index 068d188404fc..a8914b571db9 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -208,12 +208,6 @@ XPCOMUtils.defineLazyGetter(this, "WAP", function() {
   return wap;
 });
 
-XPCOMUtils.defineLazyGetter(this, "PhoneNumberUtils", function() {
-  let ns = {};
-  Cu.import("resource://gre/modules/PhoneNumberUtils.jsm", ns);
-  return ns.PhoneNumberUtils;
-});
-
 XPCOMUtils.defineLazyGetter(this, "gMessageManager", function() {
   return {
     QueryInterface: XPCOMUtils.generateQI([Ci.nsIMessageListener,
@@ -3131,702 +3125,6 @@ RadioInterface.prototype = {
 
   rilContext: null,
 
-  /**
-   * List of tuples of national language identifier pairs.
-   *
-   * TODO: Support static/runtime settings, see bug 733331.
-   */
-  enabledGsmTableTuples: [
-    [RIL.PDU_NL_IDENTIFIER_DEFAULT, RIL.PDU_NL_IDENTIFIER_DEFAULT],
-  ],
-
-  /**
-   * Use 16-bit reference number for concatenated outgoint messages.
-   *
-   * TODO: Support static/runtime settings, see bug 733331.
-   */
-  segmentRef16Bit: false,
-
-  /**
-   * Get valid SMS concatenation reference number.
-   */
-  _segmentRef: 0,
-  get nextSegmentRef() {
-    let ref = this._segmentRef++;
-
-    this._segmentRef %= (this.segmentRef16Bit ? 65535 : 255);
-
-    // 0 is not a valid SMS concatenation reference number.
-    return ref + 1;
-  },
-
-  /**
-   * Calculate encoded length using specified locking/single shift table
-   *
-   * @param message
-   *        message string to be encoded.
-   * @param langTable
-   *        locking shift table string.
-   * @param langShiftTable
-   *        single shift table string.
-   * @param strict7BitEncoding
-   *        Optional. Enable Latin characters replacement with corresponding
-   *        ones in GSM SMS 7-bit default alphabet.
-   *
-   * @return encoded length in septets.
-   *
-   * @note that the algorithm used in this function must match exactly with
-   * GsmPDUHelper#writeStringAsSeptets.
-   */
-  _countGsm7BitSeptets: function(message, langTable, langShiftTable, strict7BitEncoding) {
-    let length = 0;
-    for (let msgIndex = 0; msgIndex < message.length; msgIndex++) {
-      let c = message.charAt(msgIndex);
-      if (strict7BitEncoding) {
-        c = RIL.GSM_SMS_STRICT_7BIT_CHARMAP[c] || c;
-      }
-
-      let septet = langTable.indexOf(c);
-
-      // According to 3GPP TS 23.038, section 6.1.1 General notes, "The
-      // characters marked '1)' are not used but are displayed as a space."
-      if (septet == RIL.PDU_NL_EXTENDED_ESCAPE) {
-        continue;
-      }
-
-      if (septet >= 0) {
-        length++;
-        continue;
-      }
-
-      septet = langShiftTable.indexOf(c);
-      if (septet < 0) {
-        if (!strict7BitEncoding) {
-          return -1;
-        }
-
-        // Bug 816082, when strict7BitEncoding is enabled, we should replace
-        // characters that can't be encoded with GSM 7-Bit alphabets with '*'.
-        c = "*";
-        if (langTable.indexOf(c) >= 0) {
-          length++;
-        } else if (langShiftTable.indexOf(c) >= 0) {
-          length += 2;
-        } else {
-          // We can't even encode a '*' character with current configuration.
-          return -1;
-        }
-
-        continue;
-      }
-
-      // According to 3GPP TS 23.038 B.2, "This code represents a control
-      // character and therefore must not be used for language specific
-      // characters."
-      if (septet == RIL.PDU_NL_RESERVED_CONTROL) {
-        continue;
-      }
-
-      // The character is not found in locking shfit table, but could be
-      // encoded as <escape><char> with single shift table. Note that it's
-      // still possible for septet to has the value of PDU_NL_EXTENDED_ESCAPE,
-      // but we can display it as a space in this case as said in previous
-      // comment.
-      length += 2;
-    }
-
-    return length;
-  },
-
-  /**
-   * Calculate user data length of specified message string encoded in GSM 7Bit
-   * alphabets.
-   *
-   * @param message
-   *        a message string to be encoded.
-   * @param strict7BitEncoding
-   *        Optional. Enable Latin characters replacement with corresponding
-   *        ones in GSM SMS 7-bit default alphabet.
-   *
-   * @return null or an options object with attributes `dcs`,
-   *         `userDataHeaderLength`, `encodedFullBodyLength`, `langIndex`,
-   *         `langShiftIndex`, `segmentMaxSeq` set.
-   *
-   * @see #_calculateUserDataLength().
-   */
-  _calculateUserDataLength7Bit: function(message, strict7BitEncoding) {
-    let options = null;
-    let minUserDataSeptets = Number.MAX_VALUE;
-    for (let i = 0; i < this.enabledGsmTableTuples.length; i++) {
-      let [langIndex, langShiftIndex] = this.enabledGsmTableTuples[i];
-
-      const langTable = RIL.PDU_NL_LOCKING_SHIFT_TABLES[langIndex];
-      const langShiftTable = RIL.PDU_NL_SINGLE_SHIFT_TABLES[langShiftIndex];
-
-      let bodySeptets = this._countGsm7BitSeptets(message,
-                                                  langTable,
-                                                  langShiftTable,
-                                                  strict7BitEncoding);
-      if (bodySeptets < 0) {
-        continue;
-      }
-
-      let headerLen = 0;
-      if (langIndex != RIL.PDU_NL_IDENTIFIER_DEFAULT) {
-        headerLen += 3; // IEI + len + langIndex
-      }
-      if (langShiftIndex != RIL.PDU_NL_IDENTIFIER_DEFAULT) {
-        headerLen += 3; // IEI + len + langShiftIndex
-      }
-
-      // Calculate full user data length, note the extra byte is for header len
-      let headerSeptets = Math.ceil((headerLen ? headerLen + 1 : 0) * 8 / 7);
-      let segmentSeptets = RIL.PDU_MAX_USER_DATA_7BIT;
-      if ((bodySeptets + headerSeptets) > segmentSeptets) {
-        headerLen += this.segmentRef16Bit ? 6 : 5;
-        headerSeptets = Math.ceil((headerLen + 1) * 8 / 7);
-        segmentSeptets -= headerSeptets;
-      }
-
-      let segments = Math.ceil(bodySeptets / segmentSeptets);
-      let userDataSeptets = bodySeptets + headerSeptets * segments;
-      if (userDataSeptets >= minUserDataSeptets) {
-        continue;
-      }
-
-      minUserDataSeptets = userDataSeptets;
-
-      options = {
-        dcs: RIL.PDU_DCS_MSG_CODING_7BITS_ALPHABET,
-        encodedFullBodyLength: bodySeptets,
-        userDataHeaderLength: headerLen,
-        langIndex: langIndex,
-        langShiftIndex: langShiftIndex,
-        segmentMaxSeq: segments,
-        segmentChars: segmentSeptets,
-      };
-    }
-
-    return options;
-  },
-
-  /**
-   * Calculate user data length of specified message string encoded in UCS2.
-   *
-   * @param message
-   *        a message string to be encoded.
-   *
-   * @return an options object with attributes `dcs`, `userDataHeaderLength`,
-   *         `encodedFullBodyLength`, `segmentMaxSeq` set.
-   *
-   * @see #_calculateUserDataLength().
-   */
-  _calculateUserDataLengthUCS2: function(message) {
-    let bodyChars = message.length;
-    let headerLen = 0;
-    let headerChars = Math.ceil((headerLen ? headerLen + 1 : 0) / 2);
-    let segmentChars = RIL.PDU_MAX_USER_DATA_UCS2;
-    if ((bodyChars + headerChars) > segmentChars) {
-      headerLen += this.segmentRef16Bit ? 6 : 5;
-      headerChars = Math.ceil((headerLen + 1) / 2);
-      segmentChars -= headerChars;
-    }
-
-    let segments = Math.ceil(bodyChars / segmentChars);
-
-    return {
-      dcs: RIL.PDU_DCS_MSG_CODING_16BITS_ALPHABET,
-      encodedFullBodyLength: bodyChars * 2,
-      userDataHeaderLength: headerLen,
-      segmentMaxSeq: segments,
-      segmentChars: segmentChars,
-    };
-  },
-
-  /**
-   * Calculate user data length and its encoding.
-   *
-   * @param message
-   *        a message string to be encoded.
-   * @param strict7BitEncoding
-   *        Optional. Enable Latin characters replacement with corresponding
-   *        ones in GSM SMS 7-bit default alphabet.
-   *
-   * @return an options object with some or all of following attributes set:
-   *
-   * @param dcs
-   *        Data coding scheme. One of the PDU_DCS_MSG_CODING_*BITS_ALPHABET
-   *        constants.
-   * @param userDataHeaderLength
-   *        Length of embedded user data header, in bytes. The whole header
-   *        size will be userDataHeaderLength + 1; 0 for no header.
-   * @param encodedFullBodyLength
-   *        Length of the message body when encoded with the given DCS. For
-   *        UCS2, in bytes; for 7-bit, in septets.
-   * @param langIndex
-   *        Table index used for normal 7-bit encoded character lookup.
-   * @param langShiftIndex
-   *        Table index used for escaped 7-bit encoded character lookup.
-   * @param segmentMaxSeq
-   *        Max sequence number of a multi-part messages, or 1 for single one.
-   *        This number might not be accurate for a multi-part message until
-   *        it's processed by #_fragmentText() again.
-   */
-  _calculateUserDataLength: function(message, strict7BitEncoding) {
-    let options = this._calculateUserDataLength7Bit(message, strict7BitEncoding);
-    if (!options) {
-      options = this._calculateUserDataLengthUCS2(message);
-    }
-
-    if (DEBUG) this.debug("_calculateUserDataLength: " + JSON.stringify(options));
-    return options;
-  },
-
-  /**
-   * Fragment GSM 7-Bit encodable string for transmission.
-   *
-   * @param text
-   *        text string to be fragmented.
-   * @param langTable
-   *        locking shift table string.
-   * @param langShiftTable
-   *        single shift table string.
-   * @param segmentSeptets
-   *        Number of available spetets per segment.
-   * @param strict7BitEncoding
-   *        Optional. Enable Latin characters replacement with corresponding
-   *        ones in GSM SMS 7-bit default alphabet.
-   *
-   * @return an array of objects. See #_fragmentText() for detailed definition.
-   */
-  _fragmentText7Bit: function(text, langTable, langShiftTable, segmentSeptets, strict7BitEncoding) {
-    let ret = [];
-    let body = "", len = 0;
-    // If the message is empty, we only push the empty message to ret.
-    if (text.length === 0) {
-      ret.push({
-        body: text,
-        encodedBodyLength: text.length,
-      });
-      return ret;
-    }
-
-    for (let i = 0, inc = 0; i < text.length; i++) {
-      let c = text.charAt(i);
-      if (strict7BitEncoding) {
-        c = RIL.GSM_SMS_STRICT_7BIT_CHARMAP[c] || c;
-      }
-
-      let septet = langTable.indexOf(c);
-      if (septet == RIL.PDU_NL_EXTENDED_ESCAPE) {
-        continue;
-      }
-
-      if (septet >= 0) {
-        inc = 1;
-      } else {
-        septet = langShiftTable.indexOf(c);
-        if (septet == RIL.PDU_NL_RESERVED_CONTROL) {
-          continue;
-        }
-
-        inc = 2;
-        if (septet < 0) {
-          if (!strict7BitEncoding) {
-            throw new Error("Given text cannot be encoded with GSM 7-bit Alphabet!");
-          }
-
-          // Bug 816082, when strict7BitEncoding is enabled, we should replace
-          // characters that can't be encoded with GSM 7-Bit alphabets with '*'.
-          c = "*";
-          if (langTable.indexOf(c) >= 0) {
-            inc = 1;
-          }
-        }
-      }
-
-      if ((len + inc) > segmentSeptets) {
-        ret.push({
-          body: body,
-          encodedBodyLength: len,
-        });
-        body = c;
-        len = inc;
-      } else {
-        body += c;
-        len += inc;
-      }
-    }
-
-    if (len) {
-      ret.push({
-        body: body,
-        encodedBodyLength: len,
-      });
-    }
-
-    return ret;
-  },
-
-  /**
-   * Fragment UCS2 encodable string for transmission.
-   *
-   * @param text
-   *        text string to be fragmented.
-   * @param segmentChars
-   *        Number of available characters per segment.
-   *
-   * @return an array of objects. See #_fragmentText() for detailed definition.
-   */
-  _fragmentTextUCS2: function(text, segmentChars) {
-    let ret = [];
-    // If the message is empty, we only push the empty message to ret.
-    if (text.length === 0) {
-      ret.push({
-        body: text,
-        encodedBodyLength: text.length,
-      });
-      return ret;
-    }
-
-    for (let offset = 0; offset < text.length; offset += segmentChars) {
-      let str = text.substr(offset, segmentChars);
-      ret.push({
-        body: str,
-        encodedBodyLength: str.length * 2,
-      });
-    }
-
-    return ret;
-  },
-
-  /**
-   * Fragment string for transmission.
-   *
-   * Fragment input text string into an array of objects that contains
-   * attributes `body`, substring for this segment, `encodedBodyLength`,
-   * length of the encoded segment body in septets.
-   *
-   * @param text
-   *        Text string to be fragmented.
-   * @param options
-   *        Optional pre-calculated option object. The output array will be
-   *        stored at options.segments if there are multiple segments.
-   * @param strict7BitEncoding
-   *        Optional. Enable Latin characters replacement with corresponding
-   *        ones in GSM SMS 7-bit default alphabet.
-   *
-   * @return Populated options object.
-   */
-  _fragmentText: function(text, options, strict7BitEncoding) {
-    if (!options) {
-      options = this._calculateUserDataLength(text, strict7BitEncoding);
-    }
-
-    if (options.dcs == RIL.PDU_DCS_MSG_CODING_7BITS_ALPHABET) {
-      const langTable = RIL.PDU_NL_LOCKING_SHIFT_TABLES[options.langIndex];
-      const langShiftTable = RIL.PDU_NL_SINGLE_SHIFT_TABLES[options.langShiftIndex];
-      options.segments = this._fragmentText7Bit(text,
-                                                langTable, langShiftTable,
-                                                options.segmentChars,
-                                                strict7BitEncoding);
-    } else {
-      options.segments = this._fragmentTextUCS2(text,
-                                                options.segmentChars);
-    }
-
-    // Re-sync options.segmentMaxSeq with actual length of returning array.
-    options.segmentMaxSeq = options.segments.length;
-
-    return options;
-  },
-
-  getSegmentInfoForText: function(text, request) {
-    let strict7BitEncoding;
-    try {
-      strict7BitEncoding = Services.prefs.getBoolPref("dom.sms.strict7BitEncoding");
-    } catch (e) {
-      strict7BitEncoding = false;
-    }
-
-    let options = this._fragmentText(text, null, strict7BitEncoding);
-    let charsInLastSegment;
-    if (options.segmentMaxSeq) {
-      let lastSegment = options.segments[options.segmentMaxSeq - 1];
-      charsInLastSegment = lastSegment.encodedBodyLength;
-      if (options.dcs == RIL.PDU_DCS_MSG_CODING_16BITS_ALPHABET) {
-        // In UCS2 encoding, encodedBodyLength is in octets.
-        charsInLastSegment /= 2;
-      }
-    } else {
-      charsInLastSegment = 0;
-    }
-
-    request.notifySegmentInfoForTextGot(options.segmentMaxSeq,
-                                        options.segmentChars,
-                                        options.segmentChars - charsInLastSegment);
-  },
-
-  getSmscAddress: function(request) {
-    this.workerMessenger.send("getSmscAddress",
-                              null,
-                              (function(response) {
-      if (!response.errorMsg) {
-        request.notifyGetSmscAddress(response.smscAddress);
-      } else {
-        request.notifyGetSmscAddressFailed(Ci.nsIMobileMessageCallback.NOT_FOUND_ERROR);
-      }
-    }).bind(this));
-  },
-
-  sendSMS: function(number, message, silent, request) {
-    let strict7BitEncoding;
-    try {
-      strict7BitEncoding = Services.prefs.getBoolPref("dom.sms.strict7BitEncoding");
-    } catch (e) {
-      strict7BitEncoding = false;
-    }
-
-    let options = this._fragmentText(message, null, strict7BitEncoding);
-    options.number = PhoneNumberUtils.normalize(number);
-    let requestStatusReport;
-    try {
-      requestStatusReport =
-        Services.prefs.getBoolPref("dom.sms.requestStatusReport");
-    } catch (e) {
-      requestStatusReport = true;
-    }
-    options.requestStatusReport = requestStatusReport && !silent;
-    if (options.segmentMaxSeq > 1) {
-      options.segmentRef16Bit = this.segmentRef16Bit;
-      options.segmentRef = this.nextSegmentRef;
-    }
-
-    let notifyResult = (function notifyResult(rv, domMessage) {
-      if (!Components.isSuccessCode(rv)) {
-        if (DEBUG) this.debug("Error! Fail to save sending message! rv = " + rv);
-        request.notifySendMessageFailed(
-          gMobileMessageDatabaseService.translateCrErrorToMessageCallbackError(rv),
-          domMessage);
-        Services.obs.notifyObservers(domMessage, kSmsFailedObserverTopic, null);
-        return;
-      }
-
-      if (!silent) {
-        Services.obs.notifyObservers(domMessage, kSmsSendingObserverTopic, null);
-      }
-
-      let connection =
-        gMobileConnectionService.getItemByServiceId(this.clientId);
-      // If the radio is disabled or the SIM card is not ready, just directly
-      // return with the corresponding error code.
-      let errorCode;
-      let radioState = connection && connection.radioState;
-      if (!PhoneNumberUtils.isPlainPhoneNumber(options.number)) {
-        if (DEBUG) this.debug("Error! Address is invalid when sending SMS: " +
-                              options.number);
-        errorCode = Ci.nsIMobileMessageCallback.INVALID_ADDRESS_ERROR;
-      } else if (radioState == Ci.nsIMobileConnection.MOBILE_RADIO_STATE_UNKNOWN ||
-                 radioState == Ci.nsIMobileConnection.MOBILE_RADIO_STATE_DISABLED) {
-        if (DEBUG) this.debug("Error! Radio is disabled when sending SMS.");
-        errorCode = Ci.nsIMobileMessageCallback.RADIO_DISABLED_ERROR;
-      } else if (this.rilContext.cardState != Ci.nsIIccProvider.CARD_STATE_READY) {
-        if (DEBUG) this.debug("Error! SIM card is not ready when sending SMS.");
-        errorCode = Ci.nsIMobileMessageCallback.NO_SIM_CARD_ERROR;
-      }
-      if (errorCode) {
-        if (silent) {
-          request.notifySendMessageFailed(errorCode, domMessage);
-          return;
-        }
-
-        gMobileMessageDatabaseService
-          .setMessageDeliveryByMessageId(domMessage.id,
-                                         null,
-                                         DOM_MOBILE_MESSAGE_DELIVERY_ERROR,
-                                         RIL.GECKO_SMS_DELIVERY_STATUS_ERROR,
-                                         null,
-                                         function notifyResult(rv, domMessage) {
-          // TODO bug 832140 handle !Components.isSuccessCode(rv)
-          request.notifySendMessageFailed(errorCode, domMessage);
-          Services.obs.notifyObservers(domMessage, kSmsFailedObserverTopic, null);
-        });
-        return;
-      }
-
-      // Keep current SMS message info for sent/delivered notifications
-      let context = {
-        request: request,
-        sms: domMessage,
-        requestStatusReport: options.requestStatusReport,
-        silent: silent
-      };
-
-      // This is the entry point starting to send SMS.
-      this.workerMessenger.send("sendSMS", options,
-                                (function(context, response) {
-        if (response.errorMsg) {
-          // Failed to send SMS out.
-          let error = Ci.nsIMobileMessageCallback.UNKNOWN_ERROR;
-          switch (response.errorMsg) {
-            case RIL.ERROR_RADIO_NOT_AVAILABLE:
-              error = Ci.nsIMobileMessageCallback.NO_SIGNAL_ERROR;
-              break;
-            case RIL.ERROR_FDN_CHECK_FAILURE:
-              error = Ci.nsIMobileMessageCallback.FDN_CHECK_ERROR;
-              break;
-          }
-
-          if (context.silent) {
-            // There is no way to modify nsIDOMMozSmsMessage attributes as they
-            // are read only so we just create a new sms instance to send along
-            // with the notification.
-            let sms = context.sms;
-            context.request.notifySendMessageFailed(
-              error,
-              gMobileMessageService.createSmsMessage(sms.id,
-                                                     sms.threadId,
-                                                     sms.iccId,
-                                                     DOM_MOBILE_MESSAGE_DELIVERY_ERROR,
-                                                     RIL.GECKO_SMS_DELIVERY_STATUS_ERROR,
-                                                     sms.sender,
-                                                     sms.receiver,
-                                                     sms.body,
-                                                     sms.messageClass,
-                                                     sms.timestamp,
-                                                     0,
-                                                     0,
-                                                     sms.read));
-            return false;
-          }
-
-          gMobileMessageDatabaseService
-            .setMessageDeliveryByMessageId(context.sms.id,
-                                           null,
-                                           DOM_MOBILE_MESSAGE_DELIVERY_ERROR,
-                                           RIL.GECKO_SMS_DELIVERY_STATUS_ERROR,
-                                           null,
-                                           function notifyResult(rv, domMessage) {
-            // TODO bug 832140 handle !Components.isSuccessCode(rv)
-            context.request.notifySendMessageFailed(error, domMessage);
-            Services.obs.notifyObservers(domMessage, kSmsFailedObserverTopic, null);
-          });
-          return false;
-        } // End of send failure.
-
-        if (response.deliveryStatus) {
-          // Message delivery.
-          gMobileMessageDatabaseService
-            .setMessageDeliveryByMessageId(context.sms.id,
-                                           null,
-                                           context.sms.delivery,
-                                           response.deliveryStatus,
-                                           null,
-                                           (function notifyResult(rv, domMessage) {
-            // TODO bug 832140 handle !Components.isSuccessCode(rv)
-
-            let topic = (response.deliveryStatus ==
-                         RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS)
-                        ? kSmsDeliverySuccessObserverTopic
-                        : kSmsDeliveryErrorObserverTopic;
-
-            // Broadcasting a "sms-delivery-success" system message to open apps.
-            if (topic == kSmsDeliverySuccessObserverTopic) {
-              this.broadcastSmsSystemMessage(
-                Ci.nsISmsMessenger.NOTIFICATION_TYPE_DELIVERY_SUCCESS, domMessage);
-            }
-
-            // Notifying observers the delivery status is updated.
-            Services.obs.notifyObservers(domMessage, topic, null);
-          }).bind(this));
-
-          // Send transaction has ended completely.
-          return false;
-        } // End of message delivery.
-
-        // Message sent.
-        if (context.silent) {
-          // There is no way to modify nsIDOMMozSmsMessage attributes as they
-          // are read only so we just create a new sms instance to send along
-          // with the notification.
-          let sms = context.sms;
-          context.request.notifyMessageSent(
-            gMobileMessageService.createSmsMessage(sms.id,
-                                                   sms.threadId,
-                                                   sms.iccId,
-                                                   DOM_MOBILE_MESSAGE_DELIVERY_SENT,
-                                                   sms.deliveryStatus,
-                                                   sms.sender,
-                                                   sms.receiver,
-                                                   sms.body,
-                                                   sms.messageClass,
-                                                   sms.timestamp,
-                                                   Date.now(),
-                                                   0,
-                                                   sms.read));
-          // We don't wait for SMS-DELIVER-REPORT for silent one.
-          return false;
-        }
-
-        gMobileMessageDatabaseService
-          .setMessageDeliveryByMessageId(context.sms.id,
-                                         null,
-                                         DOM_MOBILE_MESSAGE_DELIVERY_SENT,
-                                         context.sms.deliveryStatus,
-                                         null,
-                                         (function notifyResult(rv, domMessage) {
-          // TODO bug 832140 handle !Components.isSuccessCode(rv)
-
-          if (context.requestStatusReport) {
-            context.sms = domMessage;
-          }
-
-          this.broadcastSmsSystemMessage(
-            Ci.nsISmsMessenger.NOTIFICATION_TYPE_SENT, domMessage);
-          context.request.notifyMessageSent(domMessage);
-          Services.obs.notifyObservers(domMessage, kSmsSentObserverTopic, null);
-        }).bind(this));
-
-        // Only keep current context if we have requested for delivery report.
-        return context.requestStatusReport;
-      }).bind(this, context)); // End of |workerMessenger.send| callback.
-    }).bind(this); // End of DB saveSendingMessage callback.
-
-    let sendingMessage = {
-      type: "sms",
-      sender: this.getPhoneNumber(),
-      receiver: number,
-      body: message,
-      deliveryStatusRequested: options.requestStatusReport,
-      timestamp: Date.now(),
-      iccId: this.getIccId()
-    };
-
-    if (silent) {
-      let delivery = DOM_MOBILE_MESSAGE_DELIVERY_SENDING;
-      let deliveryStatus = RIL.GECKO_SMS_DELIVERY_STATUS_PENDING;
-      let domMessage =
-        gMobileMessageService.createSmsMessage(-1, // id
-                                               0,  // threadId
-                                               sendingMessage.iccId,
-                                               delivery,
-                                               deliveryStatus,
-                                               sendingMessage.sender,
-                                               sendingMessage.receiver,
-                                               sendingMessage.body,
-                                               "normal", // message class
-                                               sendingMessage.timestamp,
-                                               0,
-                                               0,
-                                               false);
-      notifyResult(Cr.NS_OK, domMessage);
-      return;
-    }
-
-    let id = gMobileMessageDatabaseService.saveSendingMessage(
-      sendingMessage, notifyResult);
-  },
-
   // TODO: Bug 928861 - B2G NetworkManager: Provide a more generic function
   //                    for connecting
   setupDataCallByType: function(networkType) {
diff --git a/dom/system/gonk/nsIRadioInterfaceLayer.idl b/dom/system/gonk/nsIRadioInterfaceLayer.idl
index fb8d943b7e63..f20564c7aac9 100644
--- a/dom/system/gonk/nsIRadioInterfaceLayer.idl
+++ b/dom/system/gonk/nsIRadioInterfaceLayer.idl
@@ -40,7 +40,7 @@ interface nsIRilSendWorkerMessageCallback : nsISupports
   boolean handleResponse(in jsval response);
 };
 
-[scriptable, uuid(864a47d6-a576-4a5c-b8b8-9ca312345f52)]
+[scriptable, uuid(fe01c648-867a-11e4-915f-033b36e8177b)]
 interface nsIRadioInterface : nsISupports
 {
   readonly attribute nsIRilContext rilContext;
@@ -58,22 +58,9 @@ interface nsIRadioInterface : nsISupports
 
   void updateRILNetworkInterface();
 
-  /**
-   * SMS-related functionality.
-   */
-  void getSegmentInfoForText(in DOMString text,
-                             in nsIMobileMessageCallback request);
-
-  void sendSMS(in DOMString number,
-               in DOMString message,
-               in boolean silent,
-               in nsIMobileMessageCallback request);
-
   void sendWorkerMessage(in DOMString type,
               [optional] in jsval message,
               [optional] in nsIRilSendWorkerMessageCallback callback);
-
-  void getSmscAddress(in nsIMobileMessageCallback request);
 };
 
 [scriptable, uuid(78b65e8c-68e7-4510-9a05-65bba12b283e)]
diff --git a/dom/system/gonk/tests/header_helpers.js b/dom/system/gonk/tests/header_helpers.js
index 8976a6faffdb..8c36e1c6645f 100644
--- a/dom/system/gonk/tests/header_helpers.js
+++ b/dom/system/gonk/tests/header_helpers.js
@@ -11,7 +11,7 @@ let subscriptLoader = Cc["@mozilla.org/moz/jssubscript-loader;1"]
 
 /**
  * Start a new RIL worker.
- * 
+ *
  * @param custom_ns
  *        Namespace with symbols to be injected into the new worker
  *        namespace.
@@ -192,21 +192,6 @@ function newIncomingParcel(fakeParcelSize, response, request, data) {
   return bytes;
 }
 
-/**
- *
- */
-let ril_ns;
-function newRadioInterface() {
-  if (!ril_ns) {
-    ril_ns = {};
-    subscriptLoader.loadSubScript("resource://gre/components/RadioInterfaceLayer.js", ril_ns);
-  }
-
-  return {
-    __proto__: ril_ns.RadioInterface.prototype,
-  };
-}
-
 /**
  * Test whether specified function throws exception with expected
  * result.
diff --git a/dom/system/gonk/tests/test_ril_worker_sms.js b/dom/system/gonk/tests/test_ril_worker_sms.js
index 7fc3e471fc69..4e3ba768ec01 100644
--- a/dom/system/gonk/tests/test_ril_worker_sms.js
+++ b/dom/system/gonk/tests/test_ril_worker_sms.js
@@ -3,6 +3,14 @@
 
 subscriptLoader.loadSubScript("resource://gre/modules/ril_consts.js", this);
 
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "gSmsSegmentHelper", function() {
+  let ns = {};
+  Cu.import("resource://gre/modules/SmsSegmentHelper.jsm", ns);
+  return ns.SmsSegmentHelper;
+});
+
 const ESCAPE = "\uffff";
 const RESCTL = "\ufffe";
 
@@ -146,14 +154,11 @@ function add_test_receiving_sms(expected, pdu) {
   });
 }
 
-let test_receiving_7bit_alphabets__ril;
 let test_receiving_7bit_alphabets__worker;
 function test_receiving_7bit_alphabets(lst, sst) {
-  if (!test_receiving_7bit_alphabets__ril) {
-    test_receiving_7bit_alphabets__ril = newRadioInterface();
+  if (!test_receiving_7bit_alphabets__worker) {
     test_receiving_7bit_alphabets__worker = newWriteHexOctetAsUint8Worker();
   }
-  let ril = test_receiving_7bit_alphabets__ril;
   let worker = test_receiving_7bit_alphabets__worker;
   let context = worker.ContextPool._contexts[0];
   let helper = context.GsmPDUHelper;
@@ -174,7 +179,8 @@ function test_receiving_7bit_alphabets(lst, sst) {
   for (let i = 0; i < text.length;) {
     let len = Math.min(70, text.length - i);
     let expected = text.substring(i, i + len);
-    let septets = ril._countGsm7BitSeptets(expected, langTable, langShiftTable);
+    let septets =
+      gSmsSegmentHelper.countGsm7BitSeptets(expected, langTable, langShiftTable);
     let rawBytes = get7bitRawBytes(expected);
     let pdu = compose7bitPdu(lst, sst, rawBytes, septets);
     add_test_receiving_sms(expected, pdu);
diff --git a/dom/system/gonk/tests/test_ril_worker_sms_segment_info.js b/dom/system/gonk/tests/test_ril_worker_sms_segment_info.js
index c472bb274cf3..1b3c2c02b213 100644
--- a/dom/system/gonk/tests/test_ril_worker_sms_segment_info.js
+++ b/dom/system/gonk/tests/test_ril_worker_sms_segment_info.js
@@ -3,21 +3,26 @@
 
 subscriptLoader.loadSubScript("resource://gre/modules/ril_consts.js", this);
 
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyGetter(this, "gSmsSegmentHelper", function() {
+  let ns = {};
+  Cu.import("resource://gre/modules/SmsSegmentHelper.jsm", ns);
+  return ns.SmsSegmentHelper;
+});
+
 const ESCAPE = "\uffff";
 const RESCTL = "\ufffe";
-const SP = " ";
 
 function run_test() {
   run_next_test();
 }
 
 /**
- * Verify RadioInterface#_countGsm7BitSeptets() and
+ * Verify SmsSegmentHelper#countGsm7BitSeptets() and
  * GsmPDUHelper#writeStringAsSeptets() algorithm match each other.
  */
-add_test(function test_RadioInterface__countGsm7BitSeptets() {
-  let ril = newRadioInterface();
-
+add_test(function test_SmsSegmentHelper__countGsm7BitSeptets() {
   let worker = newWorker({
     postRILMessage: function(data) {
       // Do nothing
@@ -38,10 +43,11 @@ add_test(function test_RadioInterface__countGsm7BitSeptets() {
 
   function do_check_calc(str, expectedCalcLen, lst, sst, strict7BitEncoding, strToWrite) {
     do_check_eq(expectedCalcLen,
-                ril._countGsm7BitSeptets(str,
-                                         PDU_NL_LOCKING_SHIFT_TABLES[lst],
-                                         PDU_NL_SINGLE_SHIFT_TABLES[sst],
-                                         strict7BitEncoding));
+                gSmsSegmentHelper
+                  .countGsm7BitSeptets(str,
+                                       PDU_NL_LOCKING_SHIFT_TABLES[lst],
+                                       PDU_NL_SINGLE_SHIFT_TABLES[sst],
+                                       strict7BitEncoding));
 
     helper.resetOctetWritten();
     strToWrite = strToWrite || str;
@@ -107,179 +113,3 @@ add_test(function test_RadioInterface__countGsm7BitSeptets() {
   run_next_test();
 });
 
-/**
- * Verify RadioInterface#calculateUserDataLength handles national language
- * selection correctly.
- */
-add_test(function test_RadioInterface__calculateUserDataLength() {
-  let ril = newRadioInterface();
-
-  function test_calc(str, expected, enabledGsmTableTuples, strict7BitEncoding) {
-    ril.enabledGsmTableTuples = enabledGsmTableTuples;
-    let options = ril._calculateUserDataLength(str, strict7BitEncoding);
-
-    do_check_eq(expected[0], options.dcs);
-    do_check_eq(expected[1], options.encodedFullBodyLength);
-    do_check_eq(expected[2], options.userDataHeaderLength);
-    do_check_eq(expected[3], options.langIndex);
-    do_check_eq(expected[4], options.langShiftIndex);
-  }
-
-  // Test UCS fallback
-  // - No any default enabled nl tables
-  test_calc("A", [PDU_DCS_MSG_CODING_16BITS_ALPHABET, 2, 0,], []);
-  // - Character not defined in enabled nl tables
-  test_calc("A", [PDU_DCS_MSG_CODING_16BITS_ALPHABET, 2, 0,], [[2, 2]]);
-
-  // With GSM default nl tables
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 0, 0, 0], [[0, 0]]);
-  // - SP is defined in both locking/single shift tables, should be directly
-  //   encoded.
-  test_calc(SP, [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 0, 0, 0], [[0, 0]]);
-  // - '^' is only defined in single shift table, should be encoded as
-  //   <escape>^.
-  test_calc("^", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 0, 0, 0], [[0, 0]]);
-
-  // Test userDataHeaderLength calculation
-  // - Header contains both IEIs
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 6, 1, 1], [[1, 1]]);
-  // - Header contains only locking shift table IEI
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[1, 0]]);
-  // - Header contains only single shift table IEI
-  test_calc("^", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 3, 0, 1], [[0, 1]]);
-
-  // Test minimum cost nl tables selection
-  // - 'A' is defined in locking shift table
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[1, 0], [2, 0]]);
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[2, 0], [1, 0]]);
-  // - 'A' is defined in single shift table
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 6, 2, 4], [[2, 0], [2, 4]]);
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 6, 2, 4], [[2, 4], [2, 0]]);
-  // - 'A' is defined in locking shift table of one tuple and in single shift
-  //   table of another.
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[1, 0], [2, 4]]);
-  test_calc("A", [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 1, 3, 1, 0], [[2, 4], [1, 0]]);
-
-  // Test Bug 733981
-  // - Case 1, headerLen is in octets, not septets. "\\" is defined in default
-  //   single shift table and Portuguese locking shift table. The original code
-  //   will add headerLen 7(octets), which should be 8(septets), to calculated
-  //   cost and gets 14, which should be 15 in total for the first run. As for
-  //   the second run, it will be undoubtedly 14 in total. With correct fix,
-  //   the best choice should be the second one.
-  test_calc("\\\\\\\\\\\\\\",
-            [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 14, 0, 0, 0], [[3, 1], [0, 0]]);
-  // - Case 2, possible early return non-best choice. The original code will
-  //   get total cost 6 in the first run and returns immediately. With correct
-  //   fix, the best choice should be the second one.
-  test_calc(ESCAPE + ESCAPE + ESCAPE + ESCAPE + ESCAPE + "\\",
-            [PDU_DCS_MSG_CODING_7BITS_ALPHABET, 2, 0, 0, 0], [[3, 0], [0, 0]]);
-
-  // Test Bug 790192: support strict GSM SMS 7-Bit encoding
-  let str = "", gsmLen = 0, udhl = 0;
-  for (let c in GSM_SMS_STRICT_7BIT_CHARMAP) {
-    str += c;
-    if (PDU_NL_LOCKING_SHIFT_TABLES.indexOf(GSM_SMS_STRICT_7BIT_CHARMAP[c])) {
-      gsmLen += 1;
-    } else {
-      gsmLen += 2;
-    }
-  }
-  if (str.length > PDU_MAX_USER_DATA_UCS2) {
-    udhl = 5;
-  }
-  test_calc(str, [PDU_DCS_MSG_CODING_7BITS_ALPHABET, gsmLen, 0, 0, 0], [[0, 0]], true);
-  test_calc(str, [PDU_DCS_MSG_CODING_16BITS_ALPHABET, str.length * 2, udhl], [[0, 0]]);
-
-  run_next_test();
-});
-
-function generateStringOfLength(str, length) {
-  while (str.length < length) {
-    if (str.length < (length / 2)) {
-      str = str + str;
-    } else {
-      str = str + str.substr(0, length - str.length);
-    }
-  }
-
-  return str;
-}
-
-/**
- * Verify RadioInterface#_calculateUserDataLength7Bit multipart handling.
- */
-add_test(function test_RadioInterface__calculateUserDataLength7Bit_multipart() {
-  let ril = newRadioInterface();
-
-  function test_calc(str, expected) {
-    let options = ril._calculateUserDataLength7Bit(str);
-
-    do_check_eq(expected[0], options.encodedFullBodyLength);
-    do_check_eq(expected[1], options.userDataHeaderLength);
-    do_check_eq(expected[2], options.segmentMaxSeq);
-  }
-
-  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT),
-            [PDU_MAX_USER_DATA_7BIT, 0, 1]);
-  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT + 1),
-            [PDU_MAX_USER_DATA_7BIT + 1, 5, 2]);
-
-  run_next_test();
-});
-
-/**
- * Verify RadioInterface#_fragmentText().
- */
-add_test(function test_RadioInterface__fragmentText7Bit() {
-  let ril = newRadioInterface();
-
-  function test_calc(str, strict7BitEncoding, expectedSegments) {
-    expectedSegments = expectedSegments || 1;
-    let options = ril._fragmentText(str, null, strict7BitEncoding);
-    do_check_eq(expectedSegments, options.segments.length);
-  }
-
-  // 7-Bit
-
-  // Boundary checks
-  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT), false);
-  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT), true);
-  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT + 1), false, 2);
-  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT + 1), true, 2);
-
-  // Escaped character
-  test_calc(generateStringOfLength("{", PDU_MAX_USER_DATA_7BIT / 2), false);
-  test_calc(generateStringOfLength("{", PDU_MAX_USER_DATA_7BIT / 2 + 1), false, 2);
-  // Escaped character cannot be separated
-  test_calc(generateStringOfLength("{", (PDU_MAX_USER_DATA_7BIT - 7) * 2 / 2), false, 3);
-
-  // Test headerLen, 7 = Math.ceil(6 * 8 / 7), 6 = headerLen + 1
-  test_calc(generateStringOfLength("A", PDU_MAX_USER_DATA_7BIT - 7));
-  test_calc(generateStringOfLength("A", (PDU_MAX_USER_DATA_7BIT - 7) * 2), false, 2);
-  test_calc(generateStringOfLength("A", (PDU_MAX_USER_DATA_7BIT - 7) * 3), false, 3);
-
-  // UCS-2
-
-  // Boundary checks
-  test_calc(generateStringOfLength("\ua2db", PDU_MAX_USER_DATA_UCS2));
-  test_calc(generateStringOfLength("\ua2db", PDU_MAX_USER_DATA_UCS2), true);
-  test_calc(generateStringOfLength("\ua2db", PDU_MAX_USER_DATA_UCS2 + 1), false, 2);
-  // Bug 816082: when strict GSM SMS 7-Bit encoding is enabled, replace unicode
-  // chars with '*'.
-  test_calc(generateStringOfLength("\ua2db", PDU_MAX_USER_DATA_UCS2 + 1), true, 1);
-
-  // UCS2 character cannot be separated
-  ril.segmentRef16Bit = true;
-  test_calc(generateStringOfLength("\ua2db", (PDU_MAX_USER_DATA_UCS2 * 2 - 7) * 2 / 2), false, 3);
-  ril.segmentRef16Bit = false;
-
-  // Test Bug 790192: support strict GSM SMS 7-Bit encoding
-  for (let c in GSM_SMS_STRICT_7BIT_CHARMAP) {
-    test_calc(generateStringOfLength(c, PDU_MAX_USER_DATA_7BIT), false, 3);
-    test_calc(generateStringOfLength(c, PDU_MAX_USER_DATA_7BIT), true);
-    test_calc(generateStringOfLength(c, PDU_MAX_USER_DATA_UCS2), false);
-  }
-
-  run_next_test();
-});

From 4a672075aef65b628957662ad05178d462d75543 Mon Sep 17 00:00:00 2001
From: Bevis Tseng <btseng@mozilla.com>
Date: Thu, 27 Nov 2014 18:59:06 +0800
Subject: [PATCH 132/183] Bug 873351 - Part 3: Refactor SMS Notifications from
 RadioInterfaceLayer to SmsService. r=echen

---
 dom/mobilemessage/android/SmsService.cpp      |   8 -
 dom/mobilemessage/gonk/MobileMessageDB.jsm    |   4 +-
 dom/mobilemessage/gonk/SmsService.js          | 483 ++++++++++++-
 .../interfaces/nsIGonkSmsService.idl          |  83 ++-
 .../interfaces/nsISmsService.idl              |   3 +-
 dom/mobilemessage/ipc/SmsIPCService.cpp       |   8 -
 dom/system/gonk/RadioInterfaceLayer.js        | 656 ++----------------
 7 files changed, 618 insertions(+), 627 deletions(-)

diff --git a/dom/mobilemessage/android/SmsService.cpp b/dom/mobilemessage/android/SmsService.cpp
index 3a169c57b0b6..1bff0128ecc7 100644
--- a/dom/mobilemessage/android/SmsService.cpp
+++ b/dom/mobilemessage/android/SmsService.cpp
@@ -50,14 +50,6 @@ SmsService::Send(uint32_t aServiceId,
   return NS_OK;
 }
 
-NS_IMETHODIMP
-SmsService::IsSilentNumber(const nsAString& aNumber,
-                           bool*            aIsSilent)
-{
-  NS_NOTYETIMPLEMENTED("Implement me!");
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 NS_IMETHODIMP
 SmsService::AddSilentNumber(const nsAString& aNumber)
 {
diff --git a/dom/mobilemessage/gonk/MobileMessageDB.jsm b/dom/mobilemessage/gonk/MobileMessageDB.jsm
index 182d54cc248e..55e7dce599ea 100644
--- a/dom/mobilemessage/gonk/MobileMessageDB.jsm
+++ b/dom/mobilemessage/gonk/MobileMessageDB.jsm
@@ -2968,11 +2968,11 @@ MobileMessageDB.prototype = {
         // save it into the segmentRecord.
         if (aSmsSegment.teleservice === RIL.PDU_CDMA_MSG_TELESERIVCIE_ID_WAP
             && seq === 1) {
-          if (aSmsSegment.originatorPort) {
+          if (aSmsSegment.originatorPort === Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
             segmentRecord.originatorPort = aSmsSegment.originatorPort;
           }
 
-          if (aSmsSegment.destinationPort) {
+          if (aSmsSegment.destinationPort === Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
             segmentRecord.destinationPort = aSmsSegment.destinationPort;
           }
         }
diff --git a/dom/mobilemessage/gonk/SmsService.js b/dom/mobilemessage/gonk/SmsService.js
index 8adf1b0df5a8..362717d8043d 100644
--- a/dom/mobilemessage/gonk/SmsService.js
+++ b/dom/mobilemessage/gonk/SmsService.js
@@ -35,6 +35,8 @@ const DOM_MOBILE_MESSAGE_DELIVERY_SENDING  = "sending";
 const DOM_MOBILE_MESSAGE_DELIVERY_SENT     = "sent";
 const DOM_MOBILE_MESSAGE_DELIVERY_ERROR    = "error";
 
+const SMS_HANDLED_WAKELOCK_TIMEOUT = 5000;
+
 XPCOMUtils.defineLazyGetter(this, "gRadioInterfaces", function() {
   let ril = Cc["@mozilla.org/ril;1"].getService(Ci.nsIRadioInterfaceLayer);
 
@@ -57,6 +59,16 @@ XPCOMUtils.defineLazyGetter(this, "gPhoneNumberUtils", function() {
   return ns.PhoneNumberUtils;
 });
 
+XPCOMUtils.defineLazyGetter(this, "gWAP", function() {
+  let ns = {};
+  Cu.import("resource://gre/modules/WapPushManager.js", ns);
+  return ns;
+});
+
+XPCOMUtils.defineLazyServiceGetter(this, "gCellBroadcastService",
+                                   "@mozilla.org/cellbroadcast/gonkservice;1",
+                                   "nsIGonkCellBroadcastService");
+
 XPCOMUtils.defineLazyServiceGetter(this, "gMobileConnectionService",
                                    "@mozilla.org/mobileconnection/mobileconnectionservice;1",
                                    "nsIMobileConnectionService");
@@ -69,6 +81,10 @@ XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageService",
                                    "@mozilla.org/mobilemessage/mobilemessageservice;1",
                                    "nsIMobileMessageService");
 
+XPCOMUtils.defineLazyServiceGetter(this, "gPowerManagerService",
+                                   "@mozilla.org/power/powermanagerservice;1",
+                                   "nsIPowerManagerService");
+
 XPCOMUtils.defineLazyServiceGetter(this, "gSmsMessenger",
                                    "@mozilla.org/ril/system-messenger-helper;1",
                                    "nsISmsMessenger");
@@ -82,6 +98,11 @@ function SmsService() {
   this._silentNumbers = [];
   this.smsDefaultServiceId = this._getDefaultServiceId();
 
+  this._portAddressedSmsApps = {};
+  this._portAddressedSmsApps[gWAP.WDP_PORT_PUSH] = this._handleSmsWdpPortPush.bind(this);
+
+  this._receivedSmsSegmentsMap = {};
+
   Services.prefs.addObserver(kPrefRilDebuggingEnabled, this, false);
   Services.prefs.addObserver(kPrefDefaultServiceId, this, false);
   Services.obs.addObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
@@ -151,6 +172,43 @@ SmsService.prototype = {
     return iccInfo.iccid;
   },
 
+  // The following attributes/functions are used for acquiring/releasing the
+  // CPU wake lock when the RIL handles the received SMS. Note that we need
+  // a timer to bound the lock's life cycle to avoid exhausting the battery.
+  _smsHandledWakeLock: null,
+  _smsHandledWakeLockTimer: null,
+  _acquireSmsHandledWakeLock: function() {
+    if (!this._smsHandledWakeLock) {
+      if (DEBUG) debug("Acquiring a CPU wake lock for handling SMS.");
+      this._smsHandledWakeLock = gPowerManagerService.newWakeLock("cpu");
+    }
+    if (!this._smsHandledWakeLockTimer) {
+      if (DEBUG) debug("Creating a timer for releasing the CPU wake lock.");
+      this._smsHandledWakeLockTimer =
+        Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    }
+    if (DEBUG) debug("Setting the timer for releasing the CPU wake lock.");
+    this._smsHandledWakeLockTimer
+        .initWithCallback(this._releaseSmsHandledWakeLock.bind(this),
+                          SMS_HANDLED_WAKELOCK_TIMEOUT,
+                          Ci.nsITimer.TYPE_ONE_SHOT);
+  },
+
+  _releaseSmsHandledWakeLock: function() {
+    if (DEBUG) debug("Releasing the CPU wake lock for handling SMS.");
+    if (this._smsHandledWakeLockTimer) {
+      this._smsHandledWakeLockTimer.cancel();
+    }
+    if (this._smsHandledWakeLock) {
+      this._smsHandledWakeLock.unlock();
+      this._smsHandledWakeLock = null;
+    }
+  },
+
+  _convertSmsMessageClassToString: function(aMessageClass) {
+    return RIL.GECKO_SMS_MESSAGE_CLASSES[aMessageClass] || null;
+  },
+
   _convertSmsMessageClass: function(aMessageClass) {
     let index = RIL.GECKO_SMS_MESSAGE_CLASSES.indexOf(aMessageClass);
 
@@ -362,6 +420,347 @@ SmsService.prototype = {
     }
   },
 
+  /**
+   * Helper for processing received multipart SMS.
+   *
+   * @return null for handled segments, and an object containing full message
+   *         body/data once all segments are received.
+   *
+   * |_receivedSmsSegmentsMap|:
+   *   Hash map for received multipart sms fragments. Messages are hashed with
+   *   its sender address and concatenation reference number. Three additional
+   *   attributes `segmentMaxSeq`, `receivedSegments`, `segments` are inserted.
+   */
+  _receivedSmsSegmentsMap: null,
+  _processReceivedSmsSegment: function(aSegment) {
+    // Directly replace full message body for single SMS.
+    if (!(aSegment.segmentMaxSeq && (aSegment.segmentMaxSeq > 1))) {
+      if (aSegment.encoding == Ci.nsIGonkSmsService.SMS_MESSAGE_ENCODING_8BITS_ALPHABET) {
+        aSegment.fullData = aSegment.data;
+      } else {
+        aSegment.fullBody = aSegment.body;
+      }
+      return aSegment;
+    }
+
+    // Handle Concatenation for Class 0 SMS
+    let hash = aSegment.sender + ":" +
+               aSegment.segmentRef + ":" +
+               aSegment.segmentMaxSeq;
+    let seq = aSegment.segmentSeq;
+
+    let options = this._receivedSmsSegmentsMap[hash];
+    if (!options) {
+      options = aSegment;
+      this._receivedSmsSegmentsMap[hash] = options;
+
+      options.receivedSegments = 0;
+      options.segments = [];
+    } else if (options.segments[seq]) {
+      // Duplicated segment?
+      if (DEBUG) {
+        debug("Got duplicated segment no." + seq +
+              " of a multipart SMS: " + JSON.stringify(aSegment));
+      }
+      return null;
+    }
+
+    if (options.receivedSegments > 0) {
+      // Update received timestamp.
+      options.timestamp = aSegment.timestamp;
+    }
+
+    if (options.encoding == Ci.nsIGonkSmsService.SMS_MESSAGE_ENCODING_8BITS_ALPHABET) {
+      options.segments[seq] = aSegment.data;
+    } else {
+      options.segments[seq] = aSegment.body;
+    }
+    options.receivedSegments++;
+
+    // The port information is only available in 1st segment for CDMA WAP Push.
+    // If the segments of a WAP Push are not received in sequence
+    // (e.g., SMS with seq == 1 is not the 1st segment received by the device),
+    // we have to retrieve the port information from 1st segment and
+    // save it into the cached options.
+    if (aSegment.teleservice === RIL.PDU_CDMA_MSG_TELESERIVCIE_ID_WAP
+        && seq === 1) {
+      if (options.originatorPort === Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID
+          && aSegment.originatorPort !== Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
+        options.originatorPort = aSegment.originatorPort;
+      }
+
+      if (options.destinationPort === Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID
+          && aSegment.destinationPort !== Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
+        options.destinationPort = aSegment.destinationPort;
+      }
+    }
+
+    if (options.receivedSegments < options.segmentMaxSeq) {
+      if (DEBUG) {
+        debug("Got segment no." + seq + " of a multipart SMS: " +
+                           JSON.stringify(options));
+      }
+      return null;
+    }
+
+    // Remove from map
+    delete this._receivedSmsSegmentsMap[hash];
+
+    // Rebuild full body
+    if (options.encoding == Ci.nsIGonkSmsService.SMS_MESSAGE_ENCODING_8BITS_ALPHABET) {
+      // Uint8Array doesn't have `concat`, so we have to merge all segements
+      // by hand.
+      let fullDataLen = 0;
+      for (let i = 1; i <= options.segmentMaxSeq; i++) {
+        fullDataLen += options.segments[i].length;
+      }
+
+      options.fullData = new Uint8Array(fullDataLen);
+      for (let d= 0, i = 1; i <= options.segmentMaxSeq; i++) {
+        let data = options.segments[i];
+        for (let j = 0; j < data.length; j++) {
+          options.fullData[d++] = data[j];
+        }
+      }
+    } else {
+      options.fullBody = options.segments.join("");
+    }
+
+    // Remove handy fields after completing the concatenation.
+    delete options.receivedSegments;
+    delete options.segments;
+
+    if (DEBUG) {
+      debug("Got full multipart SMS: " + JSON.stringify(options));
+    }
+
+    return options;
+  },
+
+  /**
+   * Helper to purge complete message.
+   *
+   * We remove unnessary fields after completing the concatenation.
+   */
+  _purgeCompleteSmsMessage: function(aMessage) {
+    // Purge concatenation info
+    delete aMessage.segmentRef;
+    delete aMessage.segmentSeq;
+    delete aMessage.segmentMaxSeq;
+
+    // Purge partial message body
+    delete aMessage.data;
+    delete aMessage.body;
+  },
+
+  /**
+   * Handle WDP port push PDU. Constructor WDP bearer information and deliver
+   * to WapPushManager.
+   *
+   * @param aMessage
+   *        A SMS message.
+   */
+  _handleSmsWdpPortPush: function(aMessage, aServiceId) {
+    if (aMessage.encoding != Ci.nsIGonkSmsService.SMS_MESSAGE_ENCODING_8BITS_ALPHABET) {
+      if (DEBUG) {
+        debug("Got port addressed SMS but not encoded in 8-bit alphabet." +
+                   " Drop!");
+      }
+      return;
+    }
+
+    let options = {
+      bearer: gWAP.WDP_BEARER_GSM_SMS_GSM_MSISDN,
+      sourceAddress: aMessage.sender,
+      sourcePort: aMessage.originatorPort,
+      destinationAddress: this._getPhoneNumber(aServiceId),
+      destinationPort: aMessage.destinationPort,
+      serviceId: aServiceId
+    };
+    gWAP.WapPushManager.receiveWdpPDU(aMessage.fullData, aMessage.fullData.length,
+                                     0, options);
+  },
+
+  _handleCellbroadcastMessageReceived: function(aMessage, aServiceId) {
+    gCellBroadcastService
+      .notifyMessageReceived(aServiceId,
+                             Ci.nsICellBroadcastService.GSM_GEOGRAPHICAL_SCOPE_INVALID,
+                             aMessage.messageCode,
+                             aMessage.messageId,
+                             aMessage.language,
+                             aMessage.fullBody,
+                             Ci.nsICellBroadcastService.GSM_MESSAGE_CLASS_NORMAL,
+                             Date.now(),
+                             aMessage.serviceCategory,
+                             false,
+                             Ci.nsICellBroadcastService.GSM_ETWS_WARNING_INVALID,
+                             false,
+                             false);
+  },
+
+  _handleMwis: function(aMwi, aServiceId) {
+    let service = Cc["@mozilla.org/voicemail/voicemailservice;1"]
+                  .getService(Ci.nsIGonkVoicemailService);
+    service.notifyStatusChanged(aServiceId, aMwi.active, aMwi.msgCount,
+                                aMwi.returnNumber, aMwi.returnMessage);
+
+    gRadioInterfaces[aServiceId].sendWorkerMessage("updateMwis", { mwi: aMwi });
+  },
+
+  _portAddressedSmsApps: null,
+  _handleSmsReceived: function(aMessage, aServiceId) {
+    if (DEBUG) debug("_handleSmsReceived: " + JSON.stringify(aMessage));
+
+    if (aMessage.messageType == RIL.PDU_CDMA_MSG_TYPE_BROADCAST) {
+      this._handleCellbroadcastMessageReceived(aMessage, aServiceId);
+      return true;
+    }
+
+    // Dispatch to registered handler if application port addressing is
+    // available. Note that the destination port can possibly be zero when
+    // representing a UDP/TCP port.
+    if (aMessage.destinationPort !== Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID) {
+      let handler = this._portAddressedSmsApps[aMessage.destinationPort];
+      if (handler) {
+        handler(aMessage, aServiceId);
+      }
+      return true;
+    }
+
+    if (aMessage.encoding == Ci.nsIGonkSmsService.SMS_MESSAGE_ENCODING_8BITS_ALPHABET) {
+      // Don't know how to handle binary data yet.
+      return true;
+    }
+
+    aMessage.type = "sms";
+    aMessage.sender = aMessage.sender || null;
+    aMessage.receiver = this._getPhoneNumber(aServiceId);
+    aMessage.body = aMessage.fullBody = aMessage.fullBody || null;
+
+    if (this._isSilentNumber(aMessage.sender)) {
+      aMessage.id = -1;
+      aMessage.threadId = 0;
+      aMessage.delivery = DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED;
+      aMessage.deliveryStatus = RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS;
+      aMessage.read = false;
+
+      let domMessage =
+        gMobileMessageService.createSmsMessage(aMessage.id,
+                                               aMessage.threadId,
+                                               aMessage.iccId,
+                                               aMessage.delivery,
+                                               aMessage.deliveryStatus,
+                                               aMessage.sender,
+                                               aMessage.receiver,
+                                               aMessage.body,
+                                               aMessage.messageClass,
+                                               aMessage.timestamp,
+                                               aMessage.sentTimestamp,
+                                               0,
+                                               aMessage.read);
+
+      Services.obs.notifyObservers(domMessage,
+                                   kSilentSmsReceivedObserverTopic,
+                                   null);
+      return true;
+    }
+
+    if (aMessage.mwiPresent) {
+      let mwi = {
+        discard: aMessage.mwiDiscard,
+        msgCount: aMessage.mwiMsgCount,
+        active: aMessage.mwiActive,
+        returnNumber: aMessage.sender || null,
+        returnMessage: aMessage.fullBody || null
+      };
+
+      this._handleMwis(mwi, aServiceId);
+
+      // Dicarded MWI comes without text body.
+      // Hence, we discard it here after notifying the MWI status.
+      if (aMessage.mwiDiscard) {
+        return true;
+      }
+    }
+
+    let notifyReceived = (aRv, aDomMessage) => {
+      let success = Components.isSuccessCode(aRv);
+
+      this._sendAckSms(aRv, aMessage, aServiceId);
+
+      if (!success) {
+        // At this point we could send a message to content to notify the user
+        // that storing an incoming SMS failed, most likely due to a full disk.
+        if (DEBUG) {
+          debug("Could not store SMS, error code " + aRv);
+        }
+        return;
+      }
+
+      this._broadcastSmsSystemMessage(
+        Ci.nsISmsMessenger.NOTIFICATION_TYPE_RECEIVED, aDomMessage);
+      Services.obs.notifyObservers(aDomMessage, kSmsReceivedObserverTopic, null);
+    };
+
+    if (aMessage.messageClass != RIL.GECKO_SMS_MESSAGE_CLASSES[RIL.PDU_DCS_MSG_CLASS_0]) {
+      gMobileMessageDatabaseService.saveReceivedMessage(aMessage,
+                                                        notifyReceived);
+    } else {
+      aMessage.id = -1;
+      aMessage.threadId = 0;
+      aMessage.delivery = DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED;
+      aMessage.deliveryStatus = RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS;
+      aMessage.read = false;
+
+      let domMessage =
+        gMobileMessageService.createSmsMessage(aMessage.id,
+                                               aMessage.threadId,
+                                               aMessage.iccId,
+                                               aMessage.delivery,
+                                               aMessage.deliveryStatus,
+                                               aMessage.sender,
+                                               aMessage.receiver,
+                                               aMessage.body,
+                                               aMessage.messageClass,
+                                               aMessage.timestamp,
+                                               aMessage.sentTimestamp,
+                                               0,
+                                               aMessage.read);
+
+      notifyReceived(Cr.NS_OK, domMessage);
+    }
+
+    // SMS ACK will be sent in notifyReceived. Return false here.
+    return false;
+  },
+
+  /**
+   * Handle ACK response of received SMS.
+   */
+  _sendAckSms: function(aRv, aMessage, aServiceId) {
+    if (aMessage.messageClass === RIL.GECKO_SMS_MESSAGE_CLASSES[RIL.PDU_DCS_MSG_CLASS_2]) {
+      return;
+    }
+
+    let result = RIL.PDU_FCS_OK;
+    if (!Components.isSuccessCode(aRv)) {
+      if (DEBUG) debug("Failed to handle received sms: " + aRv);
+      result = (aRv === Cr.NS_ERROR_FILE_NO_DEVICE_SPACE)
+                ? RIL.PDU_FCS_MEMORY_CAPACITY_EXCEEDED
+                : RIL.PDU_FCS_UNSPECIFIED;
+    }
+
+    gRadioInterfaces[aServiceId]
+      .sendWorkerMessage("ackSMS", { result: result });
+
+  },
+
+  // An array of slient numbers.
+  _silentNumbers: null,
+  _isSilentNumber: function(aNumber) {
+    return this._silentNumbers.indexOf(aNumber) >= 0;
+  },
+
   /**
    * nsISmsService interface
    */
@@ -507,14 +906,8 @@ SmsService.prototype = {
       sendingMessage, saveSendingMessageCallback);
   },
 
-  // An array of slient numbers.
-  _silentNumbers: null,
-  isSilentNumber: function(aNumber) {
-    return this._silentNumbers.indexOf(aNumber) >= 0;
-  },
-
   addSilentNumber: function(aNumber) {
-    if (this.isSilentNumber(aNumber)) {
+    if (this._isSilentNumber(aNumber)) {
       throw Cr.NS_ERROR_UNEXPECTED;
     }
 
@@ -548,8 +941,80 @@ SmsService.prototype = {
   },
 
   /**
-   * TODO: nsIGonkSmsService interface
+   * nsIGonkSmsService interface
    */
+  notifyMessageReceived: function(aServiceId, aSMSC, aSentTimestamp,
+                                  aSender, aPid, aEncoding, aMessageClass,
+                                  aLanguage, aSegmentRef, aSegmentSeq,
+                                  aSegmentMaxSeq, aOriginatorPort,
+                                  aDestinationPort, aMwiPresent, aMwiDiscard,
+                                  aMwiMsgCount, aMwiActive, aCdmaMessageType,
+                                  aCdmaTeleservice, aCdmaServiceCategory,
+                                  aBody, aData, aDataLength) {
+
+    this._acquireSmsHandledWakeLock();
+
+    let segment = {};
+    segment.iccId = this._getIccId(aServiceId);
+    segment.SMSC = aSMSC;
+    segment.sentTimestamp = aSentTimestamp;
+    segment.timestamp = Date.now();
+    segment.sender = aSender;
+    segment.pid = aPid;
+    segment.encoding = aEncoding;
+    segment.messageClass = this._convertSmsMessageClassToString(aMessageClass);
+    segment.language = aLanguage;
+    segment.segmentRef = aSegmentRef;
+    segment.segmentSeq = aSegmentSeq;
+    segment.segmentMaxSeq = aSegmentMaxSeq;
+    segment.originatorPort = aOriginatorPort;
+    segment.destinationPort = aDestinationPort;
+    segment.mwiPresent = aMwiPresent;
+    segment.mwiDiscard = aMwiDiscard;
+    segment.mwiMsgCount = aMwiMsgCount;
+    segment.mwiActive = aMwiActive;
+    segment.messageType = aCdmaMessageType;
+    segment.teleservice = aCdmaTeleservice;
+    segment.serviceCategory = aCdmaServiceCategory;
+    segment.body = aBody;
+    segment.data = (aData && aDataLength > 0) ? aData : null;
+
+    let isMultipart = (segment.segmentMaxSeq && (segment.segmentMaxSeq > 1));
+    let messageClass = segment.messageClass;
+
+    let handleReceivedAndAck = (aRvOfIncompleteMsg, aCompleteMessage) => {
+      if (aCompleteMessage) {
+        this._purgeCompleteSmsMessage(aCompleteMessage);
+        if (this._handleSmsReceived(aCompleteMessage, aServiceId)) {
+          this._sendAckSms(Cr.NS_OK, aCompleteMessage, aServiceId);
+        }
+        // else Ack will be sent after further process in _handleSmsReceived.
+      } else {
+        this._sendAckSms(aRvOfIncompleteMsg, segment, aServiceId);
+      }
+    };
+
+    // No need to access SmsSegmentStore for Class 0 SMS and Single SMS.
+    if (!isMultipart ||
+        (messageClass == RIL.GECKO_SMS_MESSAGE_CLASSES[RIL.PDU_DCS_MSG_CLASS_0])) {
+      // `When a mobile terminated message is class 0 and the MS has the
+      // capability of displaying short messages, the MS shall display the
+      // message immediately and send an acknowledgement to the SC when the
+      // message has successfully reached the MS irrespective of whether
+      // there is memory available in the (U)SIM or ME. The message shall
+      // not be automatically stored in the (U)SIM or ME.`
+      // ~ 3GPP 23.038 clause 4
+
+      handleReceivedAndAck(Cr.NS_OK,  // ACK OK For Incomplete Class 0
+                           this._processReceivedSmsSegment(segment));
+    } else {
+      gMobileMessageDatabaseService
+        .saveSmsSegment(segment, function notifyResult(aRv, aCompleteMessage) {
+        handleReceivedAndAck(aRv,  // Ack according to the result after saving
+                             aCompleteMessage);
+      });
+    }
+  },
 
   /**
    * nsIObserver interface.
@@ -565,6 +1030,8 @@ SmsService.prototype = {
         }
         break;
       case NS_XPCOM_SHUTDOWN_OBSERVER_ID:
+        // Release the CPU wake lock for handling the received SMS.
+        this._releaseSmsHandledWakeLock();
         Services.prefs.removeObserver(kPrefRilDebuggingEnabled, this);
         Services.prefs.removeObserver(kPrefDefaultServiceId, this);
         Services.obs.removeObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
diff --git a/dom/mobilemessage/interfaces/nsIGonkSmsService.idl b/dom/mobilemessage/interfaces/nsIGonkSmsService.idl
index a3c0a53492ea..b57bbd2b84c0 100644
--- a/dom/mobilemessage/interfaces/nsIGonkSmsService.idl
+++ b/dom/mobilemessage/interfaces/nsIGonkSmsService.idl
@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "domstubs.idl"
 #include "nsISmsService.idl"
 
 %{C++
@@ -9,10 +10,86 @@
         "@mozilla.org/sms/gonksmsservice;1"
 %}
 
-[scriptable, uuid(63fab75e-73b4-11e4-a10d-dbfa9d05a4f4)]
+[scriptable, uuid(4dda515e-05ec-47b1-b750-e42c74576c43)]
 interface nsIGonkSmsService : nsISmsService
 {
+  const unsigned short SMS_MESSAGE_ENCODING_7BITS_ALPHABET = 0x00;
+  const unsigned short SMS_MESSAGE_ENCODING_8BITS_ALPHABET = 0x04;
+  const unsigned short SMS_MESSAGE_ENCODING_16BITS_ALPHABET = 0x08;
+
+  const unsigned long SMS_APPLICATION_PORT_INVALID = 0xFFFFFFFF;
+
   /**
-   * TODO: define callback to receive message from the network.
+   * Called when a short message has been received by the network.
+   *
+   * @param aServiceId
+   *        The ID of the service where this message is received from.
+   * @param aSMSC
+   *        SMS Center address.
+   * @param aSentTimestamp
+   *        The time stamp when message is arrived to SMSC.
+   * @param aSender
+   *        The sender's address of this message.
+   * @param aPid
+   *        Protocol Identifier, See TS 23.040, subcluase 9.2.3.9.
+   *        Set to 0 if invalid.
+   * @param aEncoding
+   *        The encoding of message body.
+   *        SMS_MESSAGE_ENCODING_*.
+   * @param aMessageClass
+   *        A predefined constant of nsISmsService.MESSAGE_CLASS_TYPE_*.
+   * @param aLanguage
+   *        ISO-639-1 language code for this message. Null if unspecified.
+   * @param aSegmentRef, aSegmentSeq, aSegmentMaxSeq
+   *        Concatenation info. See TS 23.040, subclause 9.2.3.24.1.
+   *        All set to 1 if no need for concatenatenation.
+   * @param aOriginatorPort, aDestinationPort
+   *        Application Port Addressing. See TS 23.040 subclause 9.2.3.24.3~4.
+   *        All set to 1 if no need for concatenatenation.
+   * @param aMwiPresent
+   *        True if MWI is presented in this message.
+   * @param aMwiDiscard
+   *        True if MWI has to be discarded after received.
+   * @param aMwiMsgCount
+   *        The number of messages waiting in the voicemail server.
+   *        -1 if number is unknown from the decoded MWI.
+   * @param aMwiActive
+   *        True if there are messages waiting in the voicemail server.
+   * @param aCdmaMessageType
+   *        CDMA SMS Message Type, as defined in 3GPP2 C.S0015-A v2.0, Table 3.4-1
+   *        Set to 0 if invalid.
+   * @param aCdmaTeleservice
+   *        SMS Teleservice Identitifier, as defined in 3GPP2 N.S0005, Table 175.
+   *        Set to 0 if invalid.
+   * @param aCdmaServiceCategory
+   *        CDMA Service Category, 3GPP2 C.R1001-D v2.0, 9.3 Service Category.
+   *        Set to 0 if invalid.
+   * @param aBody
+   *        Text message body.
+   * @param aData
+   *        Binary message body.
    */
-};
\ No newline at end of file
+  void notifyMessageReceived(in unsigned long aServiceId,
+                             in DOMString aSMSC,
+                             in DOMTimeStamp aSentTimestamp,
+                             in DOMString aSender,
+                             in unsigned short aPid,
+                             in unsigned short aEncoding,
+                             in unsigned long aMessageClass,
+                             in DOMString aLanguage,
+                             in unsigned short aSegmentRef,
+                             in unsigned short aSegmentSeq,
+                             in unsigned short aSegmentMaxSeq,
+                             in unsigned long aOriginatorPort,
+                             in unsigned long aDestinationPort,
+                             in boolean aMwiPresent,
+                             in boolean aMwiDiscard,
+                             in short aMwiMsgCount,
+                             in boolean aMwiActive,
+                             in unsigned short aCdmaMessageType,
+                             in unsigned long aCdmaTeleservice,
+                             in unsigned long aCdmaServiceCategory,
+                             in DOMString aBody,
+                             [array, size_is(aDataLength)] in octet aData,
+                             in uint32_t aDataLength);
+};
diff --git a/dom/mobilemessage/interfaces/nsISmsService.idl b/dom/mobilemessage/interfaces/nsISmsService.idl
index 4d33dfa5ee5d..a5320956d2e9 100644
--- a/dom/mobilemessage/interfaces/nsISmsService.idl
+++ b/dom/mobilemessage/interfaces/nsISmsService.idl
@@ -12,7 +12,7 @@ interface nsIMobileMessageCallback;
 #define SMS_SERVICE_CONTRACTID "@mozilla.org/sms/smsservice;1"
 %}
 
-[scriptable, uuid(31626940-73b4-11e4-8b03-1724e1d8a6a1)]
+[scriptable, uuid(ae688bca-00c9-4d08-945d-e8a5272ad5b1)]
 interface nsISmsService : nsISupports
 {
   /**
@@ -52,7 +52,6 @@ interface nsISmsService : nsISupports
             in boolean silent,
             in nsIMobileMessageCallback request);
 
-  boolean isSilentNumber(in DOMString number);
   void addSilentNumber(in DOMString number);
   void removeSilentNumber(in DOMString number);
 
diff --git a/dom/mobilemessage/ipc/SmsIPCService.cpp b/dom/mobilemessage/ipc/SmsIPCService.cpp
index a33316a20db4..d7bfe3627334 100644
--- a/dom/mobilemessage/ipc/SmsIPCService.cpp
+++ b/dom/mobilemessage/ipc/SmsIPCService.cpp
@@ -193,14 +193,6 @@ SmsIPCService::Send(uint32_t aServiceId,
                      aRequest);
 }
 
-NS_IMETHODIMP
-SmsIPCService::IsSilentNumber(const nsAString& aNumber,
-                              bool*            aIsSilent)
-{
-  NS_ERROR("We should not be here!");
-  return NS_ERROR_FAILURE;
-}
-
 NS_IMETHODIMP
 SmsIPCService::AddSilentNumber(const nsAString& aNumber)
 {
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index a8914b571db9..86227fef5bb3 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -56,13 +56,6 @@ const RILNETWORKINTERFACE_CID =
 
 const NS_XPCOM_SHUTDOWN_OBSERVER_ID      = "xpcom-shutdown";
 const kNetworkConnStateChangedTopic      = "network-connection-state-changed";
-const kSmsReceivedObserverTopic          = "sms-received";
-const kSilentSmsReceivedObserverTopic    = "silent-sms-received";
-const kSmsSendingObserverTopic           = "sms-sending";
-const kSmsSentObserverTopic              = "sms-sent";
-const kSmsFailedObserverTopic            = "sms-failed";
-const kSmsDeliverySuccessObserverTopic   = "sms-delivery-success";
-const kSmsDeliveryErrorObserverTopic     = "sms-delivery-error";
 const kMozSettingsChangedObserverTopic   = "mozsettings-changed";
 const kSysMsgListenerReadyObserverTopic  = "system-message-listener-ready";
 const kSysClockChangeObserverTopic       = "system-clock-change";
@@ -78,13 +71,7 @@ const NS_PREFBRANCH_PREFCHANGE_TOPIC_ID = "nsPref:changed";
 const kPrefRilNumRadioInterfaces = "ril.numRadioInterfaces";
 const kPrefRilDebuggingEnabled = "ril.debugging.enabled";
 
-const DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED = "received";
-const DOM_MOBILE_MESSAGE_DELIVERY_SENDING  = "sending";
-const DOM_MOBILE_MESSAGE_DELIVERY_SENT     = "sent";
-const DOM_MOBILE_MESSAGE_DELIVERY_ERROR    = "error";
-
 const RADIO_POWER_OFF_TIMEOUT = 30000;
-const SMS_HANDLED_WAKELOCK_TIMEOUT = 5000;
 const HW_DEFAULT_CLIENT_ID = 0;
 
 const INT32_MAX = 2147483647;
@@ -136,10 +123,6 @@ function debug(s) {
   dump("-*- RadioInterfaceLayer: " + s + "\n");
 }
 
-XPCOMUtils.defineLazyServiceGetter(this, "gPowerManagerService",
-                                   "@mozilla.org/power/powermanagerservice;1",
-                                   "nsIPowerManagerService");
-
 XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageService",
                                    "@mozilla.org/mobilemessage/mobilemessageservice;1",
                                    "nsIMobileMessageService");
@@ -148,10 +131,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "gSmsService",
                                    "@mozilla.org/sms/gonksmsservice;1",
                                    "nsIGonkSmsService");
 
-XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageDatabaseService",
-                                   "@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1",
-                                   "nsIRilMobileMessageDatabaseService");
-
 XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
                                    "@mozilla.org/parentprocessmessagemanager;1",
                                    "nsIMessageBroadcaster");
@@ -160,10 +139,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "gSettingsService",
                                    "@mozilla.org/settingsService;1",
                                    "nsISettingsService");
 
-XPCOMUtils.defineLazyServiceGetter(this, "gSystemMessenger",
-                                   "@mozilla.org/system-message-internal;1",
-                                   "nsISystemMessagesInternal");
-
 XPCOMUtils.defineLazyServiceGetter(this, "gNetworkManager",
                                    "@mozilla.org/network/manager;1",
                                    "nsINetworkManager");
@@ -188,10 +163,6 @@ XPCOMUtils.defineLazyServiceGetter(this, "gCellBroadcastService",
                                    "@mozilla.org/cellbroadcast/gonkservice;1",
                                    "nsIGonkCellBroadcastService");
 
-XPCOMUtils.defineLazyServiceGetter(this, "gSmsMessenger",
-                                   "@mozilla.org/ril/system-messenger-helper;1",
-                                   "nsISmsMessenger");
-
 XPCOMUtils.defineLazyServiceGetter(this, "gIccMessenger",
                                    "@mozilla.org/ril/system-messenger-helper;1",
                                    "nsIIccMessenger");
@@ -202,12 +173,6 @@ XPCOMUtils.defineLazyGetter(this, "gStkCmdFactory", function() {
   return stk.StkProactiveCmdFactory;
 });
 
-XPCOMUtils.defineLazyGetter(this, "WAP", function() {
-  let wap = {};
-  Cu.import("resource://gre/modules/WapPushManager.js", wap);
-  return wap;
-});
-
 XPCOMUtils.defineLazyGetter(this, "gMessageManager", function() {
   return {
     QueryInterface: XPCOMUtils.generateQI([Ci.nsIMessageListener,
@@ -1740,11 +1705,6 @@ function RadioInterface(aClientId, aWorkerMessenger) {
 
   Services.obs.addObserver(this, kNetworkConnStateChangedTopic, false);
 
-  this.portAddressedSmsApps = {};
-  this.portAddressedSmsApps[WAP.WDP_PORT_PUSH] = this.handleSmsWdpPortPush.bind(this);
-
-  this._receivedSmsSegmentsMap = {};
-
   this._sntp = new Sntp(this.setClockBySntp.bind(this),
                         Services.prefs.getIntPref("network.sntp.maxRetryCount"),
                         Services.prefs.getIntPref("network.sntp.refreshPeriod"),
@@ -1772,9 +1732,6 @@ RadioInterface.prototype = {
   },
 
   shutdown: function() {
-    // Release the CPU wake lock for handling the received SMS.
-    this._releaseSmsHandledWakeLock();
-
     Services.obs.removeObserver(this, kMozSettingsChangedObserverTopic);
     Services.obs.removeObserver(this, kSysClockChangeObserverTopic);
     Services.obs.removeObserver(this, kScreenStateChangedTopic);
@@ -1977,7 +1934,7 @@ RadioInterface.prototype = {
                                        this.clientId, message);
         break;
       case "sms-received":
-        this.handleSmsMultipart(message);
+        this.handleSmsReceived(message);
         break;
       case "cellbroadcast-received":
         this.handleCellbroadcastMessageReceived(message);
@@ -2012,58 +1969,6 @@ RadioInterface.prototype = {
     }
   },
 
-  /**
-   * Get phone number from iccInfo.
-   *
-   * If the icc card is gsm card, the phone number is in msisdn.
-   * @see nsIGsmIccInfo
-   *
-   * Otherwise, the phone number is in mdn.
-   * @see nsICdmaIccInfo
-   */
-  getPhoneNumber: function() {
-    let iccInfo = this.rilContext.iccInfo;
-
-    if (!iccInfo) {
-      return null;
-    }
-
-    // After moving SMS code out of RadioInterfaceLayer, we could use
-    // |iccInfo instanceof Ci.nsIGsmIccInfo| here.
-    // TODO: Bug 873351 - B2G SMS: move SMS code out of RadioInterfaceLayer to
-    //                    SmsService
-    let number = (iccInfo instanceof GsmIccInfo) ? iccInfo.msisdn : iccInfo.mdn;
-
-    // Workaround an xpconnect issue with undefined string objects.
-    // See bug 808220
-    if (number === undefined || number === "undefined") {
-      return null;
-    }
-
-    return number;
-  },
-
-  /**
-   * A utility function to get the ICC ID of the SIM card (if installed).
-   */
-  getIccId: function() {
-    let iccInfo = this.rilContext.iccInfo;
-
-    if (!iccInfo) {
-      return null;
-    }
-
-    let iccId = iccInfo.iccid;
-
-    // Workaround an xpconnect issue with undefined string objects.
-    // See bug 808220
-    if (iccId === undefined || iccId === "undefined") {
-      return null;
-    }
-
-    return iccId;
-  },
-
   // Matches the mvnoData pattern with imsi. Characters 'x' and 'X' are skipped
   // and not compared. E.g., if the mvnoData passed is '310260x10xxxxxx',
   // then the function returns true only if imsi has the same first 6 digits,
@@ -2163,506 +2068,64 @@ RadioInterface.prototype = {
   },
 
   /**
-   * Handle WDP port push PDU. Constructor WDP bearer information and deliver
-   * to WapPushManager.
-   *
-   * @param message
-   *        A SMS message.
+   * handle received SMS.
    */
-  handleSmsWdpPortPush: function(message) {
-    if (message.encoding != RIL.PDU_DCS_MSG_CODING_8BITS_ALPHABET) {
-      if (DEBUG) {
-        this.debug("Got port addressed SMS but not encoded in 8-bit alphabet." +
-                   " Drop!");
-      }
-      return;
-    }
-
-    let options = {
-      bearer: WAP.WDP_BEARER_GSM_SMS_GSM_MSISDN,
-      sourceAddress: message.sender,
-      sourcePort: message.originatorPort,
-      destinationAddress: this.rilContext.iccInfo.msisdn,
-      destinationPort: message.destinationPort,
-      serviceId: this.clientId
-    };
-    WAP.WapPushManager.receiveWdpPDU(message.fullData, message.fullData.length,
-                                     0, options);
-  },
-
-  _convertSmsMessageClass: function(aMessageClass) {
-    let index = RIL.GECKO_SMS_MESSAGE_CLASSES.indexOf(aMessageClass);
-
-    if (index < 0) {
-      throw new Error("Invalid MessageClass: " + aMessageClass);
-    }
-
-    return index;
-  },
-
-  _convertSmsDelivery: function(aDelivery) {
-    let index = [DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED,
-                 DOM_MOBILE_MESSAGE_DELIVERY_SENDING,
-                 DOM_MOBILE_MESSAGE_DELIVERY_SENT,
-                 DOM_MOBILE_MESSAGE_DELIVERY_ERROR].indexOf(aDelivery);
-
-    if (index < 0) {
-      throw new Error("Invalid Delivery: " + aDelivery);
-    }
-
-    return index;
-  },
-
-  _convertSmsDeliveryStatus: function(aDeliveryStatus) {
-    let index = [RIL.GECKO_SMS_DELIVERY_STATUS_NOT_APPLICABLE,
-                 RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS,
-                 RIL.GECKO_SMS_DELIVERY_STATUS_PENDING,
-                 RIL.GECKO_SMS_DELIVERY_STATUS_ERROR].indexOf(aDeliveryStatus);
-
-    if (index < 0) {
-      throw new Error("Invalid DeliveryStatus: " + aDeliveryStatus);
-    }
-
-    return index;
-  },
-
-  /**
-   * A helper to broadcast the system message to launch registered apps
-   * like Costcontrol, Notification and Message app... etc.
-   *
-   * @param aName
-   *        The system message name.
-   * @param aDomMessage
-   *        The nsIDOMMozSmsMessage object.
-   */
-  broadcastSmsSystemMessage: function(aNotificationType, aDomMessage) {
-    if (DEBUG) this.debug("Broadcasting the SMS system message: " + aNotificationType);
-
-    // Sadly we cannot directly broadcast the aDomMessage object
-    // because the system message mechamism will rewrap the object
-    // based on the content window, which needs to know the properties.
-    try {
-      gSmsMessenger.notifySms(aNotificationType,
-                              aDomMessage.id,
-                              aDomMessage.threadId,
-                              aDomMessage.iccId,
-                              this._convertSmsDelivery(
-                                aDomMessage.delivery),
-                              this._convertSmsDeliveryStatus(
-                                aDomMessage.deliveryStatus),
-                              aDomMessage.sender,
-                              aDomMessage.receiver,
-                              aDomMessage.body,
-                              this._convertSmsMessageClass(
-                                aDomMessage.messageClass),
-                              aDomMessage.timestamp,
-                              aDomMessage.sentTimestamp,
-                              aDomMessage.deliveryTimestamp,
-                              aDomMessage.read);
-    } catch (e) {
-      if (DEBUG) {
-        this.debug("Failed to broadcastSmsSystemMessage: " + e);
-      }
-    }
-  },
-
-  // The following attributes/functions are used for acquiring/releasing the
-  // CPU wake lock when the RIL handles the received SMS. Note that we need
-  // a timer to bound the lock's life cycle to avoid exhausting the battery.
-  _smsHandledWakeLock: null,
-  _smsHandledWakeLockTimer: null,
-
-  _acquireSmsHandledWakeLock: function() {
-    if (!this._smsHandledWakeLock) {
-      if (DEBUG) this.debug("Acquiring a CPU wake lock for handling SMS.");
-      this._smsHandledWakeLock = gPowerManagerService.newWakeLock("cpu");
-    }
-    if (!this._smsHandledWakeLockTimer) {
-      if (DEBUG) this.debug("Creating a timer for releasing the CPU wake lock.");
-      this._smsHandledWakeLockTimer =
-        Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
-    }
-    if (DEBUG) this.debug("Setting the timer for releasing the CPU wake lock.");
-    this._smsHandledWakeLockTimer
-        .initWithCallback(this._releaseSmsHandledWakeLock.bind(this),
-                          SMS_HANDLED_WAKELOCK_TIMEOUT,
-                          Ci.nsITimer.TYPE_ONE_SHOT);
-  },
-
-  _releaseSmsHandledWakeLock: function() {
-    if (DEBUG) this.debug("Releasing the CPU wake lock for handling SMS.");
-    if (this._smsHandledWakeLockTimer) {
-      this._smsHandledWakeLockTimer.cancel();
-    }
-    if (this._smsHandledWakeLock) {
-      this._smsHandledWakeLock.unlock();
-      this._smsHandledWakeLock = null;
-    }
-  },
-
-  /**
-   * Hash map for received multipart sms fragments. Messages are hashed with
-   * its sender address and concatenation reference number. Three additional
-   * attributes `segmentMaxSeq`, `receivedSegments`, `segments` are inserted.
-   */
-  _receivedSmsSegmentsMap: null,
-
-  /**
-   * Helper for processing received multipart SMS.
-   *
-   * @return null for handled segments, and an object containing full message
-   *         body/data once all segments are received.
-   */
-  _processReceivedSmsSegment: function(aSegment) {
-
-    // Directly replace full message body for single SMS.
-    if (!(aSegment.segmentMaxSeq && (aSegment.segmentMaxSeq > 1))) {
-      if (aSegment.encoding == RIL.PDU_DCS_MSG_CODING_8BITS_ALPHABET) {
-        aSegment.fullData = aSegment.data;
-      } else {
-        aSegment.fullBody = aSegment.body;
-      }
-      return aSegment;
-    }
-
-    // Handle Concatenation for Class 0 SMS
-    let hash = aSegment.sender + ":" +
-               aSegment.segmentRef + ":" +
-               aSegment.segmentMaxSeq;
-    let seq = aSegment.segmentSeq;
-
-    let options = this._receivedSmsSegmentsMap[hash];
-    if (!options) {
-      options = aSegment;
-      this._receivedSmsSegmentsMap[hash] = options;
-
-      options.receivedSegments = 0;
-      options.segments = [];
-    } else if (options.segments[seq]) {
-      // Duplicated segment?
-      if (DEBUG) {
-        this.debug("Got duplicated segment no." + seq +
-                           " of a multipart SMS: " + JSON.stringify(aSegment));
-      }
-      return null;
-    }
-
-    if (options.receivedSegments > 0) {
-      // Update received timestamp.
-      options.timestamp = aSegment.timestamp;
-    }
-
-    if (options.encoding == RIL.PDU_DCS_MSG_CODING_8BITS_ALPHABET) {
-      options.segments[seq] = aSegment.data;
-    } else {
-      options.segments[seq] = aSegment.body;
-    }
-    options.receivedSegments++;
-
-    // The port information is only available in 1st segment for CDMA WAP Push.
-    // If the segments of a WAP Push are not received in sequence
-    // (e.g., SMS with seq == 1 is not the 1st segment received by the device),
-    // we have to retrieve the port information from 1st segment and
-    // save it into the cached options.
-    if (aSegment.teleservice === RIL.PDU_CDMA_MSG_TELESERIVCIE_ID_WAP
-        && seq === 1) {
-      if (!options.originatorPort && aSegment.originatorPort) {
-        options.originatorPort = aSegment.originatorPort;
-      }
-
-      if (!options.destinationPort && aSegment.destinationPort) {
-        options.destinationPort = aSegment.destinationPort;
-      }
-    }
-
-    if (options.receivedSegments < options.segmentMaxSeq) {
-      if (DEBUG) {
-        this.debug("Got segment no." + seq + " of a multipart SMS: " +
-                           JSON.stringify(options));
-      }
-      return null;
-    }
-
-    // Remove from map
-    delete this._receivedSmsSegmentsMap[hash];
-
-    // Rebuild full body
-    if (options.encoding == RIL.PDU_DCS_MSG_CODING_8BITS_ALPHABET) {
-      // Uint8Array doesn't have `concat`, so we have to merge all segements
-      // by hand.
-      let fullDataLen = 0;
-      for (let i = 1; i <= options.segmentMaxSeq; i++) {
-        fullDataLen += options.segments[i].length;
-      }
-
-      options.fullData = new Uint8Array(fullDataLen);
-      for (let d= 0, i = 1; i <= options.segmentMaxSeq; i++) {
-        let data = options.segments[i];
-        for (let j = 0; j < data.length; j++) {
-          options.fullData[d++] = data[j];
-        }
-      }
-    } else {
-      options.fullBody = options.segments.join("");
-    }
-
-    // Remove handy fields after completing the concatenation.
-    delete options.receivedSegments;
-    delete options.segments;
-
-    if (DEBUG) {
-      this.debug("Got full multipart SMS: " + JSON.stringify(options));
-    }
-
-    return options;
-  },
-
-  /**
-   * Helper to create Savable SmsSegment.
-   */
-  _createSavableSmsSegment: function(aMessage) {
-    // We precisely define what data fields to be stored into
-    // DB here for better data migration.
-    let segment = {};
-    segment.messageType = aMessage.messageType;
-    segment.teleservice = aMessage.teleservice;
-    segment.SMSC = aMessage.SMSC;
-    segment.sentTimestamp = aMessage.sentTimestamp;
-    segment.timestamp = Date.now();
-    segment.sender = aMessage.sender;
-    segment.pid = aMessage.pid;
-    segment.encoding = aMessage.encoding;
-    segment.messageClass = aMessage.messageClass;
-    segment.iccId = this.getIccId();
-    if (aMessage.header) {
-      segment.segmentRef = aMessage.header.segmentRef;
-      segment.segmentSeq = aMessage.header.segmentSeq;
-      segment.segmentMaxSeq = aMessage.header.segmentMaxSeq;
-      segment.originatorPort = aMessage.header.originatorPort;
-      segment.destinationPort = aMessage.header.destinationPort;
-    }
-    segment.mwiPresent = (aMessage.mwi)? true: false;
-    segment.mwiDiscard = (segment.mwiPresent)? aMessage.mwi.discard: false;
-    segment.mwiMsgCount = (segment.mwiPresent)? aMessage.mwi.msgCount: 0;
-    segment.mwiActive = (segment.mwiPresent)? aMessage.mwi.active: false;
-    segment.serviceCategory = aMessage.serviceCategory;
-    segment.language = aMessage.language;
-    segment.data = aMessage.data;
-    segment.body = aMessage.body;
-
-    return segment;
-  },
-
-  /**
-   * Helper to purge complete message.
-   *
-   * We remove unnessary fields defined in _createSavableSmsSegment() after
-   * completing the concatenation.
-   */
-  _purgeCompleteSmsMessage: function(aMessage) {
-    // Purge concatenation info
-    delete aMessage.segmentRef;
-    delete aMessage.segmentSeq;
-    delete aMessage.segmentMaxSeq;
-
-    // Purge partial message body
-    delete aMessage.data;
-    delete aMessage.body;
-  },
-
-  /**
-   * handle concatenation of received SMS.
-   */
-  handleSmsMultipart: function(aMessage) {
-    if (DEBUG) this.debug("handleSmsMultipart: " + JSON.stringify(aMessage));
-
-    this._acquireSmsHandledWakeLock();
-
-    let segment = this._createSavableSmsSegment(aMessage);
-
-    let isMultipart = (segment.segmentMaxSeq && (segment.segmentMaxSeq > 1));
-    let messageClass = segment.messageClass;
-
-    let handleReceivedAndAck = function(aRvOfIncompleteMsg, aCompleteMessage) {
-      if (aCompleteMessage) {
-        this._purgeCompleteSmsMessage(aCompleteMessage);
-        if (this.handleSmsReceived(aCompleteMessage)) {
-          this.sendAckSms(Cr.NS_OK, aCompleteMessage);
-        }
-        // else Ack will be sent after further process in handleSmsReceived.
-      } else {
-        this.sendAckSms(aRvOfIncompleteMsg, segment);
-      }
-    }.bind(this);
-
-    // No need to access SmsSegmentStore for Class 0 SMS and Single SMS.
-    if (!isMultipart ||
-        (messageClass == RIL.GECKO_SMS_MESSAGE_CLASSES[RIL.PDU_DCS_MSG_CLASS_0])) {
-      // `When a mobile terminated message is class 0 and the MS has the
-      // capability of displaying short messages, the MS shall display the
-      // message immediately and send an acknowledgement to the SC when the
-      // message has successfully reached the MS irrespective of whether
-      // there is memory available in the (U)SIM or ME. The message shall
-      // not be automatically stored in the (U)SIM or ME.`
-      // ~ 3GPP 23.038 clause 4
-
-      handleReceivedAndAck(Cr.NS_OK,  // ACK OK For Incomplete Class 0
-                           this._processReceivedSmsSegment(segment));
-    } else {
-      gMobileMessageDatabaseService
-        .saveSmsSegment(segment, function notifyResult(aRv, aCompleteMessage) {
-        handleReceivedAndAck(aRv,  // Ack according to the result after saving
-                             aCompleteMessage);
-      });
-    }
-  },
-
-  portAddressedSmsApps: null,
-  handleSmsReceived: function(message) {
-    if (DEBUG) this.debug("handleSmsReceived: " + JSON.stringify(message));
-
-    if (message.messageType == RIL.PDU_CDMA_MSG_TYPE_BROADCAST) {
-      this.handleCellbroadcastMessageReceived(message);
-      return true;
-    }
-
-    // Dispatch to registered handler if application port addressing is
-    // available. Note that the destination port can possibly be zero when
-    // representing a UDP/TCP port.
-    if (message.destinationPort != null) {
-      let handler = this.portAddressedSmsApps[message.destinationPort];
-      if (handler) {
-        handler(message);
-      }
-      return true;
-    }
-
-    if (message.encoding == RIL.PDU_DCS_MSG_CODING_8BITS_ALPHABET) {
-      // Don't know how to handle binary data yet.
-      return true;
-    }
-
-    message.type = "sms";
-    message.sender = message.sender || null;
-    message.receiver = this.getPhoneNumber();
-    message.body = message.fullBody = message.fullBody || null;
-
-    if (gSmsService.isSilentNumber(message.sender)) {
-      message.id = -1;
-      message.threadId = 0;
-      message.delivery = DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED;
-      message.deliveryStatus = RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS;
-      message.read = false;
-
-      let domMessage =
-        gMobileMessageService.createSmsMessage(message.id,
-                                               message.threadId,
-                                               message.iccId,
-                                               message.delivery,
-                                               message.deliveryStatus,
-                                               message.sender,
-                                               message.receiver,
-                                               message.body,
-                                               message.messageClass,
-                                               message.timestamp,
-                                               message.sentTimestamp,
-                                               0,
-                                               message.read);
-
-      Services.obs.notifyObservers(domMessage,
-                                   kSilentSmsReceivedObserverTopic,
-                                   null);
-      return true;
-    }
-
-    if (message.mwiPresent) {
-      let mwi = {
-        discard: message.mwiDiscard,
-        msgCount: message.mwiMsgCount,
-        active: message.mwiActive
-      };
-      this.workerMessenger.send("updateMwis", { mwi: mwi });
-
-      mwi.returnNumber = message.sender;
-      mwi.returnMessage = message.fullBody;
-      this.handleIccMwis(mwi);
-
-      // Dicarded MWI comes without text body.
-      // Hence, we discard it here after notifying the MWI status.
-      if (message.mwiDiscard) {
-        return true;
-      }
-    }
-
-    let notifyReceived = function notifyReceived(rv, domMessage) {
-      let success = Components.isSuccessCode(rv);
-
-      this.sendAckSms(rv, message);
-
-      if (!success) {
-        // At this point we could send a message to content to notify the user
-        // that storing an incoming SMS failed, most likely due to a full disk.
-        if (DEBUG) {
-          this.debug("Could not store SMS, error code " + rv);
-        }
-        return;
-      }
-
-      this.broadcastSmsSystemMessage(
-        Ci.nsISmsMessenger.NOTIFICATION_TYPE_RECEIVED, domMessage);
-      Services.obs.notifyObservers(domMessage, kSmsReceivedObserverTopic, null);
-    }.bind(this);
-
-    if (message.messageClass != RIL.GECKO_SMS_MESSAGE_CLASSES[RIL.PDU_DCS_MSG_CLASS_0]) {
-      gMobileMessageDatabaseService.saveReceivedMessage(message,
-                                                        notifyReceived);
-    } else {
-      message.id = -1;
-      message.threadId = 0;
-      message.delivery = DOM_MOBILE_MESSAGE_DELIVERY_RECEIVED;
-      message.deliveryStatus = RIL.GECKO_SMS_DELIVERY_STATUS_SUCCESS;
-      message.read = false;
-
-      let domMessage =
-        gMobileMessageService.createSmsMessage(message.id,
-                                               message.threadId,
-                                               message.iccId,
-                                               message.delivery,
-                                               message.deliveryStatus,
-                                               message.sender,
-                                               message.receiver,
-                                               message.body,
-                                               message.messageClass,
-                                               message.timestamp,
-                                               message.sentTimestamp,
-                                               0,
-                                               message.read);
-
-      notifyReceived(Cr.NS_OK, domMessage);
-    }
-
-    // SMS ACK will be sent in notifyReceived. Return false here.
-    return false;
-  },
-
-  /**
-   * Handle ACK response of received SMS.
-   */
-  sendAckSms: function(aRv, aMessage) {
-    if (aMessage.messageClass === RIL.GECKO_SMS_MESSAGE_CLASSES[RIL.PDU_DCS_MSG_CLASS_2]) {
-      return;
-    }
-
-    let result = RIL.PDU_FCS_OK;
-    if (!Components.isSuccessCode(aRv)) {
-      if (DEBUG) this.debug("Failed to handle received sms: " + aRv);
-      result = (aRv === Cr.NS_ERROR_FILE_NO_DEVICE_SPACE)
-                ? RIL.PDU_FCS_MEMORY_CAPACITY_EXCEEDED
-                : RIL.PDU_FCS_UNSPECIFIED;
-    }
-
-    this.workerMessenger.send("ackSMS", { result: result });
-
+  handleSmsReceived: function(aMessage) {
+    let header = aMessage.header;
+    // Concatenation Info:
+    // - segmentRef: a modulo 256 counter indicating the reference number for a
+    //               particular concatenated short message. '0' is a valid number.
+    // - The concatenation info will not be available in |header| if
+    //   segmentSeq or segmentMaxSeq is 0.
+    // See 3GPP TS 23.040, 9.2.3.24.1 Concatenated Short Messages.
+    let segmentRef = (header && header.segmentRef !== undefined)
+      ? header.segmentRef : 1;
+    let segmentSeq = header && header.segmentSeq || 1;
+    let segmentMaxSeq = header && header.segmentMaxSeq || 1;
+    // Application Ports:
+    // The port number ranges from 0 to 49151.
+    // see 3GPP TS 23.040, 9.2.3.24.3/4 Application Port Addressing.
+    let originatorPort = (header && header.originatorPort !== undefined)
+      ? header.originatorPort
+      : Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID;
+    let destinationPort = (header && header.destinationPort !== undefined)
+      ? header.destinationPort
+      : Ci.nsIGonkSmsService.SMS_APPLICATION_PORT_INVALID;
+    // MWI info:
+    let mwiPresent = (aMessage.mwi)? true : false;
+    let mwiDiscard = (mwiPresent)? aMessage.mwi.discard: false;
+    let mwiMsgCount = (mwiPresent)? aMessage.mwi.msgCount: 0;
+    let mwiActive = (mwiPresent)? aMessage.mwi.active: false;
+    // CDMA related attributes:
+    let cdmaMessageType = aMessage.messageType || 0;
+    let cdmaTeleservice = aMessage.teleservice || 0;
+    let cdmaServiceCategory = aMessage.serviceCategory || 0;
+
+    gSmsService
+      .notifyMessageReceived(this.clientId,
+                             aMessage.SMSC || null,
+                             aMessage.sentTimestamp,
+                             aMessage.sender,
+                             aMessage.pid,
+                             aMessage.encoding,
+                             RIL.GECKO_SMS_MESSAGE_CLASSES
+                               .indexOf(aMessage.messageClass),
+                             aMessage.language || null,
+                             segmentRef,
+                             segmentSeq,
+                             segmentMaxSeq,
+                             originatorPort,
+                             destinationPort,
+                             mwiPresent,
+                             mwiDiscard,
+                             mwiMsgCount,
+                             mwiActive,
+                             cdmaMessageType,
+                             cdmaTeleservice,
+                             cdmaServiceCategory,
+                             aMessage.body || null,
+                             aMessage.data || [],
+                             (aMessage.data) ? aMessage.data.length : 0);
   },
 
   /**
@@ -2756,8 +2219,9 @@ RadioInterface.prototype = {
   handleIccMwis: function(mwi) {
     let service = Cc["@mozilla.org/voicemail/voicemailservice;1"]
                   .getService(Ci.nsIGonkVoicemailService);
+    // Note: returnNumber and returnMessage is not available from UICC.
     service.notifyStatusChanged(this.clientId, mwi.active, mwi.msgCount,
-                                mwi.returnNumber, mwi.returnMessage);
+                                null, null);
   },
 
   handleIccInfoChange: function(message) {

From 28ab63d671cfe2f37c0f9e59ed458bec97adcc13 Mon Sep 17 00:00:00 2001
From: Bevis Tseng <btseng@mozilla.com>
Date: Wed, 10 Dec 2014 15:30:59 +0800
Subject: [PATCH 133/183] Bug 1108900 - Part 1: rename
 MobileMessageDatabaseService. r=echen

--HG--
rename : dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl => dom/mobilemessage/interfaces/nsIGonkMobileMessageDatabaseService.idl
---
 dom/mobilemessage/MobileMessageManager.cpp    |  4 +-
 dom/mobilemessage/gonk/MmsService.js          |  4 +-
 dom/mobilemessage/gonk/MobileMessageDB.jsm    |  2 +-
 .../gonk/MobileMessageDatabaseService.js      | 14 ++---
 .../MobileMessageDatabaseService.manifest     |  6 +--
 dom/mobilemessage/gonk/SmsService.js          |  4 +-
 dom/mobilemessage/interfaces/moz.build        |  2 +-
 ...> nsIGonkMobileMessageDatabaseService.idl} | 52 +++++++++----------
 .../tests/marionette/mmdb_head.js             |  4 +-
 .../test_error_of_mms_manual_retrieval.js     |  4 +-
 10 files changed, 48 insertions(+), 48 deletions(-)
 rename dom/mobilemessage/interfaces/{nsIRilMobileMessageDatabaseService.idl => nsIGonkMobileMessageDatabaseService.idl} (71%)

diff --git a/dom/mobilemessage/MobileMessageManager.cpp b/dom/mobilemessage/MobileMessageManager.cpp
index 6b1238f4bada..7357164ea291 100644
--- a/dom/mobilemessage/MobileMessageManager.cpp
+++ b/dom/mobilemessage/MobileMessageManager.cpp
@@ -35,7 +35,7 @@
 #include "android/MobileMessageDatabaseService.h"
 #include "android/SmsService.h"
 #elif defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
-#include "nsIRilMobileMessageDatabaseService.h"
+#include "nsIGonkMobileMessageDatabaseService.h"
 #include "nsIGonkSmsService.h"
 #endif
 #include "nsXULAppAPI.h" // For XRE_GetProcessType()
@@ -729,7 +729,7 @@ NS_CreateMobileMessageDatabaseService()
     mobileMessageDBService = new MobileMessageDatabaseService();
 #elif defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
     mobileMessageDBService =
-      do_CreateInstance(RIL_MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
+      do_CreateInstance(GONK_MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID);
 #endif
   }
 
diff --git a/dom/mobilemessage/gonk/MmsService.js b/dom/mobilemessage/gonk/MmsService.js
index d488cad2f904..042762d130bd 100644
--- a/dom/mobilemessage/gonk/MmsService.js
+++ b/dom/mobilemessage/gonk/MmsService.js
@@ -144,8 +144,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "gUUIDGenerator",
                                    "nsIUUIDGenerator");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageDatabaseService",
-                                   "@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1",
-                                   "nsIRilMobileMessageDatabaseService");
+                                   "@mozilla.org/mobilemessage/gonkmobilemessagedatabaseservice;1",
+                                   "nsIGonkMobileMessageDatabaseService");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageService",
                                    "@mozilla.org/mobilemessage/mobilemessageservice;1",
diff --git a/dom/mobilemessage/gonk/MobileMessageDB.jsm b/dom/mobilemessage/gonk/MobileMessageDB.jsm
index 55e7dce599ea..a8fd33c54643 100644
--- a/dom/mobilemessage/gonk/MobileMessageDB.jsm
+++ b/dom/mobilemessage/gonk/MobileMessageDB.jsm
@@ -2559,7 +2559,7 @@ MobileMessageDB.prototype = {
   },
 
   /**
-   * nsIRilMobileMessageDatabaseService API
+   * nsIGonkMobileMessageDatabaseService API
    */
 
   saveReceivedMessage: function(aMessage, aCallback) {
diff --git a/dom/mobilemessage/gonk/MobileMessageDatabaseService.js b/dom/mobilemessage/gonk/MobileMessageDatabaseService.js
index 0b10153aadbc..9ca19e57de62 100644
--- a/dom/mobilemessage/gonk/MobileMessageDatabaseService.js
+++ b/dom/mobilemessage/gonk/MobileMessageDatabaseService.js
@@ -12,10 +12,10 @@ Cu.import("resource://gre/modules/Services.jsm");
 let MMDB = {};
 Cu.import("resource://gre/modules/MobileMessageDB.jsm", MMDB);
 
-const RIL_MOBILEMESSAGEDATABASESERVICE_CONTRACTID =
-  "@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1";
-const RIL_MOBILEMESSAGEDATABASESERVICE_CID =
-  Components.ID("{29785f90-6b5b-11e2-9201-3b280170b2ec}");
+const GONK_MOBILEMESSAGEDATABASESERVICE_CONTRACTID =
+  "@mozilla.org/mobilemessage/gonkmobilemessagedatabaseservice;1";
+const GONK_MOBILEMESSAGEDATABASESERVICE_CID =
+  Components.ID("{7db05024-8038-11e4-b7fa-a3edb6f1bf0c}");
 
 const DB_NAME = "sms";
 
@@ -33,8 +33,8 @@ function MobileMessageDatabaseService() {
 }
 MobileMessageDatabaseService.prototype = {
 
-  classID: RIL_MOBILEMESSAGEDATABASESERVICE_CID,
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIRilMobileMessageDatabaseService,
+  classID: GONK_MOBILEMESSAGEDATABASESERVICE_CID,
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIGonkMobileMessageDatabaseService,
                                          Ci.nsIMobileMessageDatabaseService,
                                          Ci.nsIObserver]),
 
@@ -49,7 +49,7 @@ MobileMessageDatabaseService.prototype = {
   observe: function() {},
 
   /**
-   * nsIRilMobileMessageDatabaseService API
+   * nsIGonkMobileMessageDatabaseService API
    */
 
   saveReceivedMessage: function(aMessage, aCallback) {
diff --git a/dom/mobilemessage/gonk/MobileMessageDatabaseService.manifest b/dom/mobilemessage/gonk/MobileMessageDatabaseService.manifest
index e398b403b397..d5b9af315813 100644
--- a/dom/mobilemessage/gonk/MobileMessageDatabaseService.manifest
+++ b/dom/mobilemessage/gonk/MobileMessageDatabaseService.manifest
@@ -1,3 +1,3 @@
-component {29785f90-6b5b-11e2-9201-3b280170b2ec} MobileMessageDatabaseService.js
-contract @mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1 {29785f90-6b5b-11e2-9201-3b280170b2ec}
-category profile-after-change MobileMessageDatabaseService @mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1
+component {7db05024-8038-11e4-b7fa-a3edb6f1bf0c} MobileMessageDatabaseService.js
+contract @mozilla.org/mobilemessage/gonkmobilemessagedatabaseservice;1 {7db05024-8038-11e4-b7fa-a3edb6f1bf0c}
+category profile-after-change MobileMessageDatabaseService @mozilla.org/mobilemessage/gonkmobilemessagedatabaseservice;1
diff --git a/dom/mobilemessage/gonk/SmsService.js b/dom/mobilemessage/gonk/SmsService.js
index 362717d8043d..dd85b4d4a14a 100644
--- a/dom/mobilemessage/gonk/SmsService.js
+++ b/dom/mobilemessage/gonk/SmsService.js
@@ -74,8 +74,8 @@ XPCOMUtils.defineLazyServiceGetter(this, "gMobileConnectionService",
                                    "nsIMobileConnectionService");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageDatabaseService",
-                                   "@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1",
-                                   "nsIRilMobileMessageDatabaseService");
+                                   "@mozilla.org/mobilemessage/gonkmobilemessagedatabaseservice;1",
+                                   "nsIGonkMobileMessageDatabaseService");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageService",
                                    "@mozilla.org/mobilemessage/mobilemessageservice;1",
diff --git a/dom/mobilemessage/interfaces/moz.build b/dom/mobilemessage/interfaces/moz.build
index dd7cedfd9bfc..64dca0732a2c 100644
--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -20,8 +20,8 @@ XPIDL_SOURCES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
+        'nsIGonkMobileMessageDatabaseService.idl',
         'nsIGonkSmsService.idl',
-        'nsIRilMobileMessageDatabaseService.idl',
         'nsISmsMessenger.idl',
     ]
 
diff --git a/dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl b/dom/mobilemessage/interfaces/nsIGonkMobileMessageDatabaseService.idl
similarity index 71%
rename from dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl
rename to dom/mobilemessage/interfaces/nsIGonkMobileMessageDatabaseService.idl
index e708f1dcc04b..5765a9b0e84e 100644
--- a/dom/mobilemessage/interfaces/nsIRilMobileMessageDatabaseService.idl
+++ b/dom/mobilemessage/interfaces/nsIGonkMobileMessageDatabaseService.idl
@@ -6,8 +6,8 @@
 #include "nsISupports.idl"
 #include "nsIMobileMessageDatabaseService.idl"
 
-[scriptable, function, uuid(92986322-8d56-11e2-8816-73a531c493c2)]
-interface nsIRilMobileMessageDatabaseCallback : nsISupports
+[scriptable, function, uuid(2ae081ac-8038-11e4-a472-1ba11eb89d79)]
+interface nsIGonkMobileMessageDatabaseCallback : nsISupports
 {
   /**
    * |aDomMessage|: the nsIDOMMoz{Mms,Sms}Message
@@ -15,8 +15,8 @@ interface nsIRilMobileMessageDatabaseCallback : nsISupports
   void notify(in nsresult aRv, in nsISupports aDomMessage);
 };
 
-[scriptable, function, uuid(32b02bbe-60a1-45e0-a748-ad40709b09dd)]
-interface nsIRilMobileMessageDatabaseRecordCallback : nsISupports
+[scriptable, function, uuid(2f7a6fde-8038-11e4-9d93-5b9ffba492fb)]
+interface nsIGonkMobileMessageDatabaseRecordCallback : nsISupports
 {
   /**
    * |aMessageRecord| Object: the mobile-message database record
@@ -25,8 +25,8 @@ interface nsIRilMobileMessageDatabaseRecordCallback : nsISupports
   void notify(in nsresult aRv, in jsval aMessageRecord, in nsISupports aDomMessage);
 };
 
-[scriptable, function, uuid(1b0ff03c-a2bc-11e3-a443-838d034c9805)]
-interface nsIRilMobileMessageDatabaseConcatenationCallback : nsISupports
+[scriptable, function, uuid(36f9732c-8038-11e4-b634-3f7e3df5232a)]
+interface nsIGonkMobileMessageDatabaseConcatenationCallback : nsISupports
 {
   /**
    * |aCompleteMessage|: jsval: the completely concatenated message. Noted, this value might be null.
@@ -35,14 +35,14 @@ interface nsIRilMobileMessageDatabaseConcatenationCallback : nsISupports
 };
 
 %{C++
-#define RIL_MOBILE_MESSAGE_DATABASE_SERVICE_CID \
-  { 0x29785f90, 0x6b5b, 0x11e2, { 0x92, 0x01, 0x3b, 0x28, 0x01, 0x70, 0xb2, 0xec } }
-#define RIL_MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID \
-  "@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1"
+#define GONK_MOBILE_MESSAGE_DATABASE_SERVICE_CID \
+  { 0x7db05024, 0x8038, 0x11e4, { 0xb7, 0xfa, 0xa3, 0xed, 0xb6, 0xf1, 0xbf, 0x0c } }
+#define GONK_MOBILE_MESSAGE_DATABASE_SERVICE_CONTRACTID \
+  "@mozilla.org/mobilemessage/gonkmobilemessagedatabaseservice;1"
 %}
 
-[scriptable, uuid(0b437a5c-a2bc-11e3-bd1b-dbb173eb35f8)]
-interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
+[scriptable, uuid(48a3c28a-8038-11e4-b7b9-0f2df5b53100)]
+interface nsIGonkMobileMessageDatabaseService : nsIMobileMessageDatabaseService
 {
   /**
    * |aMessage| Object: should contain the following properties for internal use:
@@ -64,7 +64,7 @@ interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
    *     - |phoneNumber| DOMString: [optional] my own phone number.
    */
   void saveReceivedMessage(in jsval aMessage,
-                [optional] in nsIRilMobileMessageDatabaseCallback aCallback);
+                [optional] in nsIGonkMobileMessageDatabaseCallback aCallback);
 
   /**
    * |aMessage| Object: should contain the following properties for internal use:
@@ -81,7 +81,7 @@ interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
    *     - |receivers| DOMString Array: the phone numbers of receivers
    */
   void saveSendingMessage(in jsval aMessage,
-               [optional] in nsIRilMobileMessageDatabaseCallback aCallback);
+               [optional] in nsIGonkMobileMessageDatabaseCallback aCallback);
 
   /**
    * |aMessageId| Number: the message's DB record ID.
@@ -89,52 +89,52 @@ interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
    * |aDelivery| DOMString: the new delivery value to update (can be null).
    * |aDeliveryStatus| DOMString: the new delivery status to update (can be null).
    * |aEnvelopeId| DOMString: the "message-id" specified in the MMS PDU headers.
-   * |aCallback| nsIRilMobileMessageDatabaseCallback: an optional callback.
+   * |aCallback| nsIGonkMobileMessageDatabaseCallback: an optional callback.
    */
   void setMessageDeliveryByMessageId(in long aMessageId,
                                      in DOMString aReceiver,
                                      in DOMString aDelivery,
                                      in DOMString aDeliveryStatus,
                                      in DOMString aEnvelopeId,
-                          [optional] in nsIRilMobileMessageDatabaseCallback aCallback);
+                          [optional] in nsIGonkMobileMessageDatabaseCallback aCallback);
 
   /**
    * |aEnvelopeId| DOMString: the "message-id" specified in the MMS PDU headers.
    * |aReceiver| DOMString: the phone number of receiver (for MMS; can be null).
    * |aDeliveryStatus| DOMString: the new delivery status to be updated (can be null).
-   * |aCallback| nsIRilMobileMessageDatabaseCallback: an optional callback.
+   * |aCallback| nsIGonkMobileMessageDatabaseCallback: an optional callback.
    */
   void setMessageDeliveryStatusByEnvelopeId(in DOMString aEnvelopeId,
                                             in DOMString aReceiver,
                                             in DOMString aDeliveryStatus,
-                                 [optional] in nsIRilMobileMessageDatabaseCallback aCallback);
+                                 [optional] in nsIGonkMobileMessageDatabaseCallback aCallback);
 
   /**
    * |aEnvelopeId| DOMString: the "message-id" specified in the MMS PDU headers.
    * |aReceiver| DOMString: the phone number of receiver (for MMS; can be null).
    * |aReadStatus| DOMString: the new read status to be updated.
-   * |aCallback| nsIRilMobileMessageDatabaseCallback: an optional callback.
+   * |aCallback| nsIGonkMobileMessageDatabaseCallback: an optional callback.
    */
   void setMessageReadStatusByEnvelopeId(in DOMString aEnvelopeId,
                                         in DOMString aReceiver,
                                         in DOMString aReadStatus,
-                             [optional] in nsIRilMobileMessageDatabaseCallback aCallback);
+                             [optional] in nsIGonkMobileMessageDatabaseCallback aCallback);
 
   /**
    * |aMessageId| Number: the message's DB record ID.
-   * |aCallback| nsIRilMobileMessageDatabaseRecordCallback: a callback which
+   * |aCallback| nsIGonkMobileMessageDatabaseRecordCallback: a callback which
    *   takes result flag, message record and domMessage as parameters.
    */
   void getMessageRecordById(in long aMessageId,
-                            in nsIRilMobileMessageDatabaseRecordCallback aCallback);
+                            in nsIGonkMobileMessageDatabaseRecordCallback aCallback);
 
   /**
    * |aTransactionId| DOMString: the transaction ID of MMS PDU.
-   * |aCallback| nsIRilMobileMessageDatabaseRecordCallback: a callback which
+   * |aCallback| nsIGonkMobileMessageDatabaseRecordCallback: a callback which
    *   takes result flag and message record as parameters.
    */
   void getMessageRecordByTransactionId(in DOMString aTransactionId,
-                                       in nsIRilMobileMessageDatabaseRecordCallback aCallback);
+                                       in nsIGonkMobileMessageDatabaseRecordCallback aCallback);
 
   /**
    * |aCrError| nsresult: the NS_ERROR defined in Components.results.
@@ -145,9 +145,9 @@ interface nsIRilMobileMessageDatabaseService : nsIMobileMessageDatabaseService
 
   /**
    * |aSmsSegment| jsval: Decoded Single SMS PDU.
-   * |aCallback| nsIRilMobileMessageDatabaseConcatenationCallback: a callback which
+   * |aCallback| nsIGonkMobileMessageDatabaseConcatenationCallback: a callback which
    *   takes result flag, and complete mesage as parameters.
    */
   void saveSmsSegment(in jsval aSmsSegment,
-                      in nsIRilMobileMessageDatabaseConcatenationCallback aCallback);
+                      in nsIGonkMobileMessageDatabaseConcatenationCallback aCallback);
 };
diff --git a/dom/mobilemessage/tests/marionette/mmdb_head.js b/dom/mobilemessage/tests/marionette/mmdb_head.js
index f6ace2c4cade..cc77643174a1 100644
--- a/dom/mobilemessage/tests/marionette/mmdb_head.js
+++ b/dom/mobilemessage/tests/marionette/mmdb_head.js
@@ -73,8 +73,8 @@ function closeMobileMessageDB(aMmdb) {
 
 /**
  * Utility function for calling MMDB methods that takes either a
- * nsIRilMobileMessageDatabaseCallback or a
- * nsIRilMobileMessageDatabaseRecordCallback.
+ * nsIGonkMobileMessageDatabaseCallback or a
+ * nsIGonkMobileMessageDatabaseRecordCallback.
  *
  * Resolve when the target method notifies us with a successful result code;
  * reject otherwise. In either case, the arguments passed are packed into an
diff --git a/dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js b/dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js
index 5c6f25d105fe..4ad692405c2e 100644
--- a/dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js
+++ b/dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js
@@ -13,8 +13,8 @@ let MMS = {};
 Cu.import("resource://gre/modules/MmsPduHelper.jsm", MMS);
 
 let gMobileMessageDatabaseService =
-  Cc["@mozilla.org/mobilemessage/rilmobilemessagedatabaseservice;1"]
-    .getService(Ci.nsIRilMobileMessageDatabaseService);
+  Cc["@mozilla.org/mobilemessage/gonkmobilemessagedatabaseservice;1"]
+    .getService(Ci.nsIGonkMobileMessageDatabaseService);
 
 let gUuidGenerator =
   Cc["@mozilla.org/uuid-generator;1"]

From 7e09d18454ec99bd662d0b0124fd623859bfcf11 Mon Sep 17 00:00:00 2001
From: Bevis Tseng <btseng@mozilla.com>
Date: Wed, 10 Dec 2014 16:14:19 +0800
Subject: [PATCH 134/183] Bug 1108900 - Part 2: rename MmsService. r=echen

---
 dom/mobilemessage/MobileMessageManager.cpp                  | 2 +-
 dom/mobilemessage/gonk/MmsService.js                        | 6 +++---
 dom/mobilemessage/gonk/MmsService.manifest                  | 4 ++--
 dom/mobilemessage/gonk/MobileMessageDB.jsm                  | 2 +-
 .../tests/marionette/test_error_of_mms_manual_retrieval.js  | 2 +-
 dom/wappush/gonk/WapPushManager.js                          | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dom/mobilemessage/MobileMessageManager.cpp b/dom/mobilemessage/MobileMessageManager.cpp
index 7357164ea291..9e95e2732225 100644
--- a/dom/mobilemessage/MobileMessageManager.cpp
+++ b/dom/mobilemessage/MobileMessageManager.cpp
@@ -745,7 +745,7 @@ NS_CreateMmsService()
     mmsService = SmsIPCService::GetSingleton();
   } else {
 #if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
-    mmsService = do_CreateInstance("@mozilla.org/mms/rilmmsservice;1");
+    mmsService = do_CreateInstance("@mozilla.org/mms/gonkmmsservice;1");
 #endif
   }
 
diff --git a/dom/mobilemessage/gonk/MmsService.js b/dom/mobilemessage/gonk/MmsService.js
index 042762d130bd..0256b9154799 100644
--- a/dom/mobilemessage/gonk/MmsService.js
+++ b/dom/mobilemessage/gonk/MmsService.js
@@ -13,8 +13,8 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/PhoneNumberUtils.jsm");
 Cu.import("resource://gre/modules/Promise.jsm");
 
-const RIL_MMSSERVICE_CONTRACTID = "@mozilla.org/mms/rilmmsservice;1";
-const RIL_MMSSERVICE_CID = Components.ID("{217ddd76-75db-4210-955d-8806cd8d87f9}");
+const GONK_MMSSERVICE_CONTRACTID = "@mozilla.org/mms/gonkmmsservice;1";
+const GONK_MMSSERVICE_CID = Components.ID("{9b069b8c-8697-11e4-a406-474f5190272b}");
 
 let DEBUG = false;
 function debug(s) {
@@ -1536,7 +1536,7 @@ function MmsService() {
 }
 MmsService.prototype = {
 
-  classID:   RIL_MMSSERVICE_CID,
+  classID:   GONK_MMSSERVICE_CID,
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIMmsService,
                                          Ci.nsIWapPushApplication,
                                          Ci.nsIObserver]),
diff --git a/dom/mobilemessage/gonk/MmsService.manifest b/dom/mobilemessage/gonk/MmsService.manifest
index 1fc736e1c2f8..5b7d87902a9e 100644
--- a/dom/mobilemessage/gonk/MmsService.manifest
+++ b/dom/mobilemessage/gonk/MmsService.manifest
@@ -1,3 +1,3 @@
 # MmsService.js
-component {217ddd76-75db-4210-955d-8806cd8d87f9} MmsService.js
-contract @mozilla.org/mms/rilmmsservice;1 {217ddd76-75db-4210-955d-8806cd8d87f9}
+component {9b069b8c-8697-11e4-a406-474f5190272b} MmsService.js
+contract @mozilla.org/mms/gonkmmsservice;1 {9b069b8c-8697-11e4-a406-474f5190272b}
diff --git a/dom/mobilemessage/gonk/MobileMessageDB.jsm b/dom/mobilemessage/gonk/MobileMessageDB.jsm
index a8fd33c54643..aed2431a3f0a 100644
--- a/dom/mobilemessage/gonk/MobileMessageDB.jsm
+++ b/dom/mobilemessage/gonk/MobileMessageDB.jsm
@@ -73,7 +73,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gMobileMessageService",
                                    "nsIMobileMessageService");
 
 XPCOMUtils.defineLazyServiceGetter(this, "gMMSService",
-                                   "@mozilla.org/mms/rilmmsservice;1",
+                                   "@mozilla.org/mms/gonkmmsservice;1",
                                    "nsIMmsService");
 
 XPCOMUtils.defineLazyGetter(this, "MMS", function() {
diff --git a/dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js b/dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js
index 4ad692405c2e..14684c7ebbf8 100644
--- a/dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js
+++ b/dom/mobilemessage/tests/marionette/test_error_of_mms_manual_retrieval.js
@@ -20,7 +20,7 @@ let gUuidGenerator =
   Cc["@mozilla.org/uuid-generator;1"]
     .getService(Ci.nsIUUIDGenerator);
 
-let gMmsService = Cc["@mozilla.org/mms/rilmmsservice;1"]
+let gMmsService = Cc["@mozilla.org/mms/gonkmmsservice;1"]
                        .getService(Ci.nsIMmsService);
 
 function saveMmsNotification() {
diff --git a/dom/wappush/gonk/WapPushManager.js b/dom/wappush/gonk/WapPushManager.js
index 8c86bf14fc49..37d094bd3fac 100644
--- a/dom/wappush/gonk/WapPushManager.js
+++ b/dom/wappush/gonk/WapPushManager.js
@@ -84,7 +84,7 @@ this.WapPushManager = {
     let msg;
     let authInfo = null;
     if (contentType === "application/vnd.wap.mms-message") {
-      let mmsService = Cc["@mozilla.org/mms/rilmmsservice;1"]
+      let mmsService = Cc["@mozilla.org/mms/gonkmmsservice;1"]
                        .getService(Ci.nsIMmsService);
       mmsService.QueryInterface(Ci.nsIWapPushApplication)
                 .receiveWapPush(data.array, data.array.length, data.offset, options);

From d8cb1c196069118fbadd5117245c3e5aae7481bc Mon Sep 17 00:00:00 2001
From: Sean Lin <selin@mozilla.com>
Date: Thu, 18 Dec 2014 18:13:31 +0800
Subject: [PATCH 135/183] Bug 1078115 - Make the transaction of app update
 atomic. r=fabrice

---
 dom/apps/Webapps.jsm | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/dom/apps/Webapps.jsm b/dom/apps/Webapps.jsm
index 432dfb3adb8d..8d50a1c97774 100755
--- a/dom/apps/Webapps.jsm
+++ b/dom/apps/Webapps.jsm
@@ -725,6 +725,18 @@ this.DOMApplicationRegistry = {
 
       yield this.loadCurrentRegistry();
 
+      // Sanity check and roll back previous incomplete app updates.
+      for (let id in this.webapps) {
+        let oldDir = FileUtils.getDir(DIRECTORY_NAME, ["webapps", id + ".old"], false, true);
+        if (oldDir.exists()) {
+          let dir = FileUtils.getDir(DIRECTORY_NAME, ["webapps", id], false, true);
+          if (dir.exists()) {
+            dir.remove(true);
+          }
+          oldDir.moveTo(null, id);
+        }
+      }
+
       try {
         let systemManifestURL =
           Services.prefs.getCharPref("b2g.system_manifest_url");
@@ -1854,8 +1866,6 @@ this.DOMApplicationRegistry = {
     app.readyToApplyDownload = true;
     app.updateTime = Date.now();
 
-    yield this._saveApps();
-
     this.broadcastMessage("Webapps:UpdateState", {
       app: app,
       id: app.id
@@ -1890,18 +1900,33 @@ this.DOMApplicationRegistry = {
     let appFile = tmpDir.clone();
     appFile.append("application.zip");
 
-    let dir = FileUtils.getDir(DIRECTORY_NAME, ["webapps", id], true, true);
+    // In order to better control the potential inconsistency due to unexpected
+    // shutdown during the update process, a separate folder is used to accommodate
+    // the updated files and to replace the current one. Some sanity check and
+    // correspondent rollback logic may be necessary during the initialization
+    // of this component to recover it at next system boot-up.
+    let oldDir = FileUtils.getDir(DIRECTORY_NAME, ["webapps", id], true, true);
+    let dir = FileUtils.getDir(DIRECTORY_NAME, ["webapps", id + ".new"], true, true);
     appFile.moveTo(dir, "application.zip");
     manFile.moveTo(dir, "manifest.webapp");
 
-    // Move the staged update manifest to a non staged one.
-    let staged = dir.clone();
+    // Copy the staged update manifest to a non staged one.
+    let staged = oldDir.clone();
     staged.append("staged-update.webapp");
 
     // If we are applying after a restarted download, we have no
     // staged update manifest.
     if (staged.exists()) {
-      staged.moveTo(dir, "update.webapp");
+      staged.copyTo(dir, "update.webapp");
+    }
+
+    oldDir.moveTo(null, id + ".old");
+    dir.moveTo(null, id);
+
+    try {
+      oldDir.remove(true);
+    } catch(e) {
+      oldDir.moveTo(tmpDir, "old." + app.updateTime);
     }
 
     try {

From 27a342c3b5390416afbfff0c5e0031f186d34908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabrice=20Desr=C3=A9?= <fabrice@mozilla.com>
Date: Thu, 18 Dec 2014 15:16:49 -0800
Subject: [PATCH 136/183] Bug 1113391 - Followup to bug 923897 r=me

---
 dom/apps/tests/addons/script2.js | 4 ++++
 dom/apps/tests/addons/style2.css | 3 +++
 2 files changed, 7 insertions(+)
 create mode 100644 dom/apps/tests/addons/script2.js
 create mode 100644 dom/apps/tests/addons/style2.css

diff --git a/dom/apps/tests/addons/script2.js b/dom/apps/tests/addons/script2.js
new file mode 100644
index 000000000000..a116f46d356d
--- /dev/null
+++ b/dom/apps/tests/addons/script2.js
@@ -0,0 +1,4 @@
+document.addEventListener("DOMContentLoaded", function() {
+  var head = document.getElementById("header2");
+  head.innerHTML = "Customized content";
+}, false);
\ No newline at end of file
diff --git a/dom/apps/tests/addons/style2.css b/dom/apps/tests/addons/style2.css
new file mode 100644
index 000000000000..0e5a21e1787e
--- /dev/null
+++ b/dom/apps/tests/addons/style2.css
@@ -0,0 +1,3 @@
+#header2 {
+  color: blue;
+}
\ No newline at end of file

From c1bc4843a5ce22bda9f7f75a5a6f1ebb7bedae93 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 15:57:22 -0800
Subject: [PATCH 137/183] Bumping gaia.json for 10 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/253e41862ab7
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Merge pull request #26607 from russnicoletti/bug-1092972

Bug 1092972 - Video app to follow text selection pattern r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/b83514159acd
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Bug 1092972 - Video app to follow text selection pattern

========

https://hg.mozilla.org/integration/gaia-central/rev/a9f399e36727
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #26802 from charleyf/Bug1103192

Bug 1103192 - Replace Utils.extend with Object.assign in sms

========

https://hg.mozilla.org/integration/gaia-central/rev/ed3bc1e3c3a6
Author: Charley <cvfergus@gmail.com>
Desc: Bug 1103192 - Replace Utils.extend with Object.assign in sms
r=azasypkin, julien

Bug 1103192 - Replace Utils.extend with Object.assign in sms

Bug 1103192 - Replace Utils.extend with Object.assign in sms - Removed leftover parts of test

========

https://hg.mozilla.org/integration/gaia-central/rev/ec57861ac5ab
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #26895 from mozilla-b2g/revert-26851-bug-1088118-calendar

Revert "Bug 1088118 - Adding User Timing markers for Calendar"

========

https://hg.mozilla.org/integration/gaia-central/rev/21060cdeb613
Author: Eli Perelman <eli@eliperelman.com>
Desc: Revert "Bug 1088118 - Adding User Timing markers for Calendar"

========

https://hg.mozilla.org/integration/gaia-central/rev/25650102755b
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #26795 from aosmond/bug1102431

Bug 1102431 - Fix how storage controller cannot assume settings are available if camera not loaded.

========

https://hg.mozilla.org/integration/gaia-central/rev/ab07a34da071
Author: Andrew Osmond <aosmond@mozilla.com>
Desc: Bug 1102431 - Fix how storage controller cannot assume settings are available if camera not loaded.

========

https://hg.mozilla.org/integration/gaia-central/rev/073cebfa1265
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #26851 from eliperelman/bug-1088118-calendar

Bug 1088118 - Adding User Timing markers for Calendar

========

https://hg.mozilla.org/integration/gaia-central/rev/ba893a1025e8
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1088118 - Adding User Timing markers to Calendar
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 80771b5f22e0..75f541d22ce7 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "9e971d42c915f999f3e352fe43fca7ba0a5245b4", 
+    "revision": "253e41862ab7a29e32d95c95bb8af6a3dcaac568", 
     "repo_path": "integration/gaia-central"
 }

From d987a4e633758eb00a7d1b65f0e052ada2498c80 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 16:02:01 -0800
Subject: [PATCH 138/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 9a86bd510c31..ef8fb3cd8455 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 63e5fc174d3e..128a123fc4bd 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index df313f49a0ee..3f7021d34653 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 310fe85e02b9..fa2cf80ca26a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 63e5fc174d3e..128a123fc4bd 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index b33c35956211..0605910caa6e 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 0b7787e40148..73e864a0a16a 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index eae0673590e2..418631d80e21 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index b1c629d019b5..bb8fcf4616a0 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 938025589249..2ede0c132557 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 4a726ab83a20..9dfa5e19db85 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2650bae535e15eef5f299cc80d4fab460f78ada7"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 5ad9a1b4901763557b75a907effe7fb53b889c13 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 16:57:16 -0800
Subject: [PATCH 139/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/bf8c2276705b
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #26890 from jrburke/bug1087066-email-rtl-checkbox

Bug 1087066 - Checkboxes should not overlap in message list r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/c888457825c7
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1087066 - Checkboxes should not overlap in message list
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 75f541d22ce7..0ae97b992569 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "253e41862ab7a29e32d95c95bb8af6a3dcaac568", 
+    "revision": "bf8c2276705b4b479ee34244c0f43f18b1866f05", 
     "repo_path": "integration/gaia-central"
 }

From 5403ec44244863a01cb1e4453ee32e69adb1ad91 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 17:07:00 -0800
Subject: [PATCH 140/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index ef8fb3cd8455..de2e436d3a0e 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 128a123fc4bd..3dfbba28a826 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 3f7021d34653..7e0a7c8f2a97 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index fa2cf80ca26a..032ceb2dfbf5 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 128a123fc4bd..3dfbba28a826 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 0605910caa6e..141eb3cd45c9 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 73e864a0a16a..f860c23cf9c8 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 418631d80e21..4c00a9787948 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index bb8fcf4616a0..72342f719713 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 2ede0c132557..8febf59b0d11 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 9dfa5e19db85..b87c45180d0c 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2aa46d15a2cf4b3726b336b8c7efd3ca358a468a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 2c53b0b8ec28f98f2c874f5dd61ab176170fd01b Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 18:52:18 -0800
Subject: [PATCH 141/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

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

Bug 1088118 - Adding User Timing markers to Usage app

========

https://hg.mozilla.org/integration/gaia-central/rev/ce1e00300eb8
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1088118 - Adding User Timing markers to Usage app
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 0ae97b992569..81f95a1cc127 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "bf8c2276705b4b479ee34244c0f43f18b1866f05", 
+    "revision": "e9560ec0672854101aa0dcfc2992ef6df27dcaa5", 
     "repo_path": "integration/gaia-central"
 }

From bdf8630ebb1cf7513d23b074e7ee0a56d6d2065d Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 18:56:57 -0800
Subject: [PATCH 142/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index de2e436d3a0e..d88a85be3148 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 3dfbba28a826..99b9d7f6cfad 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 7e0a7c8f2a97..593f187415e1 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 032ceb2dfbf5..84a5d44b85da 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 3dfbba28a826..99b9d7f6cfad 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 141eb3cd45c9..7cc7f0312435 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index f860c23cf9c8..95598b425aa6 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 4c00a9787948..8e205606d743 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 72342f719713..802b6feb6ba3 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 8febf59b0d11..f3e7fa3aa52d 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index b87c45180d0c..ff6dbd0f7d86 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ce033e2fc9f4704d2704cb6a61bd2e276b702f1a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 33385eb6d1ab59b5e14f5d22f83ab0ac5e459b60 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 19:07:18 -0800
Subject: [PATCH 143/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/332e1596ba16
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #26781 from RudyLu/keyboard/Bug1105178-move_resize_out_2

Bug 1105178 - Separate resize out to LayoutPageView.  - Use flex box to layout..
r=timdream.

========

https://hg.mozilla.org/integration/gaia-central/rev/ef052f0d496b
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 1105178 - Separate resize out to LayoutPageView.
 - Use flex box to layout the keyboard.
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 81f95a1cc127..47907ed43df2 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "e9560ec0672854101aa0dcfc2992ef6df27dcaa5", 
+    "revision": "332e1596ba165b7cae4ddfc7e43e3530538a9e5d", 
     "repo_path": "integration/gaia-central"
 }

From 90833853b0b6bd2e0bc10e9f0a2c3297bbe7c185 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 19:11:57 -0800
Subject: [PATCH 144/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index d88a85be3148..aaba69ec2696 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 99b9d7f6cfad..71664e7f30d4 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 593f187415e1..217cba455c0a 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 84a5d44b85da..b9f0c265f9ce 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 99b9d7f6cfad..71664e7f30d4 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 7cc7f0312435..ea9baf07263c 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 95598b425aa6..438d838f9655 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 8e205606d743..ef120915300f 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 802b6feb6ba3..b172c934bb10 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index f3e7fa3aa52d..ae045541df07 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index ff6dbd0f7d86..14a4a5e0d89a 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="2ddef6fdcc33bd945274408a43f0ec4b5e2bf91a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 4cb966142eddacd230dddb7f76f79c248e4f3a37 Mon Sep 17 00:00:00 2001
From: Jamin Liu <jaliu@mozilla.com>
Date: Fri, 19 Dec 2014 11:12:33 +0800
Subject: [PATCH 145/183] Bug 1100818 - Launch bluetooth certified app by
 sending system message if it's not ready for receiving BluetoothPairingEvent.
 r=btian

---
 dom/bluetooth2/BluetoothAdapter.cpp           | 64 +++++++------------
 dom/bluetooth2/BluetoothAdapter.h             | 14 ++--
 dom/bluetooth2/BluetoothCommon.h              | 13 ++++
 dom/bluetooth2/BluetoothPairingListener.cpp   | 59 +++++++++++++++++
 dom/bluetooth2/BluetoothPairingListener.h     |  5 ++
 dom/bluetooth2/BluetoothService.cpp           | 26 +++++++-
 dom/bluetooth2/BluetoothService.h             |  3 +
 .../bluedroid/BluetoothServiceBluedroid.cpp   |  4 +-
 8 files changed, 137 insertions(+), 51 deletions(-)

diff --git a/dom/bluetooth2/BluetoothAdapter.cpp b/dom/bluetooth2/BluetoothAdapter.cpp
index 87a7e584ff64..16ffb395c6d4 100644
--- a/dom/bluetooth2/BluetoothAdapter.cpp
+++ b/dom/bluetooth2/BluetoothAdapter.cpp
@@ -6,8 +6,9 @@
 
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothService.h"
-#include "BluetoothUtils.h"
 #include "DOMRequest.h"
+#include "nsIDocument.h"
+#include "nsIPrincipal.h"
 #include "nsTArrayHelpers.h"
 
 #include "mozilla/dom/BluetoothAdapter2Binding.h"
@@ -193,11 +194,15 @@ BluetoothAdapter::BluetoothAdapter(nsPIDOMWindow* aWindow,
   , mState(BluetoothAdapterState::Disabled)
   , mDiscoverable(false)
   , mDiscovering(false)
+  , mPairingReqs(nullptr)
   , mDiscoveryHandleInUse(nullptr)
 {
   MOZ_ASSERT(aWindow);
 
-  mPairingReqs = BluetoothPairingListener::Create(aWindow);
+  // Only allow certified bluetooth application to receive pairing requests
+  if (IsBluetoothCertifiedApp()) {
+    mPairingReqs = BluetoothPairingListener::Create(aWindow);
+  }
 
   const InfallibleTArray<BluetoothNamedValue>& values =
     aValue.get_ArrayOfBluetoothNamedValue();
@@ -329,8 +334,6 @@ BluetoothAdapter::Notify(const BluetoothSignal& aData)
     if (mDiscoveryHandleInUse) {
       HandleDeviceFound(v);
     }
-  } else if (aData.name().EqualsLiteral("PairingRequest")) {
-    HandlePairingRequest(v);
   } else if (aData.name().EqualsLiteral(DEVICE_PAIRED_ID)) {
     HandleDevicePaired(aData.value());
   } else if (aData.name().EqualsLiteral(DEVICE_UNPAIRED_ID)) {
@@ -762,6 +765,23 @@ BluetoothAdapter::IsAdapterAttributeChanged(BluetoothAdapterAttribute aType,
   }
 }
 
+bool
+BluetoothAdapter::IsBluetoothCertifiedApp()
+{
+  // Retrieve the app status and origin for permission checking
+  nsCOMPtr<nsIDocument> doc = GetOwner()->GetExtantDoc();
+  NS_ENSURE_TRUE(doc, false);
+
+  uint16_t appStatus = nsIPrincipal::APP_STATUS_NOT_INSTALLED;
+  nsAutoCString appOrigin;
+
+  doc->NodePrincipal()->GetAppStatus(&appStatus);
+  doc->NodePrincipal()->GetOrigin(getter_Copies(appOrigin));
+
+  return appStatus == nsIPrincipal::APP_STATUS_CERTIFIED &&
+         appOrigin.EqualsLiteral(BLUETOOTH_APP_ORIGIN);
+}
+
 void
 BluetoothAdapter::SetAdapterState(BluetoothAdapterState aState)
 {
@@ -831,42 +851,6 @@ BluetoothAdapter::HandleDeviceFound(const BluetoothValue& aValue)
   mDiscoveryHandleInUse->DispatchDeviceEvent(discoveredDevice);
 }
 
-void
-BluetoothAdapter::HandlePairingRequest(const BluetoothValue& aValue)
-{
-  MOZ_ASSERT(mPairingReqs);
-  MOZ_ASSERT(aValue.type() == BluetoothValue::TArrayOfBluetoothNamedValue);
-
-  const InfallibleTArray<BluetoothNamedValue>& arr =
-    aValue.get_ArrayOfBluetoothNamedValue();
-
-  MOZ_ASSERT(arr.Length() == 3 &&
-             arr[0].value().type() == BluetoothValue::TnsString && // address
-             arr[1].value().type() == BluetoothValue::TnsString && // passkey
-             arr[2].value().type() == BluetoothValue::TnsString);  // type
-
-  nsString deviceAddress = arr[0].value().get_nsString();
-  nsString passkey = arr[1].value().get_nsString();
-  nsString type = arr[2].value().get_nsString();
-
-  // Create a temporary device with deviceAddress for searching
-  InfallibleTArray<BluetoothNamedValue> props;
-  BT_APPEND_NAMED_VALUE(props, "Address", deviceAddress);
-  nsRefPtr<BluetoothDevice> device =
-    BluetoothDevice::Create(GetOwner(), props);
-
-  // Find the remote device by address
-  size_t index = mDevices.IndexOf(device);
-  if (index == mDevices.NoIndex) {
-    BT_WARNING("Cannot find the remote device with address %s",
-               NS_ConvertUTF16toUTF8(deviceAddress).get());
-    return;
-  }
-
-  // Notify application of pairing requests
-  mPairingReqs->DispatchPairingEvent(mDevices[index], passkey, type);
-}
-
 void
 BluetoothAdapter::DispatchAttributeEvent(const nsTArray<nsString>& aTypes)
 {
diff --git a/dom/bluetooth2/BluetoothAdapter.h b/dom/bluetooth2/BluetoothAdapter.h
index 063fa0b069dc..5c65ede7702a 100644
--- a/dom/bluetooth2/BluetoothAdapter.h
+++ b/dom/bluetooth2/BluetoothAdapter.h
@@ -248,13 +248,6 @@ private:
    */
   void HandleDeviceFound(const BluetoothValue& aValue);
 
-  /**
-   * Handle "PairingRequest" bluetooth signal.
-   *
-   * @param aValue [in] Array of information about the pairing request.
-   */
-  void HandlePairingRequest(const BluetoothValue& aValue);
-
   /**
    * Fire BluetoothAttributeEvent to trigger onattributechanged event handler.
    */
@@ -287,6 +280,13 @@ private:
   bool IsAdapterAttributeChanged(BluetoothAdapterAttribute aType,
                                  const BluetoothValue& aValue);
 
+  /**
+   * Check whether this adapter is owned by Bluetooth certified app.
+   *
+   * @return a boolean value to indicate whether it's owned by Bluetooth app.
+   */
+  bool IsBluetoothCertifiedApp();
+
   /****************************************************************************
    * Variables
    ***************************************************************************/
diff --git a/dom/bluetooth2/BluetoothCommon.h b/dom/bluetooth2/BluetoothCommon.h
index d70cb0d15893..e7ddb7c28e4e 100644
--- a/dom/bluetooth2/BluetoothCommon.h
+++ b/dom/bluetooth2/BluetoothCommon.h
@@ -143,6 +143,7 @@ extern bool gBluetoothDebugFlag;
 #define KEY_REMOTE_AGENT      "/B2G/bluetooth/remote_device_agent"
 #define KEY_MANAGER           "/B2G/bluetooth/manager"
 #define KEY_ADAPTER           "/B2G/bluetooth/adapter"
+#define KEY_PAIRING_LISTENER  "/B2G/bluetooth/pairing_listener"
 
 /**
  * When the connection status of a Bluetooth profile is changed, we'll notify
@@ -170,6 +171,18 @@ extern bool gBluetoothDebugFlag;
 #define PAIRING_REQ_TYPE_CONFIRMATION         "pairingconfirmationreq"
 #define PAIRING_REQ_TYPE_CONSENT              "pairingconsentreq"
 
+/**
+ * System message to launch bluetooth app if no pairing listener is ready to
+ * receive pairing requests.
+ */
+#define SYS_MSG_BT_PAIRING_REQ                "bluetooth-pairing-request"
+
+/**
+ * The app origin of bluetooth app, which is responsible for listening pairing
+ * requests.
+ */
+#define BLUETOOTH_APP_ORIGIN                  "app://bluetooth.gaiamobile.org"
+
 /**
  * When a remote device gets paired / unpaired with local bluetooth adapter,
  * we'll dispatch an event.
diff --git a/dom/bluetooth2/BluetoothPairingListener.cpp b/dom/bluetooth2/BluetoothPairingListener.cpp
index 305cf9fe2923..b0d31aad1c4a 100644
--- a/dom/bluetooth2/BluetoothPairingListener.cpp
+++ b/dom/bluetooth2/BluetoothPairingListener.cpp
@@ -6,8 +6,10 @@
 
 #include "mozilla/dom/bluetooth/BluetoothPairingListener.h"
 #include "mozilla/dom/bluetooth/BluetoothPairingHandle.h"
+#include "mozilla/dom/bluetooth/BluetoothTypes.h"
 #include "mozilla/dom/BluetoothPairingEvent.h"
 #include "mozilla/dom/BluetoothPairingListenerBinding.h"
+#include "BluetoothService.h"
 
 USING_BLUETOOTH_NAMESPACE
 
@@ -21,6 +23,11 @@ BluetoothPairingListener::BluetoothPairingListener(nsPIDOMWindow* aWindow)
   : DOMEventTargetHelper(aWindow)
 {
   MOZ_ASSERT(aWindow);
+
+  BluetoothService* bs = BluetoothService::Get();
+  NS_ENSURE_TRUE_VOID(bs);
+  bs->RegisterBluetoothSignalHandler(NS_LITERAL_STRING(KEY_PAIRING_LISTENER),
+                                     this);
 }
 
 already_AddRefed<BluetoothPairingListener>
@@ -37,6 +44,11 @@ BluetoothPairingListener::Create(nsPIDOMWindow* aWindow)
 
 BluetoothPairingListener::~BluetoothPairingListener()
 {
+  BluetoothService* bs = BluetoothService::Get();
+  // It can be nullptr on shutdown.
+  NS_ENSURE_TRUE_VOID(bs);
+  bs->UnregisterBluetoothSignalHandler(NS_LITERAL_STRING(KEY_PAIRING_LISTENER),
+                                       this);
 }
 
 void
@@ -67,8 +79,55 @@ BluetoothPairingListener::DispatchPairingEvent(BluetoothDevice* aDevice,
   DispatchTrustedEvent(event);
 }
 
+void
+BluetoothPairingListener::Notify(const BluetoothSignal& aData)
+{
+  InfallibleTArray<BluetoothNamedValue> arr;
+
+  BluetoothValue value = aData.value();
+  if (aData.name().EqualsLiteral("PairingRequest")) {
+
+    MOZ_ASSERT(value.type() == BluetoothValue::TArrayOfBluetoothNamedValue);
+
+    const InfallibleTArray<BluetoothNamedValue>& arr =
+      value.get_ArrayOfBluetoothNamedValue();
+
+    MOZ_ASSERT(arr.Length() == 3 &&
+               arr[0].value().type() == BluetoothValue::TnsString && // address
+               arr[1].value().type() == BluetoothValue::TnsString && // passkey
+               arr[2].value().type() == BluetoothValue::TnsString);  // type
+
+    nsString deviceAddress = arr[0].value().get_nsString();
+    nsString passkey = arr[1].value().get_nsString();
+    nsString type = arr[2].value().get_nsString();
+
+    // Create a temporary device with deviceAddress for searching
+    InfallibleTArray<BluetoothNamedValue> props;
+    BT_APPEND_NAMED_VALUE(props, "Address", deviceAddress);
+    nsRefPtr<BluetoothDevice> device =
+      BluetoothDevice::Create(GetOwner(), props);
+
+    // Notify pairing listener of pairing requests
+    DispatchPairingEvent(device, passkey, type);
+  } else {
+    BT_WARNING("Not handling pairing listener signal: %s",
+               NS_ConvertUTF16toUTF8(aData.name()).get());
+  }
+}
+
 JSObject*
 BluetoothPairingListener::WrapObject(JSContext* aCx)
 {
   return BluetoothPairingListenerBinding::Wrap(aCx, this);
 }
+
+void
+BluetoothPairingListener::DisconnectFromOwner()
+{
+  DOMEventTargetHelper::DisconnectFromOwner();
+
+  BluetoothService* bs = BluetoothService::Get();
+  NS_ENSURE_TRUE_VOID(bs);
+  bs->UnregisterBluetoothSignalHandler(NS_LITERAL_STRING(KEY_PAIRING_LISTENER),
+                                       this);
+}
diff --git a/dom/bluetooth2/BluetoothPairingListener.h b/dom/bluetooth2/BluetoothPairingListener.h
index 9958d2fc7b74..909fbc0e6952 100644
--- a/dom/bluetooth2/BluetoothPairingListener.h
+++ b/dom/bluetooth2/BluetoothPairingListener.h
@@ -14,8 +14,10 @@
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothDevice;
+class BluetoothSignal;
 
 class BluetoothPairingListener MOZ_FINAL : public DOMEventTargetHelper
+                                         , public BluetoothSignalObserver
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
@@ -27,12 +29,15 @@ public:
                             const nsAString& aPasskey,
                             const nsAString& aType);
 
+  void Notify(const BluetoothSignal& aParam); // BluetoothSignalObserver
+
   nsPIDOMWindow* GetParentObject() const
   {
     return GetOwner();
   }
 
   virtual JSObject* WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+  virtual void DisconnectFromOwner() MOZ_OVERRIDE;
 
   IMPL_EVENT_HANDLER(displaypasskeyreq);
   IMPL_EVENT_HANDLER(enterpincodereq);
diff --git a/dom/bluetooth2/BluetoothService.cpp b/dom/bluetooth2/BluetoothService.cpp
index 1a95101cd14b..e422d7cdd724 100644
--- a/dom/bluetooth2/BluetoothService.cpp
+++ b/dom/bluetooth2/BluetoothService.cpp
@@ -273,6 +273,17 @@ BluetoothService::RegisterBluetoothSignalHandler(
   }
 
   ol->AddObserver(aHandler);
+
+  // Distribute pending pairing requests when pairing listener has been added
+  // to signal observer table.
+  if (IsMainProcess() &&
+      !mPendingPairReqSignals.IsEmpty() &&
+      aNodeName.EqualsLiteral(KEY_PAIRING_LISTENER)) {
+    for (uint32_t i = 0; i < mPendingPairReqSignals.Length(); ++i) {
+      DistributeSignal(mPendingPairReqSignals[i]);
+    }
+    mPendingPairReqSignals.Clear();
+  }
 }
 
 void
@@ -331,8 +342,19 @@ BluetoothService::DistributeSignal(const BluetoothSignal& aSignal)
 
   BluetoothSignalObserverList* ol;
   if (!mBluetoothSignalObserverTable.Get(aSignal.path(), &ol)) {
-    BT_WARNING("No observer registered for path %s",
-               NS_ConvertUTF16toUTF8(aSignal.path()).get());
+    // If there is no BluetoohPairingListener in observer table, put the signal
+    // into a pending queue of pairing requests and send a system message to
+    // launch bluetooth certified app.
+    if (aSignal.path().EqualsLiteral(KEY_PAIRING_LISTENER)) {
+      mPendingPairReqSignals.AppendElement(aSignal);
+
+      BT_ENSURE_TRUE_VOID_BROADCAST_SYSMSG(
+        NS_LITERAL_STRING(SYS_MSG_BT_PAIRING_REQ),
+        BluetoothValue(EmptyString()));
+    } else {
+      BT_WARNING("No observer registered for path %s",
+                 NS_ConvertUTF16toUTF8(aSignal.path()).get());
+    }
     return;
   }
 
diff --git a/dom/bluetooth2/BluetoothService.h b/dom/bluetooth2/BluetoothService.h
index 56092a432865..8879ea3f8194 100644
--- a/dom/bluetooth2/BluetoothService.h
+++ b/dom/bluetooth2/BluetoothService.h
@@ -8,6 +8,7 @@
 #define mozilla_dom_bluetooth_bluetootheventservice_h__
 
 #include "BluetoothCommon.h"
+#include "BluetoothInterface.h"
 #include "BluetoothProfileManagerBase.h"
 #include "nsAutoPtr.h"
 #include "nsClassHashtable.h"
@@ -401,6 +402,8 @@ protected:
 
   BluetoothSignalObserverTable mBluetoothSignalObserverTable;
 
+  nsTArray<BluetoothSignal> mPendingPairReqSignals;
+
   bool mEnabled;
 };
 
diff --git a/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp b/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp
index c734833400b3..8a17df692d4a 100644
--- a/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp
+++ b/dom/bluetooth2/bluedroid/BluetoothServiceBluedroid.cpp
@@ -1473,7 +1473,7 @@ BluetoothServiceBluedroid::PinRequestNotification(const nsAString& aRemoteBdAddr
                         NS_LITERAL_STRING(PAIRING_REQ_TYPE_ENTERPINCODE));
 
   DistributeSignal(BluetoothSignal(NS_LITERAL_STRING("PairingRequest"),
-                                   NS_LITERAL_STRING(KEY_ADAPTER),
+                                   NS_LITERAL_STRING(KEY_PAIRING_LISTENER),
                                    BluetoothValue(propertiesArray)));
 }
 
@@ -1518,7 +1518,7 @@ BluetoothServiceBluedroid::SspRequestNotification(
   BT_APPEND_NAMED_VALUE(propertiesArray, "type", pairingType);
 
   DistributeSignal(BluetoothSignal(NS_LITERAL_STRING("PairingRequest"),
-                                   NS_LITERAL_STRING(KEY_ADAPTER),
+                                   NS_LITERAL_STRING(KEY_PAIRING_LISTENER),
                                    BluetoothValue(propertiesArray)));
 }
 

From 0b13bbf455c5e97de2accd334b63a72c8625d8d3 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 22:27:17 -0800
Subject: [PATCH 146/183] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/724943c2c3e2
Author: EragonJ (E.J.) <eragonj@eragonj.me>
Desc: Merge pull request #26898 from EragonJ/bug-1111903-update

Bug 1111903 - [Settings] Refactor Dialog Service with l10n best practice...

========

https://hg.mozilla.org/integration/gaia-central/rev/40636bd7b8a0
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1111903 - [Settings] Refactor Dialog Service with l10n best practices

========

https://hg.mozilla.org/integration/gaia-central/rev/833c5a6e423c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #26878 from crh0716/1111712

Bug 1111712 - Check the existence of the bluetooth item r=eragonj

========

https://hg.mozilla.org/integration/gaia-central/rev/0537e5552c0c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1111712 - Check the existence of the bluetooth item
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 47907ed43df2..d31989993871 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "332e1596ba165b7cae4ddfc7e43e3530538a9e5d", 
+    "revision": "724943c2c3e2384b5ca4ef5cfa978c733913fd03", 
     "repo_path": "integration/gaia-central"
 }

From 4e66b9065f89b930fe0e5960761f70015d9293a8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 22:31:55 -0800
Subject: [PATCH 147/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index aaba69ec2696..f5c143415639 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 71664e7f30d4..120d86d39041 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 217cba455c0a..929210b5c2e5 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index b9f0c265f9ce..220081f0c9f1 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 71664e7f30d4..120d86d39041 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index ea9baf07263c..35fac560f4ca 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 438d838f9655..2a1af018f2e8 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index ef120915300f..79fe23f2c2f5 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index b172c934bb10..e1c832a57b94 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index ae045541df07..79a8382ba08f 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 14a4a5e0d89a..8658eee769d6 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1149604ed7337424d1dbaf9f146f1f8edd967535"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From d859d8d0f951ad29cfc0003e085f6a93c063c81f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Thu, 18 Dec 2014 23:57:17 -0800
Subject: [PATCH 148/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/20dd907f4298
Author: Tzu-Lin Huang <dwi019@gmail.com>
Desc: Merge pull request #26872 from dwi2/bug1106844

Bug 1106844 - [Stingray] prevent focus stays on disabled elements in order to receive keyboard event

========

https://hg.mozilla.org/integration/gaia-central/rev/c46b7184aef1
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 1106844 - [Stingray] prevent focus stays on disabled elements in order to receive keyboard event
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index d31989993871..886d361032fc 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "724943c2c3e2384b5ca4ef5cfa978c733913fd03", 
+    "revision": "20dd907f42986f522233b523edd12064991a09ea", 
     "repo_path": "integration/gaia-central"
 }

From dfdba1ea633b1a51dfff5cb454880c5a802c7d9f Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 00:06:56 -0800
Subject: [PATCH 149/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index f5c143415639..64bcfb4b8866 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 120d86d39041..02ace38d61db 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 929210b5c2e5..2403ca196315 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 220081f0c9f1..e73808620e65 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 120d86d39041..02ace38d61db 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 35fac560f4ca..5538776ba0f9 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2a1af018f2e8..2864961c1da2 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 79fe23f2c2f5..31b488a8101d 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index e1c832a57b94..82395ad39781 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 79a8382ba08f..1c109efe4aeb 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 8658eee769d6..b0a7faf39a2d 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="ec14f58889f1ed52ba0c74ef375ab88565c31067"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="deb90229734e5397cda806fb11f2e001fba83399"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 7c9ca8778574e9b67ec2efbcb3311aab1337f046 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 00:47:28 -0800
Subject: [PATCH 150/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/67ed88a68635
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Merge pull request #26843 from RickyChien/bug-1111352

Bug 1111352 - Add keyboard test for build script r=@cctuan

========

https://hg.mozilla.org/integration/gaia-central/rev/ba9d6a0b48ab
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Bug 1111352 - Add keyboard test for build script
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c4ebb32a8f4e..1845831b4e33 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "5ec3ded83868cfc6904e0ad11714f7c3b9dc20f1", 
+    "revision": "67ed88a6863592bd8552242688ad93caa58d0b83", 
     "repo_path": "integration/gaia-central"
 }

From 0f03c71c8d2834e72b744cec2738660c2c39badf Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 00:52:07 -0800
Subject: [PATCH 151/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index b8907569aaa5..2693797f8be2 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index ef494c3c51b8..1a91afd13556 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 3f71896321f8..c3bd44df39ce 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index fde362480852..9e50ab85c12b 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index ef494c3c51b8..1a91afd13556 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index f3e85af2cf17..65fd136a9367 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 1b356ef8763d..e8ac70a5e59f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 9e7b329decd7..89a347d2647c 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 8b3a37fac7d5..e0c205f39714 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index ee217d9d9c48..9ef5d2a3157b 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 63eae9191343..478078286ac6 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="d2b9f53d29fcff3470194dd19cc9e4b60cf24cdc"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From ca25b3af3f8b75515a20935b651c6e9f44998f14 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 01:32:33 -0800
Subject: [PATCH 152/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/dbc726a9105a
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #26909 from mozilla-b2g/revert-26755-revert-26708-Patch_1046900

Reland bug 1046900, Adding telugu keyboard to FxOS

========

https://hg.mozilla.org/integration/gaia-central/rev/0ed304c7948a
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Revert "Revert "Fixes bug 1046900, Adding telugu keyboard to FxOS""
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 1845831b4e33..26c57dfebd9d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "67ed88a6863592bd8552242688ad93caa58d0b83", 
+    "revision": "dbc726a9105abd2d6d26fdca5e9508af5df50d6b", 
     "repo_path": "integration/gaia-central"
 }

From 896c38d097466fafb0fe293531965de0622d9585 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 01:41:42 -0800
Subject: [PATCH 153/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 2693797f8be2..380c3f8d8fb1 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 1a91afd13556..f855d62be77b 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index c3bd44df39ce..ada78d3e87e9 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 9e50ab85c12b..f09caf84bafd 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 1a91afd13556..f855d62be77b 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 65fd136a9367..b549367f1900 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index e8ac70a5e59f..cf9ed1a06cac 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 89a347d2647c..fe7ec3e18593 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index e0c205f39714..2ccf6a0eb99e 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 9ef5d2a3157b..f802ce844c4d 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 478078286ac6..9be64115ffff 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="23fe7747887a825c9f6de878a37744255efee058"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 872beeac365326273f1b29ff878dcef9d0b95479 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 01:47:27 -0800
Subject: [PATCH 154/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

========

https://hg.mozilla.org/integration/gaia-central/rev/530b13055e35
Author: Fernando Rodríguez Sela <frsela@tid.es>
Desc: Merge pull request #26108 from mancas/bug1095802

Bug 1095802 - Piped STK messages results in no Terminal Responses, r=anshulj, r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/c8488614a6a6
Author: Manuel <manuel.casasbarrado@telefonica.com>
Desc: Bug 1095802 - Piped STK messages results in no Terminal Responses
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 26c57dfebd9d..753f367216c8 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "dbc726a9105abd2d6d26fdca5e9508af5df50d6b", 
+    "revision": "530b13055e359a9af6fafd0384ea65a4ec8dfc5c", 
     "repo_path": "integration/gaia-central"
 }

From 567b736d38f5669687ee710e8f0fc662db66a173 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 01:57:07 -0800
Subject: [PATCH 155/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 380c3f8d8fb1..81f12498e773 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index f855d62be77b..555d50a07fca 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index ada78d3e87e9..6ba3f3714867 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index f09caf84bafd..fd8f71241685 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index f855d62be77b..555d50a07fca 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index b549367f1900..effc153e5250 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index cf9ed1a06cac..efb19f26aba5 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index fe7ec3e18593..91257c80e76f 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 2ccf6a0eb99e..10b4d307af48 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index f802ce844c4d..53881cb4eb59 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 9be64115ffff..d520f1744561 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="01c733e1e8833bbb52b9fe644adbc5730ac4b771"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From a4bfcf1ff8e5753def8ce2684a06ee54356daf72 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 02:17:23 -0800
Subject: [PATCH 156/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/4235e9c7c548
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #26760 from snowmantw/bug1110960

Bug 1110960 - Device slowing down after more than one day of uptime

========

https://hg.mozilla.org/integration/gaia-central/rev/2f29ae88d423
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1110960 - Device slowing down after more than one day of uptime
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 753f367216c8..02b5949fda3f 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "530b13055e359a9af6fafd0384ea65a4ec8dfc5c", 
+    "revision": "4235e9c7c5480b13870fa9d7640560debaf5e2e3", 
     "repo_path": "integration/gaia-central"
 }

From 0fa0e33275604cf858737cd6ff4a779214513db3 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 02:27:03 -0800
Subject: [PATCH 157/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 81f12498e773..62679f153ab3 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 555d50a07fca..2eaa60d54fa4 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 6ba3f3714867..f9beda879321 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index fd8f71241685..6d8f73d22d5a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 555d50a07fca..2eaa60d54fa4 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index effc153e5250..8e3e8e07a615 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index efb19f26aba5..b61afc2af134 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 91257c80e76f..0ec82badc4f7 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 10b4d307af48..ae584e61757d 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 53881cb4eb59..6c9dec04cff9 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index d520f1744561..b372f399892e 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="1a171fcf1901656144f81dc24aaff01f21113fbd"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From f064006f9dc85ab4dea91d74750f3df494311da9 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 02:47:25 -0800
Subject: [PATCH 158/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/6b43ac014f87
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #26837 from alivedise/bugzilla/1106855/do-not-block-system-resize-on-rocketbar

Bug 1106855 - Resize on orientationchange on active window +autoland, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/5d78038e9143
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 1106855 - Resize on orientationchange on active window
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 02b5949fda3f..4d17ec6ec631 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "4235e9c7c5480b13870fa9d7640560debaf5e2e3", 
+    "revision": "6b43ac014f87ddd058eabd056d68a03da9f4ebcd", 
     "repo_path": "integration/gaia-central"
 }

From 62f83dea152d721597ea851a3c459d7cf4d393d8 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 02:57:06 -0800
Subject: [PATCH 159/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 62679f153ab3..3f735d0c76f4 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 2eaa60d54fa4..a514519cef35 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index f9beda879321..4e3357da8632 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 6d8f73d22d5a..27aa1e1e6f04 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 2eaa60d54fa4..a514519cef35 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 8e3e8e07a615..b9a574da0ca5 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index b61afc2af134..2e5eeb3af184 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 0ec82badc4f7..b93f7924987a 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index ae584e61757d..0b2d8d7bc532 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 6c9dec04cff9..fa1485b24c2a 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index b372f399892e..ecf0f48ef3ca 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="9471af2ff4e995a0d9785ced2073c8fa9c8c357c"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 28e47f2f5c23d7fdc88e265ed31dc46ad1b43420 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 03:22:18 -0800
Subject: [PATCH 160/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c1377da26c31
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Merge pull request #26900 from RickyChien/bug-1059449

Bug 1059449 - Add MOZ_DISABLE_NONLOCAL_CONNECTIONS for build tests r=@cctuan

========

https://hg.mozilla.org/integration/gaia-central/rev/adebaf3d03f5
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Bug 1059449 - Add MOZ_DISABLE_NONLOCAL_CONNECTIONS for build tests
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 4d17ec6ec631..0df82c34ea91 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "6b43ac014f87ddd058eabd056d68a03da9f4ebcd", 
+    "revision": "c1377da26c318bf4b4ba763356de98d407f1d07d", 
     "repo_path": "integration/gaia-central"
 }

From dd08f06f0e5b0fcb615cc155f00969a868cd7eb4 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 03:26:57 -0800
Subject: [PATCH 161/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 3f735d0c76f4..fcb292930952 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index a514519cef35..3357f812ea9b 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 4e3357da8632..193cfb524fca 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 27aa1e1e6f04..7b0c1a41d38a 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index a514519cef35..3357f812ea9b 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index b9a574da0ca5..250391d9d43c 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2e5eeb3af184..9996d9a65085 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index b93f7924987a..6ba3cfde3d1e 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 0b2d8d7bc532..243cee822574 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index fa1485b24c2a..d67ad906ef33 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index ecf0f48ef3ca..01aac1e4d193 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="8a7377c1a75c25b90313f4d4606c7c25bab3a03a"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From b3bb9434e6d463b195803284c77f7ae5c3a13b1e Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 06:12:18 -0800
Subject: [PATCH 162/183] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3c7a9041d94d
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26885 from viorelaioia/bug_1110218

Bug 1110218 - Investigate intermittent failure in test_redial_last_numbe...

========

https://hg.mozilla.org/integration/gaia-central/rev/9ef859b524c0
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1110218 - Investigate intermittent failure in test_redial_last_number.py

========

https://hg.mozilla.org/integration/gaia-central/rev/3c6d71b5fd4c
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26886 from npark-mozilla/1112758

Bug 1112758 - Create a new test case for the switching to camera from gallery's list view

========

https://hg.mozilla.org/integration/gaia-central/rev/0235d0de2061
Author: No-Jun <npark@mozilla.com>
Desc: Bug 1112758 - Create a new test case for the switching to camera from gallery's list view
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 0df82c34ea91..d5a458c9014c 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "c1377da26c318bf4b4ba763356de98d407f1d07d", 
+    "revision": "3c7a9041d94d689a0b0533670b073c26bd1e879b", 
     "repo_path": "integration/gaia-central"
 }

From 6fdf71867c804f1f7acd9b7b53d912bdb0d0d1dd Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 06:17:03 -0800
Subject: [PATCH 163/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index fcb292930952..18455316cd95 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 3357f812ea9b..1d9ce4a7f49c 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 193cfb524fca..eac3e49c6aab 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 7b0c1a41d38a..553b896d06a4 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 3357f812ea9b..1d9ce4a7f49c 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 250391d9d43c..e2bd9c9b3d06 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 9996d9a65085..93b15dd2f7f3 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 6ba3cfde3d1e..4ebac724e980 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 243cee822574..ddf16cceb8b3 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index d67ad906ef33..832faab040ef 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 01aac1e4d193..297f4b00ade5 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="4460619f8901212315201b12727c2bf974889f06"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From c077c1aeef9193e99e912c8bf38b3c679b596127 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 07:12:22 -0800
Subject: [PATCH 164/183] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/18bf2612187b
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Merge pull request #26905 from RickyChien/bug-1112490

Bug 1112490 - Parallel build should output a make error r=@cctuan

========

https://hg.mozilla.org/integration/gaia-central/rev/8599f609fba7
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Bug 1112490 - Parallel build should output a make error

========

https://hg.mozilla.org/integration/gaia-central/rev/d0e0c81e056d
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #25948 from millermedeiros/1084014-month-view-day-observer

Bug 1084014 - [Calendar] update Month view to use DayObserver r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/061255136be9
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1084014 - [Calendar] update Month view to use DayObserver
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index d5a458c9014c..8db14a3d07c4 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "3c7a9041d94d689a0b0533670b073c26bd1e879b", 
+    "revision": "18bf2612187b613bbfbb21cc5700cf7b0d251971", 
     "repo_path": "integration/gaia-central"
 }

From 2df24d14844648347f93f8cd4cd40281a73ffb34 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 07:22:02 -0800
Subject: [PATCH 165/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 18455316cd95..1504dc3d3af7 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 1d9ce4a7f49c..73f6e75bc7e1 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index eac3e49c6aab..286ffb0a9c33 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 553b896d06a4..5d708757358e 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 1d9ce4a7f49c..73f6e75bc7e1 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index e2bd9c9b3d06..5f25aafa5881 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 93b15dd2f7f3..2ee4bbd4a94f 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 4ebac724e980..97faa5c3d916 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index ddf16cceb8b3..81c1da33408b 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 832faab040ef..9e0d33bff431 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 297f4b00ade5..44db94ebf856 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="25ed6542f13098b37ebb063861dab97d73e358f4"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From ec80c5a9029b1d65e3743014737559d39ee303d5 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 07:27:17 -0800
Subject: [PATCH 166/183] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0928af6ba801
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1111871 - merge pull request #26853 from etiennesegonzac:bug-1111871 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/7c31adeeb72e
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1111871 - Properly exiting the tabs view on lock events. r=sfoster
---
 b2g/config/gaia.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 8db14a3d07c4..b3c4c1b09909 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "18bf2612187b613bbfbb21cc5700cf7b0d251971", 
+    "revision": "0928af6ba8010181592fc8eedae9550ac8597f53", 
     "repo_path": "integration/gaia-central"
 }

From ee6e6a751a1aa75b55d9e4a03e877ed7b81a5226 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 07:36:57 -0800
Subject: [PATCH 167/183] Bumping manifests a=b2g-bump

---
 b2g/config/dolphin/sources.xml      | 2 +-
 b2g/config/emulator-ics/sources.xml | 2 +-
 b2g/config/emulator-jb/sources.xml  | 2 +-
 b2g/config/emulator-kk/sources.xml  | 2 +-
 b2g/config/emulator/sources.xml     | 2 +-
 b2g/config/flame-kk/sources.xml     | 2 +-
 b2g/config/flame/sources.xml        | 2 +-
 b2g/config/hamachi/sources.xml      | 2 +-
 b2g/config/helix/sources.xml        | 2 +-
 b2g/config/nexus-4/sources.xml      | 2 +-
 b2g/config/wasabi/sources.xml       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 1504dc3d3af7..aff28e8c6e2d 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 73f6e75bc7e1..d4fb914b7098 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 286ffb0a9c33..af6a072e14bf 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index 5d708757358e..1bb8741d4735 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 73f6e75bc7e1..d4fb914b7098 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d5d3f93914558b6f168447b805cd799c8233e300"/>
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 5f25aafa5881..5a018c6f335a 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
   <project name="platform_build" path="build" remote="b2g" revision="3ab0d9c70f0b2e1ededc679112c392303f037361">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/flame/sources.xml b/b2g/config/flame/sources.xml
index 2ee4bbd4a94f..24e59db19738 100644
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml
index 97faa5c3d916..cf73e3496011 100644
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml
index 81c1da33408b..34f304163307 100644
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -15,7 +15,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 9e0d33bff431..5b7f49802e77 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="8374a0d66ca9228269e860089c1535fcda9f9c5f"/>
diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml
index 44db94ebf856..3e3572f12be0 100644
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -17,7 +17,7 @@
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="85c5d7d5f7cbf5d3261197d571a0e2215b51d4ee"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="994125f21ffc162e8fe02b3670380495b5390774"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="8aee09c106f479f36c57b2a29af72d455e359211"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>

From 94d613426b05b67bfabea21cb141d3cf863fc83d Mon Sep 17 00:00:00 2001
From: Mason Chang <mchang@mozilla.com>
Date: Fri, 19 Dec 2014 10:47:56 -0500
Subject: [PATCH 168/183] Bug 1097792. Further tweak fling curving prefs.
 r=kats

---
 b2g/app/b2g.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index e97b74bb2771..86cce513e05b 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -995,10 +995,10 @@ pref("apz.pan_repaint_interval", 16);
 // APZ physics settings, tuned by UX designers
 pref("apz.fling_curve_function_x1", "0.41");
 pref("apz.fling_curve_function_y1", "0.0");
-pref("apz.fling_curve_function_x2", "0.76");
+pref("apz.fling_curve_function_x2", "0.80");
 pref("apz.fling_curve_function_y2", "1.0");
 pref("apz.fling_curve_threshold_inches_per_ms", "0.01");
-pref("apz.fling_friction", "0.0024");
+pref("apz.fling_friction", "0.00238");
 pref("apz.max_velocity_inches_per_ms", "0.07");
 
 // Tweak default displayport values to reduce the risk of running out of

From 8c9918d2b5893129de88be93a822b4b1493aa682 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:07 -0700
Subject: [PATCH 169/183] Bug 1085837 - Fix robocop testAppMenuPathways on
 Android 2.3; r=mcomella

---
 .../base/tests/components/AppMenuComponent.java     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mobile/android/base/tests/components/AppMenuComponent.java b/mobile/android/base/tests/components/AppMenuComponent.java
index a45868998c0d..b0da439e70b9 100644
--- a/mobile/android/base/tests/components/AppMenuComponent.java
+++ b/mobile/android/base/tests/components/AppMenuComponent.java
@@ -20,6 +20,7 @@ import org.mozilla.gecko.tests.helpers.WaitHelper;
 import org.mozilla.gecko.util.HardwareUtils;
 
 import android.view.View;
+import android.widget.TextView;
 
 import com.jayway.android.robotium.solo.Condition;
 import com.jayway.android.robotium.solo.RobotiumUtils;
@@ -174,6 +175,18 @@ public class AppMenuComponent extends BaseComponent {
             }
         }
 
+        // On Android 2.3, menu items may be instances of
+        // com.android.internal.view.menu.ListMenuItemView, each with a child
+        // android.widget.RelativeLayout which in turn has a child
+        // TextView with the appropriate text.
+        final List<TextView> textViewList = RobotiumUtils.filterViews(TextView.class, views);
+        for (TextView textView : textViewList) {
+            if (textView.getText().equals(text)) {
+                View relativeLayout = (View) textView.getParent();
+                View listMenuItemView = (View)relativeLayout.getParent();
+                return listMenuItemView;
+            }
+        }
         return null;
     }
 

From 5480fb59180daa059ee2b3e9444c3c8e386cfa09 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:08 -0700
Subject: [PATCH 170/183] Bug 1107002 - Update check for home banner not
 visible; r=mcomella

---
 .../tests/components/AboutHomeComponent.java  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mobile/android/base/tests/components/AboutHomeComponent.java b/mobile/android/base/tests/components/AboutHomeComponent.java
index 871393439a78..d7ab229b4b67 100644
--- a/mobile/android/base/tests/components/AboutHomeComponent.java
+++ b/mobile/android/base/tests/components/AboutHomeComponent.java
@@ -17,6 +17,7 @@ import org.mozilla.gecko.tests.UITestContext;
 import org.mozilla.gecko.tests.helpers.WaitHelper;
 import org.mozilla.gecko.util.HardwareUtils;
 
+import android.os.Build;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.TextView;
@@ -99,11 +100,20 @@ public class AboutHomeComponent extends BaseComponent {
 
     public AboutHomeComponent assertBannerNotVisible() {
         View banner = getHomeBannerView();
-        fAssertTrue("The HomeBanner is not visible",
-                    getHomePagerContainer().getVisibility() != View.VISIBLE ||
-                    banner == null ||
-                    banner.getVisibility() != View.VISIBLE ||
-                    banner.getTranslationY() == banner.getHeight());
+        if (Build.VERSION.SDK_INT >= 11) {
+            fAssertTrue("The HomeBanner is not visible",
+                        getHomePagerContainer().getVisibility() != View.VISIBLE ||
+                        banner == null ||
+                        banner.getVisibility() != View.VISIBLE ||
+                        banner.getTranslationY() == banner.getHeight());
+        } else {
+            // getTranslationY is not available before api 11.
+            // This check is a little less specific.
+            fAssertTrue("The HomeBanner is not visible",
+                        getHomePagerContainer().getVisibility() != View.VISIBLE ||
+                        banner == null ||
+                        banner.isShown() == false);
+        }
         return this;
     }
 

From 656789838257f86997c6d303157018d4064592fe Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Fri, 19 Dec 2014 08:27:03 -0800
Subject: [PATCH 171/183] Bug 1113429 - Optimize NUWA idle notifications on
 workers, r=froydnj.

---
 dom/workers/WorkerPrivate.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index d583dc2d2eae..fefc1b959e88 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -73,7 +73,6 @@
 #include "nsProxyRelease.h"
 #include "nsSandboxFlags.h"
 #include "prthread.h"
-#include "nsThread.h"
 #include "xpcpublic.h"
 
 #ifdef ANDROID
@@ -4333,17 +4332,6 @@ WorkerPrivate::DoRunLoop(JSContext* aCx)
     {
       MutexAutoLock lock(mMutex);
 
-#ifdef MOZ_NUWA_PROCESS
-      {
-        nsThread *thr = static_cast<nsThread*>(NS_GetCurrentThread());
-        ReentrantMonitorAutoEnter mon(thr->ThreadStatusMonitor());
-        if (mControlQueue.IsEmpty() &&
-            !(normalRunnablesPending = NS_HasPendingEvents(mThread))) {
-          thr->SetIdle();
-        }
-      }
-#endif // MOZ_NUWA_PROCESS
-
       while (mControlQueue.IsEmpty() &&
              !(normalRunnablesPending = NS_HasPendingEvents(mThread))) {
         WaitForWorkerEvents();
@@ -4853,6 +4841,15 @@ WorkerPrivate::WaitForWorkerEvents(PRIntervalTime aInterval)
   // The main thread may be waiting so we must notify.
   mMemoryReportCondVar.Notify();
 
+#ifdef MOZ_NUWA_PROCESS
+  {
+    MOZ_ASSERT(mThread);
+
+    ReentrantMonitorAutoEnter mon(mThread->ThreadStatusMonitor());
+    mThread->SetIdle();
+  }
+#endif // MOZ_NUWA_PROCESS
+
   // Now wait for an actual worker event.
   mCondVar.Wait(aInterval);
 

From 68517749771828e8b6d3192ae2410faf199afc38 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Fri, 19 Dec 2014 16:28:42 +0000
Subject: [PATCH 172/183] Bug 1111360 - Remove the unused NS_IS_REFLOW_ERROR
 macro and an obsolete comment.  r=roc

---
 layout/generic/nsIFrame.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 81ea730b73b6..8dbeecfd5650 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -247,14 +247,6 @@ typedef uint32_t nsReflowStatus;
 #define NS_FRAME_SET_OVERFLOW_INCOMPLETE(status) \
   status = (status & ~NS_FRAME_NOT_COMPLETE) | NS_FRAME_OVERFLOW_INCOMPLETE
 
-// This macro tests to see if an nsReflowStatus is an error value
-// or just a regular return value
-#define NS_IS_REFLOW_ERROR(_status) (int32_t(_status) < 0)
-
-/**
- * Extensions to the reflow status bits defined by nsIFrameReflow
- */
-
 // This bit is set, when a break is requested. This bit is orthogonal
 // to the nsIFrame::nsReflowStatus completion bits.
 #define NS_INLINE_BREAK              0x0100

From 5e7f3b9df5ffe9589d1a37c5c2f5e3d75cd1b1b9 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Fri, 19 Dec 2014 16:28:43 +0000
Subject: [PATCH 173/183] Bug 447660 part 1 - Replace the #define
 DISABLE_FLOAT_BREAKING_IN_COLUMNS with a pref to enable fragmenting of floats
 inside columns.  Set the pref enabled by default in non-RELEASE builds only. 
 r=roc

---
 layout/generic/crashtests/crashtests.list          |  3 ++-
 layout/generic/nsBlockFrame.cpp                    |  5 +----
 layout/generic/nsBlockReflowState.cpp              | 14 +++++++++++++-
 layout/generic/nsBlockReflowState.h                |  4 +++-
 .../bugs/563584-6-columns-ref-enabled.html         |  8 ++++++++
 layout/reftests/bugs/reftest.list                  |  6 ++++--
 layout/reftests/pagination/reftest.list            |  6 ++++--
 modules/libpref/init/all.js                        |  7 +++++++
 8 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 layout/reftests/bugs/563584-6-columns-ref-enabled.html

diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index c2a8eb51cd93..7e5917c24723 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -425,7 +425,8 @@ asserts(0-1) load 592118.html
 load 594808-1.html
 load 595435-1.xhtml
 load 595740-1.html
-load 600100.xhtml
+pref(layout.float-fragments-inside-column.enabled,true) asserts(1) load 600100.xhtml # bug 866955
+pref(layout.float-fragments-inside-column.enabled,false) load 600100.xhtml
 load 603490-1.html
 load 603510-1.html
 load 604314-1.html
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 08ec8d5abffc..10af9c0c4b2c 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -58,8 +58,6 @@ static const int MIN_LINES_NEEDING_CURSOR = 20;
 
 static const char16_t kDiscCharacter = 0x2022;
 
-#define DISABLE_FLOAT_BREAKING_IN_COLUMNS
-
 using namespace mozilla;
 using namespace mozilla::css;
 using namespace mozilla::layout;
@@ -5862,8 +5860,8 @@ nsBlockFrame::AdjustFloatAvailableSpace(nsBlockReflowState& aState,
                        ? NS_UNCONSTRAINEDSIZE
                        : std::max(0, aState.ContentBEnd() - aState.mBCoord);
 
-#ifdef DISABLE_FLOAT_BREAKING_IN_COLUMNS
   if (availBSize != NS_UNCONSTRAINEDSIZE &&
+      !aState.GetFlag(BRS_FLOAT_FRAGMENTS_INSIDE_COLUMN_ENABLED) &&
       nsLayoutUtils::GetClosestFrameOfType(this, nsGkAtoms::columnSetFrame)) {
     // Tell the float it has unrestricted block-size, so it won't break.
     // If the float doesn't actually fit in the column it will fail to be
@@ -5871,7 +5869,6 @@ nsBlockFrame::AdjustFloatAvailableSpace(nsBlockReflowState& aState,
     // overflow.
     availBSize = NS_UNCONSTRAINEDSIZE;
   }
-#endif
 
   return LogicalRect(wm, aState.ContentIStart(), aState.ContentBStart(),
                      availISize, availBSize);
diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index 9ed818c14491..bcb9c53cb501 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -15,6 +15,7 @@
 #include "nsPresContext.h"
 #include "nsIFrameInlines.h"
 #include "mozilla/AutoRestore.h"
+#include "mozilla/Preferences.h"
 #include <algorithm>
 
 #ifdef DEBUG
@@ -24,6 +25,9 @@
 using namespace mozilla;
 using namespace mozilla::layout;
 
+static bool sFloatFragmentsInsideColumnEnabled;
+static bool sFloatFragmentsInsideColumnPrefCached;
+
 nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
                                        nsPresContext* aPresContext,
                                        nsBlockFrame* aFrame,
@@ -46,6 +50,13 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
     mFloatBreakType(NS_STYLE_CLEAR_NONE),
     mConsumedBSize(aConsumedBSize)
 {
+  if (!sFloatFragmentsInsideColumnPrefCached) {
+    sFloatFragmentsInsideColumnPrefCached = true;
+    Preferences::AddBoolVarCache(&sFloatFragmentsInsideColumnEnabled,
+                                 "layout.float-fragments-inside-column.enabled");
+  }
+  SetFlag(BRS_FLOAT_FRAGMENTS_INSIDE_COLUMN_ENABLED, sFloatFragmentsInsideColumnEnabled);
+  
   WritingMode wm = aReflowState.GetWritingMode();
   SetFlag(BRS_ISFIRSTINFLOW, aFrame->GetPrevInFlow() == nullptr);
   SetFlag(BRS_ISOVERFLOWCONTAINER, IS_TRUE_OVERFLOW_CONTAINER(aFrame));
@@ -859,12 +870,13 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
 
   // In the case that we're in columns and not splitting floats, we need
   // to check here that the float's height fit, and if it didn't, bail.
-  // (This code is only for DISABLE_FLOAT_BREAKING_IN_COLUMNS .)
+  // (controlled by the pref "layout.float-fragments-inside-column.enabled")
   //
   // Likewise, if none of the float fit, and it needs to be pushed in
   // its entirety to the next page (NS_FRAME_IS_TRUNCATED or
   // NS_INLINE_IS_BREAK_BEFORE), we need to do the same.
   if ((ContentBSize() != NS_UNCONSTRAINEDSIZE &&
+       !GetFlag(BRS_FLOAT_FRAGMENTS_INSIDE_COLUMN_ENABLED) &&
        adjustedAvailableSpace.BSize(wm) == NS_UNCONSTRAINEDSIZE &&
        !mustPlaceFloat &&
        aFloat->BSize(wm) + floatMargin.BStartEnd(wm) >
diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h
index 9bb060db1b78..3b13a328ada9 100644
--- a/layout/generic/nsBlockReflowState.h
+++ b/layout/generic/nsBlockReflowState.h
@@ -32,7 +32,9 @@ class nsOverflowContinuationTracker;
 #define BRS_ISOVERFLOWCONTAINER   0x00000100
 // Our mPushedFloats list is stored on the blocks' proptable
 #define BRS_PROPTABLE_FLOATCLIST  0x00000200
-#define BRS_LASTFLAG              BRS_PROPTABLE_FLOATCLIST
+// Set when the pref layout.float-fragments-inside-column.enabled is true.
+#define BRS_FLOAT_FRAGMENTS_INSIDE_COLUMN_ENABLED 0x00000400
+#define BRS_LASTFLAG              BRS_FLOAT_FRAGMENTS_INSIDE_COLUMN_ENABLED
 
 class nsBlockReflowState {
 public:
diff --git a/layout/reftests/bugs/563584-6-columns-ref-enabled.html b/layout/reftests/bugs/563584-6-columns-ref-enabled.html
new file mode 100644
index 000000000000..56ecf414f79d
--- /dev/null
+++ b/layout/reftests/bugs/563584-6-columns-ref-enabled.html
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML>
+<title>Testcase for float breaking</title>
+<body style="margin: 0">
+  <div style="position: absolute; top: 0; left: 0; width: 150px; height: 100px; background: blue"></div>
+  <div style="position: absolute; top: 100px; left: 0; width: 75px; height: 125px; background: aqua"></div>
+  <div style="position: absolute; top: 100px; left: 75px; width: 100px; height: 125px; background: fuchsia"></div>
+  <div style="position: absolute; top: 0px; left: 200px; width: 75px; height: 75px; background: aqua"></div>
+  <div style="position: absolute; top: 0; left: 275px; width: 100px; height: 225px; background: fuchsia"></div>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 884758254948..68c79c360090 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -742,7 +742,8 @@ fails == 385823-2b.html 385823-2-ref.html
 == 386014-1c.html 386014-1-ref.html
 == 386065-1.html 386065-1-ref.html
 == 386065-2.html about:blank
-skip-if(B2G) fails == 386147-1.html 386147-1-ref.html # bug 447460
+test-pref(layout.float-fragments-inside-column.enabled,false) skip-if(B2G) fails == 386147-1.html 386147-1-ref.html
+test-pref(layout.float-fragments-inside-column.enabled,true) skip-if(B2G) == 386147-1.html 386147-1-ref.html
 == 386310-1a.html 386310-1-ref.html
 == 386310-1b.html 386310-1-ref.html
 == 386310-1c.html 386310-1-ref.html
@@ -1522,7 +1523,8 @@ skip-if(B2G) == 563584-2.html 563584-2-ref.html
 skip-if(B2G) == 563584-3.html 563584-3-ref.html
 skip-if(B2G) == 563584-4.html 563584-4-ref.html
 == 563584-5.html 563584-5-ref.html
-== 563584-6-columns.html 563584-6-columns-ref.html
+test-pref(layout.float-fragments-inside-column.enabled,false) == 563584-6-columns.html 563584-6-columns-ref.html
+test-pref(layout.float-fragments-inside-column.enabled,true) == 563584-6-columns.html 563584-6-columns-ref-enabled.html
 skip-if(B2G) == 563584-6-printing.html 563584-6-printing-ref.html
 skip-if(B2G) == 563584-7.html 563584-7-ref.html
 # FIXME: It would be nice to have variants of these -8 tests for the
diff --git a/layout/reftests/pagination/reftest.list b/layout/reftests/pagination/reftest.list
index 8227a1370dd7..2e0eadb80dd5 100644
--- a/layout/reftests/pagination/reftest.list
+++ b/layout/reftests/pagination/reftest.list
@@ -31,9 +31,11 @@ fails == border-breaking-004-cols.xhtml border-breaking-002-cols.ref.xhtml
 == content-inserted-008.xhtml content-inserted-001.ref.xhtml
 == content-inserted-009.xhtml content-inserted-002.ref.xhtml
 == dynamic-abspos-overflow-01-cols.xhtml dynamic-abspos-overflow-01-cols.ref.xhtml
-fails == float-clear-000.html float-clear-000.ref.html
+test-pref(layout.float-fragments-inside-column.enabled,false) fails == float-clear-000.html float-clear-000.ref.html
+test-pref(layout.float-fragments-inside-column.enabled,true) == float-clear-000.html float-clear-000.ref.html
 fails == float-clear-001.html float-clear-000.ref.html
-fails == float-clear-002.html float-clear-000.ref.html
+test-pref(layout.float-fragments-inside-column.enabled,false) fails == float-clear-002.html float-clear-000.ref.html
+test-pref(layout.float-fragments-inside-column.enabled,true) == float-clear-002.html float-clear-000.ref.html
 fails == float-clear-003.html float-clear-000.ref.html
 == float-clear-000-print.html float-clear-000-print.ref.html
 == float-clear-001-print.html float-clear-000-print.ref.html
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index f532dccadef6..fb7e30a77b19 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2247,6 +2247,13 @@ pref("layout.frame_rate.precise", false);
 // pref to control whether layout warnings that are hit quite often are enabled
 pref("layout.spammy_warnings.enabled", true);
 
+// Should we fragment floats inside CSS column layout?
+#ifdef RELEASE_BUILD
+pref("layout.float-fragments-inside-column.enabled", false);
+#else
+pref("layout.float-fragments-inside-column.enabled", true);
+#endif
+
 // Is support for the Web Animations API enabled?
 #ifdef RELEASE_BUILD
 pref("dom.animations-api.core.enabled", false);

From 4bd859f70844ad3c45df3f2b019572d482c2772d Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Fri, 19 Dec 2014 16:28:43 +0000
Subject: [PATCH 174/183] Bug 447660 part 2 - Mark an existing next-in-flow of
 a float that is split due to it being NOT_COMPLETE as NOT being an overflow
 container.  r=roc

---
 layout/generic/nsBlockFrame.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 10af9c0c4b2c..6a63078ae0c7 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -4066,6 +4066,9 @@ nsBlockFrame::SplitFloat(nsBlockReflowState& aState,
     if (oldParent != this) {
       ReparentFrame(nextInFlow, oldParent, this);
     }
+    if (!NS_FRAME_OVERFLOW_IS_INCOMPLETE(aFloatStatus)) {
+      nextInFlow->RemoveStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
+    }
   } else {
     nextInFlow = aState.mPresContext->PresShell()->FrameConstructor()->
       CreateContinuingFrame(aState.mPresContext, aFloat, this);
@@ -7223,10 +7226,11 @@ nsBlockFrame::ComputeFinalBSize(const nsHTMLReflowState& aReflowState,
                                               computedBSizeLeftOver),
                          aBorderPadding.BEnd(wm));
 
-  if (NS_FRAME_IS_NOT_COMPLETE(*aStatus)
-      && aFinalSize.BSize(wm) < aReflowState.AvailableBSize()) {
-    // We ran out of height on this page but we're incomplete
-    // Set status to complete except for overflow
+  if (NS_FRAME_IS_NOT_COMPLETE(*aStatus) &&
+      aFinalSize.BSize(wm) < aReflowState.AvailableBSize()) {
+    // We fit in the available space - change status to OVERFLOW_INCOMPLETE.
+    // XXXmats why didn't Reflow report OVERFLOW_INCOMPLETE in the first place?
+    // XXXmats and why exclude the case when our size == AvailableBSize?
     NS_FRAME_SET_OVERFLOW_INCOMPLETE(*aStatus);
   }
 

From 5f0c10b686a1f2c42bbaab98e79ff1011a687275 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Fri, 19 Dec 2014 16:28:43 +0000
Subject: [PATCH 175/183] Bug 447660 part 3 - When collecting / pushing a
 float, make sure to also pick up its next-in-flows that are in same block. 
 r=roc

Move the AssertNoDuplicateContinuations in DrainPushedFloats earlier because
DrainOverflowLines() sometimes picks up overflow line with a placeholder for
a float that has a next-in-flow in this block and unmark those floats as
pushed floats because they aren't anymore.

Change AppendPushedFloat to push any next-in-flows that are in the same block
as the given float too.

Make DoCollectFloats collect next-in-flows in the same block.

Make VerifyOverflowSituation check some float list invariants too.
---
 layout/generic/nsBlockFrame.cpp       | 92 ++++++++++++++++++++++-----
 layout/generic/nsBlockReflowState.cpp | 19 ++++--
 layout/generic/nsBlockReflowState.h   | 10 ++-
 3 files changed, 97 insertions(+), 24 deletions(-)

diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 6a63078ae0c7..ff0820860417 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -1101,6 +1101,15 @@ nsBlockFrame::Reflow(nsPresContext*           aPresContext,
     AddStateBits(NS_FRAME_HAS_DIRTY_CHILDREN);
   }
 
+#ifdef DEBUG
+  // Between when we drain pushed floats and when we complete reflow,
+  // we're allowed to have multiple continuations of the same float on
+  // our floats list, since a first-in-flow might get pushed to a later
+  // continuation of its containing block.  But it's not permitted
+  // outside that time.
+  nsLayoutUtils::AssertNoDuplicateContinuations(this, mFloats);
+#endif
+
   // ALWAYS drain overflow. We never want to leave the previnflow's
   // overflow lines hanging around; block reflow depends on the
   // overflow line lists being cleared out between reflow passes.
@@ -4058,6 +4067,10 @@ nsBlockFrame::SplitFloat(nsBlockReflowState& aState,
                          nsIFrame*           aFloat,
                          nsReflowStatus      aFloatStatus)
 {
+  MOZ_ASSERT(!NS_FRAME_IS_FULLY_COMPLETE(aFloatStatus),
+             "why split the frame if it's fully complete?");
+  MOZ_ASSERT(aState.mBlock == this);
+
   nsIFrame* nextInFlow = aFloat->GetNextInFlow();
   if (nextInFlow) {
     nsContainerFrame *oldParent = nextInFlow->GetParent();
@@ -4073,11 +4086,9 @@ nsBlockFrame::SplitFloat(nsBlockReflowState& aState,
     nextInFlow = aState.mPresContext->PresShell()->FrameConstructor()->
       CreateContinuingFrame(aState.mPresContext, aFloat, this);
   }
-  if (NS_FRAME_OVERFLOW_IS_INCOMPLETE(aFloatStatus))
-    aFloat->GetNextInFlow()->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
-
-  // The containing block is now overflow-incomplete.
-  NS_FRAME_SET_OVERFLOW_INCOMPLETE(aState.mReflowStatus);
+  if (NS_FRAME_OVERFLOW_IS_INCOMPLETE(aFloatStatus)) {
+    nextInFlow->AddStateBits(NS_FRAME_IS_OVERFLOW_CONTAINER);
+  }
 
   if (aFloat->StyleDisplay()->mFloats == NS_STYLE_FLOAT_LEFT) {
     aState.mFloatManager->SetSplitLeftFloatAcrossBreak();
@@ -4087,7 +4098,8 @@ nsBlockFrame::SplitFloat(nsBlockReflowState& aState,
     aState.mFloatManager->SetSplitRightFloatAcrossBreak();
   }
 
-  aState.AppendPushedFloat(nextInFlow);
+  aState.AppendPushedFloatChain(nextInFlow);
+  NS_FRAME_SET_OVERFLOW_INCOMPLETE(aState.mReflowStatus);
   return NS_OK;
 }
 
@@ -4538,6 +4550,15 @@ nsBlockFrame::DrainOverflowLines()
       // Make the overflow out-of-flow frames mine too.
       nsAutoOOFFrameList oofs(prevBlock);
       if (oofs.mList.NotEmpty()) {
+        // In case we own a next-in-flow of any of the drained frames, then
+        // those are now not PUSHED_FLOATs anymore.
+        for (nsFrameList::Enumerator e(oofs.mList); !e.AtEnd(); e.Next()) {
+          nsIFrame* nif = e.get()->GetNextInFlow();
+          for (; nif && nif->GetParent() == this; nif = nif->GetNextInFlow()) {
+            MOZ_ASSERT(mFloats.ContainsFrame(nif));
+            nif->RemoveStateBits(NS_FRAME_IS_PUSHED_FLOAT);
+          }
+        }
         ReparentFrames(oofs.mList, prevBlock, this);
         mFloats.InsertFrames(nullptr, nullptr, oofs.mList);
       }
@@ -4583,6 +4604,10 @@ nsBlockFrame::DrainSelfOverflowList()
     mFrames.AppendFrames(nullptr, ourOverflowLines->mFrames);
     mLines.splice(mLines.end(), ourOverflowLines->mLines);
   }
+
+#ifdef DEBUG
+  VerifyOverflowSituation();
+#endif
   return true;
 }
 
@@ -4610,15 +4635,6 @@ nsBlockFrame::DrainSelfOverflowList()
 void
 nsBlockFrame::DrainPushedFloats(nsBlockReflowState& aState)
 {
-#ifdef DEBUG
-  // Between when we drain pushed floats and when we complete reflow,
-  // we're allowed to have multiple continuations of the same float on
-  // our floats list, since a first-in-flow might get pushed to a later
-  // continuation of its containing block.  But it's not permitted
-  // outside that time.
-  nsLayoutUtils::AssertNoDuplicateContinuations(this, mFloats);
-#endif
-
   // If we're getting reflowed multiple times without our
   // next-continuation being reflowed, we might need to pull back floats
   // that we just put in the list to be pushed to our next-in-flow.
@@ -6086,7 +6102,7 @@ nsBlockFrame::ReflowPushedFloats(nsBlockReflowState& aState,
     nsIFrame *prevContinuation = f->GetPrevContinuation();
     if (prevContinuation && prevContinuation->GetParent() == f->GetParent()) {
       mFloats.RemoveFrame(f);
-      aState.AppendPushedFloat(f);
+      aState.AppendPushedFloatChain(f);
       f = !prev ? mFloats.FirstChild() : prev->GetNextSibling();
       continue;
     }
@@ -7014,9 +7030,10 @@ nsBlockFrame::DoCollectFloats(nsIFrame* aFrame, nsFrameList& aList,
       nsIFrame *outOfFlowFrame =
         aFrame->GetType() == nsGkAtoms::placeholderFrame ?
           nsLayoutUtils::GetFloatFromPlaceholder(aFrame) : nullptr;
-      if (outOfFlowFrame && outOfFlowFrame->GetParent() == this) {
+      while (outOfFlowFrame && outOfFlowFrame->GetParent() == this) {
         RemoveFloat(outOfFlowFrame);
         aList.AppendFrame(nullptr, outOfFlowFrame);
+        outOfFlowFrame = outOfFlowFrame->GetNextInFlow();
         // FIXME: By not pulling floats whose parent is one of our
         // later siblings, are we risking the pushed floats getting
         // out-of-order?
@@ -7345,6 +7362,47 @@ nsBlockFrame::VerifyLines(bool aFinalCheckOK)
 void
 nsBlockFrame::VerifyOverflowSituation()
 {
+  // Overflow out-of-flows must not have a next-in-flow in mFloats or mFrames.
+  nsFrameList* oofs = GetOverflowOutOfFlows() ;
+  if (oofs) {
+    for (nsFrameList::Enumerator e(*oofs); !e.AtEnd(); e.Next()) {
+      nsIFrame* nif = e.get()->GetNextInFlow();
+      MOZ_ASSERT(!nif || (!mFloats.ContainsFrame(nif) && !mFrames.ContainsFrame(nif)));
+    }
+  }
+
+  // Pushed floats must not have a next-in-flow in mFloats or mFrames.
+  oofs = GetPushedFloats();
+  if (oofs) {
+    for (nsFrameList::Enumerator e(*oofs); !e.AtEnd(); e.Next()) {
+      nsIFrame* nif = e.get()->GetNextInFlow();
+      MOZ_ASSERT(!nif || (!mFloats.ContainsFrame(nif) && !mFrames.ContainsFrame(nif)));
+    }
+  }
+
+  // A child float next-in-flow's parent must be |this| or a next-in-flow of |this|.
+  // Later next-in-flows must have the same or later parents.
+  nsIFrame::ChildListID childLists[] = { nsIFrame::kFloatList,
+                                         nsIFrame::kPushedFloatsList };
+  for (size_t i = 0; i < ArrayLength(childLists); ++i) {
+    nsFrameList children(GetChildList(childLists[i]));
+    for (nsFrameList::Enumerator e(children); !e.AtEnd(); e.Next()) {
+      nsIFrame* parent = this;
+      nsIFrame* nif = e.get()->GetNextInFlow();
+      for (; nif; nif = nif->GetNextInFlow()) {
+        bool found = false;
+        for (nsIFrame* p = parent; p; p = p->GetNextInFlow()) {
+          if (nif->GetParent() == p) {
+            parent = p;
+            found = true;
+            break;
+          }
+        }
+        MOZ_ASSERT(found, "next-in-flow is a child of parent earlier in the frame tree?");
+      }
+    }
+  }
+
   nsBlockFrame* flow = static_cast<nsBlockFrame*>(FirstInFlow());
   while (flow) {
     FrameLines* overflowLines = flow->GetOverflowLines();
diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index bcb9c53cb501..aa8a6fd7780f 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -433,11 +433,19 @@ nsBlockReflowState::SetupPushedFloatList()
 }
 
 void
-nsBlockReflowState::AppendPushedFloat(nsIFrame* aFloatCont)
+nsBlockReflowState::AppendPushedFloatChain(nsIFrame* aFloatCont)
 {
   SetupPushedFloatList();
-  aFloatCont->AddStateBits(NS_FRAME_IS_PUSHED_FLOAT);
-  mPushedFloats->AppendFrame(mBlock, aFloatCont);
+  while (true) {
+    aFloatCont->AddStateBits(NS_FRAME_IS_PUSHED_FLOAT);
+    mPushedFloats->AppendFrame(mBlock, aFloatCont);
+    aFloatCont = aFloatCont->GetNextInFlow();
+    if (!aFloatCont || aFloatCont->GetParent() != mBlock) {
+      break;
+    }
+    DebugOnly<nsresult> rv = mBlock->StealFrame(aFloatCont);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "StealFrame should succeed");
+  }
 }
 
 /**
@@ -966,6 +974,8 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
 
   if (!NS_FRAME_IS_FULLY_COMPLETE(reflowStatus)) {
     mBlock->SplitFloat(*this, aFloat, reflowStatus);
+  } else {
+    MOZ_ASSERT(!aFloat->GetNextInFlow());
   }
 
 #ifdef NOISY_FLOATMANAGER
@@ -1017,8 +1027,7 @@ nsBlockReflowState::PushFloatPastBreak(nsIFrame *aFloat)
   // isn't actually a continuation.
   DebugOnly<nsresult> rv = mBlock->StealFrame(aFloat);
   NS_ASSERTION(NS_SUCCEEDED(rv), "StealFrame should succeed");
-  AppendPushedFloat(aFloat);
-
+  AppendPushedFloatChain(aFloat);
   NS_FRAME_SET_OVERFLOW_INCOMPLETE(mReflowStatus);
 }
 
diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h
index 3b13a328ada9..d10f23d17aa1 100644
--- a/layout/generic/nsBlockReflowState.h
+++ b/layout/generic/nsBlockReflowState.h
@@ -216,8 +216,14 @@ public:
   // This method makes sure pushed floats are accessible to
   // StealFrame. Call it before adding any frames to mPushedFloats.
   void SetupPushedFloatList();
-  // Use this method to append to mPushedFloats.
-  void AppendPushedFloat(nsIFrame* aFloatCont);
+  /**
+   * Append aFloatCont and its next-in-flows within the same block to
+   * mPushedFloats.  aFloatCont should not be on any child list when
+   * making this call.  Its next-in-flows will be removed from
+   * mBlock using StealFrame() before being added to mPushedFloats.
+   * All appended frames will be marked NS_FRAME_IS_PUSHED_FLOAT.
+   */
+  void AppendPushedFloatChain(nsIFrame* aFloatCont);
 
   // Track child overflow continuations.
   nsOverflowContinuationTracker* mOverflowTracker;

From a42b39e7f54eec150c1074001e386eabb4046edf Mon Sep 17 00:00:00 2001
From: Mats Palmgren <mats@mozilla.com>
Date: Fri, 19 Dec 2014 16:28:43 +0000
Subject: [PATCH 176/183] Bug 1111292 - Include the column gap(s) in the
 minimum width calculation when the number of columns is non-auto.  r=roc

---
 layout/generic/nsColumnSetFrame.cpp          |  5 +-
 layout/reftests/columns/min-width-1a.html    |  6 +-
 layout/reftests/columns/min-width-2-ref.html | 43 ++++++++++++
 layout/reftests/columns/min-width-2.html     | 74 ++++++++++++++++++++
 layout/reftests/columns/reftest.list         |  3 +-
 5 files changed, 126 insertions(+), 5 deletions(-)
 create mode 100644 layout/reftests/columns/min-width-2-ref.html
 create mode 100644 layout/reftests/columns/min-width-2.html

diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp
index 39a7cd70c99d..e5a93d0a97b0 100644
--- a/layout/generic/nsColumnSetFrame.cpp
+++ b/layout/generic/nsColumnSetFrame.cpp
@@ -389,9 +389,12 @@ nsColumnSetFrame::GetMinISize(nsRenderingContext *aRenderingContext)
     NS_ASSERTION(colStyle->mColumnCount > 0,
                  "column-count and column-width can't both be auto");
     // As available width reduces to zero, we still have mColumnCount columns,
-    // so multiply the child's min-width by the number of columns.
+    // so multiply the child's min-width by the number of columns (n) and
+    // include n-1 column gaps.
     colISize = iSize;
     iSize *= colStyle->mColumnCount;
+    nscoord colGap = GetColumnGap(this, colStyle);
+    iSize += colGap * (colStyle->mColumnCount - 1);
     // The multiplication above can make 'width' negative (integer overflow),
     // so use std::max to protect against that.
     iSize = std::max(iSize, colISize);
diff --git a/layout/reftests/columns/min-width-1a.html b/layout/reftests/columns/min-width-1a.html
index fca8db6cf6f1..4bbd82c3a6a9 100644
--- a/layout/reftests/columns/min-width-1a.html
+++ b/layout/reftests/columns/min-width-1a.html
@@ -4,14 +4,14 @@
   <style>
   div { -moz-column-count:2; -moz-column-gap:0; border:2px solid black; height:200px; }
   div.gap { -moz-column-gap:80px; }
-  span { display:inline-block; width:50px; }
+  span { display:inline-block; width:100px; }
   </style>
 </head>
 <body>
-  <table width="1"><tr><td><div>
+  <table cellpadding=0 cellspacing=0 width="1"><tr><td><div>
     <span></span>
   </div></tr></td></table>
-  <table width="1"><tr><td><div class="gap">
+  <table cellpadding=0 cellspacing=0 width="1"><tr><td><div class="gap">
     <span></span>
   </div></tr></td></table>
 </body>
diff --git a/layout/reftests/columns/min-width-2-ref.html b/layout/reftests/columns/min-width-2-ref.html
new file mode 100644
index 000000000000..93e915da1736
--- /dev/null
+++ b/layout/reftests/columns/min-width-2-ref.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html><head>
+    <meta charset="utf-8">
+    <title>Testcase for bug 1109571</title>
+    <style type="text/css">
+* {
+    color:black; background:none; font-size:16px; padding:0; margin:0; font-family:monospace;
+}
+
+.c {
+  height: 2.2em;
+  line-height: 1em;
+  border: dotted;
+  white-space: pre;
+  position: relative;
+}
+
+g { display:inline-block; width:2em; }
+z { position:absolute; top:0; bottom:0; color:white; border-right:2px solid blue; margin-left:-1px; }
+o { position:absolute; top:0; right:0; width:0; }
+x { position:relative; z-index:1; } /* to render it above the blue bar */
+    </style>
+</head>
+<body>
+
+
+<div style="width:250px; border:1px solid">
+<table cellpadding=0 cellspacing=0><td><div class="c"><z style="padding-left:1em">&nbsp;&nbsp;&nbsp;&nbsp;</z><x>xxxx</x><g></g><x>xxxx</x><br><x>xxxx</x><g></g><x>xxxx</x></div></td><td><x>xxxxxxxxxxxxxxxxxxxxxxxxx</x></table>
+</div>
+<div style="width:250px; border:1px solid">
+<table cellpadding=0 cellspacing=0><td><div class="c"><z>&nbsp;&nbsp;&nbsp;&nbsp;</z><x>xxxxxxxx</x><br><x>xxxxxxxx</x></div></td><td><x>xxxxxxxxxxxxxxxxxxxxxxxxx</x></table>
+</div>
+
+<div style="width:250px; border:1px solid">
+<table cellpadding=0 cellspacing=0><td><div class="c"><z style="padding-left:1em">&nbsp;&nbsp;&nbsp;&nbsp;</z><x>xxxx</x><br><x>xxxx</x><o><g></g><x>xxxx</x><br><g></g><x>xxxx</x></o></div></td><td><x>xxxxxxxxxxxxxxxxxxxxxxxxx</x></table>
+</div>
+
+<div style="width:250px; border:1px solid">
+<table cellpadding=0 cellspacing=0><td><div class="c"><z>&nbsp;&nbsp;&nbsp;&nbsp;</z><x>xxxx</x><br><x>xxxx</x><o><x>xxxx</x><br><x>xxxx</x></o></div></td><td><x>xxxxxxxxxxxxxxxxxxxxxxxxx</x></table>
+</div>
+
+</body>
+</html>
diff --git a/layout/reftests/columns/min-width-2.html b/layout/reftests/columns/min-width-2.html
new file mode 100644
index 000000000000..f30d86bbdab7
--- /dev/null
+++ b/layout/reftests/columns/min-width-2.html
@@ -0,0 +1,74 @@
+<!DOCTYPE HTML>
+<html><head>
+    <meta charset="utf-8">
+    <title>Testcase for bug </title>
+    <style type="text/css">
+* {
+    color:black; background:none; font-size:16px; padding:0; margin:0; font-family:monospace;
+}
+
+.c {
+  -moz-column-rule:2px solid blue;
+  -webkit-column-rule:2px solid blue;
+  -o-column-rule:2px solid blue;
+  -ms-column-rule:2px solid blue;
+  column-rule:2px solid blue;
+
+  -moz-column-gap:0;
+  -webkit-column-gap:0;
+  -o-column-gap:0;
+  -ms-column-gap:0;
+  column-gap:0;
+
+  height:2.2em;
+  line-height:1em;
+  border:dotted;
+}
+
+.col2 {
+  -moz-column-count:2;
+  -webkit-column-count:2;
+  -o-column-count:2;
+  -ms-column-count:2;
+  column-count:2;
+}
+
+.cw {
+  -moz-column-width:4em;
+  -webkit-column-width:4em;
+  -o-column-width:4em;
+  -ms-column-width:4em;
+  column-width:4em;
+}
+
+.gap {
+  -moz-column-gap:2em;
+  -webkit-column-gap:2em;
+  -o-column-gap:2em;
+  -ms-column-gap:2em;
+  column-gap:2em;
+}
+    </style>
+</head>
+<body>
+
+
+<div style="width:250px; border:1px solid">
+<table cellpadding=0 cellspacing=0><td><div class="c col2 gap">xxxx xxxx xxxx xxxx</div></td><td width="10000">xxxxxxxxxxxxxxxxxxxxxxxxx</table>
+</div>
+<div style="width:250px; border:1px solid">
+<table cellpadding=0 cellspacing=0><td><div class="c col2">xxxx xxxx xxxx xxxx</div></td><td width="10000">xxxxxxxxxxxxxxxxxxxxxxxxx</table>
+</div>
+
+<div style="width:250px; border:1px solid">
+<table cellpadding=0 cellspacing=0><td><div class="c gap cw">xxxx xxxx xxxx xxxx</div></td><td width="10000">xxxxxxxxxxxxxxxxxxxxxxxxx</table>
+</div>
+
+<div style="width:250px; border:1px solid">
+<table cellpadding=0 cellspacing=0><td><div class="c cw">xxxx xxxx xxxx xxxx</div></td><td width="10000">xxxxxxxxxxxxxxxxxxxxxxxxx</table>
+</div>
+
+</body>
+</html>
+
+
diff --git a/layout/reftests/columns/reftest.list b/layout/reftests/columns/reftest.list
index add8d8ddb37c..da20f920b7d5 100644
--- a/layout/reftests/columns/reftest.list
+++ b/layout/reftests/columns/reftest.list
@@ -2,9 +2,10 @@
 == pref-width-1a.html pref-width-1-ref.html
 == pref-width-1b.html pref-width-1-ref.html
 == pref-width-1c.html pref-width-1-ref.html
-== min-width-1a.html min-width-1-ref.html
+== min-width-1a.html pref-width-1-ref.html
 == min-width-1b.html min-width-1-ref.html
 == min-width-1c.html min-width-1-ref.html
+== min-width-2.html min-width-2-ref.html
 == column-balancing-overflow-000.html column-balancing-overflow-000.ref.html
 == column-balancing-overflow-001.html column-balancing-overflow-000.ref.html
 == column-balancing-overflow-002.html column-balancing-overflow-002.ref.html

From 76bc957f3e3ca7372ea954547b6686448a4588c1 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@mozilla.com>
Date: Fri, 19 Dec 2014 17:32:48 +0100
Subject: [PATCH 177/183] Bug 1073033 part 2.5 - Fix rooting analysis in
 computeScopeChain. r=jandem CLOSED TREE

---
 js/src/jit/JitFrames.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/src/jit/JitFrames.cpp b/js/src/jit/JitFrames.cpp
index f02a555d576e..32a6c92ef997 100644
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -2411,8 +2411,17 @@ InlineFrameIterator::computeScopeChain(Value scopeChainValue, MaybeReadFallback
                                        bool *hasCallObj) const
 {
     if (scopeChainValue.isObject()) {
-        if (hasCallObj)
-            *hasCallObj = isFunctionFrame() && callee(fallback)->isHeavyweight();
+        if (hasCallObj) {
+            if (fallback.canRecoverResults()) {
+                RootedObject obj(fallback.maybeCx, &scopeChainValue.toObject());
+                *hasCallObj = isFunctionFrame() && callee(fallback)->isHeavyweight();
+                return obj;
+            } else {
+                JS::AutoSuppressGCAnalysis nogc; // If we cannot recover then we cannot GC.
+                *hasCallObj = isFunctionFrame() && callee(fallback)->isHeavyweight();
+            }
+        }
+
         return &scopeChainValue.toObject();
     }
 

From 6cfa91ef9bb9bccfd17c47cfdef8b30757e8def3 Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Fri, 19 Dec 2014 11:37:26 -0500
Subject: [PATCH 178/183] Backed out changeset 70d9f3f8aaf1 (bug 1078975) for
 jsreftest failures. CLOSED TREE

---
 .../ecma_6/TypedArray/find-and-findIndex.js   | 70 -------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 js/src/tests/ecma_6/TypedArray/find-and-findIndex.js

diff --git a/js/src/tests/ecma_6/TypedArray/find-and-findIndex.js b/js/src/tests/ecma_6/TypedArray/find-and-findIndex.js
deleted file mode 100644
index 1e1b70fea264..000000000000
--- a/js/src/tests/ecma_6/TypedArray/find-and-findIndex.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Any copyright is dedicated to the Public Domain.
- * https://creativecommons.org/publicdomain/zero/1.0/
- */
-
-var BUGNUMBER = 1078975;
-var summary = "Implement %TypedArray%.prototype.{find, findIndex}";
-print(BUGNUMBER + ": " + summary);
-
-const constructors = [
-  Int8Array,
-  Uint8Array,
-  Uint8ClampedArray,
-  Int16Array,
-  Uint16Array,
-  Int32Array,
-  Uint32Array,
-  Float32Array,
-  Float64Array
-];
-
-const methods = ["find", "findIndex"];
-
-constructors.forEach(constructor => {
-    methods.forEach(method => {
-        var arr = new constructor([0, 1, 2, 3, 4, 5]);
-        // test that this.length is never called
-        Object.defineProperty(arr, "length", {
-            get() {
-                throw new Error("length accessor called");
-            }
-        });
-        assertEq(arr[method].length, 1);
-        assertEq(arr[method](v => v === 3), 3);
-        assertEq(arr[method](v => v === 6), method === "find" ? undefined : -1);
-
-        var thisValues = [undefined, null, true, 1, "foo", [], {}];
-        if (typeof Symbol == "function")
-            thisValues.push(Symbol());
-
-        thisValues.forEach(thisArg =>
-            assertThrowsInstanceOf(() => arr[method].call(thisArg, () => true), TypeError)
-        );
-
-        assertThrowsInstanceOf(() => arr[method](), TypeError);
-        assertThrowsInstanceOf(() => arr[method](1), TypeError);
-
-        // ToDo neutering
-        arr = new constructor([1, 2, 3]);
-        assertEq(arr[method](v => v === 2), method === "find" ? 2 : 1);
-        neuter(arr.buffer, "change-data");
-        assertEq(arr[method](v => v === 2), method === "find" ? undefined : -1);
-    });
-});
-
-[Float32Array, Float64Array].forEach(constructor => {
-    var arr = new constructor([-0, 0, 1, 5, NaN, 6]);
-    assertEq(arr.find(v => Number.isNaN(v)), NaN);
-    assertEq(arr.findIndex(v => Number.isNaN(v)), 4);
-
-    assertEq(arr.find(v => Object.is(v, 0)), 0);
-    assertEq(arr.findIndex(v => Object.is(v, 0)), 1);
-
-    assertEq(arr.find(v => Object.is(v, -0)), -0);
-    assertEq(arr.findIndex(v => Object.is(v, -0)), 0);
-})
-
-
-if (typeof reportCompare === "function")
-    reportCompare(true, true);

From 08c961589b741381059fb84df7c4a2e5ff5e2e73 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Fri, 19 Dec 2014 12:06:59 -0500
Subject: [PATCH 179/183] Bug 1112059 - disable ts_paint_cold from talos.
 r=rvitillo

---
 testing/talos/talos.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index 86521822196c..84cb3a4ef74f 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -92,7 +92,7 @@
             }
         },
         "xperf": {
-            "tests": ["tp5n", "ts_paint_cold"],
+            "tests": ["tp5n"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
             "pagesets_parent_dir_path": "talos/page_load_test/",
             "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5n.manifest",
@@ -107,7 +107,7 @@
             ]
         },
         "xperf-e10s": {
-            "tests": ["tp5n", "ts_paint_cold"],
+            "tests": ["tp5n"],
             "pagesets_url": "http://talos-bundles.pvt.build.mozilla.org/zips/tp5n.zip",
             "pagesets_parent_dir_path": "talos/page_load_test/",
             "pagesets_manifest_path": "talos/page_load_test/tp5n/tp5n.manifest",

From f33e0b3f59160800c606dd579f20f4480e1f59d0 Mon Sep 17 00:00:00 2001
From: Joel Maher <jmaher@mozilla.com>
Date: Fri, 19 Dec 2014 12:07:00 -0500
Subject: [PATCH 180/183] Bug 1113713 - deploy talos to the latest version [fix
 tests for e10s]. r=dminor

---
 testing/talos/talos.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/talos/talos.json b/testing/talos/talos.json
index 84cb3a4ef74f..bf19b406e119 100644
--- a/testing/talos/talos.json
+++ b/testing/talos/talos.json
@@ -5,7 +5,7 @@
     },
     "global": {
         "talos_repo": "https://hg.mozilla.org/build/talos",
-        "talos_revision": "f21edb5a25b5"
+        "talos_revision": "ebc4327b8cb8"
     },
     "extra_options": {
         "android": [ "--apkPath=%(apk_path)s" ]

From c54bf723267233ec052030fc345963f788aebb2f Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Fri, 19 Dec 2014 12:07:20 -0500
Subject: [PATCH 181/183] Backed out changesets 6bd00fa70b00, 4e2f8f3b8f6b, and
 c89fec9c8b55 (bug 879717) for introducting multiple new intermittent
 failures.

--HG--
extra : rebase_source : 4aad9383081f256484dd06e87f14cc82ecf186b5
---
 dom/html/HTMLMediaElement.cpp              | 118 ++++----------------
 dom/html/HTMLMediaElement.h                |   9 --
 dom/media/test/manifest.js                 |   2 +-
 dom/media/test/mochitest.ini               |   2 -
 dom/media/test/test_bug879717.html         | 119 ---------------------
 dom/media/test/test_streams_srcObject.html |   2 -
 dom/media/test/test_video_dimensions.html  |  67 ------------
 7 files changed, 21 insertions(+), 298 deletions(-)
 delete mode 100644 dom/media/test/test_bug879717.html
 delete mode 100644 dom/media/test/test_video_dimensions.html

diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index 91650070698b..27d7e88c1e75 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -71,8 +71,6 @@
 #include "mozilla/dom/MediaSource.h"
 #include "MediaMetadataManager.h"
 #include "MediaSourceDecoder.h"
-#include "AudioStreamTrack.h"
-#include "VideoStreamTrack.h"
 
 #include "AudioChannelService.h"
 
@@ -665,10 +663,7 @@ void HTMLMediaElement::AbortExistingLoads()
   mHaveQueuedSelectResource = false;
   mSuspendedForPreloadNone = false;
   mDownloadSuspendedByCache = false;
-  mHasAudio = false;
-  mHasVideo = false;
   mSourcePointer = nullptr;
-  mLastNextFrameStatus = NEXT_FRAME_UNINITIALIZED;
 
   mTags = nullptr;
 
@@ -902,30 +897,6 @@ void HTMLMediaElement::NotifyMediaTrackEnabled(MediaTrack* aTrack)
   }
 }
 
-void HTMLMediaElement::NotifyMediaStreamTracksAvailable(DOMMediaStream* aStream)
-{
-  if (!mSrcStream || mSrcStream != aStream) {
-    return;
-  }
-
-  bool oldHasVideo = mHasVideo;
-
-  nsAutoTArray<nsRefPtr<AudioStreamTrack>,1> audioTracks;
-  mSrcStream->GetAudioTracks(audioTracks);
-  nsAutoTArray<nsRefPtr<VideoStreamTrack>,1> videoTracks;
-  mSrcStream->GetVideoTracks(videoTracks);
-
-  mHasAudio = !audioTracks.IsEmpty();
-  mHasVideo = !videoTracks.IsEmpty();
-
-  if (IsVideo() && oldHasVideo != mHasVideo) {
-    // We are a video element and mHasVideo changed so update the screen wakelock
-    NotifyOwnerDocumentActivityChanged();
-  }
-
-  UpdateReadyStateForData(mLastNextFrameStatus);
-}
-
 void HTMLMediaElement::LoadFromSourceChildren()
 {
   NS_ASSERTION(mDelayingLoadEvent,
@@ -2010,7 +1981,6 @@ HTMLMediaElement::HTMLMediaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNo
     mCurrentLoadID(0),
     mNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY),
     mReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING),
-    mLastNextFrameStatus(NEXT_FRAME_UNINITIALIZED),
     mLoadWaitStatus(NOT_WAITING),
     mVolume(1.0),
     mPreloadAction(PRELOAD_UNDEFINED),
@@ -2848,25 +2818,6 @@ private:
   bool mPendingNotifyOutput;
 };
 
-class HTMLMediaElement::MediaStreamTracksAvailableCallback:
-    public DOMMediaStream::OnTracksAvailableCallback
-{
-public:
-  explicit MediaStreamTracksAvailableCallback(HTMLMediaElement* aElement,
-                                              DOMMediaStream::TrackTypeHints aExpectedTracks = 0):
-      DOMMediaStream::OnTracksAvailableCallback(aExpectedTracks),
-      mElement(aElement)
-    {}
-  virtual void NotifyTracksAvailable(DOMMediaStream* aStream)
-  {
-    NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
-
-    mElement->NotifyMediaStreamTracksAvailable(aStream);
-  }
-private:
-  HTMLMediaElement* mElement;
-};
-
 void HTMLMediaElement::SetupSrcMediaStreamPlayback(DOMMediaStream* aStream)
 {
   NS_ASSERTION(!mSrcStream && !mSrcStreamListener, "Should have been ended already");
@@ -2888,26 +2839,22 @@ void HTMLMediaElement::SetupSrcMediaStreamPlayback(DOMMediaStream* aStream)
   if (mPausedForInactiveDocumentOrChannel) {
     GetSrcMediaStream()->ChangeExplicitBlockerCount(1);
   }
-
-  mSrcStream->OnTracksAvailable(new MediaStreamTracksAvailableCallback(this, DOMMediaStream::HINT_CONTENTS_AUDIO));
-  mSrcStream->OnTracksAvailable(new MediaStreamTracksAvailableCallback(this, DOMMediaStream::HINT_CONTENTS_VIDEO));
-
-  ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_IDLE);
-
   ChangeDelayLoadStatus(false);
   GetSrcMediaStream()->AddAudioOutput(this);
-  SetVolumeInternal();
+  GetSrcMediaStream()->SetAudioOutputVolume(this, float(mMuted ? 0.0 : mVolume));
   VideoFrameContainer* container = GetVideoFrameContainer();
   if (container) {
     GetSrcMediaStream()->AddVideoOutput(container);
   }
 
-  CheckAutoplayDataReady();
-
   // Note: we must call DisconnectTrackListListeners(...)  before dropping
   // mSrcStream
   mSrcStream->ConstructMediaTracks(AudioTracks(), VideoTracks());
 
+  ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
+  DispatchAsyncEvent(NS_LITERAL_STRING("durationchange"));
+  DispatchAsyncEvent(NS_LITERAL_STRING("loadedmetadata"));
+  ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_IDLE);
   AddRemoveSelfReference();
   // FirstFrameLoaded() will be called when the stream has current data.
 }
@@ -2988,11 +2935,6 @@ void HTMLMediaElement::MetadataLoaded(const MediaInfo* aInfo,
   } else {
     UpdateMediaSize(aInfo->mVideo.mDisplay);
   }
-
-  if (IsVideo() && aInfo->HasVideo()) {
-    // We are a video element playing video so update the screen wakelock
-    NotifyOwnerDocumentActivityChanged();
-  }
 }
 
 void HTMLMediaElement::FirstFrameLoaded()
@@ -3253,47 +3195,18 @@ bool HTMLMediaElement::ShouldCheckAllowOrigin()
 
 void HTMLMediaElement::UpdateReadyStateForData(MediaDecoderOwner::NextFrameStatus aNextFrame)
 {
-  mLastNextFrameStatus = aNextFrame;
-
-  if (mDecoder && mReadyState < nsIDOMHTMLMediaElement::HAVE_METADATA) {
+  if (mReadyState < nsIDOMHTMLMediaElement::HAVE_METADATA) {
     // aNextFrame might have a next frame because the decoder can advance
     // on its own thread before MetadataLoaded gets a chance to run.
     // The arrival of more data can't change us out of this readyState.
     return;
   }
 
-  if (mSrcStream && mReadyState < nsIDOMHTMLMediaElement::HAVE_METADATA) {
-    if ((!mHasAudio && !mHasVideo) ||
-        (IsVideo() && mHasVideo && mMediaSize == nsIntSize(-1, -1))) {
-      return;
-    }
-
-    // We are playing a stream that has video and a video frame is now set.
-    // This means we have all metadata needed to change ready state.
-    MediaInfo mediaInfo;
-    mediaInfo.mAudio.mHasAudio = mHasAudio;
-    mediaInfo.mVideo.mHasVideo = mHasVideo;
-    if (mHasVideo) {
-      mediaInfo.mVideo.mDisplay = mMediaSize;
-    }
-    MetadataLoaded(&mediaInfo, nsAutoPtr<const MetadataTags>(nullptr));
-  }
-
   if (aNextFrame == MediaDecoderOwner::NEXT_FRAME_UNAVAILABLE_SEEKING) {
     ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
     return;
   }
 
-  if (IsVideo() && mHasVideo && !IsPlaybackEnded() &&
-        GetImageContainer() && !GetImageContainer()->HasCurrentImage()) {
-    // Don't advance if we are playing video, but don't have a video frame.
-    // Also, if video became available after advancing to HAVE_CURRENT_DATA
-    // while we are still playing, we need to revert to HAVE_METADATA until
-    // a video frame is available.
-    ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_METADATA);
-    return;
-  }
-
   if (mDownloadSuspendedByCache && mDecoder && !mDecoder->IsEnded()) {
     // The decoder has signaled that the download has been suspended by the
     // media cache. So move readyState into HAVE_ENOUGH_DATA, in case there's
@@ -3441,14 +3354,14 @@ void HTMLMediaElement::ChangeNetworkState(nsMediaNetworkState aState)
 
 bool HTMLMediaElement::CanActivateAutoplay()
 {
-  // For stream inputs, we activate autoplay on HAVE_NOTHING because
+  // For stream inputs, we activate autoplay on HAVE_CURRENT_DATA because
   // this element itself might be blocking the stream from making progress by
   // being paused.
   return !mPausedForInactiveDocumentOrChannel &&
          mAutoplaying &&
          mPaused &&
          ((mDecoder && mReadyState >= nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA) ||
-          mSrcStream) &&
+          (mSrcStream && mReadyState >= nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA)) &&
          HasAttr(kNameSpaceID_None, nsGkAtoms::autoplay) &&
          mAutoplayEnabled &&
          !IsEditable();
@@ -3477,14 +3390,24 @@ void HTMLMediaElement::CheckAutoplayDataReady()
 
 VideoFrameContainer* HTMLMediaElement::GetVideoFrameContainer()
 {
-  if (mVideoFrameContainer)
-    return mVideoFrameContainer;
+  // If we have loaded the metadata, and the size of the video is still
+  // (-1, -1), the media has no video. Don't go a create a video frame
+  // container.
+  if (mReadyState >= nsIDOMHTMLMediaElement::HAVE_METADATA &&
+      mMediaSize == nsIntSize(-1, -1)) {
+    return nullptr;
+  }
 
   // Only video frames need an image container.
   if (!IsVideo()) {
     return nullptr;
   }
 
+  mHasVideo = true;
+
+  if (mVideoFrameContainer)
+    return mVideoFrameContainer;
+
   mVideoFrameContainer =
     new VideoFrameContainer(this, LayerManager::CreateAsynchronousImageContainer());
 
@@ -3597,7 +3520,6 @@ void HTMLMediaElement::NotifyDecoderPrincipalChanged()
 void HTMLMediaElement::UpdateMediaSize(nsIntSize size)
 {
   mMediaSize = size;
-  UpdateReadyStateForData(mLastNextFrameStatus);
 }
 
 void HTMLMediaElement::SuspendOrResumeElement(bool aPauseElement, bool aSuspendEvents)
diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h
index ace9f320852e..413424d088ed 100644
--- a/dom/html/HTMLMediaElement.h
+++ b/dom/html/HTMLMediaElement.h
@@ -281,11 +281,6 @@ public:
 
   void NotifyMediaTrackEnabled(MediaTrack* aTrack);
 
-  /**
-   * Called when tracks become available to the source media stream.
-   */
-  void NotifyMediaStreamTracksAvailable(DOMMediaStream* aStream);
-
   virtual bool IsNodeOfType(uint32_t aFlags) const MOZ_OVERRIDE;
 
   /**
@@ -617,7 +612,6 @@ protected:
   virtual ~HTMLMediaElement();
 
   class MediaLoadListener;
-  class MediaStreamTracksAvailableCallback;
   class StreamListener;
 
   virtual void GetItemValueText(nsAString& text) MOZ_OVERRIDE;
@@ -1042,9 +1036,6 @@ protected:
   nsMediaNetworkState mNetworkState;
   nsMediaReadyState mReadyState;
 
-  // Last value passed from codec or stream source to UpdateReadyStateForData.
-  NextFrameStatus mLastNextFrameStatus;
-
   enum LoadAlgorithmState {
     // No load algorithm instance is waiting for a source to be added to the
     // media in order to continue loading.
diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js
index 973bb3a8c21e..28c25f261640 100644
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -14,7 +14,7 @@ var gSmallTests = [
   { name:"seek.webm", type:"video/webm", width:320, height:240, duration:3.966 },
   { name:"vp9.webm", type:"video/webm", width:320, height:240, duration:4 },
   { name:"detodos.opus", type:"audio/ogg; codecs=opus", duration:2.9135 },
-  { name:"gizmo.mp4", type:"video/mp4", width:560, height:320, duration:5.56 },
+  { name:"gizmo.mp4", type:"video/mp4", duration:5.56 },
   { name:"bogus.duh", type:"bogus/duh" }
 ];
 
diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini
index 236fe8a5490c..0b242c697c95 100644
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -332,7 +332,6 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_bug726904.html]
 [test_bug874897.html]
-[test_bug879717.html]
 [test_bug883173.html]
 [test_bug895091.html]
 [test_bug895305.html]
@@ -470,7 +469,6 @@ skip-if = (toolkit == 'android' && processor == 'x86') #x86 only
 skip-if = (toolkit == 'android' && processor == 'x86') #x86 only bug 914439
 [test_reset_events_async.html]
 [test_reset_src.html]
-[test_video_dimensions.html]
 [test_resume.html]
 skip-if = true # bug 1021673
 [test_seek_out_of_range.html]
diff --git a/dom/media/test/test_bug879717.html b/dom/media/test/test_bug879717.html
deleted file mode 100644
index 35e68fb2860f..000000000000
--- a/dom/media/test/test_bug879717.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for bug 879717, check that a video element can be drawn into a canvas at various states of playback</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <script type="text/javascript" src="manifest.js"></script>
-</head>
-<body>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-var manager = new MediaTestManager;
-
-var canvas = document.createElement('canvas');
-document.body.appendChild(canvas);
-
-var checkDrawImage = function(eventName, videoElement) {
-  var exception = null;
-  var exceptionName = "nothing";
-  try {
-    var ctx = canvas.getContext('2d');
-    ctx.drawImage(videoElement, 0, 0, canvas.width, canvas.height);
-  } catch (e) {
-    exception = e;
-    exceptionName = e.name;
-  }
-  ok(exception === null,
-    "drawImage shouldn't throw an exception on " + eventName +
-    " of " + videoElement.testName + ", got " + exceptionName);
-};
-
-var checkDrawImageEventHandler = function(ev) {
-  checkDrawImage(ev.type, ev.target);
-};
-var startTest = function(media, token) {
-  manager.started(token);
-
-  // File playback
-  var v1 = document.createElement("video");
-  v1.autoplay = true;
-
-  // Captured file playback
-  var v2 = document.createElement("video");
-  v2.autoplay = true;
-
-  // Stream playback
-  var v3 = document.createElement("video");
-  v3.autoplay = true;
-
-  v1.gotLoadeddata = false;
-  v2.gotLoadeddata = false;
-  v3.gotLoadeddata = false;
-
-  v1.testName = "v1 (" + media.name + ")";
-  v2.testName = "v2 (Captured " + media.name + ")";
-  v3.testName = "v3 (Stream of " + media.name + ")";
-
-  checkDrawImage("beforeplay", v1);
-  checkDrawImage("beforeplay", v2);
-  checkDrawImage("beforeplay", v3);
-
-  v1.onloadedmetadata = checkDrawImageEventHandler;
-  v2.onloadedmetadata = checkDrawImageEventHandler;
-  v3.onloadedmetadata = checkDrawImageEventHandler;
-
-  v1.onplay = checkDrawImageEventHandler;
-  v2.onplay = checkDrawImageEventHandler;
-  v3.onplay = checkDrawImageEventHandler;
-
-  v1.onplaying = checkDrawImageEventHandler;
-  v2.onplaying = checkDrawImageEventHandler;
-  v3.onplaying = checkDrawImageEventHandler;
-
-  var onloadeddata = function(ev) {
-    ev.target.gotLoadeddata = true;
-    checkDrawImageEventHandler(ev);
-  };
-
-  v1.onloadeddata = onloadeddata;
-  v2.onloadeddata = onloadeddata;
-  v3.onloadeddata = onloadeddata;
-
-  var checkFinished = function() {
-    if (!v1.testFinished || !v2.testFinished || !v3.testFinished) {
-      return;
-    }
-
-    ok(v1.gotLoadeddata, v1.testName + " should have gotten the 'loadeddata' event callback");
-    ok(v2.gotLoadeddata, v2.testName + " should have gotten the 'loadeddata' event callback");
-    ok(v3.gotLoadeddata, v3.testName + " should have gotten the 'loadeddata' event callback");
-
-    manager.finished(token);
-  };
-
-  var onended = function(ev) {
-    checkDrawImageEventHandler(ev);
-    removeNodeAndSource(ev.target);
-    ev.target.testFinished = true;
-    checkFinished();
-  };
-
-  v1.onended = onended;
-  v2.onended = onended;
-  v3.onended = onended;
-
-  document.body.appendChild(v1);
-  document.body.appendChild(v2);
-  document.body.appendChild(v3);
-
-  v1.src = media.name;
-  v2.src = media.name;
-  v3.mozSrcObject = v2.mozCaptureStreamUntilEnded();
-}
-
-manager.runTests(getPlayableVideos(gSmallTests), startTest);
-</script>
-</pre>
-</body>
-</html>
diff --git a/dom/media/test/test_streams_srcObject.html b/dom/media/test/test_streams_srcObject.html
index ed9c5866783e..446c5466b41a 100644
--- a/dom/media/test/test_streams_srcObject.html
+++ b/dom/media/test/test_streams_srcObject.html
@@ -45,8 +45,6 @@ function doTest() {
     }
     ++step;
   });
-  a.play();
-  b.play();
 }
 </script>
 </pre>
diff --git a/dom/media/test/test_video_dimensions.html b/dom/media/test/test_video_dimensions.html
deleted file mode 100644
index 30cb959c9bc6..000000000000
--- a/dom/media/test/test_video_dimensions.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test that a video element has set video dimensions on loadedmetadata</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <script type="text/javascript" src="manifest.js"></script>
-</head>
-<body>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-var manager = new MediaTestManager;
-
-var startTest = function(test, token) {
-  manager.started(token);
-  var v1 = document.createElement('video');
-  var v2 = document.createElement('video');
-  var vout = document.createElement('video');
-
-  var numVideoElementsFinished = 0;
-
-  var onloadedmetadata = function(ev) {
-    var v = ev.target;
-    ok(!v.loadedmetadata, v.testName + " should only fire loadedmetadata once");
-    v.loadedmetadata = true;
-    is(v.videoWidth, test.width, v.testName + " video width should be set on loadedmetadata");
-    is(v.videoHeight, test.height, v.testName + " video height should be set on loadedmetadata");
-
-    numVideoElementsFinished += 1;
-    if (v === v1) {
-      removeNodeAndSource(v1);
-      v2.play();
-      vout.play();
-    }
-
-    if (numVideoElementsFinished === 3) {
-      removeNodeAndSource(v2);
-      removeNodeAndSource(vout);
-      manager.finished(token);
-    }
-  };
-  var setupElement = function(v, id) {
-    v.loadedmetadata = false;
-    v.onloadedmetadata = onloadedmetadata;
-    document.body.appendChild(v);
-  };
-
-  v1.testName = test.name;
-  v2.testName = test.name + " (Captured)";
-  vout.testName = test.name + " (Stream)";
-
-  v1.src = test.name;
-  v2.src = test.name;
-  vout.src = URL.createObjectURL(v2.mozCaptureStreamUntilEnded());
-
-  setupElement(v1, "v1");
-  setupElement(v2, "v2");
-  setupElement(vout, "vout");
-
-  v1.play();
-};
-
-manager.runTests(getPlayableVideos(gSmallTests), startTest);
-</script>
-</pre>
-</body>
-</html>

From 83b87ab7f17686101b4c3347a6a9043ff557c450 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Fri, 19 Dec 2014 12:07:04 -0500
Subject: [PATCH 182/183] Bug 1113313 - Rename these functions to better
 reflect what they do. r=billm

--HG--
extra : rebase_source : ae61b3dd6dd5ce50a131a640060d7be57e562e4d
---
 dom/ipc/ContentParent.cpp                          | 14 +++++++-------
 dom/ipc/ContentParent.h                            | 10 +++++-----
 dom/ipc/PContent.ipdl                              | 11 ++++++-----
 .../manager/ssl/src/nsKeygenHandlerContent.cpp     | 10 ++++++----
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 6fba7bf4e462..7cfd823bf1c2 100755
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -4266,11 +4266,11 @@ ContentParent::RecvOpenAnonymousTemporaryFile(FileDescriptor *aFD)
 static NS_DEFINE_CID(kFormProcessorCID, NS_FORMPROCESSOR_CID);
 
 bool
-ContentParent::RecvFormProcessValue(const nsString& oldValue,
-                                    const nsString& challenge,
-                                    const nsString& keytype,
-                                    const nsString& keyparams,
-                                    nsString* newValue)
+ContentParent::RecvKeygenProcessValue(const nsString& oldValue,
+                                      const nsString& challenge,
+                                      const nsString& keytype,
+                                      const nsString& keyparams,
+                                      nsString* newValue)
 {
     nsCOMPtr<nsIFormProcessor> formProcessor =
       do_GetService(kFormProcessorCID);
@@ -4285,8 +4285,8 @@ ContentParent::RecvFormProcessValue(const nsString& oldValue,
 }
 
 bool
-ContentParent::RecvFormProvideContent(nsString* aAttribute,
-                                      nsTArray<nsString>* aContent)
+ContentParent::RecvKeygenProvideContent(nsString* aAttribute,
+                                        nsTArray<nsString>* aContent)
 {
     nsCOMPtr<nsIFormProcessor> formProcessor =
       do_GetService(kFormProcessorCID);
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 38b2016c7f2e..70f88647d4fc 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -722,13 +722,13 @@ private:
     RecvOpenAnonymousTemporaryFile(FileDescriptor* aFD) MOZ_OVERRIDE;
 
     virtual bool
-    RecvFormProcessValue(const nsString& oldValue, const nsString& challenge,
-                         const nsString& keytype, const nsString& keyparams,
-                         nsString* newValue) MOZ_OVERRIDE;
+    RecvKeygenProcessValue(const nsString& oldValue, const nsString& challenge,
+                           const nsString& keytype, const nsString& keyparams,
+                           nsString* newValue) MOZ_OVERRIDE;
 
     virtual bool
-    RecvFormProvideContent(nsString* aAttribute,
-                           nsTArray<nsString>* aContent) MOZ_OVERRIDE;
+    RecvKeygenProvideContent(nsString* aAttribute,
+                             nsTArray<nsString>* aContent) MOZ_OVERRIDE;
 
     virtual PFileDescriptorSetParent*
     AllocPFileDescriptorSetParent(const mozilla::ipc::FileDescriptor&) MOZ_OVERRIDE;
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index 4ee89e32db55..cd49ba903215 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -798,16 +798,17 @@ parent:
      * before one is submitted. This is urgent because an extension might use
      * a CPOW to synchronously submit a keygen element.
      */
-    prio(urgent) sync FormProcessValue(nsString oldValue,
-                                       nsString challenge,
-                                       nsString keytype,
-                                       nsString keyparams)
+    prio(urgent) sync KeygenProcessValue(nsString oldValue,
+                                         nsString challenge,
+                                         nsString keytype,
+                                         nsString keyparams)
         returns (nsString newValue);
 
     /**
      * Called to provide the options for <keygen> elements.
      */
-    sync FormProvideContent() returns (nsString aAttribute, nsString[] aContent);
+    sync KeygenProvideContent()
+        returns (nsString aAttribute, nsString[] aContent);
 
     // Use only for testing!
     sync GetFileReferences(PersistenceType persistenceType,
diff --git a/security/manager/ssl/src/nsKeygenHandlerContent.cpp b/security/manager/ssl/src/nsKeygenHandlerContent.cpp
index 38329e84e623..3f3b422fe8ee 100644
--- a/security/manager/ssl/src/nsKeygenHandlerContent.cpp
+++ b/security/manager/ssl/src/nsKeygenHandlerContent.cpp
@@ -45,9 +45,9 @@ nsKeygenFormProcessorContent::ProcessValue(nsIDOMHTMLElement* aElement,
 
   nsString oldValue(aValue);
   nsString newValue;
-  unused << child->SendFormProcessValue(oldValue, challengeValue,
-                                        keyTypeValue, keyParamsValue,
-                                        &newValue);
+  unused << child->SendKeygenProcessValue(oldValue, challengeValue,
+                                          keyTypeValue, keyParamsValue,
+                                          &newValue);
 
   aValue.Assign(newValue);
   return NS_OK;
@@ -70,7 +70,9 @@ nsKeygenFormProcessorContent::ProvideContent(const nsAString& aFormType,
                                              nsAString& aAttribute)
 {
   nsString attribute;
-  unused << ContentChild::GetSingleton()->SendFormProvideContent(&attribute, &aContent);
+  unused <<
+    ContentChild::GetSingleton()->SendKeygenProvideContent(&attribute,
+                                                           &aContent);
   aAttribute.Assign(attribute);
   return NS_OK;
 }

From 02b0b22c1413df2eb94f0c743341f38b8baba423 Mon Sep 17 00:00:00 2001
From: Bill McCloskey <wmccloskey@mozilla.com>
Date: Fri, 19 Dec 2014 09:22:05 -0800
Subject: [PATCH 183/183] Bug 1087117 - Disable test_bug457672.html in e10s for
 intermittent failures

---
 dom/events/test/mochitest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/events/test/mochitest.ini b/dom/events/test/mochitest.ini
index f37ab466b6c7..72dea7a1175b 100644
--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@@ -53,7 +53,7 @@ skip-if = buildapp == 'mulet'
 skip-if = buildapp == 'mulet'
 [test_bug456273.html]
 [test_bug457672.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #CRASH_DUMP, RANDOM
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #CRASH_DUMP, RANDOM
 [test_bug489671.html]
 [test_bug493251.html]
 skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage