Changeset 122564 in webkit

Timestamp:

Jul 13, 2012 4:43:43 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Add const to the parameter of getters in ewk_security_origin
​https://bugs.webkit.org/show_bug.cgi?id=90954

Patch by Kihong Kwon <​kihong.kwon@samsung.com> on 2012-07-13
Reviewed by Kentaro Hara.

Move initialization of strings for protocol and host to the ewk_security_origin_new method,
which allows to add const qualifier for ewk_security_origin_protocol_get and ewk_security_origin_host_get.
In addition, add null checks to the getters.

• ewk/ewk_security_origin.cpp:

(ewk_security_origin_protocol_get):
(ewk_security_origin_host_get):
(ewk_security_origin_new):

• ewk/ewk_security_origin.h:

Location:

trunk/Source/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_security_origin.cpp (modified) (2 diffs)
• ewk/ewk_security_origin.h (modified) (2 diffs)

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-07-13  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        [EFL] Add const to the parameter of getters in ewk_security_origin
+        https://bugs.webkit.org/show_bug.cgi?id=90954
+
+        Reviewed by Kentaro Hara.
+
+        Move initialization of strings for protocol and host to the ewk_security_origin_new method,
+        which allows to add const qualifier for ewk_security_origin_protocol_get and ewk_security_origin_host_get.
+        In addition, add null checks to the getters.
+
+        * ewk/ewk_security_origin.cpp:
+        (ewk_security_origin_protocol_get):
+        (ewk_security_origin_host_get):
+        (ewk_security_origin_new):
+        * ewk/ewk_security_origin.h:
+
 2012-07-13  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

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

@@ -40 +40 @@
 };
 
-const char* ewk_security_origin_protocol_get(Ewk_Security_Origin* origin)
+const char* ewk_security_origin_protocol_get(const Ewk_Security_Origin* origin)
 {
-    if (!origin->protocol)
-        origin->protocol = eina_stringshare_add(origin->securityOrigin->protocol().utf8().data());
-
+    EINA_SAFETY_ON_NULL_RETURN_VAL(origin, 0);
     return origin->protocol;
 }
 
-const char* ewk_security_origin_host_get(Ewk_Security_Origin* origin)
+const char* ewk_security_origin_host_get(const Ewk_Security_Origin* origin)
 {
-    if (!origin->host)
-        origin->host = eina_stringshare_add(origin->securityOrigin->host().utf8().data());
-
+    EINA_SAFETY_ON_NULL_RETURN_VAL(origin, 0);
     return origin->host;
 }
@@ -143 +139 @@
 
     origin->securityOrigin = coreOrigin;
-    origin->host = 0;
-    origin->protocol = 0;
+    origin->protocol = eina_stringshare_add(coreOrigin->protocol().utf8().data());
+    origin->host = eina_stringshare_add(coreOrigin->host().utf8().data());
 
     return origin;

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

@@ -50 +50 @@
  * be modified. The string is guaranteed to be stringshared.
  *
- * @return the protocol scheme
+ * @return the protocol scheme or @c 0 if there is not a protocol scheme
  */
-EAPI const char          *ewk_security_origin_protocol_get(Ewk_Security_Origin *o);
+EAPI const char          *ewk_security_origin_protocol_get(const Ewk_Security_Origin *o);
 
 /**
@@ -62 +62 @@
  * @param o security origin object
  *
- * @return the host domain
+ * @return the host domain or @c 0 if there is not a host scheme
  */
-EAPI const char          *ewk_security_origin_host_get(Ewk_Security_Origin *o);
+EAPI const char          *ewk_security_origin_host_get(const Ewk_Security_Origin *o);
 
 /**