diff options
Diffstat (limited to 'Source/WebKit/gtk')
| -rw-r--r-- | Source/WebKit/gtk/ChangeLog | 16 | ||||
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebview.cpp | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog index 406c4c3dc..71935613b 100644 --- a/Source/WebKit/gtk/ChangeLog +++ b/Source/WebKit/gtk/ChangeLog @@ -1 +1,17 @@ +2012-05-25 Lu Guanqun <guanqun.lu@intel.com> + + [GTK] fix compilation for webkitwebview.cpp + https://bugs.webkit.org/show_bug.cgi?id=87473 + + Reviewed by Martin Robinson. + + When ACCELERATED_COMPOSITING and TEXTURE_MAPPER_GL is not set, + the local variable 'priv' won't be used. Therefore the following warning: + + ../../../Source/WebKit/gtk/webkit/webkitwebview.cpp: In function ‘void webkit_web_view_realize(GtkWidget*)’: + ../../../Source/WebKit/gtk/webkit/webkitwebview.cpp:971:27: warning: unused variable ‘priv’ [-Wunused-variable] + + * webkit/webkitwebview.cpp: + (webkit_web_view_realize): + == Rolled over to ChangeLog-2012-05-22 == diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp index 300ea8c99..1a54ea877 100644 --- a/Source/WebKit/gtk/webkit/webkitwebview.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp @@ -968,8 +968,6 @@ static gboolean webkit_web_view_focus_out_event(GtkWidget* widget, GdkEventFocus static void webkit_web_view_realize(GtkWidget* widget) { - WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)->priv; - gtk_widget_set_realized(widget, TRUE); GtkAllocation allocation; @@ -1010,6 +1008,7 @@ static void webkit_web_view_realize(GtkWidget* widget) GdkWindow* window = gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributes_mask); #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) + WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW(widget)->priv; priv->hasNativeWindow = gdk_window_ensure_native(window); #endif gtk_widget_set_window(widget, window); |