| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "modules/fetch/DataConsumerTee.h" | 5 #include "modules/fetch/DataConsumerTee.h" |
| 6 | 6 |
| 7 #include "core/testing/DummyPageHolder.h" | 7 #include "core/testing/DummyPageHolder.h" |
| 8 #include "core/testing/NullExecutionContext.h" | 8 #include "core/testing/NullExecutionContext.h" |
| 9 #include "modules/fetch/DataConsumerHandleTestUtil.h" | 9 #include "modules/fetch/DataConsumerHandleTestUtil.h" |
| 10 #include "platform/ThreadSafeFunctional.h" | 10 #include "platform/ThreadSafeFunctional.h" |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 class TeeCreationThread { | 54 class TeeCreationThread { |
| 55 public: | 55 public: |
| 56 void run(PassOwnPtr<Handle> src, OwnPtr<Handle>* dest1, OwnPtr<Handle>* dest
2) | 56 void run(PassOwnPtr<Handle> src, OwnPtr<Handle>* dest1, OwnPtr<Handle>* dest
2) |
| 57 { | 57 { |
| 58 m_thread = adoptPtr(new Thread("src thread", Thread::WithExecutionContex
t)); | 58 m_thread = adoptPtr(new Thread("src thread", Thread::WithExecutionContex
t)); |
| 59 m_waitableEvent = adoptPtr(new WaitableEvent()); | 59 m_waitableEvent = adoptPtr(new WaitableEvent()); |
| 60 m_thread->thread()->postTask(BLINK_FROM_HERE, threadSafeBind(&TeeCreatio
nThread<Handle>::runInternal, AllowCrossThreadAccess(this), src, AllowCrossThrea
dAccess(dest1), AllowCrossThreadAccess(dest2))); | 60 m_thread->thread()->postTask(BLINK_FROM_HERE, threadSafeBind(&TeeCreatio
nThread<Handle>::runInternal, AllowCrossThreadAccess(this), src, AllowCrossThrea
dAccess(dest1), AllowCrossThreadAccess(dest2))); |
| 61 m_waitableEvent->wait(); | 61 m_waitableEvent->wait(); |
| 62 } | 62 } |
| 63 | 63 |
| 64 Thread* thread() { return m_thread.get(); } | 64 Thread* getThread() { return m_thread.get(); } |
| 65 | 65 |
| 66 private: | 66 private: |
| 67 void runInternal(PassOwnPtr<Handle> src, OwnPtr<Handle>* dest1, OwnPtr<Handl
e>* dest2) | 67 void runInternal(PassOwnPtr<Handle> src, OwnPtr<Handle>* dest1, OwnPtr<Handl
e>* dest2) |
| 68 { | 68 { |
| 69 DataConsumerTee::create(m_thread->executionContext(), src, dest1, dest2)
; | 69 DataConsumerTee::create(m_thread->getExecutionContext(), src, dest1, des
t2); |
| 70 m_waitableEvent->signal(); | 70 m_waitableEvent->signal(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 OwnPtr<Thread> m_thread; | 73 OwnPtr<Thread> m_thread; |
| 74 OwnPtr<WaitableEvent> m_waitableEvent; | 74 OwnPtr<WaitableEvent> m_waitableEvent; |
| 75 }; | 75 }; |
| 76 | 76 |
| 77 TEST(DataConsumerTeeTest, CreateDone) | 77 TEST(DataConsumerTeeTest, CreateDone) |
| 78 { | 78 { |
| 79 OwnPtr<Handle> src(Handle::create()); | 79 OwnPtr<Handle> src(Handle::create()); |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 | 183 |
| 184 OwnPtr<HandleReadResult> res1 = r1.wait(); | 184 OwnPtr<HandleReadResult> res1 = r1.wait(); |
| 185 OwnPtr<HandleReadResult> res2 = r2.wait(); | 185 OwnPtr<HandleReadResult> res2 = r2.wait(); |
| 186 | 186 |
| 187 EXPECT_EQ(kUnexpectedError, res1->result()); | 187 EXPECT_EQ(kUnexpectedError, res1->result()); |
| 188 EXPECT_EQ(kUnexpectedError, res2->result()); | 188 EXPECT_EQ(kUnexpectedError, res2->result()); |
| 189 } | 189 } |
| 190 | 190 |
| 191 void postStop(Thread* thread) | 191 void postStop(Thread* thread) |
| 192 { | 192 { |
| 193 thread->executionContext()->stopActiveDOMObjects(); | 193 thread->getExecutionContext()->stopActiveDOMObjects(); |
| 194 } | 194 } |
| 195 | 195 |
| 196 TEST(DataConsumerTeeTest, StopSource) | 196 TEST(DataConsumerTeeTest, StopSource) |
| 197 { | 197 { |
| 198 OwnPtr<Handle> src(Handle::create()); | 198 OwnPtr<Handle> src(Handle::create()); |
| 199 OwnPtr<WebDataConsumerHandle> dest1, dest2; | 199 OwnPtr<WebDataConsumerHandle> dest1, dest2; |
| 200 | 200 |
| 201 src->add(Command(Command::Data, "hello, ")); | 201 src->add(Command(Command::Data, "hello, ")); |
| 202 src->add(Command(Command::Data, "world")); | 202 src->add(Command(Command::Data, "world")); |
| 203 | 203 |
| 204 OwnPtr<TeeCreationThread<WebDataConsumerHandle>> t = adoptPtr(new TeeCreatio
nThread<WebDataConsumerHandle>()); | 204 OwnPtr<TeeCreationThread<WebDataConsumerHandle>> t = adoptPtr(new TeeCreatio
nThread<WebDataConsumerHandle>()); |
| 205 t->run(src.release(), &dest1, &dest2); | 205 t->run(src.release(), &dest1, &dest2); |
| 206 | 206 |
| 207 ASSERT_TRUE(dest1); | 207 ASSERT_TRUE(dest1); |
| 208 ASSERT_TRUE(dest2); | 208 ASSERT_TRUE(dest2); |
| 209 | 209 |
| 210 HandleReaderRunner<HandleReader> r1(dest1.release()); | 210 HandleReaderRunner<HandleReader> r1(dest1.release()); |
| 211 HandleReaderRunner<HandleReader> r2(dest2.release()); | 211 HandleReaderRunner<HandleReader> r2(dest2.release()); |
| 212 | 212 |
| 213 // We can pass a raw pointer because the subsequent |wait| calls ensure | 213 // We can pass a raw pointer because the subsequent |wait| calls ensure |
| 214 // t->thread() is alive. | 214 // t->thread() is alive. |
| 215 t->thread()->thread()->postTask(BLINK_FROM_HERE, threadSafeBind(postStop, Al
lowCrossThreadAccess(t->thread()))); | 215 t->getThread()->thread()->postTask(BLINK_FROM_HERE, threadSafeBind(postStop,
AllowCrossThreadAccess(t->getThread()))); |
| 216 | 216 |
| 217 OwnPtr<HandleReadResult> res1 = r1.wait(); | 217 OwnPtr<HandleReadResult> res1 = r1.wait(); |
| 218 OwnPtr<HandleReadResult> res2 = r2.wait(); | 218 OwnPtr<HandleReadResult> res2 = r2.wait(); |
| 219 | 219 |
| 220 EXPECT_EQ(kUnexpectedError, res1->result()); | 220 EXPECT_EQ(kUnexpectedError, res1->result()); |
| 221 EXPECT_EQ(kUnexpectedError, res2->result()); | 221 EXPECT_EQ(kUnexpectedError, res2->result()); |
| 222 } | 222 } |
| 223 | 223 |
| 224 TEST(DataConsumerTeeTest, DetachSource) | 224 TEST(DataConsumerTeeTest, DetachSource) |
| 225 { | 225 { |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 HandleReaderRunner<HandleReader> r2(dest2.release()); | 297 HandleReaderRunner<HandleReader> r2(dest2.release()); |
| 298 OwnPtr<HandleReadResult> res2 = r2.wait(); | 298 OwnPtr<HandleReadResult> res2 = r2.wait(); |
| 299 | 299 |
| 300 EXPECT_EQ(kDone, res2->result()); | 300 EXPECT_EQ(kDone, res2->result()); |
| 301 EXPECT_EQ("hello, world", toString(res2->data())); | 301 EXPECT_EQ("hello, world", toString(res2->data())); |
| 302 } | 302 } |
| 303 | 303 |
| 304 TEST(DataConsumerTeeTest, DetachBothDestinationsShouldStopSourceReader) | 304 TEST(DataConsumerTeeTest, DetachBothDestinationsShouldStopSourceReader) |
| 305 { | 305 { |
| 306 OwnPtr<Handle> src(Handle::create()); | 306 OwnPtr<Handle> src(Handle::create()); |
| 307 RefPtr<Handle::Context> context(src->context()); | 307 RefPtr<Handle::Context> context(src->getContext()); |
| 308 OwnPtr<WebDataConsumerHandle> dest1, dest2; | 308 OwnPtr<WebDataConsumerHandle> dest1, dest2; |
| 309 | 309 |
| 310 src->add(Command(Command::Data, "hello, ")); | 310 src->add(Command(Command::Data, "hello, ")); |
| 311 src->add(Command(Command::Data, "world")); | 311 src->add(Command(Command::Data, "world")); |
| 312 | 312 |
| 313 OwnPtr<TeeCreationThread<WebDataConsumerHandle>> t = adoptPtr(new TeeCreatio
nThread<WebDataConsumerHandle>()); | 313 OwnPtr<TeeCreationThread<WebDataConsumerHandle>> t = adoptPtr(new TeeCreatio
nThread<WebDataConsumerHandle>()); |
| 314 t->run(src.release(), &dest1, &dest2); | 314 t->run(src.release(), &dest1, &dest2); |
| 315 | 315 |
| 316 ASSERT_TRUE(dest1); | 316 ASSERT_TRUE(dest1); |
| 317 ASSERT_TRUE(dest2); | 317 ASSERT_TRUE(dest2); |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 OwnPtr<HandleReadResult> res2 = r2.wait(); | 408 OwnPtr<HandleReadResult> res2 = r2.wait(); |
| 409 | 409 |
| 410 EXPECT_EQ(kDone, res1->result()); | 410 EXPECT_EQ(kDone, res1->result()); |
| 411 EXPECT_EQ(0u, res1->data().size()); | 411 EXPECT_EQ(0u, res1->data().size()); |
| 412 EXPECT_EQ(kDone, res2->result()); | 412 EXPECT_EQ(kDone, res2->result()); |
| 413 EXPECT_EQ(0u, res2->data().size()); | 413 EXPECT_EQ(0u, res2->data().size()); |
| 414 } | 414 } |
| 415 | 415 |
| 416 } // namespace | 416 } // namespace |
| 417 } // namespace blink | 417 } // namespace blink |
| OLD | NEW |