| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 5 #ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ |
| 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 6 #define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 int request_id, | 143 int request_id, |
| 144 const std::vector<std::string>& event_platforms, | 144 const std::vector<std::string>& event_platforms, |
| 145 const base::Callback<void(bool)>& callback) override; | 145 const base::Callback<void(bool)>& callback) override; |
| 146 void ResolveBeforeInstallPromptPromise( | 146 void ResolveBeforeInstallPromptPromise( |
| 147 int request_id, | 147 int request_id, |
| 148 const std::string& platform) override; | 148 const std::string& platform) override; |
| 149 blink::WebPlugin* CreatePluginPlaceholder( | 149 blink::WebPlugin* CreatePluginPlaceholder( |
| 150 blink::WebLocalFrame* frame, | 150 blink::WebLocalFrame* frame, |
| 151 const blink::WebPluginParams& params) override; | 151 const blink::WebPluginParams& params) override; |
| 152 void OnWebTestProxyBaseDestroy(test_runner::WebTestProxyBase* proxy) override; | 152 void OnWebTestProxyBaseDestroy(test_runner::WebTestProxyBase* proxy) override; |
| 153 blink::WebPoint ConvertDIPToNative( | |
| 154 const blink::WebPoint& point_in_dip) const override; | |
| 155 | 153 |
| 156 void Reset(); | 154 void Reset(); |
| 157 | 155 |
| 158 void set_proxy(test_runner::WebTestProxyBase* proxy) { proxy_ = proxy; } | 156 void set_proxy(test_runner::WebTestProxyBase* proxy) { proxy_ = proxy; } |
| 159 test_runner::WebTestProxyBase* proxy() const { return proxy_; } | 157 test_runner::WebTestProxyBase* proxy() const { return proxy_; } |
| 160 | 158 |
| 161 void ReportLeakDetectionResult(const LeakDetectionResult& result); | 159 void ReportLeakDetectionResult(const LeakDetectionResult& result); |
| 162 | 160 |
| 163 private: | 161 private: |
| 164 // Message handlers. | 162 // Message handlers. |
| (...skipping 29 matching lines...) Expand all Loading... |
| 194 std::deque<base::Callback<void(const std::vector<std::string>&)>> | 192 std::deque<base::Callback<void(const std::vector<std::string>&)>> |
| 195 get_bluetooth_events_callbacks_; | 193 get_bluetooth_events_callbacks_; |
| 196 | 194 |
| 197 bool is_main_window_; | 195 bool is_main_window_; |
| 198 | 196 |
| 199 bool focus_on_next_commit_; | 197 bool focus_on_next_commit_; |
| 200 | 198 |
| 201 scoped_ptr<LeakDetector> leak_detector_; | 199 scoped_ptr<LeakDetector> leak_detector_; |
| 202 bool needs_leak_detector_; | 200 bool needs_leak_detector_; |
| 203 | 201 |
| 204 float device_scale_factor_; | |
| 205 | |
| 206 DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); | 202 DISALLOW_COPY_AND_ASSIGN(BlinkTestRunner); |
| 207 }; | 203 }; |
| 208 | 204 |
| 209 } // namespace content | 205 } // namespace content |
| 210 | 206 |
| 211 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ | 207 #endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_RUNNER_H_ |
| OLD | NEW |