Title: [92949] trunk/Source/WebKit/efl
Revision
92949
Author
[email protected]
Date
2011-08-12 00:52:24 -0700 (Fri, 12 Aug 2011)

Log Message

[EFL] Fix after r91815 - restore changes from r91659.
https://bugs.webkit.org/show_bug.cgi?id=64682

Patch by Grzegorz Czajkowski <[email protected]> on 2011-08-12
Reviewed by Kenneth Rohde Christiansen.

Restore patch for fix ewk_view_context_menu_forward_event which
has been overwrititen by mistake.

* ewk/ewk_view.cpp:
(ewk_view_context_menu_forward_event):

Modified Paths

Diff

Modified: trunk/Source/WebKit/efl/ChangeLog (92948 => 92949)


--- trunk/Source/WebKit/efl/ChangeLog	2011-08-12 07:46:13 UTC (rev 92948)
+++ trunk/Source/WebKit/efl/ChangeLog	2011-08-12 07:52:24 UTC (rev 92949)
@@ -1,5 +1,18 @@
 2011-08-12  Grzegorz Czajkowski  <[email protected]>
 
+        [EFL] Fix after r91815 - restore changes from r91659.
+        https://bugs.webkit.org/show_bug.cgi?id=64682
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Restore patch for fix ewk_view_context_menu_forward_event which
+        has been overwrititen by mistake.
+
+        * ewk/ewk_view.cpp:
+        (ewk_view_context_menu_forward_event):
+
+2011-08-12  Grzegorz Czajkowski  <[email protected]>
+
         [EFL] HTML Saving feature.
         https://bugs.webkit.org/show_bug.cgi?id=55455
 

Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (92948 => 92949)


--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2011-08-12 07:46:13 UTC (rev 92948)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp	2011-08-12 07:52:24 UTC (rev 92949)
@@ -1393,10 +1393,9 @@
     }
 }
 
-#if ENABLE(CONTEXT_MENUS)
-
 Eina_Bool ewk_view_context_menu_forward_event(Evas_Object *o, const Evas_Event_Mouse_Down *ev)
 {
+#if ENABLE(CONTEXT_MENUS)
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EWK_VIEW_PRIV_GET_OR_RETURN(sd, priv, EINA_FALSE);
     Eina_Bool mouse_press_handled = EINA_FALSE;
@@ -1425,10 +1424,11 @@
     }
 
     return EINA_TRUE;
+#else
+    return EINA_FALSE;
+#endif
 }
 
-#endif
-
 double ewk_view_load_progress_get(const Evas_Object *o)
 {
     EWK_VIEW_SD_GET_OR_RETURN(o, sd, -1.0);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to