Remove a number of unused features from WebViewImpl

sky/engine/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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
@@ skipping 52 matching lines @@
 #include "sky/engine/platform/Cursor.h"
 #include "sky/engine/platform/KeyboardCodes.h"
 #include "sky/engine/platform/Logging.h"
 #include "sky/engine/platform/NotImplemented.h"
 #include "sky/engine/platform/PlatformGestureEvent.h"
 #include "sky/engine/platform/PlatformKeyboardEvent.h"
 #include "sky/engine/platform/PlatformMouseEvent.h"
 #include "sky/engine/platform/PlatformWheelEvent.h"
 #include "sky/engine/platform/TraceEvent.h"
 #include "sky/engine/platform/UserGestureIndicator.h"
-#include "sky/engine/platform/exported/WebActiveGestureAnimation.h"
 #include "sky/engine/platform/fonts/FontCache.h"
 #include "sky/engine/platform/graphics/Color.h"
 #include "sky/engine/platform/graphics/Image.h"
 #include "sky/engine/platform/graphics/ImageBuffer.h"
 #include "sky/engine/platform/scroll/Scrollbar.h"
 #include "sky/engine/public/platform/Platform.h"
 #include "sky/engine/public/platform/WebFloatPoint.h"
-#include "sky/engine/public/platform/WebGestureCurve.h"
 #include "sky/engine/public/platform/WebImage.h"
 #include "sky/engine/public/platform/WebLayerTreeView.h"
 #include "sky/engine/public/platform/WebURLRequest.h"
 #include "sky/engine/public/platform/WebVector.h"
 #include "sky/engine/public/web/WebActiveWheelFlingParameters.h"
 #include "sky/engine/public/web/WebBeginFrameArgs.h"
 #include "sky/engine/public/web/WebFrameClient.h"
 #include "sky/engine/public/web/WebHitTestResult.h"
 #include "sky/engine/public/web/WebNode.h"
 #include "sky/engine/public/web/WebRange.h"
@@ skipping 49 matching lines @@
     , m_rootLayerScale(1)
     , m_suppressNextKeypressEvent(false)
     , m_imeAcceptEvents(true)
     , m_isTransparent(false)
     , m_tabsToLinks(false)
     , m_rootLayer(0)
     , m_matchesHeuristicsForGpuRasterization(false)
     , m_recreatingGraphicsContext(false)
     , m_flingModifier(0)
     , m_flingSourceDevice(false)
