Skip to content

Commit 4f25f1e

Browse files
author
[email protected]
committed
Rename createBoxPtr into adoptBoxPtr
https://bugs.webkit.org/show_bug.cgi?id=214171 Reviewed by Darin Adler. Source/WebCore: No new tests, just a rename. * platform/graphics/gstreamer/eme/CDMProxyThunder.cpp: (WebCore::CDMProxyThunder::getDecryptionSession const): Used the renamed function. Source/WTF: * wtf/BoxPtr.h: (WTF::adoptInBoxPtr): Tools: * TestWebKitAPI/Tests/WTF/BoxPtr.cpp: (TestWebKitAPI::TEST): Used the renamed function. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@264499 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 994cddb commit 4f25f1e

File tree

6 files changed

+52
-19
lines changed

6 files changed

+52
-19
lines changed

‎Source/WTF/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-07-16 Xabier Rodriguez Calvar <[email protected]>
2+
3+
Rename createBoxPtr into adoptBoxPtr
4+
https://bugs.webkit.org/show_bug.cgi?id=214171
5+
6+
Reviewed by Darin Adler.
7+
8+
* wtf/BoxPtr.h:
9+
(WTF::adoptInBoxPtr):
10+
111
2020-07-16 Per Arne Vollan <[email protected]>
212

313
XPC connection should be suspended before setting target queue

‎Source/WTF/wtf/BoxPtr.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ template<typename T> struct BoxPtrDeleter {
4646

4747
template<typename T> using BoxPtr = Box<std::unique_ptr<T, BoxPtrDeleter<T>>>;
4848

49-
template<typename T> BoxPtr<T> createBoxPtr(T* ptr)
49+
template<typename T> BoxPtr<T> adoptInBoxPtr(T* ptr)
5050
{
5151
return BoxPtr<T>::create(ptr);
5252
}
@@ -75,5 +75,5 @@ template<typename T> bool operator!=(const BoxPtr<T>& lhs, const BoxPtr<T>& rhs)
7575

7676
} // namespace WTF
7777

78-
using WTF::createBoxPtr;
78+
using WTF::adoptInBoxPtr;
7979
using WTF::BoxPtr;

‎Source/WebCore/ChangeLog

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2020-07-16 Xabier Rodriguez Calvar <[email protected]>
2+
3+
Rename createBoxPtr into adoptBoxPtr
4+
https://bugs.webkit.org/show_bug.cgi?id=214171
5+
6+
Reviewed by Darin Adler.
7+
8+
No new tests, just a rename.
9+
10+
* platform/graphics/gstreamer/eme/CDMProxyThunder.cpp:
11+
(WebCore::CDMProxyThunder::getDecryptionSession const): Used the
12+
renamed function.
13+
114
2020-07-16 Fujii Hironori <[email protected]>
215

316
[WTF] Remove the unnecessary inner class DefaultHash<T>::Hash

