#star-button got a parent #star-button-box in bug 1352063. This may have broken some CSS selectors that were looking for `#urlbar-icons > .urlbar-icon`, of which #star-button is a .urlbar-icon. This was caught in bug 1374477 comment 124.

Comment on attachment 8892061 [details] Bug 1385407 - Add an extra selector for the urlbar-icon within the star-button-box now that the urlbar-icon for the bookmark star isn't a direct child of urlbar-icons. https://reviewboard.mozilla.org/r/163076/#review168346 rs=me

Pushed by jwein@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/5f2af8ad6139 Add an extra selector for the urlbar-icon within the star-button-box now that the urlbar-icon for the bookmark star isn't a direct child of urlbar-icons. r=Gijs

Backed out for failing browser_startup_images.js with: Loaded image chrome://browser/skin/bookmark-hollow.svg should have been shown: https://hg.mozilla.org/integration/autoland/rev/9de78eb067cf3ba198352d55582b4643001d4931 Push with failures: https://treeherder.mozilla.org/#/jobs?repo=autoland&revision=5f2af8ad61397dfaa61ede3cc1334d85f9be057d&filter-resultStatus=testfailed&filter-resultStatus=busted&filter-resultStatus=exception&filter-resultStatus=retry&filter-resultStatus=usercancel&filter-resultStatus=runnable Failure log: https://treeherder.mozilla.org/logviewer.html#?job_id=119625599&repo=autoland should have been shown. - 10:00:19 INFO - Stack trace: 10:00:19 INFO - chrome://mochitests/content/browser/browser/base/content/test/performance/browser_startup_images.js:null:216

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. hg error in cmd: hg rebase -s 4c79d91ebd12 -d c92dcf2ce236: rebasing 410713:4c79d91ebd12 "Bug 1385407 - Add an extra selector for the urlbar-icon within the star-button-box now that the urlbar-icon for the bookmark star isn't a direct child of urlbar-icons. r=Gijs" (tip) merging browser/base/content/browser.css merging browser/base/content/test/performance/browser_startup_images.js warning: conflicts while merging browser/base/content/test/performance/browser_startup_images.js! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue)

Pushed by jwein@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/fe8012cc708a Add an extra selector for the urlbar-icon within the star-button-box now that the urlbar-icon for the bookmark star isn't a direct child of urlbar-icons. r=Gijs