Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (139156 => 139157)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-09 05:11:11 UTC (rev 139156)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-09 05:21:11 UTC (rev 139157)
@@ -1,3 +1,17 @@
+2013-01-08 Yoshifumi Inoue <yo...@chromium.org>
+
+ Remove WebKit/chromium/src/DragScrollTimer.{cpp,h}
+ https://bugs.webkit.org/show_bug.cgi?id=106403
+
+ This patch removes unused file DragScrollTimer.{cpp,h} obsoleted by
+ r139044.
+
+ Reviewed by Hajime Morita.
+
+ * WebKit.gyp: Changed to remove lines for DragScroll.{cpp.h}.
+ * src/DragScrollTimer.cpp: Removed.
+ * src/DragScrollTimer.h: Removed.
+
2013-01-08 Keishi Hattori <kei...@webkit.org>
[Chromium] Hiding popups on mouse wheel should be handled by WebViewImpl
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (139156 => 139157)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-09 05:11:11 UTC (rev 139156)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-09 05:21:11 UTC (rev 139157)
@@ -384,8 +384,6 @@
'src/DOMUtilitiesPrivate.h',
'src/DragClientImpl.cpp',
'src/DragClientImpl.h',
- 'src/DragScrollTimer.cpp',
- 'src/DragScrollTimer.h',
'src/EditorClientImpl.cpp',
'src/EditorClientImpl.h',
'src/EventListenerWrapper.cpp',
Deleted: trunk/Source/WebKit/chromium/src/DragScrollTimer.cpp (139156 => 139157)
--- trunk/Source/WebKit/chromium/src/DragScrollTimer.cpp 2013-01-09 05:11:11 UTC (rev 139156)
+++ trunk/Source/WebKit/chromium/src/DragScrollTimer.cpp 2013-01-09 05:21:11 UTC (rev 139157)
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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 "DragScrollTimer.h"
-
-#include "FrameView.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-// Computes the distance from a point outside a rect to the nearest edge of the rect.
-static IntSize distanceToRect(const IntPoint& point, const IntRect& rect)
-{
- int dx = 0, dy = 0;
- if (point.x() < rect.x())
- dx = point.x() - rect.x();
- else if (rect.maxX() < point.x())
- dx = point.x() - rect.maxX();
- if (point.y() < rect.y())
- dy = point.y() - rect.y();
- else if (rect.maxY() < point.y())
- dy = point.y() - rect.maxY();
- return IntSize(dx, dy);
-}
-
-DragScrollTimer::DragScrollTimer()
- : m_timer(this, &DragScrollTimer::fired)
- , m_view(0)
- , m_scrolling(false)
-{
-}
-
-DragScrollTimer::~DragScrollTimer()
-{
- // We do this for detecting dead object earlier
- stop();
-}
-
-void DragScrollTimer::stop()
-{
- m_timer.stop();
- m_view = 0;
- m_scrolling = false;
-}
-
-void DragScrollTimer::scroll()
-{
- m_view->scrollBy(m_lastDistance);
- m_scrolling = true;
-}
-
-void DragScrollTimer::update()
-{
- if (shouldScroll())
- scroll();
- else
- stop();
-}
-
-void DragScrollTimer::triggerScroll(FrameView* view, const WebPoint& location)
-{
- if (!view)
- return;
-
- // Approximates Safari
- static const double scrollStartDelay = 0.2;
-
- m_view = view;
- m_lastDistance = scrollDistanceFor(view, location);
-
- if (m_scrolling)
- update();
- else if (shouldScroll() && !m_timer.isActive())
- m_timer.startOneShot(scrollStartDelay);
-}
-
-IntSize DragScrollTimer::scrollDistanceFor(FrameView* view, const WebPoint& location) const
-{
- static const int scrollMargin = 30;
-
- IntRect bounds(0, 0, view->visibleWidth(), view->visibleHeight());
- if (!bounds.contains(location))
- return IntSize(0, 0); // The location is outside the border belt.
-
- bounds.setY(bounds.y() + scrollMargin);
- bounds.setHeight(bounds.height() - scrollMargin * 2);
- bounds.setX(bounds.x() + scrollMargin);
- bounds.setWidth(bounds.width() - scrollMargin * 2);
-
- if (bounds.contains(location))
- return IntSize(0, 0); // The location is inside the border belt.
-
- // The location is over the border belt.
- return distanceToRect(location, bounds);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit/chromium/src/DragScrollTimer.h (139156 => 139157)
--- trunk/Source/WebKit/chromium/src/DragScrollTimer.h 2013-01-09 05:11:11 UTC (rev 139156)
+++ trunk/Source/WebKit/chromium/src/DragScrollTimer.h 2013-01-09 05:21:11 UTC (rev 139157)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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.
- */
-
-#ifndef DragScrollTimer_h
-#define DragScrollTimer_h
-
-#include "IntSize.h"
-#include "Timer.h"
-#include <public/WebPoint.h>
-
-namespace WebCore { class FrameView; }
-
-namespace WebKit {
-
-//
-// Encapsulating a timer and associated state management for
-// scroll-on-drag behaviour.
-//
-class DragScrollTimer {
-public:
- DragScrollTimer();
- ~DragScrollTimer();
-
- void fired(WebCore::Timer<DragScrollTimer>*) { update(); }
- void triggerScroll(WebCore::FrameView*, const WebPoint&);
- void stop();
-
-private:
- void scroll();
- void update();
- WebCore::IntSize scrollDistanceFor(WebCore::FrameView*, const WebPoint&) const;
- bool shouldScroll() const { return !m_lastDistance.isZero(); }
-
- WebCore::Timer<DragScrollTimer> m_timer;
- WebCore::FrameView* m_view;
- WebCore::IntSize m_lastDistance;
- bool m_scrolling;
-};
-
-} // namespace WebKit
-
-#endif
