Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Side by Side Diff: third_party/WebKit/Source/web/tests/SpinLockTest.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "wtf/SpinLock.h" 31 #include "wtf/SpinLock.h"
32 32
33 #include "platform/ThreadSafeFunctional.h" 33 #include "platform/ThreadSafeFunctional.h"
34 #include "public/platform/Platform.h" 34 #include "public/platform/Platform.h"
35 #include "public/platform/WebTaskRunner.h" 35 #include "public/platform/WebTaskRunner.h"
36 #include "public/platform/WebThread.h" 36 #include "public/platform/WebThread.h"
37 #include "public/platform/WebTraceLocation.h" 37 #include "public/platform/WebTraceLocation.h"
38 #include "testing/gtest/include/gtest/gtest.h" 38 #include "testing/gtest/include/gtest/gtest.h"
39 #include "wtf/PtrUtil.h" 39 #include "wtf/OwnPtr.h"
40 #include <memory> 40 #include "wtf/PassOwnPtr.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 static const size_t bufferSize = 16; 44 static const size_t bufferSize = 16;
45 45
46 static SpinLock lock; 46 static SpinLock lock;
47 47
48 static void fillBuffer(volatile char* buffer, char fillPattern) 48 static void fillBuffer(volatile char* buffer, char fillPattern)
49 { 49 {
50 for (size_t i = 0; i < bufferSize; ++i) 50 for (size_t i = 0; i < bufferSize; ++i)
(...skipping 19 matching lines...) Expand all
70 for (int i = 0; i < 500000; ++i) { 70 for (int i = 0; i < 500000; ++i) {
71 SpinLock::Guard guard(lock); 71 SpinLock::Guard guard(lock);
72 changeAndCheckBuffer(buffer); 72 changeAndCheckBuffer(buffer);
73 } 73 }
74 } 74 }
75 75
76 TEST(SpinLockTest, Torture) 76 TEST(SpinLockTest, Torture)
77 { 77 {
78 char sharedBuffer[bufferSize]; 78 char sharedBuffer[bufferSize];
79 79
80 std::unique_ptr<WebThread> thread1 = wrapUnique(Platform::current()->createT hread("thread1")); 80 OwnPtr<WebThread> thread1 = adoptPtr(Platform::current()->createThread("thre ad1"));
81 std::unique_ptr<WebThread> thread2 = wrapUnique(Platform::current()->createT hread("thread2")); 81 OwnPtr<WebThread> thread2 = adoptPtr(Platform::current()->createThread("thre ad2"));
82 82
83 thread1->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&threa dMain, AllowCrossThreadAccess(static_cast<char*>(sharedBuffer)))); 83 thread1->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&threa dMain, AllowCrossThreadAccess(static_cast<char*>(sharedBuffer))));
84 thread2->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&threa dMain, AllowCrossThreadAccess(static_cast<char*>(sharedBuffer)))); 84 thread2->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&threa dMain, AllowCrossThreadAccess(static_cast<char*>(sharedBuffer))));
85 85
86 thread1.reset(); 86 thread1.reset();
87 thread2.reset(); 87 thread2.reset();
88 } 88 }
89 89
90 } // namespace blink 90 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/tests/PrerenderingTest.cpp ('k') | third_party/WebKit/Source/web/tests/TextFinderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698