Bug 868891 - Fix regression introduced by Bug 860934. r=dougt
authorDave Hylands <dhylands@mozilla.com>
Fri, 10 May 2013 10:58:45 -0700
changeset 131581 096bac1de6eeed070652e0ec9e1e23730293f73f
parent 131545 844adf9c7f2e7c13e620151a3d6221ad5e6a7261
child 131582 acf88070ceba6244020a27bbff3fe01d9f6f6349
push id27914
push userryanvm@gmail.com
push dateSat, 11 May 2013 13:49:14 +0000
treeherdermozilla-inbound@aa2ce091b9fe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougt
bugs868891, 860934
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 868891 - Fix regression introduced by Bug 860934. r=dougt Bug 860934 removed the use of fully qualified paths when communicating between the parent and child processes. This patch fixes one of the spots that got missed.
dom/devicestorage/nsDeviceStorage.cpp
--- a/dom/devicestorage/nsDeviceStorage.cpp
+++ b/dom/devicestorage/nsDeviceStorage.cpp
@@ -403,26 +403,18 @@ FileUpdateDispatcher::Observe(nsISupport
 {
   if (XRE_GetProcessType() != GeckoProcessType_Default) {
 
     DeviceStorageFile* file = static_cast<DeviceStorageFile*>(aSubject);
     if (!file || !file->mFile) {
       NS_WARNING("Device storage file looks invalid!");
       return NS_OK;
     }
-
-    nsString fullpath;
-    nsresult rv = file->mFile->GetPath(fullpath);
-    if (NS_FAILED(rv)) {
-      NS_WARNING("Could not get path from the nsIFile!");
-      return NS_OK;
-    }
-
     ContentChild::GetSingleton()->SendFilePathUpdateNotify(file->mStorageType,
-                                                           fullpath,
+                                                           file->mPath,
                                                            NS_ConvertUTF16toUTF8(aData));
   } else {
     nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
     obs->NotifyObservers(aSubject, "file-watcher-update", aData);
   }
   return NS_OK;
 }