Merge heads

2015-07-30 12:32:10 -04:00 · 2015-07-30 12:32:10 -04:00 · 1e791c039d
--- a/browser/themes/shared/devtools/filters.svg
+++ b/browser/themes/shared/devtools/filters.svg
@ -3,7 +3,8 @@
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

 <svg height="0" xmlns="http://www.w3.org/2000/svg">
-  <filter id="invert" x="0%" y="0%" width="100%" height="100%" >
+  <filter id="invert" x="0%" y="0%" width="100%" height="100%"
+          primitiveUnits="objectBoundingBox">
    <feComponentTransfer>
      <feFuncR type="table" tableValues=".1 0"/>
      <feFuncG type="table" tableValues=".1 0"/>