Changeset 36012 in webkit
- Timestamp:
- Sep 1, 2008 5:44:01 AM (16 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r35958 r36012 1 2008-09-01 Alp Toker <alp@nuanti.com> 2 3 Reviewed by Eric Seidel. 4 5 https://bugs.webkit.org/show_bug.cgi?id=19939 6 [GTK] webkit_web_history_item_get_title() fails with assertion 7 8 Make sure newly constructed WebHistoryItem objects wrap a WebCore 9 history item when necessary. Avoid G_PARAM_CONSTRUCT since it destroys 10 history data -- use WEBKIT_PARAM flags instead as they do the right 11 thing. This restores history functionality. 12 13 Also use CString to simplify UTF-8 string management. 14 15 * webkit/webkitwebbackforwardlist.cpp: 16 (_WebKitWebBackForwardListPrivate::webkit_web_back_forward_list_get_forward_list_with_limit): 17 (_WebKitWebBackForwardListPrivate::webkit_web_back_forward_list_get_back_list_with_limit): 18 No need to initialize the vector with a size since it's cleared by the 19 callee. 20 * webkit/webkitwebhistoryitem.cpp: 21 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_finalize): 22 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_class_init): 23 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new_with_core_item): 24 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new): 25 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_new_with_data): 26 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_title): 27 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_alternate_title): 28 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_set_alternate_title): 29 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_uri): 30 (_WebKitWebHistoryItemPrivate::webkit_web_history_item_get_original_uri): 31 1 32 2008-08-27 Adrien Nader <camaradetux@gmail.com> 2 33 -
trunk/WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
r34570 r36012 164 164 return NULL; 165 165 166 WebCore::HistoryItemVector items (limit);166 WebCore::HistoryItemVector items; 167 167 GList* forwardItems = { 0 }; 168 168 … … 194 194 return NULL; 195 195 196 WebCore::HistoryItemVector items (limit);196 WebCore::HistoryItemVector items; 197 197 GList* backItems = { 0 }; 198 198 -
trunk/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
r35136 r36012 37 37 WTF::RefPtr<WebCore::HistoryItem> historyItem; 38 38 39 gchar*title;40 gchar*alternateTitle;41 gchar*uri;42 gchar*originalUri;39 WebCore::CString title; 40 WebCore::CString alternateTitle; 41 WebCore::CString uri; 42 WebCore::CString originalUri; 43 43 }; 44 44 … … 106 106 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 107 107 108 g_free(priv->title);109 g_free(priv->alternateTitle);110 g_free(priv->uri);111 g_free(priv->originalUri);108 priv->title = WebCore::CString(); 109 priv->alternateTitle = WebCore::CString(); 110 priv->uri = WebCore::CString(); 111 priv->originalUri = WebCore::CString(); 112 112 113 113 G_OBJECT_CLASS(webkit_web_history_item_parent_class)->finalize(object); … … 122 122 gobject_class->set_property = webkit_web_history_item_set_property; 123 123 gobject_class->get_property = webkit_web_history_item_get_property; 124 125 GParamFlags flags = (GParamFlags)(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT);126 124 127 125 /** … … 139 137 "The title of the history item", 140 138 NULL, 141 G_PARAM_READABLE));139 WEBKIT_PARAM_READABLE)); 142 140 143 141 /** … … 155 153 "The alternate title of the history item", 156 154 NULL, 157 flags));155 WEBKIT_PARAM_READWRITE)); 158 156 159 157 /** … … 171 169 "The URI of the history item", 172 170 NULL, 173 G_PARAM_READABLE));171 WEBKIT_PARAM_READABLE)); 174 172 175 173 /** … … 187 185 "The original URI of the history item", 188 186 NULL, 189 G_PARAM_READABLE));187 WEBKIT_PARAM_READABLE)); 190 188 191 189 /** … … 203 201 "The time at which the history item was last visited", 204 202 0, G_MAXDOUBLE, 0, 205 G_PARAM_READABLE));203 WEBKIT_PARAM_READABLE)); 206 204 207 205 g_type_class_add_private(gobject_class, sizeof(WebKitWebHistoryItemPrivate)); … … 258 256 WebKitWebHistoryItem* webHistoryItem = kit(item); 259 257 260 if (!webHistoryItem) { 258 if (webHistoryItem) 259 g_object_ref(webHistoryItem); 260 else { 261 261 webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL)); 262 webkit_history_item_add(webHistoryItem, core(webHistoryItem)); 262 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 263 264 priv->historyItem = item; 265 webkit_history_item_add(webHistoryItem, priv->historyItem.get()); 263 266 } 264 267 … … 274 277 * Return value: the new #WebKitWebHistoryItem 275 278 */ 276 WebKitWebHistoryItem* webkit_web_history_item_new( void)279 WebKitWebHistoryItem* webkit_web_history_item_new() 277 280 { 278 281 WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL)); … … 297 300 { 298 301 WebCore::KURL historyUri(uri); 299 WebCore::String historyTitle (title);302 WebCore::String historyTitle = WebCore::String::fromUTF8(title); 300 303 301 304 WebKitWebHistoryItem* webHistoryItem = WEBKIT_WEB_HISTORY_ITEM(g_object_new(WEBKIT_TYPE_WEB_HISTORY_ITEM, NULL)); … … 323 326 324 327 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 325 WebCore::String title = item->title(); 326 g_free(priv->title); 327 priv->title = g_strdup(title.utf8().data()); 328 329 return priv->title; 328 priv->title = item->title().utf8(); 329 330 return priv->title.data(); 330 331 } 331 332 … … 347 348 348 349 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 349 WebCore::String alternateTitle = item->alternateTitle(); 350 g_free(priv->alternateTitle); 351 priv->alternateTitle = g_strdup(alternateTitle.utf8().data()); 352 353 return priv->alternateTitle; 350 priv->alternateTitle = item->alternateTitle().utf8(); 351 352 return priv->alternateTitle.data(); 354 353 } 355 354 … … 364 363 { 365 364 g_return_if_fail(WEBKIT_IS_WEB_HISTORY_ITEM(webHistoryItem)); 365 g_return_if_fail(title); 366 366 367 367 WebCore::HistoryItem* item = core(webHistoryItem); … … 387 387 g_return_val_if_fail(item != NULL, NULL); 388 388 389 WebCore::String uri = item->urlString(); 390 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 391 g_free(priv->uri); 392 priv->uri = g_strdup(uri.utf8().data()); 393 394 return priv->uri; 389 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 390 priv->uri = item->urlString().utf8(); 391 392 return priv->uri.data(); 395 393 } 396 394 … … 411 409 g_return_val_if_fail(item != NULL, NULL); 412 410 413 WebCore::String originalUri = item->originalURLString(); 414 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 415 g_free(priv->originalUri); 416 priv->originalUri = g_strdup(originalUri.utf8().data()); 417 418 return webHistoryItem->priv->originalUri; 411 WebKitWebHistoryItemPrivate* priv = webHistoryItem->priv; 412 priv->originalUri = item->originalURLString().utf8(); 413 414 return webHistoryItem->priv->originalUri.data(); 419 415 } 420 416
Note: See TracChangeset
for help on using the changeset viewer.