Changeset 56615 in webkit
- Timestamp:
- Mar 26, 2010 1:58:45 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r56613 r56615 1 2010-03-08 Philippe Normand <pnormand@igalia.com> 2 3 Reviewed by Gustavo Noronha. 4 5 [GStreamer] soften dependency on libsoup in the http src element 6 https://bugs.webkit.org/show_bug.cgi?id=35864 7 8 Replaced SoupURI calls with KURL and pause/resume internal soup 9 messages only if the element is compiled for a port depending on 10 libsoup. 11 12 * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: 13 (webkit_web_src_init): 14 (webKitWebSrcSetUri): 15 (webKitWebSrcNeedDataMainCb): 16 (webKitWebSrcEnoughDataMainCb): 17 1 18 2010-03-25 Ilya Tikhonovsky <loislo@chromium.org> 2 19 -
trunk/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
r56055 r56615 256 256 // likely that libsoup already provides new data before 257 257 // the queue is really empty. 258 // This might need tweaking for ports not using libsoup. 258 259 if (priv->haveAppSrc27) 259 260 g_object_set(priv->appsrc, "min-percent", 20, NULL); … … 506 507 return TRUE; 507 508 508 SoupURI* soupUri = soup_uri_new(uri);509 510 if (! soupUri || !SOUP_URI_VALID_FOR_HTTP(soupUri)) {509 KURL url(KURL(), uri); 510 511 if (!url.isValid() || !url.protocolInHTTPFamily()) { 511 512 GST_ERROR_OBJECT(src, "Invalid URI '%s'", uri); 512 soup_uri_free(soupUri);513 513 return FALSE; 514 514 } 515 515 516 priv->uri = soup_uri_to_string(soupUri, FALSE); 517 soup_uri_free(soupUri); 518 516 priv->uri = g_strdup(url.string().utf8().data()); 519 517 return TRUE; 520 518 } … … 536 534 WebKitWebSrcPrivate* priv = src->priv; 537 535 536 #if USE(NETWORK_SOUP) 538 537 ResourceHandleInternal* d = priv->resourceHandle->getInternal(); 539 538 if (d->m_msg) 540 539 soup_session_unpause_message(ResourceHandle::defaultSession(), d->m_msg); 540 #endif 541 // Ports not using libsoup need to call the unpause/schedule API of their 542 // underlying network implementation here. 541 543 542 544 priv->paused = FALSE; … … 561 563 WebKitWebSrcPrivate* priv = src->priv; 562 564 565 #if USE(NETWORK_SOUP) 563 566 ResourceHandleInternal* d = priv->resourceHandle->getInternal(); 564 567 soup_session_pause_message(ResourceHandle::defaultSession(), d->m_msg); 565 568 #endif 569 // Ports not using libsoup need to call the pause/unschedule API of their 570 // underlying network implementation here. 571 566 572 priv->paused = TRUE; 567 573 priv->enoughDataID = 0;
Note: See TracChangeset
for help on using the changeset viewer.