Chromium Code Reviews| 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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 196 virtual void deleteFileSystem(WebKit::WebFrame*, WebKit::WebFileSystemType, WebKit::WebFileSystemCallbacks*); | 196 virtual void deleteFileSystem(WebKit::WebFrame*, WebKit::WebFileSystemType, WebKit::WebFileSystemCallbacks*); |
| 197 virtual bool willCheckAndDispatchMessageEvent( | 197 virtual bool willCheckAndDispatchMessageEvent( |
| 198 WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame, | 198 WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame, |
| 199 WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent); | 199 WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent); |
| 200 | 200 |
| 201 // Pending task list, Note taht the method is referred from WebMethodTask cl ass. | 201 // Pending task list, Note taht the method is referred from WebMethodTask cl ass. |
| 202 WebTestRunner::WebTaskList* taskList() { return &m_taskList; } | 202 WebTestRunner::WebTaskList* taskList() { return &m_taskList; } |
| 203 | 203 |
| 204 // Exposed for WebTestProxy. | 204 // Exposed for WebTestProxy. |
| 205 void scheduleComposite() { } | 205 void scheduleComposite() { } |
| 206 int screenUnavailabeBorder() { return m_screenUnavailableBorder; } | |
|
tkent
2013/05/13 22:45:49
I don't think we need to make this a member functi
| |
| 206 | 207 |
| 207 private: | 208 private: |
| 208 | 209 |
| 209 class HostMethodTask : public WebTestRunner::WebMethodTask<WebViewHost> { | 210 class HostMethodTask : public WebTestRunner::WebMethodTask<WebViewHost> { |
| 210 public: | 211 public: |
| 211 typedef void (WebViewHost::*CallbackMethodType)(); | 212 typedef void (WebViewHost::*CallbackMethodType)(); |
| 212 HostMethodTask(WebViewHost* object, CallbackMethodType callback) | 213 HostMethodTask(WebViewHost* object, CallbackMethodType callback) |
| 213 : WebTestRunner::WebMethodTask<WebViewHost>(object) | 214 : WebTestRunner::WebMethodTask<WebViewHost>(object) |
| 214 , m_callback(callback) | 215 , m_callback(callback) |
| 215 { } | 216 { } |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 258 | 259 |
| 259 WebKit::WebCursorInfo m_currentCursor; | 260 WebKit::WebCursorInfo m_currentCursor; |
| 260 | 261 |
| 261 bool m_hasWindow; | 262 bool m_hasWindow; |
| 262 bool m_inModalLoop; | 263 bool m_inModalLoop; |
| 263 | 264 |
| 264 bool m_shutdownWasInvoked; | 265 bool m_shutdownWasInvoked; |
| 265 bool m_animateScheduled; | 266 bool m_animateScheduled; |
| 266 bool m_finished; | 267 bool m_finished; |
| 267 | 268 |
| 269 int m_screenUnavailableBorder; | |
| 270 | |
| 268 WebKit::WebRect m_windowRect; | 271 WebKit::WebRect m_windowRect; |
| 269 | 272 |
| 270 // Edit command associated to the current keyboard event. | 273 // Edit command associated to the current keyboard event. |
| 271 std::string m_editCommandName; | 274 std::string m_editCommandName; |
| 272 std::string m_editCommandValue; | 275 std::string m_editCommandValue; |
| 273 | 276 |
| 274 OwnPtr<WebKit::WebContextMenuData> m_lastContextMenuData; | 277 OwnPtr<WebKit::WebContextMenuData> m_lastContextMenuData; |
| 275 | 278 |
| 276 OwnPtr<webkit_support::TestMediaStreamClient> m_testMediaStreamClient; | 279 OwnPtr<webkit_support::TestMediaStreamClient> m_testMediaStreamClient; |
| 277 | 280 |
| 278 OwnPtr<TestNavigationController> m_navigationController; | 281 OwnPtr<TestNavigationController> m_navigationController; |
| 279 | 282 |
| 280 WebTestRunner::WebTaskList m_taskList; | 283 WebTestRunner::WebTaskList m_taskList; |
| 281 Vector<WebKit::WebWidget*> m_popupmenus; | 284 Vector<WebKit::WebWidget*> m_popupmenus; |
| 282 | 285 |
| 283 OwnPtr<webkit_support::DRTLayerTreeViewClient> m_layerTreeViewClient; | 286 OwnPtr<webkit_support::DRTLayerTreeViewClient> m_layerTreeViewClient; |
| 284 OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView; | 287 OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView; |
| 285 }; | 288 }; |
| 286 | 289 |
| 287 #endif // WebViewHost_h | 290 #endif // WebViewHost_h |
| OLD | NEW |