Changeset 106908 in webkit

Timestamp:

Feb 6, 2012 11:22:36 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Define to prevent a single backing-store application from calling the tiled view function.
​https://bugs.webkit.org/show_bug.cgi?id=77842

Patch by JungJik Lee <​jungjik.lee@samsung.com> on 2012-02-06
Reviewed by Andreas Kling.

The define prevents an application using single backing store from calling tiled cache function.
The tiled APIs opened to outer should check the view type before being called.

• ewk/ewk_private.h:
• ewk/ewk_view.cpp:

(_Ewk_View_Private_Data):
(ewk_view_frame_view_creation_notify):

• ewk/ewk_view_tiled.cpp:

(ewk_view_tiled_unused_cache_get):
(ewk_view_tiled_unused_cache_set):

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_private.h (modified) (1 diff)
• ewk/ewk_view.cpp (modified) (2 diffs)
• ewk/ewk_view_tiled.cpp (modified) (2 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-02-06  JungJik Lee  <jungjik.lee@samsung.com>
+
+        [EFL] Define to prevent a single backing-store application from calling the tiled view function.
+        https://bugs.webkit.org/show_bug.cgi?id=77842
+
+        Reviewed by Andreas Kling.
+
+        The define prevents an application using single backing store from calling tiled cache function.
+        The tiled APIs opened to outer should check the view type before being called.
+
+        * ewk/ewk_private.h:
+        * ewk/ewk_view.cpp:
+        (_Ewk_View_Private_Data):
+        (ewk_view_frame_view_creation_notify):
+        * ewk/ewk_view_tiled.cpp:
+        (ewk_view_tiled_unused_cache_get):
+        (ewk_view_tiled_unused_cache_set):
+
 2012-02-06  JungJik Lee  <jungjik.lee@samsung.com>
 

trunk/Source/WebKit/efl/ewk/ewk_private.h

@@ -62 +62 @@
 const char ewkViewTiledName[] = "Ewk_View_Tiled";
 const char ewkViewSingleName[] = "Ewk_View_Single";
+
+// Define to prevent an application using different view type from calling the function.
+#define EWK_VIEW_TYPE_CHECK_OR_RETURN(ewkView, viewName, ...) \
+    if (!evas_object_smart_type_check(ewkView, viewName)) { \
+        INF("ewkView isn't an instance of %s", viewName); \
+        return __VA_ARGS__; \
+    }
 
 // forward declarations

trunk/Source/WebKit/efl/ewk/ewk_view.cpp

@@ -267 +267 @@
     }
 
-#define EWK_VIEW_TILED_TYPE_CHECK_OR_RETURN(ewkView, ...) \
-    if (!evas_object_smart_type_check(ewkView, ewkViewTiledName)) { \
-        INF("object isn't an instance of %s", ewkViewTiledName); \
-        return __VA_ARGS__; \
-    }
-
 static void _ewk_view_smart_changed(Ewk_View_Smart_Data* smartData)
 {
@@ -3217 +3211 @@
 void ewk_view_frame_view_creation_notify(Evas_Object* ewkView)
 {
-    EWK_VIEW_TILED_TYPE_CHECK_OR_RETURN(ewkView);
+    EWK_VIEW_TYPE_CHECK_OR_RETURN(ewkView, ewkViewTiledName);
     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData);
     ewk_frame_paint_full_set(smartData->main_frame, true);

trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp

@@ -393 +393 @@
 Ewk_Tile_Unused_Cache* ewk_view_tiled_unused_cache_get(const Evas_Object* ewkView)
 {
+    EWK_VIEW_TYPE_CHECK_OR_RETURN(ewkView, ewkViewTiledName, 0);
     Ewk_View_Smart_Data* smartData = ewk_view_smart_data_get(ewkView);
     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData, 0);
@@ -400 +401 @@
 void ewk_view_tiled_unused_cache_set(Evas_Object* ewkView, Ewk_Tile_Unused_Cache* cache)
 {
+    EWK_VIEW_TYPE_CHECK_OR_RETURN(ewkView, ewkViewTiledName);
     Ewk_View_Smart_Data* smartData = ewk_view_smart_data_get(ewkView);
     EINA_SAFETY_ON_NULL_RETURN(smartData);