Bug 714597 - GfxInfoCollector.h used in Thebes API should not depend on internal string API. r=roc
authorDavid Marteau <daim.project@free.fr>
Tue, 03 Jan 2012 13:19:58 +0100
changeset 84909 93d49e745ff710081763774ffdb6cfffe23966d3
parent 84908 e779821f3395bfd91ae6d89edf02f27b52d6031c
child 84910 79b42c063508b0c5c584d9ae38b1a30f5f78c49c
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs714597
milestone12.0a1
Bug 714597 - GfxInfoCollector.h used in Thebes API should not depend on internal string API. r=roc
widget/src/xpwidgets/GfxInfoCollector.h
--- a/widget/src/xpwidgets/GfxInfoCollector.h
+++ b/widget/src/xpwidgets/GfxInfoCollector.h
@@ -61,17 +61,17 @@ class InfoObject
     mOk = JS_DefineProperty(mCx, mObj, name, INT_TO_JSVAL(value), NULL, NULL, JSPROP_ENUMERATE);
   }
 
   void DefineProperty(const char *name, nsAString &value)
   {
     if (!mOk)
       return;
 
-    const nsPromiseFlatString &flat = PromiseFlatString(value);
+    const nsString &flat = PromiseFlatString(value);
     JSString *string = JS_NewUCStringCopyN(mCx, static_cast<const jschar*>(flat.get()), flat.Length());
     if (!string)
       mOk = JS_FALSE;
 
     if (!mOk)
       return;
 
     mOk = JS_DefineProperty(mCx, mObj, name, STRING_TO_JSVAL(string), NULL, NULL, JSPROP_ENUMERATE);