summaryrefslogtreecommitdiffstats
path: root/WebKit/efl
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/efl')
-rw-r--r--WebKit/efl/ChangeLog125
-rw-r--r--WebKit/efl/WebCoreSupport/ChromeClientEfl.h4
-rw-r--r--WebKit/efl/WebCoreSupport/EditorClientEfl.cpp8
-rw-r--r--WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp8
-rw-r--r--WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h3
-rw-r--r--WebKit/efl/ewk/ewk_contextmenu.cpp11
-rw-r--r--WebKit/efl/ewk/ewk_frame.cpp39
-rw-r--r--WebKit/efl/ewk/ewk_frame.h21
-rw-r--r--WebKit/efl/ewk/ewk_private.h4
-rw-r--r--WebKit/efl/ewk/ewk_tiled_backing_store.c72
-rw-r--r--WebKit/efl/ewk/ewk_tiled_matrix.c4
-rw-r--r--WebKit/efl/ewk/ewk_view.cpp6
-rw-r--r--WebKit/efl/ewk/ewk_view.h2
13 files changed, 238 insertions, 69 deletions
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index fde9fea..c9d6bfe 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,128 @@
+2010-12-27 Rafael Antognolli <antognolli@profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Set the frame smart object base clipper to non-static.
+ https://bugs.webkit.org/show_bug.cgi?id=51552
+
+ The base clipper of the clipped smart object, which is the parent
+ class of the ewk_frame class is a static clipper. It's normally only
+ used for showing/hiding the object, but in the case of the ewk_frame,
+ it needs to clip the object to its dimension, in order to clip
+ scrollbars of inner frames.
+
+ Setting it to non-static makes the clipper to be automatically moved
+ by the parent class, thus staying on the correct position when the
+ frame is moved.
+
+ This change needed to be done after the adoption of the static clipper
+ on the clipped smart base class.
+
+ * ewk/ewk_frame.cpp:
+ (_ewk_frame_smart_add):
+
+2010-12-24 Ryuan Choi <ryuan.choi@samsung.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Add option to enable Touch Events.
+ https://bugs.webkit.org/show_bug.cgi?id=49125
+
+ Implement ewk_frame_feed_touch_event to feed touch events. Because EFL
+ doesn't have touch events, Application should generate and pass it.
+
+ * WebCoreSupport/ChromeClientEfl.h:
+ (WebCore::ChromeClientEfl::needTouchEvents):
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_feed_touch_event):
+ * ewk/ewk_frame.h:
+
+2010-12-22 Sam Weinig <sam@webkit.org>
+
+ Reviewed by Darin Adler.
+
+ WebKit2 needs to mirror the frame tree in the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=51546
+
+ - Add client functions to notify that a frame has been added or
+ removed from the page cache.
+
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::didSaveToPageCache):
+ (WebCore::FrameLoaderClientEfl::didRestoreFromPageCache):
+ * WebCoreSupport/FrameLoaderClientEfl.h:
+
+2010-12-22 Ryosuke Niwa <rniwa@webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Editor.h doesn't need to include SelectionController.h
+ https://bugs.webkit.org/show_bug.cgi?id=51441
+
+ Renamed SelectionController::EDirection to SelectionDirection.
+
+ * WebCoreSupport/EditorClientEfl.cpp:
+ (WebCore::EditorClientEfl::handleEditingKeyboardEvent):
+
+2010-12-23 Lucas De Marchi <lucas.demarchi@profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Fix ContextMenu removal
+ https://bugs.webkit.org/show_bug.cgi?id=51530
+
+ Fix ContextMenu removal
+
+ In r74207 the support for ContextMenu was removed from EFL while the
+ code is being ported to the new CROSS_PLATFORM_MENUS due to build
+ breakage. However there were some missing removals in the shutdown
+ logic that introduced a bug, leading to a segmentation fault when
+ ContexController was destroyed.
+
+ The best way to effectively disable the ContextMenu is to conditionally
+ compile the meaningful stuff by surrounding with "#if
+ ENABLE(CONTEXT_MENUS)" and then disabling it in CMake.
+
+ * ewk/ewk_contextmenu.cpp: surround need parts with #if
+ ENABLE(CONTEXT_MENUS).
+ (ewk_context_menu_destroy): ditto.
+ (ewk_context_menu_item_select): ditto.
+ * ewk/ewk_private.h: ditto.
+ * ewk/ewk_view.cpp: ditto.
+
+2010-12-23 Lucas De Marchi <lucas.demarchi@profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [EFL] Clean warnings in Tiled Backing Store
+ https://bugs.webkit.org/show_bug.cgi?id=51529
+
+ Tiled backing store in EFL was giving the following warnings that are
+ gone now:
+
+ - Static function defined but not used;
+ - Comparison between signed and unsigned integer expressions;
+
+ * ewk/ewk_tiled_backing_store.c:
+ (_ewk_tiled_backing_store_item_fill):
+ (_ewk_tiled_backing_store_smart_calculate):
+ * ewk/ewk_tiled_matrix.c:
+ (_ewk_tile_matrix_slicer_setup):
+
+2010-12-23 Gyuyoung Kim <gyuyoung.kim@samsung.com>
+
+ Unreviewed build warning fix.
+
+ [EFL] Remove warning messages during the webkit efl compiling
+ https://bugs.webkit.org/show_bug.cgi?id=51520
+
+ Remove build warning messages.
+
+ * ewk/ewk_view.cpp:
+ (_ewk_view_smart_show):
+ (_ewk_view_smart_hide):
+ * ewk/ewk_view.h:
+
2010-12-22 Gyuyoung Kim <gyuyoung.kim@samsung.com>
Reviewed by Antonio Gomes.
diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
index c6c82d4..a714dd4 100644
--- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
@@ -120,6 +120,10 @@ public:
virtual void showContextMenu() { }
#endif
+#if ENABLE(TOUCH_EVENTS)
+ virtual void needTouchEvents(bool) { }
+#endif
+
virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>);
virtual void chooseIconForFiles(const Vector<String>&, FileChooser*);
virtual void formStateDidChange(const Node*);
diff --git a/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp b/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
index 6bb961b..a9e45dd 100644
--- a/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
@@ -343,25 +343,25 @@ bool EditorClientEfl::handleEditingKeyboardEvent(KeyboardEvent* event)
switch (keyEvent->windowsVirtualKeyCode()) {
case VK_LEFT:
frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
- SelectionController::DirectionLeft,
+ DirectionLeft,
keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
true);
return true;
case VK_RIGHT:
frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
- SelectionController::DirectionRight,
+ DirectionRight,
keyEvent->ctrlKey() ? WordGranularity : CharacterGranularity,
true);
return true;
case VK_UP:
frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
- SelectionController::DirectionBackward,
+ DirectionBackward,
keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
true);
return true;
case VK_DOWN:
frame->selection()->modify(keyEvent->shiftKey() ? SelectionController::AlterationExtend : SelectionController::AlterationMove,
- SelectionController::DirectionForward,
+ DirectionForward,
keyEvent->ctrlKey() ? ParagraphGranularity : LineGranularity,
true);
return true;
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
index 627c1b9..929b269 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp
@@ -923,6 +923,14 @@ void FrameLoaderClientEfl::transitionToCommittedForNewPage()
ewk_view_frame_main_cleared(m_view);
}
+void FrameLoaderClientEfl::didSaveToPageCache()
+{
+}
+
+void FrameLoaderClientEfl::didRestoreFromPageCache()
+{
+}
+
void FrameLoaderClientEfl::dispatchDidBecomeFrameset(bool)
{
}
diff --git a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
index e138139..cf7bdf0 100644
--- a/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
+++ b/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h
@@ -200,6 +200,9 @@ class FrameLoaderClientEfl : public FrameLoaderClient {
virtual void transitionToCommittedFromCachedFrame(CachedFrame*);
virtual void transitionToCommittedForNewPage();
+ virtual void didSaveToPageCache();
+ virtual void didRestoreFromPageCache();
+
virtual void dispatchDidBecomeFrameset(bool);
virtual bool canCachePage() const;
diff --git a/WebKit/efl/ewk/ewk_contextmenu.cpp b/WebKit/efl/ewk/ewk_contextmenu.cpp
index c0c68ba..40bd2ba 100644
--- a/WebKit/efl/ewk/ewk_contextmenu.cpp
+++ b/WebKit/efl/ewk/ewk_contextmenu.cpp
@@ -33,7 +33,9 @@
struct _Ewk_Context_Menu {
unsigned int __ref;
+#if ENABLE(CONTEXT_MENUS)
WebCore::ContextMenuController* controller;
+#endif
Evas_Object* view;
Eina_List* items;
@@ -73,9 +75,12 @@ void ewk_context_menu_unref(Ewk_Context_Menu* menu)
Eina_Bool ewk_context_menu_destroy(Ewk_Context_Menu* menu)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(menu, EINA_FALSE);
+#if ENABLE(CONTEXT_MENUS)
EINA_SAFETY_ON_NULL_RETURN_VAL(menu->controller, EINA_FALSE);
menu->controller->clearContextMenu();
+#endif
+
return EINA_TRUE;
}
@@ -106,6 +111,7 @@ Ewk_Context_Menu_Item* ewk_context_menu_item_new(Ewk_Context_Menu_Item_Type type
Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu* menu, Ewk_Context_Menu_Item* item)
{
+#if ENABLE(CONTEXT_MENUS)
EINA_SAFETY_ON_NULL_RETURN_VAL(menu, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(item, EINA_FALSE);
WebCore::ContextMenuAction action = static_cast<WebCore::ContextMenuAction>(item->action);
@@ -114,6 +120,8 @@ Eina_Bool ewk_context_menu_item_select(Ewk_Context_Menu* menu, Ewk_Context_Menu_
// Don't care about title and submenu as they're not used after this point.
WebCore::ContextMenuItem core(type, action, WTF::String());
menu->controller->contextMenuItemSelected(&core);
+#endif
+
return EINA_TRUE;
}
@@ -193,6 +201,7 @@ Eina_Bool ewk_context_menu_item_enabled_set(Ewk_Context_Menu_Item *o, Eina_Bool
/* internal methods ****************************************************/
+#if ENABLE(CONTEXT_MENUS)
/**
* @internal
*
@@ -260,3 +269,5 @@ void ewk_context_menu_show(Ewk_Context_Menu* o)
evas_object_smart_callback_call(o->view, "contextmenu,show", o);
}
+
+#endif
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index 5076be5..1cadc77 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -24,6 +24,7 @@
#include "config.h"
#include "ewk_frame.h"
+#include "DocumentMarkerController.h"
#include "EWebKit.h"
#include "EventHandler.h"
#include "FocusController.h"
@@ -36,6 +37,7 @@
#include "KURL.h"
#include "PlatformKeyboardEvent.h"
#include "PlatformMouseEvent.h"
+#include "PlatformTouchEvent.h"
#include "PlatformWheelEvent.h"
#include "ProgressTracker.h"
#include "RefPtr.h"
@@ -191,6 +193,7 @@ static void _ewk_frame_smart_add(Evas_Object* o)
sd->self = o;
_parent_sc.add(o);
+ evas_object_static_clip_set(sd->base.clipper, EINA_FALSE);
evas_object_move(sd->base.clipper, 0, 0);
evas_object_resize(sd->base.clipper, 0, 0);
@@ -1474,6 +1477,42 @@ Eina_Bool ewk_frame_feed_mouse_move(Evas_Object* o, const Evas_Event_Mouse_Move*
return sd->frame->eventHandler()->mouseMoved(event);
}
+Eina_Bool ewk_frame_feed_touch_event(Evas_Object* o, Ewk_Touch_Event_Type action, Eina_List* points, int metaState)
+{
+ Eina_Bool ret = EINA_FALSE;
+
+#if ENABLE(TOUCH_EVENTS)
+ EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(points, EINA_FALSE);
+
+ Evas_Coord x, y;
+ evas_object_geometry_get(sd->view, &x, &y, 0, 0);
+
+ WebCore::TouchEventType type = WebCore::TouchStart;
+ switch (action) {
+ case EWK_TOUCH_START:
+ type = WebCore::TouchStart;
+ break;
+ case EWK_TOUCH_END:
+ type = WebCore::TouchEnd;
+ break;
+ case EWK_TOUCH_MOVE:
+ type = WebCore::TouchMove;
+ break;
+ case EWK_TOUCH_CANCEL:
+ type = WebCore::TouchCancel;
+ break;
+ default:
+ return EINA_FALSE;
+ }
+
+ WebCore::PlatformTouchEvent te(points, WebCore::IntPoint(x, y), type, metaState);
+ ret = sd->frame->eventHandler()->handleTouchEvent(te);
+#endif
+ return ret;
+}
+
static inline Eina_Bool _ewk_frame_handle_key_scrolling(WebCore::Frame* frame, const WebCore::PlatformKeyboardEvent &event)
{
WebCore::ScrollDirection direction;
diff --git a/WebKit/efl/ewk/ewk_frame.h b/WebKit/efl/ewk/ewk_frame.h
index 156bd82..63936f3 100644
--- a/WebKit/efl/ewk/ewk_frame.h
+++ b/WebKit/efl/ewk/ewk_frame.h
@@ -130,6 +130,26 @@ struct _Ewk_Hit_Test {
} flags;
};
+typedef enum {
+ EWK_TOUCH_START,
+ EWK_TOUCH_END,
+ EWK_TOUCH_MOVE,
+ EWK_TOUCH_CANCEL
+} Ewk_Touch_Event_Type;
+
+typedef enum {
+ EWK_TOUCH_POINT_PRESSED,
+ EWK_TOUCH_POINT_RELEASED,
+ EWK_TOUCH_POINT_MOVED,
+ EWK_TOUCH_POINT_CANCELLED
+} Ewk_Touch_Point_Type;
+
+typedef struct _Ewk_Touch_Point Ewk_Touch_Point;
+struct _Ewk_Touch_Point {
+ unsigned int id;
+ int x, y;
+ Ewk_Touch_Point_Type state;
+};
EAPI Evas_Object *ewk_frame_view_get(const Evas_Object *o);
EAPI void ewk_frame_theme_set(Evas_Object *o, const char *path);
@@ -200,6 +220,7 @@ EAPI Eina_Bool ewk_frame_feed_mouse_wheel(Evas_Object *o, const Evas_Event_Mo
EAPI Eina_Bool ewk_frame_feed_mouse_down(Evas_Object *o, const Evas_Event_Mouse_Down *ev);
EAPI Eina_Bool ewk_frame_feed_mouse_up(Evas_Object *o, const Evas_Event_Mouse_Up *ev);
EAPI Eina_Bool ewk_frame_feed_mouse_move(Evas_Object *o, const Evas_Event_Mouse_Move *ev);
+EAPI Eina_Bool ewk_frame_feed_touch_event(Evas_Object* o, Ewk_Touch_Event_Type action, Eina_List* points, int metaState);
EAPI Eina_Bool ewk_frame_feed_key_down(Evas_Object *o, const Evas_Event_Key_Down *ev);
EAPI Eina_Bool ewk_frame_feed_key_up(Evas_Object *o, const Evas_Event_Key_Up *ev);
diff --git a/WebKit/efl/ewk/ewk_private.h b/WebKit/efl/ewk/ewk_private.h
index 7c81982..496efdb 100644
--- a/WebKit/efl/ewk/ewk_private.h
+++ b/WebKit/efl/ewk/ewk_private.h
@@ -111,12 +111,16 @@ int ewk_view_dpi_get();
Ewk_History *ewk_history_new(WebCore::BackForwardListImpl *history);
void ewk_history_free(Ewk_History *history);
+#if ENABLE(CONTEXT_MENUS)
+
Ewk_Context_Menu *ewk_context_menu_new(Evas_Object *view, WebCore::ContextMenuController *controller);
Eina_Bool ewk_context_menu_free(Ewk_Context_Menu *o);
void ewk_context_menu_item_append(Ewk_Context_Menu *o, WebCore::ContextMenuItem& core);
Ewk_Context_Menu *ewk_context_menu_custom_get(Ewk_Context_Menu *o);
void ewk_context_menu_show(Ewk_Context_Menu *o);
+#endif
+
Ewk_Window_Features *ewk_window_features_new_from_core(const WebCore::WindowFeatures* core);
Evas_Object *ewk_frame_add(Evas *e);
diff --git a/WebKit/efl/ewk/ewk_tiled_backing_store.c b/WebKit/efl/ewk/ewk_tiled_backing_store.c
index a998c5c..4fbd905 100644
--- a/WebKit/efl/ewk/ewk_tiled_backing_store.c
+++ b/WebKit/efl/ewk/ewk_tiled_backing_store.c
@@ -491,66 +491,15 @@ static Eina_Bool _ewk_tiled_backing_store_enable_render(Ewk_Tiled_Backing_Store_
return EINA_TRUE;
}
-/**
- * Returns a rectangle whose coordinates indicate which tiles are
- * currently inside the viewport.
- *
- * Specifically, the returned rectangle's coordinates have the
- * following meaning:
- * - x: Column number for the top-level tile inside the viewport.
- * - y: Row number for the top-level tile inside the viewport.
- * - w: Number of tiles horizontally inside the viewport.
- * - h: Number of tiles vertically inside the viewport.
- */
-static Eina_Rectangle _ewk_tiled_backing_store_visible_tiles_rect(Ewk_Tiled_Backing_Store_Data *priv)
-{
- Eina_Rectangle r;
-
- const Evas_Coord ox = -priv->view.offset.cur.x;
- const Evas_Coord oy = -priv->view.offset.cur.y;
- const Evas_Coord tw = priv->view.tile.w;
- const Evas_Coord th = priv->view.tile.h;
-
- r.x = MAX(0, ox / tw);
- r.y = MAX(0, oy / th);
- r.w = MIN(priv->model.cur.cols,
- ceil((float)(priv->view.w + (ox % tw)) / tw));
- r.h = MIN(priv->model.cur.rows,
- ceil((float)(priv->view.h + (oy % th)) / th));
-
- DBG("Returning %d,%d+%dx%d", r.x, r.y, r.w, r.h);
-
- return r;
-}
-
-static Eina_Bool _ewk_tiled_backing_store_tile_is_inside_viewport(Ewk_Tiled_Backing_Store_Data *priv, int col, int row)
-{
- const Eina_Rectangle r = _ewk_tiled_backing_store_visible_tiles_rect(priv);
-
- return eina_rectangle_coords_inside(&r, col, row);
-}
-
-static Eina_Bool _ewk_tiled_backing_store_tile_is_adjacent_to_viewport(Ewk_Tiled_Backing_Store_Data *priv, int col, int row)
-{
- const Eina_Rectangle r = _ewk_tiled_backing_store_visible_tiles_rect(priv);
-
- if (row == (r.y - 1) || row == (r.y + r.h))
- return (col >= (r.x - 1) && col <= (r.x + r.w));
-
- if (col == (r.x - 1) || col == (r.x + r.w))
- return (row >= (r.y - 1) && row <= (r.y + r.h));
-
- return EINA_FALSE;
-}
-
static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Store_Data *priv, Ewk_Tiled_Backing_Store_Item *it, long col, int row)
{
- int m_col = priv->model.base.col + col;
- int m_row = priv->model.base.row + row;
+ long m_col = priv->model.base.col + col;
+ long m_row = priv->model.base.row + row;
double last_used = ecore_loop_time_get();
if (m_col < 0 || m_row < 0
- || m_col >= priv->model.cur.cols || m_row >= priv->model.cur.rows) {
+ || (unsigned long)(m_col) >= priv->model.cur.cols
+ || (unsigned long)(m_row) >= priv->model.cur.rows) {
if (it->tile) {
_ewk_tiled_backing_store_tile_dissociate(priv, it, last_used);
@@ -562,8 +511,8 @@ static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Sto
const float zoom = priv->view.tile.zoom;
if (it->update.process) {
- if (it->update.row == m_row
- && it->update.col == m_col
+ if (it->update.row == (unsigned long)(m_row)
+ && it->update.col == (unsigned long)(m_col)
&& it->update.zoom == zoom)
return EINA_TRUE;
@@ -572,12 +521,15 @@ static inline Eina_Bool _ewk_tiled_backing_store_item_fill(Ewk_Tiled_Backing_Sto
if (it->tile) {
Ewk_Tile *old = it->tile;
- if (old->row != m_row || old->col != m_col || old->zoom != zoom) {
+ if (old->row != (unsigned long)(m_row)
+ || old->col != (unsigned long)(m_col)
+ || old->zoom != zoom) {
_ewk_tiled_backing_store_tile_dissociate(priv, it,
last_used);
if (it->update.process)
_ewk_tiled_backing_store_item_request_del(priv, it);
- } else if (old->row == m_row && old->col == m_col
+ } else if (old->row == (unsigned long)(m_row)
+ && old->col == (unsigned long)(m_col)
&& old->zoom == zoom)
goto end;
}
@@ -1450,7 +1402,7 @@ static void _ewk_tiled_backing_store_smart_calculate(Evas_Object *o)
ewk_tile_matrix_freeze(priv->model.matrix);
if (!priv->render.suspend && priv->changed.model) {
- long cols, rows;
+ unsigned long cols, rows;
cols = priv->model.width / priv->view.tile.w + 1;
rows = priv->model.height / priv->view.tile.h + 1;
diff --git a/WebKit/efl/ewk/ewk_tiled_matrix.c b/WebKit/efl/ewk/ewk_tiled_matrix.c
index fccbfa1..130a48a 100644
--- a/WebKit/efl/ewk/ewk_tiled_matrix.c
+++ b/WebKit/efl/ewk/ewk_tiled_matrix.c
@@ -600,9 +600,9 @@ static Eina_Bool _ewk_tile_matrix_slicer_setup(Ewk_Tile_Matrix *tm, const Eina_R
y = 0;
}
- if (y + h - 1 > rows * th)
+ if (y + h - 1 > (long)(rows * th))
h = rows * th - y;
- if (x + w - 1 > cols * tw)
+ if (x + w - 1 > (long)(cols * tw))
w = cols * tw - x;
return eina_tile_grid_slicer_setup(slicer, x, y, w, h, tw, th);
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 9eee9cb..b8633c5 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -864,7 +864,6 @@ static void _ewk_view_smart_calculate(Evas_Object* o)
static void _ewk_view_smart_show(Evas_Object *o)
{
EWK_VIEW_SD_GET(o, sd);
- EWK_VIEW_PRIV_GET(sd, priv);
if (evas_object_clipees_get(sd->base.clipper))
evas_object_show(sd->base.clipper);
@@ -874,7 +873,6 @@ static void _ewk_view_smart_show(Evas_Object *o)
static void _ewk_view_smart_hide(Evas_Object *o)
{
EWK_VIEW_SD_GET(o, sd);
- EWK_VIEW_PRIV_GET(sd, priv);
evas_object_hide(sd->base.clipper);
evas_object_hide(sd->backing_store);
@@ -1616,6 +1614,8 @@ Eina_Bool ewk_view_select_word(Evas_Object* o)
return _ewk_view_editor_command(priv, "SelectWord");
}
+#if ENABLE(CONTEXT_MENUS)
+
/**
* Forwards a request of new Context Menu to WebCore.
*
@@ -1656,6 +1656,8 @@ Eina_Bool ewk_view_context_menu_forward_event(Evas_Object* o, const Evas_Event_M
return EINA_TRUE;
}
+#endif
+
/**
* Get current load progress estimate from 0.0 to 1.0.
*
diff --git a/WebKit/efl/ewk/ewk_view.h b/WebKit/efl/ewk/ewk_view.h
index 6902949..e487f5e 100644
--- a/WebKit/efl/ewk/ewk_view.h
+++ b/WebKit/efl/ewk/ewk_view.h
@@ -155,7 +155,7 @@ struct _Ewk_View_Smart_Class {
* @see EWK_VIEW_SMART_CLASS_INIT_VERSION
* @see EWK_VIEW_SMART_CLASS_INIT_NAME_VERSION
*/
-#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define EWK_VIEW_SMART_CLASS_INIT(smart_class_init) {smart_class_init, EWK_VIEW_SMART_CLASS_VERSION, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
/**
* Initializer to zero a whole Ewk_View_Smart_Class structure.
generated by cgit v1.1 at 2025-11-28 00:46:20 +0000