diff options
| author | rniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 02:13:54 +0000 |
|---|---|---|
| committer | rniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 02:13:54 +0000 |
| commit | a1e4ac1b0b00eb0340226b8e9b5cb14c833e9e98 (patch) | |
| tree | af906c27969baa4e66aa6651d0f534eb1cff6106 /third_party/apple_webkit | |
| parent | f3ddb5bf3c351e537cc5f7b9c507fd8da66b7b2e (diff) | |
| download | chromium_src-a1e4ac1b0b00eb0340226b8e9b5cb14c833e9e98.zip chromium_src-a1e4ac1b0b00eb0340226b8e9b5cb14c833e9e98.tar.gz chromium_src-a1e4ac1b0b00eb0340226b8e9b5cb14c833e9e98.tar.bz2 | |
Merge remote-tracking branch 'refs/remotes/origin/master' after r120680.
TBR=rsesek
Add back the license.
Review URL: https://chromiumcodereview.appspot.com/9351008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/apple_webkit')
| -rw-r--r-- | third_party/apple_webkit/WebKitSystemInterface.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/third_party/apple_webkit/WebKitSystemInterface.h b/third_party/apple_webkit/WebKitSystemInterface.h index bb30eb6..93ace52 100644 --- a/third_party/apple_webkit/WebKitSystemInterface.h +++ b/third_party/apple_webkit/WebKitSystemInterface.h @@ -3,6 +3,26 @@ Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. Public header file. + +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 APPLE INC. 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 INC. 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. */ #import <Cocoa/Cocoa.h> |