impl->focusRing->requestToShow(IntPoint(event->position.x, event->position.y));
} else if (event->type == EWK_GESTURE_PAN) {
if (impl->exceedTouchMoveThreshold)
- impl->focusRing->hide();
+ impl->focusRing->requestToHide();
} else {
if (event->type != EWK_GESTURE_LONG_PRESS) {
#if ENABLE(TIZEN_CONTEXT_MENU_WEBKIT_2)
if (!impl->pageClient->isContextMenuVisible())
#endif
- impl->focusRing->hide();
+ impl->focusRing->requestToHide();
}
}
}
break;
#if ENABLE(TIZEN_DRAG_SUPPORT)
// 1. Check to start dragging.
- if (hitTestResultData.isDragSupport) {
+ if (hitTestResultData.isDragSupport && !hitTestResultData.isContentEditable) {
impl->pageClient->setDragPoint(scenePoint);
+ if (impl->pageClient->isDragMode()) {
+ impl->pageClient->setDragMode(false);
+ }
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
if (impl->focusRing)
impl->focusRing->show(IntRect(), true);
}
#endif
// 2. Check to show context menu.
- if (!hitTestResultData.absoluteImageURL.isEmpty()
- || !hitTestResultData.absoluteLinkURL.isEmpty()) {
+ if ((!hitTestResultData.absoluteImageURL.isEmpty() || !hitTestResultData.absoluteLinkURL.isEmpty())
+ && !hitTestResultData.isContentEditable) {
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
if (impl->focusRing)
impl->focusRing->show(IntRect(), true);
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
if (impl->focusRing) {
#if ENABLE(TIZEN_CONTEXT_MENU_WEBKIT_2)
- if (!impl->pageClient->isContextMenuVisible())
+ if (!impl->pageClient->isContextMenuVisible() || impl->pageClient->isTextSelectionMode())
#endif
- impl->focusRing->hide();
+ impl->focusRing->requestToHide();
}
#endif
impl->gestureClient->endDoubleTap(IntPoint(event->position.x, event->position.y));
break;
case EWK_GESTURE_LONG_PRESS:
-#if ENABLE(TIZEN_DRAG_SUPPORT)
- if (impl->pageClient->isDragMode())
- impl->pageClient->setDragMode(false);
-#endif
// Prcess endTap for LONG_PRESS gesture if text-selection and context menu did not work
impl->gestureClient->endTap(IntPoint(event->position.x, event->position.y));
break;
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
if (impl->focusRing && !(event->type == EWK_GESTURE_PAN && !impl->exceedTouchMoveThreshold))
- impl->focusRing->hide();
+ impl->focusRing->requestToHide(true);
#endif
switch (event->type) {
{
EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl, false);
- return impl->pageClient->textSelectionDown(IntPoint(x, y), true);
+ return impl->pageClient->textSelectionDown(IntPoint(x, y));
}
Eina_Bool _ewk_view_text_selection_move(Ewk_View_Smart_Data* smartData, int x, int y)
EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl, false);
IntPoint point(x, y);
- impl->pageClient->textSelectionMove(point, true);
+ impl->pageClient->textSelectionMove(point);
return true;
}
#endif
#if ENABLE(TIZEN_SCREEN_READER)
-Eina_Bool _ewk_view_screen_reader_command_execute(Ewk_View_Smart_Data* smartData, unsigned int command, int data1, int data2)
+Eina_Bool _ewk_view_screen_reader_action_execute(Ewk_View_Smart_Data* smartData, void* actionInfo)
{
EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl, false);
- return ScreenReaderProxy::screenReader().executeCommand(impl, command, data1, data2);
+ return ScreenReaderProxy::executeAction(impl, 0, static_cast<Elm_Access_Action_Info*>(actionInfo));
}
#endif
#endif // #if OS(TIZEN)
// elementary steal webview's focus during mouse up event
// So, added code that events are not propagated to smart parent according to guide from EFL
evas_object_propagate_events_set(ewkView, false);
-
-#if ENABLE(TIZEN_SCREEN_READER)
- ScreenReaderProxy::screenReader().addView(smartData->priv);
-#endif
#endif // #if OS(TIZEN)
#define CONNECT(s, c) evas_object_event_callback_add(ewkView, s, c, smartData)
EwkViewImpl::removeFromPageViewMap(ewkView);
EWK_VIEW_SD_GET(ewkView, smartData);
#if ENABLE(TIZEN_SCREEN_READER)
- ScreenReaderProxy::screenReader().removeView(smartData->priv);
+ ScreenReaderProxy::screenReader().finalize(smartData->priv);
+#endif
+#if ENABLE(TIZEN_INPUT_COLOR_PICKER)
+ // Close color picker if it's opened.
+ if (smartData && smartData->priv && smartData->priv->inputPicker->isColorPickerShown())
+ ewk_view_color_picker_color_set(ewkView, 0, 0, 0, 0);
#endif
if (smartData && smartData->priv)
_ewk_view_impl_del(smartData->priv);
#if ENABLE(TIZEN_WEBKIT2_TILED_AC)
evas_object_image_native_surface_set(smartData->image, 0);
+#if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY)
+ if (impl->pageClient->isVisible()) {
+ Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas);
+ impl->pageClient->updateViewportSize(IntSize(width, height), ecore_evas_rotation_get(ee));
+ } else
+ impl->pageClient->setDeferUpdateViewportSize(true);
+#else
+ Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas);
+ impl->pageClient->updateViewportSize(IntSize(width, height), ecore_evas_rotation_get(ee));
+#endif
+
#if ENABLE(TIZEN_RUNTIME_BACKEND_SELECTION)
if (!ewk_view_is_opengl_backend(ewkView))
_ewk_view_composite(smartData);
#endif
#if ENABLE(TIZEN_WEBKIT2_TILED_BACKING_STORE) && !ENABLE(TIZEN_WEBKIT2_EFL_WTR)
Ecore_Evas* ee = ecore_evas_ecore_evas_get(smartData->base.evas);
- impl->pageClient->updateViewportSize(IntSize(width, height), ecore_evas_rotation_get(ee));
+ int newAngle = ecore_evas_rotation_get(ee);
+#if ENABLE(TIZEN_WEBKIT2_VIEW_VISIBILITY)
+ if (impl->pageClient->deferUpdateViewportSize()) {
+ impl->pageClient->updateViewportSize(IntSize(width, height), newAngle);
+ }
+#endif
+ impl->pageClient->updateVisibleContentRectSize(IntSize(width, height));
if (ewk_view_is_opengl_backend(ewkView))
impl->pageClient->displayViewport();
#endif
if (evas_object_clipees_get(smartData->base.clipper))
evas_object_show(smartData->base.clipper);
evas_object_show(smartData->image);
+
+#if ENABLE(TIZEN_SCREEN_READER)
+ ScreenReaderProxy::screenReader().initialize(impl);
+#endif
}
static void _ewk_view_smart_hide(Evas_Object* ewkView)
api->formdata_candidate_is_showing = _ewk_view_smart_formdata_candidate_is_showing;
#endif
#if ENABLE(TIZEN_SCREEN_READER)
- api->screen_reader_command_execute = _ewk_view_screen_reader_command_execute;
+ api->screen_reader_action_execute = _ewk_view_screen_reader_action_execute;
#endif
#endif //#if OS(TIZEN)
impl->pageProxy->pageGroup()->preferences()->setForceCompositingMode(true);
impl->pageProxy->pageGroup()->preferences()->setFrameFlatteningEnabled(true);
impl->pageProxy->pageGroup()->preferences()->setAllowUniversalAccessFromFileURLs(true);
-
- int deviceWidth, deviceHeight;
- ecore_evas_screen_geometry_get(ecore_evas_ecore_evas_get(evas_object_evas_get(ewkView)), 0, 0, &deviceWidth, &deviceHeight);
- impl->pageProxy->pageGroup()->preferences()->setDeviceWidth(deviceWidth);
- impl->pageProxy->pageGroup()->preferences()->setDeviceHeight(deviceHeight);
#endif
impl->pageProxy->initializeWebPage();
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl, false);
+ impl->pageClient->prepareRestoredVisibleContectRect();
impl->pageProxy->reload(/*reloadFromOrigin*/ false);
impl->informURLChange();
smartData->api->formdata_candidate_update_data(smartData, candidateList);
- IntRect inputFieldRect = impl->pageClient->focusedNodeRect();
+ IntRect inputFieldRect = impl->transformToScene().mapRect(impl->pageClient->focusedNodeRect());
smartData->api->formdata_candidate_show(smartData, inputFieldRect.x(), inputFieldRect.y(), inputFieldRect.width(), inputFieldRect.height());
}
if (!passwordFormData.size())
return;
- String passwordFormAutofill = "try { function passwordFormAutofill() { var inputFields;";
+ String passwordFormAutofill = String::fromUTF8("try { function passwordFormAutofill() { var inputFields;");
for (size_t i = 0; i < passwordFormData.size(); i++) {
- passwordFormAutofill += String::format(" inputFields = document.getElementsByName(\"%s\");"
- " for (var i = 0; i < inputFields.length; i++)"
- " if (inputFields[i].tagName.toLowerCase() == \"input\" && (inputFields[i].type.toLowerCase() == \"text\" || inputFields[i].type.toLowerCase() == \"password\" || inputFields[i].type.toLowerCase() == \"email\"))"
- " inputFields[i].value = \"%s\";",
- passwordFormData[i].first.utf8().data(), passwordFormData[i].second.utf8().data());
+ passwordFormAutofill += String::fromUTF8(" inputFields = document.getElementsByName(\"");
+ passwordFormAutofill += passwordFormData[i].first;
+ passwordFormAutofill += String::fromUTF8("\");");
+ passwordFormAutofill += String::fromUTF8(" for (var i = 0; i < inputFields.length; i++)");
+ passwordFormAutofill += String::fromUTF8(" if (inputFields[i].tagName.toLowerCase() == \"input\" && (inputFields[i].type.toLowerCase() == \"text\" || inputFields[i].type.toLowerCase() == \"password\" || inputFields[i].type.toLowerCase() == \"email\"))");
+ passwordFormAutofill += String::fromUTF8(" inputFields[i].value = \"");
+ passwordFormAutofill += passwordFormData[i].second;
+ passwordFormAutofill += String::fromUTF8("\";");
}
- passwordFormAutofill += "} passwordFormAutofill(); } catch(e) { }";
+ passwordFormAutofill += String::fromUTF8("} passwordFormAutofill(); } catch(e) { }");
ewk_view_script_execute(ewkView, passwordFormAutofill.utf8().data(), 0, 0);
}
EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl);
impl->gestureClient->reset();
#endif
+#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
+ if (impl->focusRing)
+ impl->focusRing->hide();
+#endif
#if ENABLE(TIZEN_ISF_PORT)
impl->inputMethodContext()->hideIMFContext();
#endif
IntRect visibleRect = impl->pageClient->visibleContentRect();
IntPoint scrollPosition = visibleRect.location();
- // Do not adjust scroll position if selection rect (caret) is visible after scaling.
- if (!visibleRect.contains(selectionRect)) {
+ // Do not adjust scroll position if content is userscalable or selection rect (caret) is visible after scaling
+ if (impl->pageClient->userScalable() || !visibleRect.contains(selectionRect)) {
// set paddings
scrollPosition = IntPoint(selectionRect.x() - visibleRect.width() / 3, selectionRect.y() - visibleRect.height() / 3);
// If both input field's position x and selection rect can be displayed together,
scrollPosition.setX(focusedNodeRect.x());
}
+#if ENABLE(TIZEN_DLOG_SUPPORT)
+ TIZEN_LOGI("scroll position: [%d, %d], scale factor: [%.2f]", scrollPosition.x(), scrollPosition.y(), newScaleFactor);
+#endif
+
#if ENABLE(TIZEN_WEBKIT2_TILED_BACKING_STORE)
impl->pageClient->setVisibleContentRect(IntRect(scrollPosition, impl->size()), newScaleFactor);
#else
evas_object_image_data_set(smartData->image, pixels);
evas_object_image_data_update_add(smartData->image, 0, 0, ow, oh);
- ewkViewFrameRendered(smartData->self);
+ if (impl->pageClient->notifiedNonemptyLayout())
+ ewkViewFrameRendered(smartData->self);
impl->compositionAnimator = 0;
// Multiple suspend of ActiveDOMObject makes unintended suspend/resume status of
// the ActiveDOMObject.
if (!impl->suspendedResources && (!impl->isWaitingForJavaScriptPopupReply || !impl->isWaitingForApplicationCachePermission || !impl->isWaitingForExceededQuotaPopupReply)) {
+ impl->pageProxy->suspendAnimations();
impl->pageProxy->suspendJavaScriptAndResource();
impl->suspendedResources = true;
}
// Multiple suspend of ActiveDOMObject makes unintended suspend/resume status of
// the ActiveDOMObject.
if (impl->suspendedResources && (!impl->isWaitingForJavaScriptPopupReply || !impl->isWaitingForApplicationCachePermission || !impl->isWaitingForExceededQuotaPopupReply)) {
+ impl->pageProxy->resumeAnimations();
impl->pageProxy->resumeJavaScriptAndResource();
impl->suspendedResources = false;
}
}
#endif
+#if ENABLE(TIZEN_BACKGROUND_DISK_CACHE)
+Eina_Bool ewk_view_foreground_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+ return true;
+}
+#endif
+
Evas_Object* ewk_view_screenshot_contents_get(const Evas_Object* ewkView, Eina_Rectangle viewArea, float scaleFactor, Evas* canvas)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(canvas, 0);
unsigned int ewk_view_inspector_server_start(Evas_Object* ewkView, unsigned int port)
{
-#if ENABLE(TIZEN_WEBKIT2_REMOTE_WEB_INSPECTOR)
+#if ENABLE(TIZEN_REMOTE_WEB_INSPECTOR)
EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, 0);
EWK_VIEW_IMPL_GET_OR_RETURN(sd, impl, 0);
return impl->pageProxy->startInspectorServer(port);
#else
- LOG_ERROR("TIZEN_WEBKIT2_REMOTE_WEB_INSPECTOR is disabled.\n");
+ LOG_ERROR("TIZEN_REMOTE_WEB_INSPECTOR is disabled.\n");
return 0;
#endif
}
Eina_Bool ewk_view_inspector_server_stop(Evas_Object* ewkView)
{
-#if ENABLE(TIZEN_WEBKIT2_REMOTE_WEB_INSPECTOR)
+#if ENABLE(TIZEN_REMOTE_WEB_INSPECTOR)
EWK_VIEW_SD_GET_OR_RETURN(ewkView, sd, false);
EWK_VIEW_IMPL_GET_OR_RETURN(sd, impl, false);
return impl->pageProxy->stopInspectorServer();
#else
- LOG_ERROR("TIZEN_WEBKIT2_REMOTE_WEB_INSPECTOR is disabled.\n");
+ LOG_ERROR("TIZEN_REMOTE_WEB_INSPECTOR is disabled.\n");
return false;
#endif
}
return true;
}
+#if ENABLE(TIZEN_WEBKIT2_NOTIFY_POPUP_REPLY_STATUS)
+void ewkViewNotifyPopupReplyWaitingState(Evas_Object* ewkView, bool isWaiting)
+{
+ if (isWaiting)
+ evas_object_smart_callback_call(ewkView, "popup,reply,wait,start", 0);
+ else
+ evas_object_smart_callback_call(ewkView, "popup,reply,wait,finish", 0);
+}
+#endif
+
bool ewkViewRunJavaScriptAlert(Evas_Object* ewkView, WKStringRef alertText)
{
EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
unsigned int i = 0;
KURL base(KURL(), "file://");
EINA_LIST_FOREACH(fileUrls, list, data) {
- KURL url(base, static_cast<char*>(data));
+ KURL url(base, String::fromUTF8(static_cast<char*>(data)));
items[i++] = WKURLCreateWithUTF8CString(url.string().utf8().data());
}
WKRetainPtr<WKArrayRef> filesArray(AdoptWK, WKArrayCreate(items, size));
return ewkHistoryCreate(WKPageGetBackForwardList(toAPI(page)));
}
+Eina_Bool ewk_view_recording_surface_enable_set(Evas_Object* ewkView, Eina_Bool enable)
+{
+ return false;
+}
+
Eina_Bool ewk_view_notification_closed(Evas_Object* ewkView, Eina_List* ewkNotifications)
{
#if ENABLE(TIZEN_NOTIFICATIONS)
{
return ewk_settings_clear_text_selection_automatically_get(ewk_view_settings_get(ewkView));
}
+
+void ewk_view_text_selection_range_clear(Evas_Object* ewkView)
+{
+ EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
+ EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl);
+
+ impl->pageProxy->selectionRangeClear();
+}
#endif // #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
#if ENABLE(TIZEN_INPUT_TAG_EXTENSION)
impl->gestureClient->setTapEnabled(!wasHandled);
}
#if ENABLE(TIZEN_ISF_PORT)
- else {
+ else if (impl->pageProxy->isViewVisible()) {
IntPoint pointForHitTest = impl->transformFromScene().mapPoint(IntPoint(impl->touchDownPoint.x, impl->touchDownPoint.y));
WebHitTestResult::Data hitTestResultData = impl->pageProxy->hitTestResultAtPoint(pointForHitTest);
if (hitTestResultData.isContentEditable && impl->inputMethodContext()) {
}
#if ENABLE(TIZEN_WEBKIT2_GET_TEXT_STYLE_FOR_SELECTION)
-void ewkViewDidGetTextStyleStateForSelection(Evas_Object* ewkView, int underlineState, int italicState, int boldState, const IntPoint& startPoint, const IntPoint& endPoint)
+void ewkViewTextStyleState(Evas_Object* ewkView, const IntPoint& startPoint, const IntPoint& endPoint)
{
- Ewk_Text_Style* textStyle = ewkTextStyleCreate(underlineState, italicState, boldState, startPoint, endPoint);
+ EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
+ EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl);
+
+ EditorState editorState = impl->page()->editorState();
+ Ewk_Text_Style* textStyle = ewkTextStyleCreate(editorState, startPoint, endPoint);
evas_object_smart_callback_call(ewkView, "text,style,state", static_cast<void*>(textStyle));
ewkTextStyleDelete(textStyle);
}
#if ENABLE(TIZEN_GESTURE)
#if ENABLE(TIZEN_CONTEXT_MENU_WEBKIT_2)
// We don't want to process touch event when context menu is shown.
- if (impl->pageClient->isContextMenuVisible() && type != EWK_TOUCH_CANCEL)
+ if ((impl->pageClient->isContextMenuVisible() && type != EWK_TOUCH_CANCEL)
+#if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
+ && !impl->pageClient->isTextSelectionMode()
+#endif
+ )
return true;
#endif
#if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
}
#endif
+void ewk_view_use_settings_font(Evas_Object* ewkView)
+{
+#if ENABLE(TIZEN_USE_SETTINGS_FONT)
+ EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
+ EWK_VIEW_IMPL_GET_OR_RETURN(smartData, impl);
+
+ impl->pageProxy->useSettingsFont();
+#endif
+}
projects / framework / web / webkit-efl.git / blobdiff