Commit d66b9f27 authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

merge mozilla-inbound to mozilla-central a=merge

parents 2564317f d5cb2859

CLOBBER

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ 
# changes to stick? As of bug 928195, this shouldn't be necessary! Please

# don't change CLOBBER for WebIDL changes any more.



Bug 1356927 - Mac builds in automation require a clobber for a change in which ranlib they use
 
Bug 1340627 - clobber for Skia update

accessible/generic/DocAccessible.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1984,6 +1984,7 @@ DocAccessible::ContentRemoved(Accessible* aChild) 


  TreeMutation mt(parent);

  mt.BeforeRemoval(aChild);

  MOZ_DIAGNOSTIC_ASSERT(aChild->Parent(), "Unparented #1");



  if (aChild->IsRelocated()) {

    nsTArray<RefPtr<Accessible> >* owned = mARIAOwnsHash.Get(parent);
@@ -1993,6 +1994,7 @@ DocAccessible::ContentRemoved(Accessible* aChild) 
      mARIAOwnsHash.Remove(parent);

    }

  }

  MOZ_DIAGNOSTIC_ASSERT(aChild->Parent(), "Unparented #2");

  parent->RemoveChild(aChild);

  UncacheChildrenInSubtree(aChild);

browser/base/content/abouthome/aboutHome.css

+12 −6
Original line number Diff line number Diff line
@@ -109,7 +109,9 @@ a { 
#searchSubmit {

  margin-inline-start: -1px;

  color: transparent;

  background: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go") center center no-repeat, linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1)) padding-box;

  background: url("chrome://browser/skin/search-arrow-go.svg") center center no-repeat, linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1)) padding-box;

  -moz-context-properties: fill;

  fill: #616366;

  padding: 0;

  border: 1px solid;

  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
@@ -125,7 +127,7 @@ a { 


#searchSubmit:dir(rtl) {

  border-radius: 2px 0 0 2px;

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-rtl"), linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1));

  background-image: url("chrome://browser/skin/search-arrow-go-rtl.svg"), linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1));

}



#searchText:focus + #searchSubmit,
@@ -138,7 +140,8 @@ a { 
#searchText:focus + #searchSubmit,

#searchText[keepfocus] + #searchSubmit,

#searchText[autofocus] + #searchSubmit {

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-inverted"), linear-gradient(#4cb1ff, #1793e5);

  background-image: url("chrome://browser/skin/search-arrow-go.svg"), linear-gradient(#4cb1ff, #1793e5);

  fill: white;

  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,

              0 0 0 1px hsla(0,0%,100%,.1) inset,

              0 1px 0 hsla(210,54%,20%,.03);
@@ -147,11 +150,13 @@ a { 
#searchText:focus + #searchSubmit:dir(rtl),

#searchText[keepfocus] + #searchSubmit:dir(rtl),

#searchText[autofocus] + #searchSubmit:dir(rtl) {

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-rtl-inverted"), linear-gradient(#4cb1ff, #1793e5);

  background-image: url("chrome://browser/skin/search-arrow-go-rtl.svg"), linear-gradient(#4cb1ff, #1793e5);

  fill: white;

}



#searchText + #searchSubmit:hover {

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-inverted"), linear-gradient(#66bdff, #0d9eff);

  background-image: url("chrome://browser/skin/search-arrow-go.svg"), linear-gradient(#66bdff, #0d9eff);

  fill: white;

  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,

              0 0 0 1px hsla(0,0%,100%,.1) inset,

              0 1px 0 hsla(210,54%,20%,.03),
@@ -159,7 +164,8 @@ a { 
}



#searchText + #searchSubmit:dir(rtl):hover {

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-rtl-inverted"), linear-gradient(#66bdff, #0d9eff);

  background-image: url("chrome://browser/skin/search-arrow-go-rtl.svg"), linear-gradient(#66bdff, #0d9eff);

  fill: white;

}



#searchText + #searchSubmit:hover:active {

browser/base/content/newtab/newTab.css

+10 −5
Original line number Diff line number Diff line
@@ -400,7 +400,9 @@ body.compact #newtab-search-container { 
#newtab-search-submit {

  margin-inline-start: -1px;

  color: transparent;

  background: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go") center center no-repeat, linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1)) padding-box;

  background: url("chrome://browser/skin/search-arrow-go.svg") center center no-repeat, linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1)) padding-box;

  -moz-context-properties: fill;

  fill: #616366;

  padding: 0;

  border: 1px solid;

  border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
@@ -416,7 +418,7 @@ body.compact #newtab-search-container { 


#newtab-search-submit:dir(rtl) {

  border-radius: 2px 0 0 2px;

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-rtl"), linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1));

  background-image: url("chrome://browser/skin/search-arrow-go-rtl.svg"), linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1));

}



#newtab-search-text:focus + #newtab-search-submit,
@@ -428,14 +430,16 @@ body.compact #newtab-search-container { 
#newtab-search-text:focus + #newtab-search-submit,

#newtab-search-text[keepfocus] + #newtab-search-submit,

#newtab-search-text[autofocus] + #newtab-search-submit {

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-inverted"), linear-gradient(#4cb1ff, #1793e5);

  background-image: url("chrome://browser/skin/search-arrow-go.svg"), linear-gradient(#4cb1ff, #1793e5);

  fill: white;

  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,

              0 0 0 1px hsla(0,0%,100%,.1) inset,

              0 1px 0 hsla(210,54%,20%,.03);

}



#newtab-search-text + #newtab-search-submit:hover {

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-inverted"), linear-gradient(#4cb1ff, #1793e5);

  background-image: url("chrome://browser/skin/search-arrow-go.svg"), linear-gradient(#4cb1ff, #1793e5);

  fill: white;

  box-shadow: 0 1px 0 hsla(0,0%,100%,.2) inset,

              0 0 0 1px hsla(0,0%,100%,.1) inset,

              0 1px 0 hsla(210,54%,20%,.03),
@@ -452,7 +456,8 @@ body.compact #newtab-search-container { 
#newtab-search-text[keepfocus] + #newtab-search-submit:dir(rtl),

#newtab-search-text[autofocus] + #newtab-search-submit:dir(rtl),

#newtab-search-text + #newtab-search-submit:dir(rtl):hover {

  background-image: url("chrome://browser/skin/search-arrow-go.svg#search-arrow-go-rtl-inverted"), linear-gradient(#4cb1ff, #1793e5);

  background-image: url("chrome://browser/skin/search-arrow-go-rtl.svg"), linear-gradient(#4cb1ff, #1793e5);

  fill: white;

}



/* CUSTOMIZE */

browser/themes/shared/jar.inc.mn

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ 
  skin/classic/browser/search-history-icon.svg                 (../shared/search/history-icon.svg)

  skin/classic/browser/search-indicator-magnifying-glass.svg   (../shared/search/search-indicator-magnifying-glass.svg)

  skin/classic/browser/search-arrow-go.svg                     (../shared/search/search-arrow-go.svg)

  skin/classic/browser/search-arrow-go-rtl.svg                 (../shared/search/search-arrow-go-rtl.svg)

  skin/classic/browser/gear.svg                                (../shared/search/gear.svg)

  skin/classic/browser/tabbrowser/connecting.png               (../shared/tabbrowser/connecting.png)

  skin/classic/browser/tabbrowser/connecting@2x.png            (../shared/tabbrowser/connecting@2x.png)