Modified: trunk/Source/WebKit/efl/ChangeLog (100260 => 100261)
--- trunk/Source/WebKit/efl/ChangeLog 2011-11-15 11:01:35 UTC (rev 100260)
+++ trunk/Source/WebKit/efl/ChangeLog 2011-11-15 11:03:40 UTC (rev 100261)
@@ -1,3 +1,17 @@
+2011-11-15 Grzegorz Czajkowski <[email protected]>
+
+ [EFL] Use EINA_SAFETY_ON_NULL_RETURN_VAL for NULL checks instead of EINA_SAFETY_ON_FALSE_RETURN_VAL.
+ https://bugs.webkit.org/show_bug.cgi?id=70091
+
+ Reviewed by Filip Pizlo.
+
+ Replaces EINA_SAFETY_ON_FALSE_RETURN_VAL by EINA_SAFETY_ON_NULL_RETURN_VAL for NULL checks in compliance
+ with WebKit-EFL functions.
+
+ * ewk/ewk_frame.cpp:
+ (ewk_frame_contents_set):
+ (ewk_frame_contents_alternate_set):
+
2011-11-14 Jongseok Yang <[email protected]>
[EFL] Update ewk_frame_script_execute to return the result for _javascript_
Modified: trunk/Source/WebKit/efl/ewk/ewk_frame.cpp (100260 => 100261)
--- trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2011-11-15 11:01:35 UTC (rev 100260)
+++ trunk/Source/WebKit/efl/ewk/ewk_frame.cpp 2011-11-15 11:03:40 UTC (rev 100261)
@@ -399,7 +399,7 @@
Eina_Bool ewk_frame_contents_set(Evas_Object* ewkFrame, const char* contents, size_t contentsSize, const char* mimeType, const char* encoding, const char* baseUri)
{
EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, false);
- EINA_SAFETY_ON_FALSE_RETURN_VAL(smartData->frame, false);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, false);
EINA_SAFETY_ON_NULL_RETURN_VAL(contents, false);
return _ewk_frame_contents_set_internal
(smartData, contents, contentsSize, mimeType, encoding, baseUri, 0);
@@ -408,7 +408,7 @@
Eina_Bool ewk_frame_contents_alternate_set(Evas_Object* ewkFrame, const char* contents, size_t contentsSize, const char* mimeType, const char* encoding, const char* baseUri, const char* unreachableUri)
{
EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, false);
- EINA_SAFETY_ON_FALSE_RETURN_VAL(smartData->frame, false);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, false);
EINA_SAFETY_ON_NULL_RETURN_VAL(contents, false);
EINA_SAFETY_ON_NULL_RETURN_VAL(unreachableUri, false);
return _ewk_frame_contents_set_internal