diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/gtk/WheelEventGtk.cpp | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/gtk/WheelEventGtk.cpp')
-rw-r--r-- | Source/WebCore/platform/gtk/WheelEventGtk.cpp | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/Source/WebCore/platform/gtk/WheelEventGtk.cpp b/Source/WebCore/platform/gtk/WheelEventGtk.cpp deleted file mode 100644 index fc6206f..0000000 --- a/Source/WebCore/platform/gtk/WheelEventGtk.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. - * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "PlatformWheelEvent.h" -#include "Scrollbar.h" - -#include <gdk/gdk.h> - -namespace WebCore { - -// Keep this in sync with the other platform event constructors -PlatformWheelEvent::PlatformWheelEvent(GdkEventScroll* event) -{ - static const float delta = 1; - - m_deltaX = 0; - m_deltaY = 0; - - // Docs say an upwards scroll (away from the user) has a positive delta - switch (event->direction) { - case GDK_SCROLL_UP: - m_deltaY = delta; - break; - case GDK_SCROLL_DOWN: - m_deltaY = -delta; - break; - case GDK_SCROLL_LEFT: - m_deltaX = delta; - break; - case GDK_SCROLL_RIGHT: - m_deltaX = -delta; - break; - } - m_wheelTicksX = m_deltaX; - m_wheelTicksY = m_deltaY; - - m_position = IntPoint(static_cast<int>(event->x), static_cast<int>(event->y)); - m_globalPosition = IntPoint(static_cast<int>(event->x_root), static_cast<int>(event->y_root)); - m_granularity = ScrollByPixelWheelEvent; - m_isAccepted = false; - m_shiftKey = event->state & GDK_SHIFT_MASK; - m_ctrlKey = event->state & GDK_CONTROL_MASK; - m_altKey = event->state & GDK_MOD1_MASK; - m_metaKey = event->state & GDK_META_MASK; - - // FIXME: retrieve the user setting for the number of lines to scroll on each wheel event - m_deltaX *= static_cast<float>(Scrollbar::pixelsPerLineStep()); - m_deltaY *= static_cast<float>(Scrollbar::pixelsPerLineStep()); -} - -} |