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 "build/build_config.h" | 22 #include "build/build_config.h" |
23 #include "cc/output/begin_frame_args.h" | |
brianderson
2017/03/13 22:55:39
Is this needed?
Eric Seckler
2017/03/14 11:13:41
Reverted.
| |
23 #include "cc/trees/layer_tree_host.h" | 24 #include "cc/trees/layer_tree_host.h" |
24 #include "content/child/request_extra_data.h" | 25 #include "content/child/request_extra_data.h" |
25 #include "content/child/service_worker/service_worker_network_provider.h" | 26 #include "content/child/service_worker/service_worker_network_provider.h" |
26 #include "content/common/content_switches_internal.h" | 27 #include "content/common/content_switches_internal.h" |
27 #include "content/common/frame_messages.h" | 28 #include "content/common/frame_messages.h" |
28 #include "content/common/frame_owner_properties.h" | 29 #include "content/common/frame_owner_properties.h" |
29 #include "content/common/frame_replication_state.h" | 30 #include "content/common/frame_replication_state.h" |
30 #include "content/common/renderer.mojom.h" | 31 #include "content/common/renderer.mojom.h" |
31 #include "content/common/site_isolation_policy.h" | 32 #include "content/common/site_isolation_policy.h" |
32 #include "content/common/view_messages.h" | 33 #include "content/common/view_messages.h" |
(...skipping 2556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2589 ExpectPauseAndResume(3); | 2590 ExpectPauseAndResume(3); |
2590 blink::WebScriptSource source2( | 2591 blink::WebScriptSource source2( |
2591 WebString::fromUTF8("function func2() { func1(); }; func2();")); | 2592 WebString::fromUTF8("function func2() { func1(); }; func2();")); |
2592 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1); | 2593 frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1); |
2593 | 2594 |
2594 EXPECT_FALSE(IsPaused()); | 2595 EXPECT_FALSE(IsPaused()); |
2595 Detach(); | 2596 Detach(); |
2596 } | 2597 } |
2597 | 2598 |
2598 } // namespace content | 2599 } // namespace content |
OLD | NEW |