Bug 391429 - "Editor caret is hidden in XULRunner applications, but visible in Firefox" [p=matt@songbirdnest.com (Matt Crocker) r+sr=peterv aM9=beltzner]

content/html/document/src/nsHTMLDocument.cpp

@@ -3925,9 +3925,9 @@ nsHTMLDocument::TurnEditingOff()
   editorDocShell->GetEditor(getter_AddRefs(editor));
   nsCOMPtr<nsIEditorStyleSheets> editorss = do_QueryInterface(editor);
   if (editorss) {
-    editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/contenteditable.css"));
+    editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource://gre/res/contenteditable.css"));
     if (mEditingState == eDesignMode)
-      editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/designmode.css"));
+      editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource://gre/res/designmode.css"));
   }
 
   if (mEditingState == eDesignMode) {
@@ -4006,7 +4006,7 @@ nsHTMLDocument::EditingStateChanged()
   nsCOMPtr<nsIEditorStyleSheets> editorss = do_QueryInterface(editor, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  editorss->AddOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/contenteditable.css"));
+  editorss->AddOverrideStyleSheet(NS_LITERAL_STRING("resource://gre/res/contenteditable.css"));
 
   // Should we update the editable state of all the nodes in the document? We
   // need to do this when the designMode value changes, as that overrides
@@ -4016,7 +4016,7 @@ nsHTMLDocument::EditingStateChanged()
   PRBool spellRecheckAll = PR_FALSE;
   if (designMode) {
     // designMode is being turned on (overrides contentEditable).
-    editorss->AddOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/designmode.css"));
+    editorss->AddOverrideStyleSheet(NS_LITERAL_STRING("resource://gre/res/designmode.css"));
 
     // Store scripting and plugins state.
     PRBool tmp;
@@ -4041,7 +4041,7 @@ nsHTMLDocument::EditingStateChanged()
   }
   else if (mEditingState == eDesignMode) {
     // designMode is being turned off (contentEditable is still on).
-    editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/designmode.css"));
+    editorss->RemoveOverrideStyleSheet(NS_LITERAL_STRING("resource://gre/res/designmode.css"));
 
     rv = docshell->SetAllowJavascript(mScriptsEnabled);
     NS_ENSURE_SUCCESS(rv, rv);

editor/composer/src/res/EditorOverride.css

@@ -220,7 +220,7 @@ span[\_moz_anonclass="mozGrabber"] {
   position: absolute;
   width: 12px;
   height: 12px;
-  background-image: url("resource:/res/grabber.gif");
+  background-image: url("resource://gre/res/grabber.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none;
@@ -236,7 +236,7 @@ a[\_moz_anonclass="mozTableAddColumnBefore"] {
   border: none 0px !important;
   width: 4px;
   height: 8px;
-  background-image: url("resource:/res/table-add-column-before.gif");
+  background-image: url("resource://gre/res/table-add-column-before.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -244,11 +244,11 @@ a[\_moz_anonclass="mozTableAddColumnBefore"] {
 }
 
 a[\_moz_anonclass="mozTableAddColumnBefore"]:hover {
-  background-image: url("resource:/res/table-add-column-before-hover.gif");
+  background-image: url("resource://gre/res/table-add-column-before-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableAddColumnBefore"]:active {
-  background-image: url("resource:/res/table-add-column-before-active.gif");
+  background-image: url("resource://gre/res/table-add-column-before-active.gif");
 }
 
 a[\_moz_anonclass="mozTableAddColumnAfter"] {
@@ -258,7 +258,7 @@ a[\_moz_anonclass="mozTableAddColumnAfter"] {
   border: none 0px !important;
   width: 4px;
   height: 8px;
-  background-image: url("resource:/res/table-add-column-after.gif");
+  background-image: url("resource://gre/res/table-add-column-after.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -266,11 +266,11 @@ a[\_moz_anonclass="mozTableAddColumnAfter"] {
 }
 
 a[\_moz_anonclass="mozTableAddColumnAfter"]:hover {
-  background-image: url("resource:/res/table-add-column-after-hover.gif");
+  background-image: url("resource://gre/res/table-add-column-after-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableAddColumnAfter"]:active {
-  background-image: url("resource:/res/table-add-column-after-active.gif");
+  background-image: url("resource://gre/res/table-add-column-after-active.gif");
 }
 
 a[\_moz_anonclass="mozTableRemoveColumn"] {
@@ -280,7 +280,7 @@ a[\_moz_anonclass="mozTableRemoveColumn"] {
   border: none 0px !important;
   width: 8px;
   height: 8px;
-  background-image: url("resource:/res/table-remove-column.gif");
+  background-image: url("resource://gre/res/table-remove-column.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -288,11 +288,11 @@ a[\_moz_anonclass="mozTableRemoveColumn"] {
 }
 
 a[\_moz_anonclass="mozTableRemoveColumn"]:hover {
-  background-image: url("resource:/res/table-remove-column-hover.gif");
+  background-image: url("resource://gre/res/table-remove-column-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableRemoveColumn"]:active {
-  background-image: url("resource:/res/table-remove-column-active.gif");
+  background-image: url("resource://gre/res/table-remove-column-active.gif");
 }
 
 a[\_moz_anonclass="mozTableAddRowBefore"] {
@@ -302,7 +302,7 @@ a[\_moz_anonclass="mozTableAddRowBefore"] {
   border: none 0px !important;
   width: 8px;
   height: 4px;
-  background-image: url("resource:/res/table-add-row-before.gif");
+  background-image: url("resource://gre/res/table-add-row-before.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -310,11 +310,11 @@ a[\_moz_anonclass="mozTableAddRowBefore"] {
 }
 
 a[\_moz_anonclass="mozTableAddRowBefore"]:hover {
-  background-image: url("resource:/res/table-add-row-before-hover.gif");
+  background-image: url("resource://gre/res/table-add-row-before-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableAddRowBefore"]:active {
-  background-image: url("resource:/res/table-add-row-before-active.gif");
+  background-image: url("resource://gre/res/table-add-row-before-active.gif");
 }
 
 a[\_moz_anonclass="mozTableAddRowAfter"] {
@@ -324,7 +324,7 @@ a[\_moz_anonclass="mozTableAddRowAfter"] {
   border: none 0px !important;
   width: 8px;
   height: 4px;
-  background-image: url("resource:/res/table-add-row-after.gif");
+  background-image: url("resource://gre/res/table-add-row-after.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -332,11 +332,11 @@ a[\_moz_anonclass="mozTableAddRowAfter"] {
 }
 
 a[\_moz_anonclass="mozTableAddRowAfter"]:hover {
-  background-image: url("resource:/res/table-add-row-after-hover.gif");
+  background-image: url("resource://gre/res/table-add-row-after-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableAddRowAfter"]:active {
-  background-image: url("resource:/res/table-add-row-after-active.gif");
+  background-image: url("resource://gre/res/table-add-row-after-active.gif");
 }
 
 a[\_moz_anonclass="mozTableRemoveRow"] {
@@ -346,7 +346,7 @@ a[\_moz_anonclass="mozTableRemoveRow"] {
   border: none 0px !important;
   width: 8px;
   height: 8px;
-  background-image: url("resource:/res/table-remove-row.gif");
+  background-image: url("resource://gre/res/table-remove-row.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -354,9 +354,9 @@ a[\_moz_anonclass="mozTableRemoveRow"] {
 }
 
 a[\_moz_anonclass="mozTableRemoveRow"]:hover {
-  background-image: url("resource:/res/table-remove-row-hover.gif");
+  background-image: url("resource://gre/res/table-remove-row-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableRemoveRow"]:active {
-  background-image: url("resource:/res/table-remove-row-active.gif");
+  background-image: url("resource://gre/res/table-remove-row-active.gif");
 }

editor/libeditor/html/nsHTMLEditor.cpp

@@ -322,7 +322,7 @@ nsHTMLEditor::Init(nsIDOMDocument *aDoc, nsIPresShell *aPresShell,
 
     if (!(mFlags & eEditorAllowInteraction)) {
       // ignore any errors from this in case the file is missing
-      AddOverrideStyleSheet(NS_LITERAL_STRING("resource:/res/EditorOverride.css"));
+      AddOverrideStyleSheet(NS_LITERAL_STRING("resource://gre/res/EditorOverride.css"));
     }
 
     nsCOMPtr<nsISelection>selection;

editor/ui/composer/content/editor.js

@@ -54,7 +54,7 @@ const kDisplayModeTabIDS = ["NormalModeButton", "TagModeButton", "SourceModeButt
 const kNormalStyleSheet = "chrome://editor/content/EditorContent.css";
 const kAllTagsStyleSheet = "chrome://editor/content/EditorAllTags.css";
 const kParagraphMarksStyleSheet = "chrome://editor/content/EditorParagraphMarks.css";
-const kContentEditableStyleSheet = "resource:/res/contenteditable.css";
+const kContentEditableStyleSheet = "resource://gre/res/contenteditable.css";
 
 const kTextMimeType = "text/plain";
 const kHTMLMimeType = "text/html";

layout/style/contenteditable.css

@@ -233,7 +233,7 @@ span[\_moz_anonclass="mozGrabber"] {
   position: absolute;
   width: 12px;
   height: 12px;
-  background-image: url("resource:/res/grabber.gif");
+  background-image: url("resource://gre/res/grabber.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none;
@@ -249,7 +249,7 @@ a[\_moz_anonclass="mozTableAddColumnBefore"] {
   border: none 0px !important;
   width: 4px;
   height: 8px;
-  background-image: url("resource:/res/table-add-column-before.gif");
+  background-image: url("resource://gre/res/table-add-column-before.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -257,11 +257,11 @@ a[\_moz_anonclass="mozTableAddColumnBefore"] {
 }
 
 a[\_moz_anonclass="mozTableAddColumnBefore"]:hover {
-  background-image: url("resource:/res/table-add-column-before-hover.gif");
+  background-image: url("resource://gre/res/table-add-column-before-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableAddColumnBefore"]:active {
-  background-image: url("resource:/res/table-add-column-before-active.gif");
+  background-image: url("resource://gre/res/table-add-column-before-active.gif");
 }
 
 a[\_moz_anonclass="mozTableAddColumnAfter"] {
@@ -271,7 +271,7 @@ a[\_moz_anonclass="mozTableAddColumnAfter"] {
   border: none 0px !important;
   width: 4px;
   height: 8px;
-  background-image: url("resource:/res/table-add-column-after.gif");
+  background-image: url("resource://gre/res/table-add-column-after.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -279,11 +279,11 @@ a[\_moz_anonclass="mozTableAddColumnAfter"] {
 }
 
 a[\_moz_anonclass="mozTableAddColumnAfter"]:hover {
-  background-image: url("resource:/res/table-add-column-after-hover.gif");
+  background-image: url("resource://gre/res/table-add-column-after-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableAddColumnAfter"]:active {
-  background-image: url("resource:/res/table-add-column-after-active.gif");
+  background-image: url("resource://gre/res/table-add-column-after-active.gif");
 }
 
 a[\_moz_anonclass="mozTableRemoveColumn"] {
@@ -293,7 +293,7 @@ a[\_moz_anonclass="mozTableRemoveColumn"] {
   border: none 0px !important;
   width: 8px;
   height: 8px;
-  background-image: url("resource:/res/table-remove-column.gif");
+  background-image: url("resource://gre/res/table-remove-column.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -301,11 +301,11 @@ a[\_moz_anonclass="mozTableRemoveColumn"] {
 }
 
 a[\_moz_anonclass="mozTableRemoveColumn"]:hover {
-  background-image: url("resource:/res/table-remove-column-hover.gif");
+  background-image: url("resource://gre/res/table-remove-column-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableRemoveColumn"]:active {
-  background-image: url("resource:/res/table-remove-column-active.gif");
+  background-image: url("resource://gre/res/table-remove-column-active.gif");
 }
 
 a[\_moz_anonclass="mozTableAddRowBefore"] {
@@ -315,7 +315,7 @@ a[\_moz_anonclass="mozTableAddRowBefore"] {
   border: none 0px !important;
   width: 8px;
   height: 4px;
-  background-image: url("resource:/res/table-add-row-before.gif");
+  background-image: url("resource://gre/res/table-add-row-before.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -323,11 +323,11 @@ a[\_moz_anonclass="mozTableAddRowBefore"] {
 }
 
 a[\_moz_anonclass="mozTableAddRowBefore"]:hover {
-  background-image: url("resource:/res/table-add-row-before-hover.gif");
+  background-image: url("resource://gre/res/table-add-row-before-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableAddRowBefore"]:active {
-  background-image: url("resource:/res/table-add-row-before-active.gif");
+  background-image: url("resource://gre/res/table-add-row-before-active.gif");
 }
 
 a[\_moz_anonclass="mozTableAddRowAfter"] {
@@ -337,7 +337,7 @@ a[\_moz_anonclass="mozTableAddRowAfter"] {
   border: none 0px !important;
   width: 8px;
   height: 4px;
-  background-image: url("resource:/res/table-add-row-after.gif");
+  background-image: url("resource://gre/res/table-add-row-after.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -345,11 +345,11 @@ a[\_moz_anonclass="mozTableAddRowAfter"] {
 }
 
 a[\_moz_anonclass="mozTableAddRowAfter"]:hover {
-  background-image: url("resource:/res/table-add-row-after-hover.gif");
+  background-image: url("resource://gre/res/table-add-row-after-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableAddRowAfter"]:active {
-  background-image: url("resource:/res/table-add-row-after-active.gif");
+  background-image: url("resource://gre/res/table-add-row-after-active.gif");
 }
 
 a[\_moz_anonclass="mozTableRemoveRow"] {
@@ -359,7 +359,7 @@ a[\_moz_anonclass="mozTableRemoveRow"] {
   border: none 0px !important;
   width: 8px;
   height: 8px;
-  background-image: url("resource:/res/table-remove-row.gif");
+  background-image: url("resource://gre/res/table-remove-row.gif");
   background-repeat: no-repeat;
   background-position: center center;
   -moz-user-select: none !important;
@@ -367,9 +367,9 @@ a[\_moz_anonclass="mozTableRemoveRow"] {
 }
 
 a[\_moz_anonclass="mozTableRemoveRow"]:hover {
-  background-image: url("resource:/res/table-remove-row-hover.gif");
+  background-image: url("resource://gre/res/table-remove-row-hover.gif");
 }
 
 a[\_moz_anonclass="mozTableRemoveRow"]:active {
-  background-image: url("resource:/res/table-remove-row-active.gif");
+  background-image: url("resource://gre/res/table-remove-row-active.gif");
 }