| OLD | NEW |
| 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 virtual void paint(WebCanvas*, const WebRect&) OVERRIDE; | 102 virtual void paint(WebCanvas*, const WebRect&) OVERRIDE; |
| 103 #if OS(ANDROID) | 103 #if OS(ANDROID) |
| 104 virtual void paintCompositedDeprecated(WebCanvas*, const WebRect&) OVERRIDE; | 104 virtual void paintCompositedDeprecated(WebCanvas*, const WebRect&) OVERRIDE; |
| 105 #endif | 105 #endif |
| 106 virtual void compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback*
) OVERRIDE; | 106 virtual void compositeAndReadbackAsync(WebCompositeAndReadbackAsyncCallback*
) OVERRIDE; |
| 107 virtual bool isTrackingRepaints() const OVERRIDE; | 107 virtual bool isTrackingRepaints() const OVERRIDE; |
| 108 virtual void themeChanged() OVERRIDE; | 108 virtual void themeChanged() OVERRIDE; |
| 109 virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE; | 109 virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE; |
| 110 virtual void setCursorVisibilityState(bool isVisible) OVERRIDE; | 110 virtual void setCursorVisibilityState(bool isVisible) OVERRIDE; |
| 111 virtual bool hasTouchEventHandlersAt(const WebPoint&) OVERRIDE; | 111 virtual bool hasTouchEventHandlersAt(const WebPoint&) OVERRIDE; |
| 112 virtual void applyScrollAndScale(const WebSize&, float) OVERRIDE; | 112 virtual void applyViewportDeltas( |
| 113 const WebSize& scrollDelta, |
| 114 float pageScaleDelta, |
| 115 float topControlsDelta) OVERRIDE; |
| 113 virtual void mouseCaptureLost() OVERRIDE; | 116 virtual void mouseCaptureLost() OVERRIDE; |
| 114 virtual void setFocus(bool enable) OVERRIDE; | 117 virtual void setFocus(bool enable) OVERRIDE; |
| 115 virtual bool setComposition( | 118 virtual bool setComposition( |
| 116 const WebString& text, | 119 const WebString& text, |
| 117 const WebVector<WebCompositionUnderline>& underlines, | 120 const WebVector<WebCompositionUnderline>& underlines, |
| 118 int selectionStart, | 121 int selectionStart, |
| 119 int selectionEnd) OVERRIDE; | 122 int selectionEnd) OVERRIDE; |
| 120 virtual bool confirmComposition() OVERRIDE; | 123 virtual bool confirmComposition() OVERRIDE; |
| 121 virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior
) OVERRIDE; | 124 virtual bool confirmComposition(ConfirmCompositionBehavior selectionBehavior
) OVERRIDE; |
| 122 virtual bool confirmComposition(const WebString& text) OVERRIDE; | 125 virtual bool confirmComposition(const WebString& text) OVERRIDE; |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 // Exposed for tests. | 482 // Exposed for tests. |
| 480 WebVector<WebCompositionUnderline> compositionUnderlines() const; | 483 WebVector<WebCompositionUnderline> compositionUnderlines() const; |
| 481 | 484 |
| 482 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } | 485 WebLayerTreeView* layerTreeView() const { return m_layerTreeView; } |
| 483 | 486 |
| 484 bool pinchVirtualViewportEnabled() const; | 487 bool pinchVirtualViewportEnabled() const; |
| 485 | 488 |
| 486 bool matchesHeuristicsForGpuRasterizationForTesting() const { return m_match
esHeuristicsForGpuRasterization; } | 489 bool matchesHeuristicsForGpuRasterizationForTesting() const { return m_match
esHeuristicsForGpuRasterization; } |
| 487 | 490 |
| 488 private: | 491 private: |
| 492 void setTopControlsContentOffset(float); |
| 493 |
| 489 // TODO(bokan): Remains for legacy pinch. Remove once it's gone. Made privat
e to | 494 // TODO(bokan): Remains for legacy pinch. Remove once it's gone. Made privat
e to |
| 490 // prevent external usage | 495 // prevent external usage |
| 491 virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) O
VERRIDE; | 496 virtual void setPageScaleFactor(float scaleFactor, const WebPoint& origin) O
VERRIDE; |
| 492 | 497 |
| 493 float legibleScale() const; | 498 float legibleScale() const; |
| 494 void refreshPageScaleFactorAfterLayout(); | 499 void refreshPageScaleFactorAfterLayout(); |
| 495 void resumeTreeViewCommits(); | 500 void resumeTreeViewCommits(); |
| 496 void setUserAgentPageScaleConstraints(PageScaleConstraints newConstraints); | 501 void setUserAgentPageScaleConstraints(PageScaleConstraints newConstraints); |
| 497 float clampPageScaleFactorToLimits(float) const; | 502 float clampPageScaleFactorToLimits(float) const; |
| 498 IntSize contentsSize() const; | 503 IntSize contentsSize() const; |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 bool m_showFPSCounter; | 713 bool m_showFPSCounter; |
| 709 bool m_showPaintRects; | 714 bool m_showPaintRects; |
| 710 bool m_showDebugBorders; | 715 bool m_showDebugBorders; |
| 711 bool m_continuousPaintingEnabled; | 716 bool m_continuousPaintingEnabled; |
| 712 bool m_showScrollBottleneckRects; | 717 bool m_showScrollBottleneckRects; |
| 713 WebColor m_baseBackgroundColor; | 718 WebColor m_baseBackgroundColor; |
| 714 WebColor m_backgroundColorOverride; | 719 WebColor m_backgroundColorOverride; |
| 715 float m_zoomFactorOverride; | 720 float m_zoomFactorOverride; |
| 716 | 721 |
| 717 bool m_userGestureObserved; | 722 bool m_userGestureObserved; |
| 723 float m_topControlsContentOffset; |
| 718 }; | 724 }; |
| 719 | 725 |
| 720 // We have no ways to check if the specified WebView is an instance of | 726 // We have no ways to check if the specified WebView is an instance of |
| 721 // WebViewImpl because WebViewImpl is the only implementation of WebView. | 727 // WebViewImpl because WebViewImpl is the only implementation of WebView. |
| 722 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); | 728 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); |
| 723 | 729 |
| 724 } // namespace blink | 730 } // namespace blink |
| 725 | 731 |
| 726 #endif | 732 #endif |
| OLD | NEW |