| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  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  |  206  | 
 |  207     static const int screenUnavailableBorder; | 
 |  208  | 
|  207 private: |  209 private: | 
|  208  |  210  | 
|  209     class HostMethodTask : public WebTestRunner::WebMethodTask<WebViewHost> { |  211     class HostMethodTask : public WebTestRunner::WebMethodTask<WebViewHost> { | 
|  210     public: |  212     public: | 
|  211         typedef void (WebViewHost::*CallbackMethodType)(); |  213         typedef void (WebViewHost::*CallbackMethodType)(); | 
|  212         HostMethodTask(WebViewHost* object, CallbackMethodType callback) |  214         HostMethodTask(WebViewHost* object, CallbackMethodType callback) | 
|  213             : WebTestRunner::WebMethodTask<WebViewHost>(object) |  215             : WebTestRunner::WebMethodTask<WebViewHost>(object) | 
|  214             , m_callback(callback) |  216             , m_callback(callback) | 
|  215         { } |  217         { } | 
|  216  |  218  | 
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  278     OwnPtr<TestNavigationController> m_navigationController; |  280     OwnPtr<TestNavigationController> m_navigationController; | 
|  279  |  281  | 
|  280     WebTestRunner::WebTaskList m_taskList; |  282     WebTestRunner::WebTaskList m_taskList; | 
|  281     Vector<WebKit::WebWidget*> m_popupmenus; |  283     Vector<WebKit::WebWidget*> m_popupmenus; | 
|  282  |  284  | 
|  283     OwnPtr<webkit_support::DRTLayerTreeViewClient> m_layerTreeViewClient; |  285     OwnPtr<webkit_support::DRTLayerTreeViewClient> m_layerTreeViewClient; | 
|  284     OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView; |  286     OwnPtr<WebKit::WebLayerTreeView> m_layerTreeView; | 
|  285 }; |  287 }; | 
|  286  |  288  | 
|  287 #endif // WebViewHost_h |  289 #endif // WebViewHost_h | 
| OLD | NEW |