Changeset 109052 in webkit


Ignore:
Timestamp:
Feb 27, 2012 5:36:25 PM (12 years ago)
Author:
abarth@webkit.org
Message:

Repair license blocks for files created during modularization
https://bugs.webkit.org/show_bug.cgi?id=79721

Reviewed by Eric Seidel.

We failed to copy the license blocks correctly when moving code into
these files. This patch restores the correct license blocks.

  • Modules/geolocation/NavigatorGeolocation.cpp:
  • Modules/geolocation/NavigatorGeolocation.h:
  • Modules/mediastream/NavigatorMediaStream.cpp:
  • Modules/mediastream/NavigatorMediaStream.h:
  • bindings/js/JSDOMWindowWebAudioCustom.cpp:
  • bindings/js/JSDOMWindowWebSocketCustom.cpp:
  • storage/DOMWindowSQLDatabase.cpp:
  • storage/DOMWindowSQLDatabase.h:
Location:
trunk/Source/WebCore
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r109042 r109052  
     12012-02-27  Adam Barth  <abarth@webkit.org>
     2
     3        Repair license blocks for files created during modularization
     4        https://bugs.webkit.org/show_bug.cgi?id=79721
     5
     6        Reviewed by Eric Seidel.
     7
     8        We failed to copy the license blocks correctly when moving code into
     9        these files.  This patch restores the correct license blocks.
     10
     11        * Modules/geolocation/NavigatorGeolocation.cpp:
     12        * Modules/geolocation/NavigatorGeolocation.h:
     13        * Modules/mediastream/NavigatorMediaStream.cpp:
     14        * Modules/mediastream/NavigatorMediaStream.h:
     15        * bindings/js/JSDOMWindowWebAudioCustom.cpp:
     16        * bindings/js/JSDOMWindowWebSocketCustom.cpp:
     17        * storage/DOMWindowSQLDatabase.cpp:
     18        * storage/DOMWindowSQLDatabase.h:
     19
    1202012-02-27  Julien Chaffraix  <jchaffraix@webkit.org>
    221
  • trunk/Source/WebCore/Modules/geolocation/NavigatorGeolocation.cpp

    r108958 r109052  
    11/*
    2  * Copyright (C) 2012, Google Inc. All rights reserved.
     2 *  Copyright (C) 2000 Harri Porten (porten@kde.org)
     3 *  Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org)
     4 *  Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org)
     5 *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
     6 *  Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    37 *
    4  * Redistribution and use in source and binary forms, with or without
    5  * modification, are permitted provided that the following conditions are met:
     8 *  This library is free software; you can redistribute it and/or
     9 *  modify it under the terms of the GNU Lesser General Public
     10 *  License as published by the Free Software Foundation; either
     11 *  version 2 of the License, or (at your option) any later version.
    612 *
    7  * 1. Redistributions of source code must retain the above copyright
    8  *    notice, this list of conditions and the following disclaimer.
    9  * 2. Redistributions in binary form must reproduce the above copyright
    10  *    notice, this list of conditions and the following disclaimer in the
    11  *    documentation and/or other materials provided with the distribution.
     13 *  This library is distributed in the hope that it will be useful,
     14 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     15 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     16 *  Lesser General Public License for more details.
    1217 *
    13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
    14  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    16  * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
    17  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    18  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
    19  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
    20  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
    21  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    22  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
    23  * DAMAGE.
     18 *  You should have received a copy of the GNU Lesser General Public
     19 *  License along with this library; if not, write to the Free Software
     20 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    2421 */
    2522
  • trunk/Source/WebCore/Modules/geolocation/NavigatorGeolocation.h

    r108958 r109052  
    11/*
    2  * Copyright (C) 2011, Google Inc. All rights reserved.
    3  *
    4  * Redistribution and use in source and binary forms, with or without
    5  * modification, are permitted provided that the following conditions are met:
    6  *
    7  * 1. Redistributions of source code must retain the above copyright
    8  *    notice, this list of conditions and the following disclaimer.
    9  * 2. Redistributions in binary form must reproduce the above copyright
    10  *    notice, this list of conditions and the following disclaimer in the
    11  *    documentation and/or other materials provided with the distribution.
    12  *
    13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
    14  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    16  * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
    17  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    18  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
    19  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
    20  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
    21  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    22  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
    23  * DAMAGE.
    24  */
     2    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
     3
     4    This library is free software; you can redistribute it and/or
     5    modify it under the terms of the GNU Library General Public
     6    License as published by the Free Software Foundation; either
     7    version 2 of the License, or (at your option) any later version.
     8
     9    This library is distributed in the hope that it will be useful,
     10    but WITHOUT ANY WARRANTY; without even the implied warranty of
     11    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     12    Library General Public License for more details.
     13
     14    You should have received a copy of the GNU Library General Public License
     15    along with this library; see the file COPYING.LIB.  If not, write to
     16    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     17    Boston, MA 02110-1301, USA.
     18*/
    2519
    2620#ifndef NavigatorGeolocation_h
  • trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.cpp

    r108958 r109052  
    11/*
    2  * Copyright (C) 2012, Google Inc. All rights reserved.
     2 *  Copyright (C) 2000 Harri Porten (porten@kde.org)
     3 *  Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org)
     4 *  Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org)
     5 *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
     6 *  Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    37 *
    4  * Redistribution and use in source and binary forms, with or without
    5  * modification, are permitted provided that the following conditions are met:
     8 *  This library is free software; you can redistribute it and/or
     9 *  modify it under the terms of the GNU Lesser General Public
     10 *  License as published by the Free Software Foundation; either
     11 *  version 2 of the License, or (at your option) any later version.
    612 *
    7  * 1. Redistributions of source code must retain the above copyright
    8  *    notice, this list of conditions and the following disclaimer.
    9  * 2. Redistributions in binary form must reproduce the above copyright
    10  *    notice, this list of conditions and the following disclaimer in the
    11  *    documentation and/or other materials provided with the distribution.
     13 *  This library is distributed in the hope that it will be useful,
     14 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     15 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     16 *  Lesser General Public License for more details.
    1217 *
    13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
    14  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    16  * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
    17  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    18  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
    19  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
    20  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
    21  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    22  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
    23  * DAMAGE.
     18 *  You should have received a copy of the GNU Lesser General Public
     19 *  License along with this library; if not, write to the Free Software
     20 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
    2421 */
    2522
  • trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.h

    r107541 r109052  
    11/*
    2  * Copyright (C) 2012, Google Inc. All rights reserved.
    3  *
    4  * Redistribution and use in source and binary forms, with or without
    5  * modification, are permitted provided that the following conditions are met:
    6  *
    7  * 1. Redistributions of source code must retain the above copyright
    8  *    notice, this list of conditions and the following disclaimer.
    9  * 2. Redistributions in binary form must reproduce the above copyright
    10  *    notice, this list of conditions and the following disclaimer in the
    11  *    documentation and/or other materials provided with the distribution.
    12  *
    13  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
    14  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    16  * ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE
    17  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    18  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
    19  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
    20  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
    21  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    22  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
    23  * DAMAGE.
    24  */
     2    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
     3
     4    This library is free software; you can redistribute it and/or
     5    modify it under the terms of the GNU Library General Public
     6    License as published by the Free Software Foundation; either
     7    version 2 of the License, or (at your option) any later version.
     8
     9    This library is distributed in the hope that it will be useful,
     10    but WITHOUT ANY WARRANTY; without even the implied warranty of
     11    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     12    Library General Public License for more details.
     13
     14    You should have received a copy of the GNU Library General Public License
     15    along with this library; see the file COPYING.LIB.  If not, write to
     16    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     17    Boston, MA 02110-1301, USA.
     18*/
    2519
    2620#ifndef NavigatorMediaStream_h
  • trunk/Source/WebCore/bindings/js/JSDOMWindowWebAudioCustom.cpp

    r104778 r109052  
    11/*
     2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
    23 * Copyright (C) 2011 Google Inc. All rights reserved.
    34 *
  • trunk/Source/WebCore/bindings/js/JSDOMWindowWebSocketCustom.cpp

    r104778 r109052  
    11/*
     2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
    23 * Copyright (C) 2011 Google Inc. All rights reserved.
    34 *
  • trunk/Source/WebCore/storage/DOMWindowSQLDatabase.cpp

    r104659 r109052  
    11/*
    2  * Copyright (C) 2012 Google Inc.  All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
     3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    5  * modification, are permitted provided that the following conditions are
    6  * met:
     6 * modification, are permitted provided that the following conditions
     7 * are met:
     8 * 1. Redistributions of source code must retain the above copyright
     9 *    notice, this list of conditions and the following disclaimer.
     10 * 2. Redistributions in binary form must reproduce the above copyright
     11 *    notice, this list of conditions and the following disclaimer in the
     12 *    documentation and/or other materials provided with the distribution.
    713 *
    8  *     * Redistributions of source code must retain the above copyright
    9  * notice, this list of conditions and the following disclaimer.
    10  *     * Redistributions in binary form must reproduce the above
    11  * copyright notice, this list of conditions and the following disclaimer
    12  * in the documentation and/or other materials provided with the
    13  * distribution.
    14  *     * Neither the name of Google Inc. nor the names of its
    15  * contributors may be used to endorse or promote products derived from
    16  * this software without specific prior written permission.
    17  *
    18  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    19  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    20  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    21  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
    22  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    23  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    24  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    25  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    26  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
     15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     17 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
     18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
     19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
     20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
     21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
     22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2723 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    2925 */
    3026
  • trunk/Source/WebCore/storage/DOMWindowSQLDatabase.h

    r104654 r109052  
    11/*
    2  * Copyright (C) 2012 Google Inc.  All rights reserved.
     2 * Copyright (C) 2006, 2007, 2009, 2010 Apple Inc. All rights reserved.
     3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    5  * modification, are permitted provided that the following conditions are
    6  * met:
     6 * modification, are permitted provided that the following conditions
     7 * are met:
     8 * 1. Redistributions of source code must retain the above copyright
     9 *    notice, this list of conditions and the following disclaimer.
     10 * 2. Redistributions in binary form must reproduce the above copyright
     11 *    notice, this list of conditions and the following disclaimer in the
     12 *    documentation and/or other materials provided with the distribution.
    713 *
    8  *     * Redistributions of source code must retain the above copyright
    9  * notice, this list of conditions and the following disclaimer.
    10  *     * Redistributions in binary form must reproduce the above
    11  * copyright notice, this list of conditions and the following disclaimer
    12  * in the documentation and/or other materials provided with the
    13  * distribution.
    14  *     * Neither the name of Google Inc. nor the names of its
    15  * contributors may be used to endorse or promote products derived from
    16  * this software without specific prior written permission.
    17  *
    18  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    19  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    20  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    21  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
    22  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    23  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    24  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    25  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    26  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
     15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     17 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
     18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
     19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
     20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
     21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
     22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2723 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    28  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    2925 */
    3026
Note: See TracChangeset for help on using the changeset viewer.