Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: Source/WebKit/chromium/src/WebViewImpl.h

Issue 12315056: Merge 142913 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 559 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 WebCore::ScrollGranularity* scrollGranularity ); 570 WebCore::ScrollGranularity* scrollGranularity );
571 571
572 // Called by a full frame plugin inside this view to inform it that its 572 // Called by a full frame plugin inside this view to inform it that its
573 // zoom level has been updated. The plugin should only call this function 573 // zoom level has been updated. The plugin should only call this function
574 // if the zoom change was triggered by the browser, it's only needed in case 574 // if the zoom change was triggered by the browser, it's only needed in case
575 // a plugin can update its own zoom, say because of its own UI. 575 // a plugin can update its own zoom, say because of its own UI.
576 void fullFramePluginZoomLevelChanged(double zoomLevel); 576 void fullFramePluginZoomLevelChanged(double zoomLevel);
577 577
578 #if ENABLE(GESTURE_EVENTS) 578 #if ENABLE(GESTURE_EVENTS)
579 void computeScaleAndScrollForHitRect(const WebRect& hitRect, AutoZoomType, f loat& scale, WebPoint& scroll, bool& isAnchor); 579 void computeScaleAndScrollForHitRect(const WebRect& hitRect, AutoZoomType, f loat& scale, WebPoint& scroll, bool& isAnchor);
580 WebCore::Node* bestTouchLinkNode(const WebGestureEvent& touchEvent); 580 WebCore::Node* bestTapNode(const WebCore::PlatformGestureEvent& tapEvent);
581 void enableTouchHighlight(const WebGestureEvent& touchEvent); 581 void enableTapHighlight(const WebCore::PlatformGestureEvent& tapEvent);
582 void computeScaleAndScrollForFocusedNode(WebCore::Node* focusedNode, float& scale, WebCore::IntPoint& scroll, bool& needAnimation); 582 void computeScaleAndScrollForFocusedNode(WebCore::Node* focusedNode, float& scale, WebCore::IntPoint& scroll, bool& needAnimation);
583 #endif 583 #endif
584 void animateZoomAroundPoint(const WebCore::IntPoint&, AutoZoomType); 584 void animateZoomAroundPoint(const WebCore::IntPoint&, AutoZoomType);
585 585
586 void shouldUseAnimateDoubleTapTimeZeroForTesting(bool); 586 void shouldUseAnimateDoubleTapTimeZeroForTesting(bool);
587 587
588 void enterFullScreenForElement(WebCore::Element*); 588 void enterFullScreenForElement(WebCore::Element*);
589 void exitFullScreenForElement(WebCore::Element*); 589 void exitFullScreenForElement(WebCore::Element*);
590 590
591 // Exposed for the purpose of overriding device metrics. 591 // Exposed for the purpose of overriding device metrics.
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 897
898 bool m_showFPSCounter; 898 bool m_showFPSCounter;
899 bool m_showPaintRects; 899 bool m_showPaintRects;
900 bool m_showDebugBorders; 900 bool m_showDebugBorders;
901 bool m_continuousPaintingEnabled; 901 bool m_continuousPaintingEnabled;
902 }; 902 };
903 903
904 } // namespace WebKit 904 } // namespace WebKit
905 905
906 #endif 906 #endif
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698