diff options
author | Steve Block <steveblock@google.com> | 2009-11-12 23:26:11 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-11-13 00:40:09 +0000 |
commit | e03118fd5d9b776df29de3f96232ed6b5395c845 (patch) | |
tree | 41c5d00b7271e6ec98f65a34eab1763d882f1c4b /WebCore/platform/graphics/android/GlyphMapAndroid.cpp | |
parent | 7f9b227f4bbeb58184a4fd914ab15e384a603e8d (diff) | |
download | external_webkit-e03118fd5d9b776df29de3f96232ed6b5395c845.zip external_webkit-e03118fd5d9b776df29de3f96232ed6b5395c845.tar.gz external_webkit-e03118fd5d9b776df29de3f96232ed6b5395c845.tar.bz2 |
Fixes license headers for all Android-specific JavaScriptCore and WebCore files not yet upstreamed to webkit.org.
WebKit requires either a BSD-style or LGPL 2.1 license for all code.
We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org.
- For most files, I've fixed the names of copyright holders in the license text to 'THE COPYRIGHT HOLDERS'
and cleaned up formatting in the existing BSD-style license.
- For Makefiles and the following files in WebCore/platform/graphics/android/, I've changed from an
Apache 2.0 license to the BSD-style license.
- WebCore/platform/graphics/android/BitmapAllocatorAndroid.cpp
- WebCore/platform/graphics/android/BitmapAllocatorAndroid.h
- WebCore/platform/graphics/android/SharedBufferStream.cpp
- WebCore/platform/graphics/android/SharedBufferStream.h
- For the following files, I've changed from an LGPL licese to the BSD-style license.
- WebCore/platform/graphics/android/FontPlatformData.h
- WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp
- WebCore/plugins/android/PluginDataAndroid.cpp
Change-Id: Ic4c3e5610afc58637b7a9b81b1d0d1f17f4f4cb1
Diffstat (limited to 'WebCore/platform/graphics/android/GlyphMapAndroid.cpp')
-rw-r--r-- | WebCore/platform/graphics/android/GlyphMapAndroid.cpp | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/WebCore/platform/graphics/android/GlyphMapAndroid.cpp b/WebCore/platform/graphics/android/GlyphMapAndroid.cpp index fe64c9a..da9d99a 100644 --- a/WebCore/platform/graphics/android/GlyphMapAndroid.cpp +++ b/WebCore/platform/graphics/android/GlyphMapAndroid.cpp @@ -5,26 +5,23 @@ * 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. * - * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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. */ #include "config.h" @@ -87,4 +84,3 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b } } - |