parsepatch 0.3.1

# HG changeset patch
# User Lee Salzman <lsalzman@mozilla.com>
# Date 1438271489 14400
# Node ID b8802b591ce273baec00243ce338845741dee21d
# Parent  77261d1f603aec417ac659c560e41a3632909da0
Bug 1188462 - Rename gfx/skia/trunk directory to gfx/skia/skia. r=jrmuizel

diff --git a/CLOBBER b/CLOBBER
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 965151 needed a CLOBBER
+Bug 1188462 rearranged the skia directory.
diff --git a/gfx/skia/README_MOZILLA b/gfx/skia/README_MOZILLA
--- a/gfx/skia/README_MOZILLA
+++ b/gfx/skia/README_MOZILLA
@@ -1,12 +1,12 @@
 This is an import of Skia from 2014-07-28 (b1ab5fdd11bb358d738c1bfa63737dc65174a281)
 
 To update to a new version of Skia:
 
 - Clone Skia from upstream using the instructions here: https://sites.google.com/site/skiadocs/user-documentation/downloading
-- Copy the entire source tree from a Skia clone to mozilla-central/gfx/skia/trunk
+- Copy the entire source tree from a Skia clone to mozilla-central/gfx/skia/skia
 - cd gfx/skia && ./gyp_mozbuild
 
 Once that's done, use git status to view the files that have changed. Keep an eye on GrUserConfig.h
 and SkUserConfig.h as those probably don't want to be overwritten by upstream versions.
 
 This process will be made more automatic in the future.
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -26,59 +26,59 @@ header = """
 footer = """
 
 # can we find a better way of dealing with asm sources?
 
 # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
 #XXX: doesn't build with Apple's assembler
 if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['OS_TARGET'] != 'Darwin':
     SOURCES += [
-        'trunk/src/opts/memset.arm.S',
+        'skia/src/opts/memset.arm.S',
     ]
     if CONFIG['BUILD_ARM_NEON']:
         SOURCES += [
-            'trunk/src/opts/memset16_neon.S',
-            'trunk/src/opts/memset32_neon.S',
+            'skia/src/opts/memset16_neon.S',
+            'skia/src/opts/memset32_neon.S',
         ]
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC'] and CONFIG['OS_ARCH'] != 'WINNT':
     if CONFIG['CPU_ARCH'] == 'x86_64':
         SOURCES += [
-            'trunk/src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
+            'skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
         ]
     else:
         SOURCES += [
-            'trunk/src/opts/SkBlitRow_opts_SSE4_asm.S',
+            'skia/src/opts/SkBlitRow_opts_SSE4_asm.S',
         ]
 
 FINAL_LIBRARY = 'gkmedias'
 LOCAL_INCLUDES += [
-    'trunk/include/config',
-    'trunk/include/core',
-    'trunk/include/effects',
-    'trunk/include/gpu',
-    'trunk/include/images',
-    'trunk/include/pathops',
-    'trunk/include/pipe',
-    'trunk/include/ports',
-    'trunk/include/utils',
-    'trunk/include/utils/mac',
-    'trunk/include/utils/win',
-    'trunk/include/views',
-    'trunk/src/core',
-    'trunk/src/gpu',
-    'trunk/src/gpu/effects',
-    'trunk/src/gpu/gl',
-    'trunk/src/image',
-    'trunk/src/lazy',
-    'trunk/src/opts',
-    'trunk/src/sfnt',
-    'trunk/src/utils',
-    'trunk/src/utils/mac',
-    'trunk/src/utils/win',
+    'skia/include/config',
+    'skia/include/core',
+    'skia/include/effects',
+    'skia/include/gpu',
+    'skia/include/images',
+    'skia/include/pathops',
+    'skia/include/pipe',
+    'skia/include/ports',
+    'skia/include/utils',
+    'skia/include/utils/mac',
+    'skia/include/utils/win',
+    'skia/include/views',
+    'skia/src/core',
+    'skia/src/gpu',
+    'skia/src/gpu/effects',
+    'skia/src/gpu/gl',
+    'skia/src/image',
+    'skia/src/lazy',
+    'skia/src/opts',
+    'skia/src/sfnt',
+    'skia/src/utils',
+    'skia/src/utils/mac',
+    'skia/src/utils/win',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'android', 'gtk2', 'gtk3', 'qt', 'gonk', 'cocoa', 'uikit'}:
     DEFINES['SK_USE_POSIX_THREADS'] = 1
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
     DEFINES['SK_BUILD_SSSE3'] = 1
 
@@ -98,109 +98,109 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     DEFINES['SKIA_DLL'] = 1
     DEFINES['GR_DLL'] = 1
 
 # We should autogenerate these SSE related flags.
 
 if CONFIG['_MSC_VER']:
     # MSVC doesn't need special compiler flags, but Skia needs to be told that these files should
     # be built with the required SSE level or it will simply compile in stubs and cause runtime crashes
-    SOURCES['trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=31']
-    SOURCES['trunk/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=41']
-    SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=31']
+    SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=41']
+    SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']:
-    SOURCES['trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
-    SOURCES['trunk/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
-    SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
+    SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
     DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1
     DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0
 elif CONFIG['CLANG_CL']:
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
 
 DEFINES['SKIA_IMPLEMENTATION'] = 1
 DEFINES['GR_IMPLEMENTATION'] = 1
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
     ]
     if not CONFIG['CLANG_CXX']:
         CXXFLAGS += ['-Wno-logical-op']
     if CONFIG['CPU_ARCH'] == 'arm':
-        SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+        SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
 """
 
 import json
 
 platforms = ['linux', 'mac', 'android', 'win']
 
 custom_includes = {
-  'trunk/src/ports/SkAtomics_sync.h': True,
-  'trunk/src/ports/SkAtomics_win.h': True,
-  'trunk/src/ports/SkBarriers_x86.h': True,
-  'trunk/src/ports/SkBarriers_arm.h': True,
-  'trunk/src/ports/SkBarriers_tsan.h': True,
-  'trunk/src/ports/SkMutex_pthread.h': True,
-  'trunk/src/ports/SkMutex_win.h': True
+  'skia/src/ports/SkAtomics_sync.h': True,
+  'skia/src/ports/SkAtomics_win.h': True,
+  'skia/src/ports/SkBarriers_x86.h': True,
+  'skia/src/ports/SkBarriers_arm.h': True,
+  'skia/src/ports/SkBarriers_tsan.h': True,
+  'skia/src/ports/SkMutex_pthread.h': True,
+  'skia/src/ports/SkMutex_win.h': True
 }
 
 def generate_includes():
   includes = {}
-  for root, dirs, files in os.walk('trunk/include'):
+  for root, dirs, files in os.walk('skia/include'):
     for name in files:
       if name.endswith('.h'):
         includes[os.path.join(root, name)] = True
 
   return dict(includes.items() + custom_includes.items())
 
 def generate_opt_sources():
   opt_sources = {'opts': {''}}
-  for root, dirs, files in os.walk('trunk/src/opts'):
+  for root, dirs, files in os.walk('skia/src/opts'):
     for name in files:
       if name.endswith('.cpp'):
         opt_sources['opts'].add(os.path.join(root, name))
 
   return opt_sources
 
 def generate_platform_sources():
   sources = {}
 
   for plat in platforms:
-    if os.system("cd trunk && GYP_GENERATORS=dump_mozbuild ./gyp_skia -D OS=%s gyp/skia_lib.gyp" % plat) != 0:
+    if os.system("cd skia && GYP_GENERATORS=dump_mozbuild ./gyp_skia -D OS=%s gyp/skia_lib.gyp" % plat) != 0:
       print 'Failed to generate sources for ' + plat
       continue
 
 
-    f = open('trunk/sources.json');
-    sources[plat] = set(v.replace('../', 'trunk/') for v in json.load(f));
+    f = open('skia/sources.json');
+    sources[plat] = set(v.replace('../', 'skia/') for v in json.load(f));
     f.close()
 
   return dict(sources.items() + generate_opt_sources().items())
 
 
 def generate_separated_sources(platform_sources):
   blacklist = [
     'ChromeUtils',
@@ -237,58 +237,58 @@ def generate_separated_sources(platform_
     for item in blacklist:
       if value.find(item) >= 0:
         return True
 
     return False
 
   separated = defaultdict(set, {
     'common': {
-      #'trunk/src/effects/gradients/SkGradientTileProc.cpp',
-      'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
-      'trunk/src/ports/SkDiscardableMemory_none.cpp',
-      'trunk/src/ports/SkImageDecoder_empty.cpp',
-      'trunk/src/ports/SkMemory_mozalloc.cpp',
-      # 'trunk/src/images/SkImages.cpp',
-      # 'trunk/src/images/SkImageRef.cpp',
-      # 'trunk/src/images/SkImageRef_GlobalPool.cpp',
-      # 'trunk/src/images/SkImageRefPool.cpp',
-      # 'trunk/src/images/SkImageDecoder.cpp',
-      # 'trunk/src/images/SkImageDecoder_Factory.cpp',
+      #'skia/src/effects/gradients/SkGradientTileProc.cpp',
+      'skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
+      'skia/src/ports/SkDiscardableMemory_none.cpp',
+      'skia/src/ports/SkImageDecoder_empty.cpp',
+      'skia/src/ports/SkMemory_mozalloc.cpp',
+      # 'skia/src/images/SkImages.cpp',
+      # 'skia/src/images/SkImageRef.cpp',
+      # 'skia/src/images/SkImageRef_GlobalPool.cpp',
+      # 'skia/src/images/SkImageRefPool.cpp',
+      # 'skia/src/images/SkImageDecoder.cpp',
+      # 'skia/src/images/SkImageDecoder_Factory.cpp',
     },
     'android': {
-      # 'trunk/src/ports/SkDebug_android.cpp',
-      'trunk/src/ports/SkFontHost_android_old.cpp',
-      'trunk/src/ports/SkFontHost_cairo.cpp',
-      # 'trunk/src/ports/SkFontHost_FreeType.cpp',
-      # 'trunk/src/ports/SkFontHost_FreeType_common.cpp',
-      # 'trunk/src/ports/SkThread_pthread.cpp',
-      # 'trunk/src/ports/SkPurgeableMemoryBlock_android.cpp',
-      # 'trunk/src/ports/SkTime_Unix.cpp',
-      # 'trunk/src/utils/SkThreadUtils_pthread.cpp',
-      # 'trunk/src/images/SkImageRef_ashmem.cpp',
-      # 'trunk/src/utils/android/ashmem.cpp',
+      # 'skia/src/ports/SkDebug_android.cpp',
+      'skia/src/ports/SkFontHost_android_old.cpp',
+      'skia/src/ports/SkFontHost_cairo.cpp',
+      # 'skia/src/ports/SkFontHost_FreeType.cpp',
+      # 'skia/src/ports/SkFontHost_FreeType_common.cpp',
+      # 'skia/src/ports/SkThread_pthread.cpp',
+      # 'skia/src/ports/SkPurgeableMemoryBlock_android.cpp',
+      # 'skia/src/ports/SkTime_Unix.cpp',
+      # 'skia/src/utils/SkThreadUtils_pthread.cpp',
+      # 'skia/src/images/SkImageRef_ashmem.cpp',
+      # 'skia/src/utils/android/ashmem.cpp',
     },
     'linux': {
-      'trunk/src/ports/SkFontHost_cairo.cpp',
+      'skia/src/ports/SkFontHost_cairo.cpp',
     },
     'intel': {
       # There is currently no x86-specific opt for SkTextureCompression
-      'trunk/src/opts/opts_check_x86.cpp',
-      'trunk/src/opts/SkTextureCompression_opts_none.cpp',
+      'skia/src/opts/opts_check_x86.cpp',
+      'skia/src/opts/SkTextureCompression_opts_none.cpp',
     },
     'arm': {
-      'trunk/src/opts/SkUtils_opts_arm.cpp',
-      'trunk/src/core/SkUtilsArm.cpp',
+      'skia/src/opts/SkUtils_opts_arm.cpp',
+      'skia/src/core/SkUtilsArm.cpp',
     },
     'neon': {
-      'trunk/src/opts/SkBitmapProcState_arm_neon.cpp',
+      'skia/src/opts/SkBitmapProcState_arm_neon.cpp',
     },
     'none': {
-      'trunk/src/opts/SkUtils_opts_none.cpp',
+      'skia/src/opts/SkUtils_opts_none.cpp',
     }
   })
 
   for plat in platform_sources.keys():
     for value in platform_sources[plat]:
       if isblacklisted(value):
         continue
 
diff --git a/gfx/skia/gyp_mozbuild b/gfx/skia/gyp_mozbuild
--- a/gfx/skia/gyp_mozbuild
+++ b/gfx/skia/gyp_mozbuild
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Install our generator
-cp dump_mozbuild.py trunk/third_party/externals/gyp/pylib/gyp/generator
+cp dump_mozbuild.py skia/third_party/externals/gyp/pylib/gyp/generator
 
-# pushd trunk
+# pushd skia
 # for OS in win linux mac; do
 #     GYP_GENERATORS=dump_mozbuild ./gyp_skia -D OS=$OS -D arm_neon=0 gyp/effects.gyp
 # done
 # popd
 
 ./generate_mozbuild.py
 
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -9,908 +9,908 @@
 # # #####   #######        #     #   ## ##   #     #     #      ###
 #
 # Seriously. You shouldn't even be looking at this file unless you're
 # debugging generate_mozbuild.py.
 #
 # DO NOT MODIFY THIS FILE IT IS AUTOGENERATED.
 #
 EXPORTS.skia += [
-    'trunk/include/animator/SkAnimator.h',
-    'trunk/include/animator/SkAnimatorView.h',
-    'trunk/include/config/SkUserConfig.h',
-    'trunk/include/core/SkAdvancedTypefaceMetrics.h',
-    'trunk/include/core/SkAnnotation.h',
-    'trunk/include/core/SkBBHFactory.h',
-    'trunk/include/core/SkBitmap.h',
-    'trunk/include/core/SkBitmapDevice.h',
-    'trunk/include/core/SkBlitRow.h',
-    'trunk/include/core/SkBlurTypes.h',
-    'trunk/include/core/SkCanvas.h',
-    'trunk/include/core/SkChunkAlloc.h',
-    'trunk/include/core/SkClipStack.h',
-    'trunk/include/core/SkColor.h',
-    'trunk/include/core/SkColorFilter.h',
-    'trunk/include/core/SkColorPriv.h',
-    'trunk/include/core/SkColorShader.h',
-    'trunk/include/core/SkColorTable.h',
-    'trunk/include/core/SkComposeShader.h',
-    'trunk/include/core/SkData.h',
-    'trunk/include/core/SkDataTable.h',
-    'trunk/include/core/SkDeque.h',
-    'trunk/include/core/SkDevice.h',
-    'trunk/include/core/SkDeviceProperties.h',
-    'trunk/include/core/SkDither.h',
-    'trunk/include/core/SkDocument.h',
-    'trunk/include/core/SkDraw.h',
-    'trunk/include/core/SkDrawFilter.h',
-    'trunk/include/core/SkDrawLooper.h',
-    'trunk/include/core/SkDrawPictureCallback.h',
-    'trunk/include/core/SkDynamicAnnotations.h',
-    'trunk/include/core/SkEndian.h',
-    'trunk/include/core/SkError.h',
-    'trunk/include/core/SkFixed.h',
-    'trunk/include/core/SkFlattenable.h',
-    'trunk/include/core/SkFlattenableBuffers.h',
-    'trunk/include/core/SkFlattenableSerialization.h',
-    'trunk/include/core/SkFloatBits.h',
-    'trunk/include/core/SkFloatingPoint.h',
-    'trunk/include/core/SkFont.h',
-    'trunk/include/core/SkFontHost.h',
-    'trunk/include/core/SkFontLCDConfig.h',
-    'trunk/include/core/SkGraphics.h',
-    'trunk/include/core/SkImage.h',
-    'trunk/include/core/SkImageDecoder.h',
-    'trunk/include/core/SkImageEncoder.h',
-    'trunk/include/core/SkImageFilter.h',
-    'trunk/include/core/SkImageGenerator.h',
-    'trunk/include/core/SkImageInfo.h',
-    'trunk/include/core/SkInstCnt.h',
-    'trunk/include/core/SkMallocPixelRef.h',
-    'trunk/include/core/SkMask.h',
-    'trunk/include/core/SkMaskFilter.h',
-    'trunk/include/core/SkMath.h',
-    'trunk/include/core/SkMatrix.h',
-    'trunk/include/core/SkMetaData.h',
-    'trunk/include/core/SkOnce.h',
-    'trunk/include/core/SkOSFile.h',
-    'trunk/include/core/SkPackBits.h',
-    'trunk/include/core/SkPaint.h',
-    'trunk/include/core/SkPaintOptionsAndroid.h',
-    'trunk/include/core/SkPatch.h',
-    'trunk/include/core/SkPath.h',
-    'trunk/include/core/SkPathEffect.h',
-    'trunk/include/core/SkPathMeasure.h',
-    'trunk/include/core/SkPathRef.h',
-    'trunk/include/core/SkPicture.h',
-    'trunk/include/core/SkPictureRecorder.h',
-    'trunk/include/core/SkPixelRef.h',
-    'trunk/include/core/SkPoint.h',
-    'trunk/include/core/SkPostConfig.h',
-    'trunk/include/core/SkPreConfig.h',
-    'trunk/include/core/SkRasterizer.h',
-    'trunk/include/core/SkReadBuffer.h',
-    'trunk/include/core/SkReader32.h',
-    'trunk/include/core/SkRect.h',
-    'trunk/include/core/SkRefCnt.h',
-    'trunk/include/core/SkRegion.h',
-    'trunk/include/core/SkRRect.h',
-    'trunk/include/core/SkScalar.h',
-    'trunk/include/core/SkShader.h',
-    'trunk/include/core/SkSize.h',
-    'trunk/include/core/SkStream.h',
-    'trunk/include/core/SkString.h',
-    'trunk/include/core/SkStrokeRec.h',
-    'trunk/include/core/SkSurface.h',
-    'trunk/include/core/SkTArray.h',
-    'trunk/include/core/SkTDArray.h',
-    'trunk/include/core/SkTDict.h',
-    'trunk/include/core/SkTDStack.h',
-    'trunk/include/core/SkTemplates.h',
-    'trunk/include/core/SkThread.h',
-    'trunk/include/core/SkTime.h',
-    'trunk/include/core/SkTInternalLList.h',
-    'trunk/include/core/SkTLazy.h',
-    'trunk/include/core/SkTRegistry.h',
-    'trunk/include/core/SkTSearch.h',
-    'trunk/include/core/SkTypeface.h',
-    'trunk/include/core/SkTypes.h',
-    'trunk/include/core/SkUnPreMultiply.h',
-    'trunk/include/core/SkUtils.h',
-    'trunk/include/core/SkWeakRefCnt.h',
-    'trunk/include/core/SkWriteBuffer.h',
-    'trunk/include/core/SkWriter32.h',
-    'trunk/include/core/SkXfermode.h',
-    'trunk/include/device/xps/SkConstexprMath.h',
-    'trunk/include/device/xps/SkXPSDevice.h',
-    'trunk/include/effects/Sk1DPathEffect.h',
-    'trunk/include/effects/Sk2DPathEffect.h',
-    'trunk/include/effects/SkAlphaThresholdFilter.h',
-    'trunk/include/effects/SkArithmeticMode.h',
-    'trunk/include/effects/SkAvoidXfermode.h',
-    'trunk/include/effects/SkBitmapSource.h',
-    'trunk/include/effects/SkBlurDrawLooper.h',
-    'trunk/include/effects/SkBlurImageFilter.h',
-    'trunk/include/effects/SkBlurMaskFilter.h',
-    'trunk/include/effects/SkColorFilterImageFilter.h',
-    'trunk/include/effects/SkColorMatrix.h',
-    'trunk/include/effects/SkColorMatrixFilter.h',
-    'trunk/include/effects/SkComposeImageFilter.h',
-    'trunk/include/effects/SkCornerPathEffect.h',
-    'trunk/include/effects/SkDashPathEffect.h',
-    'trunk/include/effects/SkDiscretePathEffect.h',
-    'trunk/include/effects/SkDisplacementMapEffect.h',
-    'trunk/include/effects/SkDrawExtraPathEffect.h',
-    'trunk/include/effects/SkDropShadowImageFilter.h',
-    'trunk/include/effects/SkEmbossMaskFilter.h',
-    'trunk/include/effects/SkGradientShader.h',
-    'trunk/include/effects/SkLayerDrawLooper.h',
-    'trunk/include/effects/SkLayerRasterizer.h',
-    'trunk/include/effects/SkLerpXfermode.h',
-    'trunk/include/effects/SkLightingImageFilter.h',
-    'trunk/include/effects/SkLumaColorFilter.h',
-    'trunk/include/effects/SkMagnifierImageFilter.h',
-    'trunk/include/effects/SkMatrixConvolutionImageFilter.h',
-    'trunk/include/effects/SkMatrixImageFilter.h',
-    'trunk/include/effects/SkMergeImageFilter.h',
-    'trunk/include/effects/SkMorphologyImageFilter.h',
-    'trunk/include/effects/SkOffsetImageFilter.h',
-    'trunk/include/effects/SkPaintFlagsDrawFilter.h',
-    'trunk/include/effects/SkPerlinNoiseShader.h',
-    'trunk/include/effects/SkPictureImageFilter.h',
-    'trunk/include/effects/SkPixelXorXfermode.h',
-    'trunk/include/effects/SkPorterDuff.h',
-    'trunk/include/effects/SkRectShaderImageFilter.h',
-    'trunk/include/effects/SkStippleMaskFilter.h',
-    'trunk/include/effects/SkTableColorFilter.h',
-    'trunk/include/effects/SkTableMaskFilter.h',
-    'trunk/include/effects/SkTestImageFilters.h',
-    'trunk/include/effects/SkTileImageFilter.h',
-    'trunk/include/effects/SkTransparentShader.h',
-    'trunk/include/effects/SkXfermodeImageFilter.h',
-    'trunk/include/gpu/gl/GrGLConfig.h',
-    'trunk/include/gpu/gl/GrGLConfig_chrome.h',
-    'trunk/include/gpu/gl/GrGLExtensions.h',
-    'trunk/include/gpu/gl/GrGLFunctions.h',
-    'trunk/include/gpu/gl/GrGLInterface.h',
-    'trunk/include/gpu/gl/SkANGLEGLContext.h',
-    'trunk/include/gpu/gl/SkDebugGLContext.h',
-    'trunk/include/gpu/gl/SkGLContextHelper.h',
-    'trunk/include/gpu/gl/SkMesaGLContext.h',
-    'trunk/include/gpu/gl/SkNativeGLContext.h',
-    'trunk/include/gpu/gl/SkNullGLContext.h',
-    'trunk/include/gpu/GrBackendEffectFactory.h',
-    'trunk/include/gpu/GrClipData.h',
-    'trunk/include/gpu/GrColor.h',
-    'trunk/include/gpu/GrConfig.h',
-    'trunk/include/gpu/GrContext.h',
-    'trunk/include/gpu/GrContextFactory.h',
-    'trunk/include/gpu/GrCoordTransform.h',
-    'trunk/include/gpu/GrDrawEffect.h',
-    'trunk/include/gpu/GrEffect.h',
-    'trunk/include/gpu/GrEffectStage.h',
-    'trunk/include/gpu/GrEffectUnitTest.h',
-    'trunk/include/gpu/GrFontScaler.h',
-    'trunk/include/gpu/GrGlyph.h',
-    'trunk/include/gpu/GrGpuResource.h',
-    'trunk/include/gpu/GrPaint.h',
-    'trunk/include/gpu/GrPathRendererChain.h',
-    'trunk/include/gpu/GrRect.h',
-    'trunk/include/gpu/GrRenderTarget.h',
-    'trunk/include/gpu/GrSurface.h',
-    'trunk/include/gpu/GrTBackendEffectFactory.h',
-    'trunk/include/gpu/GrTexture.h',
-    'trunk/include/gpu/GrTextureAccess.h',
-    'trunk/include/gpu/GrTypes.h',
-    'trunk/include/gpu/GrTypesPriv.h',
-    'trunk/include/gpu/GrUserConfig.h',
-    'trunk/include/gpu/SkGpuDevice.h',
-    'trunk/include/gpu/SkGr.h',
-    'trunk/include/gpu/SkGrPixelRef.h',
-    'trunk/include/gpu/SkGrTexturePixelRef.h',
-    'trunk/include/images/SkDecodingImageGenerator.h',
-    'trunk/include/images/SkForceLinking.h',
-    'trunk/include/images/SkMovie.h',
-    'trunk/include/images/SkPageFlipper.h',
-    'trunk/include/pathops/SkPathOps.h',
-    'trunk/include/pdf/SkPDFDevice.h',
-    'trunk/include/pdf/SkPDFDocument.h',
-    'trunk/include/pipe/SkGPipe.h',
-    'trunk/include/ports/SkFontConfigInterface.h',
-    'trunk/include/ports/SkFontMgr.h',
-    'trunk/include/ports/SkFontMgr_indirect.h',
-    'trunk/include/ports/SkFontStyle.h',
-    'trunk/include/ports/SkRemotableFontMgr.h',
-    'trunk/include/ports/SkTypeface_android.h',
-    'trunk/include/ports/SkTypeface_cairo.h',
-    'trunk/include/ports/SkTypeface_mac.h',
-    'trunk/include/ports/SkTypeface_win.h',
-    'trunk/include/record/SkRecording.h',
-    'trunk/include/svg/SkSVGAttribute.h',
-    'trunk/include/svg/SkSVGBase.h',
-    'trunk/include/svg/SkSVGPaintState.h',
-    'trunk/include/svg/SkSVGParser.h',
-    'trunk/include/svg/SkSVGTypes.h',
-    'trunk/include/utils/ios/SkStream_NSData.h',
-    'trunk/include/utils/mac/SkCGUtils.h',
-    'trunk/include/utils/SkBoundaryPatch.h',
-    'trunk/include/utils/SkCamera.h',
-    'trunk/include/utils/SkCanvasStateUtils.h',
-    'trunk/include/utils/SkCondVar.h',
-    'trunk/include/utils/SkCubicInterval.h',
-    'trunk/include/utils/SkCullPoints.h',
-    'trunk/include/utils/SkDebugUtils.h',
-    'trunk/include/utils/SkDeferredCanvas.h',
-    'trunk/include/utils/SkDumpCanvas.h',
-    'trunk/include/utils/SkEventTracer.h',
-    'trunk/include/utils/SkFrontBufferedStream.h',
-    'trunk/include/utils/SkInterpolator.h',
-    'trunk/include/utils/SkJSONCPP.h',
-    'trunk/include/utils/SkLayer.h',
-    'trunk/include/utils/SkLua.h',
-    'trunk/include/utils/SkLuaCanvas.h',
-    'trunk/include/utils/SkMatrix44.h',
-    'trunk/include/utils/SkMeshUtils.h',
-    'trunk/include/utils/SkNinePatch.h',
-    'trunk/include/utils/SkNoSaveLayerCanvas.h',
-    'trunk/include/utils/SkNullCanvas.h',
-    'trunk/include/utils/SkNWayCanvas.h',
-    'trunk/include/utils/SkParse.h',
-    'trunk/include/utils/SkParsePaint.h',
-    'trunk/include/utils/SkParsePath.h',
-    'trunk/include/utils/SkPathUtils.h',
-    'trunk/include/utils/SkPictureUtils.h',
-    'trunk/include/utils/SkProxyCanvas.h',
-    'trunk/include/utils/SkRandom.h',
-    'trunk/include/utils/SkRTConf.h',
-    'trunk/include/utils/SkRunnable.h',
-    'trunk/include/utils/SkThreadPool.h',
-    'trunk/include/utils/SkWGL.h',
-    'trunk/include/utils/win/SkAutoCoInitialize.h',
-    'trunk/include/utils/win/SkHRESULT.h',
-    'trunk/include/utils/win/SkIStream.h',
-    'trunk/include/utils/win/SkTScopedComPtr.h',
-    'trunk/include/views/android/AndroidKeyToSkKey.h',
-    'trunk/include/views/animated/SkBorderView.h',
-    'trunk/include/views/animated/SkImageView.h',
-    'trunk/include/views/animated/SkProgressBarView.h',
-    'trunk/include/views/animated/SkScrollBarView.h',
-    'trunk/include/views/animated/SkWidgetViews.h',
-    'trunk/include/views/SkApplication.h',
-    'trunk/include/views/SkBGViewArtist.h',
-    'trunk/include/views/SkEvent.h',
-    'trunk/include/views/SkEventSink.h',
-    'trunk/include/views/SkKey.h',
-    'trunk/include/views/SkOSMenu.h',
-    'trunk/include/views/SkOSWindow_Android.h',
-    'trunk/include/views/SkOSWindow_iOS.h',
-    'trunk/include/views/SkOSWindow_Mac.h',
-    'trunk/include/views/SkOSWindow_NaCl.h',
-    'trunk/include/views/SkOSWindow_SDL.h',
-    'trunk/include/views/SkOSWindow_Unix.h',
-    'trunk/include/views/SkOSWindow_Win.h',
-    'trunk/include/views/SkStackViewLayout.h',
-    'trunk/include/views/SkSystemEventTypes.h',
-    'trunk/include/views/SkTextBox.h',
-    'trunk/include/views/SkTouchGesture.h',
-    'trunk/include/views/SkView.h',
-    'trunk/include/views/SkViewInflate.h',
-    'trunk/include/views/SkWidget.h',
-    'trunk/include/views/SkWindow.h',
-    'trunk/include/views/unix/keysym2ucs.h',
-    'trunk/include/views/unix/XkeysToSkKeys.h',
-    'trunk/include/xml/SkBML_WXMLParser.h',
-    'trunk/include/xml/SkBML_XMLParser.h',
-    'trunk/include/xml/SkDOM.h',
-    'trunk/include/xml/SkJS.h',
-    'trunk/include/xml/SkXMLParser.h',
-    'trunk/include/xml/SkXMLWriter.h',
-    'trunk/src/ports/SkAtomics_sync.h',
-    'trunk/src/ports/SkAtomics_win.h',
-    'trunk/src/ports/SkBarriers_arm.h',
-    'trunk/src/ports/SkBarriers_tsan.h',
-    'trunk/src/ports/SkBarriers_x86.h',
-    'trunk/src/ports/SkMutex_pthread.h',
-    'trunk/src/ports/SkMutex_win.h',
+    'skia/include/animator/SkAnimator.h',
+    'skia/include/animator/SkAnimatorView.h',
+    'skia/include/config/SkUserConfig.h',
+    'skia/include/core/SkAdvancedTypefaceMetrics.h',
+    'skia/include/core/SkAnnotation.h',
+    'skia/include/core/SkBBHFactory.h',
+    'skia/include/core/SkBitmap.h',
+    'skia/include/core/SkBitmapDevice.h',
+    'skia/include/core/SkBlitRow.h',
+    'skia/include/core/SkBlurTypes.h',
+    'skia/include/core/SkCanvas.h',
+    'skia/include/core/SkChunkAlloc.h',
+    'skia/include/core/SkClipStack.h',
+    'skia/include/core/SkColor.h',
+    'skia/include/core/SkColorFilter.h',
+    'skia/include/core/SkColorPriv.h',
+    'skia/include/core/SkColorShader.h',
+    'skia/include/core/SkColorTable.h',
+    'skia/include/core/SkComposeShader.h',
+    'skia/include/core/SkData.h',
+    'skia/include/core/SkDataTable.h',
+    'skia/include/core/SkDeque.h',
+    'skia/include/core/SkDevice.h',
+    'skia/include/core/SkDeviceProperties.h',
+    'skia/include/core/SkDither.h',
+    'skia/include/core/SkDocument.h',
+    'skia/include/core/SkDraw.h',
+    'skia/include/core/SkDrawFilter.h',
+    'skia/include/core/SkDrawLooper.h',
+    'skia/include/core/SkDrawPictureCallback.h',
+    'skia/include/core/SkDynamicAnnotations.h',
+    'skia/include/core/SkEndian.h',
+    'skia/include/core/SkError.h',
+    'skia/include/core/SkFixed.h',
+    'skia/include/core/SkFlattenable.h',
+    'skia/include/core/SkFlattenableBuffers.h',
+    'skia/include/core/SkFlattenableSerialization.h',
+    'skia/include/core/SkFloatBits.h',
+    'skia/include/core/SkFloatingPoint.h',
+    'skia/include/core/SkFont.h',
+    'skia/include/core/SkFontHost.h',
+    'skia/include/core/SkFontLCDConfig.h',
+    'skia/include/core/SkGraphics.h',
+    'skia/include/core/SkImage.h',
+    'skia/include/core/SkImageDecoder.h',
+    'skia/include/core/SkImageEncoder.h',
+    'skia/include/core/SkImageFilter.h',
+    'skia/include/core/SkImageGenerator.h',
+    'skia/include/core/SkImageInfo.h',
+    'skia/include/core/SkInstCnt.h',
+    'skia/include/core/SkMallocPixelRef.h',
+    'skia/include/core/SkMask.h',
+    'skia/include/core/SkMaskFilter.h',
+    'skia/include/core/SkMath.h',
+    'skia/include/core/SkMatrix.h',
+    'skia/include/core/SkMetaData.h',
+    'skia/include/core/SkOnce.h',
+    'skia/include/core/SkOSFile.h',
+    'skia/include/core/SkPackBits.h',
+    'skia/include/core/SkPaint.h',
+    'skia/include/core/SkPaintOptionsAndroid.h',
+    'skia/include/core/SkPatch.h',
+    'skia/include/core/SkPath.h',
+    'skia/include/core/SkPathEffect.h',
+    'skia/include/core/SkPathMeasure.h',
+    'skia/include/core/SkPathRef.h',
+    'skia/include/core/SkPicture.h',
+    'skia/include/core/SkPictureRecorder.h',
+    'skia/include/core/SkPixelRef.h',
+    'skia/include/core/SkPoint.h',
+    'skia/include/core/SkPostConfig.h',
+    'skia/include/core/SkPreConfig.h',
+    'skia/include/core/SkRasterizer.h',
+    'skia/include/core/SkReadBuffer.h',
+    'skia/include/core/SkReader32.h',
+    'skia/include/core/SkRect.h',
+    'skia/include/core/SkRefCnt.h',
+    'skia/include/core/SkRegion.h',
+    'skia/include/core/SkRRect.h',
+    'skia/include/core/SkScalar.h',
+    'skia/include/core/SkShader.h',
+    'skia/include/core/SkSize.h',
+    'skia/include/core/SkStream.h',
+    'skia/include/core/SkString.h',
+    'skia/include/core/SkStrokeRec.h',
+    'skia/include/core/SkSurface.h',
+    'skia/include/core/SkTArray.h',
+    'skia/include/core/SkTDArray.h',
+    'skia/include/core/SkTDict.h',
+    'skia/include/core/SkTDStack.h',
+    'skia/include/core/SkTemplates.h',
+    'skia/include/core/SkThread.h',
+    'skia/include/core/SkTime.h',
+    'skia/include/core/SkTInternalLList.h',
+    'skia/include/core/SkTLazy.h',
+    'skia/include/core/SkTRegistry.h',
+    'skia/include/core/SkTSearch.h',
+    'skia/include/core/SkTypeface.h',
+    'skia/include/core/SkTypes.h',
+    'skia/include/core/SkUnPreMultiply.h',
+    'skia/include/core/SkUtils.h',
+    'skia/include/core/SkWeakRefCnt.h',
+    'skia/include/core/SkWriteBuffer.h',
+    'skia/include/core/SkWriter32.h',
+    'skia/include/core/SkXfermode.h',
+    'skia/include/device/xps/SkConstexprMath.h',
+    'skia/include/device/xps/SkXPSDevice.h',
+    'skia/include/effects/Sk1DPathEffect.h',
+    'skia/include/effects/Sk2DPathEffect.h',
+    'skia/include/effects/SkAlphaThresholdFilter.h',
+    'skia/include/effects/SkArithmeticMode.h',
+    'skia/include/effects/SkAvoidXfermode.h',
+    'skia/include/effects/SkBitmapSource.h',
+    'skia/include/effects/SkBlurDrawLooper.h',
+    'skia/include/effects/SkBlurImageFilter.h',
+    'skia/include/effects/SkBlurMaskFilter.h',
+    'skia/include/effects/SkColorFilterImageFilter.h',
+    'skia/include/effects/SkColorMatrix.h',
+    'skia/include/effects/SkColorMatrixFilter.h',
+    'skia/include/effects/SkComposeImageFilter.h',
+    'skia/include/effects/SkCornerPathEffect.h',
+    'skia/include/effects/SkDashPathEffect.h',
+    'skia/include/effects/SkDiscretePathEffect.h',
+    'skia/include/effects/SkDisplacementMapEffect.h',
+    'skia/include/effects/SkDrawExtraPathEffect.h',
+    'skia/include/effects/SkDropShadowImageFilter.h',
+    'skia/include/effects/SkEmbossMaskFilter.h',
+    'skia/include/effects/SkGradientShader.h',
+    'skia/include/effects/SkLayerDrawLooper.h',
+    'skia/include/effects/SkLayerRasterizer.h',
+    'skia/include/effects/SkLerpXfermode.h',
+    'skia/include/effects/SkLightingImageFilter.h',
+    'skia/include/effects/SkLumaColorFilter.h',
+    'skia/include/effects/SkMagnifierImageFilter.h',
+    'skia/include/effects/SkMatrixConvolutionImageFilter.h',
+    'skia/include/effects/SkMatrixImageFilter.h',
+    'skia/include/effects/SkMergeImageFilter.h',
+    'skia/include/effects/SkMorphologyImageFilter.h',
+    'skia/include/effects/SkOffsetImageFilter.h',
+    'skia/include/effects/SkPaintFlagsDrawFilter.h',
+    'skia/include/effects/SkPerlinNoiseShader.h',
+    'skia/include/effects/SkPictureImageFilter.h',
+    'skia/include/effects/SkPixelXorXfermode.h',
+    'skia/include/effects/SkPorterDuff.h',
+    'skia/include/effects/SkRectShaderImageFilter.h',
+    'skia/include/effects/SkStippleMaskFilter.h',
+    'skia/include/effects/SkTableColorFilter.h',
+    'skia/include/effects/SkTableMaskFilter.h',
+    'skia/include/effects/SkTestImageFilters.h',
+    'skia/include/effects/SkTileImageFilter.h',
+    'skia/include/effects/SkTransparentShader.h',
+    'skia/include/effects/SkXfermodeImageFilter.h',
+    'skia/include/gpu/gl/GrGLConfig.h',
+    'skia/include/gpu/gl/GrGLConfig_chrome.h',
+    'skia/include/gpu/gl/GrGLExtensions.h',
+    'skia/include/gpu/gl/GrGLFunctions.h',
+    'skia/include/gpu/gl/GrGLInterface.h',
+    'skia/include/gpu/gl/SkANGLEGLContext.h',
+    'skia/include/gpu/gl/SkDebugGLContext.h',
+    'skia/include/gpu/gl/SkGLContextHelper.h',
+    'skia/include/gpu/gl/SkMesaGLContext.h',
+    'skia/include/gpu/gl/SkNativeGLContext.h',
+    'skia/include/gpu/gl/SkNullGLContext.h',
+    'skia/include/gpu/GrBackendEffectFactory.h',
+    'skia/include/gpu/GrClipData.h',
+    'skia/include/gpu/GrColor.h',
+    'skia/include/gpu/GrConfig.h',
+    'skia/include/gpu/GrContext.h',
+    'skia/include/gpu/GrContextFactory.h',
+    'skia/include/gpu/GrCoordTransform.h',
+    'skia/include/gpu/GrDrawEffect.h',
+    'skia/include/gpu/GrEffect.h',
+    'skia/include/gpu/GrEffectStage.h',
+    'skia/include/gpu/GrEffectUnitTest.h',
+    'skia/include/gpu/GrFontScaler.h',
+    'skia/include/gpu/GrGlyph.h',
+    'skia/include/gpu/GrGpuResource.h',
+    'skia/include/gpu/GrPaint.h',
+    'skia/include/gpu/GrPathRendererChain.h',
+    'skia/include/gpu/GrRect.h',
+    'skia/include/gpu/GrRenderTarget.h',
+    'skia/include/gpu/GrSurface.h',
+    'skia/include/gpu/GrTBackendEffectFactory.h',
+    'skia/include/gpu/GrTexture.h',
+    'skia/include/gpu/GrTextureAccess.h',
+    'skia/include/gpu/GrTypes.h',
+    'skia/include/gpu/GrTypesPriv.h',
+    'skia/include/gpu/GrUserConfig.h',
+    'skia/include/gpu/SkGpuDevice.h',
+    'skia/include/gpu/SkGr.h',
+    'skia/include/gpu/SkGrPixelRef.h',
+    'skia/include/gpu/SkGrTexturePixelRef.h',
+    'skia/include/images/SkDecodingImageGenerator.h',
+    'skia/include/images/SkForceLinking.h',
+    'skia/include/images/SkMovie.h',
+    'skia/include/images/SkPageFlipper.h',
+    'skia/include/pathops/SkPathOps.h',
+    'skia/include/pdf/SkPDFDevice.h',
+    'skia/include/pdf/SkPDFDocument.h',
+    'skia/include/pipe/SkGPipe.h',
+    'skia/include/ports/SkFontConfigInterface.h',
+    'skia/include/ports/SkFontMgr.h',
+    'skia/include/ports/SkFontMgr_indirect.h',
+    'skia/include/ports/SkFontStyle.h',
+    'skia/include/ports/SkRemotableFontMgr.h',
+    'skia/include/ports/SkTypeface_android.h',
+    'skia/include/ports/SkTypeface_cairo.h',
+    'skia/include/ports/SkTypeface_mac.h',
+    'skia/include/ports/SkTypeface_win.h',
+    'skia/include/record/SkRecording.h',
+    'skia/include/svg/SkSVGAttribute.h',
+    'skia/include/svg/SkSVGBase.h',
+    'skia/include/svg/SkSVGPaintState.h',
+    'skia/include/svg/SkSVGParser.h',
+    'skia/include/svg/SkSVGTypes.h',
+    'skia/include/utils/ios/SkStream_NSData.h',
+    'skia/include/utils/mac/SkCGUtils.h',
+    'skia/include/utils/SkBoundaryPatch.h',
+    'skia/include/utils/SkCamera.h',
+    'skia/include/utils/SkCanvasStateUtils.h',
+    'skia/include/utils/SkCondVar.h',
+    'skia/include/utils/SkCubicInterval.h',
+    'skia/include/utils/SkCullPoints.h',
+    'skia/include/utils/SkDebugUtils.h',
+    'skia/include/utils/SkDeferredCanvas.h',
+    'skia/include/utils/SkDumpCanvas.h',
+    'skia/include/utils/SkEventTracer.h',
+    'skia/include/utils/SkFrontBufferedStream.h',
+    'skia/include/utils/SkInterpolator.h',
+    'skia/include/utils/SkJSONCPP.h',
+    'skia/include/utils/SkLayer.h',
+    'skia/include/utils/SkLua.h',
+    'skia/include/utils/SkLuaCanvas.h',
+    'skia/include/utils/SkMatrix44.h',
+    'skia/include/utils/SkMeshUtils.h',
+    'skia/include/utils/SkNinePatch.h',
+    'skia/include/utils/SkNoSaveLayerCanvas.h',
+    'skia/include/utils/SkNullCanvas.h',
+    'skia/include/utils/SkNWayCanvas.h',
+    'skia/include/utils/SkParse.h',
+    'skia/include/utils/SkParsePaint.h',
+    'skia/include/utils/SkParsePath.h',
+    'skia/include/utils/SkPathUtils.h',
+    'skia/include/utils/SkPictureUtils.h',
+    'skia/include/utils/SkProxyCanvas.h',
+    'skia/include/utils/SkRandom.h',
+    'skia/include/utils/SkRTConf.h',
+    'skia/include/utils/SkRunnable.h',
+    'skia/include/utils/SkThreadPool.h',
+    'skia/include/utils/SkWGL.h',
+    'skia/include/utils/win/SkAutoCoInitialize.h',
+    'skia/include/utils/win/SkHRESULT.h',
+    'skia/include/utils/win/SkIStream.h',
+    'skia/include/utils/win/SkTScopedComPtr.h',
+    'skia/include/views/android/AndroidKeyToSkKey.h',
+    'skia/include/views/animated/SkBorderView.h',
+    'skia/include/views/animated/SkImageView.h',
+    'skia/include/views/animated/SkProgressBarView.h',
+    'skia/include/views/animated/SkScrollBarView.h',
+    'skia/include/views/animated/SkWidgetViews.h',
+    'skia/include/views/SkApplication.h',
+    'skia/include/views/SkBGViewArtist.h',
+    'skia/include/views/SkEvent.h',
+    'skia/include/views/SkEventSink.h',
+    'skia/include/views/SkKey.h',
+    'skia/include/views/SkOSMenu.h',
+    'skia/include/views/SkOSWindow_Android.h',
+    'skia/include/views/SkOSWindow_iOS.h',
+    'skia/include/views/SkOSWindow_Mac.h',
+    'skia/include/views/SkOSWindow_NaCl.h',
+    'skia/include/views/SkOSWindow_SDL.h',
+    'skia/include/views/SkOSWindow_Unix.h',
+    'skia/include/views/SkOSWindow_Win.h',
+    'skia/include/views/SkStackViewLayout.h',
+    'skia/include/views/SkSystemEventTypes.h',
+    'skia/include/views/SkTextBox.h',
+    'skia/include/views/SkTouchGesture.h',
+    'skia/include/views/SkView.h',
+    'skia/include/views/SkViewInflate.h',
+    'skia/include/views/SkWidget.h',
+    'skia/include/views/SkWindow.h',
+    'skia/include/views/unix/keysym2ucs.h',
+    'skia/include/views/unix/XkeysToSkKeys.h',
+    'skia/include/xml/SkBML_WXMLParser.h',
+    'skia/include/xml/SkBML_XMLParser.h',
+    'skia/include/xml/SkDOM.h',
+    'skia/include/xml/SkJS.h',
+    'skia/include/xml/SkXMLParser.h',
+    'skia/include/xml/SkXMLWriter.h',
+    'skia/src/ports/SkAtomics_sync.h',
+    'skia/src/ports/SkAtomics_win.h',
+    'skia/src/ports/SkBarriers_arm.h',
+    'skia/src/ports/SkBarriers_tsan.h',
+    'skia/src/ports/SkBarriers_x86.h',
+    'skia/src/ports/SkMutex_pthread.h',
+    'skia/src/ports/SkMutex_win.h',
 ]
 UNIFIED_SOURCES += [
-    'trunk/src/core/SkAAClip.cpp',
-    'trunk/src/core/SkAlphaRuns.cpp',
-    'trunk/src/core/SkAnnotation.cpp',
-    'trunk/src/core/SkBBHFactory.cpp',
-    'trunk/src/core/SkBBoxHierarchyRecord.cpp',
-    'trunk/src/core/SkBBoxRecord.cpp',
-    'trunk/src/core/SkBitmap.cpp',
-    'trunk/src/core/SkBitmap_scroll.cpp',
-    'trunk/src/core/SkBitmapDevice.cpp',
-    'trunk/src/core/SkBitmapFilter.cpp',
-    'trunk/src/core/SkBitmapHeap.cpp',
-    'trunk/src/core/SkBitmapProcShader.cpp',
-    'trunk/src/core/SkBitmapProcState.cpp',
-    'trunk/src/core/SkBitmapScaler.cpp',
-    'trunk/src/core/SkBlitMask_D32.cpp',
-    'trunk/src/core/SkBlitRow_D16.cpp',
-    'trunk/src/core/SkBlitRow_D32.cpp',
-    'trunk/src/core/SkBlitter.cpp',
-    'trunk/src/core/SkBuffer.cpp',
-    'trunk/src/core/SkCanvas.cpp',
-    'trunk/src/core/SkChunkAlloc.cpp',
-    'trunk/src/core/SkClipStack.cpp',
-    'trunk/src/core/SkColor.cpp',
-    'trunk/src/core/SkColorFilter.cpp',
-    'trunk/src/core/SkColorTable.cpp',
-    'trunk/src/core/SkComposeShader.cpp',
-    'trunk/src/core/SkConfig8888.cpp',
-    'trunk/src/core/SkConvolver.cpp',
-    'trunk/src/core/SkCubicClipper.cpp',
-    'trunk/src/core/SkData.cpp',
-    'trunk/src/core/SkDataTable.cpp',
-    'trunk/src/core/SkDebug.cpp',
-    'trunk/src/core/SkDeque.cpp',
-    'trunk/src/core/SkDevice.cpp',
-    'trunk/src/core/SkDeviceLooper.cpp',
-    'trunk/src/core/SkDeviceProfile.cpp',
-    'trunk/src/core/SkDistanceFieldGen.cpp',
-    'trunk/src/core/SkDither.cpp',
-    'trunk/src/core/SkDraw.cpp',
-    'trunk/src/core/SkDrawLooper.cpp',
-    'trunk/src/core/SkEdge.cpp',
-    'trunk/src/core/SkEdgeBuilder.cpp',
-    'trunk/src/core/SkEdgeClipper.cpp',
-    'trunk/src/core/SkError.cpp',
-    'trunk/src/core/SkFilterProc.cpp',
-    'trunk/src/core/SkFilterShader.cpp',
-    'trunk/src/core/SkFlattenable.cpp',
-    'trunk/src/core/SkFlattenableSerialization.cpp',
-    'trunk/src/core/SkFloat.cpp',
-    'trunk/src/core/SkFloatBits.cpp',
-    'trunk/src/core/SkFont.cpp',
-    'trunk/src/core/SkFontDescriptor.cpp',
-    'trunk/src/core/SkFontStream.cpp',
-    'trunk/src/core/SkGeometry.cpp',
-    'trunk/src/core/SkGlyphCache.cpp',
-    'trunk/src/core/SkGraphics.cpp',
-    'trunk/src/core/SkImageFilter.cpp',
-    'trunk/src/core/SkImageGenerator.cpp',
-    'trunk/src/core/SkImageInfo.cpp',
-    'trunk/src/core/SkInstCnt.cpp',
-    'trunk/src/core/SkLineClipper.cpp',
-    'trunk/src/core/SkLocalMatrixShader.cpp',
-    'trunk/src/core/SkMallocPixelRef.cpp',
-    'trunk/src/core/SkMask.cpp',
-    'trunk/src/core/SkMaskFilter.cpp',
-    'trunk/src/core/SkMaskGamma.cpp',
-    'trunk/src/core/SkMath.cpp',
-    'trunk/src/core/SkMatrix.cpp',
-    'trunk/src/core/SkMatrixClipStateMgr.cpp',
-    'trunk/src/core/SkMetaData.cpp',
-    'trunk/src/core/SkMipMap.cpp',
-    'trunk/src/core/SkPackBits.cpp',
-    'trunk/src/core/SkPaint.cpp',
-    'trunk/src/core/SkPaintOptionsAndroid.cpp',
-    'trunk/src/core/SkPaintPriv.cpp',
-    'trunk/src/core/SkPatch.cpp',
-    'trunk/src/core/SkPath.cpp',
-    'trunk/src/core/SkPathEffect.cpp',
-    'trunk/src/core/SkPathHeap.cpp',
-    'trunk/src/core/SkPathMeasure.cpp',
-    'trunk/src/core/SkPathRef.cpp',
-    'trunk/src/core/SkPicture.cpp',
-    'trunk/src/core/SkPictureFlat.cpp',
-    'trunk/src/core/SkPicturePlayback.cpp',
-    'trunk/src/core/SkPictureRangePlayback.cpp',
-    'trunk/src/core/SkPictureRecord.cpp',
-    'trunk/src/core/SkPictureRecorder.cpp',
-    'trunk/src/core/SkPictureReplacementPlayback.cpp',
-    'trunk/src/core/SkPictureShader.cpp',
-    'trunk/src/core/SkPictureStateTree.cpp',
-    'trunk/src/core/SkPixelRef.cpp',
-    'trunk/src/core/SkPoint.cpp',
-    'trunk/src/core/SkProcSpriteBlitter.cpp',
-    'trunk/src/core/SkPtrRecorder.cpp',
-    'trunk/src/core/SkQuadClipper.cpp',
-    'trunk/src/core/SkQuadTree.cpp',
-    'trunk/src/core/SkRasterClip.cpp',
-    'trunk/src/core/SkRasterizer.cpp',
-    'trunk/src/core/SkReadBuffer.cpp',
-    'trunk/src/core/SkRecordAnalysis.cpp',
-    'trunk/src/core/SkRecordDraw.cpp',
-    'trunk/src/core/SkRecorder.cpp',
-    'trunk/src/core/SkRecording.cpp',
-    'trunk/src/core/SkRecordOpts.cpp',
-    'trunk/src/core/SkRect.cpp',
-    'trunk/src/core/SkRefDict.cpp',
-    'trunk/src/core/SkRegion.cpp',
-    'trunk/src/core/SkRegion_path.cpp',
-    'trunk/src/core/SkRRect.cpp',
-    'trunk/src/core/SkRTree.cpp',
-    'trunk/src/core/SkScalar.cpp',
-    'trunk/src/core/SkScalerContext.cpp',
-    'trunk/src/core/SkScan.cpp',
-    'trunk/src/core/SkScan_AntiPath.cpp',
-    'trunk/src/core/SkScan_Hairline.cpp',
-    'trunk/src/core/SkScan_Path.cpp',
-    'trunk/src/core/SkShader.cpp',
-    'trunk/src/core/SkSpriteBlitter_ARGB32.cpp',
-    'trunk/src/core/SkSpriteBlitter_RGB16.cpp',
-    'trunk/src/core/SkStream.cpp',
-    'trunk/src/core/SkString.cpp',
-    'trunk/src/core/SkStringUtils.cpp',
-    'trunk/src/core/SkStroke.cpp',
-    'trunk/src/core/SkStrokeRec.cpp',
-    'trunk/src/core/SkStrokerPriv.cpp',
-    'trunk/src/core/SkTileGrid.cpp',
-    'trunk/src/core/SkTLS.cpp',
-    'trunk/src/core/SkTSearch.cpp',
-    'trunk/src/core/SkTypeface.cpp',
-    'trunk/src/core/SkTypefaceCache.cpp',
-    'trunk/src/core/SkUnPreMultiply.cpp',
-    'trunk/src/core/SkUtils.cpp',
-    'trunk/src/core/SkValidatingReadBuffer.cpp',
-    'trunk/src/core/SkVertState.cpp',
-    'trunk/src/core/SkWriteBuffer.cpp',
-    'trunk/src/core/SkWriter32.cpp',
-    'trunk/src/core/SkXfermode.cpp',
-    'trunk/src/doc/SkDocument.cpp',
-    'trunk/src/effects/gradients/SkBitmapCache.cpp',
-    'trunk/src/effects/gradients/SkClampRange.cpp',
-    'trunk/src/effects/gradients/SkGradientShader.cpp',
-    'trunk/src/effects/gradients/SkLinearGradient.cpp',
-    'trunk/src/effects/gradients/SkRadialGradient.cpp',
-    'trunk/src/effects/gradients/SkSweepGradient.cpp',
-    'trunk/src/effects/gradients/SkTwoPointConicalGradient.cpp',
-    'trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
-    'trunk/src/effects/gradients/SkTwoPointRadialGradient.cpp',
-    'trunk/src/effects/Sk1DPathEffect.cpp',
-    'trunk/src/effects/Sk2DPathEffect.cpp',
-    'trunk/src/effects/SkAlphaThresholdFilter.cpp',
-    'trunk/src/effects/SkArithmeticMode.cpp',
-    'trunk/src/effects/SkAvoidXfermode.cpp',
-    'trunk/src/effects/SkBitmapSource.cpp',
-    'trunk/src/effects/SkBlurDrawLooper.cpp',
-    'trunk/src/effects/SkBlurImageFilter.cpp',
-    'trunk/src/effects/SkBlurMask.cpp',
-    'trunk/src/effects/SkBlurMaskFilter.cpp',
-    'trunk/src/effects/SkColorFilterImageFilter.cpp',
-    'trunk/src/effects/SkColorFilters.cpp',
-    'trunk/src/effects/SkColorMatrix.cpp',
-    'trunk/src/effects/SkColorMatrixFilter.cpp',
-    'trunk/src/effects/SkComposeImageFilter.cpp',
-    'trunk/src/effects/SkCornerPathEffect.cpp',
-    'trunk/src/effects/SkDashPathEffect.cpp',
-    'trunk/src/effects/SkDiscretePathEffect.cpp',
-    'trunk/src/effects/SkDisplacementMapEffect.cpp',
-    'trunk/src/effects/SkDropShadowImageFilter.cpp',
-    'trunk/src/effects/SkEmbossMask.cpp',
-    'trunk/src/effects/SkEmbossMaskFilter.cpp',
-    'trunk/src/effects/SkGpuBlurUtils.cpp',
-    'trunk/src/effects/SkLayerDrawLooper.cpp',
-    'trunk/src/effects/SkLayerRasterizer.cpp',
-    'trunk/src/effects/SkLerpXfermode.cpp',
-    'trunk/src/effects/SkLightingImageFilter.cpp',
-    'trunk/src/effects/SkLumaColorFilter.cpp',
-    'trunk/src/effects/SkMagnifierImageFilter.cpp',
-    'trunk/src/effects/SkMatrixConvolutionImageFilter.cpp',
-    'trunk/src/effects/SkMatrixImageFilter.cpp',
-    'trunk/src/effects/SkMergeImageFilter.cpp',
-    'trunk/src/effects/SkMorphologyImageFilter.cpp',
-    'trunk/src/effects/SkOffsetImageFilter.cpp',
-    'trunk/src/effects/SkPaintFlagsDrawFilter.cpp',
-    'trunk/src/effects/SkPerlinNoiseShader.cpp',
-    'trunk/src/effects/SkPictureImageFilter.cpp',
-    'trunk/src/effects/SkPixelXorXfermode.cpp',
-    'trunk/src/effects/SkPorterDuff.cpp',
-    'trunk/src/effects/SkRectShaderImageFilter.cpp',
-    'trunk/src/effects/SkStippleMaskFilter.cpp',
-    'trunk/src/effects/SkTableColorFilter.cpp',
-    'trunk/src/effects/SkTableMaskFilter.cpp',
-    'trunk/src/effects/SkTestImageFilters.cpp',
-    'trunk/src/effects/SkTileImageFilter.cpp',
-    'trunk/src/effects/SkTransparentShader.cpp',
-    'trunk/src/effects/SkXfermodeImageFilter.cpp',
-    'trunk/src/fonts/SkFontMgr_indirect.cpp',
-    'trunk/src/fonts/SkGScalerContext.cpp',
-    'trunk/src/fonts/SkRemotableFontMgr.cpp',
-    'trunk/src/fonts/SkTestScalerContext.cpp',
-    'trunk/src/gpu/effects/GrBezierEffect.cpp',
-    'trunk/src/gpu/effects/GrBicubicEffect.cpp',
-    'trunk/src/gpu/effects/GrConfigConversionEffect.cpp',
-    'trunk/src/gpu/effects/GrConvexPolyEffect.cpp',
-    'trunk/src/gpu/effects/GrConvolutionEffect.cpp',
-    'trunk/src/gpu/effects/GrCustomCoordsTextureEffect.cpp',
-    'trunk/src/gpu/effects/GrDashingEffect.cpp',
-    'trunk/src/gpu/effects/GrDistanceFieldTextureEffect.cpp',
-    'trunk/src/gpu/effects/GrDitherEffect.cpp',
-    'trunk/src/gpu/effects/GrMatrixConvolutionEffect.cpp',
-    'trunk/src/gpu/effects/GrOvalEffect.cpp',
-    'trunk/src/gpu/effects/GrRRectEffect.cpp',
-    'trunk/src/gpu/effects/GrSimpleTextureEffect.cpp',
-    'trunk/src/gpu/effects/GrSingleTextureEffect.cpp',
-    'trunk/src/gpu/effects/GrTextureDomain.cpp',
-    'trunk/src/gpu/effects/GrTextureStripAtlas.cpp',
-    'trunk/src/gpu/effects/GrYUVtoRGBEffect.cpp',
-    'trunk/src/gpu/gl/debug/GrBufferObj.cpp',
-    'trunk/src/gpu/gl/debug/GrDebugGL.cpp',
-    'trunk/src/gpu/gl/debug/GrFrameBufferObj.cpp',
-    'trunk/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
-    'trunk/src/gpu/gl/debug/GrProgramObj.cpp',
-    'trunk/src/gpu/gl/debug/GrShaderObj.cpp',
-    'trunk/src/gpu/gl/debug/GrTextureObj.cpp',
-    'trunk/src/gpu/gl/debug/GrTextureUnitObj.cpp',
-    'trunk/src/gpu/gl/debug/SkDebugGLContext.cpp',
-    'trunk/src/gpu/gl/GrGLAssembleInterface.cpp',
-    'trunk/src/gpu/gl/GrGLBufferImpl.cpp',
-    'trunk/src/gpu/gl/GrGLCaps.cpp',
-    'trunk/src/gpu/gl/GrGLContext.cpp',
-    'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
-    'trunk/src/gpu/gl/GrGLCreateNullInterface.cpp',
-    'trunk/src/gpu/gl/GrGLDefaultInterface_native.cpp',
-    'trunk/src/gpu/gl/GrGLExtensions.cpp',
-    'trunk/src/gpu/gl/GrGLIndexBuffer.cpp',
-    'trunk/src/gpu/gl/GrGLInterface.cpp',
-    'trunk/src/gpu/gl/GrGLNameAllocator.cpp',
-    'trunk/src/gpu/gl/GrGLNoOpInterface.cpp',
-    'trunk/src/gpu/gl/GrGLPath.cpp',
-    'trunk/src/gpu/gl/GrGLPathRange.cpp',
-    'trunk/src/gpu/gl/GrGLProgram.cpp',
-    'trunk/src/gpu/gl/GrGLProgramDesc.cpp',
-    'trunk/src/gpu/gl/GrGLProgramEffects.cpp',
-    'trunk/src/gpu/gl/GrGLRenderTarget.cpp',
-    'trunk/src/gpu/gl/GrGLShaderBuilder.cpp',
-    'trunk/src/gpu/gl/GrGLSL.cpp',
-    'trunk/src/gpu/gl/GrGLStencilBuffer.cpp',
-    'trunk/src/gpu/gl/GrGLTexture.cpp',
-    'trunk/src/gpu/gl/GrGLUniformManager.cpp',
-    'trunk/src/gpu/gl/GrGLUtil.cpp',
-    'trunk/src/gpu/gl/GrGLVertexArray.cpp',
-    'trunk/src/gpu/gl/GrGLVertexBuffer.cpp',
-    'trunk/src/gpu/gl/GrGpuGL.cpp',
-    'trunk/src/gpu/gl/GrGpuGL_program.cpp',
-    'trunk/src/gpu/gl/SkGLContextHelper.cpp',
-    'trunk/src/gpu/gl/SkNullGLContext.cpp',
-    'trunk/src/gpu/GrAAConvexPathRenderer.cpp',
-    'trunk/src/gpu/GrAAHairLinePathRenderer.cpp',
-    'trunk/src/gpu/GrAARectRenderer.cpp',
-    'trunk/src/gpu/GrAllocPool.cpp',
-    'trunk/src/gpu/GrAtlas.cpp',
-    'trunk/src/gpu/GrBitmapTextContext.cpp',
-    'trunk/src/gpu/GrBlend.cpp',
-    'trunk/src/gpu/GrBufferAllocPool.cpp',
-    'trunk/src/gpu/GrCacheID.cpp',
-    'trunk/src/gpu/GrClipData.cpp',
-    'trunk/src/gpu/GrClipMaskCache.cpp',
-    'trunk/src/gpu/GrClipMaskManager.cpp',
-    'trunk/src/gpu/GrContext.cpp',
-    'trunk/src/gpu/GrDefaultPathRenderer.cpp',
-    'trunk/src/gpu/GrDrawState.cpp',
-    'trunk/src/gpu/GrDrawTarget.cpp',
-    'trunk/src/gpu/GrEffect.cpp',
-    'trunk/src/gpu/GrFontScaler.cpp',
-    'trunk/src/gpu/GrGpu.cpp',
-    'trunk/src/gpu/GrGpuFactory.cpp',
-    'trunk/src/gpu/GrGpuResource.cpp',
-    'trunk/src/gpu/GrInOrderDrawBuffer.cpp',
-    'trunk/src/gpu/GrLayerCache.cpp',
-    'trunk/src/gpu/GrMemoryPool.cpp',
-    'trunk/src/gpu/GrOvalRenderer.cpp',
-    'trunk/src/gpu/GrPaint.cpp',
-    'trunk/src/gpu/GrPath.cpp',
-    'trunk/src/gpu/GrPathRenderer.cpp',
-    'trunk/src/gpu/GrPathRendererChain.cpp',
-    'trunk/src/gpu/GrPathUtils.cpp',
-    'trunk/src/gpu/GrPictureUtils.cpp',
-    'trunk/src/gpu/GrRectanizer_pow2.cpp',
-    'trunk/src/gpu/GrRectanizer_skyline.cpp',
-    'trunk/src/gpu/GrReducedClip.cpp',
-    'trunk/src/gpu/GrRenderTarget.cpp',
-    'trunk/src/gpu/GrResourceCache.cpp',
-    'trunk/src/gpu/GrSoftwarePathRenderer.cpp',
-    'trunk/src/gpu/GrStencil.cpp',
-    'trunk/src/gpu/GrStencilAndCoverPathRenderer.cpp',
-    'trunk/src/gpu/GrStencilAndCoverTextContext.cpp',
-    'trunk/src/gpu/GrStencilBuffer.cpp',
-    'trunk/src/gpu/GrSurface.cpp',
-    'trunk/src/gpu/GrSWMaskHelper.cpp',
-    'trunk/src/gpu/GrTextContext.cpp',
-    'trunk/src/gpu/GrTextStrike.cpp',
-    'trunk/src/gpu/GrTexture.cpp',
-    'trunk/src/gpu/GrTextureAccess.cpp',
-    'trunk/src/gpu/GrTraceMarker.cpp',
-    'trunk/src/gpu/SkGpuDevice.cpp',
-    'trunk/src/gpu/SkGr.cpp',
-    'trunk/src/gpu/SkGrPixelRef.cpp',
-    'trunk/src/gpu/SkGrTexturePixelRef.cpp',
-    'trunk/src/image/SkImage.cpp',
-    'trunk/src/image/SkImage_Gpu.cpp',
-    'trunk/src/image/SkImage_Raster.cpp',
-    'trunk/src/image/SkImagePriv.cpp',
-    'trunk/src/image/SkSurface.cpp',
-    'trunk/src/image/SkSurface_Gpu.cpp',
-    'trunk/src/image/SkSurface_Raster.cpp',
-    'trunk/src/images/bmpdecoderhelper.cpp',
-    'trunk/src/images/SkDecodingImageGenerator.cpp',
-    'trunk/src/images/SkPageFlipper.cpp',
-    'trunk/src/images/SkScaledBitmapSampler.cpp',
-    'trunk/src/lazy/SkCachingPixelRef.cpp',
-    'trunk/src/lazy/SkDiscardableMemoryPool.cpp',
-    'trunk/src/lazy/SkDiscardablePixelRef.cpp',
-    'trunk/src/pathops/SkAddIntersections.cpp',
-    'trunk/src/pathops/SkDCubicIntersection.cpp',
-    'trunk/src/pathops/SkDCubicLineIntersection.cpp',
-    'trunk/src/pathops/SkDCubicToQuads.cpp',
-    'trunk/src/pathops/SkDLineIntersection.cpp',
-    'trunk/src/pathops/SkDQuadImplicit.cpp',
-    'trunk/src/pathops/SkDQuadIntersection.cpp',
-    'trunk/src/pathops/SkDQuadLineIntersection.cpp',
-    'trunk/src/pathops/SkIntersections.cpp',
-    'trunk/src/pathops/SkOpAngle.cpp',
-    'trunk/src/pathops/SkOpContour.cpp',
-    'trunk/src/pathops/SkOpEdgeBuilder.cpp',
-    'trunk/src/pathops/SkOpSegment.cpp',
-    'trunk/src/pathops/SkPathOpsBounds.cpp',
-    'trunk/src/pathops/SkPathOpsCommon.cpp',
-    'trunk/src/pathops/SkPathOpsCubic.cpp',
-    'trunk/src/pathops/SkPathOpsDebug.cpp',
-    'trunk/src/pathops/SkPathOpsLine.cpp',
-    'trunk/src/pathops/SkPathOpsOp.cpp',
-    'trunk/src/pathops/SkPathOpsPoint.cpp',
-    'trunk/src/pathops/SkPathOpsQuad.cpp',
-    'trunk/src/pathops/SkPathOpsRect.cpp',
-    'trunk/src/pathops/SkPathOpsSimplify.cpp',
-    'trunk/src/pathops/SkPathOpsTightBounds.cpp',
-    'trunk/src/pathops/SkPathOpsTriangle.cpp',
-    'trunk/src/pathops/SkPathOpsTypes.cpp',
-    'trunk/src/pathops/SkPathWriter.cpp',
-    'trunk/src/pathops/SkQuarticRoot.cpp',
-    'trunk/src/pathops/SkReduceOrder.cpp',
-    'trunk/src/pipe/SkGPipeRead.cpp',
-    'trunk/src/pipe/SkGPipeWrite.cpp',
-    'trunk/src/ports/SkDiscardableMemory_none.cpp',
-    'trunk/src/ports/SkGlobalInitialization_default.cpp',
-    'trunk/src/ports/SkImageDecoder_empty.cpp',
-    'trunk/src/ports/SkMemory_mozalloc.cpp',
-    'trunk/src/ports/SkOSFile_stdio.cpp',
-    'trunk/src/sfnt/SkOTTable_name.cpp',
-    'trunk/src/sfnt/SkOTUtils.cpp',
-    'trunk/src/utils/SkBase64.cpp',
-    'trunk/src/utils/SkBitSet.cpp',
-    'trunk/src/utils/SkBoundaryPatch.cpp',
-    'trunk/src/utils/SkCamera.cpp',
-    'trunk/src/utils/SkCanvasStack.cpp',
-    'trunk/src/utils/SkCanvasStateUtils.cpp',
-    'trunk/src/utils/SkCubicInterval.cpp',
-    'trunk/src/utils/SkCullPoints.cpp',
-    'trunk/src/utils/SkDashPath.cpp',
-    'trunk/src/utils/SkDeferredCanvas.cpp',
-    'trunk/src/utils/SkDumpCanvas.cpp',
-    'trunk/src/utils/SkEventTracer.cpp',
-    'trunk/src/utils/SkFrontBufferedStream.cpp',
-    'trunk/src/utils/SkGatherPixelRefsAndRects.cpp',
-    'trunk/src/utils/SkInterpolator.cpp',
-    'trunk/src/utils/SkLayer.cpp',
-    'trunk/src/utils/SkMatrix22.cpp',
-    'trunk/src/utils/SkMatrix44.cpp',
-    'trunk/src/utils/SkMeshUtils.cpp',
-    'trunk/src/utils/SkNinePatch.cpp',
-    'trunk/src/utils/SkNullCanvas.cpp',
-    'trunk/src/utils/SkNWayCanvas.cpp',
-    'trunk/src/utils/SkOSFile.cpp',
-    'trunk/src/utils/SkParseColor.cpp',
-    'trunk/src/utils/SkParsePath.cpp',
-    'trunk/src/utils/SkPathUtils.cpp',
-    'trunk/src/utils/SkPictureUtils.cpp',
-    'trunk/src/utils/SkProxyCanvas.cpp',
-    'trunk/src/utils/SkRTConf.cpp',
-    'trunk/src/utils/SkTextureCompressor.cpp',
-    'trunk/src/utils/SkTextureCompressor_ASTC.cpp',
-    'trunk/src/utils/SkTextureCompressor_LATC.cpp',
-    'trunk/src/utils/SkTextureCompressor_R11EAC.cpp',
+    'skia/src/core/SkAAClip.cpp',
+    'skia/src/core/SkAlphaRuns.cpp',
+    'skia/src/core/SkAnnotation.cpp',
+    'skia/src/core/SkBBHFactory.cpp',
+    'skia/src/core/SkBBoxHierarchyRecord.cpp',
+    'skia/src/core/SkBBoxRecord.cpp',
+    'skia/src/core/SkBitmap.cpp',
+    'skia/src/core/SkBitmap_scroll.cpp',
+    'skia/src/core/SkBitmapDevice.cpp',
+    'skia/src/core/SkBitmapFilter.cpp',
+    'skia/src/core/SkBitmapHeap.cpp',
+    'skia/src/core/SkBitmapProcShader.cpp',
+    'skia/src/core/SkBitmapProcState.cpp',
+    'skia/src/core/SkBitmapScaler.cpp',
+    'skia/src/core/SkBlitMask_D32.cpp',
+    'skia/src/core/SkBlitRow_D16.cpp',
+    'skia/src/core/SkBlitRow_D32.cpp',
+    'skia/src/core/SkBlitter.cpp',
+    'skia/src/core/SkBuffer.cpp',
+    'skia/src/core/SkCanvas.cpp',
+    'skia/src/core/SkChunkAlloc.cpp',
+    'skia/src/core/SkClipStack.cpp',
+    'skia/src/core/SkColor.cpp',
+    'skia/src/core/SkColorFilter.cpp',
+    'skia/src/core/SkColorTable.cpp',
+    'skia/src/core/SkComposeShader.cpp',
+    'skia/src/core/SkConfig8888.cpp',
+    'skia/src/core/SkConvolver.cpp',
+    'skia/src/core/SkCubicClipper.cpp',
+    'skia/src/core/SkData.cpp',
+    'skia/src/core/SkDataTable.cpp',
+    'skia/src/core/SkDebug.cpp',
+    'skia/src/core/SkDeque.cpp',
+    'skia/src/core/SkDevice.cpp',
+    'skia/src/core/SkDeviceLooper.cpp',
+    'skia/src/core/SkDeviceProfile.cpp',
+    'skia/src/core/SkDistanceFieldGen.cpp',
+    'skia/src/core/SkDither.cpp',
+    'skia/src/core/SkDraw.cpp',
+    'skia/src/core/SkDrawLooper.cpp',
+    'skia/src/core/SkEdge.cpp',
+    'skia/src/core/SkEdgeBuilder.cpp',
+    'skia/src/core/SkEdgeClipper.cpp',
+    'skia/src/core/SkError.cpp',
+    'skia/src/core/SkFilterProc.cpp',
+    'skia/src/core/SkFilterShader.cpp',
+    'skia/src/core/SkFlattenable.cpp',
+    'skia/src/core/SkFlattenableSerialization.cpp',
+    'skia/src/core/SkFloat.cpp',
+    'skia/src/core/SkFloatBits.cpp',
+    'skia/src/core/SkFont.cpp',
+    'skia/src/core/SkFontDescriptor.cpp',
+    'skia/src/core/SkFontStream.cpp',
+    'skia/src/core/SkGeometry.cpp',
+    'skia/src/core/SkGlyphCache.cpp',
+    'skia/src/core/SkGraphics.cpp',
+    'skia/src/core/SkImageFilter.cpp',
+    'skia/src/core/SkImageGenerator.cpp',
+    'skia/src/core/SkImageInfo.cpp',
+    'skia/src/core/SkInstCnt.cpp',
+    'skia/src/core/SkLineClipper.cpp',
+    'skia/src/core/SkLocalMatrixShader.cpp',
+    'skia/src/core/SkMallocPixelRef.cpp',
+    'skia/src/core/SkMask.cpp',
+    'skia/src/core/SkMaskFilter.cpp',
+    'skia/src/core/SkMaskGamma.cpp',
+    'skia/src/core/SkMath.cpp',
+    'skia/src/core/SkMatrix.cpp',
+    'skia/src/core/SkMatrixClipStateMgr.cpp',
+    'skia/src/core/SkMetaData.cpp',
+    'skia/src/core/SkMipMap.cpp',
+    'skia/src/core/SkPackBits.cpp',
+    'skia/src/core/SkPaint.cpp',
+    'skia/src/core/SkPaintOptionsAndroid.cpp',
+    'skia/src/core/SkPaintPriv.cpp',
+    'skia/src/core/SkPatch.cpp',
+    'skia/src/core/SkPath.cpp',
+    'skia/src/core/SkPathEffect.cpp',
+    'skia/src/core/SkPathHeap.cpp',
+    'skia/src/core/SkPathMeasure.cpp',
+    'skia/src/core/SkPathRef.cpp',
+    'skia/src/core/SkPicture.cpp',
+    'skia/src/core/SkPictureFlat.cpp',
+    'skia/src/core/SkPicturePlayback.cpp',
+    'skia/src/core/SkPictureRangePlayback.cpp',
+    'skia/src/core/SkPictureRecord.cpp',
+    'skia/src/core/SkPictureRecorder.cpp',
+    'skia/src/core/SkPictureReplacementPlayback.cpp',
+    'skia/src/core/SkPictureShader.cpp',
+    'skia/src/core/SkPictureStateTree.cpp',
+    'skia/src/core/SkPixelRef.cpp',
+    'skia/src/core/SkPoint.cpp',
+    'skia/src/core/SkProcSpriteBlitter.cpp',
+    'skia/src/core/SkPtrRecorder.cpp',
+    'skia/src/core/SkQuadClipper.cpp',
+    'skia/src/core/SkQuadTree.cpp',
+    'skia/src/core/SkRasterClip.cpp',
+    'skia/src/core/SkRasterizer.cpp',
+    'skia/src/core/SkReadBuffer.cpp',
+    'skia/src/core/SkRecordAnalysis.cpp',
+    'skia/src/core/SkRecordDraw.cpp',
+    'skia/src/core/SkRecorder.cpp',
+    'skia/src/core/SkRecording.cpp',
+    'skia/src/core/SkRecordOpts.cpp',
+    'skia/src/core/SkRect.cpp',
+    'skia/src/core/SkRefDict.cpp',
+    'skia/src/core/SkRegion.cpp',
+    'skia/src/core/SkRegion_path.cpp',
+    'skia/src/core/SkRRect.cpp',
+    'skia/src/core/SkRTree.cpp',
+    'skia/src/core/SkScalar.cpp',
+    'skia/src/core/SkScalerContext.cpp',
+    'skia/src/core/SkScan.cpp',
+    'skia/src/core/SkScan_AntiPath.cpp',
+    'skia/src/core/SkScan_Hairline.cpp',
+    'skia/src/core/SkScan_Path.cpp',
+    'skia/src/core/SkShader.cpp',
+    'skia/src/core/SkSpriteBlitter_ARGB32.cpp',
+    'skia/src/core/SkSpriteBlitter_RGB16.cpp',
+    'skia/src/core/SkStream.cpp',
+    'skia/src/core/SkString.cpp',
+    'skia/src/core/SkStringUtils.cpp',
+    'skia/src/core/SkStroke.cpp',
+    'skia/src/core/SkStrokeRec.cpp',
+    'skia/src/core/SkStrokerPriv.cpp',
+    'skia/src/core/SkTileGrid.cpp',
+    'skia/src/core/SkTLS.cpp',
+    'skia/src/core/SkTSearch.cpp',
+    'skia/src/core/SkTypeface.cpp',
+    'skia/src/core/SkTypefaceCache.cpp',
+    'skia/src/core/SkUnPreMultiply.cpp',
+    'skia/src/core/SkUtils.cpp',
+    'skia/src/core/SkValidatingReadBuffer.cpp',
+    'skia/src/core/SkVertState.cpp',
+    'skia/src/core/SkWriteBuffer.cpp',
+    'skia/src/core/SkWriter32.cpp',
+    'skia/src/core/SkXfermode.cpp',
+    'skia/src/doc/SkDocument.cpp',
+    'skia/src/effects/gradients/SkBitmapCache.cpp',
+    'skia/src/effects/gradients/SkClampRange.cpp',
+    'skia/src/effects/gradients/SkGradientShader.cpp',
+    'skia/src/effects/gradients/SkLinearGradient.cpp',
+    'skia/src/effects/gradients/SkRadialGradient.cpp',
+    'skia/src/effects/gradients/SkSweepGradient.cpp',
+    'skia/src/effects/gradients/SkTwoPointConicalGradient.cpp',
+    'skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp',
+    'skia/src/effects/gradients/SkTwoPointRadialGradient.cpp',
+    'skia/src/effects/Sk1DPathEffect.cpp',
+    'skia/src/effects/Sk2DPathEffect.cpp',
+    'skia/src/effects/SkAlphaThresholdFilter.cpp',
+    'skia/src/effects/SkArithmeticMode.cpp',
+    'skia/src/effects/SkAvoidXfermode.cpp',
+    'skia/src/effects/SkBitmapSource.cpp',
+    'skia/src/effects/SkBlurDrawLooper.cpp',
+    'skia/src/effects/SkBlurImageFilter.cpp',
+    'skia/src/effects/SkBlurMask.cpp',
+    'skia/src/effects/SkBlurMaskFilter.cpp',
+    'skia/src/effects/SkColorFilterImageFilter.cpp',
+    'skia/src/effects/SkColorFilters.cpp',
+    'skia/src/effects/SkColorMatrix.cpp',
+    'skia/src/effects/SkColorMatrixFilter.cpp',
+    'skia/src/effects/SkComposeImageFilter.cpp',
+    'skia/src/effects/SkCornerPathEffect.cpp',
+    'skia/src/effects/SkDashPathEffect.cpp',
+    'skia/src/effects/SkDiscretePathEffect.cpp',
+    'skia/src/effects/SkDisplacementMapEffect.cpp',
+    'skia/src/effects/SkDropShadowImageFilter.cpp',
+    'skia/src/effects/SkEmbossMask.cpp',
+    'skia/src/effects/SkEmbossMaskFilter.cpp',
+    'skia/src/effects/SkGpuBlurUtils.cpp',
+    'skia/src/effects/SkLayerDrawLooper.cpp',
+    'skia/src/effects/SkLayerRasterizer.cpp',
+    'skia/src/effects/SkLerpXfermode.cpp',
+    'skia/src/effects/SkLightingImageFilter.cpp',
+    'skia/src/effects/SkLumaColorFilter.cpp',
+    'skia/src/effects/SkMagnifierImageFilter.cpp',
+    'skia/src/effects/SkMatrixConvolutionImageFilter.cpp',
+    'skia/src/effects/SkMatrixImageFilter.cpp',
+    'skia/src/effects/SkMergeImageFilter.cpp',
+    'skia/src/effects/SkMorphologyImageFilter.cpp',
+    'skia/src/effects/SkOffsetImageFilter.cpp',
+    'skia/src/effects/SkPaintFlagsDrawFilter.cpp',
+    'skia/src/effects/SkPerlinNoiseShader.cpp',
+    'skia/src/effects/SkPictureImageFilter.cpp',
+    'skia/src/effects/SkPixelXorXfermode.cpp',
+    'skia/src/effects/SkPorterDuff.cpp',
+    'skia/src/effects/SkRectShaderImageFilter.cpp',
+    'skia/src/effects/SkStippleMaskFilter.cpp',
+    'skia/src/effects/SkTableColorFilter.cpp',
+    'skia/src/effects/SkTableMaskFilter.cpp',
+    'skia/src/effects/SkTestImageFilters.cpp',
+    'skia/src/effects/SkTileImageFilter.cpp',
+    'skia/src/effects/SkTransparentShader.cpp',
+    'skia/src/effects/SkXfermodeImageFilter.cpp',
+    'skia/src/fonts/SkFontMgr_indirect.cpp',
+    'skia/src/fonts/SkGScalerContext.cpp',
+    'skia/src/fonts/SkRemotableFontMgr.cpp',
+    'skia/src/fonts/SkTestScalerContext.cpp',
+    'skia/src/gpu/effects/GrBezierEffect.cpp',
+    'skia/src/gpu/effects/GrBicubicEffect.cpp',
+    'skia/src/gpu/effects/GrConfigConversionEffect.cpp',
+    'skia/src/gpu/effects/GrConvexPolyEffect.cpp',
+    'skia/src/gpu/effects/GrConvolutionEffect.cpp',
+    'skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp',
+    'skia/src/gpu/effects/GrDashingEffect.cpp',
+    'skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp',
+    'skia/src/gpu/effects/GrDitherEffect.cpp',
+    'skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp',
+    'skia/src/gpu/effects/GrOvalEffect.cpp',
+    'skia/src/gpu/effects/GrRRectEffect.cpp',
+    'skia/src/gpu/effects/GrSimpleTextureEffect.cpp',
+    'skia/src/gpu/effects/GrSingleTextureEffect.cpp',
+    'skia/src/gpu/effects/GrTextureDomain.cpp',
+    'skia/src/gpu/effects/GrTextureStripAtlas.cpp',
+    'skia/src/gpu/effects/GrYUVtoRGBEffect.cpp',
+    'skia/src/gpu/gl/debug/GrBufferObj.cpp',
+    'skia/src/gpu/gl/debug/GrDebugGL.cpp',
+    'skia/src/gpu/gl/debug/GrFrameBufferObj.cpp',
+    'skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
+    'skia/src/gpu/gl/debug/GrProgramObj.cpp',
+    'skia/src/gpu/gl/debug/GrShaderObj.cpp',
+    'skia/src/gpu/gl/debug/GrTextureObj.cpp',
+    'skia/src/gpu/gl/debug/GrTextureUnitObj.cpp',
+    'skia/src/gpu/gl/debug/SkDebugGLContext.cpp',
+    'skia/src/gpu/gl/GrGLAssembleInterface.cpp',
+    'skia/src/gpu/gl/GrGLBufferImpl.cpp',
+    'skia/src/gpu/gl/GrGLCaps.cpp',
+    'skia/src/gpu/gl/GrGLContext.cpp',
+    'skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
+    'skia/src/gpu/gl/GrGLCreateNullInterface.cpp',
+    'skia/src/gpu/gl/GrGLDefaultInterface_native.cpp',
+    'skia/src/gpu/gl/GrGLExtensions.cpp',
+    'skia/src/gpu/gl/GrGLIndexBuffer.cpp',
+    'skia/src/gpu/gl/GrGLInterface.cpp',
+    'skia/src/gpu/gl/GrGLNameAllocator.cpp',
+    'skia/src/gpu/gl/GrGLNoOpInterface.cpp',
+    'skia/src/gpu/gl/GrGLPath.cpp',
+    'skia/src/gpu/gl/GrGLPathRange.cpp',
+    'skia/src/gpu/gl/GrGLProgram.cpp',
+    'skia/src/gpu/gl/GrGLProgramDesc.cpp',
+    'skia/src/gpu/gl/GrGLProgramEffects.cpp',
+    'skia/src/gpu/gl/GrGLRenderTarget.cpp',
+    'skia/src/gpu/gl/GrGLShaderBuilder.cpp',
+    'skia/src/gpu/gl/GrGLSL.cpp',
+    'skia/src/gpu/gl/GrGLStencilBuffer.cpp',
+    'skia/src/gpu/gl/GrGLTexture.cpp',
+    'skia/src/gpu/gl/GrGLUniformManager.cpp',
+    'skia/src/gpu/gl/GrGLUtil.cpp',
+    'skia/src/gpu/gl/GrGLVertexArray.cpp',
+    'skia/src/gpu/gl/GrGLVertexBuffer.cpp',
+    'skia/src/gpu/gl/GrGpuGL.cpp',
+    'skia/src/gpu/gl/GrGpuGL_program.cpp',
+    'skia/src/gpu/gl/SkGLContextHelper.cpp',
+    'skia/src/gpu/gl/SkNullGLContext.cpp',
+    'skia/src/gpu/GrAAConvexPathRenderer.cpp',
+    'skia/src/gpu/GrAAHairLinePathRenderer.cpp',
+    'skia/src/gpu/GrAARectRenderer.cpp',
+    'skia/src/gpu/GrAllocPool.cpp',
+    'skia/src/gpu/GrAtlas.cpp',
+    'skia/src/gpu/GrBitmapTextContext.cpp',
+    'skia/src/gpu/GrBlend.cpp',
+    'skia/src/gpu/GrBufferAllocPool.cpp',
+    'skia/src/gpu/GrCacheID.cpp',
+    'skia/src/gpu/GrClipData.cpp',
+    'skia/src/gpu/GrClipMaskCache.cpp',
+    'skia/src/gpu/GrClipMaskManager.cpp',
+    'skia/src/gpu/GrContext.cpp',
+    'skia/src/gpu/GrDefaultPathRenderer.cpp',
+    'skia/src/gpu/GrDrawState.cpp',
+    'skia/src/gpu/GrDrawTarget.cpp',
+    'skia/src/gpu/GrEffect.cpp',
+    'skia/src/gpu/GrFontScaler.cpp',
+    'skia/src/gpu/GrGpu.cpp',
+    'skia/src/gpu/GrGpuFactory.cpp',
+    'skia/src/gpu/GrGpuResource.cpp',
+    'skia/src/gpu/GrInOrderDrawBuffer.cpp',
+    'skia/src/gpu/GrLayerCache.cpp',
+    'skia/src/gpu/GrMemoryPool.cpp',
+    'skia/src/gpu/GrOvalRenderer.cpp',
+    'skia/src/gpu/GrPaint.cpp',
+    'skia/src/gpu/GrPath.cpp',
+    'skia/src/gpu/GrPathRenderer.cpp',
+    'skia/src/gpu/GrPathRendererChain.cpp',
+    'skia/src/gpu/GrPathUtils.cpp',
+    'skia/src/gpu/GrPictureUtils.cpp',
+    'skia/src/gpu/GrRectanizer_pow2.cpp',
+    'skia/src/gpu/GrRectanizer_skyline.cpp',
+    'skia/src/gpu/GrReducedClip.cpp',
+    'skia/src/gpu/GrRenderTarget.cpp',
+    'skia/src/gpu/GrResourceCache.cpp',
+    'skia/src/gpu/GrSoftwarePathRenderer.cpp',
+    'skia/src/gpu/GrStencil.cpp',
+    'skia/src/gpu/GrStencilAndCoverPathRenderer.cpp',
+    'skia/src/gpu/GrStencilAndCoverTextContext.cpp',
+    'skia/src/gpu/GrStencilBuffer.cpp',
+    'skia/src/gpu/GrSurface.cpp',
+    'skia/src/gpu/GrSWMaskHelper.cpp',
+    'skia/src/gpu/GrTextContext.cpp',
+    'skia/src/gpu/GrTextStrike.cpp',
+    'skia/src/gpu/GrTexture.cpp',
+    'skia/src/gpu/GrTextureAccess.cpp',
+    'skia/src/gpu/GrTraceMarker.cpp',
+    'skia/src/gpu/SkGpuDevice.cpp',
+    'skia/src/gpu/SkGr.cpp',
+    'skia/src/gpu/SkGrPixelRef.cpp',
+    'skia/src/gpu/SkGrTexturePixelRef.cpp',
+    'skia/src/image/SkImage.cpp',
+    'skia/src/image/SkImage_Gpu.cpp',
+    'skia/src/image/SkImage_Raster.cpp',
+    'skia/src/image/SkImagePriv.cpp',
+    'skia/src/image/SkSurface.cpp',
+    'skia/src/image/SkSurface_Gpu.cpp',
+    'skia/src/image/SkSurface_Raster.cpp',
+    'skia/src/images/bmpdecoderhelper.cpp',
+    'skia/src/images/SkDecodingImageGenerator.cpp',
+    'skia/src/images/SkPageFlipper.cpp',
+    'skia/src/images/SkScaledBitmapSampler.cpp',
+    'skia/src/lazy/SkCachingPixelRef.cpp',
+    'skia/src/lazy/SkDiscardableMemoryPool.cpp',
+    'skia/src/lazy/SkDiscardablePixelRef.cpp',
+    'skia/src/pathops/SkAddIntersections.cpp',
+    'skia/src/pathops/SkDCubicIntersection.cpp',
+    'skia/src/pathops/SkDCubicLineIntersection.cpp',
+    'skia/src/pathops/SkDCubicToQuads.cpp',
+    'skia/src/pathops/SkDLineIntersection.cpp',
+    'skia/src/pathops/SkDQuadImplicit.cpp',
+    'skia/src/pathops/SkDQuadIntersection.cpp',
+    'skia/src/pathops/SkDQuadLineIntersection.cpp',
+    'skia/src/pathops/SkIntersections.cpp',
+    'skia/src/pathops/SkOpAngle.cpp',
+    'skia/src/pathops/SkOpContour.cpp',
+    'skia/src/pathops/SkOpEdgeBuilder.cpp',
+    'skia/src/pathops/SkOpSegment.cpp',
+    'skia/src/pathops/SkPathOpsBounds.cpp',
+    'skia/src/pathops/SkPathOpsCommon.cpp',
+    'skia/src/pathops/SkPathOpsCubic.cpp',
+    'skia/src/pathops/SkPathOpsDebug.cpp',
+    'skia/src/pathops/SkPathOpsLine.cpp',
+    'skia/src/pathops/SkPathOpsOp.cpp',
+    'skia/src/pathops/SkPathOpsPoint.cpp',
+    'skia/src/pathops/SkPathOpsQuad.cpp',
+    'skia/src/pathops/SkPathOpsRect.cpp',
+    'skia/src/pathops/SkPathOpsSimplify.cpp',
+    'skia/src/pathops/SkPathOpsTightBounds.cpp',
+    'skia/src/pathops/SkPathOpsTriangle.cpp',
+    'skia/src/pathops/SkPathOpsTypes.cpp',
+    'skia/src/pathops/SkPathWriter.cpp',
+    'skia/src/pathops/SkQuarticRoot.cpp',
+    'skia/src/pathops/SkReduceOrder.cpp',
+    'skia/src/pipe/SkGPipeRead.cpp',
+    'skia/src/pipe/SkGPipeWrite.cpp',
+    'skia/src/ports/SkDiscardableMemory_none.cpp',
+    'skia/src/ports/SkGlobalInitialization_default.cpp',
+    'skia/src/ports/SkImageDecoder_empty.cpp',
+    'skia/src/ports/SkMemory_mozalloc.cpp',
+    'skia/src/ports/SkOSFile_stdio.cpp',
+    'skia/src/sfnt/SkOTTable_name.cpp',
+    'skia/src/sfnt/SkOTUtils.cpp',
+    'skia/src/utils/SkBase64.cpp',
+    'skia/src/utils/SkBitSet.cpp',
+    'skia/src/utils/SkBoundaryPatch.cpp',
+    'skia/src/utils/SkCamera.cpp',
+    'skia/src/utils/SkCanvasStack.cpp',
+    'skia/src/utils/SkCanvasStateUtils.cpp',
+    'skia/src/utils/SkCubicInterval.cpp',
+    'skia/src/utils/SkCullPoints.cpp',
+    'skia/src/utils/SkDashPath.cpp',
+    'skia/src/utils/SkDeferredCanvas.cpp',
+    'skia/src/utils/SkDumpCanvas.cpp',
+    'skia/src/utils/SkEventTracer.cpp',
+    'skia/src/utils/SkFrontBufferedStream.cpp',
+    'skia/src/utils/SkGatherPixelRefsAndRects.cpp',
+    'skia/src/utils/SkInterpolator.cpp',
+    'skia/src/utils/SkLayer.cpp',
+    'skia/src/utils/SkMatrix22.cpp',
+    'skia/src/utils/SkMatrix44.cpp',
+    'skia/src/utils/SkMeshUtils.cpp',
+    'skia/src/utils/SkNinePatch.cpp',
+    'skia/src/utils/SkNullCanvas.cpp',
+    'skia/src/utils/SkNWayCanvas.cpp',
+    'skia/src/utils/SkOSFile.cpp',
+    'skia/src/utils/SkParseColor.cpp',
+    'skia/src/utils/SkParsePath.cpp',
+    'skia/src/utils/SkPathUtils.cpp',
+    'skia/src/utils/SkPictureUtils.cpp',
+    'skia/src/utils/SkProxyCanvas.cpp',
+    'skia/src/utils/SkRTConf.cpp',
+    'skia/src/utils/SkTextureCompressor.cpp',
+    'skia/src/utils/SkTextureCompressor_ASTC.cpp',
+    'skia/src/utils/SkTextureCompressor_LATC.cpp',
+    'skia/src/utils/SkTextureCompressor_R11EAC.cpp',
 ]
 SOURCES += [
-    'trunk/src/core/SkAdvancedTypefaceMetrics.cpp',
-    'trunk/src/core/SkBitmapProcState_matrixProcs.cpp',
-    'trunk/src/core/SkBlitter_A8.cpp',
-    'trunk/src/core/SkBlitter_ARGB32.cpp',
-    'trunk/src/core/SkBlitter_RGB16.cpp',
-    'trunk/src/core/SkBlitter_Sprite.cpp',
-    'trunk/src/core/SkFontHost.cpp',
-    'trunk/src/core/SkPictureData.cpp',
-    'trunk/src/core/SkScaledImageCache.cpp',
-    'trunk/src/core/SkScan_Antihair.cpp',
-    'trunk/src/gpu/GrAddPathRenderers_default.cpp',
-    'trunk/src/gpu/GrDistanceFieldTextContext.cpp',
-    'trunk/src/utils/SkMD5.cpp',
-    'trunk/src/utils/SkParse.cpp',
-    'trunk/src/utils/SkSHA1.cpp',
+    'skia/src/core/SkAdvancedTypefaceMetrics.cpp',
+    'skia/src/core/SkBitmapProcState_matrixProcs.cpp',
+    'skia/src/core/SkBlitter_A8.cpp',
+    'skia/src/core/SkBlitter_ARGB32.cpp',
+    'skia/src/core/SkBlitter_RGB16.cpp',
+    'skia/src/core/SkBlitter_Sprite.cpp',
+    'skia/src/core/SkFontHost.cpp',
+    'skia/src/core/SkPictureData.cpp',
+    'skia/src/core/SkScaledImageCache.cpp',
+    'skia/src/core/SkScan_Antihair.cpp',
+    'skia/src/gpu/GrAddPathRenderers_default.cpp',
+    'skia/src/gpu/GrDistanceFieldTextContext.cpp',
+    'skia/src/utils/SkMD5.cpp',
+    'skia/src/utils/SkParse.cpp',
+    'skia/src/utils/SkSHA1.cpp',
 ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     UNIFIED_SOURCES += [
-        'trunk/src/ports/SkDebug_android.cpp',
-        'trunk/src/ports/SkOSFile_posix.cpp',
-        'trunk/src/ports/SkTime_Unix.cpp',
-        'trunk/src/ports/SkTLS_pthread.cpp',
-        'trunk/src/utils/SkThreadUtils_pthread.cpp',
+        'skia/src/ports/SkDebug_android.cpp',
+        'skia/src/ports/SkOSFile_posix.cpp',
+        'skia/src/ports/SkTime_Unix.cpp',
+        'skia/src/ports/SkTLS_pthread.cpp',
+        'skia/src/utils/SkThreadUtils_pthread.cpp',
     ]
     SOURCES += [
-        'trunk/src/ports/SkFontHost_android_old.cpp',
-        'trunk/src/ports/SkFontHost_cairo.cpp',
-        'trunk/src/ports/SkFontHost_FreeType.cpp',
-        'trunk/src/ports/SkFontHost_FreeType_common.cpp',
+        'skia/src/ports/SkFontHost_android_old.cpp',
+        'skia/src/ports/SkFontHost_cairo.cpp',
+        'skia/src/ports/SkFontHost_FreeType.cpp',
+        'skia/src/ports/SkFontHost_FreeType_common.cpp',
     ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in {'cocoa', 'uikit'}:
     UNIFIED_SOURCES += [
-        'trunk/src/ports/SkDebug_stdio.cpp',
-        'trunk/src/ports/SkOSFile_posix.cpp',
-        'trunk/src/ports/SkTime_Unix.cpp',
-        'trunk/src/ports/SkTLS_pthread.cpp',
-        'trunk/src/utils/mac/SkCreateCGImageRef.cpp',
-        'trunk/src/utils/mac/SkStream_mac.cpp',
-        'trunk/src/utils/SkThreadUtils_pthread.cpp',
+        'skia/src/ports/SkDebug_stdio.cpp',
+        'skia/src/ports/SkOSFile_posix.cpp',
+        'skia/src/ports/SkTime_Unix.cpp',
+        'skia/src/ports/SkTLS_pthread.cpp',
+        'skia/src/utils/mac/SkCreateCGImageRef.cpp',
+        'skia/src/utils/mac/SkStream_mac.cpp',
+        'skia/src/utils/SkThreadUtils_pthread.cpp',
     ]
     SOURCES += [
-        'trunk/src/ports/SkFontHost_mac.cpp',
+        'skia/src/ports/SkFontHost_mac.cpp',
     ]
 if CONFIG['MOZ_WIDGET_GTK']:
     UNIFIED_SOURCES += [
-        'trunk/src/ports/SkDebug_stdio.cpp',
-        'trunk/src/ports/SkOSFile_posix.cpp',
-        'trunk/src/ports/SkTime_Unix.cpp',
-        'trunk/src/ports/SkTLS_pthread.cpp',
-        'trunk/src/utils/SkThreadUtils_pthread.cpp',
+        'skia/src/ports/SkDebug_stdio.cpp',
+        'skia/src/ports/SkOSFile_posix.cpp',
+        'skia/src/ports/SkTime_Unix.cpp',
+        'skia/src/ports/SkTLS_pthread.cpp',
+        'skia/src/utils/SkThreadUtils_pthread.cpp',
     ]
     SOURCES += [
-        'trunk/src/ports/SkFontHost_cairo.cpp',
-        'trunk/src/ports/SkFontHost_FreeType.cpp',
-        'trunk/src/ports/SkFontHost_FreeType_common.cpp',
+        'skia/src/ports/SkFontHost_cairo.cpp',
+        'skia/src/ports/SkFontHost_FreeType.cpp',
+        'skia/src/ports/SkFontHost_FreeType_common.cpp',
     ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     UNIFIED_SOURCES += [
-        'trunk/src/ports/SkDebug_stdio.cpp',
-        'trunk/src/ports/SkOSFile_posix.cpp',
-        'trunk/src/ports/SkTime_Unix.cpp',
-        'trunk/src/ports/SkTLS_pthread.cpp',
-        'trunk/src/utils/SkThreadUtils_pthread.cpp',
+        'skia/src/ports/SkDebug_stdio.cpp',
+        'skia/src/ports/SkOSFile_posix.cpp',
+        'skia/src/ports/SkTime_Unix.cpp',
+        'skia/src/ports/SkTLS_pthread.cpp',
+        'skia/src/utils/SkThreadUtils_pthread.cpp',
     ]
     SOURCES += [
-        'trunk/src/ports/SkFontHost_cairo.cpp',
-        'trunk/src/ports/SkFontHost_FreeType.cpp',
-        'trunk/src/ports/SkFontHost_FreeType_common.cpp',
+        'skia/src/ports/SkFontHost_cairo.cpp',
+        'skia/src/ports/SkFontHost_FreeType.cpp',
+        'skia/src/ports/SkFontHost_FreeType_common.cpp',
     ]
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     SOURCES += [
-        'trunk/src/ports/SkDebug_win.cpp',
-        'trunk/src/ports/SkFontHost_win.cpp',
-        'trunk/src/ports/SkFontMgr_default_dw.cpp',
-        'trunk/src/ports/SkFontMgr_win_dw.cpp',
-        'trunk/src/ports/SkOSFile_win.cpp',
-        'trunk/src/ports/SkRemotableFontMgr_win_dw.cpp',
-        'trunk/src/ports/SkScalerContext_win_dw.cpp',
-        'trunk/src/ports/SkTime_win.cpp',
-        'trunk/src/ports/SkTLS_win.cpp',
-        'trunk/src/ports/SkTypeface_win_dw.cpp',
-        'trunk/src/utils/SkThreadUtils_win.cpp',
-        'trunk/src/utils/win/SkAutoCoInitialize.cpp',
-        'trunk/src/utils/win/SkDWrite.cpp',
-        'trunk/src/utils/win/SkDWriteFontFileStream.cpp',
-        'trunk/src/utils/win/SkDWriteGeometrySink.cpp',
-        'trunk/src/utils/win/SkHRESULT.cpp',
-        'trunk/src/utils/win/SkIStream.cpp',
+        'skia/src/ports/SkDebug_win.cpp',
+        'skia/src/ports/SkFontHost_win.cpp',
+        'skia/src/ports/SkFontMgr_default_dw.cpp',
+        'skia/src/ports/SkFontMgr_win_dw.cpp',
+        'skia/src/ports/SkOSFile_win.cpp',
+        'skia/src/ports/SkRemotableFontMgr_win_dw.cpp',
+        'skia/src/ports/SkScalerContext_win_dw.cpp',
+        'skia/src/ports/SkTime_win.cpp',
+        'skia/src/ports/SkTLS_win.cpp',
+        'skia/src/ports/SkTypeface_win_dw.cpp',
+        'skia/src/utils/SkThreadUtils_win.cpp',
+        'skia/src/utils/win/SkAutoCoInitialize.cpp',
+        'skia/src/utils/win/SkDWrite.cpp',
+        'skia/src/utils/win/SkDWriteFontFileStream.cpp',
+        'skia/src/utils/win/SkDWriteGeometrySink.cpp',
+        'skia/src/utils/win/SkHRESULT.cpp',
+        'skia/src/utils/win/SkIStream.cpp',
     ]
 if CONFIG['INTEL_ARCHITECTURE']:
     UNIFIED_SOURCES += [
-        'trunk/src/opts/SkTextureCompression_opts_none.cpp',
+        'skia/src/opts/SkTextureCompression_opts_none.cpp',
     ]
     SOURCES += [
-        'trunk/src/opts/opts_check_x86.cpp',
-        'trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp',
-        'trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp',
-        'trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp',
-        'trunk/src/opts/SkBlitRect_opts_SSE2.cpp',
-        'trunk/src/opts/SkBlitRow_opts_SSE2.cpp',
-        'trunk/src/opts/SkBlurImage_opts_SSE2.cpp',
-        'trunk/src/opts/SkBlurImage_opts_SSE4.cpp',
-        'trunk/src/opts/SkMorphology_opts_SSE2.cpp',
-        'trunk/src/opts/SkUtils_opts_SSE2.cpp',
-        'trunk/src/opts/SkXfermode_opts_SSE2.cpp',
+        'skia/src/opts/opts_check_x86.cpp',
+        'skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
+        'skia/src/opts/SkBitmapProcState_opts_SSE2.cpp',
+        'skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp',
+        'skia/src/opts/SkBlitRect_opts_SSE2.cpp',
+        'skia/src/opts/SkBlitRow_opts_SSE2.cpp',
+        'skia/src/opts/SkBlurImage_opts_SSE2.cpp',
+        'skia/src/opts/SkBlurImage_opts_SSE4.cpp',
+        'skia/src/opts/SkMorphology_opts_SSE2.cpp',
+        'skia/src/opts/SkUtils_opts_SSE2.cpp',
+        'skia/src/opts/SkXfermode_opts_SSE2.cpp',
     ]
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
     UNIFIED_SOURCES += [
-        'trunk/src/core/SkUtilsArm.cpp',
-        'trunk/src/opts/SkBitmapProcState_opts_arm.cpp',
-        'trunk/src/opts/SkBlitMask_opts_arm.cpp',
-        'trunk/src/opts/SkBlurImage_opts_arm.cpp',
-        'trunk/src/opts/SkMorphology_opts_arm.cpp',
-        'trunk/src/opts/SkTextureCompression_opts_arm.cpp',
-        'trunk/src/opts/SkUtils_opts_arm.cpp',
-        'trunk/src/opts/SkXfermode_opts_arm.cpp',
+        'skia/src/core/SkUtilsArm.cpp',
+        'skia/src/opts/SkBitmapProcState_opts_arm.cpp',
+        'skia/src/opts/SkBlitMask_opts_arm.cpp',
+        'skia/src/opts/SkBlurImage_opts_arm.cpp',
+        'skia/src/opts/SkMorphology_opts_arm.cpp',
+        'skia/src/opts/SkTextureCompression_opts_arm.cpp',
+        'skia/src/opts/SkUtils_opts_arm.cpp',
+        'skia/src/opts/SkXfermode_opts_arm.cpp',
     ]
     SOURCES += [
-        'trunk/src/opts/SkBlitRow_opts_arm.cpp',
+        'skia/src/opts/SkBlitRow_opts_arm.cpp',
     ]
     if CONFIG['BUILD_ARM_NEON']:
         SOURCES += [
-            'trunk/src/opts/SkBitmapProcState_arm_neon.cpp',
-            'trunk/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
-            'trunk/src/opts/SkBlitMask_opts_arm_neon.cpp',
-            'trunk/src/opts/SkBlitRow_opts_arm_neon.cpp',
-            'trunk/src/opts/SkBlurImage_opts_neon.cpp',
-            'trunk/src/opts/SkMorphology_opts_neon.cpp',
-            'trunk/src/opts/SkTextureCompression_opts_neon.cpp',
-            'trunk/src/opts/SkXfermode_opts_arm_neon.cpp',
+            'skia/src/opts/SkBitmapProcState_arm_neon.cpp',
+            'skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
+            'skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
+            'skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
+            'skia/src/opts/SkBlurImage_opts_neon.cpp',
+            'skia/src/opts/SkMorphology_opts_neon.cpp',
+            'skia/src/opts/SkTextureCompression_opts_neon.cpp',
+            'skia/src/opts/SkXfermode_opts_arm_neon.cpp',
         ]
-        SOURCES['trunk/src/opts/SkBitmapProcState_arm_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['trunk/src/opts/SkBitmapProcState_matrixProcs_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['trunk/src/opts/SkBlitMask_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['trunk/src/opts/SkBlitRow_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['trunk/src/opts/SkBlurImage_opts_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['trunk/src/opts/SkMorphology_opts_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['trunk/src/opts/SkTextureCompression_opts_neon.cpp'].flags += ['-mfpu=neon']
-        SOURCES['trunk/src/opts/SkXfermode_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkBitmapProcState_arm_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkBlitMask_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkBlitRow_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkBlurImage_opts_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkMorphology_opts_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkTextureCompression_opts_neon.cpp'].flags += ['-mfpu=neon']
+        SOURCES['skia/src/opts/SkXfermode_opts_arm_neon.cpp'].flags += ['-mfpu=neon']
 else:
     UNIFIED_SOURCES += [
-        'trunk/src/opts/SkBitmapProcState_opts_none.cpp',
-        'trunk/src/opts/SkBlitMask_opts_none.cpp',
-        'trunk/src/opts/SkBlitRow_opts_none.cpp',
-        'trunk/src/opts/SkBlurImage_opts_none.cpp',
-        'trunk/src/opts/SkMorphology_opts_none.cpp',
-        'trunk/src/opts/SkTextureCompression_opts_none.cpp',
-        'trunk/src/opts/SkUtils_opts_none.cpp',
-        'trunk/src/opts/SkXfermode_opts_none.cpp',
+        'skia/src/opts/SkBitmapProcState_opts_none.cpp',
+        'skia/src/opts/SkBlitMask_opts_none.cpp',
+        'skia/src/opts/SkBlitRow_opts_none.cpp',
+        'skia/src/opts/SkBlurImage_opts_none.cpp',
+        'skia/src/opts/SkMorphology_opts_none.cpp',
+        'skia/src/opts/SkTextureCompression_opts_none.cpp',
+        'skia/src/opts/SkUtils_opts_none.cpp',
+        'skia/src/opts/SkXfermode_opts_none.cpp',
     ]
 
 
 # can we find a better way of dealing with asm sources?
 
 # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
 #XXX: doesn't build with Apple's assembler
 if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['OS_TARGET'] != 'Darwin':
     SOURCES += [
-        'trunk/src/opts/memset.arm.S',
+        'skia/src/opts/memset.arm.S',
     ]
     if CONFIG['BUILD_ARM_NEON']:
         SOURCES += [
-            'trunk/src/opts/memset16_neon.S',
-            'trunk/src/opts/memset32_neon.S',
+            'skia/src/opts/memset16_neon.S',
+            'skia/src/opts/memset32_neon.S',
         ]
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC'] and CONFIG['OS_ARCH'] != 'WINNT':
     if CONFIG['CPU_ARCH'] == 'x86_64':
         SOURCES += [
-            'trunk/src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
+            'skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
         ]
     else:
         SOURCES += [
-            'trunk/src/opts/SkBlitRow_opts_SSE4_asm.S',
+            'skia/src/opts/SkBlitRow_opts_SSE4_asm.S',
         ]
 
 FINAL_LIBRARY = 'gkmedias'
 LOCAL_INCLUDES += [
-    'trunk/include/config',
-    'trunk/include/core',
-    'trunk/include/effects',
-    'trunk/include/gpu',
-    'trunk/include/images',
-    'trunk/include/pathops',
-    'trunk/include/pipe',
-    'trunk/include/ports',
-    'trunk/include/utils',
-    'trunk/include/utils/mac',
-    'trunk/include/utils/win',
-    'trunk/include/views',
-    'trunk/src/core',
-    'trunk/src/gpu',
-    'trunk/src/gpu/effects',
-    'trunk/src/gpu/gl',
-    'trunk/src/image',
-    'trunk/src/lazy',
-    'trunk/src/opts',
-    'trunk/src/sfnt',
-    'trunk/src/utils',
-    'trunk/src/utils/mac',
-    'trunk/src/utils/win',
+    'skia/include/config',
+    'skia/include/core',
+    'skia/include/effects',
+    'skia/include/gpu',
+    'skia/include/images',
+    'skia/include/pathops',
+    'skia/include/pipe',
+    'skia/include/ports',
+    'skia/include/utils',
+    'skia/include/utils/mac',
+    'skia/include/utils/win',
+    'skia/include/views',
+    'skia/src/core',
+    'skia/src/gpu',
+    'skia/src/gpu/effects',
+    'skia/src/gpu/gl',
+    'skia/src/image',
+    'skia/src/lazy',
+    'skia/src/opts',
+    'skia/src/sfnt',
+    'skia/src/utils',
+    'skia/src/utils/mac',
+    'skia/src/utils/win',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'qt', 'gonk', 'cocoa', 'uikit'):
     DEFINES['SK_USE_POSIX_THREADS'] = 1
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
     DEFINES['SK_BUILD_SSSE3'] = 1
 
@@ -924,56 +924,56 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     DEFINES['SKIA_DLL'] = 1
     DEFINES['GR_DLL'] = 1
 
 # We should autogenerate these SSE related flags.
 
 if CONFIG['_MSC_VER']:
     # MSVC doesn't need special compiler flags, but Skia needs to be told that these files should
     # be built with the required SSE level or it will simply compile in stubs and cause runtime crashes
-    SOURCES['trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=31']
-    SOURCES['trunk/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=41']
-    SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
-    SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=31']
+    SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=41']
+    SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
+    SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += ['-DSK_CPU_SSE_LEVEL=20']
 
 if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']:
-    SOURCES['trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
-    SOURCES['trunk/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
-    SOURCES['trunk/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-    SOURCES['trunk/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
+    SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+    SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
 elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC'] and CONFIG['BUILD_ARM_NEON']:
     DEFINES['__ARM_HAVE_OPTIONAL_NEON_SUPPORT'] = 1
     DEFINES['USE_ANDROID_NDK_CPU_FEATURES'] = 0
 elif CONFIG['CLANG_CL']:
-    SOURCES['trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
-    SOURCES['trunk/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
+    SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3']
+    SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1']
 
 DEFINES['SKIA_IMPLEMENTATION'] = 1
 DEFINES['GR_IMPLEMENTATION'] = 1
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
     ]
     if not CONFIG['CLANG_CXX']:
         CXXFLAGS += ['-Wno-logical-op']
     if CONFIG['CPU_ARCH'] == 'arm':
-        SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
+        SOURCES['skia/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
diff --git a/gfx/skia/trunk/include/animator/SkAnimator.h b/gfx/skia/skia/include/animator/SkAnimator.h
rename from gfx/skia/trunk/include/animator/SkAnimator.h
rename to gfx/skia/skia/include/animator/SkAnimator.h
diff --git a/gfx/skia/trunk/include/animator/SkAnimatorView.h b/gfx/skia/skia/include/animator/SkAnimatorView.h
rename from gfx/skia/trunk/include/animator/SkAnimatorView.h
rename to gfx/skia/skia/include/animator/SkAnimatorView.h
diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/skia/include/config/SkUserConfig.h
rename from gfx/skia/trunk/include/config/SkUserConfig.h
rename to gfx/skia/skia/include/config/SkUserConfig.h
diff --git a/gfx/skia/trunk/include/core/SkAdvancedTypefaceMetrics.h b/gfx/skia/skia/include/core/SkAdvancedTypefaceMetrics.h
rename from gfx/skia/trunk/include/core/SkAdvancedTypefaceMetrics.h
rename to gfx/skia/skia/include/core/SkAdvancedTypefaceMetrics.h
diff --git a/gfx/skia/trunk/include/core/SkAnnotation.h b/gfx/skia/skia/include/core/SkAnnotation.h
rename from gfx/skia/trunk/include/core/SkAnnotation.h
rename to gfx/skia/skia/include/core/SkAnnotation.h
diff --git a/gfx/skia/trunk/include/core/SkBBHFactory.h b/gfx/skia/skia/include/core/SkBBHFactory.h
rename from gfx/skia/trunk/include/core/SkBBHFactory.h
rename to gfx/skia/skia/include/core/SkBBHFactory.h
diff --git a/gfx/skia/trunk/include/core/SkBitmap.h b/gfx/skia/skia/include/core/SkBitmap.h
rename from gfx/skia/trunk/include/core/SkBitmap.h
rename to gfx/skia/skia/include/core/SkBitmap.h
diff --git a/gfx/skia/trunk/include/core/SkBitmapDevice.h b/gfx/skia/skia/include/core/SkBitmapDevice.h
rename from gfx/skia/trunk/include/core/SkBitmapDevice.h
rename to gfx/skia/skia/include/core/SkBitmapDevice.h
diff --git a/gfx/skia/trunk/include/core/SkBlitRow.h b/gfx/skia/skia/include/core/SkBlitRow.h
rename from gfx/skia/trunk/include/core/SkBlitRow.h
rename to gfx/skia/skia/include/core/SkBlitRow.h
diff --git a/gfx/skia/trunk/include/core/SkBlurTypes.h b/gfx/skia/skia/include/core/SkBlurTypes.h
rename from gfx/skia/trunk/include/core/SkBlurTypes.h
rename to gfx/skia/skia/include/core/SkBlurTypes.h
diff --git a/gfx/skia/trunk/include/core/SkCanvas.h b/gfx/skia/skia/include/core/SkCanvas.h
rename from gfx/skia/trunk/include/core/SkCanvas.h
rename to gfx/skia/skia/include/core/SkCanvas.h
diff --git a/gfx/skia/trunk/include/core/SkChunkAlloc.h b/gfx/skia/skia/include/core/SkChunkAlloc.h
rename from gfx/skia/trunk/include/core/SkChunkAlloc.h
rename to gfx/skia/skia/include/core/SkChunkAlloc.h
diff --git a/gfx/skia/trunk/include/core/SkClipStack.h b/gfx/skia/skia/include/core/SkClipStack.h
rename from gfx/skia/trunk/include/core/SkClipStack.h
rename to gfx/skia/skia/include/core/SkClipStack.h
diff --git a/gfx/skia/trunk/include/core/SkColor.h b/gfx/skia/skia/include/core/SkColor.h
rename from gfx/skia/trunk/include/core/SkColor.h
rename to gfx/skia/skia/include/core/SkColor.h
diff --git a/gfx/skia/trunk/include/core/SkColorFilter.h b/gfx/skia/skia/include/core/SkColorFilter.h
rename from gfx/skia/trunk/include/core/SkColorFilter.h
rename to gfx/skia/skia/include/core/SkColorFilter.h
diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/skia/include/core/SkColorPriv.h
rename from gfx/skia/trunk/include/core/SkColorPriv.h
rename to gfx/skia/skia/include/core/SkColorPriv.h
diff --git a/gfx/skia/trunk/include/core/SkColorShader.h b/gfx/skia/skia/include/core/SkColorShader.h
rename from gfx/skia/trunk/include/core/SkColorShader.h
rename to gfx/skia/skia/include/core/SkColorShader.h
diff --git a/gfx/skia/trunk/include/core/SkColorTable.h b/gfx/skia/skia/include/core/SkColorTable.h
rename from gfx/skia/trunk/include/core/SkColorTable.h
rename to gfx/skia/skia/include/core/SkColorTable.h
diff --git a/gfx/skia/trunk/include/core/SkComposeShader.h b/gfx/skia/skia/include/core/SkComposeShader.h
rename from gfx/skia/trunk/include/core/SkComposeShader.h
rename to gfx/skia/skia/include/core/SkComposeShader.h
diff --git a/gfx/skia/trunk/include/core/SkData.h b/gfx/skia/skia/include/core/SkData.h
rename from gfx/skia/trunk/include/core/SkData.h
rename to gfx/skia/skia/include/core/SkData.h
diff --git a/gfx/skia/trunk/include/core/SkDataTable.h b/gfx/skia/skia/include/core/SkDataTable.h
rename from gfx/skia/trunk/include/core/SkDataTable.h
rename to gfx/skia/skia/include/core/SkDataTable.h
diff --git a/gfx/skia/trunk/include/core/SkDeque.h b/gfx/skia/skia/include/core/SkDeque.h
rename from gfx/skia/trunk/include/core/SkDeque.h
rename to gfx/skia/skia/include/core/SkDeque.h
diff --git a/gfx/skia/trunk/include/core/SkDevice.h b/gfx/skia/skia/include/core/SkDevice.h
rename from gfx/skia/trunk/include/core/SkDevice.h
rename to gfx/skia/skia/include/core/SkDevice.h
diff --git a/gfx/skia/trunk/include/core/SkDeviceProperties.h b/gfx/skia/skia/include/core/SkDeviceProperties.h
rename from gfx/skia/trunk/include/core/SkDeviceProperties.h
rename to gfx/skia/skia/include/core/SkDeviceProperties.h
diff --git a/gfx/skia/trunk/include/core/SkDither.h b/gfx/skia/skia/include/core/SkDither.h
rename from gfx/skia/trunk/include/core/SkDither.h
rename to gfx/skia/skia/include/core/SkDither.h
diff --git a/gfx/skia/trunk/include/core/SkDocument.h b/gfx/skia/skia/include/core/SkDocument.h
rename from gfx/skia/trunk/include/core/SkDocument.h
rename to gfx/skia/skia/include/core/SkDocument.h
diff --git a/gfx/skia/trunk/include/core/SkDraw.h b/gfx/skia/skia/include/core/SkDraw.h
rename from gfx/skia/trunk/include/core/SkDraw.h
rename to gfx/skia/skia/include/core/SkDraw.h
diff --git a/gfx/skia/trunk/include/core/SkDrawFilter.h b/gfx/skia/skia/include/core/SkDrawFilter.h
rename from gfx/skia/trunk/include/core/SkDrawFilter.h
rename to gfx/skia/skia/include/core/SkDrawFilter.h
diff --git a/gfx/skia/trunk/include/core/SkDrawLooper.h b/gfx/skia/skia/include/core/SkDrawLooper.h
rename from gfx/skia/trunk/include/core/SkDrawLooper.h
rename to gfx/skia/skia/include/core/SkDrawLooper.h
diff --git a/gfx/skia/trunk/include/core/SkDrawPictureCallback.h b/gfx/skia/skia/include/core/SkDrawPictureCallback.h
rename from gfx/skia/trunk/include/core/SkDrawPictureCallback.h
rename to gfx/skia/skia/include/core/SkDrawPictureCallback.h
diff --git a/gfx/skia/trunk/include/core/SkDynamicAnnotations.h b/gfx/skia/skia/include/core/SkDynamicAnnotations.h
rename from gfx/skia/trunk/include/core/SkDynamicAnnotations.h
rename to gfx/skia/skia/include/core/SkDynamicAnnotations.h
diff --git a/gfx/skia/trunk/include/core/SkEndian.h b/gfx/skia/skia/include/core/SkEndian.h
rename from gfx/skia/trunk/include/core/SkEndian.h
rename to gfx/skia/skia/include/core/SkEndian.h
diff --git a/gfx/skia/trunk/include/core/SkError.h b/gfx/skia/skia/include/core/SkError.h
rename from gfx/skia/trunk/include/core/SkError.h
rename to gfx/skia/skia/include/core/SkError.h
diff --git a/gfx/skia/trunk/include/core/SkFixed.h b/gfx/skia/skia/include/core/SkFixed.h
rename from gfx/skia/trunk/include/core/SkFixed.h
rename to gfx/skia/skia/include/core/SkFixed.h
diff --git a/gfx/skia/trunk/include/core/SkFlattenable.h b/gfx/skia/skia/include/core/SkFlattenable.h
rename from gfx/skia/trunk/include/core/SkFlattenable.h
rename to gfx/skia/skia/include/core/SkFlattenable.h
diff --git a/gfx/skia/trunk/include/core/SkFlattenableBuffers.h b/gfx/skia/skia/include/core/SkFlattenableBuffers.h
rename from gfx/skia/trunk/include/core/SkFlattenableBuffers.h
rename to gfx/skia/skia/include/core/SkFlattenableBuffers.h
diff --git a/gfx/skia/trunk/include/core/SkFlattenableSerialization.h b/gfx/skia/skia/include/core/SkFlattenableSerialization.h
rename from gfx/skia/trunk/include/core/SkFlattenableSerialization.h
rename to gfx/skia/skia/include/core/SkFlattenableSerialization.h
diff --git a/gfx/skia/trunk/include/core/SkFloatBits.h b/gfx/skia/skia/include/core/SkFloatBits.h
rename from gfx/skia/trunk/include/core/SkFloatBits.h
rename to gfx/skia/skia/include/core/SkFloatBits.h
diff --git a/gfx/skia/trunk/include/core/SkFloatingPoint.h b/gfx/skia/skia/include/core/SkFloatingPoint.h
rename from gfx/skia/trunk/include/core/SkFloatingPoint.h
rename to gfx/skia/skia/include/core/SkFloatingPoint.h
diff --git a/gfx/skia/trunk/include/core/SkFont.h b/gfx/skia/skia/include/core/SkFont.h
rename from gfx/skia/trunk/include/core/SkFont.h
rename to gfx/skia/skia/include/core/SkFont.h
diff --git a/gfx/skia/trunk/include/core/SkFontHost.h b/gfx/skia/skia/include/core/SkFontHost.h
rename from gfx/skia/trunk/include/core/SkFontHost.h
rename to gfx/skia/skia/include/core/SkFontHost.h
diff --git a/gfx/skia/trunk/include/core/SkFontLCDConfig.h b/gfx/skia/skia/include/core/SkFontLCDConfig.h
rename from gfx/skia/trunk/include/core/SkFontLCDConfig.h
rename to gfx/skia/skia/include/core/SkFontLCDConfig.h
diff --git a/gfx/skia/trunk/include/core/SkGraphics.h b/gfx/skia/skia/include/core/SkGraphics.h
rename from gfx/skia/trunk/include/core/SkGraphics.h
rename to gfx/skia/skia/include/core/SkGraphics.h
diff --git a/gfx/skia/trunk/include/core/SkImage.h b/gfx/skia/skia/include/core/SkImage.h
rename from gfx/skia/trunk/include/core/SkImage.h
rename to gfx/skia/skia/include/core/SkImage.h
diff --git a/gfx/skia/trunk/include/core/SkImageDecoder.h b/gfx/skia/skia/include/core/SkImageDecoder.h
rename from gfx/skia/trunk/include/core/SkImageDecoder.h
rename to gfx/skia/skia/include/core/SkImageDecoder.h
diff --git a/gfx/skia/trunk/include/core/SkImageEncoder.h b/gfx/skia/skia/include/core/SkImageEncoder.h
rename from gfx/skia/trunk/include/core/SkImageEncoder.h
rename to gfx/skia/skia/include/core/SkImageEncoder.h
diff --git a/gfx/skia/trunk/include/core/SkImageFilter.h b/gfx/skia/skia/include/core/SkImageFilter.h
rename from gfx/skia/trunk/include/core/SkImageFilter.h
rename to gfx/skia/skia/include/core/SkImageFilter.h
diff --git a/gfx/skia/trunk/include/core/SkImageGenerator.h b/gfx/skia/skia/include/core/SkImageGenerator.h
rename from gfx/skia/trunk/include/core/SkImageGenerator.h
rename to gfx/skia/skia/include/core/SkImageGenerator.h
diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/skia/include/core/SkImageInfo.h
rename from gfx/skia/trunk/include/core/SkImageInfo.h
rename to gfx/skia/skia/include/core/SkImageInfo.h
diff --git a/gfx/skia/trunk/include/core/SkInstCnt.h b/gfx/skia/skia/include/core/SkInstCnt.h
rename from gfx/skia/trunk/include/core/SkInstCnt.h
rename to gfx/skia/skia/include/core/SkInstCnt.h
diff --git a/gfx/skia/trunk/include/core/SkMallocPixelRef.h b/gfx/skia/skia/include/core/SkMallocPixelRef.h
rename from gfx/skia/trunk/include/core/SkMallocPixelRef.h
rename to gfx/skia/skia/include/core/SkMallocPixelRef.h
diff --git a/gfx/skia/trunk/include/core/SkMask.h b/gfx/skia/skia/include/core/SkMask.h
rename from gfx/skia/trunk/include/core/SkMask.h
rename to gfx/skia/skia/include/core/SkMask.h
diff --git a/gfx/skia/trunk/include/core/SkMaskFilter.h b/gfx/skia/skia/include/core/SkMaskFilter.h
rename from gfx/skia/trunk/include/core/SkMaskFilter.h
rename to gfx/skia/skia/include/core/SkMaskFilter.h
diff --git a/gfx/skia/trunk/include/core/SkMath.h b/gfx/skia/skia/include/core/SkMath.h
rename from gfx/skia/trunk/include/core/SkMath.h
rename to gfx/skia/skia/include/core/SkMath.h
diff --git a/gfx/skia/trunk/include/core/SkMatrix.h b/gfx/skia/skia/include/core/SkMatrix.h
rename from gfx/skia/trunk/include/core/SkMatrix.h
rename to gfx/skia/skia/include/core/SkMatrix.h
diff --git a/gfx/skia/trunk/include/core/SkMetaData.h b/gfx/skia/skia/include/core/SkMetaData.h
rename from gfx/skia/trunk/include/core/SkMetaData.h
rename to gfx/skia/skia/include/core/SkMetaData.h
diff --git a/gfx/skia/trunk/include/core/SkOSFile.h b/gfx/skia/skia/include/core/SkOSFile.h
rename from gfx/skia/trunk/include/core/SkOSFile.h
rename to gfx/skia/skia/include/core/SkOSFile.h
diff --git a/gfx/skia/trunk/include/core/SkOnce.h b/gfx/skia/skia/include/core/SkOnce.h
rename from gfx/skia/trunk/include/core/SkOnce.h
rename to gfx/skia/skia/include/core/SkOnce.h
diff --git a/gfx/skia/trunk/include/core/SkPackBits.h b/gfx/skia/skia/include/core/SkPackBits.h
rename from gfx/skia/trunk/include/core/SkPackBits.h
rename to gfx/skia/skia/include/core/SkPackBits.h
diff --git a/gfx/skia/trunk/include/core/SkPaint.h b/gfx/skia/skia/include/core/SkPaint.h
rename from gfx/skia/trunk/include/core/SkPaint.h
rename to gfx/skia/skia/include/core/SkPaint.h
diff --git a/gfx/skia/trunk/include/core/SkPaintOptionsAndroid.h b/gfx/skia/skia/include/core/SkPaintOptionsAndroid.h
rename from gfx/skia/trunk/include/core/SkPaintOptionsAndroid.h
rename to gfx/skia/skia/include/core/SkPaintOptionsAndroid.h
diff --git a/gfx/skia/trunk/include/core/SkPatch.h b/gfx/skia/skia/include/core/SkPatch.h
rename from gfx/skia/trunk/include/core/SkPatch.h
rename to gfx/skia/skia/include/core/SkPatch.h
diff --git a/gfx/skia/trunk/include/core/SkPath.h b/gfx/skia/skia/include/core/SkPath.h
rename from gfx/skia/trunk/include/core/SkPath.h
rename to gfx/skia/skia/include/core/SkPath.h
diff --git a/gfx/skia/trunk/include/core/SkPathEffect.h b/gfx/skia/skia/include/core/SkPathEffect.h
rename from gfx/skia/trunk/include/core/SkPathEffect.h
rename to gfx/skia/skia/include/core/SkPathEffect.h
diff --git a/gfx/skia/trunk/include/core/SkPathMeasure.h b/gfx/skia/skia/include/core/SkPathMeasure.h
rename from gfx/skia/trunk/include/core/SkPathMeasure.h
rename to gfx/skia/skia/include/core/SkPathMeasure.h
diff --git a/gfx/skia/trunk/include/core/SkPathRef.h b/gfx/skia/skia/include/core/SkPathRef.h
rename from gfx/skia/trunk/include/core/SkPathRef.h
rename to gfx/skia/skia/include/core/SkPathRef.h
diff --git a/gfx/skia/trunk/include/core/SkPicture.h b/gfx/skia/skia/include/core/SkPicture.h
rename from gfx/skia/trunk/include/core/SkPicture.h
rename to gfx/skia/skia/include/core/SkPicture.h
diff --git a/gfx/skia/trunk/include/core/SkPictureRecorder.h b/gfx/skia/skia/include/core/SkPictureRecorder.h
rename from gfx/skia/trunk/include/core/SkPictureRecorder.h
rename to gfx/skia/skia/include/core/SkPictureRecorder.h
diff --git a/gfx/skia/trunk/include/core/SkPixelRef.h b/gfx/skia/skia/include/core/SkPixelRef.h
rename from gfx/skia/trunk/include/core/SkPixelRef.h
rename to gfx/skia/skia/include/core/SkPixelRef.h
diff --git a/gfx/skia/trunk/include/core/SkPoint.h b/gfx/skia/skia/include/core/SkPoint.h
rename from gfx/skia/trunk/include/core/SkPoint.h
rename to gfx/skia/skia/include/core/SkPoint.h
diff --git a/gfx/skia/trunk/include/core/SkPostConfig.h b/gfx/skia/skia/include/core/SkPostConfig.h
rename from gfx/skia/trunk/include/core/SkPostConfig.h
rename to gfx/skia/skia/include/core/SkPostConfig.h
diff --git a/gfx/skia/trunk/include/core/SkPreConfig.h b/gfx/skia/skia/include/core/SkPreConfig.h
rename from gfx/skia/trunk/include/core/SkPreConfig.h
rename to gfx/skia/skia/include/core/SkPreConfig.h
diff --git a/gfx/skia/trunk/include/core/SkRRect.h b/gfx/skia/skia/include/core/SkRRect.h
rename from gfx/skia/trunk/include/core/SkRRect.h
rename to gfx/skia/skia/include/core/SkRRect.h
diff --git a/gfx/skia/trunk/include/core/SkRasterizer.h b/gfx/skia/skia/include/core/SkRasterizer.h
rename from gfx/skia/trunk/include/core/SkRasterizer.h
rename to gfx/skia/skia/include/core/SkRasterizer.h
diff --git a/gfx/skia/trunk/include/core/SkReadBuffer.h b/gfx/skia/skia/include/core/SkReadBuffer.h
rename from gfx/skia/trunk/include/core/SkReadBuffer.h
rename to gfx/skia/skia/include/core/SkReadBuffer.h
diff --git a/gfx/skia/trunk/include/core/SkReader32.h b/gfx/skia/skia/include/core/SkReader32.h
rename from gfx/skia/trunk/include/core/SkReader32.h
rename to gfx/skia/skia/include/core/SkReader32.h
diff --git a/gfx/skia/trunk/include/core/SkRect.h b/gfx/skia/skia/include/core/SkRect.h
rename from gfx/skia/trunk/include/core/SkRect.h
rename to gfx/skia/skia/include/core/SkRect.h
diff --git a/gfx/skia/trunk/include/core/SkRefCnt.h b/gfx/skia/skia/include/core/SkRefCnt.h
rename from gfx/skia/trunk/include/core/SkRefCnt.h
rename to gfx/skia/skia/include/core/SkRefCnt.h
diff --git a/gfx/skia/trunk/include/core/SkRegion.h b/gfx/skia/skia/include/core/SkRegion.h
rename from gfx/skia/trunk/include/core/SkRegion.h
rename to gfx/skia/skia/include/core/SkRegion.h
diff --git a/gfx/skia/trunk/include/core/SkScalar.h b/gfx/skia/skia/include/core/SkScalar.h
rename from gfx/skia/trunk/include/core/SkScalar.h
rename to gfx/skia/skia/include/core/SkScalar.h
diff --git a/gfx/skia/trunk/include/core/SkShader.h b/gfx/skia/skia/include/core/SkShader.h
rename from gfx/skia/trunk/include/core/SkShader.h
rename to gfx/skia/skia/include/core/SkShader.h
diff --git a/gfx/skia/trunk/include/core/SkSize.h b/gfx/skia/skia/include/core/SkSize.h
rename from gfx/skia/trunk/include/core/SkSize.h
rename to gfx/skia/skia/include/core/SkSize.h
diff --git a/gfx/skia/trunk/include/core/SkStream.h b/gfx/skia/skia/include/core/SkStream.h
rename from gfx/skia/trunk/include/core/SkStream.h
rename to gfx/skia/skia/include/core/SkStream.h
diff --git a/gfx/skia/trunk/include/core/SkString.h b/gfx/skia/skia/include/core/SkString.h
rename from gfx/skia/trunk/include/core/SkString.h
rename to gfx/skia/skia/include/core/SkString.h
diff --git a/gfx/skia/trunk/include/core/SkStrokeRec.h b/gfx/skia/skia/include/core/SkStrokeRec.h
rename from gfx/skia/trunk/include/core/SkStrokeRec.h
rename to gfx/skia/skia/include/core/SkStrokeRec.h
diff --git a/gfx/skia/trunk/include/core/SkSurface.h b/gfx/skia/skia/include/core/SkSurface.h
rename from gfx/skia/trunk/include/core/SkSurface.h
rename to gfx/skia/skia/include/core/SkSurface.h
diff --git a/gfx/skia/trunk/include/core/SkTArray.h b/gfx/skia/skia/include/core/SkTArray.h
rename from gfx/skia/trunk/include/core/SkTArray.h
rename to gfx/skia/skia/include/core/SkTArray.h
diff --git a/gfx/skia/trunk/include/core/SkTDArray.h b/gfx/skia/skia/include/core/SkTDArray.h
rename from gfx/skia/trunk/include/core/SkTDArray.h
rename to gfx/skia/skia/include/core/SkTDArray.h
diff --git a/gfx/skia/trunk/include/core/SkTDStack.h b/gfx/skia/skia/include/core/SkTDStack.h
rename from gfx/skia/trunk/include/core/SkTDStack.h
rename to gfx/skia/skia/include/core/SkTDStack.h
diff --git a/gfx/skia/trunk/include/core/SkTDict.h b/gfx/skia/skia/include/core/SkTDict.h
rename from gfx/skia/trunk/include/core/SkTDict.h
rename to gfx/skia/skia/include/core/SkTDict.h
diff --git a/gfx/skia/trunk/include/core/SkTInternalLList.h b/gfx/skia/skia/include/core/SkTInternalLList.h
rename from gfx/skia/trunk/include/core/SkTInternalLList.h
rename to gfx/skia/skia/include/core/SkTInternalLList.h
diff --git a/gfx/skia/trunk/include/core/SkTLazy.h b/gfx/skia/skia/include/core/SkTLazy.h
rename from gfx/skia/trunk/include/core/SkTLazy.h
rename to gfx/skia/skia/include/core/SkTLazy.h
diff --git a/gfx/skia/trunk/include/core/SkTRegistry.h b/gfx/skia/skia/include/core/SkTRegistry.h
rename from gfx/skia/trunk/include/core/SkTRegistry.h
rename to gfx/skia/skia/include/core/SkTRegistry.h
diff --git a/gfx/skia/trunk/include/core/SkTSearch.h b/gfx/skia/skia/include/core/SkTSearch.h
rename from gfx/skia/trunk/include/core/SkTSearch.h
rename to gfx/skia/skia/include/core/SkTSearch.h
diff --git a/gfx/skia/trunk/include/core/SkTemplates.h b/gfx/skia/skia/include/core/SkTemplates.h
rename from gfx/skia/trunk/include/core/SkTemplates.h
rename to gfx/skia/skia/include/core/SkTemplates.h
diff --git a/gfx/skia/trunk/include/core/SkThread.h b/gfx/skia/skia/include/core/SkThread.h
rename from gfx/skia/trunk/include/core/SkThread.h
rename to gfx/skia/skia/include/core/SkThread.h
diff --git a/gfx/skia/trunk/include/core/SkTime.h b/gfx/skia/skia/include/core/SkTime.h
rename from gfx/skia/trunk/include/core/SkTime.h
rename to gfx/skia/skia/include/core/SkTime.h
diff --git a/gfx/skia/trunk/include/core/SkTypeface.h b/gfx/skia/skia/include/core/SkTypeface.h
rename from gfx/skia/trunk/include/core/SkTypeface.h
rename to gfx/skia/skia/include/core/SkTypeface.h
diff --git a/gfx/skia/trunk/include/core/SkTypes.h b/gfx/skia/skia/include/core/SkTypes.h
rename from gfx/skia/trunk/include/core/SkTypes.h
rename to gfx/skia/skia/include/core/SkTypes.h
diff --git a/gfx/skia/trunk/include/core/SkUnPreMultiply.h b/gfx/skia/skia/include/core/SkUnPreMultiply.h
rename from gfx/skia/trunk/include/core/SkUnPreMultiply.h
rename to gfx/skia/skia/include/core/SkUnPreMultiply.h
diff --git a/gfx/skia/trunk/include/core/SkUtils.h b/gfx/skia/skia/include/core/SkUtils.h
rename from gfx/skia/trunk/include/core/SkUtils.h
rename to gfx/skia/skia/include/core/SkUtils.h
diff --git a/gfx/skia/trunk/include/core/SkWeakRefCnt.h b/gfx/skia/skia/include/core/SkWeakRefCnt.h
rename from gfx/skia/trunk/include/core/SkWeakRefCnt.h
rename to gfx/skia/skia/include/core/SkWeakRefCnt.h
diff --git a/gfx/skia/trunk/include/core/SkWriteBuffer.h b/gfx/skia/skia/include/core/SkWriteBuffer.h
rename from gfx/skia/trunk/include/core/SkWriteBuffer.h
rename to gfx/skia/skia/include/core/SkWriteBuffer.h
diff --git a/gfx/skia/trunk/include/core/SkWriter32.h b/gfx/skia/skia/include/core/SkWriter32.h
rename from gfx/skia/trunk/include/core/SkWriter32.h
rename to gfx/skia/skia/include/core/SkWriter32.h
diff --git a/gfx/skia/trunk/include/core/SkXfermode.h b/gfx/skia/skia/include/core/SkXfermode.h
rename from gfx/skia/trunk/include/core/SkXfermode.h
rename to gfx/skia/skia/include/core/SkXfermode.h
diff --git a/gfx/skia/trunk/include/device/xps/SkConstexprMath.h b/gfx/skia/skia/include/device/xps/SkConstexprMath.h
rename from gfx/skia/trunk/include/device/xps/SkConstexprMath.h
rename to gfx/skia/skia/include/device/xps/SkConstexprMath.h
diff --git a/gfx/skia/trunk/include/device/xps/SkXPSDevice.h b/gfx/skia/skia/include/device/xps/SkXPSDevice.h
rename from gfx/skia/trunk/include/device/xps/SkXPSDevice.h
rename to gfx/skia/skia/include/device/xps/SkXPSDevice.h
diff --git a/gfx/skia/trunk/include/effects/Sk1DPathEffect.h b/gfx/skia/skia/include/effects/Sk1DPathEffect.h
rename from gfx/skia/trunk/include/effects/Sk1DPathEffect.h
rename to gfx/skia/skia/include/effects/Sk1DPathEffect.h
diff --git a/gfx/skia/trunk/include/effects/Sk2DPathEffect.h b/gfx/skia/skia/include/effects/Sk2DPathEffect.h
rename from gfx/skia/trunk/include/effects/Sk2DPathEffect.h
rename to gfx/skia/skia/include/effects/Sk2DPathEffect.h
diff --git a/gfx/skia/trunk/include/effects/SkAlphaThresholdFilter.h b/gfx/skia/skia/include/effects/SkAlphaThresholdFilter.h
rename from gfx/skia/trunk/include/effects/SkAlphaThresholdFilter.h
rename to gfx/skia/skia/include/effects/SkAlphaThresholdFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkArithmeticMode.h b/gfx/skia/skia/include/effects/SkArithmeticMode.h
rename from gfx/skia/trunk/include/effects/SkArithmeticMode.h
rename to gfx/skia/skia/include/effects/SkArithmeticMode.h
diff --git a/gfx/skia/trunk/include/effects/SkAvoidXfermode.h b/gfx/skia/skia/include/effects/SkAvoidXfermode.h
rename from gfx/skia/trunk/include/effects/SkAvoidXfermode.h
rename to gfx/skia/skia/include/effects/SkAvoidXfermode.h
diff --git a/gfx/skia/trunk/include/effects/SkBitmapSource.h b/gfx/skia/skia/include/effects/SkBitmapSource.h
rename from gfx/skia/trunk/include/effects/SkBitmapSource.h
rename to gfx/skia/skia/include/effects/SkBitmapSource.h
diff --git a/gfx/skia/trunk/include/effects/SkBlurDrawLooper.h b/gfx/skia/skia/include/effects/SkBlurDrawLooper.h
rename from gfx/skia/trunk/include/effects/SkBlurDrawLooper.h
rename to gfx/skia/skia/include/effects/SkBlurDrawLooper.h
diff --git a/gfx/skia/trunk/include/effects/SkBlurImageFilter.h b/gfx/skia/skia/include/effects/SkBlurImageFilter.h
rename from gfx/skia/trunk/include/effects/SkBlurImageFilter.h
rename to gfx/skia/skia/include/effects/SkBlurImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkBlurMaskFilter.h b/gfx/skia/skia/include/effects/SkBlurMaskFilter.h
rename from gfx/skia/trunk/include/effects/SkBlurMaskFilter.h
rename to gfx/skia/skia/include/effects/SkBlurMaskFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkColorFilterImageFilter.h b/gfx/skia/skia/include/effects/SkColorFilterImageFilter.h
rename from gfx/skia/trunk/include/effects/SkColorFilterImageFilter.h
rename to gfx/skia/skia/include/effects/SkColorFilterImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkColorMatrix.h b/gfx/skia/skia/include/effects/SkColorMatrix.h
rename from gfx/skia/trunk/include/effects/SkColorMatrix.h
rename to gfx/skia/skia/include/effects/SkColorMatrix.h
diff --git a/gfx/skia/trunk/include/effects/SkColorMatrixFilter.h b/gfx/skia/skia/include/effects/SkColorMatrixFilter.h
rename from gfx/skia/trunk/include/effects/SkColorMatrixFilter.h
rename to gfx/skia/skia/include/effects/SkColorMatrixFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkComposeImageFilter.h b/gfx/skia/skia/include/effects/SkComposeImageFilter.h
rename from gfx/skia/trunk/include/effects/SkComposeImageFilter.h
rename to gfx/skia/skia/include/effects/SkComposeImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkCornerPathEffect.h b/gfx/skia/skia/include/effects/SkCornerPathEffect.h
rename from gfx/skia/trunk/include/effects/SkCornerPathEffect.h
rename to gfx/skia/skia/include/effects/SkCornerPathEffect.h
diff --git a/gfx/skia/trunk/include/effects/SkDashPathEffect.h b/gfx/skia/skia/include/effects/SkDashPathEffect.h
rename from gfx/skia/trunk/include/effects/SkDashPathEffect.h
rename to gfx/skia/skia/include/effects/SkDashPathEffect.h
diff --git a/gfx/skia/trunk/include/effects/SkDiscretePathEffect.h b/gfx/skia/skia/include/effects/SkDiscretePathEffect.h
rename from gfx/skia/trunk/include/effects/SkDiscretePathEffect.h
rename to gfx/skia/skia/include/effects/SkDiscretePathEffect.h
diff --git a/gfx/skia/trunk/include/effects/SkDisplacementMapEffect.h b/gfx/skia/skia/include/effects/SkDisplacementMapEffect.h
rename from gfx/skia/trunk/include/effects/SkDisplacementMapEffect.h
rename to gfx/skia/skia/include/effects/SkDisplacementMapEffect.h
diff --git a/gfx/skia/trunk/include/effects/SkDrawExtraPathEffect.h b/gfx/skia/skia/include/effects/SkDrawExtraPathEffect.h
rename from gfx/skia/trunk/include/effects/SkDrawExtraPathEffect.h
rename to gfx/skia/skia/include/effects/SkDrawExtraPathEffect.h
diff --git a/gfx/skia/trunk/include/effects/SkDropShadowImageFilter.h b/gfx/skia/skia/include/effects/SkDropShadowImageFilter.h
rename from gfx/skia/trunk/include/effects/SkDropShadowImageFilter.h
rename to gfx/skia/skia/include/effects/SkDropShadowImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkEmbossMaskFilter.h b/gfx/skia/skia/include/effects/SkEmbossMaskFilter.h
rename from gfx/skia/trunk/include/effects/SkEmbossMaskFilter.h
rename to gfx/skia/skia/include/effects/SkEmbossMaskFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkGradientShader.h b/gfx/skia/skia/include/effects/SkGradientShader.h
rename from gfx/skia/trunk/include/effects/SkGradientShader.h
rename to gfx/skia/skia/include/effects/SkGradientShader.h
diff --git a/gfx/skia/trunk/include/effects/SkLayerDrawLooper.h b/gfx/skia/skia/include/effects/SkLayerDrawLooper.h
rename from gfx/skia/trunk/include/effects/SkLayerDrawLooper.h
rename to gfx/skia/skia/include/effects/SkLayerDrawLooper.h
diff --git a/gfx/skia/trunk/include/effects/SkLayerRasterizer.h b/gfx/skia/skia/include/effects/SkLayerRasterizer.h
rename from gfx/skia/trunk/include/effects/SkLayerRasterizer.h
rename to gfx/skia/skia/include/effects/SkLayerRasterizer.h
diff --git a/gfx/skia/trunk/include/effects/SkLerpXfermode.h b/gfx/skia/skia/include/effects/SkLerpXfermode.h
rename from gfx/skia/trunk/include/effects/SkLerpXfermode.h
rename to gfx/skia/skia/include/effects/SkLerpXfermode.h
diff --git a/gfx/skia/trunk/include/effects/SkLightingImageFilter.h b/gfx/skia/skia/include/effects/SkLightingImageFilter.h
rename from gfx/skia/trunk/include/effects/SkLightingImageFilter.h
rename to gfx/skia/skia/include/effects/SkLightingImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkLumaColorFilter.h b/gfx/skia/skia/include/effects/SkLumaColorFilter.h
rename from gfx/skia/trunk/include/effects/SkLumaColorFilter.h
rename to gfx/skia/skia/include/effects/SkLumaColorFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkMagnifierImageFilter.h b/gfx/skia/skia/include/effects/SkMagnifierImageFilter.h
rename from gfx/skia/trunk/include/effects/SkMagnifierImageFilter.h
rename to gfx/skia/skia/include/effects/SkMagnifierImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkMatrixConvolutionImageFilter.h b/gfx/skia/skia/include/effects/SkMatrixConvolutionImageFilter.h
rename from gfx/skia/trunk/include/effects/SkMatrixConvolutionImageFilter.h
rename to gfx/skia/skia/include/effects/SkMatrixConvolutionImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkMatrixImageFilter.h b/gfx/skia/skia/include/effects/SkMatrixImageFilter.h
rename from gfx/skia/trunk/include/effects/SkMatrixImageFilter.h
rename to gfx/skia/skia/include/effects/SkMatrixImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkMergeImageFilter.h b/gfx/skia/skia/include/effects/SkMergeImageFilter.h
rename from gfx/skia/trunk/include/effects/SkMergeImageFilter.h
rename to gfx/skia/skia/include/effects/SkMergeImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkMorphologyImageFilter.h b/gfx/skia/skia/include/effects/SkMorphologyImageFilter.h
rename from gfx/skia/trunk/include/effects/SkMorphologyImageFilter.h
rename to gfx/skia/skia/include/effects/SkMorphologyImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkOffsetImageFilter.h b/gfx/skia/skia/include/effects/SkOffsetImageFilter.h
rename from gfx/skia/trunk/include/effects/SkOffsetImageFilter.h
rename to gfx/skia/skia/include/effects/SkOffsetImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkPaintFlagsDrawFilter.h b/gfx/skia/skia/include/effects/SkPaintFlagsDrawFilter.h
rename from gfx/skia/trunk/include/effects/SkPaintFlagsDrawFilter.h
rename to gfx/skia/skia/include/effects/SkPaintFlagsDrawFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkPerlinNoiseShader.h b/gfx/skia/skia/include/effects/SkPerlinNoiseShader.h
rename from gfx/skia/trunk/include/effects/SkPerlinNoiseShader.h
rename to gfx/skia/skia/include/effects/SkPerlinNoiseShader.h
diff --git a/gfx/skia/trunk/include/effects/SkPictureImageFilter.h b/gfx/skia/skia/include/effects/SkPictureImageFilter.h
rename from gfx/skia/trunk/include/effects/SkPictureImageFilter.h
rename to gfx/skia/skia/include/effects/SkPictureImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkPixelXorXfermode.h b/gfx/skia/skia/include/effects/SkPixelXorXfermode.h
rename from gfx/skia/trunk/include/effects/SkPixelXorXfermode.h
rename to gfx/skia/skia/include/effects/SkPixelXorXfermode.h
diff --git a/gfx/skia/trunk/include/effects/SkPorterDuff.h b/gfx/skia/skia/include/effects/SkPorterDuff.h
rename from gfx/skia/trunk/include/effects/SkPorterDuff.h
rename to gfx/skia/skia/include/effects/SkPorterDuff.h
diff --git a/gfx/skia/trunk/include/effects/SkRectShaderImageFilter.h b/gfx/skia/skia/include/effects/SkRectShaderImageFilter.h
rename from gfx/skia/trunk/include/effects/SkRectShaderImageFilter.h
rename to gfx/skia/skia/include/effects/SkRectShaderImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkStippleMaskFilter.h b/gfx/skia/skia/include/effects/SkStippleMaskFilter.h
rename from gfx/skia/trunk/include/effects/SkStippleMaskFilter.h
rename to gfx/skia/skia/include/effects/SkStippleMaskFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkTableColorFilter.h b/gfx/skia/skia/include/effects/SkTableColorFilter.h
rename from gfx/skia/trunk/include/effects/SkTableColorFilter.h
rename to gfx/skia/skia/include/effects/SkTableColorFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkTableMaskFilter.h b/gfx/skia/skia/include/effects/SkTableMaskFilter.h
rename from gfx/skia/trunk/include/effects/SkTableMaskFilter.h
rename to gfx/skia/skia/include/effects/SkTableMaskFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkTestImageFilters.h b/gfx/skia/skia/include/effects/SkTestImageFilters.h
rename from gfx/skia/trunk/include/effects/SkTestImageFilters.h
rename to gfx/skia/skia/include/effects/SkTestImageFilters.h
diff --git a/gfx/skia/trunk/include/effects/SkTileImageFilter.h b/gfx/skia/skia/include/effects/SkTileImageFilter.h
rename from gfx/skia/trunk/include/effects/SkTileImageFilter.h
rename to gfx/skia/skia/include/effects/SkTileImageFilter.h
diff --git a/gfx/skia/trunk/include/effects/SkTransparentShader.h b/gfx/skia/skia/include/effects/SkTransparentShader.h
rename from gfx/skia/trunk/include/effects/SkTransparentShader.h
rename to gfx/skia/skia/include/effects/SkTransparentShader.h
diff --git a/gfx/skia/trunk/include/effects/SkXfermodeImageFilter.h b/gfx/skia/skia/include/effects/SkXfermodeImageFilter.h
rename from gfx/skia/trunk/include/effects/SkXfermodeImageFilter.h
rename to gfx/skia/skia/include/effects/SkXfermodeImageFilter.h
diff --git a/gfx/skia/trunk/include/gpu/GrBackendEffectFactory.h b/gfx/skia/skia/include/gpu/GrBackendEffectFactory.h
rename from gfx/skia/trunk/include/gpu/GrBackendEffectFactory.h
rename to gfx/skia/skia/include/gpu/GrBackendEffectFactory.h
diff --git a/gfx/skia/trunk/include/gpu/GrClipData.h b/gfx/skia/skia/include/gpu/GrClipData.h
rename from gfx/skia/trunk/include/gpu/GrClipData.h
rename to gfx/skia/skia/include/gpu/GrClipData.h
diff --git a/gfx/skia/trunk/include/gpu/GrColor.h b/gfx/skia/skia/include/gpu/GrColor.h
rename from gfx/skia/trunk/include/gpu/GrColor.h
rename to gfx/skia/skia/include/gpu/GrColor.h
diff --git a/gfx/skia/trunk/include/gpu/GrConfig.h b/gfx/skia/skia/include/gpu/GrConfig.h
rename from gfx/skia/trunk/include/gpu/GrConfig.h
rename to gfx/skia/skia/include/gpu/GrConfig.h
diff --git a/gfx/skia/trunk/include/gpu/GrContext.h b/gfx/skia/skia/include/gpu/GrContext.h
rename from gfx/skia/trunk/include/gpu/GrContext.h
rename to gfx/skia/skia/include/gpu/GrContext.h
diff --git a/gfx/skia/trunk/include/gpu/GrContextFactory.h b/gfx/skia/skia/include/gpu/GrContextFactory.h
rename from gfx/skia/trunk/include/gpu/GrContextFactory.h
rename to gfx/skia/skia/include/gpu/GrContextFactory.h
diff --git a/gfx/skia/trunk/include/gpu/GrCoordTransform.h b/gfx/skia/skia/include/gpu/GrCoordTransform.h
rename from gfx/skia/trunk/include/gpu/GrCoordTransform.h
rename to gfx/skia/skia/include/gpu/GrCoordTransform.h
diff --git a/gfx/skia/trunk/include/gpu/GrDrawEffect.h b/gfx/skia/skia/include/gpu/GrDrawEffect.h
rename from gfx/skia/trunk/include/gpu/GrDrawEffect.h
rename to gfx/skia/skia/include/gpu/GrDrawEffect.h
diff --git a/gfx/skia/trunk/include/gpu/GrEffect.h b/gfx/skia/skia/include/gpu/GrEffect.h
rename from gfx/skia/trunk/include/gpu/GrEffect.h
rename to gfx/skia/skia/include/gpu/GrEffect.h
diff --git a/gfx/skia/trunk/include/gpu/GrEffectStage.h b/gfx/skia/skia/include/gpu/GrEffectStage.h
rename from gfx/skia/trunk/include/gpu/GrEffectStage.h
rename to gfx/skia/skia/include/gpu/GrEffectStage.h
diff --git a/gfx/skia/trunk/include/gpu/GrEffectUnitTest.h b/gfx/skia/skia/include/gpu/GrEffectUnitTest.h
rename from gfx/skia/trunk/include/gpu/GrEffectUnitTest.h
rename to gfx/skia/skia/include/gpu/GrEffectUnitTest.h
diff --git a/gfx/skia/trunk/include/gpu/GrFontScaler.h b/gfx/skia/skia/include/gpu/GrFontScaler.h
rename from gfx/skia/trunk/include/gpu/GrFontScaler.h
rename to gfx/skia/skia/include/gpu/GrFontScaler.h
diff --git a/gfx/skia/trunk/include/gpu/GrGlyph.h b/gfx/skia/skia/include/gpu/GrGlyph.h
rename from gfx/skia/trunk/include/gpu/GrGlyph.h
rename to gfx/skia/skia/include/gpu/GrGlyph.h
diff --git a/gfx/skia/trunk/include/gpu/GrGpuResource.h b/gfx/skia/skia/include/gpu/GrGpuResource.h
rename from gfx/skia/trunk/include/gpu/GrGpuResource.h
rename to gfx/skia/skia/include/gpu/GrGpuResource.h
diff --git a/gfx/skia/trunk/include/gpu/GrPaint.h b/gfx/skia/skia/include/gpu/GrPaint.h
rename from gfx/skia/trunk/include/gpu/GrPaint.h
rename to gfx/skia/skia/include/gpu/GrPaint.h
diff --git a/gfx/skia/trunk/include/gpu/GrPathRendererChain.h b/gfx/skia/skia/include/gpu/GrPathRendererChain.h
rename from gfx/skia/trunk/include/gpu/GrPathRendererChain.h
rename to gfx/skia/skia/include/gpu/GrPathRendererChain.h
diff --git a/gfx/skia/trunk/include/gpu/GrRect.h b/gfx/skia/skia/include/gpu/GrRect.h
rename from gfx/skia/trunk/include/gpu/GrRect.h
rename to gfx/skia/skia/include/gpu/GrRect.h
diff --git a/gfx/skia/trunk/include/gpu/GrRenderTarget.h b/gfx/skia/skia/include/gpu/GrRenderTarget.h
rename from gfx/skia/trunk/include/gpu/GrRenderTarget.h
rename to gfx/skia/skia/include/gpu/GrRenderTarget.h
diff --git a/gfx/skia/trunk/include/gpu/GrSurface.h b/gfx/skia/skia/include/gpu/GrSurface.h
rename from gfx/skia/trunk/include/gpu/GrSurface.h
rename to gfx/skia/skia/include/gpu/GrSurface.h
diff --git a/gfx/skia/trunk/include/gpu/GrTBackendEffectFactory.h b/gfx/skia/skia/include/gpu/GrTBackendEffectFactory.h
rename from gfx/skia/trunk/include/gpu/GrTBackendEffectFactory.h
rename to gfx/skia/skia/include/gpu/GrTBackendEffectFactory.h
diff --git a/gfx/skia/trunk/include/gpu/GrTexture.h b/gfx/skia/skia/include/gpu/GrTexture.h
rename from gfx/skia/trunk/include/gpu/GrTexture.h
rename to gfx/skia/skia/include/gpu/GrTexture.h
diff --git a/gfx/skia/trunk/include/gpu/GrTextureAccess.h b/gfx/skia/skia/include/gpu/GrTextureAccess.h
rename from gfx/skia/trunk/include/gpu/GrTextureAccess.h
rename to gfx/skia/skia/include/gpu/GrTextureAccess.h
diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/skia/include/gpu/GrTypes.h
rename from gfx/skia/trunk/include/gpu/GrTypes.h
rename to gfx/skia/skia/include/gpu/GrTypes.h
diff --git a/gfx/skia/trunk/include/gpu/GrTypesPriv.h b/gfx/skia/skia/include/gpu/GrTypesPriv.h
rename from gfx/skia/trunk/include/gpu/GrTypesPriv.h
rename to gfx/skia/skia/include/gpu/GrTypesPriv.h
diff --git a/gfx/skia/trunk/include/gpu/GrUserConfig.h b/gfx/skia/skia/include/gpu/GrUserConfig.h
rename from gfx/skia/trunk/include/gpu/GrUserConfig.h
rename to gfx/skia/skia/include/gpu/GrUserConfig.h
diff --git a/gfx/skia/trunk/include/gpu/SkGpuDevice.h b/gfx/skia/skia/include/gpu/SkGpuDevice.h
rename from gfx/skia/trunk/include/gpu/SkGpuDevice.h
rename to gfx/skia/skia/include/gpu/SkGpuDevice.h
diff --git a/gfx/skia/trunk/include/gpu/SkGr.h b/gfx/skia/skia/include/gpu/SkGr.h
rename from gfx/skia/trunk/include/gpu/SkGr.h
rename to gfx/skia/skia/include/gpu/SkGr.h
diff --git a/gfx/skia/trunk/include/gpu/SkGrPixelRef.h b/gfx/skia/skia/include/gpu/SkGrPixelRef.h
rename from gfx/skia/trunk/include/gpu/SkGrPixelRef.h
rename to gfx/skia/skia/include/gpu/SkGrPixelRef.h
diff --git a/gfx/skia/trunk/include/gpu/SkGrTexturePixelRef.h b/gfx/skia/skia/include/gpu/SkGrTexturePixelRef.h
rename from gfx/skia/trunk/include/gpu/SkGrTexturePixelRef.h
rename to gfx/skia/skia/include/gpu/SkGrTexturePixelRef.h
diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLConfig.h b/gfx/skia/skia/include/gpu/gl/GrGLConfig.h
rename from gfx/skia/trunk/include/gpu/gl/GrGLConfig.h
rename to gfx/skia/skia/include/gpu/gl/GrGLConfig.h
diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLConfig_chrome.h b/gfx/skia/skia/include/gpu/gl/GrGLConfig_chrome.h
rename from gfx/skia/trunk/include/gpu/gl/GrGLConfig_chrome.h
rename to gfx/skia/skia/include/gpu/gl/GrGLConfig_chrome.h
diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLExtensions.h b/gfx/skia/skia/include/gpu/gl/GrGLExtensions.h
rename from gfx/skia/trunk/include/gpu/gl/GrGLExtensions.h
rename to gfx/skia/skia/include/gpu/gl/GrGLExtensions.h
diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLFunctions.h b/gfx/skia/skia/include/gpu/gl/GrGLFunctions.h
rename from gfx/skia/trunk/include/gpu/gl/GrGLFunctions.h
rename to gfx/skia/skia/include/gpu/gl/GrGLFunctions.h
diff --git a/gfx/skia/trunk/include/gpu/gl/GrGLInterface.h b/gfx/skia/skia/include/gpu/gl/GrGLInterface.h
rename from gfx/skia/trunk/include/gpu/gl/GrGLInterface.h
rename to gfx/skia/skia/include/gpu/gl/GrGLInterface.h
diff --git a/gfx/skia/trunk/include/gpu/gl/SkANGLEGLContext.h b/gfx/skia/skia/include/gpu/gl/SkANGLEGLContext.h
rename from gfx/skia/trunk/include/gpu/gl/SkANGLEGLContext.h
rename to gfx/skia/skia/include/gpu/gl/SkANGLEGLContext.h
diff --git a/gfx/skia/trunk/include/gpu/gl/SkDebugGLContext.h b/gfx/skia/skia/include/gpu/gl/SkDebugGLContext.h
rename from gfx/skia/trunk/include/gpu/gl/SkDebugGLContext.h
rename to gfx/skia/skia/include/gpu/gl/SkDebugGLContext.h
diff --git a/gfx/skia/trunk/include/gpu/gl/SkGLContextHelper.h b/gfx/skia/skia/include/gpu/gl/SkGLContextHelper.h
rename from gfx/skia/trunk/include/gpu/gl/SkGLContextHelper.h
rename to gfx/skia/skia/include/gpu/gl/SkGLContextHelper.h
diff --git a/gfx/skia/trunk/include/gpu/gl/SkMesaGLContext.h b/gfx/skia/skia/include/gpu/gl/SkMesaGLContext.h
rename from gfx/skia/trunk/include/gpu/gl/SkMesaGLContext.h
rename to gfx/skia/skia/include/gpu/gl/SkMesaGLContext.h
diff --git a/gfx/skia/trunk/include/gpu/gl/SkNativeGLContext.h b/gfx/skia/skia/include/gpu/gl/SkNativeGLContext.h
rename from gfx/skia/trunk/include/gpu/gl/SkNativeGLContext.h
rename to gfx/skia/skia/include/gpu/gl/SkNativeGLContext.h
diff --git a/gfx/skia/trunk/include/gpu/gl/SkNullGLContext.h b/gfx/skia/skia/include/gpu/gl/SkNullGLContext.h
rename from gfx/skia/trunk/include/gpu/gl/SkNullGLContext.h
rename to gfx/skia/skia/include/gpu/gl/SkNullGLContext.h
diff --git a/gfx/skia/trunk/include/images/SkDecodingImageGenerator.h b/gfx/skia/skia/include/images/SkDecodingImageGenerator.h
rename from gfx/skia/trunk/include/images/SkDecodingImageGenerator.h
rename to gfx/skia/skia/include/images/SkDecodingImageGenerator.h
diff --git a/gfx/skia/trunk/include/images/SkForceLinking.h b/gfx/skia/skia/include/images/SkForceLinking.h
rename from gfx/skia/trunk/include/images/SkForceLinking.h
rename to gfx/skia/skia/include/images/SkForceLinking.h
diff --git a/gfx/skia/trunk/include/images/SkMovie.h b/gfx/skia/skia/include/images/SkMovie.h
rename from gfx/skia/trunk/include/images/SkMovie.h
rename to gfx/skia/skia/include/images/SkMovie.h
diff --git a/gfx/skia/trunk/include/images/SkPageFlipper.h b/gfx/skia/skia/include/images/SkPageFlipper.h
rename from gfx/skia/trunk/include/images/SkPageFlipper.h
rename to gfx/skia/skia/include/images/SkPageFlipper.h
diff --git a/gfx/skia/trunk/include/pathops/SkPathOps.h b/gfx/skia/skia/include/pathops/SkPathOps.h
rename from gfx/skia/trunk/include/pathops/SkPathOps.h
rename to gfx/skia/skia/include/pathops/SkPathOps.h
diff --git a/gfx/skia/trunk/include/pdf/SkPDFDevice.h b/gfx/skia/skia/include/pdf/SkPDFDevice.h
rename from gfx/skia/trunk/include/pdf/SkPDFDevice.h
rename to gfx/skia/skia/include/pdf/SkPDFDevice.h
diff --git a/gfx/skia/trunk/include/pdf/SkPDFDocument.h b/gfx/skia/skia/include/pdf/SkPDFDocument.h
rename from gfx/skia/trunk/include/pdf/SkPDFDocument.h
rename to gfx/skia/skia/include/pdf/SkPDFDocument.h
diff --git a/gfx/skia/trunk/include/pipe/SkGPipe.h b/gfx/skia/skia/include/pipe/SkGPipe.h
rename from gfx/skia/trunk/include/pipe/SkGPipe.h
rename to gfx/skia/skia/include/pipe/SkGPipe.h
diff --git a/gfx/skia/trunk/include/ports/SkFontConfigInterface.h b/gfx/skia/skia/include/ports/SkFontConfigInterface.h
rename from gfx/skia/trunk/include/ports/SkFontConfigInterface.h
rename to gfx/skia/skia/include/ports/SkFontConfigInterface.h
diff --git a/gfx/skia/trunk/include/ports/SkFontMgr.h b/gfx/skia/skia/include/ports/SkFontMgr.h
rename from gfx/skia/trunk/include/ports/SkFontMgr.h
rename to gfx/skia/skia/include/ports/SkFontMgr.h
diff --git a/gfx/skia/trunk/include/ports/SkFontMgr_indirect.h b/gfx/skia/skia/include/ports/SkFontMgr_indirect.h
rename from gfx/skia/trunk/include/ports/SkFontMgr_indirect.h
rename to gfx/skia/skia/include/ports/SkFontMgr_indirect.h
diff --git a/gfx/skia/trunk/include/ports/SkFontStyle.h b/gfx/skia/skia/include/ports/SkFontStyle.h
rename from gfx/skia/trunk/include/ports/SkFontStyle.h
rename to gfx/skia/skia/include/ports/SkFontStyle.h
diff --git a/gfx/skia/trunk/include/ports/SkRemotableFontMgr.h b/gfx/skia/skia/include/ports/SkRemotableFontMgr.h
rename from gfx/skia/trunk/include/ports/SkRemotableFontMgr.h
rename to gfx/skia/skia/include/ports/SkRemotableFontMgr.h
diff --git a/gfx/skia/trunk/include/ports/SkTypeface_android.h b/gfx/skia/skia/include/ports/SkTypeface_android.h
rename from gfx/skia/trunk/include/ports/SkTypeface_android.h
rename to gfx/skia/skia/include/ports/SkTypeface_android.h
diff --git a/gfx/skia/trunk/include/ports/SkTypeface_cairo.h b/gfx/skia/skia/include/ports/SkTypeface_cairo.h
rename from gfx/skia/trunk/include/ports/SkTypeface_cairo.h
rename to gfx/skia/skia/include/ports/SkTypeface_cairo.h
diff --git a/gfx/skia/trunk/include/ports/SkTypeface_mac.h b/gfx/skia/skia/include/ports/SkTypeface_mac.h
rename from gfx/skia/trunk/include/ports/SkTypeface_mac.h
rename to gfx/skia/skia/include/ports/SkTypeface_mac.h
diff --git a/gfx/skia/trunk/include/ports/SkTypeface_win.h b/gfx/skia/skia/include/ports/SkTypeface_win.h
rename from gfx/skia/trunk/include/ports/SkTypeface_win.h
rename to gfx/skia/skia/include/ports/SkTypeface_win.h
diff --git a/gfx/skia/trunk/include/record/SkRecording.h b/gfx/skia/skia/include/record/SkRecording.h
rename from gfx/skia/trunk/include/record/SkRecording.h
rename to gfx/skia/skia/include/record/SkRecording.h
diff --git a/gfx/skia/trunk/include/svg/SkSVGAttribute.h b/gfx/skia/skia/include/svg/SkSVGAttribute.h
rename from gfx/skia/trunk/include/svg/SkSVGAttribute.h
rename to gfx/skia/skia/include/svg/SkSVGAttribute.h
diff --git a/gfx/skia/trunk/include/svg/SkSVGBase.h b/gfx/skia/skia/include/svg/SkSVGBase.h
rename from gfx/skia/trunk/include/svg/SkSVGBase.h
rename to gfx/skia/skia/include/svg/SkSVGBase.h
diff --git a/gfx/skia/trunk/include/svg/SkSVGPaintState.h b/gfx/skia/skia/include/svg/SkSVGPaintState.h
rename from gfx/skia/trunk/include/svg/SkSVGPaintState.h
rename to gfx/skia/skia/include/svg/SkSVGPaintState.h
diff --git a/gfx/skia/trunk/include/svg/SkSVGParser.h b/gfx/skia/skia/include/svg/SkSVGParser.h
rename from gfx/skia/trunk/include/svg/SkSVGParser.h
rename to gfx/skia/skia/include/svg/SkSVGParser.h
diff --git a/gfx/skia/trunk/include/svg/SkSVGTypes.h b/gfx/skia/skia/include/svg/SkSVGTypes.h
rename from gfx/skia/trunk/include/svg/SkSVGTypes.h
rename to gfx/skia/skia/include/svg/SkSVGTypes.h
diff --git a/gfx/skia/trunk/include/utils/SkBoundaryPatch.h b/gfx/skia/skia/include/utils/SkBoundaryPatch.h
rename from gfx/skia/trunk/include/utils/SkBoundaryPatch.h
rename to gfx/skia/skia/include/utils/SkBoundaryPatch.h
diff --git a/gfx/skia/trunk/include/utils/SkCamera.h b/gfx/skia/skia/include/utils/SkCamera.h
rename from gfx/skia/trunk/include/utils/SkCamera.h
rename to gfx/skia/skia/include/utils/SkCamera.h
diff --git a/gfx/skia/trunk/include/utils/SkCanvasStateUtils.h b/gfx/skia/skia/include/utils/SkCanvasStateUtils.h
rename from gfx/skia/trunk/include/utils/SkCanvasStateUtils.h
rename to gfx/skia/skia/include/utils/SkCanvasStateUtils.h
diff --git a/gfx/skia/trunk/include/utils/SkCondVar.h b/gfx/skia/skia/include/utils/SkCondVar.h
rename from gfx/skia/trunk/include/utils/SkCondVar.h
rename to gfx/skia/skia/include/utils/SkCondVar.h
diff --git a/gfx/skia/trunk/include/utils/SkCubicInterval.h b/gfx/skia/skia/include/utils/SkCubicInterval.h
rename from gfx/skia/trunk/include/utils/SkCubicInterval.h
rename to gfx/skia/skia/include/utils/SkCubicInterval.h
diff --git a/gfx/skia/trunk/include/utils/SkCullPoints.h b/gfx/skia/skia/include/utils/SkCullPoints.h
rename from gfx/skia/trunk/include/utils/SkCullPoints.h
rename to gfx/skia/skia/include/utils/SkCullPoints.h
diff --git a/gfx/skia/trunk/include/utils/SkDebugUtils.h b/gfx/skia/skia/include/utils/SkDebugUtils.h
rename from gfx/skia/trunk/include/utils/SkDebugUtils.h
rename to gfx/skia/skia/include/utils/SkDebugUtils.h
diff --git a/gfx/skia/trunk/include/utils/SkDeferredCanvas.h b/gfx/skia/skia/include/utils/SkDeferredCanvas.h
rename from gfx/skia/trunk/include/utils/SkDeferredCanvas.h
rename to gfx/skia/skia/include/utils/SkDeferredCanvas.h
diff --git a/gfx/skia/trunk/include/utils/SkDumpCanvas.h b/gfx/skia/skia/include/utils/SkDumpCanvas.h
rename from gfx/skia/trunk/include/utils/SkDumpCanvas.h
rename to gfx/skia/skia/include/utils/SkDumpCanvas.h
diff --git a/gfx/skia/trunk/include/utils/SkEventTracer.h b/gfx/skia/skia/include/utils/SkEventTracer.h
rename from gfx/skia/trunk/include/utils/SkEventTracer.h
rename to gfx/skia/skia/include/utils/SkEventTracer.h
diff --git a/gfx/skia/trunk/include/utils/SkFrontBufferedStream.h b/gfx/skia/skia/include/utils/SkFrontBufferedStream.h
rename from gfx/skia/trunk/include/utils/SkFrontBufferedStream.h
rename to gfx/skia/skia/include/utils/SkFrontBufferedStream.h
diff --git a/gfx/skia/trunk/include/utils/SkInterpolator.h b/gfx/skia/skia/include/utils/SkInterpolator.h
rename from gfx/skia/trunk/include/utils/SkInterpolator.h
rename to gfx/skia/skia/include/utils/SkInterpolator.h
diff --git a/gfx/skia/trunk/include/utils/SkJSONCPP.h b/gfx/skia/skia/include/utils/SkJSONCPP.h
rename from gfx/skia/trunk/include/utils/SkJSONCPP.h
rename to gfx/skia/skia/include/utils/SkJSONCPP.h
diff --git a/gfx/skia/trunk/include/utils/SkLayer.h b/gfx/skia/skia/include/utils/SkLayer.h
rename from gfx/skia/trunk/include/utils/SkLayer.h
rename to gfx/skia/skia/include/utils/SkLayer.h
diff --git a/gfx/skia/trunk/include/utils/SkLua.h b/gfx/skia/skia/include/utils/SkLua.h
rename from gfx/skia/trunk/include/utils/SkLua.h
rename to gfx/skia/skia/include/utils/SkLua.h
diff --git a/gfx/skia/trunk/include/utils/SkLuaCanvas.h b/gfx/skia/skia/include/utils/SkLuaCanvas.h
rename from gfx/skia/trunk/include/utils/SkLuaCanvas.h
rename to gfx/skia/skia/include/utils/SkLuaCanvas.h
diff --git a/gfx/skia/trunk/include/utils/SkMatrix44.h b/gfx/skia/skia/include/utils/SkMatrix44.h
rename from gfx/skia/trunk/include/utils/SkMatrix44.h
rename to gfx/skia/skia/include/utils/SkMatrix44.h
diff --git a/gfx/skia/trunk/include/utils/SkMeshUtils.h b/gfx/skia/skia/include/utils/SkMeshUtils.h
rename from gfx/skia/trunk/include/utils/SkMeshUtils.h
rename to gfx/skia/skia/include/utils/SkMeshUtils.h
diff --git a/gfx/skia/trunk/include/utils/SkNWayCanvas.h b/gfx/skia/skia/include/utils/SkNWayCanvas.h
rename from gfx/skia/trunk/include/utils/SkNWayCanvas.h
rename to gfx/skia/skia/include/utils/SkNWayCanvas.h
diff --git a/gfx/skia/trunk/include/utils/SkNinePatch.h b/gfx/skia/skia/include/utils/SkNinePatch.h
rename from gfx/skia/trunk/include/utils/SkNinePatch.h
rename to gfx/skia/skia/include/utils/SkNinePatch.h
diff --git a/gfx/skia/trunk/include/utils/SkNoSaveLayerCanvas.h b/gfx/skia/skia/include/utils/SkNoSaveLayerCanvas.h
rename from gfx/skia/trunk/include/utils/SkNoSaveLayerCanvas.h
rename to gfx/skia/skia/include/utils/SkNoSaveLayerCanvas.h
diff --git a/gfx/skia/trunk/include/utils/SkNullCanvas.h b/gfx/skia/skia/include/utils/SkNullCanvas.h
rename from gfx/skia/trunk/include/utils/SkNullCanvas.h
rename to gfx/skia/skia/include/utils/SkNullCanvas.h
diff --git a/gfx/skia/trunk/include/utils/SkParse.h b/gfx/skia/skia/include/utils/SkParse.h
rename from gfx/skia/trunk/include/utils/SkParse.h
rename to gfx/skia/skia/include/utils/SkParse.h
diff --git a/gfx/skia/trunk/include/utils/SkParsePaint.h b/gfx/skia/skia/include/utils/SkParsePaint.h
rename from gfx/skia/trunk/include/utils/SkParsePaint.h
rename to gfx/skia/skia/include/utils/SkParsePaint.h
diff --git a/gfx/skia/trunk/include/utils/SkParsePath.h b/gfx/skia/skia/include/utils/SkParsePath.h
rename from gfx/skia/trunk/include/utils/SkParsePath.h
rename to gfx/skia/skia/include/utils/SkParsePath.h
diff --git a/gfx/skia/trunk/include/utils/SkPathUtils.h b/gfx/skia/skia/include/utils/SkPathUtils.h
rename from gfx/skia/trunk/include/utils/SkPathUtils.h
rename to gfx/skia/skia/include/utils/SkPathUtils.h
diff --git a/gfx/skia/trunk/include/utils/SkPictureUtils.h b/gfx/skia/skia/include/utils/SkPictureUtils.h
rename from gfx/skia/trunk/include/utils/SkPictureUtils.h
rename to gfx/skia/skia/include/utils/SkPictureUtils.h
diff --git a/gfx/skia/trunk/include/utils/SkProxyCanvas.h b/gfx/skia/skia/include/utils/SkProxyCanvas.h
rename from gfx/skia/trunk/include/utils/SkProxyCanvas.h
rename to gfx/skia/skia/include/utils/SkProxyCanvas.h
diff --git a/gfx/skia/trunk/include/utils/SkRTConf.h b/gfx/skia/skia/include/utils/SkRTConf.h
rename from gfx/skia/trunk/include/utils/SkRTConf.h
rename to gfx/skia/skia/include/utils/SkRTConf.h
diff --git a/gfx/skia/trunk/include/utils/SkRandom.h b/gfx/skia/skia/include/utils/SkRandom.h
rename from gfx/skia/trunk/include/utils/SkRandom.h
rename to gfx/skia/skia/include/utils/SkRandom.h
diff --git a/gfx/skia/trunk/include/utils/SkRunnable.h b/gfx/skia/skia/include/utils/SkRunnable.h
rename from gfx/skia/trunk/include/utils/SkRunnable.h
rename to gfx/skia/skia/include/utils/SkRunnable.h
diff --git a/gfx/skia/trunk/include/utils/SkThreadPool.h b/gfx/skia/skia/include/utils/SkThreadPool.h
rename from gfx/skia/trunk/include/utils/SkThreadPool.h
rename to gfx/skia/skia/include/utils/SkThreadPool.h
diff --git a/gfx/skia/trunk/include/utils/SkWGL.h b/gfx/skia/skia/include/utils/SkWGL.h
rename from gfx/skia/trunk/include/utils/SkWGL.h
rename to gfx/skia/skia/include/utils/SkWGL.h
diff --git a/gfx/skia/trunk/include/utils/ios/SkStream_NSData.h b/gfx/skia/skia/include/utils/ios/SkStream_NSData.h
rename from gfx/skia/trunk/include/utils/ios/SkStream_NSData.h
rename to gfx/skia/skia/include/utils/ios/SkStream_NSData.h
diff --git a/gfx/skia/trunk/include/utils/mac/SkCGUtils.h b/gfx/skia/skia/include/utils/mac/SkCGUtils.h
rename from gfx/skia/trunk/include/utils/mac/SkCGUtils.h
rename to gfx/skia/skia/include/utils/mac/SkCGUtils.h
diff --git a/gfx/skia/trunk/include/utils/win/SkAutoCoInitialize.h b/gfx/skia/skia/include/utils/win/SkAutoCoInitialize.h
rename from gfx/skia/trunk/include/utils/win/SkAutoCoInitialize.h
rename to gfx/skia/skia/include/utils/win/SkAutoCoInitialize.h
diff --git a/gfx/skia/trunk/include/utils/win/SkHRESULT.h b/gfx/skia/skia/include/utils/win/SkHRESULT.h
rename from gfx/skia/trunk/include/utils/win/SkHRESULT.h
rename to gfx/skia/skia/include/utils/win/SkHRESULT.h
diff --git a/gfx/skia/trunk/include/utils/win/SkIStream.h b/gfx/skia/skia/include/utils/win/SkIStream.h
rename from gfx/skia/trunk/include/utils/win/SkIStream.h
rename to gfx/skia/skia/include/utils/win/SkIStream.h
diff --git a/gfx/skia/trunk/include/utils/win/SkTScopedComPtr.h b/gfx/skia/skia/include/utils/win/SkTScopedComPtr.h
rename from gfx/skia/trunk/include/utils/win/SkTScopedComPtr.h
rename to gfx/skia/skia/include/utils/win/SkTScopedComPtr.h
diff --git a/gfx/skia/trunk/include/views/SkApplication.h b/gfx/skia/skia/include/views/SkApplication.h
rename from gfx/skia/trunk/include/views/SkApplication.h
rename to gfx/skia/skia/include/views/SkApplication.h
diff --git a/gfx/skia/trunk/include/views/SkBGViewArtist.h b/gfx/skia/skia/include/views/SkBGViewArtist.h
rename from gfx/skia/trunk/include/views/SkBGViewArtist.h
rename to gfx/skia/skia/include/views/SkBGViewArtist.h
diff --git a/gfx/skia/trunk/include/views/SkEvent.h b/gfx/skia/skia/include/views/SkEvent.h
rename from gfx/skia/trunk/include/views/SkEvent.h
rename to gfx/skia/skia/include/views/SkEvent.h
diff --git a/gfx/skia/trunk/include/views/SkEventSink.h b/gfx/skia/skia/include/views/SkEventSink.h
rename from gfx/skia/trunk/include/views/SkEventSink.h
rename to gfx/skia/skia/include/views/SkEventSink.h
diff --git a/gfx/skia/trunk/include/views/SkKey.h b/gfx/skia/skia/include/views/SkKey.h
rename from gfx/skia/trunk/include/views/SkKey.h
rename to gfx/skia/skia/include/views/SkKey.h
diff --git a/gfx/skia/trunk/include/views/SkOSMenu.h b/gfx/skia/skia/include/views/SkOSMenu.h
rename from gfx/skia/trunk/include/views/SkOSMenu.h
rename to gfx/skia/skia/include/views/SkOSMenu.h
diff --git a/gfx/skia/trunk/include/views/SkOSWindow_Android.h b/gfx/skia/skia/include/views/SkOSWindow_Android.h
rename from gfx/skia/trunk/include/views/SkOSWindow_Android.h
rename to gfx/skia/skia/include/views/SkOSWindow_Android.h
diff --git a/gfx/skia/trunk/include/views/SkOSWindow_Mac.h b/gfx/skia/skia/include/views/SkOSWindow_Mac.h
rename from gfx/skia/trunk/include/views/SkOSWindow_Mac.h
rename to gfx/skia/skia/include/views/SkOSWindow_Mac.h
diff --git a/gfx/skia/trunk/include/views/SkOSWindow_NaCl.h b/gfx/skia/skia/include/views/SkOSWindow_NaCl.h
rename from gfx/skia/trunk/include/views/SkOSWindow_NaCl.h
rename to gfx/skia/skia/include/views/SkOSWindow_NaCl.h
diff --git a/gfx/skia/trunk/include/views/SkOSWindow_SDL.h b/gfx/skia/skia/include/views/SkOSWindow_SDL.h
rename from gfx/skia/trunk/include/views/SkOSWindow_SDL.h
rename to gfx/skia/skia/include/views/SkOSWindow_SDL.h
diff --git a/gfx/skia/trunk/include/views/SkOSWindow_Unix.h b/gfx/skia/skia/include/views/SkOSWindow_Unix.h
rename from gfx/skia/trunk/include/views/SkOSWindow_Unix.h
rename to gfx/skia/skia/include/views/SkOSWindow_Unix.h
diff --git a/gfx/skia/trunk/include/views/SkOSWindow_Win.h b/gfx/skia/skia/include/views/SkOSWindow_Win.h
rename from gfx/skia/trunk/include/views/SkOSWindow_Win.h
rename to gfx/skia/skia/include/views/SkOSWindow_Win.h
diff --git a/gfx/skia/trunk/include/views/SkOSWindow_iOS.h b/gfx/skia/skia/include/views/SkOSWindow_iOS.h
rename from gfx/skia/trunk/include/views/SkOSWindow_iOS.h
rename to gfx/skia/skia/include/views/SkOSWindow_iOS.h
diff --git a/gfx/skia/trunk/include/views/SkStackViewLayout.h b/gfx/skia/skia/include/views/SkStackViewLayout.h
rename from gfx/skia/trunk/include/views/SkStackViewLayout.h
rename to gfx/skia/skia/include/views/SkStackViewLayout.h
diff --git a/gfx/skia/trunk/include/views/SkSystemEventTypes.h b/gfx/skia/skia/include/views/SkSystemEventTypes.h
rename from gfx/skia/trunk/include/views/SkSystemEventTypes.h
rename to gfx/skia/skia/include/views/SkSystemEventTypes.h
diff --git a/gfx/skia/trunk/include/views/SkTextBox.h b/gfx/skia/skia/include/views/SkTextBox.h
rename from gfx/skia/trunk/include/views/SkTextBox.h
rename to gfx/skia/skia/include/views/SkTextBox.h
diff --git a/gfx/skia/trunk/include/views/SkTouchGesture.h b/gfx/skia/skia/include/views/SkTouchGesture.h
rename from gfx/skia/trunk/include/views/SkTouchGesture.h
rename to gfx/skia/skia/include/views/SkTouchGesture.h
diff --git a/gfx/skia/trunk/include/views/SkView.h b/gfx/skia/skia/include/views/SkView.h
rename from gfx/skia/trunk/include/views/SkView.h
rename to gfx/skia/skia/include/views/SkView.h
diff --git a/gfx/skia/trunk/include/views/SkViewInflate.h b/gfx/skia/skia/include/views/SkViewInflate.h
rename from gfx/skia/trunk/include/views/SkViewInflate.h
rename to gfx/skia/skia/include/views/SkViewInflate.h
diff --git a/gfx/skia/trunk/include/views/SkWidget.h b/gfx/skia/skia/include/views/SkWidget.h
rename from gfx/skia/trunk/include/views/SkWidget.h
rename to gfx/skia/skia/include/views/SkWidget.h
diff --git a/gfx/skia/trunk/include/views/SkWindow.h b/gfx/skia/skia/include/views/SkWindow.h
rename from gfx/skia/trunk/include/views/SkWindow.h
rename to gfx/skia/skia/include/views/SkWindow.h
diff --git a/gfx/skia/trunk/include/views/android/AndroidKeyToSkKey.h b/gfx/skia/skia/include/views/android/AndroidKeyToSkKey.h
rename from gfx/skia/trunk/include/views/android/AndroidKeyToSkKey.h
rename to gfx/skia/skia/include/views/android/AndroidKeyToSkKey.h
diff --git a/gfx/skia/trunk/include/views/animated/SkBorderView.h b/gfx/skia/skia/include/views/animated/SkBorderView.h
rename from gfx/skia/trunk/include/views/animated/SkBorderView.h
rename to gfx/skia/skia/include/views/animated/SkBorderView.h
diff --git a/gfx/skia/trunk/include/views/animated/SkImageView.h b/gfx/skia/skia/include/views/animated/SkImageView.h
rename from gfx/skia/trunk/include/views/animated/SkImageView.h
rename to gfx/skia/skia/include/views/animated/SkImageView.h
diff --git a/gfx/skia/trunk/include/views/animated/SkProgressBarView.h b/gfx/skia/skia/include/views/animated/SkProgressBarView.h
rename from gfx/skia/trunk/include/views/animated/SkProgressBarView.h
rename to gfx/skia/skia/include/views/animated/SkProgressBarView.h
diff --git a/gfx/skia/trunk/include/views/animated/SkScrollBarView.h b/gfx/skia/skia/include/views/animated/SkScrollBarView.h
rename from gfx/skia/trunk/include/views/animated/SkScrollBarView.h
rename to gfx/skia/skia/include/views/animated/SkScrollBarView.h
diff --git a/gfx/skia/trunk/include/views/animated/SkWidgetViews.h b/gfx/skia/skia/include/views/animated/SkWidgetViews.h
rename from gfx/skia/trunk/include/views/animated/SkWidgetViews.h
rename to gfx/skia/skia/include/views/animated/SkWidgetViews.h
diff --git a/gfx/skia/trunk/include/views/unix/XkeysToSkKeys.h b/gfx/skia/skia/include/views/unix/XkeysToSkKeys.h
rename from gfx/skia/trunk/include/views/unix/XkeysToSkKeys.h
rename to gfx/skia/skia/include/views/unix/XkeysToSkKeys.h
diff --git a/gfx/skia/trunk/include/views/unix/keysym2ucs.h b/gfx/skia/skia/include/views/unix/keysym2ucs.h
rename from gfx/skia/trunk/include/views/unix/keysym2ucs.h
rename to gfx/skia/skia/include/views/unix/keysym2ucs.h
diff --git a/gfx/skia/trunk/include/xml/SkBML_WXMLParser.h b/gfx/skia/skia/include/xml/SkBML_WXMLParser.h
rename from gfx/skia/trunk/include/xml/SkBML_WXMLParser.h
rename to gfx/skia/skia/include/xml/SkBML_WXMLParser.h
diff --git a/gfx/skia/trunk/include/xml/SkBML_XMLParser.h b/gfx/skia/skia/include/xml/SkBML_XMLParser.h
rename from gfx/skia/trunk/include/xml/SkBML_XMLParser.h
rename to gfx/skia/skia/include/xml/SkBML_XMLParser.h
diff --git a/gfx/skia/trunk/include/xml/SkDOM.h b/gfx/skia/skia/include/xml/SkDOM.h
rename from gfx/skia/trunk/include/xml/SkDOM.h
rename to gfx/skia/skia/include/xml/SkDOM.h
diff --git a/gfx/skia/trunk/include/xml/SkJS.h b/gfx/skia/skia/include/xml/SkJS.h
rename from gfx/skia/trunk/include/xml/SkJS.h
rename to gfx/skia/skia/include/xml/SkJS.h
diff --git a/gfx/skia/trunk/include/xml/SkXMLParser.h b/gfx/skia/skia/include/xml/SkXMLParser.h
rename from gfx/skia/trunk/include/xml/SkXMLParser.h
rename to gfx/skia/skia/include/xml/SkXMLParser.h
diff --git a/gfx/skia/trunk/include/xml/SkXMLWriter.h b/gfx/skia/skia/include/xml/SkXMLWriter.h
rename from gfx/skia/trunk/include/xml/SkXMLWriter.h
rename to gfx/skia/skia/include/xml/SkXMLWriter.h
diff --git a/gfx/skia/trunk/src/animator/SkAnimate.h b/gfx/skia/skia/src/animator/SkAnimate.h
rename from gfx/skia/trunk/src/animator/SkAnimate.h
rename to gfx/skia/skia/src/animator/SkAnimate.h
diff --git a/gfx/skia/trunk/src/animator/SkAnimate3DSchema.xsd b/gfx/skia/skia/src/animator/SkAnimate3DSchema.xsd
rename from gfx/skia/trunk/src/animator/SkAnimate3DSchema.xsd
rename to gfx/skia/skia/src/animator/SkAnimate3DSchema.xsd
diff --git a/gfx/skia/trunk/src/animator/SkAnimate3DSchema.xsx b/gfx/skia/skia/src/animator/SkAnimate3DSchema.xsx
rename from gfx/skia/trunk/src/animator/SkAnimate3DSchema.xsx
rename to gfx/skia/skia/src/animator/SkAnimate3DSchema.xsx
diff --git a/gfx/skia/trunk/src/animator/SkAnimateActive.cpp b/gfx/skia/skia/src/animator/SkAnimateActive.cpp
rename from gfx/skia/trunk/src/animator/SkAnimateActive.cpp
rename to gfx/skia/skia/src/animator/SkAnimateActive.cpp
diff --git a/gfx/skia/trunk/src/animator/SkAnimateActive.h b/gfx/skia/skia/src/animator/SkAnimateActive.h
rename from gfx/skia/trunk/src/animator/SkAnimateActive.h
rename to gfx/skia/skia/src/animator/SkAnimateActive.h
diff --git a/gfx/skia/trunk/src/animator/SkAnimateBase.cpp b/gfx/skia/skia/src/animator/SkAnimateBase.cpp
rename from gfx/skia/trunk/src/animator/SkAnimateBase.cpp
rename to gfx/skia/skia/src/animator/SkAnimateBase.cpp
diff --git a/gfx/skia/trunk/src/animator/SkAnimateBase.h b/gfx/skia/skia/src/animator/SkAnimateBase.h
rename from gfx/skia/trunk/src/animator/SkAnimateBase.h
rename to gfx/skia/skia/src/animator/SkAnimateBase.h
diff --git a/gfx/skia/trunk/src/animator/SkAnimateField.cpp b/gfx/skia/skia/src/animator/SkAnimateField.cpp
rename from gfx/skia/trunk/src/animator/SkAnimateField.cpp
rename to gfx/skia/skia/src/animator/SkAnimateField.cpp
diff --git a/gfx/skia/trunk/src/animator/SkAnimateMaker.cpp b/gfx/skia/skia/src/animator/SkAnimateMaker.cpp
rename from gfx/skia/trunk/src/animator/SkAnimateMaker.cpp
rename to gfx/skia/skia/src/animator/SkAnimateMaker.cpp
diff --git a/gfx/skia/trunk/src/animator/SkAnimateMaker.h b/gfx/skia/skia/src/animator/SkAnimateMaker.h
rename from gfx/skia/trunk/src/animator/SkAnimateMaker.h
rename to gfx/skia/skia/src/animator/SkAnimateMaker.h
diff --git a/gfx/skia/trunk/src/animator/SkAnimateProperties.h b/gfx/skia/skia/src/animator/SkAnimateProperties.h
rename from gfx/skia/trunk/src/animator/SkAnimateProperties.h
rename to gfx/skia/skia/src/animator/SkAnimateProperties.h
diff --git a/gfx/skia/trunk/src/animator/SkAnimateSchema.xsd b/gfx/skia/skia/src/animator/SkAnimateSchema.xsd
rename from gfx/skia/trunk/src/animator/SkAnimateSchema.xsd
rename to gfx/skia/skia/src/animator/SkAnimateSchema.xsd
diff --git a/gfx/skia/trunk/src/animator/SkAnimateSchema.xsx b/gfx/skia/skia/src/animator/SkAnimateSchema.xsx
rename from gfx/skia/trunk/src/animator/SkAnimateSchema.xsx
rename to gfx/skia/skia/src/animator/SkAnimateSchema.xsx
diff --git a/gfx/skia/trunk/src/animator/SkAnimateSet.cpp b/gfx/skia/skia/src/animator/SkAnimateSet.cpp
rename from gfx/skia/trunk/src/animator/SkAnimateSet.cpp
rename to gfx/skia/skia/src/animator/SkAnimateSet.cpp
diff --git a/gfx/skia/trunk/src/animator/SkAnimateSet.h b/gfx/skia/skia/src/animator/SkAnimateSet.h
rename from gfx/skia/trunk/src/animator/SkAnimateSet.h
rename to gfx/skia/skia/src/animator/SkAnimateSet.h
diff --git a/gfx/skia/trunk/src/animator/SkAnimator.cpp b/gfx/skia/skia/src/animator/SkAnimator.cpp
rename from gfx/skia/trunk/src/animator/SkAnimator.cpp
rename to gfx/skia/skia/src/animator/SkAnimator.cpp
diff --git a/gfx/skia/trunk/src/animator/SkAnimatorScript.cpp b/gfx/skia/skia/src/animator/SkAnimatorScript.cpp
rename from gfx/skia/trunk/src/animator/SkAnimatorScript.cpp
rename to gfx/skia/skia/src/animator/SkAnimatorScript.cpp
diff --git a/gfx/skia/trunk/src/animator/SkAnimatorScript.h b/gfx/skia/skia/src/animator/SkAnimatorScript.h
rename from gfx/skia/trunk/src/animator/SkAnimatorScript.h
rename to gfx/skia/skia/src/animator/SkAnimatorScript.h
diff --git a/gfx/skia/trunk/src/animator/SkAnimatorScript2.cpp b/gfx/skia/skia/src/animator/SkAnimatorScript2.cpp
rename from gfx/skia/trunk/src/animator/SkAnimatorScript2.cpp
rename to gfx/skia/skia/src/animator/SkAnimatorScript2.cpp
diff --git a/gfx/skia/trunk/src/animator/SkAnimatorScript2.h b/gfx/skia/skia/src/animator/SkAnimatorScript2.h
rename from gfx/skia/trunk/src/animator/SkAnimatorScript2.h
rename to gfx/skia/skia/src/animator/SkAnimatorScript2.h
diff --git a/gfx/skia/trunk/src/animator/SkBoundable.cpp b/gfx/skia/skia/src/animator/SkBoundable.cpp
rename from gfx/skia/trunk/src/animator/SkBoundable.cpp
rename to gfx/skia/skia/src/animator/SkBoundable.cpp
diff --git a/gfx/skia/trunk/src/animator/SkBoundable.h b/gfx/skia/skia/src/animator/SkBoundable.h
rename from gfx/skia/trunk/src/animator/SkBoundable.h
rename to gfx/skia/skia/src/animator/SkBoundable.h
diff --git a/gfx/skia/trunk/src/animator/SkBuildCondensedInfo.cpp b/gfx/skia/skia/src/animator/SkBuildCondensedInfo.cpp
rename from gfx/skia/trunk/src/animator/SkBuildCondensedInfo.cpp
rename to gfx/skia/skia/src/animator/SkBuildCondensedInfo.cpp
diff --git a/gfx/skia/trunk/src/animator/SkCondensedDebug.cpp b/gfx/skia/skia/src/animator/SkCondensedDebug.cpp
rename from gfx/skia/trunk/src/animator/SkCondensedDebug.cpp
rename to gfx/skia/skia/src/animator/SkCondensedDebug.cpp
diff --git a/gfx/skia/trunk/src/animator/SkCondensedRelease.cpp b/gfx/skia/skia/src/animator/SkCondensedRelease.cpp
rename from gfx/skia/trunk/src/animator/SkCondensedRelease.cpp
rename to gfx/skia/skia/src/animator/SkCondensedRelease.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayAdd.cpp b/gfx/skia/skia/src/animator/SkDisplayAdd.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayAdd.cpp
rename to gfx/skia/skia/src/animator/SkDisplayAdd.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayAdd.h b/gfx/skia/skia/src/animator/SkDisplayAdd.h
rename from gfx/skia/trunk/src/animator/SkDisplayAdd.h
rename to gfx/skia/skia/src/animator/SkDisplayAdd.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayApply.cpp b/gfx/skia/skia/src/animator/SkDisplayApply.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayApply.cpp
rename to gfx/skia/skia/src/animator/SkDisplayApply.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayApply.h b/gfx/skia/skia/src/animator/SkDisplayApply.h
rename from gfx/skia/trunk/src/animator/SkDisplayApply.h
rename to gfx/skia/skia/src/animator/SkDisplayApply.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayBounds.cpp b/gfx/skia/skia/src/animator/SkDisplayBounds.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayBounds.cpp
rename to gfx/skia/skia/src/animator/SkDisplayBounds.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayBounds.h b/gfx/skia/skia/src/animator/SkDisplayBounds.h
rename from gfx/skia/trunk/src/animator/SkDisplayBounds.h
rename to gfx/skia/skia/src/animator/SkDisplayBounds.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayEvent.cpp b/gfx/skia/skia/src/animator/SkDisplayEvent.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayEvent.cpp
rename to gfx/skia/skia/src/animator/SkDisplayEvent.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayEvent.h b/gfx/skia/skia/src/animator/SkDisplayEvent.h
rename from gfx/skia/trunk/src/animator/SkDisplayEvent.h
rename to gfx/skia/skia/src/animator/SkDisplayEvent.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayEvents.cpp b/gfx/skia/skia/src/animator/SkDisplayEvents.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayEvents.cpp
rename to gfx/skia/skia/src/animator/SkDisplayEvents.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayEvents.h b/gfx/skia/skia/src/animator/SkDisplayEvents.h
rename from gfx/skia/trunk/src/animator/SkDisplayEvents.h
rename to gfx/skia/skia/src/animator/SkDisplayEvents.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayInclude.cpp b/gfx/skia/skia/src/animator/SkDisplayInclude.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayInclude.cpp
rename to gfx/skia/skia/src/animator/SkDisplayInclude.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayInclude.h b/gfx/skia/skia/src/animator/SkDisplayInclude.h
rename from gfx/skia/trunk/src/animator/SkDisplayInclude.h
rename to gfx/skia/skia/src/animator/SkDisplayInclude.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayInput.cpp b/gfx/skia/skia/src/animator/SkDisplayInput.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayInput.cpp
rename to gfx/skia/skia/src/animator/SkDisplayInput.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayInput.h b/gfx/skia/skia/src/animator/SkDisplayInput.h
rename from gfx/skia/trunk/src/animator/SkDisplayInput.h
rename to gfx/skia/skia/src/animator/SkDisplayInput.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayList.cpp b/gfx/skia/skia/src/animator/SkDisplayList.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayList.cpp
rename to gfx/skia/skia/src/animator/SkDisplayList.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayList.h b/gfx/skia/skia/src/animator/SkDisplayList.h
rename from gfx/skia/trunk/src/animator/SkDisplayList.h
rename to gfx/skia/skia/src/animator/SkDisplayList.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayMath.cpp b/gfx/skia/skia/src/animator/SkDisplayMath.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayMath.cpp
rename to gfx/skia/skia/src/animator/SkDisplayMath.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayMath.h b/gfx/skia/skia/src/animator/SkDisplayMath.h
rename from gfx/skia/trunk/src/animator/SkDisplayMath.h
rename to gfx/skia/skia/src/animator/SkDisplayMath.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayMovie.cpp b/gfx/skia/skia/src/animator/SkDisplayMovie.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayMovie.cpp
rename to gfx/skia/skia/src/animator/SkDisplayMovie.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayMovie.h b/gfx/skia/skia/src/animator/SkDisplayMovie.h
rename from gfx/skia/trunk/src/animator/SkDisplayMovie.h
rename to gfx/skia/skia/src/animator/SkDisplayMovie.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayNumber.cpp b/gfx/skia/skia/src/animator/SkDisplayNumber.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayNumber.cpp
rename to gfx/skia/skia/src/animator/SkDisplayNumber.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayNumber.h b/gfx/skia/skia/src/animator/SkDisplayNumber.h
rename from gfx/skia/trunk/src/animator/SkDisplayNumber.h
rename to gfx/skia/skia/src/animator/SkDisplayNumber.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayPost.cpp b/gfx/skia/skia/src/animator/SkDisplayPost.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayPost.cpp
rename to gfx/skia/skia/src/animator/SkDisplayPost.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayPost.h b/gfx/skia/skia/src/animator/SkDisplayPost.h
rename from gfx/skia/trunk/src/animator/SkDisplayPost.h
rename to gfx/skia/skia/src/animator/SkDisplayPost.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayRandom.cpp b/gfx/skia/skia/src/animator/SkDisplayRandom.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayRandom.cpp
rename to gfx/skia/skia/src/animator/SkDisplayRandom.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayRandom.h b/gfx/skia/skia/src/animator/SkDisplayRandom.h
rename from gfx/skia/trunk/src/animator/SkDisplayRandom.h
rename to gfx/skia/skia/src/animator/SkDisplayRandom.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayScreenplay.cpp b/gfx/skia/skia/src/animator/SkDisplayScreenplay.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayScreenplay.cpp
rename to gfx/skia/skia/src/animator/SkDisplayScreenplay.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayScreenplay.h b/gfx/skia/skia/src/animator/SkDisplayScreenplay.h
rename from gfx/skia/trunk/src/animator/SkDisplayScreenplay.h
rename to gfx/skia/skia/src/animator/SkDisplayScreenplay.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayType.cpp b/gfx/skia/skia/src/animator/SkDisplayType.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayType.cpp
rename to gfx/skia/skia/src/animator/SkDisplayType.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayType.h b/gfx/skia/skia/src/animator/SkDisplayType.h
rename from gfx/skia/trunk/src/animator/SkDisplayType.h
rename to gfx/skia/skia/src/animator/SkDisplayType.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayTypes.cpp b/gfx/skia/skia/src/animator/SkDisplayTypes.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayTypes.cpp
rename to gfx/skia/skia/src/animator/SkDisplayTypes.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayTypes.h b/gfx/skia/skia/src/animator/SkDisplayTypes.h
rename from gfx/skia/trunk/src/animator/SkDisplayTypes.h
rename to gfx/skia/skia/src/animator/SkDisplayTypes.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayXMLParser.cpp b/gfx/skia/skia/src/animator/SkDisplayXMLParser.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayXMLParser.cpp
rename to gfx/skia/skia/src/animator/SkDisplayXMLParser.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayXMLParser.h b/gfx/skia/skia/src/animator/SkDisplayXMLParser.h
rename from gfx/skia/trunk/src/animator/SkDisplayXMLParser.h
rename to gfx/skia/skia/src/animator/SkDisplayXMLParser.h
diff --git a/gfx/skia/trunk/src/animator/SkDisplayable.cpp b/gfx/skia/skia/src/animator/SkDisplayable.cpp
rename from gfx/skia/trunk/src/animator/SkDisplayable.cpp
rename to gfx/skia/skia/src/animator/SkDisplayable.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDisplayable.h b/gfx/skia/skia/src/animator/SkDisplayable.h
rename from gfx/skia/trunk/src/animator/SkDisplayable.h
rename to gfx/skia/skia/src/animator/SkDisplayable.h
diff --git a/gfx/skia/trunk/src/animator/SkDraw3D.cpp b/gfx/skia/skia/src/animator/SkDraw3D.cpp
rename from gfx/skia/trunk/src/animator/SkDraw3D.cpp
rename to gfx/skia/skia/src/animator/SkDraw3D.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDraw3D.h b/gfx/skia/skia/src/animator/SkDraw3D.h
rename from gfx/skia/trunk/src/animator/SkDraw3D.h
rename to gfx/skia/skia/src/animator/SkDraw3D.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawBitmap.cpp b/gfx/skia/skia/src/animator/SkDrawBitmap.cpp
rename from gfx/skia/trunk/src/animator/SkDrawBitmap.cpp
rename to gfx/skia/skia/src/animator/SkDrawBitmap.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawBitmap.h b/gfx/skia/skia/src/animator/SkDrawBitmap.h
rename from gfx/skia/trunk/src/animator/SkDrawBitmap.h
rename to gfx/skia/skia/src/animator/SkDrawBitmap.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawBlur.cpp b/gfx/skia/skia/src/animator/SkDrawBlur.cpp
rename from gfx/skia/trunk/src/animator/SkDrawBlur.cpp
rename to gfx/skia/skia/src/animator/SkDrawBlur.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawBlur.h b/gfx/skia/skia/src/animator/SkDrawBlur.h
rename from gfx/skia/trunk/src/animator/SkDrawBlur.h
rename to gfx/skia/skia/src/animator/SkDrawBlur.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawClip.cpp b/gfx/skia/skia/src/animator/SkDrawClip.cpp
rename from gfx/skia/trunk/src/animator/SkDrawClip.cpp
rename to gfx/skia/skia/src/animator/SkDrawClip.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawClip.h b/gfx/skia/skia/src/animator/SkDrawClip.h
rename from gfx/skia/trunk/src/animator/SkDrawClip.h
rename to gfx/skia/skia/src/animator/SkDrawClip.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawColor.cpp b/gfx/skia/skia/src/animator/SkDrawColor.cpp
rename from gfx/skia/trunk/src/animator/SkDrawColor.cpp
rename to gfx/skia/skia/src/animator/SkDrawColor.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawColor.h b/gfx/skia/skia/src/animator/SkDrawColor.h
rename from gfx/skia/trunk/src/animator/SkDrawColor.h
rename to gfx/skia/skia/src/animator/SkDrawColor.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawDash.cpp b/gfx/skia/skia/src/animator/SkDrawDash.cpp
rename from gfx/skia/trunk/src/animator/SkDrawDash.cpp
rename to gfx/skia/skia/src/animator/SkDrawDash.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawDash.h b/gfx/skia/skia/src/animator/SkDrawDash.h
rename from gfx/skia/trunk/src/animator/SkDrawDash.h
rename to gfx/skia/skia/src/animator/SkDrawDash.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawDiscrete.cpp b/gfx/skia/skia/src/animator/SkDrawDiscrete.cpp
rename from gfx/skia/trunk/src/animator/SkDrawDiscrete.cpp
rename to gfx/skia/skia/src/animator/SkDrawDiscrete.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawDiscrete.h b/gfx/skia/skia/src/animator/SkDrawDiscrete.h
rename from gfx/skia/trunk/src/animator/SkDrawDiscrete.h
rename to gfx/skia/skia/src/animator/SkDrawDiscrete.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawEmboss.cpp b/gfx/skia/skia/src/animator/SkDrawEmboss.cpp
rename from gfx/skia/trunk/src/animator/SkDrawEmboss.cpp
rename to gfx/skia/skia/src/animator/SkDrawEmboss.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawEmboss.h b/gfx/skia/skia/src/animator/SkDrawEmboss.h
rename from gfx/skia/trunk/src/animator/SkDrawEmboss.h
rename to gfx/skia/skia/src/animator/SkDrawEmboss.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawExtraPathEffect.cpp b/gfx/skia/skia/src/animator/SkDrawExtraPathEffect.cpp
rename from gfx/skia/trunk/src/animator/SkDrawExtraPathEffect.cpp
rename to gfx/skia/skia/src/animator/SkDrawExtraPathEffect.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawFull.cpp b/gfx/skia/skia/src/animator/SkDrawFull.cpp
rename from gfx/skia/trunk/src/animator/SkDrawFull.cpp
rename to gfx/skia/skia/src/animator/SkDrawFull.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawFull.h b/gfx/skia/skia/src/animator/SkDrawFull.h
rename from gfx/skia/trunk/src/animator/SkDrawFull.h
rename to gfx/skia/skia/src/animator/SkDrawFull.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawGradient.cpp b/gfx/skia/skia/src/animator/SkDrawGradient.cpp
rename from gfx/skia/trunk/src/animator/SkDrawGradient.cpp
rename to gfx/skia/skia/src/animator/SkDrawGradient.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawGradient.h b/gfx/skia/skia/src/animator/SkDrawGradient.h
rename from gfx/skia/trunk/src/animator/SkDrawGradient.h
rename to gfx/skia/skia/src/animator/SkDrawGradient.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawGroup.cpp b/gfx/skia/skia/src/animator/SkDrawGroup.cpp
rename from gfx/skia/trunk/src/animator/SkDrawGroup.cpp
rename to gfx/skia/skia/src/animator/SkDrawGroup.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawGroup.h b/gfx/skia/skia/src/animator/SkDrawGroup.h
rename from gfx/skia/trunk/src/animator/SkDrawGroup.h
rename to gfx/skia/skia/src/animator/SkDrawGroup.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawLine.cpp b/gfx/skia/skia/src/animator/SkDrawLine.cpp
rename from gfx/skia/trunk/src/animator/SkDrawLine.cpp
rename to gfx/skia/skia/src/animator/SkDrawLine.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawLine.h b/gfx/skia/skia/src/animator/SkDrawLine.h
rename from gfx/skia/trunk/src/animator/SkDrawLine.h
rename to gfx/skia/skia/src/animator/SkDrawLine.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawMatrix.cpp b/gfx/skia/skia/src/animator/SkDrawMatrix.cpp
rename from gfx/skia/trunk/src/animator/SkDrawMatrix.cpp
rename to gfx/skia/skia/src/animator/SkDrawMatrix.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawMatrix.h b/gfx/skia/skia/src/animator/SkDrawMatrix.h
rename from gfx/skia/trunk/src/animator/SkDrawMatrix.h
rename to gfx/skia/skia/src/animator/SkDrawMatrix.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawOval.cpp b/gfx/skia/skia/src/animator/SkDrawOval.cpp
rename from gfx/skia/trunk/src/animator/SkDrawOval.cpp
rename to gfx/skia/skia/src/animator/SkDrawOval.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawOval.h b/gfx/skia/skia/src/animator/SkDrawOval.h
rename from gfx/skia/trunk/src/animator/SkDrawOval.h
rename to gfx/skia/skia/src/animator/SkDrawOval.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawPaint.cpp b/gfx/skia/skia/src/animator/SkDrawPaint.cpp
rename from gfx/skia/trunk/src/animator/SkDrawPaint.cpp
rename to gfx/skia/skia/src/animator/SkDrawPaint.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawPaint.h b/gfx/skia/skia/src/animator/SkDrawPaint.h
rename from gfx/skia/trunk/src/animator/SkDrawPaint.h
rename to gfx/skia/skia/src/animator/SkDrawPaint.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawPath.cpp b/gfx/skia/skia/src/animator/SkDrawPath.cpp
rename from gfx/skia/trunk/src/animator/SkDrawPath.cpp
rename to gfx/skia/skia/src/animator/SkDrawPath.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawPath.h b/gfx/skia/skia/src/animator/SkDrawPath.h
rename from gfx/skia/trunk/src/animator/SkDrawPath.h
rename to gfx/skia/skia/src/animator/SkDrawPath.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawPoint.cpp b/gfx/skia/skia/src/animator/SkDrawPoint.cpp
rename from gfx/skia/trunk/src/animator/SkDrawPoint.cpp
rename to gfx/skia/skia/src/animator/SkDrawPoint.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawPoint.h b/gfx/skia/skia/src/animator/SkDrawPoint.h
rename from gfx/skia/trunk/src/animator/SkDrawPoint.h
rename to gfx/skia/skia/src/animator/SkDrawPoint.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawRectangle.cpp b/gfx/skia/skia/src/animator/SkDrawRectangle.cpp
rename from gfx/skia/trunk/src/animator/SkDrawRectangle.cpp
rename to gfx/skia/skia/src/animator/SkDrawRectangle.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawRectangle.h b/gfx/skia/skia/src/animator/SkDrawRectangle.h
rename from gfx/skia/trunk/src/animator/SkDrawRectangle.h
rename to gfx/skia/skia/src/animator/SkDrawRectangle.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawSaveLayer.cpp b/gfx/skia/skia/src/animator/SkDrawSaveLayer.cpp
rename from gfx/skia/trunk/src/animator/SkDrawSaveLayer.cpp
rename to gfx/skia/skia/src/animator/SkDrawSaveLayer.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawSaveLayer.h b/gfx/skia/skia/src/animator/SkDrawSaveLayer.h
rename from gfx/skia/trunk/src/animator/SkDrawSaveLayer.h
rename to gfx/skia/skia/src/animator/SkDrawSaveLayer.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawShader.cpp b/gfx/skia/skia/src/animator/SkDrawShader.cpp
rename from gfx/skia/trunk/src/animator/SkDrawShader.cpp
rename to gfx/skia/skia/src/animator/SkDrawShader.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawShader.h b/gfx/skia/skia/src/animator/SkDrawShader.h
rename from gfx/skia/trunk/src/animator/SkDrawShader.h
rename to gfx/skia/skia/src/animator/SkDrawShader.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawText.cpp b/gfx/skia/skia/src/animator/SkDrawText.cpp
rename from gfx/skia/trunk/src/animator/SkDrawText.cpp
rename to gfx/skia/skia/src/animator/SkDrawText.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawText.h b/gfx/skia/skia/src/animator/SkDrawText.h
rename from gfx/skia/trunk/src/animator/SkDrawText.h
rename to gfx/skia/skia/src/animator/SkDrawText.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawTextBox.cpp b/gfx/skia/skia/src/animator/SkDrawTextBox.cpp
rename from gfx/skia/trunk/src/animator/SkDrawTextBox.cpp
rename to gfx/skia/skia/src/animator/SkDrawTextBox.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawTextBox.h b/gfx/skia/skia/src/animator/SkDrawTextBox.h
rename from gfx/skia/trunk/src/animator/SkDrawTextBox.h
rename to gfx/skia/skia/src/animator/SkDrawTextBox.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawTo.cpp b/gfx/skia/skia/src/animator/SkDrawTo.cpp
rename from gfx/skia/trunk/src/animator/SkDrawTo.cpp
rename to gfx/skia/skia/src/animator/SkDrawTo.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawTo.h b/gfx/skia/skia/src/animator/SkDrawTo.h
rename from gfx/skia/trunk/src/animator/SkDrawTo.h
rename to gfx/skia/skia/src/animator/SkDrawTo.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawTransparentShader.cpp b/gfx/skia/skia/src/animator/SkDrawTransparentShader.cpp
rename from gfx/skia/trunk/src/animator/SkDrawTransparentShader.cpp
rename to gfx/skia/skia/src/animator/SkDrawTransparentShader.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawTransparentShader.h b/gfx/skia/skia/src/animator/SkDrawTransparentShader.h
rename from gfx/skia/trunk/src/animator/SkDrawTransparentShader.h
rename to gfx/skia/skia/src/animator/SkDrawTransparentShader.h
diff --git a/gfx/skia/trunk/src/animator/SkDrawable.cpp b/gfx/skia/skia/src/animator/SkDrawable.cpp
rename from gfx/skia/trunk/src/animator/SkDrawable.cpp
rename to gfx/skia/skia/src/animator/SkDrawable.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDrawable.h b/gfx/skia/skia/src/animator/SkDrawable.h
rename from gfx/skia/trunk/src/animator/SkDrawable.h
rename to gfx/skia/skia/src/animator/SkDrawable.h
diff --git a/gfx/skia/trunk/src/animator/SkDump.cpp b/gfx/skia/skia/src/animator/SkDump.cpp
rename from gfx/skia/trunk/src/animator/SkDump.cpp
rename to gfx/skia/skia/src/animator/SkDump.cpp
diff --git a/gfx/skia/trunk/src/animator/SkDump.h b/gfx/skia/skia/src/animator/SkDump.h
rename from gfx/skia/trunk/src/animator/SkDump.h
rename to gfx/skia/skia/src/animator/SkDump.h
diff --git a/gfx/skia/trunk/src/animator/SkExtraPathEffects.xsd b/gfx/skia/skia/src/animator/SkExtraPathEffects.xsd
rename from gfx/skia/trunk/src/animator/SkExtraPathEffects.xsd
rename to gfx/skia/skia/src/animator/SkExtraPathEffects.xsd
diff --git a/gfx/skia/trunk/src/animator/SkExtras.h b/gfx/skia/skia/src/animator/SkExtras.h
rename from gfx/skia/trunk/src/animator/SkExtras.h
rename to gfx/skia/skia/src/animator/SkExtras.h
diff --git a/gfx/skia/trunk/src/animator/SkGetCondensedInfo.cpp b/gfx/skia/skia/src/animator/SkGetCondensedInfo.cpp
rename from gfx/skia/trunk/src/animator/SkGetCondensedInfo.cpp
rename to gfx/skia/skia/src/animator/SkGetCondensedInfo.cpp
diff --git a/gfx/skia/trunk/src/animator/SkHitClear.cpp b/gfx/skia/skia/src/animator/SkHitClear.cpp
rename from gfx/skia/trunk/src/animator/SkHitClear.cpp
rename to gfx/skia/skia/src/animator/SkHitClear.cpp
diff --git a/gfx/skia/trunk/src/animator/SkHitClear.h b/gfx/skia/skia/src/animator/SkHitClear.h
rename from gfx/skia/trunk/src/animator/SkHitClear.h
rename to gfx/skia/skia/src/animator/SkHitClear.h
diff --git a/gfx/skia/trunk/src/animator/SkHitTest.cpp b/gfx/skia/skia/src/animator/SkHitTest.cpp
rename from gfx/skia/trunk/src/animator/SkHitTest.cpp
rename to gfx/skia/skia/src/animator/SkHitTest.cpp
diff --git a/gfx/skia/trunk/src/animator/SkHitTest.h b/gfx/skia/skia/src/animator/SkHitTest.h
rename from gfx/skia/trunk/src/animator/SkHitTest.h
rename to gfx/skia/skia/src/animator/SkHitTest.h
diff --git a/gfx/skia/trunk/src/animator/SkIntArray.h b/gfx/skia/skia/src/animator/SkIntArray.h
rename from gfx/skia/trunk/src/animator/SkIntArray.h
rename to gfx/skia/skia/src/animator/SkIntArray.h
diff --git a/gfx/skia/trunk/src/animator/SkMatrixParts.cpp b/gfx/skia/skia/src/animator/SkMatrixParts.cpp
rename from gfx/skia/trunk/src/animator/SkMatrixParts.cpp
rename to gfx/skia/skia/src/animator/SkMatrixParts.cpp
diff --git a/gfx/skia/trunk/src/animator/SkMatrixParts.h b/gfx/skia/skia/src/animator/SkMatrixParts.h
rename from gfx/skia/trunk/src/animator/SkMatrixParts.h
rename to gfx/skia/skia/src/animator/SkMatrixParts.h
diff --git a/gfx/skia/trunk/src/animator/SkMemberInfo.cpp b/gfx/skia/skia/src/animator/SkMemberInfo.cpp
rename from gfx/skia/trunk/src/animator/SkMemberInfo.cpp
rename to gfx/skia/skia/src/animator/SkMemberInfo.cpp
diff --git a/gfx/skia/trunk/src/animator/SkMemberInfo.h b/gfx/skia/skia/src/animator/SkMemberInfo.h
rename from gfx/skia/trunk/src/animator/SkMemberInfo.h
rename to gfx/skia/skia/src/animator/SkMemberInfo.h
diff --git a/gfx/skia/trunk/src/animator/SkOpArray.cpp b/gfx/skia/skia/src/animator/SkOpArray.cpp
rename from gfx/skia/trunk/src/animator/SkOpArray.cpp
rename to gfx/skia/skia/src/animator/SkOpArray.cpp
diff --git a/gfx/skia/trunk/src/animator/SkOpArray.h b/gfx/skia/skia/src/animator/SkOpArray.h
rename from gfx/skia/trunk/src/animator/SkOpArray.h
rename to gfx/skia/skia/src/animator/SkOpArray.h
diff --git a/gfx/skia/trunk/src/animator/SkOperand.h b/gfx/skia/skia/src/animator/SkOperand.h
rename from gfx/skia/trunk/src/animator/SkOperand.h
rename to gfx/skia/skia/src/animator/SkOperand.h
diff --git a/gfx/skia/trunk/src/animator/SkOperand2.h b/gfx/skia/skia/src/animator/SkOperand2.h
rename from gfx/skia/trunk/src/animator/SkOperand2.h
rename to gfx/skia/skia/src/animator/SkOperand2.h
diff --git a/gfx/skia/trunk/src/animator/SkOperandInterpolator.h b/gfx/skia/skia/src/animator/SkOperandInterpolator.h
rename from gfx/skia/trunk/src/animator/SkOperandInterpolator.h
rename to gfx/skia/skia/src/animator/SkOperandInterpolator.h
diff --git a/gfx/skia/trunk/src/animator/SkOperandIterpolator.cpp b/gfx/skia/skia/src/animator/SkOperandIterpolator.cpp
rename from gfx/skia/trunk/src/animator/SkOperandIterpolator.cpp
rename to gfx/skia/skia/src/animator/SkOperandIterpolator.cpp
diff --git a/gfx/skia/trunk/src/animator/SkPaintPart.cpp b/gfx/skia/skia/src/animator/SkPaintPart.cpp
rename from gfx/skia/trunk/src/animator/SkPaintPart.cpp
rename to gfx/skia/skia/src/animator/SkPaintPart.cpp
diff --git a/gfx/skia/trunk/src/animator/SkPaintPart.h b/gfx/skia/skia/src/animator/SkPaintPart.h
rename from gfx/skia/trunk/src/animator/SkPaintPart.h
rename to gfx/skia/skia/src/animator/SkPaintPart.h
diff --git a/gfx/skia/trunk/src/animator/SkParseSVGPath.cpp b/gfx/skia/skia/src/animator/SkParseSVGPath.cpp
rename from gfx/skia/trunk/src/animator/SkParseSVGPath.cpp
rename to gfx/skia/skia/src/animator/SkParseSVGPath.cpp
diff --git a/gfx/skia/trunk/src/animator/SkPathParts.cpp b/gfx/skia/skia/src/animator/SkPathParts.cpp
rename from gfx/skia/trunk/src/animator/SkPathParts.cpp
rename to gfx/skia/skia/src/animator/SkPathParts.cpp
diff --git a/gfx/skia/trunk/src/animator/SkPathParts.h b/gfx/skia/skia/src/animator/SkPathParts.h
rename from gfx/skia/trunk/src/animator/SkPathParts.h
rename to gfx/skia/skia/src/animator/SkPathParts.h
diff --git a/gfx/skia/trunk/src/animator/SkPostParts.cpp b/gfx/skia/skia/src/animator/SkPostParts.cpp
rename from gfx/skia/trunk/src/animator/SkPostParts.cpp
rename to gfx/skia/skia/src/animator/SkPostParts.cpp
diff --git a/gfx/skia/trunk/src/animator/SkPostParts.h b/gfx/skia/skia/src/animator/SkPostParts.h
rename from gfx/skia/trunk/src/animator/SkPostParts.h
rename to gfx/skia/skia/src/animator/SkPostParts.h
diff --git a/gfx/skia/trunk/src/animator/SkScript.cpp b/gfx/skia/skia/src/animator/SkScript.cpp
rename from gfx/skia/trunk/src/animator/SkScript.cpp
rename to gfx/skia/skia/src/animator/SkScript.cpp
diff --git a/gfx/skia/trunk/src/animator/SkScript.h b/gfx/skia/skia/src/animator/SkScript.h
rename from gfx/skia/trunk/src/animator/SkScript.h
rename to gfx/skia/skia/src/animator/SkScript.h
diff --git a/gfx/skia/trunk/src/animator/SkScript2.h b/gfx/skia/skia/src/animator/SkScript2.h
rename from gfx/skia/trunk/src/animator/SkScript2.h
rename to gfx/skia/skia/src/animator/SkScript2.h
diff --git a/gfx/skia/trunk/src/animator/SkScriptCallBack.h b/gfx/skia/skia/src/animator/SkScriptCallBack.h
rename from gfx/skia/trunk/src/animator/SkScriptCallBack.h
rename to gfx/skia/skia/src/animator/SkScriptCallBack.h
diff --git a/gfx/skia/trunk/src/animator/SkScriptDecompile.cpp b/gfx/skia/skia/src/animator/SkScriptDecompile.cpp
rename from gfx/skia/trunk/src/animator/SkScriptDecompile.cpp
rename to gfx/skia/skia/src/animator/SkScriptDecompile.cpp
diff --git a/gfx/skia/trunk/src/animator/SkScriptRuntime.cpp b/gfx/skia/skia/src/animator/SkScriptRuntime.cpp
rename from gfx/skia/trunk/src/animator/SkScriptRuntime.cpp
rename to gfx/skia/skia/src/animator/SkScriptRuntime.cpp
diff --git a/gfx/skia/trunk/src/animator/SkScriptRuntime.h b/gfx/skia/skia/src/animator/SkScriptRuntime.h
rename from gfx/skia/trunk/src/animator/SkScriptRuntime.h
rename to gfx/skia/skia/src/animator/SkScriptRuntime.h
diff --git a/gfx/skia/trunk/src/animator/SkScriptTokenizer.cpp b/gfx/skia/skia/src/animator/SkScriptTokenizer.cpp
rename from gfx/skia/trunk/src/animator/SkScriptTokenizer.cpp
rename to gfx/skia/skia/src/animator/SkScriptTokenizer.cpp
diff --git a/gfx/skia/trunk/src/animator/SkSnapshot.cpp b/gfx/skia/skia/src/animator/SkSnapshot.cpp
rename from gfx/skia/trunk/src/animator/SkSnapshot.cpp
rename to gfx/skia/skia/src/animator/SkSnapshot.cpp
diff --git a/gfx/skia/trunk/src/animator/SkSnapshot.h b/gfx/skia/skia/src/animator/SkSnapshot.h
rename from gfx/skia/trunk/src/animator/SkSnapshot.h
rename to gfx/skia/skia/src/animator/SkSnapshot.h
diff --git a/gfx/skia/trunk/src/animator/SkTDArray_Experimental.h b/gfx/skia/skia/src/animator/SkTDArray_Experimental.h
rename from gfx/skia/trunk/src/animator/SkTDArray_Experimental.h
rename to gfx/skia/skia/src/animator/SkTDArray_Experimental.h
diff --git a/gfx/skia/trunk/src/animator/SkTextOnPath.cpp b/gfx/skia/skia/src/animator/SkTextOnPath.cpp
rename from gfx/skia/trunk/src/animator/SkTextOnPath.cpp
rename to gfx/skia/skia/src/animator/SkTextOnPath.cpp
diff --git a/gfx/skia/trunk/src/animator/SkTextOnPath.h b/gfx/skia/skia/src/animator/SkTextOnPath.h
rename from gfx/skia/trunk/src/animator/SkTextOnPath.h
rename to gfx/skia/skia/src/animator/SkTextOnPath.h
diff --git a/gfx/skia/trunk/src/animator/SkTextToPath.cpp b/gfx/skia/skia/src/animator/SkTextToPath.cpp
rename from gfx/skia/trunk/src/animator/SkTextToPath.cpp
rename to gfx/skia/skia/src/animator/SkTextToPath.cpp
diff --git a/gfx/skia/trunk/src/animator/SkTextToPath.h b/gfx/skia/skia/src/animator/SkTextToPath.h
rename from gfx/skia/trunk/src/animator/SkTextToPath.h
rename to gfx/skia/skia/src/animator/SkTextToPath.h
diff --git a/gfx/skia/trunk/src/animator/SkTime.cpp b/gfx/skia/skia/src/animator/SkTime.cpp
rename from gfx/skia/trunk/src/animator/SkTime.cpp
rename to gfx/skia/skia/src/animator/SkTime.cpp
diff --git a/gfx/skia/trunk/src/animator/SkTypedArray.cpp b/gfx/skia/skia/src/animator/SkTypedArray.cpp
rename from gfx/skia/trunk/src/animator/SkTypedArray.cpp
rename to gfx/skia/skia/src/animator/SkTypedArray.cpp
diff --git a/gfx/skia/trunk/src/animator/SkTypedArray.h b/gfx/skia/skia/src/animator/SkTypedArray.h
rename from gfx/skia/trunk/src/animator/SkTypedArray.h
rename to gfx/skia/skia/src/animator/SkTypedArray.h
diff --git a/gfx/skia/trunk/src/animator/SkXMLAnimatorWriter.cpp b/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.cpp
rename from gfx/skia/trunk/src/animator/SkXMLAnimatorWriter.cpp
rename to gfx/skia/skia/src/animator/SkXMLAnimatorWriter.cpp
diff --git a/gfx/skia/trunk/src/animator/SkXMLAnimatorWriter.h b/gfx/skia/skia/src/animator/SkXMLAnimatorWriter.h
rename from gfx/skia/trunk/src/animator/SkXMLAnimatorWriter.h
rename to gfx/skia/skia/src/animator/SkXMLAnimatorWriter.h
diff --git a/gfx/skia/trunk/src/animator/thingstodo.txt b/gfx/skia/skia/src/animator/thingstodo.txt
rename from gfx/skia/trunk/src/animator/thingstodo.txt
rename to gfx/skia/skia/src/animator/thingstodo.txt
diff --git a/gfx/skia/trunk/src/core/SkAAClip.cpp b/gfx/skia/skia/src/core/SkAAClip.cpp
rename from gfx/skia/trunk/src/core/SkAAClip.cpp
rename to gfx/skia/skia/src/core/SkAAClip.cpp
diff --git a/gfx/skia/trunk/src/core/SkAAClip.h b/gfx/skia/skia/src/core/SkAAClip.h
rename from gfx/skia/trunk/src/core/SkAAClip.h
rename to gfx/skia/skia/src/core/SkAAClip.h
diff --git a/gfx/skia/trunk/src/core/SkAdvancedTypefaceMetrics.cpp b/gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.cpp
rename from gfx/skia/trunk/src/core/SkAdvancedTypefaceMetrics.cpp
rename to gfx/skia/skia/src/core/SkAdvancedTypefaceMetrics.cpp
diff --git a/gfx/skia/trunk/src/core/SkAlphaRuns.cpp b/gfx/skia/skia/src/core/SkAlphaRuns.cpp
rename from gfx/skia/trunk/src/core/SkAlphaRuns.cpp
rename to gfx/skia/skia/src/core/SkAlphaRuns.cpp
diff --git a/gfx/skia/trunk/src/core/SkAnnotation.cpp b/gfx/skia/skia/src/core/SkAnnotation.cpp
rename from gfx/skia/trunk/src/core/SkAnnotation.cpp
rename to gfx/skia/skia/src/core/SkAnnotation.cpp
diff --git a/gfx/skia/trunk/src/core/SkAntiRun.h b/gfx/skia/skia/src/core/SkAntiRun.h
rename from gfx/skia/trunk/src/core/SkAntiRun.h
rename to gfx/skia/skia/src/core/SkAntiRun.h
diff --git a/gfx/skia/trunk/src/core/SkAutoKern.h b/gfx/skia/skia/src/core/SkAutoKern.h
rename from gfx/skia/trunk/src/core/SkAutoKern.h
rename to gfx/skia/skia/src/core/SkAutoKern.h
diff --git a/gfx/skia/trunk/src/core/SkBBHFactory.cpp b/gfx/skia/skia/src/core/SkBBHFactory.cpp
rename from gfx/skia/trunk/src/core/SkBBHFactory.cpp
rename to gfx/skia/skia/src/core/SkBBHFactory.cpp
diff --git a/gfx/skia/trunk/src/core/SkBBoxHierarchy.h b/gfx/skia/skia/src/core/SkBBoxHierarchy.h
rename from gfx/skia/trunk/src/core/SkBBoxHierarchy.h
rename to gfx/skia/skia/src/core/SkBBoxHierarchy.h
diff --git a/gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.cpp b/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.cpp
rename from gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.cpp
rename to gfx/skia/skia/src/core/SkBBoxHierarchyRecord.cpp
diff --git a/gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.h b/gfx/skia/skia/src/core/SkBBoxHierarchyRecord.h
rename from gfx/skia/trunk/src/core/SkBBoxHierarchyRecord.h
rename to gfx/skia/skia/src/core/SkBBoxHierarchyRecord.h
diff --git a/gfx/skia/trunk/src/core/SkBBoxRecord.cpp b/gfx/skia/skia/src/core/SkBBoxRecord.cpp
rename from gfx/skia/trunk/src/core/SkBBoxRecord.cpp
rename to gfx/skia/skia/src/core/SkBBoxRecord.cpp
diff --git a/gfx/skia/trunk/src/core/SkBBoxRecord.h b/gfx/skia/skia/src/core/SkBBoxRecord.h
rename from gfx/skia/trunk/src/core/SkBBoxRecord.h
rename to gfx/skia/skia/src/core/SkBBoxRecord.h
diff --git a/gfx/skia/trunk/src/core/SkBitmap.cpp b/gfx/skia/skia/src/core/SkBitmap.cpp
rename from gfx/skia/trunk/src/core/SkBitmap.cpp
rename to gfx/skia/skia/src/core/SkBitmap.cpp
diff --git a/gfx/skia/trunk/src/core/SkBitmapDevice.cpp b/gfx/skia/skia/src/core/SkBitmapDevice.cpp
rename from gfx/skia/trunk/src/core/SkBitmapDevice.cpp
rename to gfx/skia/skia/src/core/SkBitmapDevice.cpp
diff --git a/gfx/skia/trunk/src/core/SkBitmapFilter.cpp b/gfx/skia/skia/src/core/SkBitmapFilter.cpp
rename from gfx/skia/trunk/src/core/SkBitmapFilter.cpp
rename to gfx/skia/skia/src/core/SkBitmapFilter.cpp
diff --git a/gfx/skia/trunk/src/core/SkBitmapFilter.h b/gfx/skia/skia/src/core/SkBitmapFilter.h
rename from gfx/skia/trunk/src/core/SkBitmapFilter.h
rename to gfx/skia/skia/src/core/SkBitmapFilter.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapHeap.cpp b/gfx/skia/skia/src/core/SkBitmapHeap.cpp
rename from gfx/skia/trunk/src/core/SkBitmapHeap.cpp
rename to gfx/skia/skia/src/core/SkBitmapHeap.cpp
diff --git a/gfx/skia/trunk/src/core/SkBitmapHeap.h b/gfx/skia/skia/src/core/SkBitmapHeap.h
rename from gfx/skia/trunk/src/core/SkBitmapHeap.h
rename to gfx/skia/skia/src/core/SkBitmapHeap.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcShader.cpp b/gfx/skia/skia/src/core/SkBitmapProcShader.cpp
rename from gfx/skia/trunk/src/core/SkBitmapProcShader.cpp
rename to gfx/skia/skia/src/core/SkBitmapProcShader.cpp
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcShader.h b/gfx/skia/skia/src/core/SkBitmapProcShader.h
rename from gfx/skia/trunk/src/core/SkBitmapProcShader.h
rename to gfx/skia/skia/src/core/SkBitmapProcShader.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState.cpp b/gfx/skia/skia/src/core/SkBitmapProcState.cpp
rename from gfx/skia/trunk/src/core/SkBitmapProcState.cpp
rename to gfx/skia/skia/src/core/SkBitmapProcState.cpp
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState.h b/gfx/skia/skia/src/core/SkBitmapProcState.h
rename from gfx/skia/trunk/src/core/SkBitmapProcState.h
rename to gfx/skia/skia/src/core/SkBitmapProcState.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_filter.h b/gfx/skia/skia/src/core/SkBitmapProcState_filter.h
rename from gfx/skia/trunk/src/core/SkBitmapProcState_filter.h
rename to gfx/skia/skia/src/core/SkBitmapProcState_filter.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_matrix.h b/gfx/skia/skia/src/core/SkBitmapProcState_matrix.h
rename from gfx/skia/trunk/src/core/SkBitmapProcState_matrix.h
rename to gfx/skia/skia/src/core/SkBitmapProcState_matrix.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_matrixProcs.cpp b/gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp
rename from gfx/skia/trunk/src/core/SkBitmapProcState_matrixProcs.cpp
rename to gfx/skia/skia/src/core/SkBitmapProcState_matrixProcs.cpp
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_matrix_template.h b/gfx/skia/skia/src/core/SkBitmapProcState_matrix_template.h
rename from gfx/skia/trunk/src/core/SkBitmapProcState_matrix_template.h
rename to gfx/skia/skia/src/core/SkBitmapProcState_matrix_template.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_procs.h b/gfx/skia/skia/src/core/SkBitmapProcState_procs.h
rename from gfx/skia/trunk/src/core/SkBitmapProcState_procs.h
rename to gfx/skia/skia/src/core/SkBitmapProcState_procs.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_sample.h b/gfx/skia/skia/src/core/SkBitmapProcState_sample.h
rename from gfx/skia/trunk/src/core/SkBitmapProcState_sample.h
rename to gfx/skia/skia/src/core/SkBitmapProcState_sample.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_shaderproc.h b/gfx/skia/skia/src/core/SkBitmapProcState_shaderproc.h
rename from gfx/skia/trunk/src/core/SkBitmapProcState_shaderproc.h
rename to gfx/skia/skia/src/core/SkBitmapProcState_shaderproc.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapProcState_utils.h b/gfx/skia/skia/src/core/SkBitmapProcState_utils.h
rename from gfx/skia/trunk/src/core/SkBitmapProcState_utils.h
rename to gfx/skia/skia/src/core/SkBitmapProcState_utils.h
diff --git a/gfx/skia/trunk/src/core/SkBitmapScaler.cpp b/gfx/skia/skia/src/core/SkBitmapScaler.cpp
rename from gfx/skia/trunk/src/core/SkBitmapScaler.cpp
rename to gfx/skia/skia/src/core/SkBitmapScaler.cpp
diff --git a/gfx/skia/trunk/src/core/SkBitmapScaler.h b/gfx/skia/skia/src/core/SkBitmapScaler.h
rename from gfx/skia/trunk/src/core/SkBitmapScaler.h
rename to gfx/skia/skia/src/core/SkBitmapScaler.h
diff --git a/gfx/skia/trunk/src/core/SkBitmap_scroll.cpp b/gfx/skia/skia/src/core/SkBitmap_scroll.cpp
rename from gfx/skia/trunk/src/core/SkBitmap_scroll.cpp
rename to gfx/skia/skia/src/core/SkBitmap_scroll.cpp
diff --git a/gfx/skia/trunk/src/core/SkBlitBWMaskTemplate.h b/gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h
rename from gfx/skia/trunk/src/core/SkBlitBWMaskTemplate.h
rename to gfx/skia/skia/src/core/SkBlitBWMaskTemplate.h
diff --git a/gfx/skia/trunk/src/core/SkBlitMask.h b/gfx/skia/skia/src/core/SkBlitMask.h
rename from gfx/skia/trunk/src/core/SkBlitMask.h
rename to gfx/skia/skia/src/core/SkBlitMask.h
diff --git a/gfx/skia/trunk/src/core/SkBlitMask_D32.cpp b/gfx/skia/skia/src/core/SkBlitMask_D32.cpp
rename from gfx/skia/trunk/src/core/SkBlitMask_D32.cpp
rename to gfx/skia/skia/src/core/SkBlitMask_D32.cpp
diff --git a/gfx/skia/trunk/src/core/SkBlitRow_D16.cpp b/gfx/skia/skia/src/core/SkBlitRow_D16.cpp
rename from gfx/skia/trunk/src/core/SkBlitRow_D16.cpp
rename to gfx/skia/skia/src/core/SkBlitRow_D16.cpp
diff --git a/gfx/skia/trunk/src/core/SkBlitRow_D32.cpp b/gfx/skia/skia/src/core/SkBlitRow_D32.cpp
rename from gfx/skia/trunk/src/core/SkBlitRow_D32.cpp
rename to gfx/skia/skia/src/core/SkBlitRow_D32.cpp
diff --git a/gfx/skia/trunk/src/core/SkBlitter.cpp b/gfx/skia/skia/src/core/SkBlitter.cpp
rename from gfx/skia/trunk/src/core/SkBlitter.cpp
rename to gfx/skia/skia/src/core/SkBlitter.cpp
diff --git a/gfx/skia/trunk/src/core/SkBlitter.h b/gfx/skia/skia/src/core/SkBlitter.h
rename from gfx/skia/trunk/src/core/SkBlitter.h
rename to gfx/skia/skia/src/core/SkBlitter.h
diff --git a/gfx/skia/trunk/src/core/SkBlitter_A8.cpp b/gfx/skia/skia/src/core/SkBlitter_A8.cpp
rename from gfx/skia/trunk/src/core/SkBlitter_A8.cpp
rename to gfx/skia/skia/src/core/SkBlitter_A8.cpp
diff --git a/gfx/skia/trunk/src/core/SkBlitter_ARGB32.cpp b/gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp
rename from gfx/skia/trunk/src/core/SkBlitter_ARGB32.cpp
rename to gfx/skia/skia/src/core/SkBlitter_ARGB32.cpp
diff --git a/gfx/skia/trunk/src/core/SkBlitter_RGB16.cpp b/gfx/skia/skia/src/core/SkBlitter_RGB16.cpp
rename from gfx/skia/trunk/src/core/SkBlitter_RGB16.cpp
rename to gfx/skia/skia/src/core/SkBlitter_RGB16.cpp
diff --git a/gfx/skia/trunk/src/core/SkBlitter_Sprite.cpp b/gfx/skia/skia/src/core/SkBlitter_Sprite.cpp
rename from gfx/skia/trunk/src/core/SkBlitter_Sprite.cpp
rename to gfx/skia/skia/src/core/SkBlitter_Sprite.cpp
diff --git a/gfx/skia/trunk/src/core/SkBuffer.cpp b/gfx/skia/skia/src/core/SkBuffer.cpp
rename from gfx/skia/trunk/src/core/SkBuffer.cpp
rename to gfx/skia/skia/src/core/SkBuffer.cpp
diff --git a/gfx/skia/trunk/src/core/SkBuffer.h b/gfx/skia/skia/src/core/SkBuffer.h
rename from gfx/skia/trunk/src/core/SkBuffer.h
rename to gfx/skia/skia/src/core/SkBuffer.h
diff --git a/gfx/skia/trunk/src/core/SkCanvas.cpp b/gfx/skia/skia/src/core/SkCanvas.cpp
rename from gfx/skia/trunk/src/core/SkCanvas.cpp
rename to gfx/skia/skia/src/core/SkCanvas.cpp
diff --git a/gfx/skia/trunk/src/core/SkChecksum.h b/gfx/skia/skia/src/core/SkChecksum.h
rename from gfx/skia/trunk/src/core/SkChecksum.h
rename to gfx/skia/skia/src/core/SkChecksum.h
diff --git a/gfx/skia/trunk/src/core/SkChunkAlloc.cpp b/gfx/skia/skia/src/core/SkChunkAlloc.cpp
rename from gfx/skia/trunk/src/core/SkChunkAlloc.cpp
rename to gfx/skia/skia/src/core/SkChunkAlloc.cpp
diff --git a/gfx/skia/trunk/src/core/SkClipStack.cpp b/gfx/skia/skia/src/core/SkClipStack.cpp
rename from gfx/skia/trunk/src/core/SkClipStack.cpp
rename to gfx/skia/skia/src/core/SkClipStack.cpp
diff --git a/gfx/skia/trunk/src/core/SkColor.cpp b/gfx/skia/skia/src/core/SkColor.cpp
rename from gfx/skia/trunk/src/core/SkColor.cpp
rename to gfx/skia/skia/src/core/SkColor.cpp
diff --git a/gfx/skia/trunk/src/core/SkColorFilter.cpp b/gfx/skia/skia/src/core/SkColorFilter.cpp
rename from gfx/skia/trunk/src/core/SkColorFilter.cpp
rename to gfx/skia/skia/src/core/SkColorFilter.cpp
diff --git a/gfx/skia/trunk/src/core/SkColorTable.cpp b/gfx/skia/skia/src/core/SkColorTable.cpp
rename from gfx/skia/trunk/src/core/SkColorTable.cpp
rename to gfx/skia/skia/src/core/SkColorTable.cpp
diff --git a/gfx/skia/trunk/src/core/SkComposeShader.cpp b/gfx/skia/skia/src/core/SkComposeShader.cpp
rename from gfx/skia/trunk/src/core/SkComposeShader.cpp
rename to gfx/skia/skia/src/core/SkComposeShader.cpp
diff --git a/gfx/skia/trunk/src/core/SkConfig8888.cpp b/gfx/skia/skia/src/core/SkConfig8888.cpp
rename from gfx/skia/trunk/src/core/SkConfig8888.cpp
rename to gfx/skia/skia/src/core/SkConfig8888.cpp
diff --git a/gfx/skia/trunk/src/core/SkConfig8888.h b/gfx/skia/skia/src/core/SkConfig8888.h
rename from gfx/skia/trunk/src/core/SkConfig8888.h
rename to gfx/skia/skia/src/core/SkConfig8888.h
diff --git a/gfx/skia/trunk/src/core/SkConvolver.cpp b/gfx/skia/skia/src/core/SkConvolver.cpp
rename from gfx/skia/trunk/src/core/SkConvolver.cpp
rename to gfx/skia/skia/src/core/SkConvolver.cpp
diff --git a/gfx/skia/trunk/src/core/SkConvolver.h b/gfx/skia/skia/src/core/SkConvolver.h
rename from gfx/skia/trunk/src/core/SkConvolver.h
rename to gfx/skia/skia/src/core/SkConvolver.h
diff --git a/gfx/skia/trunk/src/core/SkCoreBlitters.h b/gfx/skia/skia/src/core/SkCoreBlitters.h
rename from gfx/skia/trunk/src/core/SkCoreBlitters.h
rename to gfx/skia/skia/src/core/SkCoreBlitters.h
diff --git a/gfx/skia/trunk/src/core/SkCubicClipper.cpp b/gfx/skia/skia/src/core/SkCubicClipper.cpp
rename from gfx/skia/trunk/src/core/SkCubicClipper.cpp
rename to gfx/skia/skia/src/core/SkCubicClipper.cpp
diff --git a/gfx/skia/trunk/src/core/SkCubicClipper.h b/gfx/skia/skia/src/core/SkCubicClipper.h
rename from gfx/skia/trunk/src/core/SkCubicClipper.h
rename to gfx/skia/skia/src/core/SkCubicClipper.h
diff --git a/gfx/skia/trunk/src/core/SkData.cpp b/gfx/skia/skia/src/core/SkData.cpp
rename from gfx/skia/trunk/src/core/SkData.cpp
rename to gfx/skia/skia/src/core/SkData.cpp
diff --git a/gfx/skia/trunk/src/core/SkDataTable.cpp b/gfx/skia/skia/src/core/SkDataTable.cpp
rename from gfx/skia/trunk/src/core/SkDataTable.cpp
rename to gfx/skia/skia/src/core/SkDataTable.cpp
diff --git a/gfx/skia/trunk/src/core/SkDebug.cpp b/gfx/skia/skia/src/core/SkDebug.cpp
rename from gfx/skia/trunk/src/core/SkDebug.cpp
rename to gfx/skia/skia/src/core/SkDebug.cpp
diff --git a/gfx/skia/trunk/src/core/SkDeque.cpp b/gfx/skia/skia/src/core/SkDeque.cpp
rename from gfx/skia/trunk/src/core/SkDeque.cpp
rename to gfx/skia/skia/src/core/SkDeque.cpp
diff --git a/gfx/skia/trunk/src/core/SkDescriptor.h b/gfx/skia/skia/src/core/SkDescriptor.h
rename from gfx/skia/trunk/src/core/SkDescriptor.h
rename to gfx/skia/skia/src/core/SkDescriptor.h
diff --git a/gfx/skia/trunk/src/core/SkDevice.cpp b/gfx/skia/skia/src/core/SkDevice.cpp
rename from gfx/skia/trunk/src/core/SkDevice.cpp
rename to gfx/skia/skia/src/core/SkDevice.cpp
diff --git a/gfx/skia/trunk/src/core/SkDeviceImageFilterProxy.h b/gfx/skia/skia/src/core/SkDeviceImageFilterProxy.h
rename from gfx/skia/trunk/src/core/SkDeviceImageFilterProxy.h
rename to gfx/skia/skia/src/core/SkDeviceImageFilterProxy.h
diff --git a/gfx/skia/trunk/src/core/SkDeviceLooper.cpp b/gfx/skia/skia/src/core/SkDeviceLooper.cpp
rename from gfx/skia/trunk/src/core/SkDeviceLooper.cpp
rename to gfx/skia/skia/src/core/SkDeviceLooper.cpp
diff --git a/gfx/skia/trunk/src/core/SkDeviceLooper.h b/gfx/skia/skia/src/core/SkDeviceLooper.h
rename from gfx/skia/trunk/src/core/SkDeviceLooper.h
rename to gfx/skia/skia/src/core/SkDeviceLooper.h
diff --git a/gfx/skia/trunk/src/core/SkDeviceProfile.cpp b/gfx/skia/skia/src/core/SkDeviceProfile.cpp
rename from gfx/skia/trunk/src/core/SkDeviceProfile.cpp
rename to gfx/skia/skia/src/core/SkDeviceProfile.cpp
diff --git a/gfx/skia/trunk/src/core/SkDeviceProfile.h b/gfx/skia/skia/src/core/SkDeviceProfile.h
rename from gfx/skia/trunk/src/core/SkDeviceProfile.h
rename to gfx/skia/skia/src/core/SkDeviceProfile.h
diff --git a/gfx/skia/trunk/src/core/SkDiscardableMemory.h b/gfx/skia/skia/src/core/SkDiscardableMemory.h
rename from gfx/skia/trunk/src/core/SkDiscardableMemory.h
rename to gfx/skia/skia/src/core/SkDiscardableMemory.h
diff --git a/gfx/skia/trunk/src/core/SkDistanceFieldGen.cpp b/gfx/skia/skia/src/core/SkDistanceFieldGen.cpp
rename from gfx/skia/trunk/src/core/SkDistanceFieldGen.cpp
rename to gfx/skia/skia/src/core/SkDistanceFieldGen.cpp
diff --git a/gfx/skia/trunk/src/core/SkDistanceFieldGen.h b/gfx/skia/skia/src/core/SkDistanceFieldGen.h
rename from gfx/skia/trunk/src/core/SkDistanceFieldGen.h
rename to gfx/skia/skia/src/core/SkDistanceFieldGen.h
diff --git a/gfx/skia/trunk/src/core/SkDither.cpp b/gfx/skia/skia/src/core/SkDither.cpp
rename from gfx/skia/trunk/src/core/SkDither.cpp
rename to gfx/skia/skia/src/core/SkDither.cpp
diff --git a/gfx/skia/trunk/src/core/SkDraw.cpp b/gfx/skia/skia/src/core/SkDraw.cpp
rename from gfx/skia/trunk/src/core/SkDraw.cpp
rename to gfx/skia/skia/src/core/SkDraw.cpp
diff --git a/gfx/skia/trunk/src/core/SkDrawLooper.cpp b/gfx/skia/skia/src/core/SkDrawLooper.cpp
rename from gfx/skia/trunk/src/core/SkDrawLooper.cpp
rename to gfx/skia/skia/src/core/SkDrawLooper.cpp
diff --git a/gfx/skia/trunk/src/core/SkDrawProcs.h b/gfx/skia/skia/src/core/SkDrawProcs.h
rename from gfx/skia/trunk/src/core/SkDrawProcs.h
rename to gfx/skia/skia/src/core/SkDrawProcs.h
diff --git a/gfx/skia/trunk/src/core/SkEdge.cpp b/gfx/skia/skia/src/core/SkEdge.cpp
rename from gfx/skia/trunk/src/core/SkEdge.cpp
rename to gfx/skia/skia/src/core/SkEdge.cpp
diff --git a/gfx/skia/trunk/src/core/SkEdge.h b/gfx/skia/skia/src/core/SkEdge.h
rename from gfx/skia/trunk/src/core/SkEdge.h
rename to gfx/skia/skia/src/core/SkEdge.h
diff --git a/gfx/skia/trunk/src/core/SkEdgeBuilder.cpp b/gfx/skia/skia/src/core/SkEdgeBuilder.cpp
rename from gfx/skia/trunk/src/core/SkEdgeBuilder.cpp
rename to gfx/skia/skia/src/core/SkEdgeBuilder.cpp
diff --git a/gfx/skia/trunk/src/core/SkEdgeBuilder.h b/gfx/skia/skia/src/core/SkEdgeBuilder.h
rename from gfx/skia/trunk/src/core/SkEdgeBuilder.h
rename to gfx/skia/skia/src/core/SkEdgeBuilder.h
diff --git a/gfx/skia/trunk/src/core/SkEdgeClipper.cpp b/gfx/skia/skia/src/core/SkEdgeClipper.cpp
rename from gfx/skia/trunk/src/core/SkEdgeClipper.cpp
rename to gfx/skia/skia/src/core/SkEdgeClipper.cpp
diff --git a/gfx/skia/trunk/src/core/SkEdgeClipper.h b/gfx/skia/skia/src/core/SkEdgeClipper.h
rename from gfx/skia/trunk/src/core/SkEdgeClipper.h
rename to gfx/skia/skia/src/core/SkEdgeClipper.h
diff --git a/gfx/skia/trunk/src/core/SkEmptyShader.h b/gfx/skia/skia/src/core/SkEmptyShader.h
rename from gfx/skia/trunk/src/core/SkEmptyShader.h
rename to gfx/skia/skia/src/core/SkEmptyShader.h
diff --git a/gfx/skia/trunk/src/core/SkError.cpp b/gfx/skia/skia/src/core/SkError.cpp
rename from gfx/skia/trunk/src/core/SkError.cpp
rename to gfx/skia/skia/src/core/SkError.cpp
diff --git a/gfx/skia/trunk/src/core/SkErrorInternals.h b/gfx/skia/skia/src/core/SkErrorInternals.h
rename from gfx/skia/trunk/src/core/SkErrorInternals.h
rename to gfx/skia/skia/src/core/SkErrorInternals.h
diff --git a/gfx/skia/trunk/src/core/SkFDot6.h b/gfx/skia/skia/src/core/SkFDot6.h
rename from gfx/skia/trunk/src/core/SkFDot6.h
rename to gfx/skia/skia/src/core/SkFDot6.h
diff --git a/gfx/skia/trunk/src/core/SkFilterProc.cpp b/gfx/skia/skia/src/core/SkFilterProc.cpp
rename from gfx/skia/trunk/src/core/SkFilterProc.cpp
rename to gfx/skia/skia/src/core/SkFilterProc.cpp
diff --git a/gfx/skia/trunk/src/core/SkFilterProc.h b/gfx/skia/skia/src/core/SkFilterProc.h
rename from gfx/skia/trunk/src/core/SkFilterProc.h
rename to gfx/skia/skia/src/core/SkFilterProc.h
diff --git a/gfx/skia/trunk/src/core/SkFilterShader.cpp b/gfx/skia/skia/src/core/SkFilterShader.cpp
rename from gfx/skia/trunk/src/core/SkFilterShader.cpp
rename to gfx/skia/skia/src/core/SkFilterShader.cpp
diff --git a/gfx/skia/trunk/src/core/SkFilterShader.h b/gfx/skia/skia/src/core/SkFilterShader.h
rename from gfx/skia/trunk/src/core/SkFilterShader.h
rename to gfx/skia/skia/src/core/SkFilterShader.h
diff --git a/gfx/skia/trunk/src/core/SkFlate.cpp b/gfx/skia/skia/src/core/SkFlate.cpp
rename from gfx/skia/trunk/src/core/SkFlate.cpp
rename to gfx/skia/skia/src/core/SkFlate.cpp
diff --git a/gfx/skia/trunk/src/core/SkFlate.h b/gfx/skia/skia/src/core/SkFlate.h
rename from gfx/skia/trunk/src/core/SkFlate.h
rename to gfx/skia/skia/src/core/SkFlate.h
diff --git a/gfx/skia/trunk/src/core/SkFlattenable.cpp b/gfx/skia/skia/src/core/SkFlattenable.cpp
rename from gfx/skia/trunk/src/core/SkFlattenable.cpp
rename to gfx/skia/skia/src/core/SkFlattenable.cpp
diff --git a/gfx/skia/trunk/src/core/SkFlattenableSerialization.cpp b/gfx/skia/skia/src/core/SkFlattenableSerialization.cpp
rename from gfx/skia/trunk/src/core/SkFlattenableSerialization.cpp
rename to gfx/skia/skia/src/core/SkFlattenableSerialization.cpp
diff --git a/gfx/skia/trunk/src/core/SkFloat.cpp b/gfx/skia/skia/src/core/SkFloat.cpp
rename from gfx/skia/trunk/src/core/SkFloat.cpp
rename to gfx/skia/skia/src/core/SkFloat.cpp
diff --git a/gfx/skia/trunk/src/core/SkFloat.h b/gfx/skia/skia/src/core/SkFloat.h
rename from gfx/skia/trunk/src/core/SkFloat.h
rename to gfx/skia/skia/src/core/SkFloat.h
diff --git a/gfx/skia/trunk/src/core/SkFloatBits.cpp b/gfx/skia/skia/src/core/SkFloatBits.cpp
rename from gfx/skia/trunk/src/core/SkFloatBits.cpp
rename to gfx/skia/skia/src/core/SkFloatBits.cpp
diff --git a/gfx/skia/trunk/src/core/SkFont.cpp b/gfx/skia/skia/src/core/SkFont.cpp
rename from gfx/skia/trunk/src/core/SkFont.cpp
rename to gfx/skia/skia/src/core/SkFont.cpp
diff --git a/gfx/skia/trunk/src/core/SkFontDescriptor.cpp b/gfx/skia/skia/src/core/SkFontDescriptor.cpp
rename from gfx/skia/trunk/src/core/SkFontDescriptor.cpp
rename to gfx/skia/skia/src/core/SkFontDescriptor.cpp
diff --git a/gfx/skia/trunk/src/core/SkFontDescriptor.h b/gfx/skia/skia/src/core/SkFontDescriptor.h
rename from gfx/skia/trunk/src/core/SkFontDescriptor.h
rename to gfx/skia/skia/src/core/SkFontDescriptor.h
diff --git a/gfx/skia/trunk/src/core/SkFontHost.cpp b/gfx/skia/skia/src/core/SkFontHost.cpp
rename from gfx/skia/trunk/src/core/SkFontHost.cpp
rename to gfx/skia/skia/src/core/SkFontHost.cpp
diff --git a/gfx/skia/trunk/src/core/SkFontStream.cpp b/gfx/skia/skia/src/core/SkFontStream.cpp
rename from gfx/skia/trunk/src/core/SkFontStream.cpp
rename to gfx/skia/skia/src/core/SkFontStream.cpp
diff --git a/gfx/skia/trunk/src/core/SkFontStream.h b/gfx/skia/skia/src/core/SkFontStream.h
rename from gfx/skia/trunk/src/core/SkFontStream.h
rename to gfx/skia/skia/src/core/SkFontStream.h
diff --git a/gfx/skia/trunk/src/core/SkGeometry.cpp b/gfx/skia/skia/src/core/SkGeometry.cpp
rename from gfx/skia/trunk/src/core/SkGeometry.cpp
rename to gfx/skia/skia/src/core/SkGeometry.cpp
diff --git a/gfx/skia/trunk/src/core/SkGeometry.h b/gfx/skia/skia/src/core/SkGeometry.h
rename from gfx/skia/trunk/src/core/SkGeometry.h
rename to gfx/skia/skia/src/core/SkGeometry.h
diff --git a/gfx/skia/trunk/src/core/SkGlyph.h b/gfx/skia/skia/src/core/SkGlyph.h
rename from gfx/skia/trunk/src/core/SkGlyph.h
rename to gfx/skia/skia/src/core/SkGlyph.h
diff --git a/gfx/skia/trunk/src/core/SkGlyphCache.cpp b/gfx/skia/skia/src/core/SkGlyphCache.cpp
rename from gfx/skia/trunk/src/core/SkGlyphCache.cpp
rename to gfx/skia/skia/src/core/SkGlyphCache.cpp
diff --git a/gfx/skia/trunk/src/core/SkGlyphCache.h b/gfx/skia/skia/src/core/SkGlyphCache.h
rename from gfx/skia/trunk/src/core/SkGlyphCache.h
rename to gfx/skia/skia/src/core/SkGlyphCache.h
diff --git a/gfx/skia/trunk/src/core/SkGlyphCache_Globals.h b/gfx/skia/skia/src/core/SkGlyphCache_Globals.h
rename from gfx/skia/trunk/src/core/SkGlyphCache_Globals.h
rename to gfx/skia/skia/src/core/SkGlyphCache_Globals.h
diff --git a/gfx/skia/trunk/src/core/SkGraphics.cpp b/gfx/skia/skia/src/core/SkGraphics.cpp
rename from gfx/skia/trunk/src/core/SkGraphics.cpp
rename to gfx/skia/skia/src/core/SkGraphics.cpp
diff --git a/gfx/skia/trunk/src/core/SkImageFilter.cpp b/gfx/skia/skia/src/core/SkImageFilter.cpp
rename from gfx/skia/trunk/src/core/SkImageFilter.cpp
rename to gfx/skia/skia/src/core/SkImageFilter.cpp
diff --git a/gfx/skia/trunk/src/core/SkImageGenerator.cpp b/gfx/skia/skia/src/core/SkImageGenerator.cpp
rename from gfx/skia/trunk/src/core/SkImageGenerator.cpp
rename to gfx/skia/skia/src/core/SkImageGenerator.cpp
diff --git a/gfx/skia/trunk/src/core/SkImageGeneratorPriv.h b/gfx/skia/skia/src/core/SkImageGeneratorPriv.h
rename from gfx/skia/trunk/src/core/SkImageGeneratorPriv.h
rename to gfx/skia/skia/src/core/SkImageGeneratorPriv.h
diff --git a/gfx/skia/trunk/src/core/SkImageInfo.cpp b/gfx/skia/skia/src/core/SkImageInfo.cpp
rename from gfx/skia/trunk/src/core/SkImageInfo.cpp
rename to gfx/skia/skia/src/core/SkImageInfo.cpp
diff --git a/gfx/skia/trunk/src/core/SkInstCnt.cpp b/gfx/skia/skia/src/core/SkInstCnt.cpp
rename from gfx/skia/trunk/src/core/SkInstCnt.cpp
rename to gfx/skia/skia/src/core/SkInstCnt.cpp
diff --git a/gfx/skia/trunk/src/core/SkLazyFnPtr.h b/gfx/skia/skia/src/core/SkLazyFnPtr.h
rename from gfx/skia/trunk/src/core/SkLazyFnPtr.h
rename to gfx/skia/skia/src/core/SkLazyFnPtr.h
diff --git a/gfx/skia/trunk/src/core/SkLazyPtr.h b/gfx/skia/skia/src/core/SkLazyPtr.h
rename from gfx/skia/trunk/src/core/SkLazyPtr.h
rename to gfx/skia/skia/src/core/SkLazyPtr.h
diff --git a/gfx/skia/trunk/src/core/SkLineClipper.cpp b/gfx/skia/skia/src/core/SkLineClipper.cpp
rename from gfx/skia/trunk/src/core/SkLineClipper.cpp
rename to gfx/skia/skia/src/core/SkLineClipper.cpp
diff --git a/gfx/skia/trunk/src/core/SkLineClipper.h b/gfx/skia/skia/src/core/SkLineClipper.h
rename from gfx/skia/trunk/src/core/SkLineClipper.h
rename to gfx/skia/skia/src/core/SkLineClipper.h
diff --git a/gfx/skia/trunk/src/core/SkLocalMatrixShader.cpp b/gfx/skia/skia/src/core/SkLocalMatrixShader.cpp
rename from gfx/skia/trunk/src/core/SkLocalMatrixShader.cpp
rename to gfx/skia/skia/src/core/SkLocalMatrixShader.cpp
diff --git a/gfx/skia/trunk/src/core/SkLocalMatrixShader.h b/gfx/skia/skia/src/core/SkLocalMatrixShader.h
rename from gfx/skia/trunk/src/core/SkLocalMatrixShader.h
rename to gfx/skia/skia/src/core/SkLocalMatrixShader.h
diff --git a/gfx/skia/trunk/src/core/SkMallocPixelRef.cpp b/gfx/skia/skia/src/core/SkMallocPixelRef.cpp
rename from gfx/skia/trunk/src/core/SkMallocPixelRef.cpp
rename to gfx/skia/skia/src/core/SkMallocPixelRef.cpp
diff --git a/gfx/skia/trunk/src/core/SkMask.cpp b/gfx/skia/skia/src/core/SkMask.cpp
rename from gfx/skia/trunk/src/core/SkMask.cpp
rename to gfx/skia/skia/src/core/SkMask.cpp
diff --git a/gfx/skia/trunk/src/core/SkMaskFilter.cpp b/gfx/skia/skia/src/core/SkMaskFilter.cpp
rename from gfx/skia/trunk/src/core/SkMaskFilter.cpp
rename to gfx/skia/skia/src/core/SkMaskFilter.cpp
diff --git a/gfx/skia/trunk/src/core/SkMaskGamma.cpp b/gfx/skia/skia/src/core/SkMaskGamma.cpp
rename from gfx/skia/trunk/src/core/SkMaskGamma.cpp
rename to gfx/skia/skia/src/core/SkMaskGamma.cpp
diff --git a/gfx/skia/trunk/src/core/SkMaskGamma.h b/gfx/skia/skia/src/core/SkMaskGamma.h
rename from gfx/skia/trunk/src/core/SkMaskGamma.h
rename to gfx/skia/skia/src/core/SkMaskGamma.h
diff --git a/gfx/skia/trunk/src/core/SkMath.cpp b/gfx/skia/skia/src/core/SkMath.cpp
rename from gfx/skia/trunk/src/core/SkMath.cpp
rename to gfx/skia/skia/src/core/SkMath.cpp
diff --git a/gfx/skia/trunk/src/core/SkMathPriv.h b/gfx/skia/skia/src/core/SkMathPriv.h
rename from gfx/skia/trunk/src/core/SkMathPriv.h
rename to gfx/skia/skia/src/core/SkMathPriv.h
diff --git a/gfx/skia/trunk/src/core/SkMatrix.cpp b/gfx/skia/skia/src/core/SkMatrix.cpp
rename from gfx/skia/trunk/src/core/SkMatrix.cpp
rename to gfx/skia/skia/src/core/SkMatrix.cpp
diff --git a/gfx/skia/trunk/src/core/SkMatrixClipStateMgr.cpp b/gfx/skia/skia/src/core/SkMatrixClipStateMgr.cpp
rename from gfx/skia/trunk/src/core/SkMatrixClipStateMgr.cpp
rename to gfx/skia/skia/src/core/SkMatrixClipStateMgr.cpp
diff --git a/gfx/skia/trunk/src/core/SkMatrixClipStateMgr.h b/gfx/skia/skia/src/core/SkMatrixClipStateMgr.h
rename from gfx/skia/trunk/src/core/SkMatrixClipStateMgr.h
rename to gfx/skia/skia/src/core/SkMatrixClipStateMgr.h
diff --git a/gfx/skia/trunk/src/core/SkMatrixUtils.h b/gfx/skia/skia/src/core/SkMatrixUtils.h
rename from gfx/skia/trunk/src/core/SkMatrixUtils.h
rename to gfx/skia/skia/src/core/SkMatrixUtils.h
diff --git a/gfx/skia/trunk/src/core/SkMessageBus.h b/gfx/skia/skia/src/core/SkMessageBus.h
rename from gfx/skia/trunk/src/core/SkMessageBus.h
rename to gfx/skia/skia/src/core/SkMessageBus.h
diff --git a/gfx/skia/trunk/src/core/SkMetaData.cpp b/gfx/skia/skia/src/core/SkMetaData.cpp
rename from gfx/skia/trunk/src/core/SkMetaData.cpp
rename to gfx/skia/skia/src/core/SkMetaData.cpp
diff --git a/gfx/skia/trunk/src/core/SkMipMap.cpp b/gfx/skia/skia/src/core/SkMipMap.cpp
rename from gfx/skia/trunk/src/core/SkMipMap.cpp
rename to gfx/skia/skia/src/core/SkMipMap.cpp
diff --git a/gfx/skia/trunk/src/core/SkMipMap.h b/gfx/skia/skia/src/core/SkMipMap.h
rename from gfx/skia/trunk/src/core/SkMipMap.h
rename to gfx/skia/skia/src/core/SkMipMap.h
diff --git a/gfx/skia/trunk/src/core/SkOrderedReadBuffer.h b/gfx/skia/skia/src/core/SkOrderedReadBuffer.h
rename from gfx/skia/trunk/src/core/SkOrderedReadBuffer.h
rename to gfx/skia/skia/src/core/SkOrderedReadBuffer.h
diff --git a/gfx/skia/trunk/src/core/SkPackBits.cpp b/gfx/skia/skia/src/core/SkPackBits.cpp
rename from gfx/skia/trunk/src/core/SkPackBits.cpp
rename to gfx/skia/skia/src/core/SkPackBits.cpp
diff --git a/gfx/skia/trunk/src/core/SkPaint.cpp b/gfx/skia/skia/src/core/SkPaint.cpp
rename from gfx/skia/trunk/src/core/SkPaint.cpp
rename to gfx/skia/skia/src/core/SkPaint.cpp
diff --git a/gfx/skia/trunk/src/core/SkPaintDefaults.h b/gfx/skia/skia/src/core/SkPaintDefaults.h
rename from gfx/skia/trunk/src/core/SkPaintDefaults.h
rename to gfx/skia/skia/src/core/SkPaintDefaults.h
diff --git a/gfx/skia/trunk/src/core/SkPaintOptionsAndroid.cpp b/gfx/skia/skia/src/core/SkPaintOptionsAndroid.cpp
rename from gfx/skia/trunk/src/core/SkPaintOptionsAndroid.cpp
rename to gfx/skia/skia/src/core/SkPaintOptionsAndroid.cpp
diff --git a/gfx/skia/trunk/src/core/SkPaintPriv.cpp b/gfx/skia/skia/src/core/SkPaintPriv.cpp
rename from gfx/skia/trunk/src/core/SkPaintPriv.cpp
rename to gfx/skia/skia/src/core/SkPaintPriv.cpp
diff --git a/gfx/skia/trunk/src/core/SkPaintPriv.h b/gfx/skia/skia/src/core/SkPaintPriv.h
rename from gfx/skia/trunk/src/core/SkPaintPriv.h
rename to gfx/skia/skia/src/core/SkPaintPriv.h
diff --git a/gfx/skia/trunk/src/core/SkPatch.cpp b/gfx/skia/skia/src/core/SkPatch.cpp
rename from gfx/skia/trunk/src/core/SkPatch.cpp
rename to gfx/skia/skia/src/core/SkPatch.cpp
diff --git a/gfx/skia/trunk/src/core/SkPath.cpp b/gfx/skia/skia/src/core/SkPath.cpp
rename from gfx/skia/trunk/src/core/SkPath.cpp
rename to gfx/skia/skia/src/core/SkPath.cpp
diff --git a/gfx/skia/trunk/src/core/SkPathEffect.cpp b/gfx/skia/skia/src/core/SkPathEffect.cpp
rename from gfx/skia/trunk/src/core/SkPathEffect.cpp
rename to gfx/skia/skia/src/core/SkPathEffect.cpp
diff --git a/gfx/skia/trunk/src/core/SkPathHeap.cpp b/gfx/skia/skia/src/core/SkPathHeap.cpp
rename from gfx/skia/trunk/src/core/SkPathHeap.cpp
rename to gfx/skia/skia/src/core/SkPathHeap.cpp
diff --git a/gfx/skia/trunk/src/core/SkPathHeap.h b/gfx/skia/skia/src/core/SkPathHeap.h
rename from gfx/skia/trunk/src/core/SkPathHeap.h
rename to gfx/skia/skia/src/core/SkPathHeap.h
diff --git a/gfx/skia/trunk/src/core/SkPathMeasure.cpp b/gfx/skia/skia/src/core/SkPathMeasure.cpp
rename from gfx/skia/trunk/src/core/SkPathMeasure.cpp
rename to gfx/skia/skia/src/core/SkPathMeasure.cpp
diff --git a/gfx/skia/trunk/src/core/SkPathRef.cpp b/gfx/skia/skia/src/core/SkPathRef.cpp
rename from gfx/skia/trunk/src/core/SkPathRef.cpp
rename to gfx/skia/skia/src/core/SkPathRef.cpp
diff --git a/gfx/skia/trunk/src/core/SkPerspIter.h b/gfx/skia/skia/src/core/SkPerspIter.h
rename from gfx/skia/trunk/src/core/SkPerspIter.h
rename to gfx/skia/skia/src/core/SkPerspIter.h
diff --git a/gfx/skia/trunk/src/core/SkPicture.cpp b/gfx/skia/skia/src/core/SkPicture.cpp
rename from gfx/skia/trunk/src/core/SkPicture.cpp
rename to gfx/skia/skia/src/core/SkPicture.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureData.cpp b/gfx/skia/skia/src/core/SkPictureData.cpp
rename from gfx/skia/trunk/src/core/SkPictureData.cpp
rename to gfx/skia/skia/src/core/SkPictureData.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureData.h b/gfx/skia/skia/src/core/SkPictureData.h
rename from gfx/skia/trunk/src/core/SkPictureData.h
rename to gfx/skia/skia/src/core/SkPictureData.h
diff --git a/gfx/skia/trunk/src/core/SkPictureFlat.cpp b/gfx/skia/skia/src/core/SkPictureFlat.cpp
rename from gfx/skia/trunk/src/core/SkPictureFlat.cpp
rename to gfx/skia/skia/src/core/SkPictureFlat.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureFlat.h b/gfx/skia/skia/src/core/SkPictureFlat.h
rename from gfx/skia/trunk/src/core/SkPictureFlat.h
rename to gfx/skia/skia/src/core/SkPictureFlat.h
diff --git a/gfx/skia/trunk/src/core/SkPicturePlayback.cpp b/gfx/skia/skia/src/core/SkPicturePlayback.cpp
rename from gfx/skia/trunk/src/core/SkPicturePlayback.cpp
rename to gfx/skia/skia/src/core/SkPicturePlayback.cpp
diff --git a/gfx/skia/trunk/src/core/SkPicturePlayback.h b/gfx/skia/skia/src/core/SkPicturePlayback.h
rename from gfx/skia/trunk/src/core/SkPicturePlayback.h
rename to gfx/skia/skia/src/core/SkPicturePlayback.h
diff --git a/gfx/skia/trunk/src/core/SkPictureRangePlayback.cpp b/gfx/skia/skia/src/core/SkPictureRangePlayback.cpp
rename from gfx/skia/trunk/src/core/SkPictureRangePlayback.cpp
rename to gfx/skia/skia/src/core/SkPictureRangePlayback.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureRangePlayback.h b/gfx/skia/skia/src/core/SkPictureRangePlayback.h
rename from gfx/skia/trunk/src/core/SkPictureRangePlayback.h
rename to gfx/skia/skia/src/core/SkPictureRangePlayback.h
diff --git a/gfx/skia/trunk/src/core/SkPictureRecord.cpp b/gfx/skia/skia/src/core/SkPictureRecord.cpp
rename from gfx/skia/trunk/src/core/SkPictureRecord.cpp
rename to gfx/skia/skia/src/core/SkPictureRecord.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureRecord.h b/gfx/skia/skia/src/core/SkPictureRecord.h
rename from gfx/skia/trunk/src/core/SkPictureRecord.h
rename to gfx/skia/skia/src/core/SkPictureRecord.h
diff --git a/gfx/skia/trunk/src/core/SkPictureRecorder.cpp b/gfx/skia/skia/src/core/SkPictureRecorder.cpp
rename from gfx/skia/trunk/src/core/SkPictureRecorder.cpp
rename to gfx/skia/skia/src/core/SkPictureRecorder.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureReplacementPlayback.cpp b/gfx/skia/skia/src/core/SkPictureReplacementPlayback.cpp
rename from gfx/skia/trunk/src/core/SkPictureReplacementPlayback.cpp
rename to gfx/skia/skia/src/core/SkPictureReplacementPlayback.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureReplacementPlayback.h b/gfx/skia/skia/src/core/SkPictureReplacementPlayback.h
rename from gfx/skia/trunk/src/core/SkPictureReplacementPlayback.h
rename to gfx/skia/skia/src/core/SkPictureReplacementPlayback.h
diff --git a/gfx/skia/trunk/src/core/SkPictureShader.cpp b/gfx/skia/skia/src/core/SkPictureShader.cpp
rename from gfx/skia/trunk/src/core/SkPictureShader.cpp
rename to gfx/skia/skia/src/core/SkPictureShader.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureShader.h b/gfx/skia/skia/src/core/SkPictureShader.h
rename from gfx/skia/trunk/src/core/SkPictureShader.h
rename to gfx/skia/skia/src/core/SkPictureShader.h
diff --git a/gfx/skia/trunk/src/core/SkPictureStateTree.cpp b/gfx/skia/skia/src/core/SkPictureStateTree.cpp
rename from gfx/skia/trunk/src/core/SkPictureStateTree.cpp
rename to gfx/skia/skia/src/core/SkPictureStateTree.cpp
diff --git a/gfx/skia/trunk/src/core/SkPictureStateTree.h b/gfx/skia/skia/src/core/SkPictureStateTree.h
rename from gfx/skia/trunk/src/core/SkPictureStateTree.h
rename to gfx/skia/skia/src/core/SkPictureStateTree.h
diff --git a/gfx/skia/trunk/src/core/SkPixelRef.cpp b/gfx/skia/skia/src/core/SkPixelRef.cpp
rename from gfx/skia/trunk/src/core/SkPixelRef.cpp
rename to gfx/skia/skia/src/core/SkPixelRef.cpp
diff --git a/gfx/skia/trunk/src/core/SkPoint.cpp b/gfx/skia/skia/src/core/SkPoint.cpp
rename from gfx/skia/trunk/src/core/SkPoint.cpp
rename to gfx/skia/skia/src/core/SkPoint.cpp
diff --git a/gfx/skia/trunk/src/core/SkProcSpriteBlitter.cpp b/gfx/skia/skia/src/core/SkProcSpriteBlitter.cpp
rename from gfx/skia/trunk/src/core/SkProcSpriteBlitter.cpp
rename to gfx/skia/skia/src/core/SkProcSpriteBlitter.cpp
diff --git a/gfx/skia/trunk/src/core/SkPtrRecorder.cpp b/gfx/skia/skia/src/core/SkPtrRecorder.cpp
rename from gfx/skia/trunk/src/core/SkPtrRecorder.cpp
rename to gfx/skia/skia/src/core/SkPtrRecorder.cpp
diff --git a/gfx/skia/trunk/src/core/SkPtrRecorder.h b/gfx/skia/skia/src/core/SkPtrRecorder.h
rename from gfx/skia/trunk/src/core/SkPtrRecorder.h
rename to gfx/skia/skia/src/core/SkPtrRecorder.h
diff --git a/gfx/skia/trunk/src/core/SkQuadClipper.cpp b/gfx/skia/skia/src/core/SkQuadClipper.cpp
rename from gfx/skia/trunk/src/core/SkQuadClipper.cpp
rename to gfx/skia/skia/src/core/SkQuadClipper.cpp
diff --git a/gfx/skia/trunk/src/core/SkQuadClipper.h b/gfx/skia/skia/src/core/SkQuadClipper.h
rename from gfx/skia/trunk/src/core/SkQuadClipper.h
rename to gfx/skia/skia/src/core/SkQuadClipper.h
diff --git a/gfx/skia/trunk/src/core/SkQuadTree.cpp b/gfx/skia/skia/src/core/SkQuadTree.cpp
rename from gfx/skia/trunk/src/core/SkQuadTree.cpp
rename to gfx/skia/skia/src/core/SkQuadTree.cpp
diff --git a/gfx/skia/trunk/src/core/SkQuadTree.h b/gfx/skia/skia/src/core/SkQuadTree.h
rename from gfx/skia/trunk/src/core/SkQuadTree.h
rename to gfx/skia/skia/src/core/SkQuadTree.h
diff --git a/gfx/skia/trunk/src/core/SkRRect.cpp b/gfx/skia/skia/src/core/SkRRect.cpp
rename from gfx/skia/trunk/src/core/SkRRect.cpp
rename to gfx/skia/skia/src/core/SkRRect.cpp
diff --git a/gfx/skia/trunk/src/core/SkRTree.cpp b/gfx/skia/skia/src/core/SkRTree.cpp
rename from gfx/skia/trunk/src/core/SkRTree.cpp
rename to gfx/skia/skia/src/core/SkRTree.cpp
diff --git a/gfx/skia/trunk/src/core/SkRTree.h b/gfx/skia/skia/src/core/SkRTree.h
rename from gfx/skia/trunk/src/core/SkRTree.h
rename to gfx/skia/skia/src/core/SkRTree.h
diff --git a/gfx/skia/trunk/src/core/SkRasterClip.cpp b/gfx/skia/skia/src/core/SkRasterClip.cpp
rename from gfx/skia/trunk/src/core/SkRasterClip.cpp
rename to gfx/skia/skia/src/core/SkRasterClip.cpp
diff --git a/gfx/skia/trunk/src/core/SkRasterClip.h b/gfx/skia/skia/src/core/SkRasterClip.h
rename from gfx/skia/trunk/src/core/SkRasterClip.h
rename to gfx/skia/skia/src/core/SkRasterClip.h
diff --git a/gfx/skia/trunk/src/core/SkRasterizer.cpp b/gfx/skia/skia/src/core/SkRasterizer.cpp
rename from gfx/skia/trunk/src/core/SkRasterizer.cpp
rename to gfx/skia/skia/src/core/SkRasterizer.cpp
diff --git a/gfx/skia/trunk/src/core/SkReadBuffer.cpp b/gfx/skia/skia/src/core/SkReadBuffer.cpp
rename from gfx/skia/trunk/src/core/SkReadBuffer.cpp
rename to gfx/skia/skia/src/core/SkReadBuffer.cpp
diff --git a/gfx/skia/trunk/src/core/SkRecord.h b/gfx/skia/skia/src/core/SkRecord.h
rename from gfx/skia/trunk/src/core/SkRecord.h
rename to gfx/skia/skia/src/core/SkRecord.h
diff --git a/gfx/skia/trunk/src/core/SkRecordAnalysis.cpp b/gfx/skia/skia/src/core/SkRecordAnalysis.cpp
rename from gfx/skia/trunk/src/core/SkRecordAnalysis.cpp
rename to gfx/skia/skia/src/core/SkRecordAnalysis.cpp
diff --git a/gfx/skia/trunk/src/core/SkRecordAnalysis.h b/gfx/skia/skia/src/core/SkRecordAnalysis.h
rename from gfx/skia/trunk/src/core/SkRecordAnalysis.h
rename to gfx/skia/skia/src/core/SkRecordAnalysis.h
diff --git a/gfx/skia/trunk/src/core/SkRecordDraw.cpp b/gfx/skia/skia/src/core/SkRecordDraw.cpp
rename from gfx/skia/trunk/src/core/SkRecordDraw.cpp
rename to gfx/skia/skia/src/core/SkRecordDraw.cpp
diff --git a/gfx/skia/trunk/src/core/SkRecordDraw.h b/gfx/skia/skia/src/core/SkRecordDraw.h
rename from gfx/skia/trunk/src/core/SkRecordDraw.h
rename to gfx/skia/skia/src/core/SkRecordDraw.h
diff --git a/gfx/skia/trunk/src/core/SkRecordOpts.cpp b/gfx/skia/skia/src/core/SkRecordOpts.cpp
rename from gfx/skia/trunk/src/core/SkRecordOpts.cpp
rename to gfx/skia/skia/src/core/SkRecordOpts.cpp
diff --git a/gfx/skia/trunk/src/core/SkRecordOpts.h b/gfx/skia/skia/src/core/SkRecordOpts.h
rename from gfx/skia/trunk/src/core/SkRecordOpts.h
rename to gfx/skia/skia/src/core/SkRecordOpts.h
diff --git a/gfx/skia/trunk/src/core/SkRecordPattern.h b/gfx/skia/skia/src/core/SkRecordPattern.h
rename from gfx/skia/trunk/src/core/SkRecordPattern.h
rename to gfx/skia/skia/src/core/SkRecordPattern.h
diff --git a/gfx/skia/trunk/src/core/SkRecorder.cpp b/gfx/skia/skia/src/core/SkRecorder.cpp
rename from gfx/skia/trunk/src/core/SkRecorder.cpp
rename to gfx/skia/skia/src/core/SkRecorder.cpp
diff --git a/gfx/skia/trunk/src/core/SkRecorder.h b/gfx/skia/skia/src/core/SkRecorder.h
rename from gfx/skia/trunk/src/core/SkRecorder.h
rename to gfx/skia/skia/src/core/SkRecorder.h
diff --git a/gfx/skia/trunk/src/core/SkRecording.cpp b/gfx/skia/skia/src/core/SkRecording.cpp
rename from gfx/skia/trunk/src/core/SkRecording.cpp
rename to gfx/skia/skia/src/core/SkRecording.cpp
diff --git a/gfx/skia/trunk/src/core/SkRecords.h b/gfx/skia/skia/src/core/SkRecords.h
rename from gfx/skia/trunk/src/core/SkRecords.h
rename to gfx/skia/skia/src/core/SkRecords.h
diff --git a/gfx/skia/trunk/src/core/SkRect.cpp b/gfx/skia/skia/src/core/SkRect.cpp
rename from gfx/skia/trunk/src/core/SkRect.cpp
rename to gfx/skia/skia/src/core/SkRect.cpp
diff --git a/gfx/skia/trunk/src/core/SkRefDict.cpp b/gfx/skia/skia/src/core/SkRefDict.cpp
rename from gfx/skia/trunk/src/core/SkRefDict.cpp
rename to gfx/skia/skia/src/core/SkRefDict.cpp
diff --git a/gfx/skia/trunk/src/core/SkRefDict.h b/gfx/skia/skia/src/core/SkRefDict.h
rename from gfx/skia/trunk/src/core/SkRefDict.h
rename to gfx/skia/skia/src/core/SkRefDict.h
diff --git a/gfx/skia/trunk/src/core/SkRegion.cpp b/gfx/skia/skia/src/core/SkRegion.cpp
rename from gfx/skia/trunk/src/core/SkRegion.cpp
rename to gfx/skia/skia/src/core/SkRegion.cpp
diff --git a/gfx/skia/trunk/src/core/SkRegionPriv.h b/gfx/skia/skia/src/core/SkRegionPriv.h
rename from gfx/skia/trunk/src/core/SkRegionPriv.h
rename to gfx/skia/skia/src/core/SkRegionPriv.h
diff --git a/gfx/skia/trunk/src/core/SkRegion_path.cpp b/gfx/skia/skia/src/core/SkRegion_path.cpp
rename from gfx/skia/trunk/src/core/SkRegion_path.cpp
rename to gfx/skia/skia/src/core/SkRegion_path.cpp
diff --git a/gfx/skia/trunk/src/core/SkScalar.cpp b/gfx/skia/skia/src/core/SkScalar.cpp
rename from gfx/skia/trunk/src/core/SkScalar.cpp
rename to gfx/skia/skia/src/core/SkScalar.cpp
diff --git a/gfx/skia/trunk/src/core/SkScaledImageCache.cpp b/gfx/skia/skia/src/core/SkScaledImageCache.cpp
rename from gfx/skia/trunk/src/core/SkScaledImageCache.cpp
rename to gfx/skia/skia/src/core/SkScaledImageCache.cpp
diff --git a/gfx/skia/trunk/src/core/SkScaledImageCache.h b/gfx/skia/skia/src/core/SkScaledImageCache.h
rename from gfx/skia/trunk/src/core/SkScaledImageCache.h
rename to gfx/skia/skia/src/core/SkScaledImageCache.h
diff --git a/gfx/skia/trunk/src/core/SkScalerContext.cpp b/gfx/skia/skia/src/core/SkScalerContext.cpp
rename from gfx/skia/trunk/src/core/SkScalerContext.cpp
rename to gfx/skia/skia/src/core/SkScalerContext.cpp
diff --git a/gfx/skia/trunk/src/core/SkScalerContext.h b/gfx/skia/skia/src/core/SkScalerContext.h
rename from gfx/skia/trunk/src/core/SkScalerContext.h
rename to gfx/skia/skia/src/core/SkScalerContext.h
diff --git a/gfx/skia/trunk/src/core/SkScan.cpp b/gfx/skia/skia/src/core/SkScan.cpp
rename from gfx/skia/trunk/src/core/SkScan.cpp
rename to gfx/skia/skia/src/core/SkScan.cpp
diff --git a/gfx/skia/trunk/src/core/SkScan.h b/gfx/skia/skia/src/core/SkScan.h
rename from gfx/skia/trunk/src/core/SkScan.h
rename to gfx/skia/skia/src/core/SkScan.h
diff --git a/gfx/skia/trunk/src/core/SkScanPriv.h b/gfx/skia/skia/src/core/SkScanPriv.h
rename from gfx/skia/trunk/src/core/SkScanPriv.h
rename to gfx/skia/skia/src/core/SkScanPriv.h
diff --git a/gfx/skia/trunk/src/core/SkScan_AntiPath.cpp b/gfx/skia/skia/src/core/SkScan_AntiPath.cpp
rename from gfx/skia/trunk/src/core/SkScan_AntiPath.cpp
rename to gfx/skia/skia/src/core/SkScan_AntiPath.cpp
diff --git a/gfx/skia/trunk/src/core/SkScan_Antihair.cpp b/gfx/skia/skia/src/core/SkScan_Antihair.cpp
rename from gfx/skia/trunk/src/core/SkScan_Antihair.cpp
rename to gfx/skia/skia/src/core/SkScan_Antihair.cpp
diff --git a/gfx/skia/trunk/src/core/SkScan_Hairline.cpp b/gfx/skia/skia/src/core/SkScan_Hairline.cpp
rename from gfx/skia/trunk/src/core/SkScan_Hairline.cpp
rename to gfx/skia/skia/src/core/SkScan_Hairline.cpp
diff --git a/gfx/skia/trunk/src/core/SkScan_Path.cpp b/gfx/skia/skia/src/core/SkScan_Path.cpp
rename from gfx/skia/trunk/src/core/SkScan_Path.cpp
rename to gfx/skia/skia/src/core/SkScan_Path.cpp
diff --git a/gfx/skia/trunk/src/core/SkShader.cpp b/gfx/skia/skia/src/core/SkShader.cpp
rename from gfx/skia/trunk/src/core/SkShader.cpp
rename to gfx/skia/skia/src/core/SkShader.cpp
diff --git a/gfx/skia/trunk/src/core/SkSinTable.h b/gfx/skia/skia/src/core/SkSinTable.h
rename from gfx/skia/trunk/src/core/SkSinTable.h
rename to gfx/skia/skia/src/core/SkSinTable.h
diff --git a/gfx/skia/trunk/src/core/SkSmallAllocator.h b/gfx/skia/skia/src/core/SkSmallAllocator.h
rename from gfx/skia/trunk/src/core/SkSmallAllocator.h
rename to gfx/skia/skia/src/core/SkSmallAllocator.h
diff --git a/gfx/skia/trunk/src/core/SkSpriteBlitter.h b/gfx/skia/skia/src/core/SkSpriteBlitter.h
rename from gfx/skia/trunk/src/core/SkSpriteBlitter.h
rename to gfx/skia/skia/src/core/SkSpriteBlitter.h
diff --git a/gfx/skia/trunk/src/core/SkSpriteBlitterTemplate.h b/gfx/skia/skia/src/core/SkSpriteBlitterTemplate.h
rename from gfx/skia/trunk/src/core/SkSpriteBlitterTemplate.h
rename to gfx/skia/skia/src/core/SkSpriteBlitterTemplate.h
diff --git a/gfx/skia/trunk/src/core/SkSpriteBlitter_ARGB32.cpp b/gfx/skia/skia/src/core/SkSpriteBlitter_ARGB32.cpp
rename from gfx/skia/trunk/src/core/SkSpriteBlitter_ARGB32.cpp
rename to gfx/skia/skia/src/core/SkSpriteBlitter_ARGB32.cpp
diff --git a/gfx/skia/trunk/src/core/SkSpriteBlitter_RGB16.cpp b/gfx/skia/skia/src/core/SkSpriteBlitter_RGB16.cpp
rename from gfx/skia/trunk/src/core/SkSpriteBlitter_RGB16.cpp
rename to gfx/skia/skia/src/core/SkSpriteBlitter_RGB16.cpp
diff --git a/gfx/skia/trunk/src/core/SkStream.cpp b/gfx/skia/skia/src/core/SkStream.cpp
rename from gfx/skia/trunk/src/core/SkStream.cpp
rename to gfx/skia/skia/src/core/SkStream.cpp
diff --git a/gfx/skia/trunk/src/core/SkStreamPriv.h b/gfx/skia/skia/src/core/SkStreamPriv.h
rename from gfx/skia/trunk/src/core/SkStreamPriv.h
rename to gfx/skia/skia/src/core/SkStreamPriv.h
diff --git a/gfx/skia/trunk/src/core/SkString.cpp b/gfx/skia/skia/src/core/SkString.cpp
rename from gfx/skia/trunk/src/core/SkString.cpp
rename to gfx/skia/skia/src/core/SkString.cpp
diff --git a/gfx/skia/trunk/src/core/SkStringUtils.cpp b/gfx/skia/skia/src/core/SkStringUtils.cpp
rename from gfx/skia/trunk/src/core/SkStringUtils.cpp
rename to gfx/skia/skia/src/core/SkStringUtils.cpp
diff --git a/gfx/skia/trunk/src/core/SkStringUtils.h b/gfx/skia/skia/src/core/SkStringUtils.h
rename from gfx/skia/trunk/src/core/SkStringUtils.h
rename to gfx/skia/skia/src/core/SkStringUtils.h
diff --git a/gfx/skia/trunk/src/core/SkStroke.cpp b/gfx/skia/skia/src/core/SkStroke.cpp
rename from gfx/skia/trunk/src/core/SkStroke.cpp
rename to gfx/skia/skia/src/core/SkStroke.cpp
diff --git a/gfx/skia/trunk/src/core/SkStroke.h b/gfx/skia/skia/src/core/SkStroke.h
rename from gfx/skia/trunk/src/core/SkStroke.h
rename to gfx/skia/skia/src/core/SkStroke.h
diff --git a/gfx/skia/trunk/src/core/SkStrokeRec.cpp b/gfx/skia/skia/src/core/SkStrokeRec.cpp
rename from gfx/skia/trunk/src/core/SkStrokeRec.cpp
rename to gfx/skia/skia/src/core/SkStrokeRec.cpp
diff --git a/gfx/skia/trunk/src/core/SkStrokerPriv.cpp b/gfx/skia/skia/src/core/SkStrokerPriv.cpp
rename from gfx/skia/trunk/src/core/SkStrokerPriv.cpp
rename to gfx/skia/skia/src/core/SkStrokerPriv.cpp
diff --git a/gfx/skia/trunk/src/core/SkStrokerPriv.h b/gfx/skia/skia/src/core/SkStrokerPriv.h
rename from gfx/skia/trunk/src/core/SkStrokerPriv.h
rename to gfx/skia/skia/src/core/SkStrokerPriv.h
diff --git a/gfx/skia/trunk/src/core/SkTDynamicHash.h b/gfx/skia/skia/src/core/SkTDynamicHash.h
rename from gfx/skia/trunk/src/core/SkTDynamicHash.h
rename to gfx/skia/skia/src/core/SkTDynamicHash.h
diff --git a/gfx/skia/trunk/src/core/SkTInternalSList.h b/gfx/skia/skia/src/core/SkTInternalSList.h
rename from gfx/skia/trunk/src/core/SkTInternalSList.h
rename to gfx/skia/skia/src/core/SkTInternalSList.h
diff --git a/gfx/skia/trunk/src/core/SkTLList.h b/gfx/skia/skia/src/core/SkTLList.h
rename from gfx/skia/trunk/src/core/SkTLList.h
rename to gfx/skia/skia/src/core/SkTLList.h
diff --git a/gfx/skia/trunk/src/core/SkTLS.cpp b/gfx/skia/skia/src/core/SkTLS.cpp
rename from gfx/skia/trunk/src/core/SkTLS.cpp
rename to gfx/skia/skia/src/core/SkTLS.cpp
diff --git a/gfx/skia/trunk/src/core/SkTLS.h b/gfx/skia/skia/src/core/SkTLS.h
rename from gfx/skia/trunk/src/core/SkTLS.h
rename to gfx/skia/skia/src/core/SkTLS.h
diff --git a/gfx/skia/trunk/src/core/SkTMultiMap.h b/gfx/skia/skia/src/core/SkTMultiMap.h
rename from gfx/skia/trunk/src/core/SkTMultiMap.h
rename to gfx/skia/skia/src/core/SkTMultiMap.h
diff --git a/gfx/skia/trunk/src/core/SkTObjectPool.h b/gfx/skia/skia/src/core/SkTObjectPool.h
rename from gfx/skia/trunk/src/core/SkTObjectPool.h
rename to gfx/skia/skia/src/core/SkTObjectPool.h
diff --git a/gfx/skia/trunk/src/core/SkTRefArray.h b/gfx/skia/skia/src/core/SkTRefArray.h
rename from gfx/skia/trunk/src/core/SkTRefArray.h
rename to gfx/skia/skia/src/core/SkTRefArray.h
diff --git a/gfx/skia/trunk/src/core/SkTSearch.cpp b/gfx/skia/skia/src/core/SkTSearch.cpp
rename from gfx/skia/trunk/src/core/SkTSearch.cpp
rename to gfx/skia/skia/src/core/SkTSearch.cpp
diff --git a/gfx/skia/trunk/src/core/SkTSort.h b/gfx/skia/skia/src/core/SkTSort.h
rename from gfx/skia/trunk/src/core/SkTSort.h
rename to gfx/skia/skia/src/core/SkTSort.h
diff --git a/gfx/skia/trunk/src/core/SkTextFormatParams.h b/gfx/skia/skia/src/core/SkTextFormatParams.h
rename from gfx/skia/trunk/src/core/SkTextFormatParams.h
rename to gfx/skia/skia/src/core/SkTextFormatParams.h
diff --git a/gfx/skia/trunk/src/core/SkTextMapStateProc.h b/gfx/skia/skia/src/core/SkTextMapStateProc.h
rename from gfx/skia/trunk/src/core/SkTextMapStateProc.h
rename to gfx/skia/skia/src/core/SkTextMapStateProc.h
diff --git a/gfx/skia/trunk/src/core/SkTextToPathIter.h b/gfx/skia/skia/src/core/SkTextToPathIter.h
rename from gfx/skia/trunk/src/core/SkTextToPathIter.h
rename to gfx/skia/skia/src/core/SkTextToPathIter.h
diff --git a/gfx/skia/trunk/src/core/SkThreadPriv.h b/gfx/skia/skia/src/core/SkThreadPriv.h
rename from gfx/skia/trunk/src/core/SkThreadPriv.h
rename to gfx/skia/skia/src/core/SkThreadPriv.h
diff --git a/gfx/skia/trunk/src/core/SkTileGrid.cpp b/gfx/skia/skia/src/core/SkTileGrid.cpp
rename from gfx/skia/trunk/src/core/SkTileGrid.cpp
rename to gfx/skia/skia/src/core/SkTileGrid.cpp
diff --git a/gfx/skia/trunk/src/core/SkTileGrid.h b/gfx/skia/skia/src/core/SkTileGrid.h
rename from gfx/skia/trunk/src/core/SkTileGrid.h
rename to gfx/skia/skia/src/core/SkTileGrid.h
diff --git a/gfx/skia/trunk/src/core/SkTraceEvent.h b/gfx/skia/skia/src/core/SkTraceEvent.h
rename from gfx/skia/trunk/src/core/SkTraceEvent.h
rename to gfx/skia/skia/src/core/SkTraceEvent.h
diff --git a/gfx/skia/trunk/src/core/SkTypeface.cpp b/gfx/skia/skia/src/core/SkTypeface.cpp
rename from gfx/skia/trunk/src/core/SkTypeface.cpp
rename to gfx/skia/skia/src/core/SkTypeface.cpp
diff --git a/gfx/skia/trunk/src/core/SkTypefaceCache.cpp b/gfx/skia/skia/src/core/SkTypefaceCache.cpp
rename from gfx/skia/trunk/src/core/SkTypefaceCache.cpp
rename to gfx/skia/skia/src/core/SkTypefaceCache.cpp
diff --git a/gfx/skia/trunk/src/core/SkTypefaceCache.h b/gfx/skia/skia/src/core/SkTypefaceCache.h
rename from gfx/skia/trunk/src/core/SkTypefaceCache.h
rename to gfx/skia/skia/src/core/SkTypefaceCache.h
diff --git a/gfx/skia/trunk/src/core/SkTypefacePriv.h b/gfx/skia/skia/src/core/SkTypefacePriv.h
rename from gfx/skia/trunk/src/core/SkTypefacePriv.h
rename to gfx/skia/skia/src/core/SkTypefacePriv.h
diff --git a/gfx/skia/trunk/src/core/SkUnPreMultiply.cpp b/gfx/skia/skia/src/core/SkUnPreMultiply.cpp
rename from gfx/skia/trunk/src/core/SkUnPreMultiply.cpp
rename to gfx/skia/skia/src/core/SkUnPreMultiply.cpp
diff --git a/gfx/skia/trunk/src/core/SkUtils.cpp b/gfx/skia/skia/src/core/SkUtils.cpp
rename from gfx/skia/trunk/src/core/SkUtils.cpp
rename to gfx/skia/skia/src/core/SkUtils.cpp
diff --git a/gfx/skia/trunk/src/core/SkUtilsArm.cpp b/gfx/skia/skia/src/core/SkUtilsArm.cpp
rename from gfx/skia/trunk/src/core/SkUtilsArm.cpp
rename to gfx/skia/skia/src/core/SkUtilsArm.cpp
diff --git a/gfx/skia/trunk/src/core/SkUtilsArm.h b/gfx/skia/skia/src/core/SkUtilsArm.h
rename from gfx/skia/trunk/src/core/SkUtilsArm.h
rename to gfx/skia/skia/src/core/SkUtilsArm.h
diff --git a/gfx/skia/trunk/src/core/SkValidatingReadBuffer.cpp b/gfx/skia/skia/src/core/SkValidatingReadBuffer.cpp
rename from gfx/skia/trunk/src/core/SkValidatingReadBuffer.cpp
rename to gfx/skia/skia/src/core/SkValidatingReadBuffer.cpp
diff --git a/gfx/skia/trunk/src/core/SkValidatingReadBuffer.h b/gfx/skia/skia/src/core/SkValidatingReadBuffer.h
rename from gfx/skia/trunk/src/core/SkValidatingReadBuffer.h
rename to gfx/skia/skia/src/core/SkValidatingReadBuffer.h
diff --git a/gfx/skia/trunk/src/core/SkValidationUtils.h b/gfx/skia/skia/src/core/SkValidationUtils.h
rename from gfx/skia/trunk/src/core/SkValidationUtils.h
rename to gfx/skia/skia/src/core/SkValidationUtils.h
diff --git a/gfx/skia/trunk/src/core/SkVertState.cpp b/gfx/skia/skia/src/core/SkVertState.cpp
rename from gfx/skia/trunk/src/core/SkVertState.cpp
rename to gfx/skia/skia/src/core/SkVertState.cpp
diff --git a/gfx/skia/trunk/src/core/SkVertState.h b/gfx/skia/skia/src/core/SkVertState.h
rename from gfx/skia/trunk/src/core/SkVertState.h
rename to gfx/skia/skia/src/core/SkVertState.h
diff --git a/gfx/skia/trunk/src/core/SkWriteBuffer.cpp b/gfx/skia/skia/src/core/SkWriteBuffer.cpp
rename from gfx/skia/trunk/src/core/SkWriteBuffer.cpp
rename to gfx/skia/skia/src/core/SkWriteBuffer.cpp
diff --git a/gfx/skia/trunk/src/core/SkWriter32.cpp b/gfx/skia/skia/src/core/SkWriter32.cpp
rename from gfx/skia/trunk/src/core/SkWriter32.cpp
rename to gfx/skia/skia/src/core/SkWriter32.cpp
diff --git a/gfx/skia/trunk/src/core/SkXfermode.cpp b/gfx/skia/skia/src/core/SkXfermode.cpp
rename from gfx/skia/trunk/src/core/SkXfermode.cpp
rename to gfx/skia/skia/src/core/SkXfermode.cpp
diff --git a/gfx/skia/trunk/src/core/SkXfermode_proccoeff.h b/gfx/skia/skia/src/core/SkXfermode_proccoeff.h
rename from gfx/skia/trunk/src/core/SkXfermode_proccoeff.h
rename to gfx/skia/skia/src/core/SkXfermode_proccoeff.h
diff --git a/gfx/skia/trunk/src/device/xps/SkXPSDevice.cpp b/gfx/skia/skia/src/device/xps/SkXPSDevice.cpp
rename from gfx/skia/trunk/src/device/xps/SkXPSDevice.cpp
rename to gfx/skia/skia/src/device/xps/SkXPSDevice.cpp
diff --git a/gfx/skia/trunk/src/doc/SkDocument.cpp b/gfx/skia/skia/src/doc/SkDocument.cpp
rename from gfx/skia/trunk/src/doc/SkDocument.cpp
rename to gfx/skia/skia/src/doc/SkDocument.cpp
diff --git a/gfx/skia/trunk/src/doc/SkDocument_PDF.cpp b/gfx/skia/skia/src/doc/SkDocument_PDF.cpp
rename from gfx/skia/trunk/src/doc/SkDocument_PDF.cpp
rename to gfx/skia/skia/src/doc/SkDocument_PDF.cpp
diff --git a/gfx/skia/trunk/src/effects/Sk1DPathEffect.cpp b/gfx/skia/skia/src/effects/Sk1DPathEffect.cpp
rename from gfx/skia/trunk/src/effects/Sk1DPathEffect.cpp
rename to gfx/skia/skia/src/effects/Sk1DPathEffect.cpp
diff --git a/gfx/skia/trunk/src/effects/Sk2DPathEffect.cpp b/gfx/skia/skia/src/effects/Sk2DPathEffect.cpp
rename from gfx/skia/trunk/src/effects/Sk2DPathEffect.cpp
rename to gfx/skia/skia/src/effects/Sk2DPathEffect.cpp
diff --git a/gfx/skia/trunk/src/effects/SkAlphaThresholdFilter.cpp b/gfx/skia/skia/src/effects/SkAlphaThresholdFilter.cpp
rename from gfx/skia/trunk/src/effects/SkAlphaThresholdFilter.cpp
rename to gfx/skia/skia/src/effects/SkAlphaThresholdFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkArithmeticMode.cpp b/gfx/skia/skia/src/effects/SkArithmeticMode.cpp
rename from gfx/skia/trunk/src/effects/SkArithmeticMode.cpp
rename to gfx/skia/skia/src/effects/SkArithmeticMode.cpp
diff --git a/gfx/skia/trunk/src/effects/SkAvoidXfermode.cpp b/gfx/skia/skia/src/effects/SkAvoidXfermode.cpp
rename from gfx/skia/trunk/src/effects/SkAvoidXfermode.cpp
rename to gfx/skia/skia/src/effects/SkAvoidXfermode.cpp
diff --git a/gfx/skia/trunk/src/effects/SkBitmapSource.cpp b/gfx/skia/skia/src/effects/SkBitmapSource.cpp
rename from gfx/skia/trunk/src/effects/SkBitmapSource.cpp
rename to gfx/skia/skia/src/effects/SkBitmapSource.cpp
diff --git a/gfx/skia/trunk/src/effects/SkBlurDrawLooper.cpp b/gfx/skia/skia/src/effects/SkBlurDrawLooper.cpp
rename from gfx/skia/trunk/src/effects/SkBlurDrawLooper.cpp
rename to gfx/skia/skia/src/effects/SkBlurDrawLooper.cpp
diff --git a/gfx/skia/trunk/src/effects/SkBlurImageFilter.cpp b/gfx/skia/skia/src/effects/SkBlurImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkBlurImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkBlurImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkBlurMask.cpp b/gfx/skia/skia/src/effects/SkBlurMask.cpp
rename from gfx/skia/trunk/src/effects/SkBlurMask.cpp
rename to gfx/skia/skia/src/effects/SkBlurMask.cpp
diff --git a/gfx/skia/trunk/src/effects/SkBlurMask.h b/gfx/skia/skia/src/effects/SkBlurMask.h
rename from gfx/skia/trunk/src/effects/SkBlurMask.h
rename to gfx/skia/skia/src/effects/SkBlurMask.h
diff --git a/gfx/skia/trunk/src/effects/SkBlurMaskFilter.cpp b/gfx/skia/skia/src/effects/SkBlurMaskFilter.cpp
rename from gfx/skia/trunk/src/effects/SkBlurMaskFilter.cpp
rename to gfx/skia/skia/src/effects/SkBlurMaskFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkColorFilterImageFilter.cpp b/gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkColorFilterImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkColorFilterImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkColorFilters.cpp b/gfx/skia/skia/src/effects/SkColorFilters.cpp
rename from gfx/skia/trunk/src/effects/SkColorFilters.cpp
rename to gfx/skia/skia/src/effects/SkColorFilters.cpp
diff --git a/gfx/skia/trunk/src/effects/SkColorMatrix.cpp b/gfx/skia/skia/src/effects/SkColorMatrix.cpp
rename from gfx/skia/trunk/src/effects/SkColorMatrix.cpp
rename to gfx/skia/skia/src/effects/SkColorMatrix.cpp
diff --git a/gfx/skia/trunk/src/effects/SkColorMatrixFilter.cpp b/gfx/skia/skia/src/effects/SkColorMatrixFilter.cpp
rename from gfx/skia/trunk/src/effects/SkColorMatrixFilter.cpp
rename to gfx/skia/skia/src/effects/SkColorMatrixFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkComposeImageFilter.cpp b/gfx/skia/skia/src/effects/SkComposeImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkComposeImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkComposeImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkCornerPathEffect.cpp b/gfx/skia/skia/src/effects/SkCornerPathEffect.cpp
rename from gfx/skia/trunk/src/effects/SkCornerPathEffect.cpp
rename to gfx/skia/skia/src/effects/SkCornerPathEffect.cpp
diff --git a/gfx/skia/trunk/src/effects/SkDashPathEffect.cpp b/gfx/skia/skia/src/effects/SkDashPathEffect.cpp
rename from gfx/skia/trunk/src/effects/SkDashPathEffect.cpp
rename to gfx/skia/skia/src/effects/SkDashPathEffect.cpp
diff --git a/gfx/skia/trunk/src/effects/SkDiscretePathEffect.cpp b/gfx/skia/skia/src/effects/SkDiscretePathEffect.cpp
rename from gfx/skia/trunk/src/effects/SkDiscretePathEffect.cpp
rename to gfx/skia/skia/src/effects/SkDiscretePathEffect.cpp
diff --git a/gfx/skia/trunk/src/effects/SkDisplacementMapEffect.cpp b/gfx/skia/skia/src/effects/SkDisplacementMapEffect.cpp
rename from gfx/skia/trunk/src/effects/SkDisplacementMapEffect.cpp
rename to gfx/skia/skia/src/effects/SkDisplacementMapEffect.cpp
diff --git a/gfx/skia/trunk/src/effects/SkDropShadowImageFilter.cpp b/gfx/skia/skia/src/effects/SkDropShadowImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkDropShadowImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkDropShadowImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkEmbossMask.cpp b/gfx/skia/skia/src/effects/SkEmbossMask.cpp
rename from gfx/skia/trunk/src/effects/SkEmbossMask.cpp
rename to gfx/skia/skia/src/effects/SkEmbossMask.cpp
diff --git a/gfx/skia/trunk/src/effects/SkEmbossMask.h b/gfx/skia/skia/src/effects/SkEmbossMask.h
rename from gfx/skia/trunk/src/effects/SkEmbossMask.h
rename to gfx/skia/skia/src/effects/SkEmbossMask.h
diff --git a/gfx/skia/trunk/src/effects/SkEmbossMaskFilter.cpp b/gfx/skia/skia/src/effects/SkEmbossMaskFilter.cpp
rename from gfx/skia/trunk/src/effects/SkEmbossMaskFilter.cpp
rename to gfx/skia/skia/src/effects/SkEmbossMaskFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkEmbossMask_Table.h b/gfx/skia/skia/src/effects/SkEmbossMask_Table.h
rename from gfx/skia/trunk/src/effects/SkEmbossMask_Table.h
rename to gfx/skia/skia/src/effects/SkEmbossMask_Table.h
diff --git a/gfx/skia/trunk/src/effects/SkGpuBlurUtils.cpp b/gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp
rename from gfx/skia/trunk/src/effects/SkGpuBlurUtils.cpp
rename to gfx/skia/skia/src/effects/SkGpuBlurUtils.cpp
diff --git a/gfx/skia/trunk/src/effects/SkGpuBlurUtils.h b/gfx/skia/skia/src/effects/SkGpuBlurUtils.h
rename from gfx/skia/trunk/src/effects/SkGpuBlurUtils.h
rename to gfx/skia/skia/src/effects/SkGpuBlurUtils.h
diff --git a/gfx/skia/trunk/src/effects/SkLayerDrawLooper.cpp b/gfx/skia/skia/src/effects/SkLayerDrawLooper.cpp
rename from gfx/skia/trunk/src/effects/SkLayerDrawLooper.cpp
rename to gfx/skia/skia/src/effects/SkLayerDrawLooper.cpp
diff --git a/gfx/skia/trunk/src/effects/SkLayerRasterizer.cpp b/gfx/skia/skia/src/effects/SkLayerRasterizer.cpp
rename from gfx/skia/trunk/src/effects/SkLayerRasterizer.cpp
rename to gfx/skia/skia/src/effects/SkLayerRasterizer.cpp
diff --git a/gfx/skia/trunk/src/effects/SkLerpXfermode.cpp b/gfx/skia/skia/src/effects/SkLerpXfermode.cpp
rename from gfx/skia/trunk/src/effects/SkLerpXfermode.cpp
rename to gfx/skia/skia/src/effects/SkLerpXfermode.cpp
diff --git a/gfx/skia/trunk/src/effects/SkLightingImageFilter.cpp b/gfx/skia/skia/src/effects/SkLightingImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkLightingImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkLightingImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkLumaColorFilter.cpp b/gfx/skia/skia/src/effects/SkLumaColorFilter.cpp
rename from gfx/skia/trunk/src/effects/SkLumaColorFilter.cpp
rename to gfx/skia/skia/src/effects/SkLumaColorFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkMagnifierImageFilter.cpp b/gfx/skia/skia/src/effects/SkMagnifierImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkMagnifierImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkMagnifierImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkMatrixConvolutionImageFilter.cpp b/gfx/skia/skia/src/effects/SkMatrixConvolutionImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkMatrixConvolutionImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkMatrixConvolutionImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkMatrixImageFilter.cpp b/gfx/skia/skia/src/effects/SkMatrixImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkMatrixImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkMatrixImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkMergeImageFilter.cpp b/gfx/skia/skia/src/effects/SkMergeImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkMergeImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkMergeImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkMorphologyImageFilter.cpp b/gfx/skia/skia/src/effects/SkMorphologyImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkMorphologyImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkMorphologyImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkOffsetImageFilter.cpp b/gfx/skia/skia/src/effects/SkOffsetImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkOffsetImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkOffsetImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkPaintFlagsDrawFilter.cpp b/gfx/skia/skia/src/effects/SkPaintFlagsDrawFilter.cpp
rename from gfx/skia/trunk/src/effects/SkPaintFlagsDrawFilter.cpp
rename to gfx/skia/skia/src/effects/SkPaintFlagsDrawFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkPerlinNoiseShader.cpp b/gfx/skia/skia/src/effects/SkPerlinNoiseShader.cpp
rename from gfx/skia/trunk/src/effects/SkPerlinNoiseShader.cpp
rename to gfx/skia/skia/src/effects/SkPerlinNoiseShader.cpp
diff --git a/gfx/skia/trunk/src/effects/SkPictureImageFilter.cpp b/gfx/skia/skia/src/effects/SkPictureImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkPictureImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkPictureImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkPixelXorXfermode.cpp b/gfx/skia/skia/src/effects/SkPixelXorXfermode.cpp
rename from gfx/skia/trunk/src/effects/SkPixelXorXfermode.cpp
rename to gfx/skia/skia/src/effects/SkPixelXorXfermode.cpp
diff --git a/gfx/skia/trunk/src/effects/SkPorterDuff.cpp b/gfx/skia/skia/src/effects/SkPorterDuff.cpp
rename from gfx/skia/trunk/src/effects/SkPorterDuff.cpp
rename to gfx/skia/skia/src/effects/SkPorterDuff.cpp
diff --git a/gfx/skia/trunk/src/effects/SkRectShaderImageFilter.cpp b/gfx/skia/skia/src/effects/SkRectShaderImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkRectShaderImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkRectShaderImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkStippleMaskFilter.cpp b/gfx/skia/skia/src/effects/SkStippleMaskFilter.cpp
rename from gfx/skia/trunk/src/effects/SkStippleMaskFilter.cpp
rename to gfx/skia/skia/src/effects/SkStippleMaskFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkTableColorFilter.cpp b/gfx/skia/skia/src/effects/SkTableColorFilter.cpp
rename from gfx/skia/trunk/src/effects/SkTableColorFilter.cpp
rename to gfx/skia/skia/src/effects/SkTableColorFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkTableMaskFilter.cpp b/gfx/skia/skia/src/effects/SkTableMaskFilter.cpp
rename from gfx/skia/trunk/src/effects/SkTableMaskFilter.cpp
rename to gfx/skia/skia/src/effects/SkTableMaskFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkTestImageFilters.cpp b/gfx/skia/skia/src/effects/SkTestImageFilters.cpp
rename from gfx/skia/trunk/src/effects/SkTestImageFilters.cpp
rename to gfx/skia/skia/src/effects/SkTestImageFilters.cpp
diff --git a/gfx/skia/trunk/src/effects/SkTileImageFilter.cpp b/gfx/skia/skia/src/effects/SkTileImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkTileImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkTileImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/SkTransparentShader.cpp b/gfx/skia/skia/src/effects/SkTransparentShader.cpp
rename from gfx/skia/trunk/src/effects/SkTransparentShader.cpp
rename to gfx/skia/skia/src/effects/SkTransparentShader.cpp
diff --git a/gfx/skia/trunk/src/effects/SkXfermodeImageFilter.cpp b/gfx/skia/skia/src/effects/SkXfermodeImageFilter.cpp
rename from gfx/skia/trunk/src/effects/SkXfermodeImageFilter.cpp
rename to gfx/skia/skia/src/effects/SkXfermodeImageFilter.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkBitmapCache.cpp b/gfx/skia/skia/src/effects/gradients/SkBitmapCache.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkBitmapCache.cpp
rename to gfx/skia/skia/src/effects/gradients/SkBitmapCache.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkBitmapCache.h b/gfx/skia/skia/src/effects/gradients/SkBitmapCache.h
rename from gfx/skia/trunk/src/effects/gradients/SkBitmapCache.h
rename to gfx/skia/skia/src/effects/gradients/SkBitmapCache.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkClampRange.cpp b/gfx/skia/skia/src/effects/gradients/SkClampRange.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkClampRange.cpp
rename to gfx/skia/skia/src/effects/gradients/SkClampRange.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkClampRange.h b/gfx/skia/skia/src/effects/gradients/SkClampRange.h
rename from gfx/skia/trunk/src/effects/gradients/SkClampRange.h
rename to gfx/skia/skia/src/effects/gradients/SkClampRange.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkGradientShader.cpp b/gfx/skia/skia/src/effects/gradients/SkGradientShader.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkGradientShader.cpp
rename to gfx/skia/skia/src/effects/gradients/SkGradientShader.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkGradientShaderPriv.h b/gfx/skia/skia/src/effects/gradients/SkGradientShaderPriv.h
rename from gfx/skia/trunk/src/effects/gradients/SkGradientShaderPriv.h
rename to gfx/skia/skia/src/effects/gradients/SkGradientShaderPriv.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkLinearGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkLinearGradient.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkLinearGradient.cpp
rename to gfx/skia/skia/src/effects/gradients/SkLinearGradient.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkLinearGradient.h b/gfx/skia/skia/src/effects/gradients/SkLinearGradient.h
rename from gfx/skia/trunk/src/effects/gradients/SkLinearGradient.h
rename to gfx/skia/skia/src/effects/gradients/SkLinearGradient.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkRadialGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkRadialGradient.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkRadialGradient.cpp
rename to gfx/skia/skia/src/effects/gradients/SkRadialGradient.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkRadialGradient.h b/gfx/skia/skia/src/effects/gradients/SkRadialGradient.h
rename from gfx/skia/trunk/src/effects/gradients/SkRadialGradient.h
rename to gfx/skia/skia/src/effects/gradients/SkRadialGradient.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkRadialGradient_Table.h b/gfx/skia/skia/src/effects/gradients/SkRadialGradient_Table.h
rename from gfx/skia/trunk/src/effects/gradients/SkRadialGradient_Table.h
rename to gfx/skia/skia/src/effects/gradients/SkRadialGradient_Table.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkSweepGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkSweepGradient.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkSweepGradient.cpp
rename to gfx/skia/skia/src/effects/gradients/SkSweepGradient.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkSweepGradient.h b/gfx/skia/skia/src/effects/gradients/SkSweepGradient.h
rename from gfx/skia/trunk/src/effects/gradients/SkSweepGradient.h
rename to gfx/skia/skia/src/effects/gradients/SkSweepGradient.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient.cpp
rename to gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.h
rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient.h
rename to gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
rename to gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
rename to gfx/skia/skia/src/effects/gradients/SkTwoPointConicalGradient_gpu.h
diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointRadialGradient.cpp b/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp
rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointRadialGradient.cpp
rename to gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp
diff --git a/gfx/skia/trunk/src/effects/gradients/SkTwoPointRadialGradient.h b/gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.h
rename from gfx/skia/trunk/src/effects/gradients/SkTwoPointRadialGradient.h
rename to gfx/skia/skia/src/effects/gradients/SkTwoPointRadialGradient.h
diff --git a/gfx/skia/trunk/src/fonts/SkFontMgr_fontconfig.cpp b/gfx/skia/skia/src/fonts/SkFontMgr_fontconfig.cpp
rename from gfx/skia/trunk/src/fonts/SkFontMgr_fontconfig.cpp
rename to gfx/skia/skia/src/fonts/SkFontMgr_fontconfig.cpp
diff --git a/gfx/skia/trunk/src/fonts/SkFontMgr_indirect.cpp b/gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
rename from gfx/skia/trunk/src/fonts/SkFontMgr_indirect.cpp
rename to gfx/skia/skia/src/fonts/SkFontMgr_indirect.cpp
diff --git a/gfx/skia/trunk/src/fonts/SkGScalerContext.cpp b/gfx/skia/skia/src/fonts/SkGScalerContext.cpp
rename from gfx/skia/trunk/src/fonts/SkGScalerContext.cpp
rename to gfx/skia/skia/src/fonts/SkGScalerContext.cpp
diff --git a/gfx/skia/trunk/src/fonts/SkGScalerContext.h b/gfx/skia/skia/src/fonts/SkGScalerContext.h
rename from gfx/skia/trunk/src/fonts/SkGScalerContext.h
rename to gfx/skia/skia/src/fonts/SkGScalerContext.h
diff --git a/gfx/skia/trunk/src/fonts/SkRemotableFontMgr.cpp b/gfx/skia/skia/src/fonts/SkRemotableFontMgr.cpp
rename from gfx/skia/trunk/src/fonts/SkRemotableFontMgr.cpp
rename to gfx/skia/skia/src/fonts/SkRemotableFontMgr.cpp
diff --git a/gfx/skia/trunk/src/fonts/SkTestScalerContext.cpp b/gfx/skia/skia/src/fonts/SkTestScalerContext.cpp
rename from gfx/skia/trunk/src/fonts/SkTestScalerContext.cpp
rename to gfx/skia/skia/src/fonts/SkTestScalerContext.cpp
diff --git a/gfx/skia/trunk/src/fonts/SkTestScalerContext.h b/gfx/skia/skia/src/fonts/SkTestScalerContext.h
rename from gfx/skia/trunk/src/fonts/SkTestScalerContext.h
rename to gfx/skia/skia/src/fonts/SkTestScalerContext.h
diff --git a/gfx/skia/trunk/src/gpu/GrAAConvexPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.cpp
rename from gfx/skia/trunk/src/gpu/GrAAConvexPathRenderer.cpp
rename to gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrAAConvexPathRenderer.h b/gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.h
rename from gfx/skia/trunk/src/gpu/GrAAConvexPathRenderer.h
rename to gfx/skia/skia/src/gpu/GrAAConvexPathRenderer.h
diff --git a/gfx/skia/trunk/src/gpu/GrAAHairLinePathRenderer.cpp b/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.cpp
rename from gfx/skia/trunk/src/gpu/GrAAHairLinePathRenderer.cpp
rename to gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrAAHairLinePathRenderer.h b/gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.h
rename from gfx/skia/trunk/src/gpu/GrAAHairLinePathRenderer.h
rename to gfx/skia/skia/src/gpu/GrAAHairLinePathRenderer.h
diff --git a/gfx/skia/trunk/src/gpu/GrAARectRenderer.cpp b/gfx/skia/skia/src/gpu/GrAARectRenderer.cpp
rename from gfx/skia/trunk/src/gpu/GrAARectRenderer.cpp
rename to gfx/skia/skia/src/gpu/GrAARectRenderer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrAARectRenderer.h b/gfx/skia/skia/src/gpu/GrAARectRenderer.h
rename from gfx/skia/trunk/src/gpu/GrAARectRenderer.h
rename to gfx/skia/skia/src/gpu/GrAARectRenderer.h
diff --git a/gfx/skia/trunk/src/gpu/GrAddPathRenderers_default.cpp b/gfx/skia/skia/src/gpu/GrAddPathRenderers_default.cpp
rename from gfx/skia/trunk/src/gpu/GrAddPathRenderers_default.cpp
rename to gfx/skia/skia/src/gpu/GrAddPathRenderers_default.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrAllocPool.cpp b/gfx/skia/skia/src/gpu/GrAllocPool.cpp
rename from gfx/skia/trunk/src/gpu/GrAllocPool.cpp
rename to gfx/skia/skia/src/gpu/GrAllocPool.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrAllocPool.h b/gfx/skia/skia/src/gpu/GrAllocPool.h
rename from gfx/skia/trunk/src/gpu/GrAllocPool.h
rename to gfx/skia/skia/src/gpu/GrAllocPool.h
diff --git a/gfx/skia/trunk/src/gpu/GrAllocator.h b/gfx/skia/skia/src/gpu/GrAllocator.h
rename from gfx/skia/trunk/src/gpu/GrAllocator.h
rename to gfx/skia/skia/src/gpu/GrAllocator.h
diff --git a/gfx/skia/trunk/src/gpu/GrAtlas.cpp b/gfx/skia/skia/src/gpu/GrAtlas.cpp
rename from gfx/skia/trunk/src/gpu/GrAtlas.cpp
rename to gfx/skia/skia/src/gpu/GrAtlas.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrAtlas.h b/gfx/skia/skia/src/gpu/GrAtlas.h
rename from gfx/skia/trunk/src/gpu/GrAtlas.h
rename to gfx/skia/skia/src/gpu/GrAtlas.h
diff --git a/gfx/skia/trunk/src/gpu/GrBinHashKey.h b/gfx/skia/skia/src/gpu/GrBinHashKey.h
rename from gfx/skia/trunk/src/gpu/GrBinHashKey.h
rename to gfx/skia/skia/src/gpu/GrBinHashKey.h
diff --git a/gfx/skia/trunk/src/gpu/GrBitmapTextContext.cpp b/gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp
rename from gfx/skia/trunk/src/gpu/GrBitmapTextContext.cpp
rename to gfx/skia/skia/src/gpu/GrBitmapTextContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrBitmapTextContext.h b/gfx/skia/skia/src/gpu/GrBitmapTextContext.h
rename from gfx/skia/trunk/src/gpu/GrBitmapTextContext.h
rename to gfx/skia/skia/src/gpu/GrBitmapTextContext.h
diff --git a/gfx/skia/trunk/src/gpu/GrBlend.cpp b/gfx/skia/skia/src/gpu/GrBlend.cpp
rename from gfx/skia/trunk/src/gpu/GrBlend.cpp
rename to gfx/skia/skia/src/gpu/GrBlend.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrBlend.h b/gfx/skia/skia/src/gpu/GrBlend.h
rename from gfx/skia/trunk/src/gpu/GrBlend.h
rename to gfx/skia/skia/src/gpu/GrBlend.h
diff --git a/gfx/skia/trunk/src/gpu/GrBufferAllocPool.cpp b/gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp
rename from gfx/skia/trunk/src/gpu/GrBufferAllocPool.cpp
rename to gfx/skia/skia/src/gpu/GrBufferAllocPool.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrBufferAllocPool.h b/gfx/skia/skia/src/gpu/GrBufferAllocPool.h
rename from gfx/skia/trunk/src/gpu/GrBufferAllocPool.h
rename to gfx/skia/skia/src/gpu/GrBufferAllocPool.h
diff --git a/gfx/skia/trunk/src/gpu/GrCacheID.cpp b/gfx/skia/skia/src/gpu/GrCacheID.cpp
rename from gfx/skia/trunk/src/gpu/GrCacheID.cpp
rename to gfx/skia/skia/src/gpu/GrCacheID.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrClipData.cpp b/gfx/skia/skia/src/gpu/GrClipData.cpp
rename from gfx/skia/trunk/src/gpu/GrClipData.cpp
rename to gfx/skia/skia/src/gpu/GrClipData.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrClipMaskCache.cpp b/gfx/skia/skia/src/gpu/GrClipMaskCache.cpp
rename from gfx/skia/trunk/src/gpu/GrClipMaskCache.cpp
rename to gfx/skia/skia/src/gpu/GrClipMaskCache.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrClipMaskCache.h b/gfx/skia/skia/src/gpu/GrClipMaskCache.h
rename from gfx/skia/trunk/src/gpu/GrClipMaskCache.h
rename to gfx/skia/skia/src/gpu/GrClipMaskCache.h
diff --git a/gfx/skia/trunk/src/gpu/GrClipMaskManager.cpp b/gfx/skia/skia/src/gpu/GrClipMaskManager.cpp
rename from gfx/skia/trunk/src/gpu/GrClipMaskManager.cpp
rename to gfx/skia/skia/src/gpu/GrClipMaskManager.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrClipMaskManager.h b/gfx/skia/skia/src/gpu/GrClipMaskManager.h
rename from gfx/skia/trunk/src/gpu/GrClipMaskManager.h
rename to gfx/skia/skia/src/gpu/GrClipMaskManager.h
diff --git a/gfx/skia/trunk/src/gpu/GrContext.cpp b/gfx/skia/skia/src/gpu/GrContext.cpp
rename from gfx/skia/trunk/src/gpu/GrContext.cpp
rename to gfx/skia/skia/src/gpu/GrContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrDefaultPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.cpp
rename from gfx/skia/trunk/src/gpu/GrDefaultPathRenderer.cpp
rename to gfx/skia/skia/src/gpu/GrDefaultPathRenderer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrDefaultPathRenderer.h b/gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h
rename from gfx/skia/trunk/src/gpu/GrDefaultPathRenderer.h
rename to gfx/skia/skia/src/gpu/GrDefaultPathRenderer.h
diff --git a/gfx/skia/trunk/src/gpu/GrDistanceFieldTextContext.cpp b/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.cpp
rename from gfx/skia/trunk/src/gpu/GrDistanceFieldTextContext.cpp
rename to gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrDistanceFieldTextContext.h b/gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.h
rename from gfx/skia/trunk/src/gpu/GrDistanceFieldTextContext.h
rename to gfx/skia/skia/src/gpu/GrDistanceFieldTextContext.h
diff --git a/gfx/skia/trunk/src/gpu/GrDrawState.cpp b/gfx/skia/skia/src/gpu/GrDrawState.cpp
rename from gfx/skia/trunk/src/gpu/GrDrawState.cpp
rename to gfx/skia/skia/src/gpu/GrDrawState.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrDrawState.h b/gfx/skia/skia/src/gpu/GrDrawState.h
rename from gfx/skia/trunk/src/gpu/GrDrawState.h
rename to gfx/skia/skia/src/gpu/GrDrawState.h
diff --git a/gfx/skia/trunk/src/gpu/GrDrawTarget.cpp b/gfx/skia/skia/src/gpu/GrDrawTarget.cpp
rename from gfx/skia/trunk/src/gpu/GrDrawTarget.cpp
rename to gfx/skia/skia/src/gpu/GrDrawTarget.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrDrawTarget.h b/gfx/skia/skia/src/gpu/GrDrawTarget.h
rename from gfx/skia/trunk/src/gpu/GrDrawTarget.h
rename to gfx/skia/skia/src/gpu/GrDrawTarget.h
diff --git a/gfx/skia/trunk/src/gpu/GrDrawTargetCaps.h b/gfx/skia/skia/src/gpu/GrDrawTargetCaps.h
rename from gfx/skia/trunk/src/gpu/GrDrawTargetCaps.h
rename to gfx/skia/skia/src/gpu/GrDrawTargetCaps.h
diff --git a/gfx/skia/trunk/src/gpu/GrEffect.cpp b/gfx/skia/skia/src/gpu/GrEffect.cpp
rename from gfx/skia/trunk/src/gpu/GrEffect.cpp
rename to gfx/skia/skia/src/gpu/GrEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrFontScaler.cpp b/gfx/skia/skia/src/gpu/GrFontScaler.cpp
rename from gfx/skia/trunk/src/gpu/GrFontScaler.cpp
rename to gfx/skia/skia/src/gpu/GrFontScaler.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrGeometryBuffer.h b/gfx/skia/skia/src/gpu/GrGeometryBuffer.h
rename from gfx/skia/trunk/src/gpu/GrGeometryBuffer.h
rename to gfx/skia/skia/src/gpu/GrGeometryBuffer.h
diff --git a/gfx/skia/trunk/src/gpu/GrGpu.cpp b/gfx/skia/skia/src/gpu/GrGpu.cpp
rename from gfx/skia/trunk/src/gpu/GrGpu.cpp
rename to gfx/skia/skia/src/gpu/GrGpu.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrGpu.h b/gfx/skia/skia/src/gpu/GrGpu.h
rename from gfx/skia/trunk/src/gpu/GrGpu.h
rename to gfx/skia/skia/src/gpu/GrGpu.h
diff --git a/gfx/skia/trunk/src/gpu/GrGpuFactory.cpp b/gfx/skia/skia/src/gpu/GrGpuFactory.cpp
rename from gfx/skia/trunk/src/gpu/GrGpuFactory.cpp
rename to gfx/skia/skia/src/gpu/GrGpuFactory.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrGpuResource.cpp b/gfx/skia/skia/src/gpu/GrGpuResource.cpp
rename from gfx/skia/trunk/src/gpu/GrGpuResource.cpp
rename to gfx/skia/skia/src/gpu/GrGpuResource.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.cpp b/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp
rename from gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.cpp
rename to gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.h b/gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h
rename from gfx/skia/trunk/src/gpu/GrInOrderDrawBuffer.h
rename to gfx/skia/skia/src/gpu/GrInOrderDrawBuffer.h
diff --git a/gfx/skia/trunk/src/gpu/GrIndexBuffer.h b/gfx/skia/skia/src/gpu/GrIndexBuffer.h
rename from gfx/skia/trunk/src/gpu/GrIndexBuffer.h
rename to gfx/skia/skia/src/gpu/GrIndexBuffer.h
diff --git a/gfx/skia/trunk/src/gpu/GrLayerCache.cpp b/gfx/skia/skia/src/gpu/GrLayerCache.cpp
rename from gfx/skia/trunk/src/gpu/GrLayerCache.cpp
rename to gfx/skia/skia/src/gpu/GrLayerCache.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrLayerCache.h b/gfx/skia/skia/src/gpu/GrLayerCache.h
rename from gfx/skia/trunk/src/gpu/GrLayerCache.h
rename to gfx/skia/skia/src/gpu/GrLayerCache.h
diff --git a/gfx/skia/trunk/src/gpu/GrMemoryPool.cpp b/gfx/skia/skia/src/gpu/GrMemoryPool.cpp
rename from gfx/skia/trunk/src/gpu/GrMemoryPool.cpp
rename to gfx/skia/skia/src/gpu/GrMemoryPool.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrMemoryPool.h b/gfx/skia/skia/src/gpu/GrMemoryPool.h
rename from gfx/skia/trunk/src/gpu/GrMemoryPool.h
rename to gfx/skia/skia/src/gpu/GrMemoryPool.h
diff --git a/gfx/skia/trunk/src/gpu/GrOrderedSet.h b/gfx/skia/skia/src/gpu/GrOrderedSet.h
rename from gfx/skia/trunk/src/gpu/GrOrderedSet.h
rename to gfx/skia/skia/src/gpu/GrOrderedSet.h
diff --git a/gfx/skia/trunk/src/gpu/GrOvalRenderer.cpp b/gfx/skia/skia/src/gpu/GrOvalRenderer.cpp
rename from gfx/skia/trunk/src/gpu/GrOvalRenderer.cpp
rename to gfx/skia/skia/src/gpu/GrOvalRenderer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrOvalRenderer.h b/gfx/skia/skia/src/gpu/GrOvalRenderer.h
rename from gfx/skia/trunk/src/gpu/GrOvalRenderer.h
rename to gfx/skia/skia/src/gpu/GrOvalRenderer.h
diff --git a/gfx/skia/trunk/src/gpu/GrPaint.cpp b/gfx/skia/skia/src/gpu/GrPaint.cpp
rename from gfx/skia/trunk/src/gpu/GrPaint.cpp
rename to gfx/skia/skia/src/gpu/GrPaint.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrPath.cpp b/gfx/skia/skia/src/gpu/GrPath.cpp
rename from gfx/skia/trunk/src/gpu/GrPath.cpp
rename to gfx/skia/skia/src/gpu/GrPath.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrPath.h b/gfx/skia/skia/src/gpu/GrPath.h
rename from gfx/skia/trunk/src/gpu/GrPath.h
rename to gfx/skia/skia/src/gpu/GrPath.h
diff --git a/gfx/skia/trunk/src/gpu/GrPathRange.h b/gfx/skia/skia/src/gpu/GrPathRange.h
rename from gfx/skia/trunk/src/gpu/GrPathRange.h
rename to gfx/skia/skia/src/gpu/GrPathRange.h
diff --git a/gfx/skia/trunk/src/gpu/GrPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrPathRenderer.cpp
rename from gfx/skia/trunk/src/gpu/GrPathRenderer.cpp
rename to gfx/skia/skia/src/gpu/GrPathRenderer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrPathRenderer.h b/gfx/skia/skia/src/gpu/GrPathRenderer.h
rename from gfx/skia/trunk/src/gpu/GrPathRenderer.h
rename to gfx/skia/skia/src/gpu/GrPathRenderer.h
diff --git a/gfx/skia/trunk/src/gpu/GrPathRendererChain.cpp b/gfx/skia/skia/src/gpu/GrPathRendererChain.cpp
rename from gfx/skia/trunk/src/gpu/GrPathRendererChain.cpp
rename to gfx/skia/skia/src/gpu/GrPathRendererChain.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrPathUtils.cpp b/gfx/skia/skia/src/gpu/GrPathUtils.cpp
rename from gfx/skia/trunk/src/gpu/GrPathUtils.cpp
rename to gfx/skia/skia/src/gpu/GrPathUtils.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrPathUtils.h b/gfx/skia/skia/src/gpu/GrPathUtils.h
rename from gfx/skia/trunk/src/gpu/GrPathUtils.h
rename to gfx/skia/skia/src/gpu/GrPathUtils.h
diff --git a/gfx/skia/trunk/src/gpu/GrPictureUtils.cpp b/gfx/skia/skia/src/gpu/GrPictureUtils.cpp
rename from gfx/skia/trunk/src/gpu/GrPictureUtils.cpp
rename to gfx/skia/skia/src/gpu/GrPictureUtils.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrPictureUtils.h b/gfx/skia/skia/src/gpu/GrPictureUtils.h
rename from gfx/skia/trunk/src/gpu/GrPictureUtils.h
rename to gfx/skia/skia/src/gpu/GrPictureUtils.h
diff --git a/gfx/skia/trunk/src/gpu/GrPlotMgr.h b/gfx/skia/skia/src/gpu/GrPlotMgr.h
rename from gfx/skia/trunk/src/gpu/GrPlotMgr.h
rename to gfx/skia/skia/src/gpu/GrPlotMgr.h
diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer.h b/gfx/skia/skia/src/gpu/GrRectanizer.h
rename from gfx/skia/trunk/src/gpu/GrRectanizer.h
rename to gfx/skia/skia/src/gpu/GrRectanizer.h
diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer_pow2.cpp b/gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp
rename from gfx/skia/trunk/src/gpu/GrRectanizer_pow2.cpp
rename to gfx/skia/skia/src/gpu/GrRectanizer_pow2.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer_pow2.h b/gfx/skia/skia/src/gpu/GrRectanizer_pow2.h
rename from gfx/skia/trunk/src/gpu/GrRectanizer_pow2.h
rename to gfx/skia/skia/src/gpu/GrRectanizer_pow2.h
diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer_skyline.cpp b/gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp
rename from gfx/skia/trunk/src/gpu/GrRectanizer_skyline.cpp
rename to gfx/skia/skia/src/gpu/GrRectanizer_skyline.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrRectanizer_skyline.h b/gfx/skia/skia/src/gpu/GrRectanizer_skyline.h
rename from gfx/skia/trunk/src/gpu/GrRectanizer_skyline.h
rename to gfx/skia/skia/src/gpu/GrRectanizer_skyline.h
diff --git a/gfx/skia/trunk/src/gpu/GrRedBlackTree.h b/gfx/skia/skia/src/gpu/GrRedBlackTree.h
rename from gfx/skia/trunk/src/gpu/GrRedBlackTree.h
rename to gfx/skia/skia/src/gpu/GrRedBlackTree.h
diff --git a/gfx/skia/trunk/src/gpu/GrReducedClip.cpp b/gfx/skia/skia/src/gpu/GrReducedClip.cpp
rename from gfx/skia/trunk/src/gpu/GrReducedClip.cpp
rename to gfx/skia/skia/src/gpu/GrReducedClip.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrReducedClip.h b/gfx/skia/skia/src/gpu/GrReducedClip.h
rename from gfx/skia/trunk/src/gpu/GrReducedClip.h
rename to gfx/skia/skia/src/gpu/GrReducedClip.h
diff --git a/gfx/skia/trunk/src/gpu/GrRenderTarget.cpp b/gfx/skia/skia/src/gpu/GrRenderTarget.cpp
rename from gfx/skia/trunk/src/gpu/GrRenderTarget.cpp
rename to gfx/skia/skia/src/gpu/GrRenderTarget.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrResourceCache.cpp b/gfx/skia/skia/src/gpu/GrResourceCache.cpp
rename from gfx/skia/trunk/src/gpu/GrResourceCache.cpp
rename to gfx/skia/skia/src/gpu/GrResourceCache.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrResourceCache.h b/gfx/skia/skia/src/gpu/GrResourceCache.h
rename from gfx/skia/trunk/src/gpu/GrResourceCache.h
rename to gfx/skia/skia/src/gpu/GrResourceCache.h
diff --git a/gfx/skia/trunk/src/gpu/GrSWMaskHelper.cpp b/gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp
rename from gfx/skia/trunk/src/gpu/GrSWMaskHelper.cpp
rename to gfx/skia/skia/src/gpu/GrSWMaskHelper.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrSWMaskHelper.h b/gfx/skia/skia/src/gpu/GrSWMaskHelper.h
rename from gfx/skia/trunk/src/gpu/GrSWMaskHelper.h
rename to gfx/skia/skia/src/gpu/GrSWMaskHelper.h
diff --git a/gfx/skia/trunk/src/gpu/GrSoftwarePathRenderer.cpp b/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.cpp
rename from gfx/skia/trunk/src/gpu/GrSoftwarePathRenderer.cpp
rename to gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrSoftwarePathRenderer.h b/gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.h
rename from gfx/skia/trunk/src/gpu/GrSoftwarePathRenderer.h
rename to gfx/skia/skia/src/gpu/GrSoftwarePathRenderer.h
diff --git a/gfx/skia/trunk/src/gpu/GrStencil.cpp b/gfx/skia/skia/src/gpu/GrStencil.cpp
rename from gfx/skia/trunk/src/gpu/GrStencil.cpp
rename to gfx/skia/skia/src/gpu/GrStencil.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrStencil.h b/gfx/skia/skia/src/gpu/GrStencil.h
rename from gfx/skia/trunk/src/gpu/GrStencil.h
rename to gfx/skia/skia/src/gpu/GrStencil.h
diff --git a/gfx/skia/trunk/src/gpu/GrStencilAndCoverPathRenderer.cpp b/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp
rename from gfx/skia/trunk/src/gpu/GrStencilAndCoverPathRenderer.cpp
rename to gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrStencilAndCoverPathRenderer.h b/gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.h
rename from gfx/skia/trunk/src/gpu/GrStencilAndCoverPathRenderer.h
rename to gfx/skia/skia/src/gpu/GrStencilAndCoverPathRenderer.h
diff --git a/gfx/skia/trunk/src/gpu/GrStencilAndCoverTextContext.cpp b/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.cpp
rename from gfx/skia/trunk/src/gpu/GrStencilAndCoverTextContext.cpp
rename to gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrStencilAndCoverTextContext.h b/gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.h
rename from gfx/skia/trunk/src/gpu/GrStencilAndCoverTextContext.h
rename to gfx/skia/skia/src/gpu/GrStencilAndCoverTextContext.h
diff --git a/gfx/skia/trunk/src/gpu/GrStencilBuffer.cpp b/gfx/skia/skia/src/gpu/GrStencilBuffer.cpp
rename from gfx/skia/trunk/src/gpu/GrStencilBuffer.cpp
rename to gfx/skia/skia/src/gpu/GrStencilBuffer.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrStencilBuffer.h b/gfx/skia/skia/src/gpu/GrStencilBuffer.h
rename from gfx/skia/trunk/src/gpu/GrStencilBuffer.h
rename to gfx/skia/skia/src/gpu/GrStencilBuffer.h
diff --git a/gfx/skia/trunk/src/gpu/GrStrokeInfo.h b/gfx/skia/skia/src/gpu/GrStrokeInfo.h
rename from gfx/skia/trunk/src/gpu/GrStrokeInfo.h
rename to gfx/skia/skia/src/gpu/GrStrokeInfo.h
diff --git a/gfx/skia/trunk/src/gpu/GrSurface.cpp b/gfx/skia/skia/src/gpu/GrSurface.cpp
rename from gfx/skia/trunk/src/gpu/GrSurface.cpp
rename to gfx/skia/skia/src/gpu/GrSurface.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrTBSearch.h b/gfx/skia/skia/src/gpu/GrTBSearch.h
rename from gfx/skia/trunk/src/gpu/GrTBSearch.h
rename to gfx/skia/skia/src/gpu/GrTBSearch.h
diff --git a/gfx/skia/trunk/src/gpu/GrTHashTable.h b/gfx/skia/skia/src/gpu/GrTHashTable.h
rename from gfx/skia/trunk/src/gpu/GrTHashTable.h
rename to gfx/skia/skia/src/gpu/GrTHashTable.h
diff --git a/gfx/skia/trunk/src/gpu/GrTemplates.h b/gfx/skia/skia/src/gpu/GrTemplates.h
rename from gfx/skia/trunk/src/gpu/GrTemplates.h
rename to gfx/skia/skia/src/gpu/GrTemplates.h
diff --git a/gfx/skia/trunk/src/gpu/GrTest.cpp b/gfx/skia/skia/src/gpu/GrTest.cpp
rename from gfx/skia/trunk/src/gpu/GrTest.cpp
rename to gfx/skia/skia/src/gpu/GrTest.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrTest.h b/gfx/skia/skia/src/gpu/GrTest.h
rename from gfx/skia/trunk/src/gpu/GrTest.h
rename to gfx/skia/skia/src/gpu/GrTest.h
diff --git a/gfx/skia/trunk/src/gpu/GrTextContext.cpp b/gfx/skia/skia/src/gpu/GrTextContext.cpp
rename from gfx/skia/trunk/src/gpu/GrTextContext.cpp
rename to gfx/skia/skia/src/gpu/GrTextContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrTextContext.h b/gfx/skia/skia/src/gpu/GrTextContext.h
rename from gfx/skia/trunk/src/gpu/GrTextContext.h
rename to gfx/skia/skia/src/gpu/GrTextContext.h
diff --git a/gfx/skia/trunk/src/gpu/GrTextStrike.cpp b/gfx/skia/skia/src/gpu/GrTextStrike.cpp
rename from gfx/skia/trunk/src/gpu/GrTextStrike.cpp
rename to gfx/skia/skia/src/gpu/GrTextStrike.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrTextStrike.h b/gfx/skia/skia/src/gpu/GrTextStrike.h
rename from gfx/skia/trunk/src/gpu/GrTextStrike.h
rename to gfx/skia/skia/src/gpu/GrTextStrike.h
diff --git a/gfx/skia/trunk/src/gpu/GrTextStrike_impl.h b/gfx/skia/skia/src/gpu/GrTextStrike_impl.h
rename from gfx/skia/trunk/src/gpu/GrTextStrike_impl.h
rename to gfx/skia/skia/src/gpu/GrTextStrike_impl.h
diff --git a/gfx/skia/trunk/src/gpu/GrTexture.cpp b/gfx/skia/skia/src/gpu/GrTexture.cpp
rename from gfx/skia/trunk/src/gpu/GrTexture.cpp
rename to gfx/skia/skia/src/gpu/GrTexture.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrTextureAccess.cpp b/gfx/skia/skia/src/gpu/GrTextureAccess.cpp
rename from gfx/skia/trunk/src/gpu/GrTextureAccess.cpp
rename to gfx/skia/skia/src/gpu/GrTextureAccess.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrTraceMarker.cpp b/gfx/skia/skia/src/gpu/GrTraceMarker.cpp
rename from gfx/skia/trunk/src/gpu/GrTraceMarker.cpp
rename to gfx/skia/skia/src/gpu/GrTraceMarker.cpp
diff --git a/gfx/skia/trunk/src/gpu/GrTraceMarker.h b/gfx/skia/skia/src/gpu/GrTraceMarker.h
rename from gfx/skia/trunk/src/gpu/GrTraceMarker.h
rename to gfx/skia/skia/src/gpu/GrTraceMarker.h
diff --git a/gfx/skia/trunk/src/gpu/GrTracing.h b/gfx/skia/skia/src/gpu/GrTracing.h
rename from gfx/skia/trunk/src/gpu/GrTracing.h
rename to gfx/skia/skia/src/gpu/GrTracing.h
diff --git a/gfx/skia/trunk/src/gpu/GrVertexBuffer.h b/gfx/skia/skia/src/gpu/GrVertexBuffer.h
rename from gfx/skia/trunk/src/gpu/GrVertexBuffer.h
rename to gfx/skia/skia/src/gpu/GrVertexBuffer.h
diff --git a/gfx/skia/trunk/src/gpu/SkGpuDevice.cpp b/gfx/skia/skia/src/gpu/SkGpuDevice.cpp
rename from gfx/skia/trunk/src/gpu/SkGpuDevice.cpp
rename to gfx/skia/skia/src/gpu/SkGpuDevice.cpp
diff --git a/gfx/skia/trunk/src/gpu/SkGr.cpp b/gfx/skia/skia/src/gpu/SkGr.cpp
rename from gfx/skia/trunk/src/gpu/SkGr.cpp
rename to gfx/skia/skia/src/gpu/SkGr.cpp
diff --git a/gfx/skia/trunk/src/gpu/SkGrPixelRef.cpp b/gfx/skia/skia/src/gpu/SkGrPixelRef.cpp
rename from gfx/skia/trunk/src/gpu/SkGrPixelRef.cpp
rename to gfx/skia/skia/src/gpu/SkGrPixelRef.cpp
diff --git a/gfx/skia/trunk/src/gpu/SkGrTexturePixelRef.cpp b/gfx/skia/skia/src/gpu/SkGrTexturePixelRef.cpp
rename from gfx/skia/trunk/src/gpu/SkGrTexturePixelRef.cpp
rename to gfx/skia/skia/src/gpu/SkGrTexturePixelRef.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/Gr1DKernelEffect.h b/gfx/skia/skia/src/gpu/effects/Gr1DKernelEffect.h
rename from gfx/skia/trunk/src/gpu/effects/Gr1DKernelEffect.h
rename to gfx/skia/skia/src/gpu/effects/Gr1DKernelEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrBezierEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrBezierEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrBezierEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrBezierEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrBezierEffect.h b/gfx/skia/skia/src/gpu/effects/GrBezierEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrBezierEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrBezierEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrBicubicEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrBicubicEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrBicubicEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrBicubicEffect.h b/gfx/skia/skia/src/gpu/effects/GrBicubicEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrBicubicEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrBicubicEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrConfigConversionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrConfigConversionEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrConfigConversionEffect.h b/gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrConfigConversionEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrConfigConversionEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrConvexPolyEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrConvexPolyEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrConvexPolyEffect.h b/gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrConvexPolyEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrConvexPolyEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrConvolutionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrConvolutionEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrConvolutionEffect.h b/gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrConvolutionEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrConvolutionEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrCustomCoordsTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrCustomCoordsTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrCustomCoordsTextureEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrCustomCoordsTextureEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrDashingEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDashingEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrDashingEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrDashingEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrDashingEffect.h b/gfx/skia/skia/src/gpu/effects/GrDashingEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrDashingEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrDashingEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrDistanceFieldTextureEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrDistanceFieldTextureEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrDitherEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrDitherEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrDitherEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrDitherEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrDitherEffect.h b/gfx/skia/skia/src/gpu/effects/GrDitherEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrDitherEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrDitherEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrMatrixConvolutionEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrMatrixConvolutionEffect.h b/gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrMatrixConvolutionEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrMatrixConvolutionEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrOvalEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrOvalEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrOvalEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrOvalEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrOvalEffect.h b/gfx/skia/skia/src/gpu/effects/GrOvalEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrOvalEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrOvalEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrRRectEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrRRectEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrRRectEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrRRectEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrRRectEffect.h b/gfx/skia/skia/src/gpu/effects/GrRRectEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrRRectEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrRRectEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrSimpleTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrSimpleTextureEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrSimpleTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrSimpleTextureEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrSimpleTextureEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrSingleTextureEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrSingleTextureEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrSingleTextureEffect.h b/gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrSingleTextureEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrSingleTextureEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrTextureDomain.cpp b/gfx/skia/skia/src/gpu/effects/GrTextureDomain.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrTextureDomain.cpp
rename to gfx/skia/skia/src/gpu/effects/GrTextureDomain.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrTextureDomain.h b/gfx/skia/skia/src/gpu/effects/GrTextureDomain.h
rename from gfx/skia/trunk/src/gpu/effects/GrTextureDomain.h
rename to gfx/skia/skia/src/gpu/effects/GrTextureDomain.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrTextureStripAtlas.cpp b/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrTextureStripAtlas.cpp
rename to gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrTextureStripAtlas.h b/gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.h
rename from gfx/skia/trunk/src/gpu/effects/GrTextureStripAtlas.h
rename to gfx/skia/skia/src/gpu/effects/GrTextureStripAtlas.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrVertexEffect.h b/gfx/skia/skia/src/gpu/effects/GrVertexEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrVertexEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrVertexEffect.h
diff --git a/gfx/skia/trunk/src/gpu/effects/GrYUVtoRGBEffect.cpp b/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
rename from gfx/skia/trunk/src/gpu/effects/GrYUVtoRGBEffect.cpp
rename to gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
diff --git a/gfx/skia/trunk/src/gpu/effects/GrYUVtoRGBEffect.h b/gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.h
rename from gfx/skia/trunk/src/gpu/effects/GrYUVtoRGBEffect.h
rename to gfx/skia/skia/src/gpu/effects/GrYUVtoRGBEffect.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLAssembleGLESInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLAssembleGLESInterface.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLAssembleGLESInterface.h
rename to gfx/skia/skia/src/gpu/gl/GrGLAssembleGLESInterface.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLAssembleInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLAssembleInterface.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLAssembleInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLAssembleInterface.h
rename to gfx/skia/skia/src/gpu/gl/GrGLAssembleInterface.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLBufferImpl.cpp b/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLBufferImpl.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLBufferImpl.h b/gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLBufferImpl.h
rename to gfx/skia/skia/src/gpu/gl/GrGLBufferImpl.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCaps.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLCaps.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLCaps.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCaps.h b/gfx/skia/skia/src/gpu/gl/GrGLCaps.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLCaps.h
rename to gfx/skia/skia/src/gpu/gl/GrGLCaps.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLContext.cpp b/gfx/skia/skia/src/gpu/gl/GrGLContext.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLContext.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLContext.h b/gfx/skia/skia/src/gpu/gl/GrGLContext.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLContext.h
rename to gfx/skia/skia/src/gpu/gl/GrGLContext.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLCreateNullInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLCreateNullInterface.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLCreateNullInterface.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLCreateNullInterface.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLDefaultInterface_native.cpp b/gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_native.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLDefaultInterface_native.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_native.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLDefaultInterface_none.cpp b/gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLDefaultInterface_none.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLDefines.h b/gfx/skia/skia/src/gpu/gl/GrGLDefines.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLDefines.h
rename to gfx/skia/skia/src/gpu/gl/GrGLDefines.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLEffect.h b/gfx/skia/skia/src/gpu/gl/GrGLEffect.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLEffect.h
rename to gfx/skia/skia/src/gpu/gl/GrGLEffect.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLExtensions.cpp b/gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLExtensions.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLExtensions.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLIRect.h b/gfx/skia/skia/src/gpu/gl/GrGLIRect.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLIRect.h
rename to gfx/skia/skia/src/gpu/gl/GrGLIRect.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLIndexBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLIndexBuffer.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLIndexBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLIndexBuffer.h
rename to gfx/skia/skia/src/gpu/gl/GrGLIndexBuffer.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLInterface.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLInterface.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLNameAllocator.cpp b/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLNameAllocator.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLNameAllocator.h b/gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLNameAllocator.h
rename to gfx/skia/skia/src/gpu/gl/GrGLNameAllocator.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.cpp b/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.h b/gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLNoOpInterface.h
rename to gfx/skia/skia/src/gpu/gl/GrGLNoOpInterface.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLPath.cpp b/gfx/skia/skia/src/gpu/gl/GrGLPath.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLPath.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLPath.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLPath.h b/gfx/skia/skia/src/gpu/gl/GrGLPath.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLPath.h
rename to gfx/skia/skia/src/gpu/gl/GrGLPath.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLPathRange.cpp b/gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLPathRange.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLPathRange.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLPathRange.h b/gfx/skia/skia/src/gpu/gl/GrGLPathRange.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLPathRange.h
rename to gfx/skia/skia/src/gpu/gl/GrGLPathRange.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgram.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLProgram.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLProgram.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgram.h b/gfx/skia/skia/src/gpu/gl/GrGLProgram.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLProgram.h
rename to gfx/skia/skia/src/gpu/gl/GrGLProgram.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgramDesc.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLProgramDesc.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgramDesc.h b/gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLProgramDesc.h
rename to gfx/skia/skia/src/gpu/gl/GrGLProgramDesc.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgramEffects.cpp b/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLProgramEffects.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLProgramEffects.h b/gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLProgramEffects.h
rename to gfx/skia/skia/src/gpu/gl/GrGLProgramEffects.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLRenderTarget.cpp b/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLRenderTarget.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLRenderTarget.h b/gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLRenderTarget.h
rename to gfx/skia/skia/src/gpu/gl/GrGLRenderTarget.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLSL.cpp b/gfx/skia/skia/src/gpu/gl/GrGLSL.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLSL.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLSL.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLSL.h b/gfx/skia/skia/src/gpu/gl/GrGLSL.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLSL.h
rename to gfx/skia/skia/src/gpu/gl/GrGLSL.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLSL_impl.h b/gfx/skia/skia/src/gpu/gl/GrGLSL_impl.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLSL_impl.h
rename to gfx/skia/skia/src/gpu/gl/GrGLSL_impl.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.cpp b/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.h b/gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLShaderBuilder.h
rename to gfx/skia/skia/src/gpu/gl/GrGLShaderBuilder.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLShaderVar.h b/gfx/skia/skia/src/gpu/gl/GrGLShaderVar.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLShaderVar.h
rename to gfx/skia/skia/src/gpu/gl/GrGLShaderVar.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLStencilBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLStencilBuffer.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLStencilBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLStencilBuffer.h
rename to gfx/skia/skia/src/gpu/gl/GrGLStencilBuffer.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLTexture.cpp b/gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLTexture.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLTexture.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLTexture.h b/gfx/skia/skia/src/gpu/gl/GrGLTexture.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLTexture.h
rename to gfx/skia/skia/src/gpu/gl/GrGLTexture.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUniformHandle.h b/gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLUniformHandle.h
rename to gfx/skia/skia/src/gpu/gl/GrGLUniformHandle.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUniformManager.cpp b/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLUniformManager.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLUniformManager.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUniformManager.h b/gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLUniformManager.h
rename to gfx/skia/skia/src/gpu/gl/GrGLUniformManager.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUtil.cpp b/gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLUtil.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLUtil.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLUtil.h b/gfx/skia/skia/src/gpu/gl/GrGLUtil.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLUtil.h
rename to gfx/skia/skia/src/gpu/gl/GrGLUtil.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.cpp b/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLVertexArray.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexArray.h
rename to gfx/skia/skia/src/gpu/gl/GrGLVertexArray.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexBuffer.cpp b/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexBuffer.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexBuffer.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexBuffer.h
rename to gfx/skia/skia/src/gpu/gl/GrGLVertexBuffer.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGLVertexEffect.h b/gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h
rename from gfx/skia/trunk/src/gpu/gl/GrGLVertexEffect.h
rename to gfx/skia/skia/src/gpu/gl/GrGLVertexEffect.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGpuGL.cpp b/gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGpuGL.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGpuGL.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGpuGL.h b/gfx/skia/skia/src/gpu/gl/GrGpuGL.h
rename from gfx/skia/trunk/src/gpu/gl/GrGpuGL.h
rename to gfx/skia/skia/src/gpu/gl/GrGpuGL.h
diff --git a/gfx/skia/trunk/src/gpu/gl/GrGpuGL_program.cpp b/gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp
rename from gfx/skia/trunk/src/gpu/gl/GrGpuGL_program.cpp
rename to gfx/skia/skia/src/gpu/gl/GrGpuGL_program.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/SkGLContextHelper.cpp b/gfx/skia/skia/src/gpu/gl/SkGLContextHelper.cpp
rename from gfx/skia/trunk/src/gpu/gl/SkGLContextHelper.cpp
rename to gfx/skia/skia/src/gpu/gl/SkGLContextHelper.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/SkNullGLContext.cpp b/gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp
rename from gfx/skia/trunk/src/gpu/gl/SkNullGLContext.cpp
rename to gfx/skia/skia/src/gpu/gl/SkNullGLContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp b/gfx/skia/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
rename from gfx/skia/trunk/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
rename to gfx/skia/skia/src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/android/SkNativeGLContext_android.cpp b/gfx/skia/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp
rename from gfx/skia/trunk/src/gpu/gl/android/SkNativeGLContext_android.cpp
rename to gfx/skia/skia/src/gpu/gl/android/SkNativeGLContext_android.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp b/gfx/skia/skia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
rename from gfx/skia/trunk/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
rename to gfx/skia/skia/src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/angle/SkANGLEGLContext.cpp b/gfx/skia/skia/src/gpu/gl/angle/SkANGLEGLContext.cpp
rename from gfx/skia/trunk/src/gpu/gl/angle/SkANGLEGLContext.cpp
rename to gfx/skia/skia/src/gpu/gl/angle/SkANGLEGLContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrBufferObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/GrBufferObj.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrBufferObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrBufferObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrDebugGL.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/GrDebugGL.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrDebugGL.h b/gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrDebugGL.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrDebugGL.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrFBBindableObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrFBBindableObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrFBBindableObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrFBBindableObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrFakeRefObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrFakeRefObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrFakeRefObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrFrameBufferObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/GrFrameBufferObj.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrFrameBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrFrameBufferObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrFrameBufferObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrProgramObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/GrProgramObj.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrProgramObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrProgramObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrProgramObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrRenderBufferObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrRenderBufferObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrRenderBufferObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrRenderBufferObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrShaderObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/GrShaderObj.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrShaderObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrShaderObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrShaderObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrTextureObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/GrTextureObj.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrTextureObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrTextureObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrTextureObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrTextureUnitObj.cpp b/gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/GrTextureUnitObj.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrTextureUnitObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrTextureUnitObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrTextureUnitObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/GrVertexArrayObj.h b/gfx/skia/skia/src/gpu/gl/debug/GrVertexArrayObj.h
rename from gfx/skia/trunk/src/gpu/gl/debug/GrVertexArrayObj.h
rename to gfx/skia/skia/src/gpu/gl/debug/GrVertexArrayObj.h
diff --git a/gfx/skia/trunk/src/gpu/gl/debug/SkDebugGLContext.cpp b/gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.cpp
rename from gfx/skia/trunk/src/gpu/gl/debug/SkDebugGLContext.cpp
rename to gfx/skia/skia/src/gpu/gl/debug/SkDebugGLContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp b/gfx/skia/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
rename from gfx/skia/trunk/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
rename to gfx/skia/skia/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm b/gfx/skia/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm
rename from gfx/skia/trunk/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm
rename to gfx/skia/skia/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm
diff --git a/gfx/skia/trunk/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp b/gfx/skia/skia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
rename from gfx/skia/trunk/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
rename to gfx/skia/skia/src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/mac/SkNativeGLContext_mac.cpp b/gfx/skia/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
rename from gfx/skia/trunk/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
rename to gfx/skia/skia/src/gpu/gl/mac/SkNativeGLContext_mac.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp b/gfx/skia/skia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
rename from gfx/skia/trunk/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
rename to gfx/skia/skia/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/mesa/SkMesaGLContext.cpp b/gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp
rename from gfx/skia/trunk/src/gpu/gl/mesa/SkMesaGLContext.cpp
rename to gfx/skia/skia/src/gpu/gl/mesa/SkMesaGLContext.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/mesa/osmesa_wrapper.h b/gfx/skia/skia/src/gpu/gl/mesa/osmesa_wrapper.h
rename from gfx/skia/trunk/src/gpu/gl/mesa/osmesa_wrapper.h
rename to gfx/skia/skia/src/gpu/gl/mesa/osmesa_wrapper.h
diff --git a/gfx/skia/trunk/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp b/gfx/skia/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp
rename from gfx/skia/trunk/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp
rename to gfx/skia/skia/src/gpu/gl/nacl/SkNativeGLContext_nacl.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp b/gfx/skia/skia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
rename from gfx/skia/trunk/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
rename to gfx/skia/skia/src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/unix/SkNativeGLContext_unix.cpp b/gfx/skia/skia/src/gpu/gl/unix/SkNativeGLContext_unix.cpp
rename from gfx/skia/trunk/src/gpu/gl/unix/SkNativeGLContext_unix.cpp
rename to gfx/skia/skia/src/gpu/gl/unix/SkNativeGLContext_unix.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp b/gfx/skia/skia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
rename from gfx/skia/trunk/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
rename to gfx/skia/skia/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
diff --git a/gfx/skia/trunk/src/gpu/gl/win/SkNativeGLContext_win.cpp b/gfx/skia/skia/src/gpu/gl/win/SkNativeGLContext_win.cpp
rename from gfx/skia/trunk/src/gpu/gl/win/SkNativeGLContext_win.cpp
rename to gfx/skia/skia/src/gpu/gl/win/SkNativeGLContext_win.cpp
diff --git a/gfx/skia/trunk/src/image/SkImage.cpp b/gfx/skia/skia/src/image/SkImage.cpp
rename from gfx/skia/trunk/src/image/SkImage.cpp
rename to gfx/skia/skia/src/image/SkImage.cpp
diff --git a/gfx/skia/trunk/src/image/SkImagePriv.cpp b/gfx/skia/skia/src/image/SkImagePriv.cpp
rename from gfx/skia/trunk/src/image/SkImagePriv.cpp
rename to gfx/skia/skia/src/image/SkImagePriv.cpp
diff --git a/gfx/skia/trunk/src/image/SkImagePriv.h b/gfx/skia/skia/src/image/SkImagePriv.h
rename from gfx/skia/trunk/src/image/SkImagePriv.h
rename to gfx/skia/skia/src/image/SkImagePriv.h
diff --git a/gfx/skia/trunk/src/image/SkImage_Base.h b/gfx/skia/skia/src/image/SkImage_Base.h
rename from gfx/skia/trunk/src/image/SkImage_Base.h
rename to gfx/skia/skia/src/image/SkImage_Base.h
diff --git a/gfx/skia/trunk/src/image/SkImage_Codec.cpp b/gfx/skia/skia/src/image/SkImage_Codec.cpp
rename from gfx/skia/trunk/src/image/SkImage_Codec.cpp
rename to gfx/skia/skia/src/image/SkImage_Codec.cpp
diff --git a/gfx/skia/trunk/src/image/SkImage_Gpu.cpp b/gfx/skia/skia/src/image/SkImage_Gpu.cpp
rename from gfx/skia/trunk/src/image/SkImage_Gpu.cpp
rename to gfx/skia/skia/src/image/SkImage_Gpu.cpp
diff --git a/gfx/skia/trunk/src/image/SkImage_Raster.cpp b/gfx/skia/skia/src/image/SkImage_Raster.cpp
rename from gfx/skia/trunk/src/image/SkImage_Raster.cpp
rename to gfx/skia/skia/src/image/SkImage_Raster.cpp
diff --git a/gfx/skia/trunk/src/image/SkSurface.cpp b/gfx/skia/skia/src/image/SkSurface.cpp
rename from gfx/skia/trunk/src/image/SkSurface.cpp
rename to gfx/skia/skia/src/image/SkSurface.cpp
diff --git a/gfx/skia/trunk/src/image/SkSurface_Base.h b/gfx/skia/skia/src/image/SkSurface_Base.h
rename from gfx/skia/trunk/src/image/SkSurface_Base.h
rename to gfx/skia/skia/src/image/SkSurface_Base.h
diff --git a/gfx/skia/trunk/src/image/SkSurface_Gpu.cpp b/gfx/skia/skia/src/image/SkSurface_Gpu.cpp
rename from gfx/skia/trunk/src/image/SkSurface_Gpu.cpp
rename to gfx/skia/skia/src/image/SkSurface_Gpu.cpp
diff --git a/gfx/skia/trunk/src/image/SkSurface_Raster.cpp b/gfx/skia/skia/src/image/SkSurface_Raster.cpp
rename from gfx/skia/trunk/src/image/SkSurface_Raster.cpp
rename to gfx/skia/skia/src/image/SkSurface_Raster.cpp
diff --git a/gfx/skia/trunk/src/images/SkDecodingImageGenerator.cpp b/gfx/skia/skia/src/images/SkDecodingImageGenerator.cpp
rename from gfx/skia/trunk/src/images/SkDecodingImageGenerator.cpp
rename to gfx/skia/skia/src/images/SkDecodingImageGenerator.cpp
diff --git a/gfx/skia/trunk/src/images/SkForceLinking.cpp b/gfx/skia/skia/src/images/SkForceLinking.cpp
rename from gfx/skia/trunk/src/images/SkForceLinking.cpp
rename to gfx/skia/skia/src/images/SkForceLinking.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder.cpp b/gfx/skia/skia/src/images/SkImageDecoder.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_FactoryDefault.cpp b/gfx/skia/skia/src/images/SkImageDecoder_FactoryDefault.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_FactoryDefault.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_FactoryDefault.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_FactoryRegistrar.cpp b/gfx/skia/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_FactoryRegistrar.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_FactoryRegistrar.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_ktx.cpp b/gfx/skia/skia/src/images/SkImageDecoder_ktx.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_ktx.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_ktx.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libbmp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libbmp.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_libbmp.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_libbmp.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libgif.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libgif.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_libgif.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_libgif.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libico.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libico.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_libico.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_libico.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libjpeg.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libjpeg.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_libjpeg.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_libjpeg.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libpng.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libpng.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_libpng.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_libpng.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_libwebp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_libwebp.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_libwebp.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_libwebp.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_pkm.cpp b/gfx/skia/skia/src/images/SkImageDecoder_pkm.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_pkm.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_pkm.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageDecoder_wbmp.cpp b/gfx/skia/skia/src/images/SkImageDecoder_wbmp.cpp
rename from gfx/skia/trunk/src/images/SkImageDecoder_wbmp.cpp
rename to gfx/skia/skia/src/images/SkImageDecoder_wbmp.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageEncoder.cpp b/gfx/skia/skia/src/images/SkImageEncoder.cpp
rename from gfx/skia/trunk/src/images/SkImageEncoder.cpp
rename to gfx/skia/skia/src/images/SkImageEncoder.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageEncoder_Factory.cpp b/gfx/skia/skia/src/images/SkImageEncoder_Factory.cpp
rename from gfx/skia/trunk/src/images/SkImageEncoder_Factory.cpp
rename to gfx/skia/skia/src/images/SkImageEncoder_Factory.cpp
diff --git a/gfx/skia/trunk/src/images/SkImageEncoder_argb.cpp b/gfx/skia/skia/src/images/SkImageEncoder_argb.cpp
rename from gfx/skia/trunk/src/images/SkImageEncoder_argb.cpp
rename to gfx/skia/skia/src/images/SkImageEncoder_argb.cpp
diff --git a/gfx/skia/trunk/src/images/SkJpegUtility.cpp b/gfx/skia/skia/src/images/SkJpegUtility.cpp
rename from gfx/skia/trunk/src/images/SkJpegUtility.cpp
rename to gfx/skia/skia/src/images/SkJpegUtility.cpp
diff --git a/gfx/skia/trunk/src/images/SkJpegUtility.h b/gfx/skia/skia/src/images/SkJpegUtility.h
rename from gfx/skia/trunk/src/images/SkJpegUtility.h
rename to gfx/skia/skia/src/images/SkJpegUtility.h
diff --git a/gfx/skia/trunk/src/images/SkMovie.cpp b/gfx/skia/skia/src/images/SkMovie.cpp
rename from gfx/skia/trunk/src/images/SkMovie.cpp
rename to gfx/skia/skia/src/images/SkMovie.cpp
diff --git a/gfx/skia/trunk/src/images/SkMovie_gif.cpp b/gfx/skia/skia/src/images/SkMovie_gif.cpp
rename from gfx/skia/trunk/src/images/SkMovie_gif.cpp
rename to gfx/skia/skia/src/images/SkMovie_gif.cpp
diff --git a/gfx/skia/trunk/src/images/SkPageFlipper.cpp b/gfx/skia/skia/src/images/SkPageFlipper.cpp
rename from gfx/skia/trunk/src/images/SkPageFlipper.cpp
rename to gfx/skia/skia/src/images/SkPageFlipper.cpp
diff --git a/gfx/skia/trunk/src/images/SkScaledBitmapSampler.cpp b/gfx/skia/skia/src/images/SkScaledBitmapSampler.cpp
rename from gfx/skia/trunk/src/images/SkScaledBitmapSampler.cpp
rename to gfx/skia/skia/src/images/SkScaledBitmapSampler.cpp
diff --git a/gfx/skia/trunk/src/images/SkScaledBitmapSampler.h b/gfx/skia/skia/src/images/SkScaledBitmapSampler.h
rename from gfx/skia/trunk/src/images/SkScaledBitmapSampler.h
rename to gfx/skia/skia/src/images/SkScaledBitmapSampler.h
diff --git a/gfx/skia/trunk/src/images/bmpdecoderhelper.cpp b/gfx/skia/skia/src/images/bmpdecoderhelper.cpp
rename from gfx/skia/trunk/src/images/bmpdecoderhelper.cpp
rename to gfx/skia/skia/src/images/bmpdecoderhelper.cpp
diff --git a/gfx/skia/trunk/src/images/bmpdecoderhelper.h b/gfx/skia/skia/src/images/bmpdecoderhelper.h
rename from gfx/skia/trunk/src/images/bmpdecoderhelper.h
rename to gfx/skia/skia/src/images/bmpdecoderhelper.h
diff --git a/gfx/skia/trunk/src/images/transform_scanline.h b/gfx/skia/skia/src/images/transform_scanline.h
rename from gfx/skia/trunk/src/images/transform_scanline.h
rename to gfx/skia/skia/src/images/transform_scanline.h
diff --git a/gfx/skia/trunk/src/lazy/SkCachingPixelRef.cpp b/gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp
rename from gfx/skia/trunk/src/lazy/SkCachingPixelRef.cpp
rename to gfx/skia/skia/src/lazy/SkCachingPixelRef.cpp
diff --git a/gfx/skia/trunk/src/lazy/SkCachingPixelRef.h b/gfx/skia/skia/src/lazy/SkCachingPixelRef.h
rename from gfx/skia/trunk/src/lazy/SkCachingPixelRef.h
rename to gfx/skia/skia/src/lazy/SkCachingPixelRef.h
diff --git a/gfx/skia/trunk/src/lazy/SkDiscardableMemoryPool.cpp b/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.cpp
rename from gfx/skia/trunk/src/lazy/SkDiscardableMemoryPool.cpp
rename to gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.cpp
diff --git a/gfx/skia/trunk/src/lazy/SkDiscardableMemoryPool.h b/gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.h
rename from gfx/skia/trunk/src/lazy/SkDiscardableMemoryPool.h
rename to gfx/skia/skia/src/lazy/SkDiscardableMemoryPool.h
diff --git a/gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.cpp b/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.cpp
rename from gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.cpp
rename to gfx/skia/skia/src/lazy/SkDiscardablePixelRef.cpp
diff --git a/gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.h b/gfx/skia/skia/src/lazy/SkDiscardablePixelRef.h
rename from gfx/skia/trunk/src/lazy/SkDiscardablePixelRef.h
rename to gfx/skia/skia/src/lazy/SkDiscardablePixelRef.h
diff --git a/gfx/skia/trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp
rename from gfx/skia/trunk/src/opts/SkBitmapFilter_opts_SSE2.cpp
rename to gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBitmapFilter_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkBitmapFilter_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkBitmapFilter_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_arm_neon.cpp
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_arm_neon.cpp
rename to gfx/skia/skia/src/opts/SkBitmapProcState_arm_neon.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_filter_neon.h b/gfx/skia/skia/src/opts/SkBitmapProcState_filter_neon.h
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_filter_neon.h
rename to gfx/skia/skia/src/opts/SkBitmapProcState_filter_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_matrixProcs_neon.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_matrixProcs_neon.cpp
rename to gfx/skia/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_matrix_neon.h b/gfx/skia/skia/src/opts/SkBitmapProcState_matrix_neon.h
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_matrix_neon.h
rename to gfx/skia/skia/src/opts/SkBitmapProcState_matrix_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSE2.cpp
rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSSE3.cpp
rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSSE3.h b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.h
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_SSSE3.h
rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_SSSE3.h
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_arm.cpp
rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_arm.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_mips_dsp.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_mips_dsp.cpp
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_mips_dsp.cpp
rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_mips_dsp.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBitmapProcState_opts_none.cpp b/gfx/skia/skia/src/opts/SkBitmapProcState_opts_none.cpp
rename from gfx/skia/trunk/src/opts/SkBitmapProcState_opts_none.cpp
rename to gfx/skia/skia/src/opts/SkBitmapProcState_opts_none.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitMask_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm.cpp
rename from gfx/skia/trunk/src/opts/SkBlitMask_opts_arm.cpp
rename to gfx/skia/skia/src/opts/SkBlitMask_opts_arm.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitMask_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.cpp
rename from gfx/skia/trunk/src/opts/SkBlitMask_opts_arm_neon.cpp
rename to gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitMask_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.h
rename from gfx/skia/trunk/src/opts/SkBlitMask_opts_arm_neon.h
rename to gfx/skia/skia/src/opts/SkBlitMask_opts_arm_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkBlitMask_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlitMask_opts_none.cpp
rename from gfx/skia/trunk/src/opts/SkBlitMask_opts_none.cpp
rename to gfx/skia/skia/src/opts/SkBlitMask_opts_none.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitRect_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.cpp
rename from gfx/skia/trunk/src/opts/SkBlitRect_opts_SSE2.cpp
rename to gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitRect_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkBlitRect_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkBlitRect_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.cpp
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.cpp
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4.h
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4_asm.S b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_asm.S
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4_asm.S
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_asm.S
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4_x64_asm.S b/gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_SSE4_x64_asm.S
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_arm.cpp
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_arm.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.cpp
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_arm_neon.cpp
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.h
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_arm_neon.h
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_arm_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_mips_dsp.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_mips_dsp.cpp
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_mips_dsp.cpp
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_mips_dsp.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlitRow_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlitRow_opts_none.cpp
rename from gfx/skia/trunk/src/opts/SkBlitRow_opts_none.cpp
rename to gfx/skia/skia/src/opts/SkBlitRow_opts_none.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts.h b/gfx/skia/skia/src/opts/SkBlurImage_opts.h
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts.h
rename to gfx/skia/skia/src/opts/SkBlurImage_opts.h
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.cpp
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE2.cpp
rename to gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE2.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkBlurImage_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE4.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.cpp
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE4.cpp
rename to gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE4.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.h
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_SSE4.h
rename to gfx/skia/skia/src/opts/SkBlurImage_opts_SSE4.h
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_arm.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_arm.cpp
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_arm.cpp
rename to gfx/skia/skia/src/opts/SkBlurImage_opts_arm.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_neon.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.cpp
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_neon.cpp
rename to gfx/skia/skia/src/opts/SkBlurImage_opts_neon.cpp
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_neon.h b/gfx/skia/skia/src/opts/SkBlurImage_opts_neon.h
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_neon.h
rename to gfx/skia/skia/src/opts/SkBlurImage_opts_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkBlurImage_opts_none.cpp b/gfx/skia/skia/src/opts/SkBlurImage_opts_none.cpp
rename from gfx/skia/trunk/src/opts/SkBlurImage_opts_none.cpp
rename to gfx/skia/skia/src/opts/SkBlurImage_opts_none.cpp
diff --git a/gfx/skia/trunk/src/opts/SkColor_opts_SSE2.h b/gfx/skia/skia/src/opts/SkColor_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkColor_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkColor_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkColor_opts_neon.h b/gfx/skia/skia/src/opts/SkColor_opts_neon.h
rename from gfx/skia/trunk/src/opts/SkColor_opts_neon.h
rename to gfx/skia/skia/src/opts/SkColor_opts_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkMath_opts_SSE2.h b/gfx/skia/skia/src/opts/SkMath_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkMath_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkMath_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts.h b/gfx/skia/skia/src/opts/SkMorphology_opts.h
rename from gfx/skia/trunk/src/opts/SkMorphology_opts.h
rename to gfx/skia/skia/src/opts/SkMorphology_opts.h
diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.cpp
rename from gfx/skia/trunk/src/opts/SkMorphology_opts_SSE2.cpp
rename to gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.cpp
diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_SSE2.h b/gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkMorphology_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkMorphology_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_arm.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_arm.cpp
rename from gfx/skia/trunk/src/opts/SkMorphology_opts_arm.cpp
rename to gfx/skia/skia/src/opts/SkMorphology_opts_arm.cpp
diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_neon.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_neon.cpp
rename from gfx/skia/trunk/src/opts/SkMorphology_opts_neon.cpp
rename to gfx/skia/skia/src/opts/SkMorphology_opts_neon.cpp
diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_neon.h b/gfx/skia/skia/src/opts/SkMorphology_opts_neon.h
rename from gfx/skia/trunk/src/opts/SkMorphology_opts_neon.h
rename to gfx/skia/skia/src/opts/SkMorphology_opts_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkMorphology_opts_none.cpp b/gfx/skia/skia/src/opts/SkMorphology_opts_none.cpp
rename from gfx/skia/trunk/src/opts/SkMorphology_opts_none.cpp
rename to gfx/skia/skia/src/opts/SkMorphology_opts_none.cpp
diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts.h b/gfx/skia/skia/src/opts/SkTextureCompression_opts.h
rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts.h
rename to gfx/skia/skia/src/opts/SkTextureCompression_opts.h
diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts_arm.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_arm.cpp
rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts_arm.cpp
rename to gfx/skia/skia/src/opts/SkTextureCompression_opts_arm.cpp
diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts_neon.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.cpp
rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts_neon.cpp
rename to gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.cpp
diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts_neon.h b/gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.h
rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts_neon.h
rename to gfx/skia/skia/src/opts/SkTextureCompression_opts_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkTextureCompression_opts_none.cpp b/gfx/skia/skia/src/opts/SkTextureCompression_opts_none.cpp
rename from gfx/skia/trunk/src/opts/SkTextureCompression_opts_none.cpp
rename to gfx/skia/skia/src/opts/SkTextureCompression_opts_none.cpp
diff --git a/gfx/skia/trunk/src/opts/SkUtils_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp
rename from gfx/skia/trunk/src/opts/SkUtils_opts_SSE2.cpp
rename to gfx/skia/skia/src/opts/SkUtils_opts_SSE2.cpp
diff --git a/gfx/skia/trunk/src/opts/SkUtils_opts_SSE2.h b/gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkUtils_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkUtils_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkUtils_opts_arm.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp
rename from gfx/skia/trunk/src/opts/SkUtils_opts_arm.cpp
rename to gfx/skia/skia/src/opts/SkUtils_opts_arm.cpp
diff --git a/gfx/skia/trunk/src/opts/SkUtils_opts_none.cpp b/gfx/skia/skia/src/opts/SkUtils_opts_none.cpp
rename from gfx/skia/trunk/src/opts/SkUtils_opts_none.cpp
rename to gfx/skia/skia/src/opts/SkUtils_opts_none.cpp
diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_SSE2.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.cpp
rename from gfx/skia/trunk/src/opts/SkXfermode_opts_SSE2.cpp
rename to gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.cpp
diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_SSE2.h b/gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h
rename from gfx/skia/trunk/src/opts/SkXfermode_opts_SSE2.h
rename to gfx/skia/skia/src/opts/SkXfermode_opts_SSE2.h
diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_arm.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_arm.cpp
rename from gfx/skia/trunk/src/opts/SkXfermode_opts_arm.cpp
rename to gfx/skia/skia/src/opts/SkXfermode_opts_arm.cpp
diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.cpp
rename from gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.cpp
rename to gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.cpp
diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.h b/gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.h
rename from gfx/skia/trunk/src/opts/SkXfermode_opts_arm_neon.h
rename to gfx/skia/skia/src/opts/SkXfermode_opts_arm_neon.h
diff --git a/gfx/skia/trunk/src/opts/SkXfermode_opts_none.cpp b/gfx/skia/skia/src/opts/SkXfermode_opts_none.cpp
rename from gfx/skia/trunk/src/opts/SkXfermode_opts_none.cpp
rename to gfx/skia/skia/src/opts/SkXfermode_opts_none.cpp
diff --git a/gfx/skia/trunk/src/opts/memset.arm.S b/gfx/skia/skia/src/opts/memset.arm.S
rename from gfx/skia/trunk/src/opts/memset.arm.S
rename to gfx/skia/skia/src/opts/memset.arm.S
diff --git a/gfx/skia/trunk/src/opts/memset16_neon.S b/gfx/skia/skia/src/opts/memset16_neon.S
rename from gfx/skia/trunk/src/opts/memset16_neon.S
rename to gfx/skia/skia/src/opts/memset16_neon.S
diff --git a/gfx/skia/trunk/src/opts/memset32_neon.S b/gfx/skia/skia/src/opts/memset32_neon.S
rename from gfx/skia/trunk/src/opts/memset32_neon.S
rename to gfx/skia/skia/src/opts/memset32_neon.S
diff --git a/gfx/skia/trunk/src/opts/opts_check_x86.cpp b/gfx/skia/skia/src/opts/opts_check_x86.cpp
rename from gfx/skia/trunk/src/opts/opts_check_x86.cpp
rename to gfx/skia/skia/src/opts/opts_check_x86.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkAddIntersections.cpp b/gfx/skia/skia/src/pathops/SkAddIntersections.cpp
rename from gfx/skia/trunk/src/pathops/SkAddIntersections.cpp
rename to gfx/skia/skia/src/pathops/SkAddIntersections.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkAddIntersections.h b/gfx/skia/skia/src/pathops/SkAddIntersections.h
rename from gfx/skia/trunk/src/pathops/SkAddIntersections.h
rename to gfx/skia/skia/src/pathops/SkAddIntersections.h
diff --git a/gfx/skia/trunk/src/pathops/SkDCubicIntersection.cpp b/gfx/skia/skia/src/pathops/SkDCubicIntersection.cpp
rename from gfx/skia/trunk/src/pathops/SkDCubicIntersection.cpp
rename to gfx/skia/skia/src/pathops/SkDCubicIntersection.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkDCubicLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDCubicLineIntersection.cpp
rename from gfx/skia/trunk/src/pathops/SkDCubicLineIntersection.cpp
rename to gfx/skia/skia/src/pathops/SkDCubicLineIntersection.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkDCubicToQuads.cpp b/gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp
rename from gfx/skia/trunk/src/pathops/SkDCubicToQuads.cpp
rename to gfx/skia/skia/src/pathops/SkDCubicToQuads.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkDLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDLineIntersection.cpp
rename from gfx/skia/trunk/src/pathops/SkDLineIntersection.cpp
rename to gfx/skia/skia/src/pathops/SkDLineIntersection.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkDQuadImplicit.cpp b/gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp
rename from gfx/skia/trunk/src/pathops/SkDQuadImplicit.cpp
rename to gfx/skia/skia/src/pathops/SkDQuadImplicit.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkDQuadImplicit.h b/gfx/skia/skia/src/pathops/SkDQuadImplicit.h
rename from gfx/skia/trunk/src/pathops/SkDQuadImplicit.h
rename to gfx/skia/skia/src/pathops/SkDQuadImplicit.h
diff --git a/gfx/skia/trunk/src/pathops/SkDQuadIntersection.cpp b/gfx/skia/skia/src/pathops/SkDQuadIntersection.cpp
rename from gfx/skia/trunk/src/pathops/SkDQuadIntersection.cpp
rename to gfx/skia/skia/src/pathops/SkDQuadIntersection.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkDQuadLineIntersection.cpp b/gfx/skia/skia/src/pathops/SkDQuadLineIntersection.cpp
rename from gfx/skia/trunk/src/pathops/SkDQuadLineIntersection.cpp
rename to gfx/skia/skia/src/pathops/SkDQuadLineIntersection.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkIntersectionHelper.h b/gfx/skia/skia/src/pathops/SkIntersectionHelper.h
rename from gfx/skia/trunk/src/pathops/SkIntersectionHelper.h
rename to gfx/skia/skia/src/pathops/SkIntersectionHelper.h
diff --git a/gfx/skia/trunk/src/pathops/SkIntersections.cpp b/gfx/skia/skia/src/pathops/SkIntersections.cpp
rename from gfx/skia/trunk/src/pathops/SkIntersections.cpp
rename to gfx/skia/skia/src/pathops/SkIntersections.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkIntersections.h b/gfx/skia/skia/src/pathops/SkIntersections.h
rename from gfx/skia/trunk/src/pathops/SkIntersections.h
rename to gfx/skia/skia/src/pathops/SkIntersections.h
diff --git a/gfx/skia/trunk/src/pathops/SkLineParameters.h b/gfx/skia/skia/src/pathops/SkLineParameters.h
rename from gfx/skia/trunk/src/pathops/SkLineParameters.h
rename to gfx/skia/skia/src/pathops/SkLineParameters.h
diff --git a/gfx/skia/trunk/src/pathops/SkOpAngle.cpp b/gfx/skia/skia/src/pathops/SkOpAngle.cpp
rename from gfx/skia/trunk/src/pathops/SkOpAngle.cpp
rename to gfx/skia/skia/src/pathops/SkOpAngle.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkOpAngle.h b/gfx/skia/skia/src/pathops/SkOpAngle.h
rename from gfx/skia/trunk/src/pathops/SkOpAngle.h
rename to gfx/skia/skia/src/pathops/SkOpAngle.h
diff --git a/gfx/skia/trunk/src/pathops/SkOpContour.cpp b/gfx/skia/skia/src/pathops/SkOpContour.cpp
rename from gfx/skia/trunk/src/pathops/SkOpContour.cpp
rename to gfx/skia/skia/src/pathops/SkOpContour.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkOpContour.h b/gfx/skia/skia/src/pathops/SkOpContour.h
rename from gfx/skia/trunk/src/pathops/SkOpContour.h
rename to gfx/skia/skia/src/pathops/SkOpContour.h
diff --git a/gfx/skia/trunk/src/pathops/SkOpEdgeBuilder.cpp b/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp
rename from gfx/skia/trunk/src/pathops/SkOpEdgeBuilder.cpp
rename to gfx/skia/skia/src/pathops/SkOpEdgeBuilder.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkOpEdgeBuilder.h b/gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h
rename from gfx/skia/trunk/src/pathops/SkOpEdgeBuilder.h
rename to gfx/skia/skia/src/pathops/SkOpEdgeBuilder.h
diff --git a/gfx/skia/trunk/src/pathops/SkOpSegment.cpp b/gfx/skia/skia/src/pathops/SkOpSegment.cpp
rename from gfx/skia/trunk/src/pathops/SkOpSegment.cpp
rename to gfx/skia/skia/src/pathops/SkOpSegment.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkOpSegment.h b/gfx/skia/skia/src/pathops/SkOpSegment.h
rename from gfx/skia/trunk/src/pathops/SkOpSegment.h
rename to gfx/skia/skia/src/pathops/SkOpSegment.h
diff --git a/gfx/skia/trunk/src/pathops/SkOpSpan.h b/gfx/skia/skia/src/pathops/SkOpSpan.h
rename from gfx/skia/trunk/src/pathops/SkOpSpan.h
rename to gfx/skia/skia/src/pathops/SkOpSpan.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsBounds.cpp b/gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsBounds.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsBounds.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsBounds.h b/gfx/skia/skia/src/pathops/SkPathOpsBounds.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsBounds.h
rename to gfx/skia/skia/src/pathops/SkPathOpsBounds.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCommon.cpp b/gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsCommon.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsCommon.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCommon.h b/gfx/skia/skia/src/pathops/SkPathOpsCommon.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsCommon.h
rename to gfx/skia/skia/src/pathops/SkPathOpsCommon.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCubic.cpp b/gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsCubic.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsCubic.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCubic.h b/gfx/skia/skia/src/pathops/SkPathOpsCubic.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsCubic.h
rename to gfx/skia/skia/src/pathops/SkPathOpsCubic.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsCurve.h b/gfx/skia/skia/src/pathops/SkPathOpsCurve.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsCurve.h
rename to gfx/skia/skia/src/pathops/SkPathOpsCurve.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsDebug.cpp b/gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsDebug.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsDebug.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsDebug.h b/gfx/skia/skia/src/pathops/SkPathOpsDebug.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsDebug.h
rename to gfx/skia/skia/src/pathops/SkPathOpsDebug.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsLine.cpp b/gfx/skia/skia/src/pathops/SkPathOpsLine.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsLine.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsLine.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsLine.h b/gfx/skia/skia/src/pathops/SkPathOpsLine.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsLine.h
rename to gfx/skia/skia/src/pathops/SkPathOpsLine.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsOp.cpp b/gfx/skia/skia/src/pathops/SkPathOpsOp.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsOp.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsOp.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsPoint.cpp b/gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsPoint.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsPoint.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsPoint.h b/gfx/skia/skia/src/pathops/SkPathOpsPoint.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsPoint.h
rename to gfx/skia/skia/src/pathops/SkPathOpsPoint.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsQuad.cpp b/gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsQuad.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsQuad.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsQuad.h b/gfx/skia/skia/src/pathops/SkPathOpsQuad.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsQuad.h
rename to gfx/skia/skia/src/pathops/SkPathOpsQuad.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsRect.cpp b/gfx/skia/skia/src/pathops/SkPathOpsRect.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsRect.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsRect.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsRect.h b/gfx/skia/skia/src/pathops/SkPathOpsRect.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsRect.h
rename to gfx/skia/skia/src/pathops/SkPathOpsRect.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsSimplify.cpp b/gfx/skia/skia/src/pathops/SkPathOpsSimplify.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsSimplify.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsSimplify.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTightBounds.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTightBounds.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsTightBounds.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsTightBounds.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTriangle.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTriangle.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsTriangle.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsTriangle.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTriangle.h b/gfx/skia/skia/src/pathops/SkPathOpsTriangle.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsTriangle.h
rename to gfx/skia/skia/src/pathops/SkPathOpsTriangle.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTypes.cpp b/gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp
rename from gfx/skia/trunk/src/pathops/SkPathOpsTypes.cpp
rename to gfx/skia/skia/src/pathops/SkPathOpsTypes.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathOpsTypes.h b/gfx/skia/skia/src/pathops/SkPathOpsTypes.h
rename from gfx/skia/trunk/src/pathops/SkPathOpsTypes.h
rename to gfx/skia/skia/src/pathops/SkPathOpsTypes.h
diff --git a/gfx/skia/trunk/src/pathops/SkPathWriter.cpp b/gfx/skia/skia/src/pathops/SkPathWriter.cpp
rename from gfx/skia/trunk/src/pathops/SkPathWriter.cpp
rename to gfx/skia/skia/src/pathops/SkPathWriter.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkPathWriter.h b/gfx/skia/skia/src/pathops/SkPathWriter.h
rename from gfx/skia/trunk/src/pathops/SkPathWriter.h
rename to gfx/skia/skia/src/pathops/SkPathWriter.h
diff --git a/gfx/skia/trunk/src/pathops/SkQuarticRoot.cpp b/gfx/skia/skia/src/pathops/SkQuarticRoot.cpp
rename from gfx/skia/trunk/src/pathops/SkQuarticRoot.cpp
rename to gfx/skia/skia/src/pathops/SkQuarticRoot.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkQuarticRoot.h b/gfx/skia/skia/src/pathops/SkQuarticRoot.h
rename from gfx/skia/trunk/src/pathops/SkQuarticRoot.h
rename to gfx/skia/skia/src/pathops/SkQuarticRoot.h
diff --git a/gfx/skia/trunk/src/pathops/SkReduceOrder.cpp b/gfx/skia/skia/src/pathops/SkReduceOrder.cpp
rename from gfx/skia/trunk/src/pathops/SkReduceOrder.cpp
rename to gfx/skia/skia/src/pathops/SkReduceOrder.cpp
diff --git a/gfx/skia/trunk/src/pathops/SkReduceOrder.h b/gfx/skia/skia/src/pathops/SkReduceOrder.h
rename from gfx/skia/trunk/src/pathops/SkReduceOrder.h
rename to gfx/skia/skia/src/pathops/SkReduceOrder.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFCatalog.cpp b/gfx/skia/skia/src/pdf/SkPDFCatalog.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFCatalog.cpp
rename to gfx/skia/skia/src/pdf/SkPDFCatalog.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFCatalog.h b/gfx/skia/skia/src/pdf/SkPDFCatalog.h
rename from gfx/skia/trunk/src/pdf/SkPDFCatalog.h
rename to gfx/skia/skia/src/pdf/SkPDFCatalog.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFDevice.cpp b/gfx/skia/skia/src/pdf/SkPDFDevice.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFDevice.cpp
rename to gfx/skia/skia/src/pdf/SkPDFDevice.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFDeviceFlattener.cpp b/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFDeviceFlattener.cpp
rename to gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFDeviceFlattener.h b/gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h
rename from gfx/skia/trunk/src/pdf/SkPDFDeviceFlattener.h
rename to gfx/skia/skia/src/pdf/SkPDFDeviceFlattener.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFDocument.cpp b/gfx/skia/skia/src/pdf/SkPDFDocument.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFDocument.cpp
rename to gfx/skia/skia/src/pdf/SkPDFDocument.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFFont.cpp b/gfx/skia/skia/src/pdf/SkPDFFont.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFFont.cpp
rename to gfx/skia/skia/src/pdf/SkPDFFont.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFFont.h b/gfx/skia/skia/src/pdf/SkPDFFont.h
rename from gfx/skia/trunk/src/pdf/SkPDFFont.h
rename to gfx/skia/skia/src/pdf/SkPDFFont.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFFontImpl.h b/gfx/skia/skia/src/pdf/SkPDFFontImpl.h
rename from gfx/skia/trunk/src/pdf/SkPDFFontImpl.h
rename to gfx/skia/skia/src/pdf/SkPDFFontImpl.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFFormXObject.cpp b/gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFFormXObject.cpp
rename to gfx/skia/skia/src/pdf/SkPDFFormXObject.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFFormXObject.h b/gfx/skia/skia/src/pdf/SkPDFFormXObject.h
rename from gfx/skia/trunk/src/pdf/SkPDFFormXObject.h
rename to gfx/skia/skia/src/pdf/SkPDFFormXObject.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFGraphicState.cpp b/gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFGraphicState.cpp
rename to gfx/skia/skia/src/pdf/SkPDFGraphicState.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFGraphicState.h b/gfx/skia/skia/src/pdf/SkPDFGraphicState.h
rename from gfx/skia/trunk/src/pdf/SkPDFGraphicState.h
rename to gfx/skia/skia/src/pdf/SkPDFGraphicState.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFImage.cpp b/gfx/skia/skia/src/pdf/SkPDFImage.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFImage.cpp
rename to gfx/skia/skia/src/pdf/SkPDFImage.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFImage.h b/gfx/skia/skia/src/pdf/SkPDFImage.h
rename from gfx/skia/trunk/src/pdf/SkPDFImage.h
rename to gfx/skia/skia/src/pdf/SkPDFImage.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFPage.cpp b/gfx/skia/skia/src/pdf/SkPDFPage.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFPage.cpp
rename to gfx/skia/skia/src/pdf/SkPDFPage.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFPage.h b/gfx/skia/skia/src/pdf/SkPDFPage.h
rename from gfx/skia/trunk/src/pdf/SkPDFPage.h
rename to gfx/skia/skia/src/pdf/SkPDFPage.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFResourceDict.cpp b/gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFResourceDict.cpp
rename to gfx/skia/skia/src/pdf/SkPDFResourceDict.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFResourceDict.h b/gfx/skia/skia/src/pdf/SkPDFResourceDict.h
rename from gfx/skia/trunk/src/pdf/SkPDFResourceDict.h
rename to gfx/skia/skia/src/pdf/SkPDFResourceDict.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFShader.cpp b/gfx/skia/skia/src/pdf/SkPDFShader.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFShader.cpp
rename to gfx/skia/skia/src/pdf/SkPDFShader.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFShader.h b/gfx/skia/skia/src/pdf/SkPDFShader.h
rename from gfx/skia/trunk/src/pdf/SkPDFShader.h
rename to gfx/skia/skia/src/pdf/SkPDFShader.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFStream.cpp b/gfx/skia/skia/src/pdf/SkPDFStream.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFStream.cpp
rename to gfx/skia/skia/src/pdf/SkPDFStream.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFStream.h b/gfx/skia/skia/src/pdf/SkPDFStream.h
rename from gfx/skia/trunk/src/pdf/SkPDFStream.h
rename to gfx/skia/skia/src/pdf/SkPDFStream.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFTypes.cpp b/gfx/skia/skia/src/pdf/SkPDFTypes.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFTypes.cpp
rename to gfx/skia/skia/src/pdf/SkPDFTypes.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFTypes.h b/gfx/skia/skia/src/pdf/SkPDFTypes.h
rename from gfx/skia/trunk/src/pdf/SkPDFTypes.h
rename to gfx/skia/skia/src/pdf/SkPDFTypes.h
diff --git a/gfx/skia/trunk/src/pdf/SkPDFUtils.cpp b/gfx/skia/skia/src/pdf/SkPDFUtils.cpp
rename from gfx/skia/trunk/src/pdf/SkPDFUtils.cpp
rename to gfx/skia/skia/src/pdf/SkPDFUtils.cpp
diff --git a/gfx/skia/trunk/src/pdf/SkPDFUtils.h b/gfx/skia/skia/src/pdf/SkPDFUtils.h
rename from gfx/skia/trunk/src/pdf/SkPDFUtils.h
rename to gfx/skia/skia/src/pdf/SkPDFUtils.h
diff --git a/gfx/skia/trunk/src/pdf/SkTSet.h b/gfx/skia/skia/src/pdf/SkTSet.h
rename from gfx/skia/trunk/src/pdf/SkTSet.h
rename to gfx/skia/skia/src/pdf/SkTSet.h
diff --git a/gfx/skia/trunk/src/pipe/SkGPipePriv.h b/gfx/skia/skia/src/pipe/SkGPipePriv.h
rename from gfx/skia/trunk/src/pipe/SkGPipePriv.h
rename to gfx/skia/skia/src/pipe/SkGPipePriv.h
diff --git a/gfx/skia/trunk/src/pipe/SkGPipeRead.cpp b/gfx/skia/skia/src/pipe/SkGPipeRead.cpp
rename from gfx/skia/trunk/src/pipe/SkGPipeRead.cpp
rename to gfx/skia/skia/src/pipe/SkGPipeRead.cpp
diff --git a/gfx/skia/trunk/src/pipe/SkGPipeWrite.cpp b/gfx/skia/skia/src/pipe/SkGPipeWrite.cpp
rename from gfx/skia/trunk/src/pipe/SkGPipeWrite.cpp
rename to gfx/skia/skia/src/pipe/SkGPipeWrite.cpp
diff --git a/gfx/skia/trunk/src/pipe/utils/SamplePipeControllers.cpp b/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.cpp
rename from gfx/skia/trunk/src/pipe/utils/SamplePipeControllers.cpp
rename to gfx/skia/skia/src/pipe/utils/SamplePipeControllers.cpp
diff --git a/gfx/skia/trunk/src/pipe/utils/SamplePipeControllers.h b/gfx/skia/skia/src/pipe/utils/SamplePipeControllers.h
rename from gfx/skia/trunk/src/pipe/utils/SamplePipeControllers.h
rename to gfx/skia/skia/src/pipe/utils/SamplePipeControllers.h
diff --git a/gfx/skia/trunk/src/ports/SkAtomics_sync.h b/gfx/skia/skia/src/ports/SkAtomics_sync.h
rename from gfx/skia/trunk/src/ports/SkAtomics_sync.h
rename to gfx/skia/skia/src/ports/SkAtomics_sync.h
diff --git a/gfx/skia/trunk/src/ports/SkAtomics_win.h b/gfx/skia/skia/src/ports/SkAtomics_win.h
rename from gfx/skia/trunk/src/ports/SkAtomics_win.h
rename to gfx/skia/skia/src/ports/SkAtomics_win.h
diff --git a/gfx/skia/trunk/src/ports/SkBarriers_arm.h b/gfx/skia/skia/src/ports/SkBarriers_arm.h
rename from gfx/skia/trunk/src/ports/SkBarriers_arm.h
rename to gfx/skia/skia/src/ports/SkBarriers_arm.h
diff --git a/gfx/skia/trunk/src/ports/SkBarriers_tsan.h b/gfx/skia/skia/src/ports/SkBarriers_tsan.h
rename from gfx/skia/trunk/src/ports/SkBarriers_tsan.h
rename to gfx/skia/skia/src/ports/SkBarriers_tsan.h
diff --git a/gfx/skia/trunk/src/ports/SkBarriers_x86.h b/gfx/skia/skia/src/ports/SkBarriers_x86.h
rename from gfx/skia/trunk/src/ports/SkBarriers_x86.h
rename to gfx/skia/skia/src/ports/SkBarriers_x86.h
diff --git a/gfx/skia/trunk/src/ports/SkDebug_android.cpp b/gfx/skia/skia/src/ports/SkDebug_android.cpp
rename from gfx/skia/trunk/src/ports/SkDebug_android.cpp
rename to gfx/skia/skia/src/ports/SkDebug_android.cpp
diff --git a/gfx/skia/trunk/src/ports/SkDebug_nacl.cpp b/gfx/skia/skia/src/ports/SkDebug_nacl.cpp
rename from gfx/skia/trunk/src/ports/SkDebug_nacl.cpp
rename to gfx/skia/skia/src/ports/SkDebug_nacl.cpp
diff --git a/gfx/skia/trunk/src/ports/SkDebug_stdio.cpp b/gfx/skia/skia/src/ports/SkDebug_stdio.cpp
rename from gfx/skia/trunk/src/ports/SkDebug_stdio.cpp
rename to gfx/skia/skia/src/ports/SkDebug_stdio.cpp
diff --git a/gfx/skia/trunk/src/ports/SkDebug_win.cpp b/gfx/skia/skia/src/ports/SkDebug_win.cpp
rename from gfx/skia/trunk/src/ports/SkDebug_win.cpp
rename to gfx/skia/skia/src/ports/SkDebug_win.cpp
diff --git a/gfx/skia/trunk/src/ports/SkDiscardableMemory_none.cpp b/gfx/skia/skia/src/ports/SkDiscardableMemory_none.cpp
rename from gfx/skia/trunk/src/ports/SkDiscardableMemory_none.cpp
rename to gfx/skia/skia/src/ports/SkDiscardableMemory_none.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontConfigInterface_android.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_android.cpp
rename from gfx/skia/trunk/src/ports/SkFontConfigInterface_android.cpp
rename to gfx/skia/skia/src/ports/SkFontConfigInterface_android.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontConfigInterface_direct.cpp b/gfx/skia/skia/src/ports/SkFontConfigInterface_direct.cpp
rename from gfx/skia/trunk/src/ports/SkFontConfigInterface_direct.cpp
rename to gfx/skia/skia/src/ports/SkFontConfigInterface_direct.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontConfigParser_android.cpp b/gfx/skia/skia/src/ports/SkFontConfigParser_android.cpp
rename from gfx/skia/trunk/src/ports/SkFontConfigParser_android.cpp
rename to gfx/skia/skia/src/ports/SkFontConfigParser_android.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontConfigParser_android.h b/gfx/skia/skia/src/ports/SkFontConfigParser_android.h
rename from gfx/skia/trunk/src/ports/SkFontConfigParser_android.h
rename to gfx/skia/skia/src/ports/SkFontConfigParser_android.h
diff --git a/gfx/skia/trunk/src/ports/SkFontConfigTypeface.h b/gfx/skia/skia/src/ports/SkFontConfigTypeface.h
rename from gfx/skia/trunk/src/ports/SkFontConfigTypeface.h
rename to gfx/skia/skia/src/ports/SkFontConfigTypeface.h
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_FreeType.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_FreeType.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_FreeType_common.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_FreeType_common.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_FreeType_common.h b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.h
rename from gfx/skia/trunk/src/ports/SkFontHost_FreeType_common.h
rename to gfx/skia/skia/src/ports/SkFontHost_FreeType_common.h
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_android_old.cpp b/gfx/skia/skia/src/ports/SkFontHost_android_old.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_android_old.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_android_old.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_cairo.cpp b/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_cairo.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_fontconfig.cpp b/gfx/skia/skia/src/ports/SkFontHost_fontconfig.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_fontconfig.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_fontconfig.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_linux.cpp b/gfx/skia/skia/src/ports/SkFontHost_linux.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_linux.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_linux.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_mac.cpp b/gfx/skia/skia/src/ports/SkFontHost_mac.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_mac.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_mac.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_none.cpp b/gfx/skia/skia/src/ports/SkFontHost_none.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_none.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_none.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontHost_win.cpp b/gfx/skia/skia/src/ports/SkFontHost_win.cpp
rename from gfx/skia/trunk/src/ports/SkFontHost_win.cpp
rename to gfx/skia/skia/src/ports/SkFontHost_win.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontMgr_android.cpp b/gfx/skia/skia/src/ports/SkFontMgr_android.cpp
rename from gfx/skia/trunk/src/ports/SkFontMgr_android.cpp
rename to gfx/skia/skia/src/ports/SkFontMgr_android.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontMgr_default_dw.cpp b/gfx/skia/skia/src/ports/SkFontMgr_default_dw.cpp
rename from gfx/skia/trunk/src/ports/SkFontMgr_default_dw.cpp
rename to gfx/skia/skia/src/ports/SkFontMgr_default_dw.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontMgr_default_gdi.cpp b/gfx/skia/skia/src/ports/SkFontMgr_default_gdi.cpp
rename from gfx/skia/trunk/src/ports/SkFontMgr_default_gdi.cpp
rename to gfx/skia/skia/src/ports/SkFontMgr_default_gdi.cpp
diff --git a/gfx/skia/trunk/src/ports/SkFontMgr_win_dw.cpp b/gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp
rename from gfx/skia/trunk/src/ports/SkFontMgr_win_dw.cpp
rename to gfx/skia/skia/src/ports/SkFontMgr_win_dw.cpp
diff --git a/gfx/skia/trunk/src/ports/SkGlobalInitialization_chromium.cpp b/gfx/skia/skia/src/ports/SkGlobalInitialization_chromium.cpp
rename from gfx/skia/trunk/src/ports/SkGlobalInitialization_chromium.cpp
rename to gfx/skia/skia/src/ports/SkGlobalInitialization_chromium.cpp
diff --git a/gfx/skia/trunk/src/ports/SkGlobalInitialization_default.cpp b/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp
rename from gfx/skia/trunk/src/ports/SkGlobalInitialization_default.cpp
rename to gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp
diff --git a/gfx/skia/trunk/src/ports/SkImageDecoder_CG.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp
rename from gfx/skia/trunk/src/ports/SkImageDecoder_CG.cpp
rename to gfx/skia/skia/src/ports/SkImageDecoder_CG.cpp
diff --git a/gfx/skia/trunk/src/ports/SkImageDecoder_WIC.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_WIC.cpp
rename from gfx/skia/trunk/src/ports/SkImageDecoder_WIC.cpp
rename to gfx/skia/skia/src/ports/SkImageDecoder_WIC.cpp
diff --git a/gfx/skia/trunk/src/ports/SkImageDecoder_empty.cpp b/gfx/skia/skia/src/ports/SkImageDecoder_empty.cpp
rename from gfx/skia/trunk/src/ports/SkImageDecoder_empty.cpp
rename to gfx/skia/skia/src/ports/SkImageDecoder_empty.cpp
diff --git a/gfx/skia/trunk/src/ports/SkMemory_malloc.cpp b/gfx/skia/skia/src/ports/SkMemory_malloc.cpp
rename from gfx/skia/trunk/src/ports/SkMemory_malloc.cpp
rename to gfx/skia/skia/src/ports/SkMemory_malloc.cpp
diff --git a/gfx/skia/trunk/src/ports/SkMemory_mozalloc.cpp b/gfx/skia/skia/src/ports/SkMemory_mozalloc.cpp
rename from gfx/skia/trunk/src/ports/SkMemory_mozalloc.cpp
rename to gfx/skia/skia/src/ports/SkMemory_mozalloc.cpp
diff --git a/gfx/skia/trunk/src/ports/SkMutex_pthread.h b/gfx/skia/skia/src/ports/SkMutex_pthread.h
rename from gfx/skia/trunk/src/ports/SkMutex_pthread.h
rename to gfx/skia/skia/src/ports/SkMutex_pthread.h
diff --git a/gfx/skia/trunk/src/ports/SkMutex_win.h b/gfx/skia/skia/src/ports/SkMutex_win.h
rename from gfx/skia/trunk/src/ports/SkMutex_win.h
rename to gfx/skia/skia/src/ports/SkMutex_win.h
diff --git a/gfx/skia/trunk/src/ports/SkOSFile_none.cpp b/gfx/skia/skia/src/ports/SkOSFile_none.cpp
rename from gfx/skia/trunk/src/ports/SkOSFile_none.cpp
rename to gfx/skia/skia/src/ports/SkOSFile_none.cpp
diff --git a/gfx/skia/trunk/src/ports/SkOSFile_posix.cpp b/gfx/skia/skia/src/ports/SkOSFile_posix.cpp
rename from gfx/skia/trunk/src/ports/SkOSFile_posix.cpp
rename to gfx/skia/skia/src/ports/SkOSFile_posix.cpp
diff --git a/gfx/skia/trunk/src/ports/SkOSFile_stdio.cpp b/gfx/skia/skia/src/ports/SkOSFile_stdio.cpp
rename from gfx/skia/trunk/src/ports/SkOSFile_stdio.cpp
rename to gfx/skia/skia/src/ports/SkOSFile_stdio.cpp
diff --git a/gfx/skia/trunk/src/ports/SkOSFile_win.cpp b/gfx/skia/skia/src/ports/SkOSFile_win.cpp
rename from gfx/skia/trunk/src/ports/SkOSFile_win.cpp
rename to gfx/skia/skia/src/ports/SkOSFile_win.cpp
diff --git a/gfx/skia/trunk/src/ports/SkRemotableFontMgr_win_dw.cpp b/gfx/skia/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
rename from gfx/skia/trunk/src/ports/SkRemotableFontMgr_win_dw.cpp
rename to gfx/skia/skia/src/ports/SkRemotableFontMgr_win_dw.cpp
diff --git a/gfx/skia/trunk/src/ports/SkScalerContext_win_dw.cpp b/gfx/skia/skia/src/ports/SkScalerContext_win_dw.cpp
rename from gfx/skia/trunk/src/ports/SkScalerContext_win_dw.cpp
rename to gfx/skia/skia/src/ports/SkScalerContext_win_dw.cpp
diff --git a/gfx/skia/trunk/src/ports/SkScalerContext_win_dw.h b/gfx/skia/skia/src/ports/SkScalerContext_win_dw.h
rename from gfx/skia/trunk/src/ports/SkScalerContext_win_dw.h
rename to gfx/skia/skia/src/ports/SkScalerContext_win_dw.h
diff --git a/gfx/skia/trunk/src/ports/SkTLS_none.cpp b/gfx/skia/skia/src/ports/SkTLS_none.cpp
rename from gfx/skia/trunk/src/ports/SkTLS_none.cpp
rename to gfx/skia/skia/src/ports/SkTLS_none.cpp
diff --git a/gfx/skia/trunk/src/ports/SkTLS_pthread.cpp b/gfx/skia/skia/src/ports/SkTLS_pthread.cpp
rename from gfx/skia/trunk/src/ports/SkTLS_pthread.cpp
rename to gfx/skia/skia/src/ports/SkTLS_pthread.cpp
diff --git a/gfx/skia/trunk/src/ports/SkTLS_win.cpp b/gfx/skia/skia/src/ports/SkTLS_win.cpp
rename from gfx/skia/trunk/src/ports/SkTLS_win.cpp
rename to gfx/skia/skia/src/ports/SkTLS_win.cpp
diff --git a/gfx/skia/trunk/src/ports/SkTime_Unix.cpp b/gfx/skia/skia/src/ports/SkTime_Unix.cpp
rename from gfx/skia/trunk/src/ports/SkTime_Unix.cpp
rename to gfx/skia/skia/src/ports/SkTime_Unix.cpp
diff --git a/gfx/skia/trunk/src/ports/SkTime_win.cpp b/gfx/skia/skia/src/ports/SkTime_win.cpp
rename from gfx/skia/trunk/src/ports/SkTime_win.cpp
rename to gfx/skia/skia/src/ports/SkTime_win.cpp
diff --git a/gfx/skia/trunk/src/ports/SkTypeface_win_dw.cpp b/gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp
rename from gfx/skia/trunk/src/ports/SkTypeface_win_dw.cpp
rename to gfx/skia/skia/src/ports/SkTypeface_win_dw.cpp
diff --git a/gfx/skia/trunk/src/ports/SkTypeface_win_dw.h b/gfx/skia/skia/src/ports/SkTypeface_win_dw.h
rename from gfx/skia/trunk/src/ports/SkTypeface_win_dw.h
rename to gfx/skia/skia/src/ports/SkTypeface_win_dw.h
diff --git a/gfx/skia/trunk/src/ports/SkXMLParser_empty.cpp b/gfx/skia/skia/src/ports/SkXMLParser_empty.cpp
rename from gfx/skia/trunk/src/ports/SkXMLParser_empty.cpp
rename to gfx/skia/skia/src/ports/SkXMLParser_empty.cpp
diff --git a/gfx/skia/trunk/src/sfnt/SkIBMFamilyClass.h b/gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h
rename from gfx/skia/trunk/src/sfnt/SkIBMFamilyClass.h
rename to gfx/skia/skia/src/sfnt/SkIBMFamilyClass.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTableTypes.h b/gfx/skia/skia/src/sfnt/SkOTTableTypes.h
rename from gfx/skia/trunk/src/sfnt/SkOTTableTypes.h
rename to gfx/skia/skia/src/sfnt/SkOTTableTypes.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_EBDT.h b/gfx/skia/skia/src/sfnt/SkOTTable_EBDT.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_EBDT.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_EBDT.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_EBLC.h b/gfx/skia/skia/src/sfnt/SkOTTable_EBLC.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_EBLC.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_EBLC.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_EBSC.h b/gfx/skia/skia/src/sfnt/SkOTTable_EBSC.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_EBSC.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_EBSC.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V0.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V0.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V0.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V1.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V1.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V1.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V2.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V2.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V2.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V3.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V3.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V3.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V4.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_V4.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_V4.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_VA.h b/gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_OS_2_VA.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_OS_2_VA.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_gasp.h b/gfx/skia/skia/src/sfnt/SkOTTable_gasp.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_gasp.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_gasp.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_glyf.h b/gfx/skia/skia/src/sfnt/SkOTTable_glyf.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_glyf.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_glyf.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_head.h b/gfx/skia/skia/src/sfnt/SkOTTable_head.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_head.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_head.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_hhea.h b/gfx/skia/skia/src/sfnt/SkOTTable_hhea.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_hhea.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_hhea.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_loca.h b/gfx/skia/skia/src/sfnt/SkOTTable_loca.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_loca.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_loca.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_maxp.h b/gfx/skia/skia/src/sfnt/SkOTTable_maxp.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_maxp.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_maxp.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_maxp_CFF.h b/gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_maxp_CFF.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_maxp_CFF.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_maxp_TT.h b/gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_maxp_TT.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_maxp_TT.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_name.cpp b/gfx/skia/skia/src/sfnt/SkOTTable_name.cpp
rename from gfx/skia/trunk/src/sfnt/SkOTTable_name.cpp
rename to gfx/skia/skia/src/sfnt/SkOTTable_name.cpp
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_name.h b/gfx/skia/skia/src/sfnt/SkOTTable_name.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_name.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_name.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTTable_post.h b/gfx/skia/skia/src/sfnt/SkOTTable_post.h
rename from gfx/skia/trunk/src/sfnt/SkOTTable_post.h
rename to gfx/skia/skia/src/sfnt/SkOTTable_post.h
diff --git a/gfx/skia/trunk/src/sfnt/SkOTUtils.cpp b/gfx/skia/skia/src/sfnt/SkOTUtils.cpp
rename from gfx/skia/trunk/src/sfnt/SkOTUtils.cpp
rename to gfx/skia/skia/src/sfnt/SkOTUtils.cpp
diff --git a/gfx/skia/trunk/src/sfnt/SkOTUtils.h b/gfx/skia/skia/src/sfnt/SkOTUtils.h
rename from gfx/skia/trunk/src/sfnt/SkOTUtils.h
rename to gfx/skia/skia/src/sfnt/SkOTUtils.h
diff --git a/gfx/skia/trunk/src/sfnt/SkPanose.h b/gfx/skia/skia/src/sfnt/SkPanose.h
rename from gfx/skia/trunk/src/sfnt/SkPanose.h
rename to gfx/skia/skia/src/sfnt/SkPanose.h
diff --git a/gfx/skia/trunk/src/sfnt/SkPreprocessorSeq.h b/gfx/skia/skia/src/sfnt/SkPreprocessorSeq.h
rename from gfx/skia/trunk/src/sfnt/SkPreprocessorSeq.h
rename to gfx/skia/skia/src/sfnt/SkPreprocessorSeq.h
diff --git a/gfx/skia/trunk/src/sfnt/SkSFNTHeader.h b/gfx/skia/skia/src/sfnt/SkSFNTHeader.h
rename from gfx/skia/trunk/src/sfnt/SkSFNTHeader.h
rename to gfx/skia/skia/src/sfnt/SkSFNTHeader.h
diff --git a/gfx/skia/trunk/src/sfnt/SkTTCFHeader.h b/gfx/skia/skia/src/sfnt/SkTTCFHeader.h
rename from gfx/skia/trunk/src/sfnt/SkTTCFHeader.h
rename to gfx/skia/skia/src/sfnt/SkTTCFHeader.h
diff --git a/gfx/skia/trunk/src/sfnt/SkTypedEnum.h b/gfx/skia/skia/src/sfnt/SkTypedEnum.h
rename from gfx/skia/trunk/src/sfnt/SkTypedEnum.h
rename to gfx/skia/skia/src/sfnt/SkTypedEnum.h
diff --git a/gfx/skia/trunk/src/svg/SkSVG.cpp b/gfx/skia/skia/src/svg/SkSVG.cpp
rename from gfx/skia/trunk/src/svg/SkSVG.cpp
rename to gfx/skia/skia/src/svg/SkSVG.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGCircle.cpp b/gfx/skia/skia/src/svg/SkSVGCircle.cpp
rename from gfx/skia/trunk/src/svg/SkSVGCircle.cpp
rename to gfx/skia/skia/src/svg/SkSVGCircle.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGCircle.h b/gfx/skia/skia/src/svg/SkSVGCircle.h
rename from gfx/skia/trunk/src/svg/SkSVGCircle.h
rename to gfx/skia/skia/src/svg/SkSVGCircle.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGClipPath.cpp b/gfx/skia/skia/src/svg/SkSVGClipPath.cpp
rename from gfx/skia/trunk/src/svg/SkSVGClipPath.cpp
rename to gfx/skia/skia/src/svg/SkSVGClipPath.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGClipPath.h b/gfx/skia/skia/src/svg/SkSVGClipPath.h
rename from gfx/skia/trunk/src/svg/SkSVGClipPath.h
rename to gfx/skia/skia/src/svg/SkSVGClipPath.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGDefs.cpp b/gfx/skia/skia/src/svg/SkSVGDefs.cpp
rename from gfx/skia/trunk/src/svg/SkSVGDefs.cpp
rename to gfx/skia/skia/src/svg/SkSVGDefs.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGDefs.h b/gfx/skia/skia/src/svg/SkSVGDefs.h
rename from gfx/skia/trunk/src/svg/SkSVGDefs.h
rename to gfx/skia/skia/src/svg/SkSVGDefs.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGElements.cpp b/gfx/skia/skia/src/svg/SkSVGElements.cpp
rename from gfx/skia/trunk/src/svg/SkSVGElements.cpp
rename to gfx/skia/skia/src/svg/SkSVGElements.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGElements.h b/gfx/skia/skia/src/svg/SkSVGElements.h
rename from gfx/skia/trunk/src/svg/SkSVGElements.h
rename to gfx/skia/skia/src/svg/SkSVGElements.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGEllipse.cpp b/gfx/skia/skia/src/svg/SkSVGEllipse.cpp
rename from gfx/skia/trunk/src/svg/SkSVGEllipse.cpp
rename to gfx/skia/skia/src/svg/SkSVGEllipse.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGEllipse.h b/gfx/skia/skia/src/svg/SkSVGEllipse.h
rename from gfx/skia/trunk/src/svg/SkSVGEllipse.h
rename to gfx/skia/skia/src/svg/SkSVGEllipse.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGFeColorMatrix.cpp b/gfx/skia/skia/src/svg/SkSVGFeColorMatrix.cpp
rename from gfx/skia/trunk/src/svg/SkSVGFeColorMatrix.cpp
rename to gfx/skia/skia/src/svg/SkSVGFeColorMatrix.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGFeColorMatrix.h b/gfx/skia/skia/src/svg/SkSVGFeColorMatrix.h
rename from gfx/skia/trunk/src/svg/SkSVGFeColorMatrix.h
rename to gfx/skia/skia/src/svg/SkSVGFeColorMatrix.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGFilter.cpp b/gfx/skia/skia/src/svg/SkSVGFilter.cpp
rename from gfx/skia/trunk/src/svg/SkSVGFilter.cpp
rename to gfx/skia/skia/src/svg/SkSVGFilter.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGFilter.h b/gfx/skia/skia/src/svg/SkSVGFilter.h
rename from gfx/skia/trunk/src/svg/SkSVGFilter.h
rename to gfx/skia/skia/src/svg/SkSVGFilter.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGG.cpp b/gfx/skia/skia/src/svg/SkSVGG.cpp
rename from gfx/skia/trunk/src/svg/SkSVGG.cpp
rename to gfx/skia/skia/src/svg/SkSVGG.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGG.h b/gfx/skia/skia/src/svg/SkSVGG.h
rename from gfx/skia/trunk/src/svg/SkSVGG.h
rename to gfx/skia/skia/src/svg/SkSVGG.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGGradient.cpp b/gfx/skia/skia/src/svg/SkSVGGradient.cpp
rename from gfx/skia/trunk/src/svg/SkSVGGradient.cpp
rename to gfx/skia/skia/src/svg/SkSVGGradient.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGGradient.h b/gfx/skia/skia/src/svg/SkSVGGradient.h
rename from gfx/skia/trunk/src/svg/SkSVGGradient.h
rename to gfx/skia/skia/src/svg/SkSVGGradient.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGGroup.cpp b/gfx/skia/skia/src/svg/SkSVGGroup.cpp
rename from gfx/skia/trunk/src/svg/SkSVGGroup.cpp
rename to gfx/skia/skia/src/svg/SkSVGGroup.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGGroup.h b/gfx/skia/skia/src/svg/SkSVGGroup.h
rename from gfx/skia/trunk/src/svg/SkSVGGroup.h
rename to gfx/skia/skia/src/svg/SkSVGGroup.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGImage.cpp b/gfx/skia/skia/src/svg/SkSVGImage.cpp
rename from gfx/skia/trunk/src/svg/SkSVGImage.cpp
rename to gfx/skia/skia/src/svg/SkSVGImage.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGImage.h b/gfx/skia/skia/src/svg/SkSVGImage.h
rename from gfx/skia/trunk/src/svg/SkSVGImage.h
rename to gfx/skia/skia/src/svg/SkSVGImage.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGLine.cpp b/gfx/skia/skia/src/svg/SkSVGLine.cpp
rename from gfx/skia/trunk/src/svg/SkSVGLine.cpp
rename to gfx/skia/skia/src/svg/SkSVGLine.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGLine.h b/gfx/skia/skia/src/svg/SkSVGLine.h
rename from gfx/skia/trunk/src/svg/SkSVGLine.h
rename to gfx/skia/skia/src/svg/SkSVGLine.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGLinearGradient.cpp b/gfx/skia/skia/src/svg/SkSVGLinearGradient.cpp
rename from gfx/skia/trunk/src/svg/SkSVGLinearGradient.cpp
rename to gfx/skia/skia/src/svg/SkSVGLinearGradient.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGLinearGradient.h b/gfx/skia/skia/src/svg/SkSVGLinearGradient.h
rename from gfx/skia/trunk/src/svg/SkSVGLinearGradient.h
rename to gfx/skia/skia/src/svg/SkSVGLinearGradient.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGMask.cpp b/gfx/skia/skia/src/svg/SkSVGMask.cpp
rename from gfx/skia/trunk/src/svg/SkSVGMask.cpp
rename to gfx/skia/skia/src/svg/SkSVGMask.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGMask.h b/gfx/skia/skia/src/svg/SkSVGMask.h
rename from gfx/skia/trunk/src/svg/SkSVGMask.h
rename to gfx/skia/skia/src/svg/SkSVGMask.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGMetadata.cpp b/gfx/skia/skia/src/svg/SkSVGMetadata.cpp
rename from gfx/skia/trunk/src/svg/SkSVGMetadata.cpp
rename to gfx/skia/skia/src/svg/SkSVGMetadata.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGMetadata.h b/gfx/skia/skia/src/svg/SkSVGMetadata.h
rename from gfx/skia/trunk/src/svg/SkSVGMetadata.h
rename to gfx/skia/skia/src/svg/SkSVGMetadata.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGPaintState.cpp b/gfx/skia/skia/src/svg/SkSVGPaintState.cpp
rename from gfx/skia/trunk/src/svg/SkSVGPaintState.cpp
rename to gfx/skia/skia/src/svg/SkSVGPaintState.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGParser.cpp b/gfx/skia/skia/src/svg/SkSVGParser.cpp
rename from gfx/skia/trunk/src/svg/SkSVGParser.cpp
rename to gfx/skia/skia/src/svg/SkSVGParser.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGPath.cpp b/gfx/skia/skia/src/svg/SkSVGPath.cpp
rename from gfx/skia/trunk/src/svg/SkSVGPath.cpp
rename to gfx/skia/skia/src/svg/SkSVGPath.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGPath.h b/gfx/skia/skia/src/svg/SkSVGPath.h
rename from gfx/skia/trunk/src/svg/SkSVGPath.h
rename to gfx/skia/skia/src/svg/SkSVGPath.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGPolygon.cpp b/gfx/skia/skia/src/svg/SkSVGPolygon.cpp
rename from gfx/skia/trunk/src/svg/SkSVGPolygon.cpp
rename to gfx/skia/skia/src/svg/SkSVGPolygon.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGPolygon.h b/gfx/skia/skia/src/svg/SkSVGPolygon.h
rename from gfx/skia/trunk/src/svg/SkSVGPolygon.h
rename to gfx/skia/skia/src/svg/SkSVGPolygon.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGPolyline.cpp b/gfx/skia/skia/src/svg/SkSVGPolyline.cpp
rename from gfx/skia/trunk/src/svg/SkSVGPolyline.cpp
rename to gfx/skia/skia/src/svg/SkSVGPolyline.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGPolyline.h b/gfx/skia/skia/src/svg/SkSVGPolyline.h
rename from gfx/skia/trunk/src/svg/SkSVGPolyline.h
rename to gfx/skia/skia/src/svg/SkSVGPolyline.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGRadialGradient.cpp b/gfx/skia/skia/src/svg/SkSVGRadialGradient.cpp
rename from gfx/skia/trunk/src/svg/SkSVGRadialGradient.cpp
rename to gfx/skia/skia/src/svg/SkSVGRadialGradient.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGRadialGradient.h b/gfx/skia/skia/src/svg/SkSVGRadialGradient.h
rename from gfx/skia/trunk/src/svg/SkSVGRadialGradient.h
rename to gfx/skia/skia/src/svg/SkSVGRadialGradient.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGRect.cpp b/gfx/skia/skia/src/svg/SkSVGRect.cpp
rename from gfx/skia/trunk/src/svg/SkSVGRect.cpp
rename to gfx/skia/skia/src/svg/SkSVGRect.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGRect.h b/gfx/skia/skia/src/svg/SkSVGRect.h
rename from gfx/skia/trunk/src/svg/SkSVGRect.h
rename to gfx/skia/skia/src/svg/SkSVGRect.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGSVG.cpp b/gfx/skia/skia/src/svg/SkSVGSVG.cpp
rename from gfx/skia/trunk/src/svg/SkSVGSVG.cpp
rename to gfx/skia/skia/src/svg/SkSVGSVG.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGSVG.h b/gfx/skia/skia/src/svg/SkSVGSVG.h
rename from gfx/skia/trunk/src/svg/SkSVGSVG.h
rename to gfx/skia/skia/src/svg/SkSVGSVG.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGStop.cpp b/gfx/skia/skia/src/svg/SkSVGStop.cpp
rename from gfx/skia/trunk/src/svg/SkSVGStop.cpp
rename to gfx/skia/skia/src/svg/SkSVGStop.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGStop.h b/gfx/skia/skia/src/svg/SkSVGStop.h
rename from gfx/skia/trunk/src/svg/SkSVGStop.h
rename to gfx/skia/skia/src/svg/SkSVGStop.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGSymbol.cpp b/gfx/skia/skia/src/svg/SkSVGSymbol.cpp
rename from gfx/skia/trunk/src/svg/SkSVGSymbol.cpp
rename to gfx/skia/skia/src/svg/SkSVGSymbol.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGSymbol.h b/gfx/skia/skia/src/svg/SkSVGSymbol.h
rename from gfx/skia/trunk/src/svg/SkSVGSymbol.h
rename to gfx/skia/skia/src/svg/SkSVGSymbol.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGText.cpp b/gfx/skia/skia/src/svg/SkSVGText.cpp
rename from gfx/skia/trunk/src/svg/SkSVGText.cpp
rename to gfx/skia/skia/src/svg/SkSVGText.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGText.h b/gfx/skia/skia/src/svg/SkSVGText.h
rename from gfx/skia/trunk/src/svg/SkSVGText.h
rename to gfx/skia/skia/src/svg/SkSVGText.h
diff --git a/gfx/skia/trunk/src/svg/SkSVGUse.cpp b/gfx/skia/skia/src/svg/SkSVGUse.cpp
rename from gfx/skia/trunk/src/svg/SkSVGUse.cpp
rename to gfx/skia/skia/src/svg/SkSVGUse.cpp
diff --git a/gfx/skia/trunk/src/svg/SkSVGUse.h b/gfx/skia/skia/src/svg/SkSVGUse.h
rename from gfx/skia/trunk/src/svg/SkSVGUse.h
rename to gfx/skia/skia/src/svg/SkSVGUse.h
diff --git a/gfx/skia/trunk/src/utils/SkBase64.cpp b/gfx/skia/skia/src/utils/SkBase64.cpp
rename from gfx/skia/trunk/src/utils/SkBase64.cpp
rename to gfx/skia/skia/src/utils/SkBase64.cpp
diff --git a/gfx/skia/trunk/src/utils/SkBase64.h b/gfx/skia/skia/src/utils/SkBase64.h
rename from gfx/skia/trunk/src/utils/SkBase64.h
rename to gfx/skia/skia/src/utils/SkBase64.h
diff --git a/gfx/skia/trunk/src/utils/SkBitSet.cpp b/gfx/skia/skia/src/utils/SkBitSet.cpp
rename from gfx/skia/trunk/src/utils/SkBitSet.cpp
rename to gfx/skia/skia/src/utils/SkBitSet.cpp
diff --git a/gfx/skia/trunk/src/utils/SkBitSet.h b/gfx/skia/skia/src/utils/SkBitSet.h
rename from gfx/skia/trunk/src/utils/SkBitSet.h
rename to gfx/skia/skia/src/utils/SkBitSet.h
diff --git a/gfx/skia/trunk/src/utils/SkBitmapHasher.cpp b/gfx/skia/skia/src/utils/SkBitmapHasher.cpp
rename from gfx/skia/trunk/src/utils/SkBitmapHasher.cpp
rename to gfx/skia/skia/src/utils/SkBitmapHasher.cpp
diff --git a/gfx/skia/trunk/src/utils/SkBitmapHasher.h b/gfx/skia/skia/src/utils/SkBitmapHasher.h
rename from gfx/skia/trunk/src/utils/SkBitmapHasher.h
rename to gfx/skia/skia/src/utils/SkBitmapHasher.h
diff --git a/gfx/skia/trunk/src/utils/SkBoundaryPatch.cpp b/gfx/skia/skia/src/utils/SkBoundaryPatch.cpp
rename from gfx/skia/trunk/src/utils/SkBoundaryPatch.cpp
rename to gfx/skia/skia/src/utils/SkBoundaryPatch.cpp
diff --git a/gfx/skia/trunk/src/utils/SkCamera.cpp b/gfx/skia/skia/src/utils/SkCamera.cpp
rename from gfx/skia/trunk/src/utils/SkCamera.cpp
rename to gfx/skia/skia/src/utils/SkCamera.cpp
diff --git a/gfx/skia/trunk/src/utils/SkCanvasStack.cpp b/gfx/skia/skia/src/utils/SkCanvasStack.cpp
rename from gfx/skia/trunk/src/utils/SkCanvasStack.cpp
rename to gfx/skia/skia/src/utils/SkCanvasStack.cpp
diff --git a/gfx/skia/trunk/src/utils/SkCanvasStack.h b/gfx/skia/skia/src/utils/SkCanvasStack.h
rename from gfx/skia/trunk/src/utils/SkCanvasStack.h
rename to gfx/skia/skia/src/utils/SkCanvasStack.h
diff --git a/gfx/skia/trunk/src/utils/SkCanvasStateUtils.cpp b/gfx/skia/skia/src/utils/SkCanvasStateUtils.cpp
rename from gfx/skia/trunk/src/utils/SkCanvasStateUtils.cpp
rename to gfx/skia/skia/src/utils/SkCanvasStateUtils.cpp
diff --git a/gfx/skia/trunk/src/utils/SkCondVar.cpp b/gfx/skia/skia/src/utils/SkCondVar.cpp
rename from gfx/skia/trunk/src/utils/SkCondVar.cpp
rename to gfx/skia/skia/src/utils/SkCondVar.cpp
diff --git a/gfx/skia/trunk/src/utils/SkCubicInterval.cpp b/gfx/skia/skia/src/utils/SkCubicInterval.cpp
rename from gfx/skia/trunk/src/utils/SkCubicInterval.cpp
rename to gfx/skia/skia/src/utils/SkCubicInterval.cpp
diff --git a/gfx/skia/trunk/src/utils/SkCullPoints.cpp b/gfx/skia/skia/src/utils/SkCullPoints.cpp
rename from gfx/skia/trunk/src/utils/SkCullPoints.cpp
rename to gfx/skia/skia/src/utils/SkCullPoints.cpp
diff --git a/gfx/skia/trunk/src/utils/SkDashPath.cpp b/gfx/skia/skia/src/utils/SkDashPath.cpp
rename from gfx/skia/trunk/src/utils/SkDashPath.cpp
rename to gfx/skia/skia/src/utils/SkDashPath.cpp
diff --git a/gfx/skia/trunk/src/utils/SkDashPathPriv.h b/gfx/skia/skia/src/utils/SkDashPathPriv.h
rename from gfx/skia/trunk/src/utils/SkDashPathPriv.h
rename to gfx/skia/skia/src/utils/SkDashPathPriv.h
diff --git a/gfx/skia/trunk/src/utils/SkDeferredCanvas.cpp b/gfx/skia/skia/src/utils/SkDeferredCanvas.cpp
rename from gfx/skia/trunk/src/utils/SkDeferredCanvas.cpp
rename to gfx/skia/skia/src/utils/SkDeferredCanvas.cpp
diff --git a/gfx/skia/trunk/src/utils/SkDumpCanvas.cpp b/gfx/skia/skia/src/utils/SkDumpCanvas.cpp
rename from gfx/skia/trunk/src/utils/SkDumpCanvas.cpp
rename to gfx/skia/skia/src/utils/SkDumpCanvas.cpp
diff --git a/gfx/skia/trunk/src/utils/SkEventTracer.cpp b/gfx/skia/skia/src/utils/SkEventTracer.cpp
rename from gfx/skia/trunk/src/utils/SkEventTracer.cpp
rename to gfx/skia/skia/src/utils/SkEventTracer.cpp
diff --git a/gfx/skia/trunk/src/utils/SkFloatUtils.h b/gfx/skia/skia/src/utils/SkFloatUtils.h
rename from gfx/skia/trunk/src/utils/SkFloatUtils.h
rename to gfx/skia/skia/src/utils/SkFloatUtils.h
diff --git a/gfx/skia/trunk/src/utils/SkFrontBufferedStream.cpp b/gfx/skia/skia/src/utils/SkFrontBufferedStream.cpp
rename from gfx/skia/trunk/src/utils/SkFrontBufferedStream.cpp
rename to gfx/skia/skia/src/utils/SkFrontBufferedStream.cpp
diff --git a/gfx/skia/trunk/src/utils/SkGatherPixelRefsAndRects.cpp b/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.cpp
rename from gfx/skia/trunk/src/utils/SkGatherPixelRefsAndRects.cpp
rename to gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.cpp
diff --git a/gfx/skia/trunk/src/utils/SkGatherPixelRefsAndRects.h b/gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.h
rename from gfx/skia/trunk/src/utils/SkGatherPixelRefsAndRects.h
rename to gfx/skia/skia/src/utils/SkGatherPixelRefsAndRects.h
diff --git a/gfx/skia/trunk/src/utils/SkInterpolator.cpp b/gfx/skia/skia/src/utils/SkInterpolator.cpp
rename from gfx/skia/trunk/src/utils/SkInterpolator.cpp
rename to gfx/skia/skia/src/utils/SkInterpolator.cpp
diff --git a/gfx/skia/trunk/src/utils/SkLayer.cpp b/gfx/skia/skia/src/utils/SkLayer.cpp
rename from gfx/skia/trunk/src/utils/SkLayer.cpp
rename to gfx/skia/skia/src/utils/SkLayer.cpp
diff --git a/gfx/skia/trunk/src/utils/SkLua.cpp b/gfx/skia/skia/src/utils/SkLua.cpp
rename from gfx/skia/trunk/src/utils/SkLua.cpp
rename to gfx/skia/skia/src/utils/SkLua.cpp
diff --git a/gfx/skia/trunk/src/utils/SkLuaCanvas.cpp b/gfx/skia/skia/src/utils/SkLuaCanvas.cpp
rename from gfx/skia/trunk/src/utils/SkLuaCanvas.cpp
rename to gfx/skia/skia/src/utils/SkLuaCanvas.cpp
diff --git a/gfx/skia/trunk/src/utils/SkMD5.cpp b/gfx/skia/skia/src/utils/SkMD5.cpp
rename from gfx/skia/trunk/src/utils/SkMD5.cpp
rename to gfx/skia/skia/src/utils/SkMD5.cpp
diff --git a/gfx/skia/trunk/src/utils/SkMD5.h b/gfx/skia/skia/src/utils/SkMD5.h
rename from gfx/skia/trunk/src/utils/SkMD5.h
rename to gfx/skia/skia/src/utils/SkMD5.h
diff --git a/gfx/skia/trunk/src/utils/SkMatrix22.cpp b/gfx/skia/skia/src/utils/SkMatrix22.cpp
rename from gfx/skia/trunk/src/utils/SkMatrix22.cpp
rename to gfx/skia/skia/src/utils/SkMatrix22.cpp
diff --git a/gfx/skia/trunk/src/utils/SkMatrix22.h b/gfx/skia/skia/src/utils/SkMatrix22.h
rename from gfx/skia/trunk/src/utils/SkMatrix22.h
rename to gfx/skia/skia/src/utils/SkMatrix22.h
diff --git a/gfx/skia/trunk/src/utils/SkMatrix44.cpp b/gfx/skia/skia/src/utils/SkMatrix44.cpp
rename from gfx/skia/trunk/src/utils/SkMatrix44.cpp
rename to gfx/skia/skia/src/utils/SkMatrix44.cpp
diff --git a/gfx/skia/trunk/src/utils/SkMeshUtils.cpp b/gfx/skia/skia/src/utils/SkMeshUtils.cpp
rename from gfx/skia/trunk/src/utils/SkMeshUtils.cpp
rename to gfx/skia/skia/src/utils/SkMeshUtils.cpp
diff --git a/gfx/skia/trunk/src/utils/SkNWayCanvas.cpp b/gfx/skia/skia/src/utils/SkNWayCanvas.cpp
rename from gfx/skia/trunk/src/utils/SkNWayCanvas.cpp
rename to gfx/skia/skia/src/utils/SkNWayCanvas.cpp
diff --git a/gfx/skia/trunk/src/utils/SkNinePatch.cpp b/gfx/skia/skia/src/utils/SkNinePatch.cpp
rename from gfx/skia/trunk/src/utils/SkNinePatch.cpp
rename to gfx/skia/skia/src/utils/SkNinePatch.cpp
diff --git a/gfx/skia/trunk/src/utils/SkNullCanvas.cpp b/gfx/skia/skia/src/utils/SkNullCanvas.cpp
rename from gfx/skia/trunk/src/utils/SkNullCanvas.cpp
rename to gfx/skia/skia/src/utils/SkNullCanvas.cpp
diff --git a/gfx/skia/trunk/src/utils/SkOSFile.cpp b/gfx/skia/skia/src/utils/SkOSFile.cpp
rename from gfx/skia/trunk/src/utils/SkOSFile.cpp
rename to gfx/skia/skia/src/utils/SkOSFile.cpp
diff --git a/gfx/skia/trunk/src/utils/SkPDFRasterizer.cpp b/gfx/skia/skia/src/utils/SkPDFRasterizer.cpp
rename from gfx/skia/trunk/src/utils/SkPDFRasterizer.cpp
rename to gfx/skia/skia/src/utils/SkPDFRasterizer.cpp
diff --git a/gfx/skia/trunk/src/utils/SkPDFRasterizer.h b/gfx/skia/skia/src/utils/SkPDFRasterizer.h
rename from gfx/skia/trunk/src/utils/SkPDFRasterizer.h
rename to gfx/skia/skia/src/utils/SkPDFRasterizer.h
diff --git a/gfx/skia/trunk/src/utils/SkParse.cpp b/gfx/skia/skia/src/utils/SkParse.cpp
rename from gfx/skia/trunk/src/utils/SkParse.cpp
rename to gfx/skia/skia/src/utils/SkParse.cpp
diff --git a/gfx/skia/trunk/src/utils/SkParseColor.cpp b/gfx/skia/skia/src/utils/SkParseColor.cpp
rename from gfx/skia/trunk/src/utils/SkParseColor.cpp
rename to gfx/skia/skia/src/utils/SkParseColor.cpp
diff --git a/gfx/skia/trunk/src/utils/SkParsePath.cpp b/gfx/skia/skia/src/utils/SkParsePath.cpp
rename from gfx/skia/trunk/src/utils/SkParsePath.cpp
rename to gfx/skia/skia/src/utils/SkParsePath.cpp
diff --git a/gfx/skia/trunk/src/utils/SkPathUtils.cpp b/gfx/skia/skia/src/utils/SkPathUtils.cpp
rename from gfx/skia/trunk/src/utils/SkPathUtils.cpp
rename to gfx/skia/skia/src/utils/SkPathUtils.cpp
diff --git a/gfx/skia/trunk/src/utils/SkPictureUtils.cpp b/gfx/skia/skia/src/utils/SkPictureUtils.cpp
rename from gfx/skia/trunk/src/utils/SkPictureUtils.cpp
rename to gfx/skia/skia/src/utils/SkPictureUtils.cpp
diff --git a/gfx/skia/trunk/src/utils/SkProxyCanvas.cpp b/gfx/skia/skia/src/utils/SkProxyCanvas.cpp
rename from gfx/skia/trunk/src/utils/SkProxyCanvas.cpp
rename to gfx/skia/skia/src/utils/SkProxyCanvas.cpp
diff --git a/gfx/skia/trunk/src/utils/SkRTConf.cpp b/gfx/skia/skia/src/utils/SkRTConf.cpp
rename from gfx/skia/trunk/src/utils/SkRTConf.cpp
rename to gfx/skia/skia/src/utils/SkRTConf.cpp
diff --git a/gfx/skia/trunk/src/utils/SkSHA1.cpp b/gfx/skia/skia/src/utils/SkSHA1.cpp
rename from gfx/skia/trunk/src/utils/SkSHA1.cpp
rename to gfx/skia/skia/src/utils/SkSHA1.cpp
diff --git a/gfx/skia/trunk/src/utils/SkSHA1.h b/gfx/skia/skia/src/utils/SkSHA1.h
rename from gfx/skia/trunk/src/utils/SkSHA1.h
rename to gfx/skia/skia/src/utils/SkSHA1.h
diff --git a/gfx/skia/trunk/src/utils/SkTFitsIn.h b/gfx/skia/skia/src/utils/SkTFitsIn.h
rename from gfx/skia/trunk/src/utils/SkTFitsIn.h
rename to gfx/skia/skia/src/utils/SkTFitsIn.h
diff --git a/gfx/skia/trunk/src/utils/SkTLogic.h b/gfx/skia/skia/src/utils/SkTLogic.h
rename from gfx/skia/trunk/src/utils/SkTLogic.h
rename to gfx/skia/skia/src/utils/SkTLogic.h
diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor.cpp
rename from gfx/skia/trunk/src/utils/SkTextureCompressor.cpp
rename to gfx/skia/skia/src/utils/SkTextureCompressor.cpp
diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor.h b/gfx/skia/skia/src/utils/SkTextureCompressor.h
rename from gfx/skia/trunk/src/utils/SkTextureCompressor.h
rename to gfx/skia/skia/src/utils/SkTextureCompressor.h
diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_ASTC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.cpp
rename from gfx/skia/trunk/src/utils/SkTextureCompressor_ASTC.cpp
rename to gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.cpp
diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_ASTC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.h
rename from gfx/skia/trunk/src/utils/SkTextureCompressor_ASTC.h
rename to gfx/skia/skia/src/utils/SkTextureCompressor_ASTC.h
diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_LATC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.cpp
rename from gfx/skia/trunk/src/utils/SkTextureCompressor_LATC.cpp
rename to gfx/skia/skia/src/utils/SkTextureCompressor_LATC.cpp
diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_LATC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_LATC.h
rename from gfx/skia/trunk/src/utils/SkTextureCompressor_LATC.h
rename to gfx/skia/skia/src/utils/SkTextureCompressor_LATC.h
diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_R11EAC.cpp b/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.cpp
rename from gfx/skia/trunk/src/utils/SkTextureCompressor_R11EAC.cpp
rename to gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.cpp
diff --git a/gfx/skia/trunk/src/utils/SkTextureCompressor_R11EAC.h b/gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.h
rename from gfx/skia/trunk/src/utils/SkTextureCompressor_R11EAC.h
rename to gfx/skia/skia/src/utils/SkTextureCompressor_R11EAC.h
diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils.h b/gfx/skia/skia/src/utils/SkThreadUtils.h
rename from gfx/skia/trunk/src/utils/SkThreadUtils.h
rename to gfx/skia/skia/src/utils/SkThreadUtils.h
diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread.cpp
rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread.cpp
rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread.cpp
diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread.h b/gfx/skia/skia/src/utils/SkThreadUtils_pthread.h
rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread.h
rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread.h
diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread_linux.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread_linux.cpp
rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread_linux.cpp
rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread_linux.cpp
diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread_mach.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread_mach.cpp
rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread_mach.cpp
rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread_mach.cpp
diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_pthread_other.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_pthread_other.cpp
rename from gfx/skia/trunk/src/utils/SkThreadUtils_pthread_other.cpp
rename to gfx/skia/skia/src/utils/SkThreadUtils_pthread_other.cpp
diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_win.cpp b/gfx/skia/skia/src/utils/SkThreadUtils_win.cpp
rename from gfx/skia/trunk/src/utils/SkThreadUtils_win.cpp
rename to gfx/skia/skia/src/utils/SkThreadUtils_win.cpp
diff --git a/gfx/skia/trunk/src/utils/SkThreadUtils_win.h b/gfx/skia/skia/src/utils/SkThreadUtils_win.h
rename from gfx/skia/trunk/src/utils/SkThreadUtils_win.h
rename to gfx/skia/skia/src/utils/SkThreadUtils_win.h
diff --git a/gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.cpp b/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.cpp
rename from gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.cpp
rename to gfx/skia/skia/src/utils/debugger/SkDebugCanvas.cpp
diff --git a/gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.h b/gfx/skia/skia/src/utils/debugger/SkDebugCanvas.h
rename from gfx/skia/trunk/src/utils/debugger/SkDebugCanvas.h
rename to gfx/skia/skia/src/utils/debugger/SkDebugCanvas.h
diff --git a/gfx/skia/trunk/src/utils/debugger/SkDrawCommand.cpp b/gfx/skia/skia/src/utils/debugger/SkDrawCommand.cpp
rename from gfx/skia/trunk/src/utils/debugger/SkDrawCommand.cpp
rename to gfx/skia/skia/src/utils/debugger/SkDrawCommand.cpp
diff --git a/gfx/skia/trunk/src/utils/debugger/SkDrawCommand.h b/gfx/skia/skia/src/utils/debugger/SkDrawCommand.h
rename from gfx/skia/trunk/src/utils/debugger/SkDrawCommand.h
rename to gfx/skia/skia/src/utils/debugger/SkDrawCommand.h
diff --git a/gfx/skia/trunk/src/utils/debugger/SkObjectParser.cpp b/gfx/skia/skia/src/utils/debugger/SkObjectParser.cpp
rename from gfx/skia/trunk/src/utils/debugger/SkObjectParser.cpp
rename to gfx/skia/skia/src/utils/debugger/SkObjectParser.cpp
diff --git a/gfx/skia/trunk/src/utils/debugger/SkObjectParser.h b/gfx/skia/skia/src/utils/debugger/SkObjectParser.h
rename from gfx/skia/trunk/src/utils/debugger/SkObjectParser.h
rename to gfx/skia/skia/src/utils/debugger/SkObjectParser.h
diff --git a/gfx/skia/trunk/src/utils/ios/SkFontHost_iOS.mm b/gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm
rename from gfx/skia/trunk/src/utils/ios/SkFontHost_iOS.mm
rename to gfx/skia/skia/src/utils/ios/SkFontHost_iOS.mm
diff --git a/gfx/skia/trunk/src/utils/ios/SkImageDecoder_iOS.mm b/gfx/skia/skia/src/utils/ios/SkImageDecoder_iOS.mm
rename from gfx/skia/trunk/src/utils/ios/SkImageDecoder_iOS.mm
rename to gfx/skia/skia/src/utils/ios/SkImageDecoder_iOS.mm
diff --git a/gfx/skia/trunk/src/utils/ios/SkOSFile_iOS.mm b/gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm
rename from gfx/skia/trunk/src/utils/ios/SkOSFile_iOS.mm
rename to gfx/skia/skia/src/utils/ios/SkOSFile_iOS.mm
diff --git a/gfx/skia/trunk/src/utils/ios/SkStream_NSData.mm b/gfx/skia/skia/src/utils/ios/SkStream_NSData.mm
rename from gfx/skia/trunk/src/utils/ios/SkStream_NSData.mm
rename to gfx/skia/skia/src/utils/ios/SkStream_NSData.mm
diff --git a/gfx/skia/trunk/src/utils/mac/SkCreateCGImageRef.cpp b/gfx/skia/skia/src/utils/mac/SkCreateCGImageRef.cpp
rename from gfx/skia/trunk/src/utils/mac/SkCreateCGImageRef.cpp
rename to gfx/skia/skia/src/utils/mac/SkCreateCGImageRef.cpp
diff --git a/gfx/skia/trunk/src/utils/mac/SkStream_mac.cpp b/gfx/skia/skia/src/utils/mac/SkStream_mac.cpp
rename from gfx/skia/trunk/src/utils/mac/SkStream_mac.cpp
rename to gfx/skia/skia/src/utils/mac/SkStream_mac.cpp
diff --git a/gfx/skia/trunk/src/utils/win/SkAutoCoInitialize.cpp b/gfx/skia/skia/src/utils/win/SkAutoCoInitialize.cpp
rename from gfx/skia/trunk/src/utils/win/SkAutoCoInitialize.cpp
rename to gfx/skia/skia/src/utils/win/SkAutoCoInitialize.cpp
diff --git a/gfx/skia/trunk/src/utils/win/SkDWrite.cpp b/gfx/skia/skia/src/utils/win/SkDWrite.cpp
rename from gfx/skia/trunk/src/utils/win/SkDWrite.cpp
rename to gfx/skia/skia/src/utils/win/SkDWrite.cpp
diff --git a/gfx/skia/trunk/src/utils/win/SkDWrite.h b/gfx/skia/skia/src/utils/win/SkDWrite.h
rename from gfx/skia/trunk/src/utils/win/SkDWrite.h
rename to gfx/skia/skia/src/utils/win/SkDWrite.h
diff --git a/gfx/skia/trunk/src/utils/win/SkDWriteFontFileStream.cpp b/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.cpp
rename from gfx/skia/trunk/src/utils/win/SkDWriteFontFileStream.cpp
rename to gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.cpp
diff --git a/gfx/skia/trunk/src/utils/win/SkDWriteFontFileStream.h b/gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.h
rename from gfx/skia/trunk/src/utils/win/SkDWriteFontFileStream.h
rename to gfx/skia/skia/src/utils/win/SkDWriteFontFileStream.h
diff --git a/gfx/skia/trunk/src/utils/win/SkDWriteGeometrySink.cpp b/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.cpp
rename from gfx/skia/trunk/src/utils/win/SkDWriteGeometrySink.cpp
rename to gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.cpp
diff --git a/gfx/skia/trunk/src/utils/win/SkDWriteGeometrySink.h b/gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.h
rename from gfx/skia/trunk/src/utils/win/SkDWriteGeometrySink.h
rename to gfx/skia/skia/src/utils/win/SkDWriteGeometrySink.h
diff --git a/gfx/skia/trunk/src/utils/win/SkHRESULT.cpp b/gfx/skia/skia/src/utils/win/SkHRESULT.cpp
rename from gfx/skia/trunk/src/utils/win/SkHRESULT.cpp
rename to gfx/skia/skia/src/utils/win/SkHRESULT.cpp
diff --git a/gfx/skia/trunk/src/utils/win/SkIStream.cpp b/gfx/skia/skia/src/utils/win/SkIStream.cpp
rename from gfx/skia/trunk/src/utils/win/SkIStream.cpp
rename to gfx/skia/skia/src/utils/win/SkIStream.cpp
diff --git a/gfx/skia/trunk/src/utils/win/SkWGL_win.cpp b/gfx/skia/skia/src/utils/win/SkWGL_win.cpp
rename from gfx/skia/trunk/src/utils/win/SkWGL_win.cpp
rename to gfx/skia/skia/src/utils/win/SkWGL_win.cpp
diff --git a/gfx/skia/trunk/src/views/SkBGViewArtist.cpp b/gfx/skia/skia/src/views/SkBGViewArtist.cpp
rename from gfx/skia/trunk/src/views/SkBGViewArtist.cpp
rename to gfx/skia/skia/src/views/SkBGViewArtist.cpp
diff --git a/gfx/skia/trunk/src/views/SkEvent.cpp b/gfx/skia/skia/src/views/SkEvent.cpp
rename from gfx/skia/trunk/src/views/SkEvent.cpp
rename to gfx/skia/skia/src/views/SkEvent.cpp
diff --git a/gfx/skia/trunk/src/views/SkEventSink.cpp b/gfx/skia/skia/src/views/SkEventSink.cpp
rename from gfx/skia/trunk/src/views/SkEventSink.cpp
rename to gfx/skia/skia/src/views/SkEventSink.cpp
diff --git a/gfx/skia/trunk/src/views/SkOSMenu.cpp b/gfx/skia/skia/src/views/SkOSMenu.cpp
rename from gfx/skia/trunk/src/views/SkOSMenu.cpp
rename to gfx/skia/skia/src/views/SkOSMenu.cpp
diff --git a/gfx/skia/trunk/src/views/SkParsePaint.cpp b/gfx/skia/skia/src/views/SkParsePaint.cpp
rename from gfx/skia/trunk/src/views/SkParsePaint.cpp
rename to gfx/skia/skia/src/views/SkParsePaint.cpp
diff --git a/gfx/skia/trunk/src/views/SkProgressView.cpp b/gfx/skia/skia/src/views/SkProgressView.cpp
rename from gfx/skia/trunk/src/views/SkProgressView.cpp
rename to gfx/skia/skia/src/views/SkProgressView.cpp
diff --git a/gfx/skia/trunk/src/views/SkStackViewLayout.cpp b/gfx/skia/skia/src/views/SkStackViewLayout.cpp
rename from gfx/skia/trunk/src/views/SkStackViewLayout.cpp
rename to gfx/skia/skia/src/views/SkStackViewLayout.cpp
diff --git a/gfx/skia/trunk/src/views/SkTagList.cpp b/gfx/skia/skia/src/views/SkTagList.cpp
rename from gfx/skia/trunk/src/views/SkTagList.cpp
rename to gfx/skia/skia/src/views/SkTagList.cpp
diff --git a/gfx/skia/trunk/src/views/SkTagList.h b/gfx/skia/skia/src/views/SkTagList.h
rename from gfx/skia/trunk/src/views/SkTagList.h
rename to gfx/skia/skia/src/views/SkTagList.h
diff --git a/gfx/skia/trunk/src/views/SkTextBox.cpp b/gfx/skia/skia/src/views/SkTextBox.cpp
rename from gfx/skia/trunk/src/views/SkTextBox.cpp
rename to gfx/skia/skia/src/views/SkTextBox.cpp
diff --git a/gfx/skia/trunk/src/views/SkTouchGesture.cpp b/gfx/skia/skia/src/views/SkTouchGesture.cpp
rename from gfx/skia/trunk/src/views/SkTouchGesture.cpp
rename to gfx/skia/skia/src/views/SkTouchGesture.cpp
diff --git a/gfx/skia/trunk/src/views/SkView.cpp b/gfx/skia/skia/src/views/SkView.cpp
rename from gfx/skia/trunk/src/views/SkView.cpp
rename to gfx/skia/skia/src/views/SkView.cpp
diff --git a/gfx/skia/trunk/src/views/SkViewInflate.cpp b/gfx/skia/skia/src/views/SkViewInflate.cpp
rename from gfx/skia/trunk/src/views/SkViewInflate.cpp
rename to gfx/skia/skia/src/views/SkViewInflate.cpp
diff --git a/gfx/skia/trunk/src/views/SkViewPriv.cpp b/gfx/skia/skia/src/views/SkViewPriv.cpp
rename from gfx/skia/trunk/src/views/SkViewPriv.cpp
rename to gfx/skia/skia/src/views/SkViewPriv.cpp
diff --git a/gfx/skia/trunk/src/views/SkViewPriv.h b/gfx/skia/skia/src/views/SkViewPriv.h
rename from gfx/skia/trunk/src/views/SkViewPriv.h
rename to gfx/skia/skia/src/views/SkViewPriv.h
diff --git a/gfx/skia/trunk/src/views/SkWidgets.cpp b/gfx/skia/skia/src/views/SkWidgets.cpp
rename from gfx/skia/trunk/src/views/SkWidgets.cpp
rename to gfx/skia/skia/src/views/SkWidgets.cpp
diff --git a/gfx/skia/trunk/src/views/SkWindow.cpp b/gfx/skia/skia/src/views/SkWindow.cpp
rename from gfx/skia/trunk/src/views/SkWindow.cpp
rename to gfx/skia/skia/src/views/SkWindow.cpp
diff --git a/gfx/skia/trunk/src/views/animated/SkBorderView.cpp b/gfx/skia/skia/src/views/animated/SkBorderView.cpp
rename from gfx/skia/trunk/src/views/animated/SkBorderView.cpp
rename to gfx/skia/skia/src/views/animated/SkBorderView.cpp
diff --git a/gfx/skia/trunk/src/views/animated/SkImageView.cpp b/gfx/skia/skia/src/views/animated/SkImageView.cpp
rename from gfx/skia/trunk/src/views/animated/SkImageView.cpp
rename to gfx/skia/skia/src/views/animated/SkImageView.cpp
diff --git a/gfx/skia/trunk/src/views/animated/SkProgressBarView.cpp b/gfx/skia/skia/src/views/animated/SkProgressBarView.cpp
rename from gfx/skia/trunk/src/views/animated/SkProgressBarView.cpp
rename to gfx/skia/skia/src/views/animated/SkProgressBarView.cpp
diff --git a/gfx/skia/trunk/src/views/animated/SkScrollBarView.cpp b/gfx/skia/skia/src/views/animated/SkScrollBarView.cpp
rename from gfx/skia/trunk/src/views/animated/SkScrollBarView.cpp
rename to gfx/skia/skia/src/views/animated/SkScrollBarView.cpp
diff --git a/gfx/skia/trunk/src/views/animated/SkStaticTextView.cpp b/gfx/skia/skia/src/views/animated/SkStaticTextView.cpp
rename from gfx/skia/trunk/src/views/animated/SkStaticTextView.cpp
rename to gfx/skia/skia/src/views/animated/SkStaticTextView.cpp
diff --git a/gfx/skia/trunk/src/views/animated/SkWidgetViews.cpp b/gfx/skia/skia/src/views/animated/SkWidgetViews.cpp
rename from gfx/skia/trunk/src/views/animated/SkWidgetViews.cpp
rename to gfx/skia/skia/src/views/animated/SkWidgetViews.cpp
diff --git a/gfx/skia/trunk/src/views/ios/SkOSWindow_iOS.mm b/gfx/skia/skia/src/views/ios/SkOSWindow_iOS.mm
rename from gfx/skia/trunk/src/views/ios/SkOSWindow_iOS.mm
rename to gfx/skia/skia/src/views/ios/SkOSWindow_iOS.mm
diff --git a/gfx/skia/trunk/src/views/mac/SampleApp-Info.plist b/gfx/skia/skia/src/views/mac/SampleApp-Info.plist
rename from gfx/skia/trunk/src/views/mac/SampleApp-Info.plist
rename to gfx/skia/skia/src/views/mac/SampleApp-Info.plist
diff --git a/gfx/skia/trunk/src/views/mac/SampleApp.xib b/gfx/skia/skia/src/views/mac/SampleApp.xib
rename from gfx/skia/trunk/src/views/mac/SampleApp.xib
rename to gfx/skia/skia/src/views/mac/SampleApp.xib
diff --git a/gfx/skia/trunk/src/views/mac/SampleAppDelegate.h b/gfx/skia/skia/src/views/mac/SampleAppDelegate.h
rename from gfx/skia/trunk/src/views/mac/SampleAppDelegate.h
rename to gfx/skia/skia/src/views/mac/SampleAppDelegate.h
diff --git a/gfx/skia/trunk/src/views/mac/SampleAppDelegate.mm b/gfx/skia/skia/src/views/mac/SampleAppDelegate.mm
rename from gfx/skia/trunk/src/views/mac/SampleAppDelegate.mm
rename to gfx/skia/skia/src/views/mac/SampleAppDelegate.mm
diff --git a/gfx/skia/trunk/src/views/mac/SkEventNotifier.h b/gfx/skia/skia/src/views/mac/SkEventNotifier.h
rename from gfx/skia/trunk/src/views/mac/SkEventNotifier.h
rename to gfx/skia/skia/src/views/mac/SkEventNotifier.h
diff --git a/gfx/skia/trunk/src/views/mac/SkEventNotifier.mm b/gfx/skia/skia/src/views/mac/SkEventNotifier.mm
rename from gfx/skia/trunk/src/views/mac/SkEventNotifier.mm
rename to gfx/skia/skia/src/views/mac/SkEventNotifier.mm
diff --git a/gfx/skia/trunk/src/views/mac/SkNSView.h b/gfx/skia/skia/src/views/mac/SkNSView.h
rename from gfx/skia/trunk/src/views/mac/SkNSView.h
rename to gfx/skia/skia/src/views/mac/SkNSView.h
diff --git a/gfx/skia/trunk/src/views/mac/SkNSView.mm b/gfx/skia/skia/src/views/mac/SkNSView.mm
rename from gfx/skia/trunk/src/views/mac/SkNSView.mm
rename to gfx/skia/skia/src/views/mac/SkNSView.mm
diff --git a/gfx/skia/trunk/src/views/mac/SkOSWindow_Mac.cpp b/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.cpp
rename from gfx/skia/trunk/src/views/mac/SkOSWindow_Mac.cpp
rename to gfx/skia/skia/src/views/mac/SkOSWindow_Mac.cpp
diff --git a/gfx/skia/trunk/src/views/mac/SkOSWindow_Mac.mm b/gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm
rename from gfx/skia/trunk/src/views/mac/SkOSWindow_Mac.mm
rename to gfx/skia/skia/src/views/mac/SkOSWindow_Mac.mm
diff --git a/gfx/skia/trunk/src/views/mac/SkOptionsTableView.h b/gfx/skia/skia/src/views/mac/SkOptionsTableView.h
rename from gfx/skia/trunk/src/views/mac/SkOptionsTableView.h
rename to gfx/skia/skia/src/views/mac/SkOptionsTableView.h
diff --git a/gfx/skia/trunk/src/views/mac/SkOptionsTableView.mm b/gfx/skia/skia/src/views/mac/SkOptionsTableView.mm
rename from gfx/skia/trunk/src/views/mac/SkOptionsTableView.mm
rename to gfx/skia/skia/src/views/mac/SkOptionsTableView.mm
diff --git a/gfx/skia/trunk/src/views/mac/SkSampleNSView.h b/gfx/skia/skia/src/views/mac/SkSampleNSView.h
rename from gfx/skia/trunk/src/views/mac/SkSampleNSView.h
rename to gfx/skia/skia/src/views/mac/SkSampleNSView.h
diff --git a/gfx/skia/trunk/src/views/mac/SkSampleNSView.mm b/gfx/skia/skia/src/views/mac/SkSampleNSView.mm
rename from gfx/skia/trunk/src/views/mac/SkSampleNSView.mm
rename to gfx/skia/skia/src/views/mac/SkSampleNSView.mm
diff --git a/gfx/skia/trunk/src/views/mac/SkTextFieldCell.h b/gfx/skia/skia/src/views/mac/SkTextFieldCell.h
rename from gfx/skia/trunk/src/views/mac/SkTextFieldCell.h
rename to gfx/skia/skia/src/views/mac/SkTextFieldCell.h
diff --git a/gfx/skia/trunk/src/views/mac/SkTextFieldCell.m b/gfx/skia/skia/src/views/mac/SkTextFieldCell.m
rename from gfx/skia/trunk/src/views/mac/SkTextFieldCell.m
rename to gfx/skia/skia/src/views/mac/SkTextFieldCell.m
diff --git a/gfx/skia/trunk/src/views/mac/skia_mac.mm b/gfx/skia/skia/src/views/mac/skia_mac.mm
rename from gfx/skia/trunk/src/views/mac/skia_mac.mm
rename to gfx/skia/skia/src/views/mac/skia_mac.mm
diff --git a/gfx/skia/trunk/src/views/sdl/SkOSWindow_SDL.cpp b/gfx/skia/skia/src/views/sdl/SkOSWindow_SDL.cpp
rename from gfx/skia/trunk/src/views/sdl/SkOSWindow_SDL.cpp
rename to gfx/skia/skia/src/views/sdl/SkOSWindow_SDL.cpp
diff --git a/gfx/skia/trunk/src/views/unix/SkOSWindow_Unix.cpp b/gfx/skia/skia/src/views/unix/SkOSWindow_Unix.cpp
rename from gfx/skia/trunk/src/views/unix/SkOSWindow_Unix.cpp
rename to gfx/skia/skia/src/views/unix/SkOSWindow_Unix.cpp
diff --git a/gfx/skia/trunk/src/views/unix/keysym2ucs.c b/gfx/skia/skia/src/views/unix/keysym2ucs.c
rename from gfx/skia/trunk/src/views/unix/keysym2ucs.c
rename to gfx/skia/skia/src/views/unix/keysym2ucs.c
diff --git a/gfx/skia/trunk/src/views/unix/skia_unix.cpp b/gfx/skia/skia/src/views/unix/skia_unix.cpp
rename from gfx/skia/trunk/src/views/unix/skia_unix.cpp
rename to gfx/skia/skia/src/views/unix/skia_unix.cpp
diff --git a/gfx/skia/trunk/src/views/win/SkOSWindow_win.cpp b/gfx/skia/skia/src/views/win/SkOSWindow_win.cpp
rename from gfx/skia/trunk/src/views/win/SkOSWindow_win.cpp
rename to gfx/skia/skia/src/views/win/SkOSWindow_win.cpp
diff --git a/gfx/skia/trunk/src/views/win/skia_win.cpp b/gfx/skia/skia/src/views/win/skia_win.cpp
rename from gfx/skia/trunk/src/views/win/skia_win.cpp
rename to gfx/skia/skia/src/views/win/skia_win.cpp
diff --git a/gfx/skia/trunk/src/xml/SkBML_Verbs.h b/gfx/skia/skia/src/xml/SkBML_Verbs.h
rename from gfx/skia/trunk/src/xml/SkBML_Verbs.h
rename to gfx/skia/skia/src/xml/SkBML_Verbs.h
diff --git a/gfx/skia/trunk/src/xml/SkBML_XMLParser.cpp b/gfx/skia/skia/src/xml/SkBML_XMLParser.cpp
rename from gfx/skia/trunk/src/xml/SkBML_XMLParser.cpp
rename to gfx/skia/skia/src/xml/SkBML_XMLParser.cpp
diff --git a/gfx/skia/trunk/src/xml/SkDOM.cpp b/gfx/skia/skia/src/xml/SkDOM.cpp
rename from gfx/skia/trunk/src/xml/SkDOM.cpp
rename to gfx/skia/skia/src/xml/SkDOM.cpp
diff --git a/gfx/skia/trunk/src/xml/SkJS.cpp b/gfx/skia/skia/src/xml/SkJS.cpp
rename from gfx/skia/trunk/src/xml/SkJS.cpp
rename to gfx/skia/skia/src/xml/SkJS.cpp
diff --git a/gfx/skia/trunk/src/xml/SkJSDisplayable.cpp b/gfx/skia/skia/src/xml/SkJSDisplayable.cpp
rename from gfx/skia/trunk/src/xml/SkJSDisplayable.cpp
rename to gfx/skia/skia/src/xml/SkJSDisplayable.cpp
diff --git a/gfx/skia/trunk/src/xml/SkXMLParser.cpp b/gfx/skia/skia/src/xml/SkXMLParser.cpp
rename from gfx/skia/trunk/src/xml/SkXMLParser.cpp
rename to gfx/skia/skia/src/xml/SkXMLParser.cpp
diff --git a/gfx/skia/trunk/src/xml/SkXMLPullParser.cpp b/gfx/skia/skia/src/xml/SkXMLPullParser.cpp
rename from gfx/skia/trunk/src/xml/SkXMLPullParser.cpp
rename to gfx/skia/skia/src/xml/SkXMLPullParser.cpp
diff --git a/gfx/skia/trunk/src/xml/SkXMLWriter.cpp b/gfx/skia/skia/src/xml/SkXMLWriter.cpp
rename from gfx/skia/trunk/src/xml/SkXMLWriter.cpp
rename to gfx/skia/skia/src/xml/SkXMLWriter.cpp
diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build
--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -19,12 +19,12 @@ UNIFIED_SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
 
 LOCAL_INCLUDES += [
     '/dom/plugins/base',
     '/dom/plugins/base/android',
     '/gfx/gl',
-    '/gfx/skia/trunk/include/config',
-    '/gfx/skia/trunk/include/core',
+    '/gfx/skia/skia/include/config',
+    '/gfx/skia/skia/include/core',
 ]
 
diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -75,18 +75,18 @@ SOURCES += [
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
     '/dom/system/android',
-    '/gfx/skia/trunk/include/config',
-    '/gfx/skia/trunk/include/core',
+    '/gfx/skia/skia/include/config',
+    '/gfx/skia/skia/include/core',
     '/widget',
 ]
 
 DEFINES['HAVE_OFF64_T'] = True
 DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
 
 if CONFIG['ANDROID_VERSION'] != '15':
     DEFINES['HAVE_POSIX_CLOCKS'] = True