Bug 812529 - Add 1.4 and 1.8x selection monocle images. r=mbrubeck

browser/metro/base/tests/mochitest/browser_selection_urlbar.js

@@ -86,6 +86,9 @@ gTests.push({
     ok(edit.popup.popupOpen, "bug: popup should be showing");
 
     clearSelection(edit);
+    yield waitForCondition(function () {
+      return !SelectionHelperUI.isSelectionUIVisible;
+    });
   }
 });
 
@@ -101,7 +104,6 @@ gTests.push({
 
     let editCoords = logicalCoordsForElement(edit);
     SelectionHelperUI.attachEditSession(ChromeSelectionHandler, editCoords.x, editCoords.y);
-
     ok(SelectionHelperUI.isSelectionUIVisible, "selection enabled");
 
     let selection = edit.QueryInterface(Components.interfaces.nsIDOMXULTextBoxElement)
@@ -115,6 +117,9 @@ gTests.push({
     ok(SelectionHelperUI.isCaretUIVisible, "caret browsing enabled");
 
     clearSelection(edit);
+    yield waitForCondition(function () {
+      return !SelectionHelperUI.isSelectionUIVisible;
+    });
   }
 });
 
@@ -131,6 +136,9 @@ gTests.push({
     edit.blur();
     ok(!SelectionHelperUI.isSelectionUIVisible, "selection no longer enabled");
     clearSelection(edit);
+    yield waitForCondition(function () {
+      return !SelectionHelperUI.isSelectionUIVisible;
+    });
   }
 });
 

browser/metro/theme/browser.css

@@ -292,14 +292,29 @@ documenttab[selected] .documenttab-selection {
 }
 
 .selectionhandle {
-  list-style-image: url("chrome://browser/skin/images/selection-monocle.png");
-  border: 0px solid gray;
+  background-image: url("chrome://browser/skin/images/selection-monocle.png");
+  background-repeat: no-repeat;
+  background-size: 18px 18px;
   padding: 0px;
-  margin-top: -30px;
-  margin-left: -18px;
+  margin-top: -19px;
+  margin-left: -9px;
   pointer-events: auto;
 }
 
+@media (min-resolution: @min_res_140pc@) {
+  /* Load 140% image when scaled by 140% */
+  .selectionhandle {
+    background-image: url("chrome://browser/skin/images/selection-monocle@1.4x.png");
+  }
+}
+
+@media (min-resolution: @min_res_180pc@) {
+  /* Load 180% image when scaled by 180% */
+  .selectionhandle {
+    background-image: url("chrome://browser/skin/images/selection-monocle@1.8x.png");
+  }
+}
+
 /* content scrollbars */
 .scroller {
   opacity: 0;

browser/metro/theme/jar.mn

@@ -97,6 +97,8 @@ chrome.jar:
   skin/images/exitfullscreen-hdpi.png       (images/exitfullscreen-hdpi.png)
   skin/images/scrubber-hdpi.png             (images/scrubber-hdpi.png)
   skin/images/selection-monocle.png         (images/selection-monocle.png)
+  skin/images/selection-monocle@1.4x.png    (images/selection-monocle@1.4x.png)
+  skin/images/selection-monocle@1.8x.png    (images/selection-monocle@1.8x.png)
   skin/images/appbar-icons.png              (images/appbar-icons.png)
   skin/images/pinned-hdpi.png               (images/pinned-hdpi.png)
   skin/images/tile-selected-check-hdpi.png  (images/tile-selected-check-hdpi.png)