X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fweb-view%2Fweb-view.cpp;h=b777e7a23317a35158f033bd44ed1137e9255d0b;hb=177b9cb383ec5d87aab1521d5a925666478d90d6;hp=06c4ee9fbbf60b962867b5e3f83ab4db6b8846ec;hpb=f15407e1710844219f3e418e83e689b5ff7341c2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/controls/web-view/web-view.cpp b/dali-toolkit/devel-api/controls/web-view/web-view.cpp index 06c4ee9..b777e7a 100755 --- a/dali-toolkit/devel-api/controls/web-view/web-view.cpp +++ b/dali-toolkit/devel-api/controls/web-view/web-view.cpp @@ -59,7 +59,7 @@ WebView WebView::New(const std::string& locale, const std::string& timezoneId) return Internal::WebView::New(locale, timezoneId); } -WebView WebView::New(int argc, char** argv) +WebView WebView::New(uint32_t argc, char** argv) { return Internal::WebView::New(argc, argv); } @@ -169,12 +169,12 @@ bool WebView::StopInspectorServer() return Dali::Toolkit::GetImpl(*this).StopInspectorServer(); } -void WebView::ScrollBy(int deltaX, int deltaY) +void WebView::ScrollBy(int32_t deltaX, int32_t deltaY) { Dali::Toolkit::GetImpl(*this).ScrollBy(deltaX, deltaY); } -bool WebView::ScrollEdgeBy(int deltaX, int deltaY) +bool WebView::ScrollEdgeBy(int32_t deltaX, int32_t deltaY) { return Dali::Toolkit::GetImpl(*this).ScrollEdgeBy(deltaX, deltaY); } @@ -244,6 +244,16 @@ void WebView::JavaScriptPromptReply(const std::string& result) Dali::Toolkit::GetImpl(*this).JavaScriptPromptReply(result); } +std::unique_ptr WebView::CreateHitTest(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode) +{ + return Dali::Toolkit::GetImpl(*this).CreateHitTest(x, y, mode); +} + +bool WebView::CreateHitTestAsynchronously(int32_t x, int32_t y, Dali::WebEngineHitTest::HitTestMode mode, Dali::WebEnginePlugin::WebEngineHitTestCreatedCallback callback) +{ + return Dali::Toolkit::GetImpl(*this).CreateHitTestAsynchronously(x, y, mode, callback); +} + void WebView::ClearHistory() { Dali::Toolkit::GetImpl(*this).ClearHistory(); @@ -279,12 +289,12 @@ void WebView::AddDynamicCertificatePath(const std::string& host, const std::stri Dali::Toolkit::GetImpl(*this).AddDynamicCertificatePath(host, certPath); } -Dali::Toolkit::ImageView WebView::GetScreenshot(Dali::Rect viewArea, float scaleFactor) +Dali::Toolkit::ImageView WebView::GetScreenshot(Dali::Rect viewArea, float scaleFactor) { return Dali::Toolkit::GetImpl(*this).GetScreenshot(viewArea, scaleFactor); } -bool WebView::GetScreenshotAsynchronously(Dali::Rect viewArea, float scaleFactor, Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback callback) +bool WebView::GetScreenshotAsynchronously(Dali::Rect viewArea, float scaleFactor, Dali::Toolkit::WebView::WebViewScreenshotCapturedCallback callback) { return Dali::Toolkit::GetImpl(*this).GetScreenshotAsynchronously(viewArea, scaleFactor, callback); } @@ -349,9 +359,9 @@ WebView::WebViewConsoleMessageSignalType& WebView::ConsoleMessageSignal() return Dali::Toolkit::GetImpl(*this).ConsoleMessageSignal(); } -WebView::WebViewPolicyDecisionSignalType& WebView::PolicyDecisionSignal() +WebView::WebViewResponsePolicyDecisionSignalType& WebView::ResponsePolicyDecisionSignal() { - return Dali::Toolkit::GetImpl(*this).PolicyDecisionSignal(); + return Dali::Toolkit::GetImpl(*this).ResponsePolicyDecisionSignal(); } WebView::WebViewCertificateSignalType& WebView::CertificateConfirmSignal() @@ -369,6 +379,16 @@ WebView::WebViewHttpAuthHandlerSignalType& WebView::HttpAuthHandlerSignal() return Dali::Toolkit::GetImpl(*this).HttpAuthHandlerSignal(); } +WebView::WebViewContextMenuCustomizedSignalType& WebView::ContextMenuCustomizedSignal() +{ + return Dali::Toolkit::GetImpl(*this).ContextMenuCustomizedSignal(); +} + +WebView::WebViewContextMenuItemSelectedSignalType& WebView::ContextMenuItemSelectedSignal() +{ + return Dali::Toolkit::GetImpl(*this).ContextMenuItemSelectedSignal(); +} + WebView::WebView(Internal::WebView& implementation) : Control(implementation) {