diff --git a/layout/Makefile.in b/layout/Makefile.in
index 312ddb163945..01ef2692b0d5 100644
--- a/layout/Makefile.in
+++ b/layout/Makefile.in
@@ -63,7 +63,7 @@ endif
 
 PARALLEL_DIRS += inspector/public inspector/src
 ifdef ENABLE_TESTS
-PARALLEL_DIRS += inspector/tests
+PARALLEL_DIRS += inspector/tests inspector/tests/chrome
 endif
 
 DIRS           += build
diff --git a/layout/inspector/tests/chrome/GentiumPlus-R.woff b/layout/inspector/tests/chrome/GentiumPlus-R.woff
new file mode 100755
index 000000000000..e9b2e8a814b9
Binary files /dev/null and b/layout/inspector/tests/chrome/GentiumPlus-R.woff differ
diff --git a/layout/inspector/tests/chrome/Makefile.in b/layout/inspector/tests/chrome/Makefile.in
new file mode 100644
index 000000000000..4518bb32139e
--- /dev/null
+++ b/layout/inspector/tests/chrome/Makefile.in
@@ -0,0 +1,54 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+relativesrcdir	= layout/inspector/tests/chrome
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+_CHROME_FILES =\
+		test_bug467669.xul \
+		test_bug467669.css \
+		GentiumPlus-R.woff \
+		$(NULL)
+
+libs:: $(_CHROME_FILES)
+	$(INSTALL) $^ $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
diff --git a/layout/inspector/tests/chrome/test_bug467669.css b/layout/inspector/tests/chrome/test_bug467669.css
new file mode 100644
index 000000000000..fb050bf31957
--- /dev/null
+++ b/layout/inspector/tests/chrome/test_bug467669.css
@@ -0,0 +1,8 @@
+@font-face {
+  font-family: font-face-test-family;
+  src: url(bad/font/name.ttf), url(GentiumPlus-R.woff) format("woff");
+}
+
+.gentium {
+  font-family: font-face-test-family;
+}
diff --git a/layout/inspector/tests/chrome/test_bug467669.xul b/layout/inspector/tests/chrome/test_bug467669.xul
new file mode 100644
index 000000000000..9325eba1ea8a
--- /dev/null
+++ b/layout/inspector/tests/chrome/test_bug467669.xul
@@ -0,0 +1,175 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
+<?xml-stylesheet type="text/css" href="test_bug467669.css"?>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=467669
+-->
+<window title="Mozilla Bug 467669"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="RunTest();">
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <!-- test code goes here -->
+  <script type="application/javascript">
+  <![CDATA[
+  /** Test for Bug 467669 **/
+
+SimpleTest.waitForExplicitFinish();
+
+function RunTest() {
+  const CI = Components.interfaces;
+  const CC = Components.classes;
+
+  const kIsLinux = navigator.platform.indexOf("Linux") == 0;
+  const kIsMac = navigator.platform.indexOf("Mac") == 0;
+  const kIsWin = navigator.platform.indexOf("Win") == 0;
+
+  var domUtils =
+    CC["@mozilla.org/inspector/dom-utils;1"].getService(CI.inIDOMUtils);
+
+  var rng = document.createRange();
+  var elem, fonts, f;
+
+  elem = document.getElementById("test1");
+  rng.selectNode(elem);
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 1, "number of fonts for simple Latin text");
+  f = fonts.item(0);
+  is(f.rule, null, "rule");
+  is(f.srcIndex, -1, "srcIndex");
+  is(f.localName, "", "local name");
+  is(f.URI, "", "URI");
+  is(f.format, "", "format string");
+  is(f.metadata, "", "metadata");
+//  report(elem.id, fonts);
+
+  elem = document.getElementById("test2");
+  rng.selectNode(elem);
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 3, "number of fonts for mixed serif, sans and monospaced text");
+//  report(elem.id, fonts);
+
+  elem = document.getElementById("test3");
+  rng.selectNode(elem);
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 2, "number of fonts for mixed Latin & Chinese");
+//  report(elem.id, fonts);
+
+  // get properties of a @font-face font
+  elem = document.getElementById("test4");
+  rng.selectNode(elem);
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 1, "number of fonts in @font-face test");
+  f = fonts.item(0);
+  isnot(f.rule, null, "missing rule");
+  is(f.srcIndex, 1, "srcIndex");
+  is(f.localName, "", "local name");
+  is(f.URI, "chrome://mochitests/content/chrome/layout/inspector/tests/chrome/GentiumPlus-R.woff", "bad URI");
+  is(f.format, "woff", "format");
+  is(/bukva:raz/.test(f.metadata), true, "metadata");
+//  report(elem.id, fonts);
+
+  elem = document.getElementById("test5").childNodes[0];
+  // check that string length is as expected, including soft hyphens
+  is(elem.length, 42, "string length with soft hyphens");
+
+  // initial latin substring...
+  rng.setStart(elem, 0);
+  rng.setEnd(elem, 20); // "supercalifragilistic"
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 1, "number of fonts (Latin-only)");
+  f = fonts.item(0);
+  is(f.name, "Gentium Plus", "font name");
+  is(f.CSSFamilyName, "font-face-test-family", "family name");
+  is(f.fromFontGroup, true, "font matched in font group");
+
+  // extend to include a chinese character
+  rng.setEnd(elem, 21);
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 2, "number of fonts (incl Chinese)");
+  if (kIsMac || kIsWin) { // these are only implemented by the Mac & Win font backends
+    var i;
+    for (i = 0; i < fonts.length; ++i) {
+      f = fonts.item(i);
+      if (f.rule) {
+        is(f.fromFontGroup, true, "@font-face font matched in group");
+        is(f.fromLanguagePrefs, false, "not from language prefs");
+        is(f.fromSystemFallback, false, "not from system fallback");
+      } else {
+        is(f.fromFontGroup, false, "not matched in group");
+        is(f.fromLanguagePrefs, true, "from language prefs");
+        is(f.fromSystemFallback, false, "not from system fallback");
+      }
+    }
+  }
+
+  // second half of the string includes &shy; chars to check original/skipped mapping;
+  // select just the final character
+  rng.setStart(elem, elem.length - 1);
+  rng.setEnd(elem, elem.length);
+  is(rng.toString(), "!", "content of range");
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 1, "number of fonts for last char");
+  f = fonts.item(0);
+  is(f.name, "Gentium Plus", "font name");
+
+  // include the preceding character as well
+  rng.setStart(elem, elem.length - 2);
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 2, "number of fonts for last two chars");
+
+  // then trim the final one
+  rng.setEnd(elem, elem.length - 1);
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 1, "number of fonts for Chinese char");
+  f = fonts.item(0);
+  isnot(f.name, "Gentium Plus", "font name for Chinese char");
+
+  rng.selectNode(elem);
+  fonts = domUtils.getUsedFontFaces(rng);
+//  report("test5", fonts);
+
+  elem = document.getElementById("test6");
+  rng.selectNode(elem);
+  fonts = domUtils.getUsedFontFaces(rng);
+  is(fonts.length, 2, "number of font faces for regular & italic");
+  is(fonts.item(0).CSSFamilyName, fonts.item(1).CSSFamilyName, "same family for regular & italic");
+  isnot(fonts.item(0).name, fonts.item(1).name, "different faces for regular & italic");
+//  report(elem.id, fonts);
+
+  SimpleTest.finish();
+}
+
+// just for test-debugging purposes
+function report(e, f) {
+  var fontNames = "";
+  var i;
+  for (i = 0; i < f.length; ++i) {
+    if (i == 0) {
+      fontNames += e + " fonts: "
+    } else {
+      fontNames += ", ";
+    }
+    fontNames += f.item(i).name;
+  }
+  dump(fontNames + "\n");
+}
+
+  ]]>
+  </script>
+
+  <!-- html:body contains elements the test will inspect -->
+  <body xmlns="http://www.w3.org/1999/xhtml">
+  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=467669"
+     target="_blank">Mozilla Bug 467669</a>
+  <div id="test1">Hello world</div>
+  <div id="test2" style="font-family:sans-serif"><span style="font-family:serif">Hello</span> <tt>cruel</tt> world</div>
+  <div id="test3">Hello, &#x4F60;&#x597D;</div>
+  <div id="test4" class="gentium">Hello Gentium Plus!</div>
+  <div id="test5" class="gentium">supercalifragilistic&#x4F60;ex&#xAD;pi&#xAD;a&#xAD;li&#xAD;do&#xAD;cious&#x597D;!</div>
+  <div id="test6" style="font-family:serif">regular and <em>italic</em> text</div>
+  </body>
+
+</window>