Bug 1188462 - Rename gfx/skia/trunk directory to gfx/skia/skia. r=jrmuizel

CLOBBER

@@ -22,4 +22,4 @@
 # 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.

gfx/skia/README_MOZILLA

@@ -3,7 +3,7 @@ This is an import of Skia from 2014-07-28 (b1ab5fdd11bb358d738c1bfa63737dc65174a
 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

gfx/skia/generate_mozbuild.py

@@ -31,49 +31,49 @@ footer = """
 #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'}:
@@ -103,34 +103,34 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 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
@@ -143,7 +143,7 @@ if CONFIG['GNU_CXX']:
     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']
@@ -158,18 +158,18 @@ 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
@@ -178,7 +178,7 @@ def generate_includes():
 
 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))
@@ -189,13 +189,13 @@ 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())
@@ -242,48 +242,48 @@ def generate_separated_sources(platform_sources):
 
   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',
     }
   })
 

gfx/skia/gyp_mozbuild

@@ -1,9 +1,9 @@
 #!/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