OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ | 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ |
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ | 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 | 127 |
128 void postSpellCheckEvent(const blink::WebString& eventName); | 128 void postSpellCheckEvent(const blink::WebString& eventName); |
129 | 129 |
130 protected: | 130 protected: |
131 WebTestProxyBase(); | 131 WebTestProxyBase(); |
132 ~WebTestProxyBase(); | 132 ~WebTestProxyBase(); |
133 | 133 |
134 void didInvalidateRect(const blink::WebRect&); | 134 void didInvalidateRect(const blink::WebRect&); |
135 void didScrollRect(int, int, const blink::WebRect&); | 135 void didScrollRect(int, int, const blink::WebRect&); |
136 void scheduleAnimation(); | 136 void scheduleAnimation(); |
| 137 bool isCompositorFramePending() const; |
137 // FIXME: Remove once we switch to use didForceResize. | 138 // FIXME: Remove once we switch to use didForceResize. |
138 void setWindowRect(const blink::WebRect&); | 139 void setWindowRect(const blink::WebRect&); |
139 void show(blink::WebNavigationPolicy); | 140 void show(blink::WebNavigationPolicy); |
140 void didAutoResize(const blink::WebSize&); | 141 void didAutoResize(const blink::WebSize&); |
141 void postAccessibilityEvent(const blink::WebAXObject&, blink::WebAXEvent); | 142 void postAccessibilityEvent(const blink::WebAXObject&, blink::WebAXEvent); |
142 void startDragging(blink::WebFrame*, const blink::WebDragData&, blink::WebDr
agOperationsMask, const blink::WebImage&, const blink::WebPoint&); | 143 void startDragging(blink::WebFrame*, const blink::WebDragData&, blink::WebDr
agOperationsMask, const blink::WebImage&, const blink::WebPoint&); |
143 void didChangeSelection(bool isEmptySelection); | 144 void didChangeSelection(bool isEmptySelection); |
144 void didChangeContents(); | 145 void didChangeContents(); |
145 void didEndEditing(); | 146 void didEndEditing(); |
146 bool createView(blink::WebFrame* creator, const blink::WebURLRequest&, const
blink::WebWindowFeatures&, const blink::WebString& frameName, blink::WebNavigat
ionPolicy, bool suppressOpener); | 147 bool createView(blink::WebFrame* creator, const blink::WebURLRequest&, const
blink::WebWindowFeatures&, const blink::WebString& frameName, blink::WebNavigat
ionPolicy, bool suppressOpener); |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 WebTestProxyBase::didScrollRect(dx, dy, clipRect); | 252 WebTestProxyBase::didScrollRect(dx, dy, clipRect); |
252 } | 253 } |
253 virtual void scheduleComposite() | 254 virtual void scheduleComposite() |
254 { | 255 { |
255 WebTestProxyBase::scheduleComposite(); | 256 WebTestProxyBase::scheduleComposite(); |
256 } | 257 } |
257 virtual void scheduleAnimation() | 258 virtual void scheduleAnimation() |
258 { | 259 { |
259 WebTestProxyBase::scheduleAnimation(); | 260 WebTestProxyBase::scheduleAnimation(); |
260 } | 261 } |
| 262 virtual bool isCompositorFramePending() const |
| 263 { |
| 264 return WebTestProxyBase::isCompositorFramePending(); |
| 265 } |
261 virtual void setWindowRect(const blink::WebRect& rect) | 266 virtual void setWindowRect(const blink::WebRect& rect) |
262 { | 267 { |
263 WebTestProxyBase::setWindowRect(rect); | 268 WebTestProxyBase::setWindowRect(rect); |
264 Base::setWindowRect(rect); | 269 Base::setWindowRect(rect); |
265 } | 270 } |
266 virtual void show(blink::WebNavigationPolicy policy) | 271 virtual void show(blink::WebNavigationPolicy policy) |
267 { | 272 { |
268 WebTestProxyBase::show(policy); | 273 WebTestProxyBase::show(policy); |
269 Base::show(policy); | 274 Base::show(policy); |
270 } | 275 } |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
519 WebTestProxyBase::postSpellCheckEvent(eventName); | 524 WebTestProxyBase::postSpellCheckEvent(eventName); |
520 } | 525 } |
521 | 526 |
522 private: | 527 private: |
523 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); | 528 DISALLOW_COPY_AND_ASSIGN(WebTestProxy); |
524 }; | 529 }; |
525 | 530 |
526 } | 531 } |
527 | 532 |
528 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ | 533 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEBTESTPROXY_H_ |
OLD | NEW |