-    , m_showFPSCounter(false)
     , m_showPaintRects(false)
     , m_showDebugBorders(false)
     , m_continuousPaintingEnabled(false)
     , m_showScrollBottleneckRects(false)
     , m_baseBackgroundColor(Color::white)
     , m_backgroundColorOverride(Color::transparent)
     , m_userGestureObserved(false)
 {
     Page::PageClients pageClients;
     pageClients.chromeClient = &m_chromeClientImpl;
@@ skipping 11 matching lines @@
 WebViewImpl::~WebViewImpl()
 {
     ASSERT(!m_page);
 }
 
 WebLocalFrameImpl* WebViewImpl::mainFrameImpl()
 {
     return m_page ? WebLocalFrameImpl::fromFrame(m_page->mainFrame()) : 0;
 }
 
-bool WebViewImpl::tabKeyCyclesThroughElements() const
-{
-    ASSERT(m_page);
-    return m_page->tabKeyCyclesThroughElements();
-}
-
-void WebViewImpl::setTabKeyCyclesThroughElements(bool value)
-{
-    if (m_page)
-        m_page->setTabKeyCyclesThroughElements(value);
-}
-
 void WebViewImpl::handleMouseLeave(LocalFrame& mainFrame, const WebMouseEvent& event)
 {
     m_client->setMouseOverURL(WebURL());
     PageWidgetEventHandler::handleMouseLeave(mainFrame, event);
 }
 
 void WebViewImpl::handleMouseDown(LocalFrame& mainFrame, const WebMouseEvent& event)
 {
     PageWidgetEventHandler::handleMouseDown(mainFrame, event);
 
     if (event.button == WebMouseEvent::ButtonLeft && m_mouseCaptureNode)
         m_mouseCaptureGestureToken = mainFrame.eventHandler().takeLastMouseDownGestureToken();
 }
 
 void WebViewImpl::handleMouseUp(LocalFrame& mainFrame, const WebMouseEvent& event)
 {
     PageWidgetEventHandler::handleMouseUp(mainFrame, event);
 }
 
 bool WebViewImpl::handleMouseWheel(LocalFrame& mainFrame, const WebMouseWheelEvent& event)
 {
     return PageWidgetEventHandler::handleMouseWheel(mainFrame, event);
 }
 
-// FIXME(sky): This appears to be unused.
-bool WebViewImpl::scrollBy(const WebFloatSize& delta, const WebFloatSize& velocity)
-{
-    if (m_flingSourceDevice == WebGestureDeviceTouchpad) {
-        WebMouseWheelEvent syntheticWheel;
-        const float tickDivisor = WheelEvent::TickMultiplier;
-
-        syntheticWheel.deltaX = delta.width;
-        syntheticWheel.deltaY = delta.height;
-        syntheticWheel.wheelTicksX = delta.width / tickDivisor;
-        syntheticWheel.wheelTicksY = delta.height / tickDivisor;
-        syntheticWheel.hasPreciseScrollingDeltas = true;
-        syntheticWheel.x = m_positionOnFlingStart.x;
-        syntheticWheel.y = m_positionOnFlingStart.y;
-        syntheticWheel.globalX = m_globalPositionOnFlingStart.x;
-        syntheticWheel.globalY = m_globalPositionOnFlingStart.y;
-        syntheticWheel.modifiers = m_flingModifier;
-
-        if (m_page && m_page->mainFrame() && m_page->mainFrame()->view())
-            return handleMouseWheel(*m_page->mainFrame(), syntheticWheel);
-    } else {
-        WebGestureEvent syntheticGestureEvent;
-
-        syntheticGestureEvent.type = WebInputEvent::GestureScrollUpdateWithoutPropagation;
-        syntheticGestureEvent.data.scrollUpdate.deltaX = delta.width;
-        syntheticGestureEvent.data.scrollUpdate.deltaY = delta.height;
-        syntheticGestureEvent.x = m_positionOnFlingStart.x;
-        syntheticGestureEvent.y = m_positionOnFlingStart.y;
-        syntheticGestureEvent.globalX = m_globalPositionOnFlingStart.x;
-        syntheticGestureEvent.globalY = m_globalPositionOnFlingStart.y;
-        syntheticGestureEvent.modifiers = m_flingModifier;
-        syntheticGestureEvent.sourceDevice = WebGestureDeviceTouchscreen;
-
-        if (m_page && m_page->mainFrame() && m_page->mainFrame()->view())
-            return handleGestureEvent(syntheticGestureEvent);
-    }
-    return false;
-}
-
 bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
 {
     bool eventSwallowed = false;
     bool eventCancelled = false; // for disambiguation
 
-    // Special handling for slow-path fling gestures.
-    switch (event.type) {
-    case WebInputEvent::GestureFlingStart: {
-        if (mainFrameImpl()->frame()->eventHandler().isScrollbarHandlingGestures())
-            break;
-        m_client->cancelScheduledContentIntents();
-        m_positionOnFlingStart = WebPoint(event.x, event.y);
-        m_globalPositionOnFlingStart = WebPoint(event.globalX, event.globalY);
-        m_flingModifier = event.modifiers;
-        m_flingSourceDevice = event.sourceDevice;
-        OwnPtr<WebGestureCurve> flingCurve = adoptPtr(Platform::current()->createFlingAnimationCurve(event.sourceDevice, WebFloatPoint(event.data.flingStart.velocityX, event.data.flingStart.velocityY), WebSize()));
-        ASSERT(flingCurve);
-        m_gestureAnimation = WebActiveGestureAnimation::createAtAnimationStart(flingCurve.release(), this);
-        scheduleAnimation();
-        eventSwallowed = true;
-
-        m_client->didHandleGestureEvent(event, eventCancelled);
-        return eventSwallowed;
-    }
-    case WebInputEvent::GestureFlingCancel:
-        if (endActiveFlingAnimation())
-            eventSwallowed = true;
-
-        m_client->didHandleGestureEvent(event, eventCancelled);
-        return eventSwallowed;
-    default:
-        break;
-    }
-
     PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
 
     // FIXME: Remove redundant hit tests by pushing the call to EventHandler::targetGestureEvent
     // up to this point and pass GestureEventWithHitTestResults around.
 
     switch (event.type) {
     case WebInputEvent::GestureTap: {
         m_client->cancelScheduledContentIntents();
         if (detectContentOnTouch(platformEvent.position())) {
             eventSwallowed = true;
@@ skipping 38 matching lines @@
         eventSwallowed = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(platformEvent);
         break;
     }
     default:
         ASSERT_NOT_REACHED();
     }
     m_client->didHandleGestureEvent(event, eventCancelled);
     return eventSwallowed;
 }
 
-void WebViewImpl::transferActiveWheelFlingAnimation(const WebActiveWheelFlingParameters& parameters)
-{
-    TRACE_EVENT0("blink", "WebViewImpl::transferActiveWheelFlingAnimation");
-    ASSERT(!m_gestureAnimation);
-    m_positionOnFlingStart = parameters.point;
-    m_globalPositionOnFlingStart = parameters.globalPoint;
-    m_flingModifier = parameters.modifiers;
-    OwnPtr<WebGestureCurve> curve = adoptPtr(Platform::current()->createFlingAnimationCurve(parameters.sourceDevice, WebFloatPoint(parameters.delta), parameters.cumulativeScroll));
-    ASSERT(curve);
-    m_gestureAnimation = WebActiveGestureAnimation::createWithTimeOffset(curve.release(), this, parameters.startTime);
-    scheduleAnimation();
-}
-
-bool WebViewImpl::endActiveFlingAnimation()
-{
-    if (m_gestureAnimation) {
-        m_gestureAnimation.clear();
-        return true;
-    }
-    return false;
-}
-
-void WebViewImpl::setShowFPSCounter(bool show)
-{
-    m_showFPSCounter = show;
-}
-
 void WebViewImpl::setShowPaintRects(bool show)
 {
     m_showPaintRects = show;
 }
 
 void WebViewImpl::setShowDebugBorders(bool show)
 {
     m_showDebugBorders = show;
 }
 
@@ skipping 15 matching lines @@
 
     page()->acceptLanguagesChanged();
 }
 
 bool WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event)
 {
     ASSERT((event.type == WebInputEvent::RawKeyDown)
         || (event.type == WebInputEvent::KeyDown)
         || (event.type == WebInputEvent::KeyUp));
 
-    // Halt an in-progress fling on a key event.
-    endActiveFlingAnimation();
-
     // Please refer to the comments explaining the m_suppressNextKeypressEvent
     // member.
     // The m_suppressNextKeypressEvent is set if the KeyDown is handled by
     // Webkit. A keyDown event is typically associated with a keyPress(char)
     // event and a keyUp event. We reset this flag here as this is a new keyDown
     // event.
     m_suppressNextKeypressEvent = false;
 
     RefPtr<LocalFrame> focusedFrame = focusedCoreFrame();
     if (!focusedFrame)
@@ skipping 209 matching lines @@
 }
 
 void WebViewImpl::beginFrame(const WebBeginFrameArgs& frameTime)
 {
     TRACE_EVENT0("blink", "WebViewImpl::beginFrame");
 
     WebBeginFrameArgs validFrameTime(frameTime);
     if (!validFrameTime.lastFrameTimeMonotonic)
         validFrameTime.lastFrameTimeMonotonic = monotonicallyIncreasingTime();
 
-    // Create synthetic wheel events as necessary for fling.
-    if (m_gestureAnimation) {
-        if (m_gestureAnimation->animate(validFrameTime.lastFrameTimeMonotonic))
-            scheduleAnimation();
-        else {
-            endActiveFlingAnimation();
-
-            PlatformGestureEvent endScrollEvent(PlatformEvent::GestureScrollEnd,
-                m_positionOnFlingStart, m_globalPositionOnFlingStart,
-                IntSize(), 0, false, false, false, false,
-                0, 0, 0, 0);
-
-            mainFrameImpl()->frame()->eventHandler().handleGestureScrollEnd(endScrollEvent);
-        }
-    }
-
     WTF_LOG(ScriptedAnimationController, "WebViewImpl::beginFrame: page = %d", !m_page ? 0 : 1);
     if (!m_page)
         return;
 
     PageWidgetDelegate::animate(m_page.get(), validFrameTime.lastFrameTimeMonotonic);
 
     if (m_continuousPaintingEnabled)
         m_client->scheduleAnimation();
 }
 
@@ skipping 652 matching lines @@
         page()->focusController().setActive(active);
 }
 
 bool WebViewImpl::isActive() const
 {
     return page() ? page()->focusController().isActive() : false;
 }
 
 void WebViewImpl::didCommitLoad(bool isNewNavigation, bool isNavigationWithinPage)
 {
-    endActiveFlingAnimation();
     m_userGestureObserved = false;
     if (!isNavigationWithinPage)
         UserGestureIndicator::clearProcessedUserGestureSinceLoad();
 }
 
 void WebViewImpl::layoutUpdated(WebLocalFrameImpl* webframe)
 {
     if (!m_client)
         return;
     m_client->didUpdateLayout();
@@ skipping 73 matching lines @@
 void WebViewImpl::setVisibilityState(WebPageVisibilityState visibilityState,
                                      bool isInitialState) {
     if (!page())
         return;
 
     ASSERT(visibilityState == WebPageVisibilityStateVisible || visibilityState == WebPageVisibilityStateHidden);
     m_page->setVisibilityState(static_cast<PageVisibilityState>(static_cast<int>(visibilityState)), isInitialState);
 }
 
 } // namespace blink