[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:37:47 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 1f0a6ca7059fd31101e2595a3618e0eba837b8e0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 23 14:41:31 2010 +0000
2010-12-23 Lucas De Marchi <lucas.demarchi at 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.
* cmake/OptionsEfl.cmake: Disable ContextMenu and don't pretend we
implement CROSS_PLATFORM_MENUS yet.
2010-12-23 Lucas De Marchi <lucas.demarchi at 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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74556 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 1b4a58d..57b2ee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-12-23 Lucas De Marchi <lucas.demarchi at 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.
+
+ * cmake/OptionsEfl.cmake: Disable ContextMenu and don't pretend we
+ implement CROSS_PLATFORM_MENUS yet.
+
2010-12-22 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index a6b8134..ace957c 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -2,6 +2,32 @@
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 at profusion.mobi>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
[EFL] Clean warnings in Tiled Backing Store
https://bugs.webkit.org/show_bug.cgi?id=51529
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_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_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index 8d3458d..b8633c5 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -1614,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.
*
@@ -1654,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/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index 872b652..93b2f37 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -37,7 +37,7 @@ FIND_PACKAGE(Threads REQUIRED)
FIND_PACKAGE(JPEG REQUIRED)
FIND_PACKAGE(PNG REQUIRED)
-ADD_DEFINITIONS(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1)
+ADD_DEFINITIONS(-DENABLE_CONTEXT_MENUS=0)
SET(WTF_USE_PTHREADS 1)
ADD_DEFINITIONS(-DWTF_USE_PTHREADS=1)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list