Changeset 158110 in webkit
- Timestamp:
- Oct 28, 2013 8:22:29 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r158109 r158110 1 2013-10-28 Bastien Nocera <hadess@hadess.net> 2 3 Name all the GLib timeout sources 4 https://bugs.webkit.org/show_bug.cgi?id=123229 5 6 Reviewed by Anders Carlsson. 7 8 Give a name to GLib timeout sources, this is helpful when 9 profiling WebKitGTK applications. 10 11 No new tests, no change in functionality. 12 1 13 2013-10-28 Philippe Normand <pnormand@igalia.com> 2 14 -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
r158103 r158110 451 451 if (newState == GST_STATE_READY && !m_readyTimerHandler) { 452 452 m_readyTimerHandler = g_timeout_add_seconds(gReadyStateTimerInterval, reinterpret_cast<GSourceFunc>(mediaPlayerPrivateReadyStateTimeoutCallback), this); 453 g_source_set_name_by_id(m_readyTimerHandler, "[WebKit] mediaPlayerPrivateReadyStateTimeoutCallback"); 453 454 } else if (newState != GST_STATE_READY && m_readyTimerHandler) { 454 455 g_source_remove(m_readyTimerHandler); -
trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
r157506 r158110 271 271 priv->timeoutId = g_timeout_add_full(G_PRIORITY_DEFAULT, 0, webkitVideoSinkTimeoutCallback, 272 272 gst_object_ref(sink), reinterpret_cast<GDestroyNotify>(gst_object_unref)); 273 g_source_set_name_by_id(priv->timeoutId, "[WebKit] webkitVideoSinkTimeoutCallback"); 273 274 274 275 g_cond_wait(priv->dataCondition, priv->bufferMutex); -
trunk/Source/WebCore/platform/graphics/gtk/FullscreenVideoControllerGtk.cpp
r150421 r158110 171 171 172 172 // Start periodic updates of the progress bar. 173 if (!m_progressBarUpdateId) 173 if (!m_progressBarUpdateId) { 174 174 m_progressBarUpdateId = g_timeout_add(PROGRESS_BAR_UPDATE_INTERVAL, reinterpret_cast<GSourceFunc>(progressBarUpdateCallback), this); 175 g_source_set_name_by_id(m_progressBarUpdateId, "[WebKit] progressBarUpdateCallback"); 176 } 175 177 176 178 // Hide the hud in few seconds, if requested. 177 if (autoHide) 179 if (autoHide) { 178 180 m_hudTimeoutId = g_timeout_add(HUD_AUTO_HIDE_INTERVAL, reinterpret_cast<GSourceFunc>(hideHudCallback), this); 181 g_source_set_name_by_id(m_hudTimeoutId, "[WebKit] hideHudCallback"); 182 } 179 183 } 180 184 … … 447 451 448 452 m_progressBarUpdateId = g_timeout_add(PROGRESS_BAR_UPDATE_INTERVAL, reinterpret_cast<GSourceFunc>(progressBarUpdateCallback), this); 453 g_source_set_name_by_id(m_progressBarUpdateId, "[WebKit] progressBarUpdateCallback"); 449 454 450 455 playStateChanged(); -
trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp
r101190 r158110 44 44 } 45 45 46 static gboolean timeout_cb(gpointer)46 static gboolean sharedTimerTimeoutCallback(gpointer) 47 47 { 48 48 if (sharedTimerFiredFunction) … … 58 58 59 59 stopSharedTimer(); 60 sharedTimer = g_timeout_add_full(GDK_PRIORITY_REDRAW, intervalInMS, timeout_cb, 0, 0); 60 sharedTimer = g_timeout_add_full(GDK_PRIORITY_REDRAW, intervalInMS, sharedTimerTimeoutCallback, 0, 0); 61 g_source_set_name_by_id(sharedTimer, "[WebKit] sharedTimerTimeoutCallback"); 61 62 } 62 63 -
trunk/Source/WebCore/plugins/gtk/gtk2xtbin.c
r152552 r158110 394 394 (GSourceFunc)xt_event_polling_timer_callback, 395 395 xtdisplay); 396 g_source_set_name_by_id(xt_polling_timer_id, "[WebKit] xt_event_polling_timer_callback"); 396 397 } 397 398 -
trunk/Source/WebKit/gtk/ChangeLog
r158103 r158110 1 2013-10-28 Bastien Nocera <hadess@hadess.net> 2 3 Name all the GLib timeout sources 4 https://bugs.webkit.org/show_bug.cgi?id=123229 5 6 Reviewed by Anders Carlsson. 7 8 Give a name to GLib timeout sources, this is helpful when 9 profiling WebKitGTK applications. 10 1 11 2013-10-28 Bastien Nocera <hadess@hadess.net> 2 12 -
trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
r156543 r158110 170 170 double nextFlush = std::max((1 / gFramesPerSecond) - (currentTime() - m_lastFlushTime), 0.0); 171 171 m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 1000 * nextFlush, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0); 172 g_source_set_name_by_id(m_layerFlushTimerCallbackId, "[WebKit] layerFlushTimerFiredCallback"); 172 173 } 173 174 … … 270 271 271 272 m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 500, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0); 273 g_source_set_name_by_id(m_layerFlushTimerCallbackId, "[WebKit] layerFlushTimerFiredCallback"); 272 274 } 273 275 … … 337 339 double nextFlush = std::max(gScheduleDelay - (currentTime() - m_lastFlushTime), 0.0); 338 340 m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, nextFlush * 1000, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0); 341 g_source_set_name_by_id(m_layerFlushTimerCallbackId, "[WebKit] layerFlushTimerFiredCallback"); 339 342 } 340 343 -
trunk/Source/WebKit2/ChangeLog
r158108 r158110 1 2013-10-28 Bastien Nocera <hadess@hadess.net> 2 3 Name all the GLib timeout sources 4 https://bugs.webkit.org/show_bug.cgi?id=123229 5 6 Reviewed by Anders Carlsson. 7 8 Give a name to GLib timeout sources, this is helpful when 9 profiling WebKitGTK applications. 10 1 11 2013-10-28 Carlos Garcia Campos <cgarcia@igalia.com> 2 12 -
trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
r156603 r158110 305 305 double nextFlush = std::max((1 / targetFPS) - (currentTime() - m_lastFlushTime), 0.0); 306 306 m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, nextFlush * 1000.0, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0); 307 g_source_set_name_by_id(m_layerFlushTimerCallbackId, "[WebKit] layerFlushTimerFiredCallback"); 307 308 } 308 309 } … … 403 404 404 405 // We use a GLib timer because otherwise GTK+ event handling during dragging can starve WebCore timers, which have a lower priority. 405 if (!m_layerFlushTimerCallbackId) 406 if (!m_layerFlushTimerCallbackId) { 406 407 m_layerFlushTimerCallbackId = g_timeout_add_full(GDK_PRIORITY_EVENTS, 0, reinterpret_cast<GSourceFunc>(layerFlushTimerFiredCallback), this, 0); 408 g_source_set_name_by_id(m_layerFlushTimerCallbackId, "[WebKit] layerFlushTimerFiredCallback"); 409 } 407 410 } 408 411 -
trunk/Tools/ChangeLog
r158103 r158110 1 2013-10-28 Bastien Nocera <hadess@hadess.net> 2 3 Name all the GLib timeout sources 4 https://bugs.webkit.org/show_bug.cgi?id=123229 5 6 Reviewed by Anders Carlsson. 7 8 Give a name to GLib timeout sources, this is helpful when 9 profiling WebKitGTK applications. 10 1 11 2013-10-28 Bastien Nocera <hadess@hadess.net> 2 12 -
trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp
r156331 r158110 315 315 316 316 m_waitToDump = waitUntilDone; 317 if (m_waitToDump && shouldSetWaitToDumpWatchdog()) 318 setWaitToDumpWatchdog(g_timeout_add_seconds(timeoutSeconds, waitToDumpWatchdogFired, 0)); 317 if (m_waitToDump && shouldSetWaitToDumpWatchdog()) { 318 guint id = g_timeout_add_seconds(timeoutSeconds, waitToDumpWatchdogFired, 0); 319 g_source_set_name_by_id(id, "[WebKit] waitToDumpWatchdogFired"); 320 setWaitToDumpWatchdog(id); 321 } 319 322 } 320 323 -
trunk/Tools/GtkLauncher/main.c
r155714 r158110 158 158 "%s is now full screen. Press ESC or f to exit.", uri); 159 159 g_signal_connect_swapped(dialog, "response", G_CALLBACK(gtk_widget_destroy), dialog); 160 g_timeout_add(1500, (GSourceFunc) webViewFullscreenMessageWindowClose, dialog); 160 guint id = g_timeout_add(1500, (GSourceFunc) webViewFullscreenMessageWindowClose, dialog); 161 g_source_set_name_by_id(id, "[WebKit] webViewFullscreenMessageWindowClose"); 161 162 gtk_dialog_run(GTK_DIALOG(dialog)); 162 163 } -
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
r157218 r158110 164 164 gdouble progress = webkit_web_view_get_estimated_load_progress(webView); 165 165 gtk_entry_set_progress_fraction(GTK_ENTRY(window->uriEntry), progress); 166 if (progress == 1.0) 167 g_timeout_add(500, (GSourceFunc)resetEntryProgress, window->uriEntry); 166 if (progress == 1.0) { 167 guint id = g_timeout_add(500, (GSourceFunc)resetEntryProgress, window->uriEntry); 168 g_source_set_name_by_id(id, "[WebKit] resetEntryProgress"); 169 } 168 170 } 169 171 … … 312 314 313 315 window->fullScreenMessageLabelId = g_timeout_add_seconds(2, (GSourceFunc)fullScreenMessageTimeoutCallback, window); 316 g_source_set_name_by_id(window->fullScreenMessageLabelId, "[WebKit] fullScreenMessageTimeoutCallback"); 314 317 gtk_widget_hide(window->toolbar); 315 318 window->searchBarVisible = gtk_widget_get_visible(GTK_WIDGET(window->searchBar)); -
trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp
r140970 r158110 61 61 m_waitToDumpWatchdogTimer = g_timeout_add(waitToDumpWatchdogTimerInterval * 1000, 62 62 waitToDumpWatchdogTimerCallback, 0); 63 g_source_set_name_by_id(m_waitToDumpWatchdogTimer, "[WebKit] waitToDumpWatchdogTimerCallback"); 63 64 } 64 65 -
trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp
r135496 r158110 69 69 { 70 70 cancelTimeout(); 71 if (timeout != m_noTimeout) 71 if (timeout != m_noTimeout) { 72 72 gTimeoutSourceId = g_timeout_add(timeout * 1000, timeoutCallback, 0); 73 g_source_set_name_by_id(gTimeoutSourceId, "[WebKit] timeoutCallback"); 74 } 73 75 gtk_main(); 74 76 }
Note: See TracChangeset
for help on using the changeset viewer.