‎Source/WebCore/platform/graphics/gstreamer/eme/CDMProxyThunder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ BoxPtr<OpenCDMSession> CDMProxyThunder::getDecryptionSession(const DecryptionCon
6464
BoxPtr<OpenCDMSession> keyValue = WTF::get<BoxPtr<OpenCDMSession>>(keyData);
6565

6666
if (!keyValue) {
67-
keyValue = createBoxPtr(opencdm_get_system_session(&static_cast<const CDMInstanceThunder*>(instance())->thunderSystem(), keyID.data(),
67+
keyValue = adoptInBoxPtr(opencdm_get_system_session(&static_cast<const CDMInstanceThunder*>(instance())->thunderSystem(), keyID.data(),
6868
keyID.size(), s_licenseKeyResponseTimeout.millisecondsAs<uint32_t>()));
6969
ASSERT(keyValue);
7070
// takeValueIfDifferent takes and r-value ref of

‎Tools/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2020-07-16 Xabier Rodriguez Calvar <[email protected]>
2+
3+
Rename createBoxPtr into adoptBoxPtr
4+
https://bugs.webkit.org/show_bug.cgi?id=214171
5+
6+
Reviewed by Darin Adler.
7+
8+
* TestWebKitAPI/Tests/WTF/BoxPtr.cpp:
9+
(TestWebKitAPI::TEST): Used the renamed function.
10+
111
2020-07-15 Jer Noble <[email protected]>
212

313
Unreviwed test gardening; disable the SleepDisabler.NavigateBack

‎Tools/TestWebKitAPI/Tests/WTF/BoxPtr.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ TEST(WTF_BoxPtr, Basic)
7070

7171
{
7272
BoxPtrLogger* a = BoxPtrLogger::create("a");
73-
BoxPtr<BoxPtrLogger> ptr = createBoxPtr(a);
73+
BoxPtr<BoxPtrLogger> ptr = adoptInBoxPtr(a);
7474
EXPECT_EQ(true, static_cast<bool>(ptr));
7575
EXPECT_EQ(a, ptr->get());
7676
EXPECT_EQ(a->name, (*ptr)->name);
@@ -79,7 +79,7 @@ TEST(WTF_BoxPtr, Basic)
7979

8080
{
8181
BoxPtrLogger* a = BoxPtrLogger::create("a");
82-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
82+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
8383
BoxPtr<BoxPtrLogger> p2(p1);
8484
EXPECT_EQ(a, p1->get());
8585
EXPECT_EQ(a, p2->get());
@@ -88,7 +88,7 @@ TEST(WTF_BoxPtr, Basic)
8888

8989
{
9090
BoxPtrLogger* a = BoxPtrLogger::create("a");
91-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
91+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
9292
BoxPtr<BoxPtrLogger> p2 = p1;
9393
EXPECT_EQ(a, p1->get());
9494
EXPECT_EQ(a, p2->get());
@@ -97,7 +97,7 @@ TEST(WTF_BoxPtr, Basic)
9797

9898
{
9999
BoxPtrLogger* a = BoxPtrLogger::create("a");
100-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
100+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
101101
BoxPtr<BoxPtrLogger> p2 = WTFMove(p1);
102102
EXPECT_EQ(false, static_cast<bool>(p1));
103103
EXPECT_EQ(a, p2->get());
@@ -106,7 +106,7 @@ TEST(WTF_BoxPtr, Basic)
106106

107107
{
108108
BoxPtrLogger* a = BoxPtrLogger::create("a");
109-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
109+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
110110
BoxPtr<BoxPtrLogger> p2(WTFMove(p1));
111111
EXPECT_EQ(false, static_cast<bool>(p1));
112112
EXPECT_EQ(a, p2->get());
@@ -115,7 +115,7 @@ TEST(WTF_BoxPtr, Basic)
115115

116116
{
117117
BoxPtrLogger* a = BoxPtrLogger::create("a");
118-
BoxPtr<BoxPtrLogger> ptr = createBoxPtr(a);
118+
BoxPtr<BoxPtrLogger> ptr = adoptInBoxPtr(a);
119119
EXPECT_EQ(a, ptr->get());
120120
ptr = nullptr;
121121
EXPECT_EQ(false, static_cast<bool>(ptr));
@@ -128,8 +128,8 @@ TEST(WTF_BoxPtr, Assignment)
128128
{
129129
BoxPtrLogger* a = BoxPtrLogger::create("a");
130130
BoxPtrLogger* b = BoxPtrLogger::create("b");
131-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
132-
BoxPtr<BoxPtrLogger> p2 = createBoxPtr(b);
131+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
132+
BoxPtr<BoxPtrLogger> p2 = adoptInBoxPtr(b);
133133
EXPECT_EQ(a, p1->get());
134134
EXPECT_EQ(b, p2->get());
135135
log() << "| ";
@@ -143,8 +143,8 @@ TEST(WTF_BoxPtr, Assignment)
143143
{
144144
BoxPtrLogger* a = BoxPtrLogger::create("a");
145145
BoxPtrLogger* b = BoxPtrLogger::create("b");
146-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
147-
BoxPtr<BoxPtrLogger> p2 = createBoxPtr(b);
146+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
147+
BoxPtr<BoxPtrLogger> p2 = adoptInBoxPtr(b);
148148
EXPECT_EQ(a, p1->get());
149149
EXPECT_EQ(b, p2->get());
150150
log() << "| ";
@@ -157,7 +157,7 @@ TEST(WTF_BoxPtr, Assignment)
157157

158158
{
159159
BoxPtrLogger* a = BoxPtrLogger::create("a");
160-
BoxPtr<BoxPtrLogger> ptr = createBoxPtr(a);
160+
BoxPtr<BoxPtrLogger> ptr = adoptInBoxPtr(a);
161161
EXPECT_EQ(a, ptr->get());
162162
log() << "| ";
163163
IGNORE_CLANG_WARNINGS_BEGIN("self-assign-overloaded")
@@ -170,7 +170,7 @@ TEST(WTF_BoxPtr, Assignment)
170170

171171
{
172172
BoxPtrLogger* a = BoxPtrLogger::create("a");
173-
BoxPtr<BoxPtrLogger> ptr = createBoxPtr(a);
173+
BoxPtr<BoxPtrLogger> ptr = adoptInBoxPtr(a);
174174
EXPECT_EQ(a, ptr->get());
175175
IGNORE_CLANG_WARNINGS_BEGIN("self-move")
176176
ptr = WTFMove(ptr);
@@ -185,16 +185,16 @@ TEST(WTF_BoxPtr, Operators)
185185
{
186186
BoxPtrLogger* a = BoxPtrLogger::create("a");
187187
BoxPtrLogger* b = BoxPtrLogger::create("b");
188-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
189-
BoxPtr<BoxPtrLogger> p2 = createBoxPtr(b);
188+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
189+
BoxPtr<BoxPtrLogger> p2 = adoptInBoxPtr(b);
190190
EXPECT_EQ(p1, p1);
191191
EXPECT_NE(p1, p2);
192192
}
193193
EXPECT_STREQ("create(a) create(b) delete(b) delete(a) ", takeLogStr().c_str());
194194

195195
{
196196
BoxPtrLogger* a = BoxPtrLogger::create("a");
197-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
197+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
198198
EXPECT_EQ(static_cast<bool>(p1), true);
199199
EXPECT_EQ(!p1, false);
200200
}
@@ -203,7 +203,7 @@ TEST(WTF_BoxPtr, Operators)
203203
{
204204
BoxPtr<BoxPtrLogger> empty;
205205
BoxPtrLogger* a = BoxPtrLogger::create("a");
206-
BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
206+
BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
207207
EXPECT_NE(empty, p1);
208208
EXPECT_EQ(empty, empty);
209209
}

0 commit comments

Comments
 (0)