projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement WebEngine::GetPlainTextAsynchronously
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
web-engine
/
common
/
web-engine-impl.cpp
diff --git
a/dali/internal/web-engine/common/web-engine-impl.cpp
b/dali/internal/web-engine/common/web-engine-impl.cpp
index
b6539f8
..
f4753f0
100755
(executable)
--- a/
dali/internal/web-engine/common/web-engine-impl.cpp
+++ b/
dali/internal/web-engine/common/web-engine-impl.cpp
@@
-401,12
+401,12
@@
void WebEngine::GoBack()
mPlugin->GoBack();
}
mPlugin->GoBack();
}
-void WebEngine::EvaluateJavaScript(const std::string& script,
std::function<void(const std::string&)>
resultHandler)
+void WebEngine::EvaluateJavaScript(const std::string& script,
Dali::WebEnginePlugin::JavaScriptMessageHandlerCallback
resultHandler)
{
mPlugin->EvaluateJavaScript(script, resultHandler);
}
{
mPlugin->EvaluateJavaScript(script, resultHandler);
}
-void WebEngine::AddJavaScriptMessageHandler(const std::string& exposedObjectName,
std::function<void(const std::string&)>
handler)
+void WebEngine::AddJavaScriptMessageHandler(const std::string& exposedObjectName,
Dali::WebEnginePlugin::JavaScriptMessageHandlerCallback
handler)
{
mPlugin->AddJavaScriptMessageHandler(exposedObjectName, handler);
}
{
mPlugin->AddJavaScriptMessageHandler(exposedObjectName, handler);
}
@@
-571,84
+571,89
@@
bool WebEngine::SendWheelEvent(const Dali::WheelEvent& event)
return mPlugin->SendWheelEvent(event);
}
return mPlugin->SendWheelEvent(event);
}
-Dali::WebEnginePlugin::WebEngine
PageLoadSignalType& WebEngine::PageLoadStart
edSignal()
+Dali::WebEnginePlugin::WebEngine
FrameRenderedSignalType& WebEngine::FrameRender
edSignal()
{
{
- return mPlugin->
PageLoadStart
edSignal();
+ return mPlugin->
FrameRender
edSignal();
}
}
-
Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadInProgressSignal(
)
+
void WebEngine::RegisterPageLoadStartedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback
)
{
{
-
return mPlugin->PageLoadInProgressSignal(
);
+
mPlugin->RegisterPageLoadStartedCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEnginePageLoadSignalType& WebEngine::PageLoadFinishedSignal(
)
+
void WebEngine::RegisterPageLoadInProgressCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback
)
{
{
-
return mPlugin->PageLoadFinishedSignal(
);
+
mPlugin->RegisterPageLoadInProgressCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEnginePageLoadErrorSignalType& WebEngine::PageLoadErrorSignal(
)
+
void WebEngine::RegisterPageLoadFinishedCallback(Dali::WebEnginePlugin::WebEnginePageLoadCallback callback
)
{
{
-
return mPlugin->PageLoadErrorSignal(
);
+
mPlugin->RegisterPageLoadFinishedCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineScrollEdgeReachedSignalType& WebEngine::ScrollEdgeReachedSignal(
)
+
void WebEngine::RegisterPageLoadErrorCallback(Dali::WebEnginePlugin::WebEnginePageLoadErrorCallback callback
)
{
{
-
return mPlugin->ScrollEdgeReachedSignal(
);
+
mPlugin->RegisterPageLoadErrorCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineUrlChangedSignalType& WebEngine::UrlChangedSignal(
)
+
void WebEngine::RegisterScrollEdgeReachedCallback(Dali::WebEnginePlugin::WebEngineScrollEdgeReachedCallback callback
)
{
{
-
return mPlugin->UrlChangedSignal(
);
+
mPlugin->RegisterScrollEdgeReachedCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineFormRepostDecisionSignalType& WebEngine::FormRepostDecisionSignal(
)
+
void WebEngine::RegisterUrlChangedCallback(Dali::WebEnginePlugin::WebEngineUrlChangedCallback callback
)
{
{
-
return mPlugin->FormRepostDecisionSignal(
);
+
mPlugin->RegisterUrlChangedCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineFrameRenderedSignalType& WebEngine::FrameRenderedSignal(
)
+
void WebEngine::RegisterFormRepostDecidedCallback(Dali::WebEnginePlugin::WebEngineFormRepostDecidedCallback callback
)
{
{
- return mPlugin->FrameRenderedSignal();
+ mPlugin->RegisterFormRepostDecidedCallback(callback);
+}
+
+void WebEngine::RegisterRequestInterceptorCallback(Dali::WebEnginePlugin::WebEngineRequestInterceptorCallback callback)
+{
+ mPlugin->RegisterRequestInterceptorCallback(callback);
}
}
-
Dali::WebEnginePlugin::WebEngineRequestInterceptorSignalType& WebEngine::RequestInterceptorSignal(
)
+
void WebEngine::RegisterConsoleMessageReceivedCallback(Dali::WebEnginePlugin::WebEngineConsoleMessageReceivedCallback callback
)
{
{
-
return mPlugin->RequestInterceptorSignal(
);
+
mPlugin->RegisterConsoleMessageReceivedCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineConsoleMessageSignalType& WebEngine::ConsoleMessageSignal(
)
+
void WebEngine::RegisterResponsePolicyDecidedCallback(Dali::WebEnginePlugin::WebEngineResponsePolicyDecidedCallback callback
)
{
{
-
return mPlugin->ConsoleMessageSignal(
);
+
mPlugin->RegisterResponsePolicyDecidedCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineResponsePolicyDecisionSignalType& WebEngine::ResponsePolicyDecisionSignal(
)
+
void WebEngine::RegisterCertificateConfirmedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback
)
{
{
-
return mPlugin->ResponsePolicyDecisionSignal(
);
+
mPlugin->RegisterCertificateConfirmedCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineCertificateSignalType& WebEngine::CertificateConfirmSignal(
)
+
void WebEngine::RegisterSslCertificateChangedCallback(Dali::WebEnginePlugin::WebEngineCertificateCallback callback
)
{
{
-
return mPlugin->CertificateConfirmSignal(
);
+
mPlugin->RegisterSslCertificateChangedCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineCertificateSignalType& WebEngine::SslCertificateChangedSignal(
)
+
void WebEngine::RegisterHttpAuthHandlerCallback(Dali::WebEnginePlugin::WebEngineHttpAuthHandlerCallback callback
)
{
{
-
return mPlugin->SslCertificateChangedSignal(
);
+
mPlugin->RegisterHttpAuthHandlerCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineHttpAuthHandlerSignalType& WebEngine::HttpAuthHandlerSignal(
)
+
void WebEngine::RegisterContextMenuShownCallback(Dali::WebEnginePlugin::WebEngineContextMenuShownCallback callback
)
{
{
-
return mPlugin->HttpAuthHandlerSignal(
);
+
mPlugin->RegisterContextMenuShownCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineContextMenuShownSignalType& WebEngine::ContextMenuShownSignal(
)
+
void WebEngine::RegisterContextMenuHiddenCallback(Dali::WebEnginePlugin::WebEngineContextMenuHiddenCallback callback
)
{
{
-
return mPlugin->ContextMenuShownSignal(
);
+
mPlugin->RegisterContextMenuHiddenCallback(callback
);
}
}
-
Dali::WebEnginePlugin::WebEngineContextMenuHiddenSignalType& WebEngine::ContextMenuHiddenSignal(
)
+
void WebEngine::GetPlainTextAsynchronously(Dali::WebEnginePlugin::PlainTextReceivedCallback callback
)
{
{
-
return mPlugin->ContextMenuHiddenSignal(
);
+
mPlugin->GetPlainTextAsynchronously(callback
);
}
} // namespace Adaptor
}
} // namespace Adaptor