31 files changed, 64 insertions, 48 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index b9158219fe..2a38add318 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -174,33 +174,33 @@
           ],
           'sources': [
             # Sample App specific files
-            '../src/utils/mac/SampleApp-Info.plist',
-            '../src/utils/mac/SampleAppDelegate.h',
-            '../src/utils/mac/SampleAppDelegate.mm',
-            '../src/utils/mac/SkSampleNSView.h',
-            '../src/utils/mac/SkSampleNSView.mm',
+            '../src/views/mac/SampleApp-Info.plist',
+            '../src/views/mac/SampleAppDelegate.h',
+            '../src/views/mac/SampleAppDelegate.mm',
+            '../src/views/mac/SkSampleNSView.h',
+            '../src/views/mac/SkSampleNSView.mm',
             
             # Mac files
-            '../src/utils/mac/SkEventNotifier.h',
-            '../src/utils/mac/SkEventNotifier.mm',
-            '../src/utils/mac/skia_mac.mm',
-            '../src/utils/mac/SkNSView.h',
-            '../src/utils/mac/SkNSView.mm',
-            '../src/utils/mac/SkOptionsTableView.h',
-            '../src/utils/mac/SkOptionsTableView.mm',
-            '../src/utils/mac/SkOSWindow_Mac.mm',
-            '../src/utils/mac/SkTextFieldCell.h',
-            '../src/utils/mac/SkTextFieldCell.m',
+            '../src/views/mac/SkEventNotifier.h',
+            '../src/views/mac/SkEventNotifier.mm',
+            '../src/views/mac/skia_mac.mm',
+            '../src/views/mac/SkNSView.h',
+            '../src/views/mac/SkNSView.mm',
+            '../src/views/mac/SkOptionsTableView.h',
+            '../src/views/mac/SkOptionsTableView.mm',
+            '../src/views/mac/SkOSWindow_Mac.mm',
+            '../src/views/mac/SkTextFieldCell.h',
+            '../src/views/mac/SkTextFieldCell.m',
           ],
           'libraries': [
             '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
             '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
           ],
           'xcode_settings' : {
-            'INFOPLIST_FILE' : '../src/utils/mac/SampleApp-Info.plist',
+            'INFOPLIST_FILE' : '../src/views/mac/SampleApp-Info.plist',
           },
           'mac_bundle_resources' : [
-            '../src/utils/mac/SampleApp.xib',
+            '../src/views/mac/SampleApp.xib',
           ],
         }],
         [ 'skia_os == "ios"', {
@@ -222,7 +222,7 @@
             '../experimental/iOSSampleApp/iPhone/AppDelegate_iPhone.mm',
             '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm',
 
-            '../src/utils/ios/SkOSWindow_iOS.mm',
+            '../src/views/ios/SkOSWindow_iOS.mm',
             '../src/utils/ios/SkImageDecoder_iOS.mm',
             '../src/utils/ios/SkStream_NSData.mm',
             '../src/utils/ios/SkOSFile_iOS.mm',
diff --git a/gyp/SimpleCocoaApp.gyp b/gyp/SimpleCocoaApp.gyp
index f5e41c49f7..13f05dcaac 100644
--- a/gyp/SimpleCocoaApp.gyp
+++ b/gyp/SimpleCocoaApp.gyp
@@ -8,16 +8,16 @@
         '../experimental/SimpleCocoaApp/',
       ],
       'sources': [
-        '../src/utils/mac/SkEventNotifier.h',
-        '../src/utils/mac/SkEventNotifier.mm',
-        '../src/utils/mac/skia_mac.mm',
-        '../src/utils/mac/SkNSView.h',
-        '../src/utils/mac/SkNSView.mm',
-        '../src/utils/mac/SkOptionsTableView.h',
-        '../src/utils/mac/SkOptionsTableView.mm',
-        '../src/utils/mac/SkOSWindow_Mac.mm',
-        '../src/utils/mac/SkTextFieldCell.h',
-        '../src/utils/mac/SkTextFieldCell.m',
+        '../src/views/mac/SkEventNotifier.h',
+        '../src/views/mac/SkEventNotifier.mm',
+        '../src/views/mac/skia_mac.mm',
+        '../src/views/mac/SkNSView.h',
+        '../src/views/mac/SkNSView.mm',
+        '../src/views/mac/SkOptionsTableView.h',
+        '../src/views/mac/SkOptionsTableView.mm',
+        '../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',
diff --git a/gyp/iOSSampleApp.gyp b/gyp/iOSSampleApp.gyp
index b864ca687f..f504594ee9 100644
--- a/gyp/iOSSampleApp.gyp
+++ b/gyp/iOSSampleApp.gyp
@@ -1,7 +1,4 @@
 {
-  'includes': [
-    'target_defaults.gypi',
-  ],
   'defines!': [
     'SK_BUILD_FOR_MAC',
   ],
@@ -212,7 +209,7 @@
             '../experimental/iOSSampleApp/iPhone/SkUINavigationController.mm',
             '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
 
-            '../src/utils/ios/SkOSWindow_iOS.mm',
+            '../src/views/ios/SkOSWindow_iOS.mm',
             '../src/utils/ios/SkImageDecoder_iOS.mm',
             '../src/utils/ios/SkStream_NSData.mm',
             '../src/utils/ios/SkOSFile_iOS.mm',
diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 87d6e973ad..1847e95842 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -10,7 +10,6 @@
         '../include/utils/mac',
         '../include/utils/unix',
         '../include/utils/win',
-        '../include/views',
         '../include/effects',
         '../include/xml',
       ],
@@ -62,13 +61,6 @@
         #mac
         '../include/utils/mac/SkCGUtils.h',
         '../src/utils/mac/SkCreateCGImageRef.cpp',
-
-        #sdl
-        '../src/utils/SDL/SkOSWindow_SDL.cpp',
-
-        #*nix
-        '../src/utils/unix/keysym2ucs.c',
-        '../src/utils/unix/SkOSWindow_Unix.cpp',
         
         #windows
         '../include/utils/win/SkAutoCoInitialize.h',
@@ -76,10 +68,8 @@
         '../include/utils/win/SkIStream.h',
         '../include/utils/win/SkTScopedComPtr.h',
         '../src/utils/win/SkAutoCoInitialize.cpp',
-        '../src/utils/win/skia_win.cpp',
         '../src/utils/win/SkHRESULT.cpp',
         '../src/utils/win/SkIStream.cpp',
-        '../src/utils/win/SkOSWindow_win.cpp',
         '../src/utils/win/SkWGL_win.cpp',
       ],
       'sources!': [
@@ -104,8 +94,6 @@
           'sources!': [
             '../include/utils/mac/SkCGUtils.h',
             '../src/utils/mac/SkCreateCGImageRef.cpp',
-            '../src/utils/mac/skia_mac.mm',
-            '../src/utils/mac/SkOSWindow_Mac.mm',
           ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
@@ -119,10 +107,6 @@
           'include_dirs!': [
             '../include/utils/unix',
           ],
-          'sources!': [
-            '../src/utils/unix/keysym2ucs.c',
-            '../src/utils/unix/SkOSWindow_Unix.cpp',
-          ],
         }],
         [ 'skia_os == "win"', {
           'direct_dependent_settings': {
diff --git a/gyp/views.gyp b/gyp/views.gyp
index e997573418..832c1803bf 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -12,6 +12,7 @@
         '../include/images',
         '../include/animator',
         '../include/effects',
+        '../include/views/unix',
       ],
       'sources': [
         '../include/views/SkApplication.h',
@@ -64,10 +65,27 @@
         '../src/views/SkWidgets.cpp',
         '../src/views/SkWidgetViews.cpp',
         '../src/views/SkWindow.cpp',
+
+        #mac
+        '../src/views/mac/SkOSWindow_Mac.mm',
+        '../src/views/mac/skia_mac.mm',
+
+        #sdl
+        '../src/views/SDL/SkOSWindow_SDL.cpp',
+
+        #*nix
+        '../src/views/unix/SkOSWindow_Unix.cpp',
+        '../src/views/unix/keysym2ucs.c',
+
+        #windows
+        '../src/views/win/SkOSWindow_win.cpp',
+        '../src/views/win/skia_win.cpp',
+
       ],
       'sources!' : [
         '../src/views/SkListView.cpp',   #depends on missing SkListSource implementation
         '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation
+        '../src/views/SDL/SkOSWindow_SDL.cpp',
       ],
       'conditions': [
         [ 'skia_os == "mac"', {
@@ -77,11 +95,28 @@
               '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
             ],
           },
+        },{
+          'sources!': [
+            '../src/views/mac/SkOSWindow_Mac.mm',
+            '../src/views/mac/skia_mac.mm',
+          ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
           'sources': [
             '../unix_test_app/main.cpp',
           ],
+        },{
+          'sources!': [
+            '../src/views/unix/SkOSWindow_Unix.cpp',
+            '../src/views/unix/keysym2ucs.c',
+          ],
+        }],
+        [ 'skia_os == "win"', {
+        },{
+          'sources!': [
+            '../src/views/win/SkOSWindow_win.cpp',
+            '../src/views/win/skia_win.cpp',
+          ],
         }],
         [ 'skia_os == "android"', {
           # Android does not support animator so we need to remove all files
diff --git a/include/utils/android/AndroidKeyToSkKey.h b/include/views/android/AndroidKeyToSkKey.h
index 6bcb148b46..6bcb148b46 100644
--- a/include/utils/android/AndroidKeyToSkKey.h
+++ b/include/views/android/AndroidKeyToSkKey.h
diff --git a/include/utils/unix/XkeysToSkKeys.h b/include/views/unix/XkeysToSkKeys.h
index 30eb97d396..30eb97d396 100644
--- a/include/utils/unix/XkeysToSkKeys.h
+++ b/include/views/unix/XkeysToSkKeys.h
diff --git a/include/utils/unix/keysym2ucs.h b/include/views/unix/keysym2ucs.h
index 255a930539..255a930539 100644
--- a/include/utils/unix/keysym2ucs.h
+++ b/include/views/unix/keysym2ucs.h
diff --git a/src/utils/ios/SkOSWindow_iOS.mm b/src/views/ios/SkOSWindow_iOS.mm
index be6f44d797..be6f44d797 100755
--- a/src/utils/ios/SkOSWindow_iOS.mm
+++ b/src/views/ios/SkOSWindow_iOS.mm
diff --git a/src/utils/mac/SampleApp-Info.plist b/src/views/mac/SampleApp-Info.plist
index 64c6d481ff..64c6d481ff 100644
--- a/src/utils/mac/SampleApp-Info.plist
+++ b/src/views/mac/SampleApp-Info.plist
diff --git a/src/utils/mac/SampleApp.xib b/src/views/mac/SampleApp.xib
index 9549e4e473..9549e4e473 100644
--- a/src/utils/mac/SampleApp.xib
+++ b/src/views/mac/SampleApp.xib
diff --git a/src/utils/mac/SampleAppDelegate.h b/src/views/mac/SampleAppDelegate.h
index 8f2bead7bd..8f2bead7bd 100644
--- a/src/utils/mac/SampleAppDelegate.h
+++ b/src/views/mac/SampleAppDelegate.h
diff --git a/src/utils/mac/SampleAppDelegate.mm b/src/views/mac/SampleAppDelegate.mm
index 91dcada888..91dcada888 100644
--- a/src/utils/mac/SampleAppDelegate.mm
+++ b/src/views/mac/SampleAppDelegate.mm
diff --git a/src/utils/mac/SkEventNotifier.h b/src/views/mac/SkEventNotifier.h
index ea6bbf1e34..ea6bbf1e34 100644
--- a/src/utils/mac/SkEventNotifier.h
+++ b/src/views/mac/SkEventNotifier.h
diff --git a/src/utils/mac/SkEventNotifier.mm b/src/views/mac/SkEventNotifier.mm
index 0864380d95..0864380d95 100644
--- a/src/utils/mac/SkEventNotifier.mm
+++ b/src/views/mac/SkEventNotifier.mm
diff --git a/src/utils/mac/SkNSView.h b/src/views/mac/SkNSView.h
index 6b8989a713..6b8989a713 100644
--- a/src/utils/mac/SkNSView.h
+++ b/src/views/mac/SkNSView.h
diff --git a/src/utils/mac/SkNSView.mm b/src/views/mac/SkNSView.mm
index b520dd5f7f..b520dd5f7f 100644
--- a/src/utils/mac/SkNSView.mm
+++ b/src/views/mac/SkNSView.mm
diff --git a/src/utils/mac/SkOSWindow_Mac.cpp b/src/views/mac/SkOSWindow_Mac.cpp
index d41c9a75de..d41c9a75de 100644
--- a/src/utils/mac/SkOSWindow_Mac.cpp
+++ b/src/views/mac/SkOSWindow_Mac.cpp
diff --git a/src/utils/mac/SkOSWindow_Mac.mm b/src/views/mac/SkOSWindow_Mac.mm
index 7ac36d54a7..7ac36d54a7 100644
--- a/src/utils/mac/SkOSWindow_Mac.mm
+++ b/src/views/mac/SkOSWindow_Mac.mm
diff --git a/src/utils/mac/SkOptionsTableView.h b/src/views/mac/SkOptionsTableView.h
index 1f9b36a1b8..1f9b36a1b8 100644
--- a/src/utils/mac/SkOptionsTableView.h
+++ b/src/views/mac/SkOptionsTableView.h
diff --git a/src/utils/mac/SkOptionsTableView.mm b/src/views/mac/SkOptionsTableView.mm
index 41c7d4d791..41c7d4d791 100644
--- a/src/utils/mac/SkOptionsTableView.mm
+++ b/src/views/mac/SkOptionsTableView.mm
diff --git a/src/utils/mac/SkSampleNSView.h b/src/views/mac/SkSampleNSView.h
index d3aca9a735..d3aca9a735 100644
--- a/src/utils/mac/SkSampleNSView.h
+++ b/src/views/mac/SkSampleNSView.h
diff --git a/src/utils/mac/SkSampleNSView.mm b/src/views/mac/SkSampleNSView.mm
index 242544fa69..242544fa69 100644
--- a/src/utils/mac/SkSampleNSView.mm
+++ b/src/views/mac/SkSampleNSView.mm
diff --git a/src/utils/mac/SkTextFieldCell.h b/src/views/mac/SkTextFieldCell.h
index 93d0e4dedd..93d0e4dedd 100644
--- a/src/utils/mac/SkTextFieldCell.h
+++ b/src/views/mac/SkTextFieldCell.h
diff --git a/src/utils/mac/SkTextFieldCell.m b/src/views/mac/SkTextFieldCell.m
index 7aa094da88..7aa094da88 100644
--- a/src/utils/mac/SkTextFieldCell.m
+++ b/src/views/mac/SkTextFieldCell.m
diff --git a/src/utils/mac/skia_mac.mm b/src/views/mac/skia_mac.mm
index e3c31c40f6..e3c31c40f6 100644
--- a/src/utils/mac/skia_mac.mm
+++ b/src/views/mac/skia_mac.mm
diff --git a/src/utils/SDL/SkOSWindow_SDL.cpp b/src/views/sdl/SkOSWindow_SDL.cpp
index c2ba8b4349..c2ba8b4349 100644
--- a/src/utils/SDL/SkOSWindow_SDL.cpp
+++ b/src/views/sdl/SkOSWindow_SDL.cpp
diff --git a/src/utils/unix/SkOSWindow_Unix.cpp b/src/views/unix/SkOSWindow_Unix.cpp
index b4b0f17cd6..b4b0f17cd6 100644
--- a/src/utils/unix/SkOSWindow_Unix.cpp
+++ b/src/views/unix/SkOSWindow_Unix.cpp
diff --git a/src/utils/unix/keysym2ucs.c b/src/views/unix/keysym2ucs.c
index 520c6a7614..520c6a7614 100644
--- a/src/utils/unix/keysym2ucs.c
+++ b/src/views/unix/keysym2ucs.c
diff --git a/src/utils/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp
index c59821a172..c59821a172 100644
--- a/src/utils/win/SkOSWindow_win.cpp
+++ b/src/views/win/SkOSWindow_win.cpp
diff --git a/src/utils/win/skia_win.cpp b/src/views/win/skia_win.cpp
index 2643cc8799..2643cc8799 100644
--- a/src/utils/win/skia_win.cpp
+++ b/src/views/win/skia_win.cpp