| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 void setPendingExtraData(PassOwnPtr<TestShellExtraData>); | 82 void setPendingExtraData(PassOwnPtr<TestShellExtraData>); |
| 83 | 83 |
| 84 TestNavigationController* navigationController() { return m_navigationContro
ller.get(); } | 84 TestNavigationController* navigationController() { return m_navigationContro
ller.get(); } |
| 85 | 85 |
| 86 void closeWidget(); | 86 void closeWidget(); |
| 87 | 87 |
| 88 // WebTestDelegate. | 88 // WebTestDelegate. |
| 89 virtual void setEditCommand(const std::string& name, const std::string& valu
e) OVERRIDE; | 89 virtual void setEditCommand(const std::string& name, const std::string& valu
e) OVERRIDE; |
| 90 virtual void clearEditCommand() OVERRIDE; | 90 virtual void clearEditCommand() OVERRIDE; |
| 91 virtual void setGamepadData(const WebKit::WebGamepads&) OVERRIDE; | 91 virtual void setGamepadData(const WebKit::WebGamepads&) OVERRIDE; |
| 92 virtual void setDeviceMotionHandler(WebKit::WebDeviceMotionHandler*) OVERRID
E; |
| 92 virtual void printMessage(const std::string& message) OVERRIDE; | 93 virtual void printMessage(const std::string& message) OVERRIDE; |
| 93 virtual void postTask(WebTestRunner::WebTask*) OVERRIDE; | 94 virtual void postTask(WebTestRunner::WebTask*) OVERRIDE; |
| 94 virtual void postDelayedTask(WebTestRunner::WebTask*, long long ms) OVERRIDE
; | 95 virtual void postDelayedTask(WebTestRunner::WebTask*, long long ms) OVERRIDE
; |
| 95 virtual WebKit::WebString registerIsolatedFileSystem(const WebKit::WebVector
<WebKit::WebString>& absoluteFilenames) OVERRIDE; | 96 virtual WebKit::WebString registerIsolatedFileSystem(const WebKit::WebVector
<WebKit::WebString>& absoluteFilenames) OVERRIDE; |
| 96 virtual long long getCurrentTimeInMillisecond() OVERRIDE; | 97 virtual long long getCurrentTimeInMillisecond() OVERRIDE; |
| 97 virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path(const std::string
& path) OVERRIDE; | 98 virtual WebKit::WebString getAbsoluteWebStringFromUTF8Path(const std::string
& path) OVERRIDE; |
| 98 virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL&) OVERRIDE; | 99 virtual WebKit::WebURL localFileToDataURL(const WebKit::WebURL&) OVERRIDE; |
| 99 virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string&) OVERRIDE; | 100 virtual WebKit::WebURL rewriteLayoutTestsURL(const std::string&) OVERRIDE; |
| 100 virtual WebTestRunner::WebPreferences* preferences() OVERRIDE; | 101 virtual WebTestRunner::WebPreferences* preferences() OVERRIDE; |
| 101 virtual void applyPreferences() OVERRIDE; | 102 virtual void applyPreferences() OVERRIDE; |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 OwnPtr<TestNavigationController> m_navigationController; | 281 OwnPtr<TestNavigationController> m_navigationController; |
| 281 | 282 |
| 282 WebTestRunner::WebTaskList m_taskList; | 283 WebTestRunner::WebTaskList m_taskList; |
| 283 Vector<WebKit::WebWidget*> m_popupmenus; | 284 Vector<WebKit::WebWidget*> m_popupmenus; |
| 284 | 285 |
| 285 OwnPtr<webkit_support::DRTLayerTreeViewClient> m_layerTreeViewClient; | 286 OwnPtr<webkit_support::DRTLayerTreeViewClient> m_layerTreeViewClient; |
| 286 OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView; | 287 OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView; |
| 287 }; | 288 }; |
| 288 | 289 |
| 289 #endif // WebViewHost_h | 290 #endif // WebViewHost_h |
| OLD | NEW |