diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/platform/gtk/RenderThemeGtk3.cpp | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/platform/gtk/RenderThemeGtk3.cpp')
-rw-r--r-- | Source/WebCore/platform/gtk/RenderThemeGtk3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp index 7fa0f04..527de1a 100644 --- a/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp +++ b/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp @@ -483,14 +483,14 @@ bool RenderThemeGtk::paintMenuList(RenderObject* renderObject, const PaintInfo& gtk_style_context_get_style(arrowStyleContext, "arrow-scaling", &arrowScaling, NULL); IntSize arrowSize(minArrowSize, innerRect.height()); - IntPoint arrowPosition = innerRect.location(); + FloatPoint arrowPosition(innerRect.location()); if (direction == GTK_TEXT_DIR_LTR) arrowPosition.move(innerRect.width() - arrowSize.width(), 0); // GTK+ actually fetches the xalign and valign values from the widget, but since we // don't have a widget here, we are just using the default xalign and valign values of 0.5. gint extent = std::min(arrowSize.width(), arrowSize.height()) * arrowScaling; - arrowPosition.move(std::floor((arrowSize.width() - extent) / 2), std::floor((arrowSize.height() - extent) / 2)); + arrowPosition.move((arrowSize.width() - extent) / 2, (arrowSize.height() - extent) / 2); gtk_style_context_set_state(arrowStyleContext, state); gtk_render_arrow(arrowStyleContext, cairoContext, G_PI, arrowPosition.x(), arrowPosition.y(), extent); |