Bug 1323120 - Add license for Chromium and third party code in mortar project. r=gerv
authorlochang <ghoo1125@yahoo.com.tw>
Tue, 13 Dec 2016 00:52:00 -0500
changeset 326424 6768b6d8ba5a90cbd21b5d3bc03b0796d3509c7f
parent 326423 410e5d477c0d13e38092421cd02c899f81423065
child 326425 5956d0c8b4f054352ae88ecee7fb4fc7708f5959
push id35243
push userryanvm@gmail.com
push dateMon, 19 Dec 2016 21:18:41 +0000
treeherderautoland@0103a22afe98 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs1323120
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1323120 - Add license for Chromium and third party code in mortar project. r=gerv
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -99,16 +99,17 @@
       <li><a href="about:license#gears-istumbler">Google Gears/iStumbler License</a></li>
       <li><a href="about:license#vp8">Google VP8 License</a></li>
       <li><a href="about:license#gyp">gyp License</a></li>
       <li><a href="about:license#halloc">halloc License</a></li>
       <li><a href="about:license#harfbuzz">HarfBuzz License</a></li>
       <li><a href="about:license#icu">ICU License</a></li>
       <li><a href="about:license#immutable">Immutable.js License</a></li>
       <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#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>
 #ifdef MOZ_USE_LIBCXX
       <li><a href="about:license#libc++">libc++ License</a></li>
 #endif
@@ -2649,35 +2650,37 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
 
 
     <hr>
 
     <h1><a id="chromium"></a>Chromium License</h1>
 
     <p>This license applies to parts of the code in:</p>
     <ul>
+        <li><span class="path">browser/extensions/mortar/host/common/opengles2-utils.jsm</span></li>
         <li><span class="path">editor/libeditor/EditorEventListener.cpp</span></li>
         <li><span class="path">security/sandbox/</span></li>
         <li><span class="path">widget/cocoa/GfxInfo.mm</span></li>
     </ul>
     <p>and also some files in these directories:</p>
     <ul>
+        <li><span class="path">browser/extensions/mortar/ppapi/</span></li>
         <li><span class="path">dom/media/webspeech/recognition/</span></li>
         <li><span class="path">dom/plugins/</span></li>
         <li><span class="path">gfx/ots/</span></li>
         <li><span class="path">gfx/ycbcr/</span></li>
         <li><span class="path">ipc/chromium/</span></li>
         <li><span class="path">media/openmax_dl/</span></li>
         <li><span class="path">toolkit/components/downloads/chromium/</span></li>
         <li><span class="path">toolkit/components/url-classifier/chromium/</span></li>
         <li><span class="path">tools/profiler/</span></li>
     </ul>
 
 <pre>
-Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+Copyright (c) 2006-2016 The Chromium 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
@@ -3553,16 +3556,47 @@ 5. Disclaimer/Limitation of Liability: T
    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 DAMAGES.
 </pre>
 
     <hr>
 
+    <h1><a id="jsmn"></a>JSMN License</h1>
+
+    <p>This license applies to files in the directories
+    <span class="path">browser/extensions/mortar/json/</span>.
+    </p>
+
+<pre>
+Copyright (c) 2010 Serge A. Zaitsev
+Copyright (c) 2015 Andreas Gal
+
+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>
+
     <h1><a id="jemalloc"></a>jemalloc License</h1>
 
     <p>This license applies to files in the directories
     <span class="path">memory/mozjemalloc/</span> and
     <span class="path">memory/jemalloc/</span>.
     </p>
 
 <pre>
@@ -3665,16 +3699,22 @@ SUCH DAMAGE.
 
     <p>This license applies to the following files:</p>
 
     <ul>
       <li class="path">openmax_dl/dl/api/omxtypes.h</li>
       <li class="path">openmax_dl/dl/sp/api/omxSP.h</li>
     </ul>
 
+    <p>and also some files in these directories:</p>
+
+    <ul>
+      <li class="path">browser/extensions/mortar/ppapi/</li>
+    </ul>
+
 <pre>
 Copyright 2005-2008 The Khronos Group Inc. All Rights Reserved.
 
 These materials are protected by copyright laws and contain material
 proprietary to the Khronos Group, Inc.  You may use these materials
 for implementing Khronos specifications, without altering or removing
 any trademark, copyright or other notice from the specification.