diff options
Diffstat (limited to 'Source/WebKit/chromium/src/WebViewImpl.h')
| -rw-r--r-- | Source/WebKit/chromium/src/WebViewImpl.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/WebViewImpl.h b/Source/WebKit/chromium/src/WebViewImpl.h index 4c1a974a0..47907f124 100644 --- a/Source/WebKit/chromium/src/WebViewImpl.h +++ b/Source/WebKit/chromium/src/WebViewImpl.h @@ -392,7 +392,7 @@ public: void mouseContextMenu(const WebMouseEvent&); void mouseDoubleClick(const WebMouseEvent&); - bool detectContentOnTouch(const WebPoint&, WebInputEvent::Type); + bool detectContentOnTouch(const WebPoint&); void startPageScaleAnimation(const WebCore::IntPoint& targetPosition, bool useAnchor, float newScale, double durationInSeconds); void numberOfWheelEventHandlersChanged(unsigned); @@ -561,12 +561,14 @@ public: void fullFramePluginZoomLevelChanged(double zoomLevel); #if ENABLE(GESTURE_EVENTS) - void computeScaleAndScrollForHitRect(const WebRect& hitRect, AutoZoomType, float& scale, WebPoint& scroll); + void computeScaleAndScrollForHitRect(const WebRect& hitRect, AutoZoomType, float& scale, WebPoint& scroll, bool& isAnchor); WebCore::Node* bestTouchLinkNode(WebCore::IntPoint touchEventLocation); void enableTouchHighlight(WebCore::IntPoint touchEventLocation); #endif void animateZoomAroundPoint(const WebCore::IntPoint&, AutoZoomType); + void shouldUseAnimateDoubleTapTimeZeroForTesting(bool); + void loseCompositorContext(int numTimes); void enterFullScreenForElement(WebCore::Element*); @@ -740,6 +742,12 @@ private: float m_savedPageScaleFactor; // 0 means that no page scale factor is saved. WebCore::IntSize m_savedScrollOffset; + // Whether the current scale was achieved by zooming in with double tap. + bool m_doubleTapZoomInEffect; + + // Used for testing purposes. + bool m_shouldUseDoubleTapTimeZero; + bool m_contextMenuAllowed; bool m_doingDragAndDrop; |