Bug 214832 some web pages bookmark as [object HTMLImageElement] r=caillon sr=bz

xpfe/browser/resources/content/navigator.xul

@@ -72,6 +72,7 @@ Contributor(s):
   <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/XPCNativeWrapper.js"/>
 
   <!-- Shared Bookmarks Utility Library -->
   <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>

xpfe/components/bookmarks/resources/bm-panel.xul

@@ -45,6 +45,7 @@
   <!-- XXX - would like to cut this dependency out -->
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/XPCNativeWrapper.js"/>
 
   <!-- Bookmarks Shell -->
   <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>

xpfe/components/bookmarks/resources/bookmarks.js

@@ -1512,7 +1512,7 @@ var BookmarksUtils = {
       var name = "";
       var charset;
       try {
-        var doc = webNav.document;
+        var doc = new XPCNativeWrapper(webNav.document, "title", "characterSet");
         name = doc.title || url;
         charset = doc.characterSet;
       } catch (e) {
@@ -1541,8 +1541,9 @@ var BookmarksUtils = {
     var url = aDocShell.currentURI.spec;
     var title, docCharset = null;
     try {
-      title = aDocShell.document.title || url;
-      docCharset = aDocShell.document.characterSet;
+      var doc = new XPCNativeWrapper(aDocShell.document, "title", "characterSet");
+      title = doc.title || url;
+      docCharset = doc.characterSet;
     }
     catch (e) {
       title = url;