| 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 | 5 |
| 6 #include "bindings/core/v8/ScriptStreamer.h" | 6 #include "bindings/core/v8/ScriptStreamer.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/ScriptSourceCode.h" | 8 #include "bindings/core/v8/ScriptSourceCode.h" |
| 9 #include "bindings/core/v8/ScriptStreamerThread.h" | 9 #include "bindings/core/v8/ScriptStreamerThread.h" |
| 10 #include "bindings/core/v8/V8Binding.h" | 10 #include "bindings/core/v8/V8Binding.h" |
| 11 #include "bindings/core/v8/V8BindingForTesting.h" | 11 #include "bindings/core/v8/V8BindingForTesting.h" |
| 12 #include "bindings/core/v8/V8ScriptRunner.h" | 12 #include "bindings/core/v8/V8ScriptRunner.h" |
| 13 #include "core/dom/Element.h" | 13 #include "core/dom/Element.h" |
| 14 #include "core/dom/PendingScript.h" | 14 #include "core/dom/PendingScript.h" |
| 15 #include "core/frame/Settings.h" | 15 #include "core/frame/Settings.h" |
| 16 #include "platform/heap/Handle.h" | 16 #include "platform/heap/Handle.h" |
| 17 #include "platform/testing/UnitTestHelpers.h" | 17 #include "platform/testing/UnitTestHelpers.h" |
| 18 #include "public/platform/Platform.h" | 18 #include "public/platform/Platform.h" |
| 19 #include "public/platform/WebScheduler.h" | 19 #include "public/platform/WebScheduler.h" |
| 20 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
| 21 #include <memory> |
| 21 #include <v8.h> | 22 #include <v8.h> |
| 22 | 23 |
| 23 namespace blink { | 24 namespace blink { |
| 24 | 25 |
| 25 namespace { | 26 namespace { |
| 26 | 27 |
| 27 class ScriptStreamingTest : public ::testing::Test { | 28 class ScriptStreamingTest : public ::testing::Test { |
| 28 public: | 29 public: |
| 29 ScriptStreamingTest() | 30 ScriptStreamingTest() |
| 30 : m_loadingTaskRunner(Platform::current()->currentThread()->scheduler()-
>loadingTaskRunner()) | 31 : m_loadingTaskRunner(Platform::current()->currentThread()->scheduler()-
>loadingTaskRunner()) |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 { | 78 { |
| 78 while (ScriptStreamerThread::shared()->isRunningTask()) { | 79 while (ScriptStreamerThread::shared()->isRunningTask()) { |
| 79 testing::runPendingTasks(); | 80 testing::runPendingTasks(); |
| 80 } | 81 } |
| 81 // Once more, because the "streaming complete" notification might only | 82 // Once more, because the "streaming complete" notification might only |
| 82 // now be in the task queue. | 83 // now be in the task queue. |
| 83 testing::runPendingTasks(); | 84 testing::runPendingTasks(); |
| 84 } | 85 } |
| 85 | 86 |
| 86 WebTaskRunner* m_loadingTaskRunner; // NOT OWNED | 87 WebTaskRunner* m_loadingTaskRunner; // NOT OWNED |
| 87 OwnPtr<Settings> m_settings; | 88 std::unique_ptr<Settings> m_settings; |
| 88 // The Resource and PendingScript where we stream from. These don't really | 89 // The Resource and PendingScript where we stream from. These don't really |
| 89 // fetch any data outside the test; the test controls the data by calling | 90 // fetch any data outside the test; the test controls the data by calling |
| 90 // ScriptResource::appendData. | 91 // ScriptResource::appendData. |
| 91 ResourceRequest m_resourceRequest; | 92 ResourceRequest m_resourceRequest; |
| 92 Persistent<ScriptResource> m_resource; | 93 Persistent<ScriptResource> m_resource; |
| 93 Persistent<PendingScript> m_pendingScript; | 94 Persistent<PendingScript> m_pendingScript; |
| 94 }; | 95 }; |
| 95 | 96 |
| 96 class TestScriptResourceClient : public GarbageCollectedFinalized<TestScriptReso
urceClient>, public ScriptResourceClient { | 97 class TestScriptResourceClient : public GarbageCollectedFinalized<TestScriptReso
urceClient>, public ScriptResourceClient { |
| 97 USING_GARBAGE_COLLECTED_MIXIN(TestScriptResourceClient); | 98 USING_GARBAGE_COLLECTED_MIXIN(TestScriptResourceClient); |
| (...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 EXPECT_TRUE(sourceCode.streamer()); | 387 EXPECT_TRUE(sourceCode.streamer()); |
| 387 v8::TryCatch tryCatch(scope.isolate()); | 388 v8::TryCatch tryCatch(scope.isolate()); |
| 388 v8::Local<v8::Script> script; | 389 v8::Local<v8::Script> script; |
| 389 EXPECT_TRUE(V8ScriptRunner::compileScript(sourceCode, scope.isolate()).ToLoc
al(&script)); | 390 EXPECT_TRUE(V8ScriptRunner::compileScript(sourceCode, scope.isolate()).ToLoc
al(&script)); |
| 390 EXPECT_FALSE(tryCatch.HasCaught()); | 391 EXPECT_FALSE(tryCatch.HasCaught()); |
| 391 } | 392 } |
| 392 | 393 |
| 393 } // namespace | 394 } // namespace |
| 394 | 395 |
| 395 } // namespace blink | 396 } // namespace blink |
| OLD | NEW |