| 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 18 matching lines...) Expand all Loading... |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebViewImpl_h | 31 #ifndef WebViewImpl_h |
| 32 #define WebViewImpl_h | 32 #define WebViewImpl_h |
| 33 | 33 |
| 34 #include "core/page/EventWithHitTestResults.h" | 34 #include "core/page/EventWithHitTestResults.h" |
| 35 #include "platform/geometry/IntPoint.h" | 35 #include "platform/geometry/IntPoint.h" |
| 36 #include "platform/geometry/IntRect.h" | 36 #include "platform/geometry/IntRect.h" |
| 37 #include "platform/graphics/GraphicsLayer.h" | 37 #include "platform/graphics/GraphicsLayer.h" |
| 38 #include "platform/heap/Handle.h" | 38 #include "platform/heap/Handle.h" |
| 39 #include "public/platform/WebFloatSize.h" |
| 39 #include "public/platform/WebGestureCurveTarget.h" | 40 #include "public/platform/WebGestureCurveTarget.h" |
| 40 #include "public/platform/WebLayer.h" | 41 #include "public/platform/WebLayer.h" |
| 41 #include "public/platform/WebPoint.h" | 42 #include "public/platform/WebPoint.h" |
| 42 #include "public/platform/WebRect.h" | 43 #include "public/platform/WebRect.h" |
| 43 #include "public/platform/WebSize.h" | 44 #include "public/platform/WebSize.h" |
| 44 #include "public/platform/WebString.h" | 45 #include "public/platform/WebString.h" |
| 45 #include "public/platform/WebVector.h" | 46 #include "public/platform/WebVector.h" |
| 46 #include "public/web/WebInputEvent.h" | 47 #include "public/web/WebInputEvent.h" |
| 47 #include "public/web/WebNavigationPolicy.h" | 48 #include "public/web/WebNavigationPolicy.h" |
| 48 #include "public/web/WebView.h" | 49 #include "public/web/WebView.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 | 115 |
| 115 // FIXME(bokan): Old pinch path only - This should be removed once old pinch | 116 // FIXME(bokan): Old pinch path only - This should be removed once old pinch |
| 116 // is removed. | 117 // is removed. |
| 117 virtual void applyViewportDeltas( | 118 virtual void applyViewportDeltas( |
| 118 const WebSize& scrollDelta, | 119 const WebSize& scrollDelta, |
| 119 float pageScaleDelta, | 120 float pageScaleDelta, |
| 120 float topControlsDelta) override; | 121 float topControlsDelta) override; |
| 121 virtual void applyViewportDeltas( | 122 virtual void applyViewportDeltas( |
| 122 const WebSize& pinchViewportDelta, | 123 const WebSize& pinchViewportDelta, |
| 123 const WebSize& mainFrameDelta, | 124 const WebSize& mainFrameDelta, |
| 125 const WebFloatSize& elasticOverscrollDelta, |
| 126 float pageScaleDelta, |
| 127 float topControlsDelta) override; |
| 128 // TODO(ccameron): Remove this when all callers are removed. |
| 129 virtual void applyViewportDeltas( |
| 130 const WebSize& pinchViewportDelta, |
| 131 const WebSize& mainFrameDelta, |
| 124 float pageScaleDelta, | 132 float pageScaleDelta, |
| 125 float topControlsDelta) override; | 133 float topControlsDelta) override; |
| 126 virtual void mouseCaptureLost() override; | 134 virtual void mouseCaptureLost() override; |
| 127 virtual void setFocus(bool enable) override; | 135 virtual void setFocus(bool enable) override; |
| 128 virtual bool setComposition( | 136 virtual bool setComposition( |
| 129 const WebString& text, | 137 const WebString& text, |
| 130 const WebVector<WebCompositionUnderline>& underlines, | 138 const WebVector<WebCompositionUnderline>& underlines, |
| 131 int selectionStart, | 139 int selectionStart, |
| 132 int selectionEnd) override; | 140 int selectionEnd) override; |
| 133 virtual bool confirmComposition() override; | 141 virtual bool confirmComposition() override; |
| (...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 752 float m_topControlsLayoutHeight; | 760 float m_topControlsLayoutHeight; |
| 753 }; | 761 }; |
| 754 | 762 |
| 755 // We have no ways to check if the specified WebView is an instance of | 763 // We have no ways to check if the specified WebView is an instance of |
| 756 // WebViewImpl because WebViewImpl is the only implementation of WebView. | 764 // WebViewImpl because WebViewImpl is the only implementation of WebView. |
| 757 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); | 765 DEFINE_TYPE_CASTS(WebViewImpl, WebView, webView, true, true); |
| 758 | 766 |
| 759 } // namespace blink | 767 } // namespace blink |
| 760 | 768 |
| 761 #endif | 769 #endif |
| OLD | NEW |