Bug 1097398 Part 1 - Make AccessibleCaret assets be able to override via chrome url draft
authorTing-Yu Lin <tlin@mozilla.com>
Tue, 16 Feb 2016 16:55:28 +0800
changeset 331177 8165d222a2d5200dfc047ed7671fb054a6a21511
parent 331176 4b59936b52a39783d01532aab69b0712e3f98083
child 331178 2b81487a8fe9fbba89f79551b2e36bca2dab2386
push id10922
push usertlin@mozilla.com
push dateTue, 16 Feb 2016 09:54:54 +0000
bugs1097398
milestone47.0a1
Bug 1097398 Part 1 - Make AccessibleCaret assets be able to override via chrome url Fennec wants to use a Android L style caret assets. Therefore, register chrome urls for default AccessibleCaret assets so that it can be overridden by later patches. 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
@@ -736,28 +736,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
@@ -16,8 +16,23 @@ toolkit.jar:
    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)
 
 % resource gre-resources %res/
+
+% skin global classic/1.0 %skin/classic/global/
+   skin/classic/global/accessiblecaret/normal_1x.png        (res/accessiblecaret/normal_1x.png)
+   skin/classic/global/accessiblecaret/normal_1.5x.png      (res/accessiblecaret/normal_1.5x.png)
+   skin/classic/global/accessiblecaret/normal_2x.png        (res/accessiblecaret/normal_2x.png)
+   skin/classic/global/accessiblecaret/normal_2.25x.png     (res/accessiblecaret/normal_2.25x.png)
+   skin/classic/global/accessiblecaret/tilt_left_1x.png     (res/accessiblecaret/tilt_left_1x.png)
+   skin/classic/global/accessiblecaret/tilt_left_1.5x.png   (res/accessiblecaret/tilt_left_1.5x.png)
+   skin/classic/global/accessiblecaret/tilt_left_2x.png     (res/accessiblecaret/tilt_left_2x.png)
+   skin/classic/global/accessiblecaret/tilt_left_2.25x.png  (res/accessiblecaret/tilt_left_2.25x.png)
+   skin/classic/global/accessiblecaret/tilt_right_1x.png    (res/accessiblecaret/tilt_right_1x.png)
+   skin/classic/global/accessiblecaret/tilt_right_1.5x.png  (res/accessiblecaret/tilt_right_1.5x.png)
+   skin/classic/global/accessiblecaret/tilt_right_2x.png    (res/accessiblecaret/tilt_right_2x.png)
+   skin/classic/global/accessiblecaret/tilt_right_2.25x.png (res/accessiblecaret/tilt_right_2.25x.png)
+
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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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("chrome://global/skin/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
@@ -526,30 +526,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
@@ -479,30 +479,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