--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -60,16 +60,17 @@
<li><a href="about:license#ACE">ACE License</a></li>
<li><a href="about:license#acorn">acorn License</a></li>
#ifdef MOZ_INSTALL_TRACKING
<li><a href="about:license#adjust">Adjust SDK License</a></li>
#endif
<li><a href="about:license#adobecmap">Adobe CMap License</a></li>
<li><a href="about:license#android">Android Open Source License</a></li>
<li><a href="about:license#angle">ANGLE License</a></li>
+ <li><a href="about:license#agg">Anti-Grain Geometry Public License</a></li>
<li><a href="about:license#apache">Apache License 2.0</a></li>
<li><a href="about:license#apple">Apple License</a></li>
<li><a href="about:license#apple-mozilla">Apple/Mozilla NPRuntime License</a></li>
<li><a href="about:license#arm">ARM License</a></li>
<li><a href="about:license#babel">Babel License</a></li>
<li><a href="about:license#babylon">Babylon License</a></li>
<li><a href="about:license#bspatch">bspatch License</a></li>
<li><a href="about:license#cairo">Cairo Component Licenses</a></li>
@@ -102,16 +103,17 @@
<li><a href="about:license#jpnic">Japan Network Information Center License</a></li>
<li><a href="about:license#jsmn">JSMN License</a></li>
<li><a href="about:license#jszip">JSZip License</a></li>
<li><a href="about:license#jemalloc">jemalloc License</a></li>
<li><a href="about:license#jquery">jQuery License</a></li>
<li><a href="about:license#k_exp">k_exp License</a></li>
<li><a href="about:license#khronos">Khronos group License</a></li>
<li><a href="about:license#kiss_fft">Kiss FFT License</a></li>
+ <li><a href="about:license#lcms">lcms License</a></li>
#ifdef MOZ_USE_LIBCXX
<li><a href="about:license#libc++">libc++ License</a></li>
#endif
<li><a href="about:license#libcubeb">libcubeb License</a></li>
<li><a href="about:license#libevent">libevent License</a></li>
<li><a href="about:license#libffi">libffi License</a></li>
<li><a href="about:license#libjingle">libjingle License</a></li>
<li><a href="about:license#libnestegg">libnestegg License</a></li>
@@ -122,21 +124,23 @@
<li><a href="about:license#microformatsshiv">MIT license — microformat-shiv</a></li>
<li><a href="about:license#myspell">MySpell License</a></li>
<li><a href="about:license#naturalSort">naturalSort License</a></li>
<li><a href="about:license#nicer">nICEr License</a></li>
<li><a href="about:license#node-md5">node-md5 License</a></li>
<li><a href="about:license#node-properties">node-properties License</a></li>
<li><a href="about:license#nrappkit">nrappkit License</a></li>
<li><a href="about:license#openaes">OpenAES License</a></li>
+ <li><a href="about:license#openjpeg">OpenJPEG License</a></li>
<li><a href="about:license#openvision">OpenVision License</a></li>
#if defined(XP_WIN) || defined(XP_MACOSX) || defined(XP_LINUX)
<li><a href="about:license#openvr">OpenVR License</a></li>
#endif
<li><a href="about:license#pbkdf2-sha256">pbkdf2_sha256 License</a></li>
+ <li><a href="about:license#pdfium">PDFium License</a></li>
#ifdef MOZ_WEBSPEECH_POCKETSPHINX
<li><a href="about:license#pocketsphinx">Pocketsphinx License</a></li>
#endif
<li><a href="about:license#praton">praton License</a></li>
<li><a href="about:license#praton1">praton and inet_ntop License</a></li>
<li><a href="about:license#qcms">qcms License</a></li>
<li><a href="about:license#qrcode-generator">QR Code Generator License</a></li>
<li><a href="about:license#raven-js">Raven.js License</a></li>
@@ -2201,16 +2205,33 @@ CAUSED AND ON ANY THEORY OF LIABILITY, W
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
</pre>
<hr>
+ <h1><a id="agg"></a>Anti-Grain Geometry Public License</h1>
+
+ <p>This license applies to files in the directory
+ <span class="path">widget/third_party/pdfium/pdfium/third_party/agg23/</span>.</p>
+
+<pre>
+Copyright (C) 2002-2005 Maxim Shemanarev (http://www.antigrain.com)
+
+Permission to copy, use, modify, sell and distribute this software
+is granted provided this copyright notice appears in all copies.
+This software is provided "as is" without express or implied
+warranty, and with no claim as to its suitability for any purpose.
+</pre>
+
+
+ <hr>
+
<h1><a id="acorn"></a>acorn License</h1>
<p>This license applies to all files in
<code>devtools/shared/acorn</code>.
</p>
<pre>
Copyright (C) 2012 by Marijn Haverbeke <marijnh@gmail.com>
@@ -2730,16 +2751,17 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
<p>and also some files in these directories:</p>
<ul>
<li><code>browser/extensions/mortar/ppapi/</code></li>
<li><code>dom/media/webspeech/recognition/</code></li>
<li><code>dom/plugins/</code></li>
<li><code>gfx/ots/</code></li>
<li><code>gfx/ycbcr/</code></li>
<li><code>ipc/chromium/</code></li>
+ <li><code>widget/third_party/pdfium/pdfium/third_party/base/</code></li>
<li><code>media/openmax_dl/</code></li>
<li><code>toolkit/components/downloads/chromium/</code></li>
<li><code>toolkit/components/url-classifier/chromium/</code></li>
<li><code>tools/profiler/</code></li>
</ul>
<pre>
Copyright (c) 2006-2016 The Chromium Authors. All rights reserved.
@@ -3927,16 +3949,45 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIA
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</pre>
<hr>
+ <h1><a id="lcms"></a>lcms License</h1>
+
+ <p>This license applies to files in the directory
+ <span class="path">widget/third_party/pdfium/pdfium/third_party/lcms2-2.6/</span>.</p>
+
+<pre>
+Copyright (c) 1998-2014 Marti Maria Saguer
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</pre>
+
+ <hr>
+
#ifdef MOZ_USE_LIBCXX
<h1><a id="libc++"></a>libc++ License</h1>
<p class="correctme">This license applies to the copy of libc++ obtained
from the Android NDK.</p>
<pre>
Copyright (c) 2009-2014 by the contributors listed in the libc++ CREDITS.TXT
@@ -4459,16 +4510,66 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
</pre>
<hr>
+ <h1><a id="openjpeg"></a>OpenJPEG License</h1>
+
+ <p>This license applies to files in the directory
+ <span class="path">widget/third_party/pdfium/pdfium/third_party/libopenjpeg20/</span>.</p>
+
+<pre>
+The copyright in this software is being made available under the 2-clauses
+BSD License, included below. This software may be subject to other third
+party and contributor rights, including patent rights, and no such rights
+are granted under this license.
+
+Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
+Copyright (c) 2002-2014, Professor Benoit Macq
+Copyright (c) 2001-2003, David Janssens
+Copyright (c) 2002-2003, Yannick Verschueren
+Copyright (c) 2003-2007, Francois-Olivier Devaux
+Copyright (c) 2003-2014, Antonin Descampe
+Copyright (c) 2005, Herve Drolon, FreeImage Team
+Copyright (c) 2006-2007, Parvatha Elangovan
+Copyright (c) 2008, Jerome Fimes, Communications & Systemes <jerome.fimes@c-s.fr>
+Copyright (c) 2010-2011, Kaori Hagihara
+Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France
+Copyright (c) 2012, CS Systemes d'Information, France
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</pre>
+
+
+ <hr>
+
<h1><a id="openvision"></a>OpenVision License</h1>
<p>This license applies to the file
<code>extensions/auth/gssapi.h</code>.</p>
<pre>
Copyright 1993 by OpenVision Technologies, Inc.
@@ -4857,16 +4958,54 @@ ARE DISCLAIMED. IN NO EVENT SHALL THE A
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
</pre>
+
+ <hr>
+
+ <h1><a id="pdfium"></a>PDFium License</h1>
+
+ <p>This license applies to files in the directory
+ <span class="path">widget/third_party/pdfium/pdfium/</span>.
+ </p>
+
+<pre>
+Copyright 2014 PDFium Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</pre>
#ifdef MOZ_WEBSPEECH_POCKETSPHINX
<hr>
<h1><a id="pocketsphinx"></a>Pocketsphinx License</h1>
<p>This license applies to files in the directories
<code>media/pocketsphinx/</code> and
@@ -6275,16 +6414,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
<li>The <a href="http://www.bzip.org/">bzip2</a> compression library
(Julian Seward)</li>
<li>The <a href="http://www.libpng.org/pub/png/">libpng</a> graphics library
(Glenn Randers-Pehrson and team)</li>
<li>The <a href="http://www.sqlite.org/">sqlite</a> database engine
(D. Richard Hipp and team)</li>
<li>The <a href="http://nsis.sourceforge.net/">Nullsoft Scriptable Install System</a>
(Amir Szekely and team)</li>
+ <li>The <a href="http://mattmccutchen.net/bigint/">C++ Big Integer Library</a>
+ (Matt McCutchen)</li>
</ul>
#ifdef XP_WIN
<hr>
