| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 WebTestProxy_h | 31 #ifndef WebTestProxy_h |
| 32 #define WebTestProxy_h | 32 #define WebTestProxy_h |
| 33 | 33 |
| 34 #include "WebTask.h" | 34 #include "WebTask.h" |
| 35 #include "WebTestCommon.h" | 35 #include "WebTestCommon.h" |
| 36 #include "public/platform/WebRect.h" | 36 #include "public/platform/WebRect.h" |
| 37 #include "public/platform/WebURLError.h" | 37 #include "public/platform/WebURLError.h" |
| 38 #include "public/platform/WebURLRequest.h" | 38 #include "public/platform/WebURLRequest.h" |
| 39 #include "public/web/WebAccessibilityEnums.h" |
| 39 #include "public/web/WebAccessibilityNotification.h" | 40 #include "public/web/WebAccessibilityNotification.h" |
| 40 #include "public/web/WebDOMMessageEvent.h" | 41 #include "public/web/WebDOMMessageEvent.h" |
| 41 #include "public/web/WebDragOperation.h" | 42 #include "public/web/WebDragOperation.h" |
| 42 #include "public/web/WebEditingAction.h" | 43 #include "public/web/WebEditingAction.h" |
| 43 #include "public/web/WebIconURL.h" | 44 #include "public/web/WebIconURL.h" |
| 44 #include "public/web/WebNavigationPolicy.h" | 45 #include "public/web/WebNavigationPolicy.h" |
| 45 #include "public/web/WebNavigationType.h" | 46 #include "public/web/WebNavigationType.h" |
| 46 #include "public/web/WebSecurityOrigin.h" | 47 #include "public/web/WebSecurityOrigin.h" |
| 47 #include "public/web/WebTextAffinity.h" | 48 #include "public/web/WebTextAffinity.h" |
| 48 #include "public/web/WebTextDirection.h" | 49 #include "public/web/WebTextDirection.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 protected: | 146 protected: |
| 146 WebTestProxyBase(); | 147 WebTestProxyBase(); |
| 147 ~WebTestProxyBase(); | 148 ~WebTestProxyBase(); |
| 148 | 149 |
| 149 void didInvalidateRect(const WebKit::WebRect&); | 150 void didInvalidateRect(const WebKit::WebRect&); |
| 150 void didScrollRect(int, int, const WebKit::WebRect&); | 151 void didScrollRect(int, int, const WebKit::WebRect&); |
| 151 void scheduleAnimation(); | 152 void scheduleAnimation(); |
| 152 void setWindowRect(const WebKit::WebRect&); | 153 void setWindowRect(const WebKit::WebRect&); |
| 153 void show(WebKit::WebNavigationPolicy); | 154 void show(WebKit::WebNavigationPolicy); |
| 154 void didAutoResize(const WebKit::WebSize&); | 155 void didAutoResize(const WebKit::WebSize&); |
| 155 void postAccessibilityNotification(const WebKit::WebAccessibilityObject&, We
bKit::WebAccessibilityNotification); | 156 void postAccessibilityNotification(const WebKit::WebAccessibilityObject&, We
bKit::AXNotification); |
| 156 void startDragging(WebKit::WebFrame*, const WebKit::WebDragData&, WebKit::We
bDragOperationsMask, const WebKit::WebImage&, const WebKit::WebPoint&); | 157 void startDragging(WebKit::WebFrame*, const WebKit::WebDragData&, WebKit::We
bDragOperationsMask, const WebKit::WebImage&, const WebKit::WebPoint&); |
| 157 bool shouldBeginEditing(const WebKit::WebRange&); | 158 bool shouldBeginEditing(const WebKit::WebRange&); |
| 158 bool shouldEndEditing(const WebKit::WebRange&); | 159 bool shouldEndEditing(const WebKit::WebRange&); |
| 159 bool shouldInsertNode(const WebKit::WebNode&, const WebKit::WebRange&, WebKi
t::WebEditingAction); | 160 bool shouldInsertNode(const WebKit::WebNode&, const WebKit::WebRange&, WebKi
t::WebEditingAction); |
| 160 bool shouldInsertText(const WebKit::WebString& text, const WebKit::WebRange&
, WebKit::WebEditingAction); | 161 bool shouldInsertText(const WebKit::WebString& text, const WebKit::WebRange&
, WebKit::WebEditingAction); |
| 161 bool shouldChangeSelectedRange(const WebKit::WebRange& fromRange, const WebK
it::WebRange& toRange, WebKit::WebTextAffinity, bool stillSelecting); | 162 bool shouldChangeSelectedRange(const WebKit::WebRange& fromRange, const WebK
it::WebRange& toRange, WebKit::WebTextAffinity, bool stillSelecting); |
| 162 bool shouldDeleteRange(const WebKit::WebRange&); | 163 bool shouldDeleteRange(const WebKit::WebRange&); |
| 163 bool shouldApplyStyle(const WebKit::WebString& style, const WebKit::WebRange
&); | 164 bool shouldApplyStyle(const WebKit::WebString& style, const WebKit::WebRange
&); |
| 164 void didBeginEditing(); | 165 void didBeginEditing(); |
| 165 void didChangeSelection(bool isEmptySelection); | 166 void didChangeSelection(bool isEmptySelection); |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 virtual void show(WebKit::WebNavigationPolicy policy) | 294 virtual void show(WebKit::WebNavigationPolicy policy) |
| 294 { | 295 { |
| 295 WebTestProxyBase::show(policy); | 296 WebTestProxyBase::show(policy); |
| 296 Base::show(policy); | 297 Base::show(policy); |
| 297 } | 298 } |
| 298 virtual void didAutoResize(const WebKit::WebSize& newSize) | 299 virtual void didAutoResize(const WebKit::WebSize& newSize) |
| 299 { | 300 { |
| 300 WebTestProxyBase::didAutoResize(newSize); | 301 WebTestProxyBase::didAutoResize(newSize); |
| 301 Base::didAutoResize(newSize); | 302 Base::didAutoResize(newSize); |
| 302 } | 303 } |
| 303 virtual void postAccessibilityNotification(const WebKit::WebAccessibilityObj
ect& object, WebKit::WebAccessibilityNotification notification) | 304 virtual void postAccessibilityNotificationNew(const WebKit::WebAccessibility
Object& object, WebKit::AXNotification notification) |
| 304 { | 305 { |
| 305 WebTestProxyBase::postAccessibilityNotification(object, notification); | 306 WebTestProxyBase::postAccessibilityNotification(object, notification); |
| 306 Base::postAccessibilityNotification(object, notification); | 307 Base::postAccessibilityNotificationNew(object, notification); |
| 307 } | 308 } |
| 308 virtual void startDragging(WebKit::WebFrame* frame, const WebKit::WebDragDat
a& data, WebKit::WebDragOperationsMask mask, const WebKit::WebImage& image, cons
t WebKit::WebPoint& point) | 309 virtual void startDragging(WebKit::WebFrame* frame, const WebKit::WebDragDat
a& data, WebKit::WebDragOperationsMask mask, const WebKit::WebImage& image, cons
t WebKit::WebPoint& point) |
| 309 { | 310 { |
| 310 WebTestProxyBase::startDragging(frame, data, mask, image, point); | 311 WebTestProxyBase::startDragging(frame, data, mask, image, point); |
| 311 // Don't forward this call to Base because we don't want to do a real dr
ag-and-drop. | 312 // Don't forward this call to Base because we don't want to do a real dr
ag-and-drop. |
| 312 } | 313 } |
| 313 virtual bool shouldBeginEditing(const WebKit::WebRange& range) | 314 virtual bool shouldBeginEditing(const WebKit::WebRange& range) |
| 314 { | 315 { |
| 315 WebTestProxyBase::shouldBeginEditing(range); | 316 WebTestProxyBase::shouldBeginEditing(range); |
| 316 return Base::shouldBeginEditing(range); | 317 return Base::shouldBeginEditing(range); |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 578 } | 579 } |
| 579 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient* client, const WebKit::WebColor& color) | 580 virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserC
lient* client, const WebKit::WebColor& color) |
| 580 { | 581 { |
| 581 return WebTestProxyBase::createColorChooser(client, color); | 582 return WebTestProxyBase::createColorChooser(client, color); |
| 582 } | 583 } |
| 583 }; | 584 }; |
| 584 | 585 |
| 585 } | 586 } |
| 586 | 587 |
| 587 #endif // WebTestProxy_h | 588 #endif // WebTestProxy_h |
| OLD | NEW |