Bug 1097398 Part 1 - Move AccessibleCaret default assets to layout/style/. r=nalexander, r=heycam
authorTing-Yu Lin <tlin@mozilla.com>
Tue, 16 Feb 2016 16:55:28 +0800
changeset 324484 eeebbe5ee8fbe2dbc25d47b3be0adf46178dbb77
parent 324483 13e8ff78d7c3e04405af3fe985c9c8bcc3d44a51
child 324485 d0be9a37a515a0e91f099743e2253d580ded88b5
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, heycam
bugs1097398
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1097398 Part 1 - Move AccessibleCaret default assets to layout/style/. r=nalexander, r=heycam Default AccessibleCaret assets were in editor for historical reasons. Because ua.css references them, I move them to layout/style/ and add them in jar.mn so that we don't have to package them in various products. MozReview-Commit-ID: 7K7qr9FK784
b2g/installer/package-manifest.in
browser/installer/package-manifest.in
editor/composer/moz.build
editor/composer/res/accessiblecaret.png
editor/composer/res/accessiblecaret@1.5x.png
editor/composer/res/accessiblecaret@2.25x.png
editor/composer/res/accessiblecaret@2x.png
editor/composer/res/accessiblecaret_tilt_left.png
editor/composer/res/accessiblecaret_tilt_left@1.5x.png
editor/composer/res/accessiblecaret_tilt_left@2.25x.png
editor/composer/res/accessiblecaret_tilt_left@2x.png
editor/composer/res/accessiblecaret_tilt_right.png
editor/composer/res/accessiblecaret_tilt_right@1.5x.png
editor/composer/res/accessiblecaret_tilt_right@2.25x.png
editor/composer/res/accessiblecaret_tilt_right@2x.png
layout/style/jar.mn
layout/style/res/accessiblecaret-normal@1.5x.png
layout/style/res/accessiblecaret-normal@1x.png
layout/style/res/accessiblecaret-normal@2.25x.png
layout/style/res/accessiblecaret-normal@2x.png
layout/style/res/accessiblecaret-tilt-left@1.5x.png
layout/style/res/accessiblecaret-tilt-left@1x.png
layout/style/res/accessiblecaret-tilt-left@2.25x.png
layout/style/res/accessiblecaret-tilt-left@2x.png
layout/style/res/accessiblecaret-tilt-right@1.5x.png
layout/style/res/accessiblecaret-tilt-right@1x.png
layout/style/res/accessiblecaret-tilt-right@2.25x.png
layout/style/res/accessiblecaret-tilt-right@2x.png
layout/style/ua.css
mobile/android/b2gdroid/installer/package-manifest.in
mobile/android/installer/package-manifest.in
--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -787,28 +787,16 @@
 @RESPATH@/res/table-add-row-before-hover.gif
 @RESPATH@/res/table-add-row-before.gif
 @RESPATH@/res/table-remove-column-active.gif
 @RESPATH@/res/table-remove-column-hover.gif
 @RESPATH@/res/table-remove-column.gif
 @RESPATH@/res/table-remove-row-active.gif
 @RESPATH@/res/table-remove-row-hover.gif
 @RESPATH@/res/table-remove-row.gif
