From: Piotr Kosko <p.kosko@samsung.com>
Date: Wed, 28 Mar 2018 11:20:31 +0000 (+0200)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen/20180403.060641~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F174138%2F1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/download/download_instance.cc

Change-Id: Ib5546e2489ffdd603e5889e895707b0800209174
---

57ac6a792c35c6e1bc858cce2451444959e88953
diff --cc src/content/content_manager.cc
index 9ae3bb4f,edd86d51..53c79bc8
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@@ -1383,7 -1383,10 +1383,10 @@@ int ContentManager::getLyrics(const pic
    }
  
    metadata_extractor_h extractor;
-   metadata_extractor_create(&extractor);
+   ret = metadata_extractor_create(&extractor);
+   if (METADATA_EXTRACTOR_ERROR_NONE != ret) {
 -    LOGGER(ERROR) << "metadata_extractor_create failed, error: " << ret;
++    LoggerE("metadata_extractor_create failed, error: %d", ret);
+   }
    std::unique_ptr<std::remove_pointer<metadata_extractor_h>::type, int (*)(metadata_extractor_h)>
        extractor_ptr(extractor, &metadata_extractor_destroy);  // automatically release the memory
  
diff --cc src/download/download_instance.cc
index 722123f2,4e1fa39f..a2770b3e
--- a/src/download/download_instance.cc
+++ b/src/download/download_instance.cc
@@@ -318,15 -314,13 +318,14 @@@ gboolean DownloadInstance::OnFinished(v
        LoggerW("%s", get_error_message(ret));
      }
      out["status"] = picojson::value("completed");
+     out["fullPath"] =
+         picojson::value(common::FilesystemProvider::Create().GetVirtualPath(fullPath));
    }
- 
 -  out["callbackId"] = picojson::value(static_cast<double>(callback_id));
 +  out["downloadId"] = picojson::value(static_cast<double>(download_id));
  
-   out["fullPath"] = picojson::value(common::FilesystemProvider::Create().GetVirtualPath(fullPath));
 -  Instance::PostMessage(downCbPtr->instance, picojson::value(out).serialize().c_str());
 -  // downCbPtr is freed in destructor, it prevent from crash if OnFinished state
 +  out["listenerId"] = picojson::value(kDownloadManagerListenerId);
- 
 +  Instance::PostMessage(down_cb_ptr->instance, picojson::value(out).serialize().c_str());
 +  // down_cb_ptr is freed in destructor, it prevent from crash if OnFinished state
    // was called after OnCanceled or OnFailed
    free(fullPath);