Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[webview_flutter] Add evaluateJavascript() function #25

Merged
merged 1 commit into from
Jan 26, 2021
Merged

[webview_flutter] Add evaluateJavascript() function #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions packages/webview_flutter/tizen/src/webview.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

#include "webview.h"

#include <Ecore_IMF_Evas.h>
#include <Ecore_Input_Evas.h>
#include <flutter/method_channel.h>
#include <flutter/plugin_registrar.h>
#include <flutter/standard_method_codec.h>
#include <flutter/standard_message_codec.h>
#include <flutter_platform_view.h>
#include <flutter_texture_registrar.h>
#include "webview_flutter_tizen_plugin.h"
#include "webview.h"

#include <map>
#include <memory>
Expand All @@ -18,10 +17,6 @@
#include "lwe/PlatformIntegrationData.h"
#include "webview_factory.h"

#include <Ecore_Input_Evas.h>
#include <Ecore_IMF_Evas.h>


#define LWE_EXPORT
extern "C" size_t LWE_EXPORT createWebViewInstance(
unsigned x, unsigned y, unsigned width, unsigned height,
Expand Down Expand Up @@ -64,12 +59,12 @@ WebView::WebView(flutter::PluginRegistrar* registrar, int viewId,
FlutterTextureRegistrar* textureRegistrar, double width,
double height, const std::string initialUrl)
: PlatformView(registrar, viewId),
tbmSurface_(nullptr),
textureRegistrar_(textureRegistrar),
webViewInstance_(nullptr),
currentUrl_(initialUrl),
width_(width),
height_(height) {
height_(height),
tbmSurface_(nullptr) {
SetTextureId(FlutterRegisterExternalTexture(textureRegistrar_));
InitWebView();
auto channel =
Expand Down Expand Up @@ -473,7 +468,9 @@ void WebView::InitWebView() {
}
float scaleFactor = 1;

webViewInstance_ = (LWE::WebContainer*)createWebViewInstance(0,0,width_, height_,scaleFactor, "SamsungOneUI", "ko-KR", "Asia/Seoul",[this]() -> LWE::WebContainer::ExternalImageInfo {
webViewInstance_ = (LWE::WebContainer*)createWebViewInstance(
0, 0, width_, height_, scaleFactor, "SamsungOneUI", "ko-KR", "Asia/Seoul",
[this]() -> LWE::WebContainer::ExternalImageInfo {
LWE::WebContainer::ExternalImageInfo result;
tbmSurface_ = tbm_surface_create(width_, height_, TBM_FORMAT_ARGB8888);
tbm_surface_info_s tbmSurfaceInfo;
Expand All @@ -482,7 +479,8 @@ void WebView::InitWebView() {
result.imageAddress = (void*)tbmSurface_;
}
return result;
}, [this](LWE::WebContainer* c) {
},
[this](LWE::WebContainer* c) {
FlutterMarkExternalTextureFrameAvailable(textureRegistrar_,
GetTextureId(), tbmSurface_);
tbm_surface_destroy(tbmSurface_);
Expand Down Expand Up @@ -528,7 +526,19 @@ void WebView::HandleMethodCall(
} else if (methodName.compare("currentUrl") == 0) {
result->Success(flutter::EncodableValue(GetCurrentUrl().c_str()));
} else if (methodName.compare("evaluateJavascript") == 0) {
result->NotImplemented();
if (std::holds_alternative<std::string>(arguments)) {
std::string jsString = std::get<std::string>(arguments);
webViewInstance_->EvaluateJavaScript(
jsString, [res = result.release()](std::string value) {
LOG_DEBUG("value: %s\n", value.c_str());
if (res) {
res->Success(flutter::EncodableValue(value));
delete res;
}
});
} else {
result->Error("Invalid Arguments", "Invalid Arguments");
}
} else if (methodName.compare("addJavascriptChannels") == 0) {
result->NotImplemented();
} else if (methodName.compare("removeJavascriptChannels") == 0) {
Expand Down
4 changes: 4 additions & 0 deletions packages/webview_flutter/tizen/src/webview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#ifndef FLUTTER_PLUGIN_WEBVIEW_FLUTTER_TIZEN_WEVIEW_H_
#define FLUTTER_PLUGIN_WEBVIEW_FLUTTER_TIZEN_WEVIEW_H_

#include <flutter/plugin_registrar.h>
#include <flutter/standard_message_codec.h>
#include <flutter/standard_method_codec.h>
#include <flutter_platform_view.h>
#include <flutter_plugin_registrar.h>
#include <flutter_texture_registrar.h>
#include <tbm_surface.h>

// #include "lwe/LWEWebView.h"
Expand Down