Changeset 31399 in webkit

Timestamp:

Mar 28, 2008 11:26:04 AM (16 years ago)

Author:

alp@webkit.org

Message:

2008-03-28 Jasper Bryant-Greene <​jasper@unix.geek.nz>

Reviewed by Alp Toker.

​http://bugs.webkit.org/show_bug.cgi?id=18061
PlatformScrollBarGtk attempts to allocate negative width and/or height for widgets

Missing clampNegativeToZero() call meant that we tried to allocate widgets with negative width and/or height.

• platform/gtk/PlatformScrollBarGtk.cpp: (PlatformScrollbar::geometryChanged):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/gtk/PlatformScrollBarGtk.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-28  Jasper Bryant-Greene  <jasper@unix.geek.nz>
+
+        Reviewed by Alp Toker.
+
+        http://bugs.webkit.org/show_bug.cgi?id=18061
+        PlatformScrollBarGtk attempts to allocate negative width and/or height for widgets
+
+        Missing clampNegativeToZero() call meant that we tried to allocate widgets with negative width and/or height.
+
+        * platform/gtk/PlatformScrollBarGtk.cpp:
+        (PlatformScrollbar::geometryChanged):
+
 2008-03-28  Brady Eidson  <beidson@apple.com>
 

trunk/WebCore/platform/gtk/PlatformScrollBarGtk.cpp

@@ -123 +123 @@
     FrameView* frameView = static_cast<FrameView*>(parent());
     IntRect windowRect = IntRect(frameView->contentsToWindow(frameGeometry().location()), frameGeometry().size());
-    GtkAllocation allocation = { windowRect.x(), windowRect.y(), windowRect.width(), windowRect.height() };
+
+    IntSize sz = frameGeometry().size();
+    sz.clampNegativeToZero();
+
+    GtkAllocation allocation = { windowRect.x(), windowRect.y(), sz.width(), sz.height() };
     gtk_widget_size_allocate(gtkWidget(), &allocation);
 }