Migration with svn revision 66966

Merge remote branch 'origin/upstream'

Conflicts:
	src/lib/canvas/evas_callbacks.c
	src/lib/canvas/evas_events.c
	src/lib/canvas/evas_focus.c
	src/lib/canvas/evas_map.c

diff --cc src/lib/cache/evas_cache_image.c
index d52c64e,ac90448..ac90448
mode 100755,100644..100755
--- 1/src/lib/cache/evas_cache_image.c
--- 2/src/lib/cache/evas_cache_image.c
+++ b/src/lib/cache/evas_cache_image.c

diff --cc src/lib/canvas/evas_events.c
index 0cd9212,c8242c1..ff48c42
--- 1/src/lib/canvas/evas_events.c
--- 2/src/lib/canvas/evas_events.c
+++ b/src/lib/canvas/evas_events.c
@@@ -887,11 -906,10 +906,15 @@@ evas_event_feed_mouse_out(Evas *e, unsi
     ev.modifiers = &(e->modifiers);
     ev.locks = &(e->locks);
     ev.timestamp = timestamp;
-    ev.event_flags = EVAS_EVENT_FLAG_NONE;
+    ev.event_flags = e->default_event_flags;
  
     _evas_walk(e);
++<<<<<<< HEAD
 +   /* if our mouse button is grabbed to any objects */
 +   if ((0) && (e->pointer.mouse_grabbed != 0))
++=======
+    /* if our mouse button is inside any objects */
++>>>>>>> origin/upstream
       {
          /* go thru old list of in objects */
          Eina_List *l, *copy;
@@@ -909,7 -927,7 +932,11 @@@
                    if (!obj->delete_me)
                      {
                         if (e->events_frozen <= 0)
++<<<<<<< HEAD
 +                          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
++=======
+                          evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
++>>>>>>> origin/upstream
                      }
                    obj->mouse_grabbed = 0;
                 }

diff --cc src/lib/canvas/evas_map.c
index ec355bb,2359d5a..bed8b22
--- 1/src/lib/canvas/evas_map.c
--- 2/src/lib/canvas/evas_map.c
+++ b/src/lib/canvas/evas_map.c
@@@ -90,16 -86,16 +88,16 @@@ _evas_map_calc_map_geometry(Evas_Objec
     p++;
     for (; p < p_end; p++)
       {
-       Evas_Coord x, y;
-       x = lround(p->x);
-       y = lround(p->y);
- 
-         if (p->x < x1) x1 = x;
-         if (p->x > x2) x2 = x;
-         if (p->y < y1) y1 = y;
-         if (p->y > y2) y2 = y;
+         Evas_Coord x, y;
+         
+         x = lround(p->x);
+         y = lround(p->y);
+         if (x < x1) x1 = x;
+         if (x > x2) x2 = x;
+         if (y < y1) y1 = y;
+         if (y > y2) y2 = y;
       }
 -// this causes clip-out bugs now mapped objs canbe opaque!!!   
 +// this causes clip-out bugs now mapped objs canbe opaque!!!
  //   // add 1 pixel of fuzz around the map region to ensure updates are correct
  //   x1 -= 1; y1 -= 1;
  //   x2 += 1; y2 += 1;

diff --cc src/lib/canvas/evas_object_image.c
index 0e384cf,aa4a974..4f61ea6
mode 100755,100644..100755
--- 1/src/lib/canvas/evas_object_image.c
--- 2/src/lib/canvas/evas_object_image.c
+++ b/src/lib/canvas/evas_object_image.c

diff --cc src/modules/engines/gl_common/evas_gl_texture.c
Simple merge

diff --cc src/modules/loaders/gif/evas_image_load_gif.c
Simple merge