[Tizen] Fix differenct size casting issue accepted/tizen/unified/20190514.120100 submit/tizen/20190514.115711
authorJiyun Yang <ji.yang@samsung.com>
Tue, 14 May 2019 11:50:47 +0000 (20:50 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Tue, 14 May 2019 11:50:57 +0000 (20:50 +0900)
Change-Id: Ief4025a91a50db2612a32bf035a0787a52fda0f0
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
dali-extension/web-engine-chromium/tizen-web-engine-chromium.h

index 49abe8a..6660d45 100644 (file)
@@ -215,7 +215,7 @@ public:
     return ewk_view_forward_possible( mWebView );
   }
 
-  void EvaluateJavaScript( uint32_t key, const std::string& script )
+  void EvaluateJavaScript( size_t key, const std::string& script )
   {
     ewk_view_script_execute( mWebView, script.c_str(), OnEvaluateJavaScript, (void*)key );
   }
@@ -436,7 +436,7 @@ private:
     auto client = WebEngineManager::Get().FindContainerClient( o );
     if( client )
     {
-      client->RunJavaScriptEvaluationResultHandler( (int)data, result );
+      client->RunJavaScriptEvaluationResultHandler( (size_t)data, result );
     }
   }
 
@@ -868,7 +868,7 @@ void TizenWebEngineChromium::LoadError( const char* url, int errorCode )
   mLoadErrorSignal.Emit( stdUrl, errorCode );
 }
 
-void TizenWebEngineChromium::RunJavaScriptEvaluationResultHandler( uint32_t key, const char* result )
+void TizenWebEngineChromium::RunJavaScriptEvaluationResultHandler( size_t key, const char* result )
 {
   auto handler = mJavaScriptEvaluationResultHandlers.find( key );
   if( handler == mJavaScriptEvaluationResultHandlers.end() )
index deab68b..cf1f53f 100644 (file)
@@ -71,7 +71,7 @@ public:
    * @param [in] result Result string from JavaScript runtime
    * @see Dali::Plugin::TizenWebEngineChromium::EvaluateJavaScript
    */
-  virtual void RunJavaScriptEvaluationResultHandler( uint32_t key, const char* result ) = 0;
+  virtual void RunJavaScriptEvaluationResultHandler( size_t key, const char* result ) = 0;
 
   /**
    * @brief Callback function to be called by WebViewContainer when a message handler is called from JavaScript runtime.
@@ -328,7 +328,7 @@ public:
   /**
    * @copydoc Dali::Plugin::WebViewContainerClient::RunJavaScriptEvaluationResultHandler()
    */
-  void RunJavaScriptEvaluationResultHandler( uint32_t key, const char* result ) override;
+  void RunJavaScriptEvaluationResultHandler( size_t key, const char* result ) override;
 
   /**
    * @copydoc Dali::Plugin::WebViewContainerClient::RunJavaScriptMessageHandler()
@@ -340,13 +340,13 @@ private:
   WebViewContainerForDali*                                mWebViewContainer;
   Dali::NativeImageSourcePtr                              mDaliImageSrc;
   std::string                                             mUrl;
-  uint32_t                                                mJavaScriptEvaluationCount;
+  size_t                                                  mJavaScriptEvaluationCount;
 
   Dali::WebEnginePlugin::WebEnginePageLoadSignalType      mLoadStartedSignal;
   Dali::WebEnginePlugin::WebEnginePageLoadSignalType      mLoadFinishedSignal;
   Dali::WebEnginePlugin::WebEnginePageLoadErrorSignalType mLoadErrorSignal;
 
-  std::unordered_map< uint32_t, JavaScriptCallback >      mJavaScriptEvaluationResultHandlers;
+  std::unordered_map< size_t, JavaScriptCallback >        mJavaScriptEvaluationResultHandlers;
   std::unordered_map< std::string, JavaScriptCallback >   mJavaScriptMessageHandlers;
 };
 } // namespace Plugin