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 #include <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 #include <tuple> | 7 #include <tuple> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/json/json_reader.h" | 12 #include "base/json/json_reader.h" |
13 #include "base/json/json_writer.h" | 13 #include "base/json/json_writer.h" |
14 #include "base/location.h" | 14 #include "base/location.h" |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/single_thread_task_runner.h" | 16 #include "base/single_thread_task_runner.h" |
17 #include "base/strings/string_util.h" | 17 #include "base/strings/string_util.h" |
18 #include "base/strings/utf_string_conversions.h" | 18 #include "base/strings/utf_string_conversions.h" |
19 #include "base/threading/thread_task_runner_handle.h" | 19 #include "base/threading/thread_task_runner_handle.h" |
20 #include "base/time/time.h" | 20 #include "base/time/time.h" |
21 #include "base/values.h" | 21 #include "base/values.h" |
22 #include "base/win/windows_version.h" | |
23 #include "build/build_config.h" | 22 #include "build/build_config.h" |
24 #include "cc/trees/layer_tree.h" | 23 #include "cc/trees/layer_tree.h" |
25 #include "cc/trees/layer_tree_host.h" | 24 #include "cc/trees/layer_tree_host.h" |
26 #include "content/child/request_extra_data.h" | 25 #include "content/child/request_extra_data.h" |
27 #include "content/child/service_worker/service_worker_network_provider.h" | 26 #include "content/child/service_worker/service_worker_network_provider.h" |
28 #include "content/common/content_switches_internal.h" | 27 #include "content/common/content_switches_internal.h" |
29 #include "content/common/frame_messages.h" | 28 #include "content/common/frame_messages.h" |
30 #include "content/common/frame_owner_properties.h" | 29 #include "content/common/frame_owner_properties.h" |
31 #include "content/common/frame_replication_state.h" | 30 #include "content/common/frame_replication_state.h" |
32 #include "content/common/renderer.mojom.h" | 31 #include "content/common/renderer.mojom.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 #include "third_party/WebKit/public/web/WebSettings.h" | 80 #include "third_party/WebKit/public/web/WebSettings.h" |
82 #include "third_party/WebKit/public/web/WebView.h" | 81 #include "third_party/WebKit/public/web/WebView.h" |
83 #include "third_party/WebKit/public/web/WebWindowFeatures.h" | 82 #include "third_party/WebKit/public/web/WebWindowFeatures.h" |
84 #include "ui/events/base_event_utils.h" | 83 #include "ui/events/base_event_utils.h" |
85 #include "ui/events/event.h" | 84 #include "ui/events/event.h" |
86 #include "ui/events/keycodes/keyboard_codes.h" | 85 #include "ui/events/keycodes/keyboard_codes.h" |
87 #include "ui/gfx/codec/jpeg_codec.h" | 86 #include "ui/gfx/codec/jpeg_codec.h" |
88 #include "ui/gfx/range/range.h" | 87 #include "ui/gfx/range/range.h" |
89 #include "ui/native_theme/native_theme_switches.h" | 88 #include "ui/native_theme/native_theme_switches.h" |
90 | 89 |
| 90 #if defined(OS_WIN) |
| 91 #include "base/win/windows_version.h" |
| 92 #endif |
| 93 |
91 #if defined(USE_AURA) && defined(USE_X11) | 94 #if defined(USE_AURA) && defined(USE_X11) |
92 #include <X11/Xlib.h> | 95 #include <X11/Xlib.h> |
93 #include "base/memory/ptr_util.h" | 96 #include "base/memory/ptr_util.h" |
94 #include "ui/events/event_constants.h" | 97 #include "ui/events/event_constants.h" |
95 #include "ui/events/keycodes/keyboard_code_conversion.h" | 98 #include "ui/events/keycodes/keyboard_code_conversion.h" |
96 #include "ui/events/test/events_test_utils.h" | 99 #include "ui/events/test/events_test_utils.h" |
97 #include "ui/events/test/events_test_utils_x11.h" | 100 #include "ui/events/test/events_test_utils_x11.h" |
98 #endif | 101 #endif |
99 | 102 |
100 #if defined(USE_OZONE) | 103 #if defined(USE_OZONE) |
(...skipping 2455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2556 ExpectPauseAndResume(3); | 2559 ExpectPauseAndResume(3); |
2557 blink::WebScriptSource source2( | 2560 blink::WebScriptSource source2( |
2558 WebString::fromUTF8("function func2() { func1(); }; func2();")); | 2561 WebString::fromUTF8("function func2() { func1(); }; func2();")); |
2559 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1, 1); | 2562 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1, 1); |
2560 | 2563 |
2561 EXPECT_FALSE(IsPaused()); | 2564 EXPECT_FALSE(IsPaused()); |
2562 Detach(); | 2565 Detach(); |
2563 } | 2566 } |
2564 | 2567 |
2565 } // namespace content | 2568 } // namespace content |
OLD | NEW |