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