Title: [118517] trunk/Source/WebKit/gtk
- Revision
- 118517
- Author
- [email protected]
- Date
- 2012-05-25 06:04:15 -0700 (Fri, 25 May 2012)
Log Message
[GTK] fix compilation for webkitwebview.cpp
https://bugs.webkit.org/show_bug.cgi?id=87473
Patch by Lu Guanqun <[email protected]> on 2012-05-25
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (118516 => 118517)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-05-25 12:54:04 UTC (rev 118516)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-05-25 13:04:15 UTC (rev 118517)
@@ -1 +1,17 @@
+2012-05-25 Lu Guanqun <[email protected]>
+
+ [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 ==
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (118516 => 118517)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-05-25 12:54:04 UTC (rev 118516)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-05-25 13:04:15 UTC (rev 118517)
@@ -968,8 +968,6 @@
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 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
