Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part II of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6474054
git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/FileReaderApp.gyp b/gyp/FileReaderApp.gyp
index 545eff2..b56460b 100644
--- a/gyp/FileReaderApp.gyp
+++ b/gyp/FileReaderApp.gyp
@@ -4,7 +4,7 @@
'target_name': 'FileReaderApp',
'type': 'executable',
'mac_bundle' : 1,
-
+
'include_dirs' : [
'../include/pipe',
'../experimental/FileReaderApp',
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 23ab8a7..0d65e8b0 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -104,7 +104,7 @@
'../samplecode/SampleXfermodes.cpp',
'../samplecode/SampleXfermodesBlur.cpp',
'../samplecode/TransitionView.cpp',
-
+
# DrawingBoard
#'../experimental/DrawingBoard/SkColorPalette.h',
#'../experimental/DrawingBoard/SkColorPalette.cpp',
@@ -112,12 +112,12 @@
#'../experimental/DrawingBoard/SkNetPipeController.cpp',
#'../experimental/DrawingBoard/SampleDrawingClient.cpp',
#'../experimental/DrawingBoard/SampleDrawingServer.cpp',
-
+
# Networking
#'../experimental/Networking/SampleNetPipeReader.cpp',
#'../experimental/Networking/SkSockets.cpp',
#'../experimental/Networking/SkSockets.h',
-
+
# Debugger
'../experimental/Debugger/DebuggerViews.h',
'../experimental/Debugger/DebuggerContentView.cpp',
@@ -173,7 +173,7 @@
'../src/views/mac/SampleAppDelegate.mm',
'../src/views/mac/SkSampleNSView.h',
'../src/views/mac/SkSampleNSView.mm',
-
+
# Mac files
'../src/views/mac/SkEventNotifier.h',
'../src/views/mac/SkEventNotifier.mm',
diff --git a/gyp/SimpleCocoaApp.gyp b/gyp/SimpleCocoaApp.gyp
index f20c444..dd02c41 100644
--- a/gyp/SimpleCocoaApp.gyp
+++ b/gyp/SimpleCocoaApp.gyp
@@ -18,11 +18,11 @@
'../src/views/mac/SkOSWindow_Mac.mm',
'../src/views/mac/SkTextFieldCell.h',
'../src/views/mac/SkTextFieldCell.m',
-
+
'../experimental/SimpleCocoaApp/SimpleApp-Info.plist',
'../experimental/SimpleCocoaApp/SimpleApp.h',
'../experimental/SimpleCocoaApp/SimpleApp.mm',
-
+
],
'dependencies': [
'core.gyp:core',
diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index 122f2c3..ea7bbf2 100644
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -1,18 +1,18 @@
# This GYP file stores the dependencies necessary to build Skia on the Android
# platform. The OS doesn't provide many stable libraries as part of the
-# distribution so we have to build a few of them ourselves.
+# distribution so we have to build a few of them ourselves.
#
-# We tried adding this gyp file to the android directory at the root of
+# We tried adding this gyp file to the android directory at the root of
# the Skia repo, but that resulted in the generated makefiles being created
# outside of the intended output directory. So to avoid this we created a simple
# shim here that includes the android_deps.gypi file. The actual dependencies
-# are defined and maintained in that gypi file.
-#
+# are defined and maintained in that gypi file.
+#
# Also this assumes that the android directory is a sibling to the directory
# that contains your primary Skia checkout. If it is not then you must manually
# edit the includes below to specify the actual location of the android.gypi.
# This is due to the fact that we cannot use variables in an includes as the
-# variable expansion step for gyp happens after the includes are processed.
+# variable expansion step for gyp happens after the includes are processed.
{
'includes': [
'../../android/gyp/dependencies.gypi',
diff --git a/gyp/android_system.gyp b/gyp/android_system.gyp
index bbc1e69..a2a9a0a 100644
--- a/gyp/android_system.gyp
+++ b/gyp/android_system.gyp
@@ -1,18 +1,18 @@
# This GYP file stores the dependencies necessary to build Skia on the Android
# platform. The OS doesn't provide many stable libraries as part of the
-# distribution so we have to build a few of them ourselves.
+# distribution so we have to build a few of them ourselves.
#
-# We tried adding this gyp file to the android directory at the root of
+# We tried adding this gyp file to the android directory at the root of
# the Skia repo, but that resulted in the generated makefiles being created
# outside of the intended output directory. So to avoid this we created a simple
# shim here that includes the android_system.gypi file. The actual dependencies
-# are defined and maintained in that gypi file.
-#
+# are defined and maintained in that gypi file.
+#
# Also this assumes that the android directory is a sibling to the directory
# that contains your primary Skia checkout. If it is not then you must manually
# edit the includes below to specify the actual location of the android.gypi.
# This is due to the fact that we cannot use variables in an includes as the
-# variable expansion step for gyp happens after the includes are processed.
+# variable expansion step for gyp happens after the includes are processed.
{
'includes': [
'../../android/gyp/android.gypi',
diff --git a/gyp/bench.gypi b/gyp/bench.gypi
index 5d2730d..26d8b36 100644
--- a/gyp/bench.gypi
+++ b/gyp/bench.gypi
@@ -9,7 +9,7 @@
'../bench/AAClipBench.cpp',
'../bench/BitmapBench.cpp',
'../bench/BlurBench.cpp',
- '../bench/ChecksumBench.cpp',
+ '../bench/ChecksumBench.cpp',
'../bench/ChromeBench.cpp',
'../bench/DashBench.cpp',
'../bench/DecodeBench.cpp',
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 247fe74..79c6ee5 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -101,4 +101,4 @@
# tab-width:2
# indent-tabs-mode:nil
# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
\ No newline at end of file
+# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 13f1976..f519824 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -27,7 +27,7 @@
'images.gyp:images',
'pdf.gyp:pdf',
'ports.gyp:ports',
- 'utils.gyp:utils',
+ 'utils.gyp:utils',
],
'conditions': [
['skia_os == "mac"', {
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index 58a8ade..7228758 100644
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -176,7 +176,7 @@
'sources': [
'<@(gr_sources)',
'<@(gr_native_gl_sources)',
- '<@(gr_angle_gl_sources)',
+ '<@(gr_angle_gl_sources)',
'<@(gr_mesa_gl_sources)',
'<@(gr_debug_gl_sources)',
'<@(gr_null_gl_sources)',
diff --git a/gyp/iOSSampleApp.gyp b/gyp/iOSSampleApp.gyp
index 6da247c..f9c8a58 100644
--- a/gyp/iOSSampleApp.gyp
+++ b/gyp/iOSSampleApp.gyp
@@ -111,11 +111,11 @@
'../samplecode/SampleVertices.cpp',
'../samplecode/SampleXfermodes.cpp',
'../samplecode/SampleXfermodesBlur.cpp',
-
+
# Dependencies for the pipe code in SampleApp
'../src/pipe/SkGPipeRead.cpp',
'../src/pipe/SkGPipeWrite.cpp',
-
+
# DrawingBoard
'../experimental/DrawingBoard/SkColorPalette.h',
'../experimental/DrawingBoard/SkColorPalette.cpp',
@@ -123,12 +123,12 @@
'../experimental/DrawingBoard/SkNetPipeController.cpp',
'../experimental/DrawingBoard/SampleDrawingClient.cpp',
'../experimental/DrawingBoard/SampleDrawingServer.cpp',
-
+
# Networking
'../experimental/Networking/SampleNetPipeReader.cpp',
'../experimental/Networking/SkSockets.cpp',
'../experimental/Networking/SkSockets.h',
-
+
# Transition
'../src/utils/SkInterpolator.cpp',
'../include/utils/SkInterpolator.h',
@@ -192,14 +192,14 @@
'../experimental/iOSSampleApp/Shared/SkUIDetailViewController.h',
'../experimental/iOSSampleApp/Shared/SkUIDetailViewController.mm',
'../experimental/iOSSampleApp/Shared/main.m',
-
+
# iPad
'../experimental/iOSSampleApp/iPad/AppDelegate_iPad.h',
'../experimental/iOSSampleApp/iPad/AppDelegate_iPad.mm',
'../experimental/iOSSampleApp/iPad/SkUISplitViewController.h',
'../experimental/iOSSampleApp/iPad/SkUISplitViewController.mm',
'../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib',
-
+
# iPhone
'../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.h',
'../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index c286603..34c0540 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -116,7 +116,7 @@
'android_deps.gyp:ft2',
'android_deps.gyp:expat',
],
- }],
+ }],
],
'direct_dependent_settings': {
'include_dirs': [
diff --git a/gyp/shapeops_demo.gyp b/gyp/shapeops_demo.gyp
index 2e594b1..910e2ec 100644
--- a/gyp/shapeops_demo.gyp
+++ b/gyp/shapeops_demo.gyp
@@ -78,7 +78,7 @@
}],
[ 'skia_os == "mac"', {
'sources': [
-
+
# Mac files
'../src/views/mac/SkEventNotifier.h',
'../src/views/mac/SkEventNotifier.mm',
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index b4b8785..9cfe46e 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -73,7 +73,7 @@
#mac
'../include/utils/mac/SkCGUtils.h',
'../src/utils/mac/SkCreateCGImageRef.cpp',
-
+
#windows
'../include/utils/win/SkAutoCoInitialize.h',
'../include/utils/win/SkHRESULT.h',