| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "base/auto_reset.h" | 5 #include "base/auto_reset.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "content/browser/renderer_host/render_widget_host_impl.h" | 8 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 9 #include "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
| 10 #include "content/common/input/synthetic_web_input_event_builders.h" | 10 #include "content/common/input/synthetic_web_input_event_builders.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 | 157 |
| 158 filter_ = new InputEventMessageFilter(); | 158 filter_ = new InputEventMessageFilter(); |
| 159 host->GetProcess()->AddFilter(filter_); | 159 host->GetProcess()->AddFilter(filter_); |
| 160 } | 160 } |
| 161 | 161 |
| 162 // ContentBrowserTest: | 162 // ContentBrowserTest: |
| 163 virtual void SetUp() OVERRIDE { | 163 virtual void SetUp() OVERRIDE { |
| 164 // We expect real pixel output for these tests. | 164 // We expect real pixel output for these tests. |
| 165 UseRealGLContexts(); | 165 UseRealGLContexts(); |
| 166 | 166 |
| 167 // On legacy windows, these tests need real GL bindings to pass. | |
| 168 #if defined(OS_WIN) && !defined(USE_AURA) | |
| 169 UseRealGLBindings(); | |
| 170 #endif | |
| 171 | |
| 172 ContentBrowserTest::SetUp(); | 167 ContentBrowserTest::SetUp(); |
| 173 } | 168 } |
| 174 | 169 |
| 175 virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE { | 170 virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE { |
| 176 cmd->AppendSwitchASCII(switches::kTouchEvents, | 171 cmd->AppendSwitchASCII(switches::kTouchEvents, |
| 177 switches::kTouchEventsEnabled); | 172 switches::kTouchEventsEnabled); |
| 178 cmd->AppendSwitch(GetParam()); | 173 cmd->AppendSwitch(GetParam()); |
| 179 } | 174 } |
| 180 | 175 |
| 181 scoped_refptr<InputEventMessageFilter> filter_; | 176 scoped_refptr<InputEventMessageFilter> filter_; |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 | 293 |
| 299 INSTANTIATE_TEST_CASE_P(WithoutInputHandlerProxy, TouchInputBrowserTest, | 294 INSTANTIATE_TEST_CASE_P(WithoutInputHandlerProxy, TouchInputBrowserTest, |
| 300 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); | 295 ::testing::Values(std::string(switches::kDisableThreadedCompositing))); |
| 301 | 296 |
| 302 #if !defined(OS_MACOSX) | 297 #if !defined(OS_MACOSX) |
| 303 INSTANTIATE_TEST_CASE_P(WithInputHandlerProxy, TouchInputBrowserTest, | 298 INSTANTIATE_TEST_CASE_P(WithInputHandlerProxy, TouchInputBrowserTest, |
| 304 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); | 299 ::testing::Values(std::string(switches::kEnableThreadedCompositing))); |
| 305 #endif | 300 #endif |
| 306 | 301 |
| 307 } // namespace content | 302 } // namespace content |
| OLD | NEW |