OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "bindings/core/v8/ScriptController.h" | 5 #include "bindings/core/v8/ScriptController.h" |
6 #include "bindings/core/v8/ScriptSourceCode.h" | 6 #include "bindings/core/v8/ScriptSourceCode.h" |
7 #include "bindings/core/v8/V8BindingForCore.h" | 7 #include "bindings/core/v8/V8BindingForCore.h" |
8 #include "bindings/core/v8/V8DOMActivityLogger.h" | 8 #include "bindings/core/v8/V8DOMActivityLogger.h" |
9 #include "core/frame/FrameTestHelpers.h" | 9 #include "core/frame/FrameTestHelpers.h" |
10 #include "core/frame/WebLocalFrameBase.h" | 10 #include "core/frame/WebLocalFrameBase.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 protected: | 73 protected: |
74 ActivityLoggerTest() { | 74 ActivityLoggerTest() { |
75 activity_logger_ = new TestActivityLogger(); | 75 activity_logger_ = new TestActivityLogger(); |
76 V8DOMActivityLogger::SetActivityLogger(kIsolatedWorldId, String(), | 76 V8DOMActivityLogger::SetActivityLogger(kIsolatedWorldId, String(), |
77 WTF::WrapUnique(activity_logger_)); | 77 WTF::WrapUnique(activity_logger_)); |
78 web_view_helper_.Initialize(); | 78 web_view_helper_.Initialize(); |
79 script_controller_ = &web_view_helper_.WebView() | 79 script_controller_ = &web_view_helper_.WebView() |
80 ->MainFrameImpl() | 80 ->MainFrameImpl() |
81 ->GetFrame() | 81 ->GetFrame() |
82 ->GetScriptController(); | 82 ->GetScriptController(); |
83 FrameTestHelpers::LoadFrame(web_view_helper_.WebView()->MainFrame(), | 83 FrameTestHelpers::LoadFrame(web_view_helper_.WebView()->MainFrameImpl(), |
84 "about:blank"); | 84 "about:blank"); |
85 } | 85 } |
86 | 86 |
87 ~ActivityLoggerTest() { WebCache::Clear(); } | 87 ~ActivityLoggerTest() { WebCache::Clear(); } |
88 | 88 |
89 void ExecuteScriptInMainWorld(const String& script) const { | 89 void ExecuteScriptInMainWorld(const String& script) const { |
90 v8::HandleScope scope(v8::Isolate::GetCurrent()); | 90 v8::HandleScope scope(v8::Isolate::GetCurrent()); |
91 script_controller_->ExecuteScriptInMainWorld(script); | 91 script_controller_->ExecuteScriptInMainWorld(script); |
92 PumpPendingRequestsForFrameToLoad(web_view_helper_.WebView()->MainFrame()); | 92 PumpPendingRequestsForFrameToLoad(web_view_helper_.WebView()->MainFrame()); |
93 } | 93 } |
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" | 587 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" |
588 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E\n" | 588 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E\n" |
589 "blinkRequestResource | Image | data:text/html;charset=utf-8,B\n"; | 589 "blinkRequestResource | Image | data:text/html;charset=utf-8,B\n"; |
590 ExecuteScriptInMainWorld(code); | 590 ExecuteScriptInMainWorld(code); |
591 ASSERT_TRUE(VerifyActivities("")); | 591 ASSERT_TRUE(VerifyActivities("")); |
592 ExecuteScriptInIsolatedWorld(code); | 592 ExecuteScriptInIsolatedWorld(code); |
593 ASSERT_TRUE(VerifyActivities(expected_activities)); | 593 ASSERT_TRUE(VerifyActivities(expected_activities)); |
594 } | 594 } |
595 | 595 |
596 } // namespace blink | 596 } // namespace blink |
OLD | NEW |