Changeset 101190 in webkit

Timestamp:

Nov 26, 2011, 2:16:36 AM (15 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Fix some warnings in WebCore GTK+
​https://bugs.webkit.org/show_bug.cgi?id=73137

Patch by Martin Robinson <​mrobinson@igalia.com> 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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/CursorGtk.cpp (modified) (1 diff)
• platform/gtk/RenderThemeGtk3.cpp (modified) (1 diff)
• platform/gtk/SharedTimerGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-26  Martin Robinson  <mrobinson@igalia.com>
+
+        [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  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/gtk/CursorGtk.cpp

@@ -47 +47 @@
         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));

trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp

@@ -597 +597 @@
 {
     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);

trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp

@@ -63 +63 @@
 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;
 }