Title: [101190] trunk/Source/WebCore
- Revision
- 101190
- Author
- [email protected]
- Date
- 2011-11-26 02:16:36 -0800 (Sat, 26 Nov 2011)
Log Message
[GTK] Fix some warnings in WebCore GTK+
https://bugs.webkit.org/show_bug.cgi?id=73137
Patch by Martin Robinson <[email protected]> on 2011-11-26
Reviewed by Philippe Normand.
No new tests. This patch just fixes compilation warnings.
* platform/gtk/CursorGtk.cpp:
(WebCore::createNamedCursor): Remove unused variable.
* platform/gtk/RenderThemeGtk3.cpp:
(WebCore::RenderThemeGtk::paintSliderTrack): ASSERT_UNUSED instead of ASSERT.
* platform/gtk/SharedTimerGtk.cpp: Ditto.
(WebCore::stopSharedTimer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101189 => 101190)
--- trunk/Source/WebCore/ChangeLog 2011-11-26 08:59:05 UTC (rev 101189)
+++ trunk/Source/WebCore/ChangeLog 2011-11-26 10:16:36 UTC (rev 101190)
@@ -1,3 +1,19 @@
+2011-11-26 Martin Robinson <[email protected]>
+
+ [GTK] Fix some warnings in WebCore GTK+
+ https://bugs.webkit.org/show_bug.cgi?id=73137
+
+ Reviewed by Philippe Normand.
+
+ No new tests. This patch just fixes compilation warnings.
+
+ * platform/gtk/CursorGtk.cpp:
+ (WebCore::createNamedCursor): Remove unused variable.
+ * platform/gtk/RenderThemeGtk3.cpp:
+ (WebCore::RenderThemeGtk::paintSliderTrack): ASSERT_UNUSED instead of ASSERT.
+ * platform/gtk/SharedTimerGtk.cpp: Ditto.
+ (WebCore::stopSharedTimer):
+
2011-11-25 Eric Carlson <[email protected]>
Implement addCue and removeCue in TextTrack
Modified: trunk/Source/WebCore/platform/gtk/CursorGtk.cpp (101189 => 101190)
--- trunk/Source/WebCore/platform/gtk/CursorGtk.cpp 2011-11-26 08:59:05 UTC (rev 101189)
+++ trunk/Source/WebCore/platform/gtk/CursorGtk.cpp 2011-11-26 10:16:36 UTC (rev 101190)
@@ -46,7 +46,6 @@
if (c)
return c;
- IntSize cursorSize = IntSize(32, 32);
RefPtr<cairo_surface_t> source = adoptRef(cairo_image_surface_create_for_data(const_cast<unsigned char*>(cursor.bits), CAIRO_FORMAT_A1, 32, 32, 4));
RefPtr<cairo_surface_t> mask = adoptRef(cairo_image_surface_create_for_data(const_cast<unsigned char*>(cursor.mask_bits), CAIRO_FORMAT_A1, 32, 32, 4));
RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_A1, 32, 32));
Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp (101189 => 101190)
--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp 2011-11-26 08:59:05 UTC (rev 101189)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp 2011-11-26 10:16:36 UTC (rev 101190)
@@ -596,7 +596,7 @@
bool RenderThemeGtk::paintSliderTrack(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
{
ControlPart part = renderObject->style()->appearance();
- ASSERT(part == SliderHorizontalPart || part == SliderVerticalPart || part == MediaVolumeSliderPart);
+ ASSERT_UNUSED(part, part == SliderHorizontalPart || part == SliderVerticalPart || part == MediaVolumeSliderPart);
GtkStyleContext* context = getStyleContext(GTK_TYPE_SCALE);
gtk_style_context_save(context);
Modified: trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp (101189 => 101190)
--- trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp 2011-11-26 08:59:05 UTC (rev 101189)
+++ trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp 2011-11-26 10:16:36 UTC (rev 101190)
@@ -62,12 +62,11 @@
void stopSharedTimer()
{
- gboolean s = FALSE;
if (sharedTimer == 0)
return;
- s = g_source_remove(sharedTimer);
- ASSERT(s);
+ gboolean removedSource = g_source_remove(sharedTimer);
+ ASSERT_UNUSED(removedSource, removedSource);
sharedTimer = 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
