diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp')
| -rw-r--r-- | WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp index 01bc03a..158a3b8 100644 --- a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp +++ b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp @@ -213,7 +213,7 @@ void FullscreenVideoController::hideHud() GdkCursor* cursor = blankCursor(); gdk_window_set_cursor(window, cursor); - gtk_widget_hide_all(m_hudWindow); + gtk_widget_hide(m_hudWindow); if (m_progressBarUpdateId) { g_source_remove(m_progressBarUpdateId); @@ -350,7 +350,7 @@ void FullscreenVideoController::exitFullscreen() if (m_mediaElement->platformMedia().type == WebCore::PlatformMedia::GStreamerGWorldType) m_mediaElement->platformMedia().media.gstreamerGWorld->exitFullscreen(); - gtk_widget_hide_all(m_window); + gtk_widget_hide(m_window); gtk_widget_destroy(m_hudWindow); m_hudWindow = 0; @@ -541,8 +541,8 @@ void FullscreenVideoController::createHud() GtkWidget* label = gtk_label_new(_("Time:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); - GtkObject* adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 0.1, 1.0, 1.0); - m_timeHScale = gtk_hscale_new(GTK_ADJUSTMENT(adjustment)); + GtkAdjustment* adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 100.0, 0.1, 1.0, 1.0)); + m_timeHScale = gtk_hscale_new(adjustment); gtk_scale_set_draw_value(GTK_SCALE(m_timeHScale), FALSE); gtk_range_set_show_fill_level(GTK_RANGE(m_timeHScale), TRUE); gtk_range_set_update_policy(GTK_RANGE(m_timeHScale), GTK_UPDATE_CONTINUOUS); |