From: Carsten Haitzler <raster@rasterman.com>
Date: Thu, 2 Jun 2011 10:00:05 +0000 (+0000)
Subject: disable masking support. back to clip rects.
X-Git-Tag: submit/devel/efl/20131022.203902~9370
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ffa0f4075ca1b02a7c3704f528b80bc14386834;p=platform%2Fupstream%2Fefl.git

disable masking support. back to clip rects.



SVN revision: 59896
---

diff --git a/legacy/evas/src/lib/canvas/evas_clip.c b/legacy/evas/src/lib/canvas/evas_clip.c
index 9416b92..7337f4f 100644
--- a/legacy/evas/src/lib/canvas/evas_clip.c
+++ b/legacy/evas/src/lib/canvas/evas_clip.c
@@ -159,7 +159,7 @@ evas_object_mapped_clip_across_mark(Evas_Object *obj)
 }
 
 /* public functions */
-
+extern const char *o_rect_type;
 
 EAPI void
 evas_object_clip_set(Evas_Object *obj, Evas_Object *clip)
@@ -178,6 +178,8 @@ evas_object_clip_set(Evas_Object *obj, Evas_Object *clip)
    if (obj->cur.clipper == clip) return;
    if (obj == clip) return;
    if (evas_object_intercept_call_clip_set(obj, clip)) return;
+   // illegal to set anything but a rect as a clip
+   if (clip->type != o_rect_type) return;
    if (obj->smart.smart)
      {
        if (obj->smart.smart->smart_class->clip_set)
diff --git a/legacy/evas/src/lib/canvas/evas_object_rectangle.c b/legacy/evas/src/lib/canvas/evas_object_rectangle.c
index 74a3d6e..36678e7 100644
--- a/legacy/evas/src/lib/canvas/evas_object_rectangle.c
+++ b/legacy/evas/src/lib/canvas/evas_object_rectangle.c
@@ -4,6 +4,8 @@
 /* private magic number for rectangle objects */
 static const char o_type[] = "rectangle";
 
+const char *o_rect_type = o_type;
+
 /* private struct for rectangle object internal data */
 typedef struct _Evas_Object_Rectangle      Evas_Object_Rectangle;