Title: [122566] trunk/Source/WebKit2
- Revision
- 122566
- Author
- [email protected]
- Date
- 2012-07-13 05:03:40 -0700 (Fri, 13 Jul 2012)
Log Message
[EFL][WK2] Use eina stringsharing for Ewk_Web_Resource's url
https://bugs.webkit.org/show_bug.cgi?id=91200
Patch by Christophe Dumez <[email protected]> on 2012-07-13
Reviewed by Kenneth Rohde Christiansen.
Use eina stringsharing for Ewk_Web_Resource's url
for consistency.
* UIProcess/API/efl/ewk_web_resource.cpp:
(_Ewk_Web_Resource):
(_Ewk_Web_Resource::_Ewk_Web_Resource):
(ewk_web_resource_unref):
(ewk_web_resource_url_get):
* UIProcess/API/efl/ewk_web_resource.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (122565 => 122566)
--- trunk/Source/WebKit2/ChangeLog 2012-07-13 11:44:10 UTC (rev 122565)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-13 12:03:40 UTC (rev 122566)
@@ -1,3 +1,20 @@
+2012-07-13 Christophe Dumez <[email protected]>
+
+ [EFL][WK2] Use eina stringsharing for Ewk_Web_Resource's url
+ https://bugs.webkit.org/show_bug.cgi?id=91200
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Use eina stringsharing for Ewk_Web_Resource's url
+ for consistency.
+
+ * UIProcess/API/efl/ewk_web_resource.cpp:
+ (_Ewk_Web_Resource):
+ (_Ewk_Web_Resource::_Ewk_Web_Resource):
+ (ewk_web_resource_unref):
+ (ewk_web_resource_url_get):
+ * UIProcess/API/efl/ewk_web_resource.h:
+
2012-07-13 Carlos Garcia Campos <[email protected]>
[GTK] WebKitWebView::mouse-target-changed is not emitted when moved to/from edtiable content
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.cpp (122565 => 122566)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.cpp 2012-07-13 11:44:10 UTC (rev 122565)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.cpp 2012-07-13 12:03:40 UTC (rev 122566)
@@ -31,12 +31,12 @@
struct _Ewk_Web_Resource {
unsigned int __ref; /**< the reference count of the object */
- CString url;
+ const char* url;
bool isMainResource;
_Ewk_Web_Resource(const char* _url, bool _isMainResource)
: __ref(1)
- , url(_url)
+ , url(eina_stringshare_add(_url))
, isMainResource(_isMainResource)
{ }
};
@@ -55,6 +55,7 @@
if (--resource->__ref)
return;
+ eina_stringshare_del(resource->url);
delete resource;
}
@@ -62,7 +63,7 @@
{
EINA_SAFETY_ON_NULL_RETURN_VAL(resource, 0);
- return resource->url.data();
+ return resource->url;
}
/**
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.h (122565 => 122566)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.h 2012-07-13 11:44:10 UTC (rev 122565)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_web_resource.h 2012-07-13 12:03:40 UTC (rev 122566)
@@ -61,7 +61,11 @@
*
* @param resource resource object to query.
*
- * @return the URL pointer, that may be @c NULL.
+ * @return the URL pointer, that may be @c NULL. This pointer is
+ * guaranteed to be eina_stringshare, so whenever possible
+ * save yourself some cpu cycles and use
+ * eina_stringshare_ref() instead of eina_stringshare_add() or
+ * strdup().
*/
EAPI const char *ewk_web_resource_url_get(const Ewk_Web_Resource *resource);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