-@RESPATH@/res/accessiblecaret.png
-@RESPATH@/res/accessiblecaret@1.5x.png
-@RESPATH@/res/accessiblecaret@2.25x.png
-@RESPATH@/res/accessiblecaret@2x.png
-@RESPATH@/res/accessiblecaret_tilt_left.png
-@RESPATH@/res/accessiblecaret_tilt_left@1.5x.png
-@RESPATH@/res/accessiblecaret_tilt_left@2.25x.png
-@RESPATH@/res/accessiblecaret_tilt_left@2x.png
-@RESPATH@/res/accessiblecaret_tilt_right.png
-@RESPATH@/res/accessiblecaret_tilt_right@1.5x.png
-@RESPATH@/res/accessiblecaret_tilt_right@2.25x.png
-@RESPATH@/res/accessiblecaret_tilt_right@2x.png
 @RESPATH@/res/grabber.gif
 #ifdef XP_MACOSX
 @RESPATH@/res/cursors/*
 #endif
 @RESPATH@/res/fonts/*
 @RESPATH@/res/dtd/*
 @RESPATH@/res/html/*
 @RESPATH@/res/language.properties
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -734,28 +734,16 @@
 @RESPATH@/res/table-add-row-before-hover.gif
 @RESPATH@/res/table-add-row-before.gif
 @RESPATH@/res/table-remove-column-active.gif
 @RESPATH@/res/table-remove-column-hover.gif
 @RESPATH@/res/table-remove-column.gif
 @RESPATH@/res/table-remove-row-active.gif
 @RESPATH@/res/table-remove-row-hover.gif
 @RESPATH@/res/table-remove-row.gif
-@RESPATH@/res/accessiblecaret.png
-@RESPATH@/res/accessiblecaret@1.5x.png
-@RESPATH@/res/accessiblecaret@2.25x.png
-@RESPATH@/res/accessiblecaret@2x.png
-@RESPATH@/res/accessiblecaret_tilt_left.png
-@RESPATH@/res/accessiblecaret_tilt_left@1.5x.png
-@RESPATH@/res/accessiblecaret_tilt_left@2.25x.png
-@RESPATH@/res/accessiblecaret_tilt_left@2x.png
-@RESPATH@/res/accessiblecaret_tilt_right.png
-@RESPATH@/res/accessiblecaret_tilt_right@1.5x.png
-@RESPATH@/res/accessiblecaret_tilt_right@2.25x.png
-@RESPATH@/res/accessiblecaret_tilt_right@2x.png
 @RESPATH@/res/grabber.gif
 #ifdef XP_MACOSX
 @RESPATH@/res/cursors/*
 #endif
 @RESPATH@/res/fonts/*
 @RESPATH@/res/dtd/*
 @RESPATH@/res/html/*
 #if defined(XP_MACOSX) || defined(XP_WIN)
--- a/editor/composer/moz.build
+++ b/editor/composer/moz.build
@@ -22,28 +22,16 @@ UNIFIED_SOURCES += [
     'nsComposerRegistration.cpp',
     'nsComposeTxtSrvFilter.cpp',
     'nsEditingSession.cpp',
     'nsEditorSpellCheck.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 RESOURCE_FILES += [
-    'res/accessiblecaret.png',
-    'res/accessiblecaret@1.5x.png',
-    'res/accessiblecaret@2.25x.png',
-    'res/accessiblecaret@2x.png',
-    'res/accessiblecaret_tilt_left.png',
-    'res/accessiblecaret_tilt_left@1.5x.png',
-    'res/accessiblecaret_tilt_left@2.25x.png',
-    'res/accessiblecaret_tilt_left@2x.png',
-    'res/accessiblecaret_tilt_right.png',
-    'res/accessiblecaret_tilt_right@1.5x.png',
-    'res/accessiblecaret_tilt_right@2.25x.png',
-    'res/accessiblecaret_tilt_right@2x.png',
     'res/EditorOverride.css',
     'res/grabber.gif',
     'res/table-add-column-after-active.gif',
     'res/table-add-column-after-hover.gif',
     'res/table-add-column-after.gif',
     'res/table-add-column-before-active.gif',
     'res/table-add-column-before-hover.gif',
     'res/table-add-column-before.gif',
--- a/layout/style/jar.mn
+++ b/layout/style/jar.mn
@@ -14,10 +14,22 @@ toolkit.jar:
 *  res/forms.css    (forms.css)
    res/number-control.css    (number-control.css)
    res/arrow.gif        (arrow.gif)
    res/arrow-left.gif   (arrow-left.gif)
    res/arrow-right.gif  (arrow-right.gif)
    res/arrowd.gif       (arrowd.gif)
    res/arrowd-left.gif  (arrowd-left.gif)
    res/arrowd-right.gif (arrowd-right.gif)
+   res/accessiblecaret-normal@1x.png         (res/accessiblecaret-normal@1x.png)
+   res/accessiblecaret-normal@1.5x.png       (res/accessiblecaret-normal@1.5x.png)
+   res/accessiblecaret-normal@2x.png         (res/accessiblecaret-normal@2x.png)
+   res/accessiblecaret-normal@2.25x.png      (res/accessiblecaret-normal@2.25x.png)
+   res/accessiblecaret-tilt-left@1x.png      (res/accessiblecaret-tilt-left@1x.png)
+   res/accessiblecaret-tilt-left@1.5x.png    (res/accessiblecaret-tilt-left@1.5x.png)
+   res/accessiblecaret-tilt-left@2x.png      (res/accessiblecaret-tilt-left@2x.png)
+   res/accessiblecaret-tilt-left@2.25x.png   (res/accessiblecaret-tilt-left@2.25x.png)
+   res/accessiblecaret-tilt-right@1x.png     (res/accessiblecaret-tilt-right@1x.png)
+   res/accessiblecaret-tilt-right@1.5x.png   (res/accessiblecaret-tilt-right@1.5x.png)
+   res/accessiblecaret-tilt-right@2x.png     (res/accessiblecaret-tilt-right@2x.png)
+   res/accessiblecaret-tilt-right@2.25x.png  (res/accessiblecaret-tilt-right@2.25x.png)
 
 % resource gre-resources %res/
rename from editor/composer/res/accessiblecaret@1.5x.png
rename to layout/style/res/accessiblecaret-normal@1.5x.png
rename from editor/composer/res/accessiblecaret.png
rename to layout/style/res/accessiblecaret-normal@1x.png
rename from editor/composer/res/accessiblecaret@2.25x.png
rename to layout/style/res/accessiblecaret-normal@2.25x.png
rename from editor/composer/res/accessiblecaret@2x.png
rename to layout/style/res/accessiblecaret-normal@2x.png
rename from editor/composer/res/accessiblecaret_tilt_left@1.5x.png
rename to layout/style/res/accessiblecaret-tilt-left@1.5x.png
rename from editor/composer/res/accessiblecaret_tilt_left.png
rename to layout/style/res/accessiblecaret-tilt-left@1x.png
rename from editor/composer/res/accessiblecaret_tilt_left@2.25x.png
rename to layout/style/res/accessiblecaret-tilt-left@2.25x.png
rename from editor/composer/res/accessiblecaret_tilt_left@2x.png
rename to layout/style/res/accessiblecaret-tilt-left@2x.png
rename from editor/composer/res/accessiblecaret_tilt_right@1.5x.png
rename to layout/style/res/accessiblecaret-tilt-right@1.5x.png
rename from editor/composer/res/accessiblecaret_tilt_right.png
rename to layout/style/res/accessiblecaret-tilt-right@1x.png
rename from editor/composer/res/accessiblecaret_tilt_right@2.25x.png
rename to layout/style/res/accessiblecaret-tilt-right@2.25x.png
rename from editor/composer/res/accessiblecaret_tilt_right@2x.png
rename to layout/style/res/accessiblecaret-tilt-right@2x.png
--- a/layout/style/ua.css
+++ b/layout/style/ua.css
@@ -365,72 +365,72 @@ div:-moz-native-anonymous.moz-accessible
   background-color: #008aa0;
 }
 
 div:-moz-native-anonymous.moz-accessiblecaret.no-bar > div.bar {
   display: none;
 }
 
 div:-moz-native-anonymous.moz-accessiblecaret.normal > div.image {
-  background-image: url("resource://gre/res/accessiblecaret.png");
+  background-image: url("resource://gre-resources/accessiblecaret-normal@1x.png");
 }
 
 div:-moz-native-anonymous.moz-accessiblecaret.left > div.image {
-  background-image: url("resource://gre/res/accessiblecaret_tilt_left.png");
+  background-image: url("resource://gre-resources/accessiblecaret-tilt-left@1x.png");
   margin-left: -39%;
 }
 
 div:-moz-native-anonymous.moz-accessiblecaret.right > div.image {
-  background-image: url("resource://gre/res/accessiblecaret_tilt_right.png");
+  background-image: url("resource://gre-resources/accessiblecaret-tilt-right@1x.png");
   margin-left: 41%;
 }
 
 div:-moz-native-anonymous.moz-accessiblecaret.none {
   display: none;
 }
 
 @media (min-resolution: 1.5dppx) {
   div:-moz-native-anonymous.moz-accessiblecaret.normal > div.image {
-    background-image: url("resource://gre/res/accessiblecaret@1.5x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-normal@1.5x.png");
   }
 
   div:-moz-native-anonymous.moz-accessiblecaret.left > div.image {
-    background-image: url("resource://gre/res/accessiblecaret_tilt_left@1.5x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-tilt-left@1.5x.png");
   }
 
   div:-moz-native-anonymous.moz-accessiblecaret.right > div.image {
-    background-image: url("resource://gre/res/accessiblecaret_tilt_right@1.5x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-tilt-right@1.5x.png");
   }
 }
 
 @media (min-resolution: 2dppx) {
   div:-moz-native-anonymous.moz-accessiblecaret.normal > div.image {
-    background-image: url("resource://gre/res/accessiblecaret@2x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-normal@2x.png");
   }
 
   div:-moz-native-anonymous.moz-accessiblecaret.left > div.image {
-    background-image: url("resource://gre/res/accessiblecaret_tilt_left@2x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-tilt-left@2x.png");
   }
 
   div:-moz-native-anonymous.moz-accessiblecaret.right > div.image {
-    background-image: url("resource://gre/res/accessiblecaret_tilt_right@2x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-tilt-right@2x.png");
   }
 }
 
 @media (min-resolution: 2.25dppx) {
   div:-moz-native-anonymous.moz-accessiblecaret.normal > div.image {
-    background-image: url("resource://gre/res/accessiblecaret@2.25x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-normal@2.25x.png");
   }
 
   div:-moz-native-anonymous.moz-accessiblecaret.left > div.image {
-    background-image: url("resource://gre/res/accessiblecaret_tilt_left@2.25x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-tilt-left@2.25x.png");
   }
 
   div:-moz-native-anonymous.moz-accessiblecaret.right > div.image {
-    background-image: url("resource://gre/res/accessiblecaret_tilt_right@2.25x.png");
+    background-image: url("resource://gre-resources/accessiblecaret-tilt-right@2.25x.png");
   }
 }
 
 /* Custom content container in the CanvasFrame, fixed positioned on top of
    everything else, not reacting to pointer events. */
 div:-moz-native-anonymous.moz-custom-content-container {
   pointer-events: none;
   -moz-top-layer: top;
--- a/mobile/android/b2gdroid/installer/package-manifest.in
+++ b/mobile/android/b2gdroid/installer/package-manifest.in
@@ -524,30 +524,16 @@
 @BINPATH@/res/table-remove-row-active.gif
 @BINPATH@/res/table-remove-row-hover.gif
 @BINPATH@/res/table-remove-row.gif
 @BINPATH@/res/grabber.gif
 @BINPATH@/res/dtd/*
 @BINPATH@/res/html/*
 @BINPATH@/res/language.properties
 @BINPATH@/res/entityTables/*
-#ifdef NIGHTLY_BUILD
-@BINPATH@/res/accessiblecaret.png
-@BINPATH@/res/accessiblecaret@1.5x.png
-@BINPATH@/res/accessiblecaret@2.25x.png
-@BINPATH@/res/accessiblecaret@2x.png
-@BINPATH@/res/accessiblecaret_tilt_left.png
-@BINPATH@/res/accessiblecaret_tilt_left@1.5x.png
-@BINPATH@/res/accessiblecaret_tilt_left@2.25x.png
-@BINPATH@/res/accessiblecaret_tilt_left@2x.png
-@BINPATH@/res/accessiblecaret_tilt_right.png
-@BINPATH@/res/accessiblecaret_tilt_right@1.5x.png
-@BINPATH@/res/accessiblecaret_tilt_right@2.25x.png
-@BINPATH@/res/accessiblecaret_tilt_right@2x.png
-#endif
 
 #ifndef MOZ_ANDROID_EXCLUDE_FONTS
 @BINPATH@/res/fonts/*
 #else
 @BINPATH@/res/fonts/*.properties
 #endif
 
 ; svg
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -477,30 +477,16 @@
 @BINPATH@/res/table-remove-row-active.gif
 @BINPATH@/res/table-remove-row-hover.gif
 @BINPATH@/res/table-remove-row.gif
 @BINPATH@/res/grabber.gif
 @BINPATH@/res/dtd/*
 @BINPATH@/res/html/*
 @BINPATH@/res/language.properties
 @BINPATH@/res/entityTables/*
-#ifdef NIGHTLY_BUILD
-@BINPATH@/res/accessiblecaret.png
-@BINPATH@/res/accessiblecaret@1.5x.png
-@BINPATH@/res/accessiblecaret@2.25x.png
-@BINPATH@/res/accessiblecaret@2x.png
-@BINPATH@/res/accessiblecaret_tilt_left.png
-@BINPATH@/res/accessiblecaret_tilt_left@1.5x.png
-@BINPATH@/res/accessiblecaret_tilt_left@2.25x.png
-@BINPATH@/res/accessiblecaret_tilt_left@2x.png
-@BINPATH@/res/accessiblecaret_tilt_right.png
-@BINPATH@/res/accessiblecaret_tilt_right@1.5x.png
-@BINPATH@/res/accessiblecaret_tilt_right@2.25x.png
-@BINPATH@/res/accessiblecaret_tilt_right@2x.png
-#endif
 
 #ifndef MOZ_ANDROID_EXCLUDE_FONTS
 @BINPATH@/res/fonts/*
 #else
 @BINPATH@/res/fonts/*.properties
 #endif
 
 ; svg