diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /WebKit/efl/ewk/ewk_view.cpp | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'WebKit/efl/ewk/ewk_view.cpp')
| -rw-r--r-- | WebKit/efl/ewk/ewk_view.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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. * |