From ec3ed6a5ebf6f2c406d7bcf94b6bc34fcaeb976e Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Thu, 28 Jul 2011 14:26:00 +0000 Subject: Automatic update of all copyright notices to reflect new license terms. I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/views/SkBGViewArtist.cpp | 7 +++++++ src/views/SkBorderView.cpp | 7 +++++++ src/views/SkEvent.cpp | 24 ++++++++---------------- src/views/SkEventSink.cpp | 24 ++++++++---------------- src/views/SkImageView.cpp | 7 +++++++ src/views/SkListView.cpp | 7 +++++++ src/views/SkListWidget.cpp | 7 +++++++ src/views/SkOSMenu.cpp | 7 +++++++ src/views/SkParsePaint.cpp | 7 +++++++ src/views/SkProgressBarView.cpp | 7 +++++++ src/views/SkProgressView.cpp | 7 +++++++ src/views/SkScrollBarView.cpp | 7 +++++++ src/views/SkStackViewLayout.cpp | 7 +++++++ src/views/SkStaticTextView.cpp | 7 +++++++ src/views/SkTagList.cpp | 24 ++++++++---------------- src/views/SkTagList.h | 24 ++++++++---------------- src/views/SkTextBox.cpp | 24 ++++++++---------------- src/views/SkTouchGesture.cpp | 19 ++++++------------- src/views/SkView.cpp | 7 +++++++ src/views/SkViewInflate.cpp | 7 +++++++ src/views/SkViewPriv.cpp | 7 +++++++ src/views/SkViewPriv.h | 7 +++++++ src/views/SkWidget.cpp | 7 +++++++ src/views/SkWidgetViews.cpp | 7 +++++++ src/views/SkWidgets.cpp | 7 +++++++ src/views/SkWindow.cpp | 7 +++++++ 26 files changed, 186 insertions(+), 93 deletions(-) (limited to 'src/views') diff --git a/src/views/SkBGViewArtist.cpp b/src/views/SkBGViewArtist.cpp index 07da123284..d9a45b8ffb 100644 --- a/src/views/SkBGViewArtist.cpp +++ b/src/views/SkBGViewArtist.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkBGViewArtist.h" #include "SkCanvas.h" #include "SkParsePaint.h" diff --git a/src/views/SkBorderView.cpp b/src/views/SkBorderView.cpp index 74a24775f4..cc1c08bc79 100644 --- a/src/views/SkBorderView.cpp +++ b/src/views/SkBorderView.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkBorderView.h" #include "SkAnimator.h" #include "SkWidgetViews.h" diff --git a/src/views/SkEvent.cpp b/src/views/SkEvent.cpp index ec4a7b47b7..2c09bc3bcb 100644 --- a/src/views/SkEvent.cpp +++ b/src/views/SkEvent.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/views/SkEvent.cpp -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkEvent.h" diff --git a/src/views/SkEventSink.cpp b/src/views/SkEventSink.cpp index c8fe35ca18..3c3aa5d213 100644 --- a/src/views/SkEventSink.cpp +++ b/src/views/SkEventSink.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/views/SkEventSink.cpp -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkEventSink.h" #include "SkTagList.h" diff --git a/src/views/SkImageView.cpp b/src/views/SkImageView.cpp index 9c358c7e26..8924dd32fb 100644 --- a/src/views/SkImageView.cpp +++ b/src/views/SkImageView.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkImageView.h" #include "SkAnimator.h" #include "SkBitmap.h" diff --git a/src/views/SkListView.cpp b/src/views/SkListView.cpp index ba4f02afc9..20747a285a 100644 --- a/src/views/SkListView.cpp +++ b/src/views/SkListView.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkWidget.h" #include "SkCanvas.h" #include "SkEvent.h" diff --git a/src/views/SkListWidget.cpp b/src/views/SkListWidget.cpp index 89008e7ebe..4d95e0fc46 100644 --- a/src/views/SkListWidget.cpp +++ b/src/views/SkListWidget.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkWidgetViews.h" #include "SkAnimator.h" diff --git a/src/views/SkOSMenu.cpp b/src/views/SkOSMenu.cpp index 3760ddd5cb..5ce36dc2b7 100644 --- a/src/views/SkOSMenu.cpp +++ b/src/views/SkOSMenu.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkOSMenu.h" static int gOSMenuCmd = 7000; diff --git a/src/views/SkParsePaint.cpp b/src/views/SkParsePaint.cpp index a79f30c150..4839439bb8 100644 --- a/src/views/SkParsePaint.cpp +++ b/src/views/SkParsePaint.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkParsePaint.h" #include "SkTSearch.h" #include "SkParse.h" diff --git a/src/views/SkProgressBarView.cpp b/src/views/SkProgressBarView.cpp index a9fd516458..ce26ac4ed8 100644 --- a/src/views/SkProgressBarView.cpp +++ b/src/views/SkProgressBarView.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkProgressBarView.h" #include "SkAnimator.h" #include "SkWidgetViews.h" diff --git a/src/views/SkProgressView.cpp b/src/views/SkProgressView.cpp index 0c81bccacd..8a506f44a1 100644 --- a/src/views/SkProgressView.cpp +++ b/src/views/SkProgressView.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkWidget.h" #include "SkCanvas.h" #include "SkShader.h" diff --git a/src/views/SkScrollBarView.cpp b/src/views/SkScrollBarView.cpp index 2e087bd1ae..98288f5b74 100644 --- a/src/views/SkScrollBarView.cpp +++ b/src/views/SkScrollBarView.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkScrollBarView.h" #include "SkAnimator.h" #include "SkWidgetViews.h" diff --git a/src/views/SkStackViewLayout.cpp b/src/views/SkStackViewLayout.cpp index ae2e9e81a5..a6e3f508d8 100644 --- a/src/views/SkStackViewLayout.cpp +++ b/src/views/SkStackViewLayout.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkStackViewLayout.h" SkStackViewLayout::SkStackViewLayout() diff --git a/src/views/SkStaticTextView.cpp b/src/views/SkStaticTextView.cpp index 8fb8bc12a5..2fd04a7b0e 100644 --- a/src/views/SkStaticTextView.cpp +++ b/src/views/SkStaticTextView.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkWidgetViews.h" #include "SkTextBox.h" diff --git a/src/views/SkTagList.cpp b/src/views/SkTagList.cpp index 4576ce67c0..e1b1662cd7 100644 --- a/src/views/SkTagList.cpp +++ b/src/views/SkTagList.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/views/SkTagList.cpp -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkTagList.h" diff --git a/src/views/SkTagList.h b/src/views/SkTagList.h index 5f428e4022..47294e3242 100644 --- a/src/views/SkTagList.h +++ b/src/views/SkTagList.h @@ -1,19 +1,11 @@ -/* libs/graphics/views/SkTagList.h -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #ifndef SkTagList_DEFINED #define SkTagList_DEFINED diff --git a/src/views/SkTextBox.cpp b/src/views/SkTextBox.cpp index 0e31ac68e4..6a88c6ce39 100644 --- a/src/views/SkTextBox.cpp +++ b/src/views/SkTextBox.cpp @@ -1,19 +1,11 @@ -/* libs/graphics/views/SkTextBox.cpp -** -** Copyright 2006, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #include "SkTextBox.h" #include "../core/SkGlyphCache.h" diff --git a/src/views/SkTouchGesture.cpp b/src/views/SkTouchGesture.cpp index 1732176983..bcfaf892c5 100644 --- a/src/views/SkTouchGesture.cpp +++ b/src/views/SkTouchGesture.cpp @@ -1,20 +1,13 @@ -/* - Copyright 2010 Google Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +/* + * Copyright 2010 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + #include "SkTouchGesture.h" #include "SkMatrix.h" #include "SkTime.h" diff --git a/src/views/SkView.cpp b/src/views/SkView.cpp index 4b99987db1..69dc6fc7f2 100644 --- a/src/views/SkView.cpp +++ b/src/views/SkView.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkView.h" #include "SkCanvas.h" diff --git a/src/views/SkViewInflate.cpp b/src/views/SkViewInflate.cpp index 8f5489de54..184e54021a 100644 --- a/src/views/SkViewInflate.cpp +++ b/src/views/SkViewInflate.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkViewInflate.h" #include "SkView.h" #include diff --git a/src/views/SkViewPriv.cpp b/src/views/SkViewPriv.cpp index b03ca8c101..ad15f3fdb4 100644 --- a/src/views/SkViewPriv.cpp +++ b/src/views/SkViewPriv.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkViewPriv.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/views/SkViewPriv.h b/src/views/SkViewPriv.h index 06ce59bec6..d8cf966ce9 100644 --- a/src/views/SkViewPriv.h +++ b/src/views/SkViewPriv.h @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #ifndef SkViewPriv_DEFINED #define SkViewPriv_DEFINED diff --git a/src/views/SkWidget.cpp b/src/views/SkWidget.cpp index 4d055c43ec..104429da57 100644 --- a/src/views/SkWidget.cpp +++ b/src/views/SkWidget.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkWidget.h" #include "SkCanvas.h" #include "SkInterpolator.h" diff --git a/src/views/SkWidgetViews.cpp b/src/views/SkWidgetViews.cpp index 2705307472..42dad4530d 100644 --- a/src/views/SkWidgetViews.cpp +++ b/src/views/SkWidgetViews.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkWidgetViews.h" #include "SkAnimator.h" #include "SkCanvas.h" diff --git a/src/views/SkWidgets.cpp b/src/views/SkWidgets.cpp index dba9ab354e..69d755bd8b 100644 --- a/src/views/SkWidgets.cpp +++ b/src/views/SkWidgets.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkWidget.h" #include "SkCanvas.h" #include "SkKey.h" diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp index b35f6f26d8..ef3264f6d2 100644 --- a/src/views/SkWindow.cpp +++ b/src/views/SkWindow.cpp @@ -1,3 +1,10 @@ + +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ #include "SkWindow.h" #include "SkCanvas.h" #include "SkDevice.h" -- cgit v1.2.3