From: Piotr Kosko <p.kosko@samsung.com>
Date: Fri, 26 Jan 2018 10:10:36 +0000 (+0100)
Subject: Merge branch 'tizen_3.0' into tizen_4.0
X-Git-Tag: submit/tizen_4.0/20180126.102411^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd1c34159467ade993b575a633e78c52134bbab5;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
	src/download/download_instance.cc

Change-Id: I58ad10dac86b0a93074499fc839b30dd365b0f59
---

cd1c34159467ade993b575a633e78c52134bbab5
diff --cc src/download/download_instance.cc
index 4662cbf8,fda4c574..722123f2
--- a/src/download/download_instance.cc
+++ b/src/download/download_instance.cc
@@@ -196,10 -194,10 +196,11 @@@ void DownloadInstance::OnStateChanged(i
      return;
    }
  
 -  downCbPtr->state = state;
 -  downCbPtr->downloadId = download_id;
 +  down_cb_ptr->state = state;
 +  down_cb_ptr->native_download_id = download_id;
  
-   SLoggerD("State for callbackId %d changed to %d", down_cb_ptr->download_id, static_cast<int>(state));
 -  SLoggerD("State for callbackId %d changed to %d", downCbPtr->callbackId, static_cast<int>(state));
++  SLoggerD("State for callbackId %d changed to %d", down_cb_ptr->download_id,
++           static_cast<int>(state));
  
    switch (state) {
      case DOWNLOAD_STATE_NONE: