std::vector<blink::mojom::MenuItemPtr> menu_items,
bool right_aligned,
bool allow_multiple_selection) {
+#if BUILDFLAG(IS_EFL)
+ if (wcva_helper()) {
+ wcva_helper()->ShowPopupMenu(
+ render_frame_host, std::move(popup_client), bounds, item_height,
+ item_font_size, selected_item, std::move(menu_items), right_aligned,
+ allow_multiple_selection);
+ }
+#else
NOTIMPLEMENTED() << " show " << menu_items.size() << " menu items";
+#endif
}
#endif
declare_args() {
# Whether or not to use external popup menu.
- use_external_popup_menu = is_android || is_mac
+ use_external_popup_menu = is_android || is_mac || use_efl
# Whether to perform critical memory pressure handling when in foreground (if
# false, critical memory pressure is treated like moderate pressure in foreground).
void TestPageBroadcast::SetHistoryOffsetAndLength(int32_t history_offset,
int32_t history_length) {}
+#if BUILDFLAG(IS_EFL)
+void TestPageBroadcast::ScrollFocusedNodeIntoView() {}
+#endif
+
void TestPageBroadcast::SetPageBaseBackgroundColor(
absl::optional<SkColor> color) {}
const blink::RendererPreferences& preferences) override;
void SetHistoryOffsetAndLength(int32_t history_offset,
int32_t history_length) override;
+#if BUILDFLAG(IS_EFL)
+ void ScrollFocusedNodeIntoView() override;
+#endif
void SetPageBaseBackgroundColor(absl::optional<SkColor> color) override;
void CreateRemoteMainFrame(
const blink::RemoteFrameToken& token,
// Set history offset and length.
SetHistoryOffsetAndLength(int32 offset, int32 length);
+ [EnableIf=is_efl]
+ ScrollFocusedNodeIntoView();
+
// Sent to whole page, but should only be used by the main frame.
SetPageBaseBackgroundColor(skia.mojom.SkColor? color);
return;
GetPage()->SetLongPollingGlobalTimeout(timeout);
}
+
+void WebViewImpl::ScrollFocusedNodeIntoView() {
+ if (Element* element = FocusedElement())
+ element->scrollIntoViewIfNeeded(true /*centerIfNeeded*/);
+}
#endif
} // namespace blink
bool PaintSoftBitmap(SkCanvas*, const gfx::Rect&) override;
bool HasAcceleratedCanvasWithinViewport() const override;
void SetLongPollingGlobalTimeout(uint64_t timeout) override;
+ void ScrollFocusedNodeIntoView() override;
#endif
// Functions to add and remove observers for this object.
#include "third_party/blink/public/common/context_menu_data/menu_item_info.h"
#include "third_party/blink/public/common/input/web_gesture_event.h"
#include "third_party/blink/public/common/input/web_input_event.h"
+#include "third_party/blink/public/mojom/choosers/popup_menu.mojom.h"
#include "ui/base/ime/text_input_type.h"
#include "ui/gfx/geometry/rect.h"
int item_height,
double item_font_size,
int selected_item,
- const std::vector<blink::MenuItemInfo>& items,
+ std::vector<blink::mojom::MenuItemPtr> items,
bool right_aligned,
bool allow_multiple_selection) = 0;
virtual void HidePopupMenu() = 0;
#include "popup_menu_item_private.h"
#include "base/logging.h"
-Popup_Menu_Item::Popup_Menu_Item(const blink::MenuItemInfo& item)
- : type(static_cast<Popup_Menu_Item_Type>(item.type)),
- textDirection(item.text_direction),
- hasTextDirectionOverride(item.has_text_direction_override),
- isEnabled(item.enabled),
+Popup_Menu_Item::Popup_Menu_Item(blink::mojom::MenuItemPtr item)
+ : type(static_cast<Popup_Menu_Item_Type>(item->type)),
+ textDirection(item->text_direction ? base::i18n::RIGHT_TO_LEFT
+ : base::i18n::LEFT_TO_RIGHT),
+ hasTextDirectionOverride(item->has_text_direction_override),
+ isEnabled(item->enabled),
isLabel(true),
- isSelected(item.checked),
- text(base::UTF16ToUTF8(item.label)),
- toolTip(base::UTF16ToUTF8(item.tool_tip)),
- accessibilityText(base::UTF16ToUTF8(item.label)) {}
+ isSelected(item->checked),
+ text(item->label.value()),
+ toolTip(item->tool_tip.value()),
+ accessibilityText(item->label.value()) {}
Popup_Menu_Item_Type popup_menu_item_type_get(const Popup_Menu_Item* item) {
EINA_SAFETY_ON_NULL_RETURN_VAL(item, POPUP_MENU_UNKNOWN);
#include "base/i18n/rtl.h"
#include "popup_menu_item.h"
-#include "third_party/blink/public/common/context_menu_data/menu_item_info.h"
+#include "third_party/blink/public/mojom/choosers/popup_menu.mojom.h"
#include <string>
*/
class Popup_Menu_Item {
public:
- explicit Popup_Menu_Item(const blink::MenuItemInfo& menuitem);
+ explicit Popup_Menu_Item(blink::mojom::MenuItemPtr menuitem);
Popup_Menu_Item_Type type;
base::i18n::TextDirection textDirection;
// found in the LICENSE file.
#include "popup_picker.h"
-#include "popup_menu_item.h"
-// DJKim : FIXME
-//#include "WebPopupMenuProxyEfl.h"
-#include "eweb_view.h"
-#include "base/path_service.h"
+#include <ecore_x_wayland_wrapper.h>
+
#include "base/files/file_path.h"
+#include "base/logging.h"
+#include "base/path_service.h"
#include "common/web_contents_utils.h"
#include "content/common/paths_efl.h"
-#include "base/logging.h"
+#include "eweb_view.h"
+#include "popup_menu_item.h"
+#include "ui/display/screen.h"
+#include "ui/gfx/geometry/dip_util.h"
#include <Elementary.h>
#include <libintl.h>
#if BUILDFLAG(IS_TIZEN)
#include <dlfcn.h>
#include <efl_extension.h>
+
extern void* EflExtensionHandle;
#endif
delete picker;
}
+void popup_picker_geometry_get(Popup_Picker* picker,
+ int* x,
+ int* y,
+ int* width,
+ int* height) {
+ int p_x, p_y, p_width, p_height;
+ p_x = p_y = p_width = p_height = 0;
+ edje_object_part_geometry_get(elm_layout_edje_get(picker->container), "bg",
+ &p_x, &p_y, &p_width, &p_height);
+
+ gfx::Rect scaled_rect = gfx::ToEnclosingRect(gfx::ConvertRectToDips(
+ gfx::Rect(p_x, p_y, p_width, p_height),
+ display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor()));
+
+ if (x)
+ *x = scaled_rect.x();
+ if (y)
+ *y = scaled_rect.y();
+ if (width)
+ *width = scaled_rect.width();
+ if (height)
+ *height = scaled_rect.height();
+}
+
void popup_picker_update(Evas_Object* parent, Popup_Picker* picker, Eina_List* items, int selectedIndex) {
// FIXME: A check should be made if the items are changed instead of directly changing them.
// Another issue is that if the list is scrolled, the old scroll position is not retained as
void popup_picker_resize(Popup_Picker* picker);
void popup_picker_resize(Popup_Picker* picker, int width, int height);
void popup_picker_del(Popup_Picker* picker);
+void popup_picker_geometry_get(Popup_Picker* picker,
+ int* x,
+ int* y,
+ int* width,
+ int* height);
void popup_picker_update(Evas_Object* parent, Popup_Picker* picker, Eina_List* items, int selectedIndex);
void popupPickerKeyUpCallback(void* data, Evas* e, Evas_Object* obj, void* event_info);
void listClosed(void *data, Evas_Object *obj, const char *emission, const char *source);
SmartCallback<EWebViewCallbacks::LoadError>().call(&err);
}
-void EWebView::ShowPopupMenu(const std::vector<blink::MenuItemInfo>& items,
- int selectedIndex,
- bool multiple) {
+void EWebView::HandlePopupMenu(std::vector<blink::mojom::MenuItemPtr> items,
+ int selectedIndex,
+ bool multiple) {
// Request form navigation information as early as possible,
// given that is renderer will ping-back with actual requested data.
RenderFrameHostImpl* render_frame_host =
Eina_List* popupItems = 0;
const size_t size = items.size();
for (size_t i = 0; i < size; ++i) {
- popupItems = eina_list_append(popupItems, new Popup_Menu_Item(items[i]));
+ popupItems =
+ eina_list_append(popupItems, new Popup_Menu_Item(std::move(items[i])));
}
ReleasePopupMenuList();
popup_picker_buttons_update(popupPicker_, formNavigation_.position,
formNavigation_.count, false);
+
+ // Picker has been shown on top of webview and the page content gets
+ // partially overlapped. Decrease viewport while showing picker.
+ AdjustViewPortHeightToPopupMenu(true /* is_popup_menu_visible */);
+ ScrollFocusedNodeIntoView();
}
-Eina_Bool EWebView::HidePopupMenu() {
+void EWebView::HidePopupMenu() {
if (!popupPicker_)
- return false;
+ return;
if (FormIsNavigating())
- return true;
+ return;
+ AdjustViewPortHeightToPopupMenu(false /* is_popup_menu_visible */);
popup_picker_del(popupPicker_);
popupPicker_ = 0;
- return true;
}
void EWebView::UpdateFormNavigation(int formElementCount,
formNavigation_.nextState = nextState;
}
-bool EWebView::IsSelectPickerShown() const {
- return (popupPicker_ != NULL);
-}
-
-void EWebView::CloseSelectPicker() {
- listClosed(popupPicker_, 0, 0, 0);
-}
-
void EWebView::SetFormIsNavigating(bool formIsNavigating) {
formIsNavigating_ = formIsNavigating;
}
return true;
}
-Eina_Bool EWebView::PopupMenuClose() {
-// DJKim : FIXME
-#if 0
- if (!impl->popupMenuProxy)
- return false;
-
- impl->popupMenuProxy = 0;
-#endif
+void EWebView::PopupMenuClose() {
HidePopupMenu();
-
- if (!popupMenuItems_)
- return false;
-
- void* item;
- EINA_LIST_FREE(popupMenuItems_, item)
- delete static_cast<Popup_Menu_Item*>(item);
- popupMenuItems_ = 0;
-
- RenderFrameHostImpl* render_frame_host =
- static_cast<RenderFrameHostImpl*>(web_contents_->GetPrimaryMainFrame());
- if (!render_frame_host)
- return false;
-#if !defined(EWK_BRINGUP) // FIXME: m67 bringup
- render_frame_host->DidCancelPopupMenu();
-#endif
- return true;
+ ReleasePopupMenuList();
+ wcva()->wcva_helper()->DidCancelPopupMenu();
}
void EWebView::HandleLongPressGesture(
scale_factor);
}
+void EWebView::ScrollFocusedNodeIntoView() {
+ if (RenderViewHost* render_view_host = web_contents_->GetRenderViewHost()) {
+ if (auto& broadcast = static_cast<RenderViewHostImpl*>(render_view_host)
+ ->GetAssociatedPageBroadcast())
+ broadcast->ScrollFocusedNodeIntoView();
+ }
+}
+
+void EWebView::AdjustViewPortHeightToPopupMenu(bool is_popup_menu_visible) {
+ DCHECK(popupPicker_);
+
+ int picker_height = 0;
+ popup_picker_geometry_get(popupPicker_, 0, 0, 0, &picker_height);
+
+ gfx::Rect rect = rwhva()->offscreen_helper()->GetViewBounds();
+ // FIXME(g.czajkowski): detect the need of resizing viewport.
+ // Checking the position of focused <select> element and do resize only when
+ // the picker overlaps the element will prevent Blink from doing re-layout.
+ // Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=15488.
+ rwhva()->offscreen_helper()->SetCustomViewportSize(gfx::Size(
+ rect.width(), is_popup_menu_visible ? rect.height() - picker_height
+ : rect.height() + picker_height));
+}
+
bool EWebView::GetScrollPosition(int* x, int* y) const {
if (!rwhva()) {
LOG(ERROR) << "rwhva() returns nullptr";
#include "content/browser/date_time_chooser_efl.h"
#include "content/browser/renderer_host/event_with_latency_info.h"
#include "content/browser/selection/selection_controller_efl.h"
+#include "content/browser/web_contents/web_contents_view_aura.h"
+#include "content/browser/web_contents/web_contents_view_aura_helper_efl.h"
#include "content/public/browser/context_menu_params.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/quota_permission_context.h"
#include "scroll_detector.h"
#include "third_party/blink/public/common/context_menu_data/menu_item_info.h"
#include "third_party/blink/public/mojom/choosers/file_chooser.mojom.h"
+#include "third_party/blink/public/mojom/choosers/popup_menu.mojom.h"
#include "ui/aura/window_tree_host.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/size.h"
void Find(const char* text, Ewk_Find_Options);
void InvokeAuthCallbackOnUI(_Ewk_Auth_Challenge* auth_challenge);
void SetContentSecurityPolicy(const char* policy, Ewk_CSP_Header_Type type);
- void ShowPopupMenu(const std::vector<blink::MenuItemInfo>& items,
- int selectedIndex,
- bool multiple);
- Eina_Bool HidePopupMenu();
+ void HandlePopupMenu(std::vector<blink::mojom::MenuItemPtr> items,
+ int selectedIndex,
+ bool multiple);
+ void HidePopupMenu();
void UpdateFormNavigation(int formElementCount,
int currentNodeIndex,
bool prevState,
bool nextState);
void FormNavigate(bool direction);
- bool IsSelectPickerShown() const;
- void CloseSelectPicker();
bool FormIsNavigating() const { return formIsNavigating_; }
void SetFormIsNavigating(bool formIsNavigating);
Eina_Bool PopupMenuUpdate(Eina_List* items, int selectedIndex);
Eina_Bool DidSelectPopupMenuItem(int selectedIndex);
Eina_Bool DidMultipleSelectPopupMenuItem(std::vector<int>& selectedIndices);
- Eina_Bool PopupMenuClose();
+ void PopupMenuClose();
void HandleLongPressGesture(const content::ContextMenuParams&);
void ShowContextMenu(const content::ContextMenuParams&);
void CancelContextMenu(int request_id);
JavaScriptDialogManagerEfl* GetJavaScriptDialogManagerEfl();
void ReleasePopupMenuList();
+ // Changes viewport without resizing Evas_Object representing webview
+ // and its corresponding RWHV to let Blink renders custom viewport
+ // while showing picker.
+ void AdjustViewPortHeightToPopupMenu(bool is_popup_menu_visible);
void ShowContextMenuInternal(const content::ContextMenuParams&);
void UpdateWebkitPreferencesEfl(content::RenderViewHost*);
void ChangeScroll(int& x, int& y);
+ void ScrollFocusedNodeIntoView();
void GenerateMHTML(Ewk_View_Save_Page_Callback callback,
void* user_data,
int item_height,
double item_font_size,
int selected_item,
- const std::vector<blink::MenuItemInfo>& items,
+ std::vector<blink::mojom::MenuItemPtr> items,
bool right_aligned,
bool allow_multiple_selection) {
- web_view_->ShowPopupMenu(items, selected_item, allow_multiple_selection);
+ web_view_->HandlePopupMenu(std::move(items), selected_item,
+ allow_multiple_selection);
}
void WebContentsEflDelegateEwk::HidePopupMenu() {
double dialog_value,
content::DateTimeChooserEfl* date_time_chooser) {
web_view_->InputPickerShow(dialog_type, dialog_value, date_time_chooser);
-}
\ No newline at end of file
+}
#define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_EFL_DELEGATE_EWK_H_
#include "content/public/browser/web_contents_efl_delegate.h"
+#include "third_party/blink/public/mojom/choosers/popup_menu.mojom.h"
class EWebView;
int item_height,
double item_font_size,
int selected_item,
- const std::vector<blink::MenuItemInfo>& items,
+ std::vector<blink::mojom::MenuItemPtr> items,
bool right_aligned,
bool allow_multiple_selection) override;
void HidePopupMenu() override;
projects / platform / framework / web / chromium-efl.git / commitdiff