Modified: trunk/Source/WTF/wtf/BoxPtr.h (264498 => 264499)
--- trunk/Source/WTF/wtf/BoxPtr.h 2020-07-17 04:41:57 UTC (rev 264498)
+++ trunk/Source/WTF/wtf/BoxPtr.h 2020-07-17 05:18:58 UTC (rev 264499)
@@ -46,7 +46,7 @@
template<typename T> using BoxPtr = Box<std::unique_ptr<T, BoxPtrDeleter<T>>>;
-template<typename T> BoxPtr<T> createBoxPtr(T* ptr)
+template<typename T> BoxPtr<T> adoptInBoxPtr(T* ptr)
{
return BoxPtr<T>::create(ptr);
}
@@ -75,5 +75,5 @@
} // namespace WTF
-using WTF::createBoxPtr;
+using WTF::adoptInBoxPtr;
using WTF::BoxPtr;
Modified: trunk/Source/WebCore/ChangeLog (264498 => 264499)
--- trunk/Source/WebCore/ChangeLog 2020-07-17 04:41:57 UTC (rev 264498)
+++ trunk/Source/WebCore/ChangeLog 2020-07-17 05:18:58 UTC (rev 264499)
@@ -1,3 +1,16 @@
+2020-07-16 Xabier Rodriguez Calvar <[email protected]>
+
+ Rename createBoxPtr into adoptBoxPtr
+ https://bugs.webkit.org/show_bug.cgi?id=214171
+
+ Reviewed by Darin Adler.
+
+ No new tests, just a rename.
+
+ * platform/graphics/gstreamer/eme/CDMProxyThunder.cpp:
+ (WebCore::CDMProxyThunder::getDecryptionSession const): Used the
+ renamed function.
+
2020-07-16 Fujii Hironori <[email protected]>
[WTF] Remove the unnecessary inner class DefaultHash<T>::Hash
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMProxyThunder.cpp (264498 => 264499)
--- trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMProxyThunder.cpp 2020-07-17 04:41:57 UTC (rev 264498)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/eme/CDMProxyThunder.cpp 2020-07-17 05:18:58 UTC (rev 264499)
@@ -64,7 +64,7 @@
BoxPtr<OpenCDMSession> keyValue = WTF::get<BoxPtr<OpenCDMSession>>(keyData);
if (!keyValue) {
- keyValue = createBoxPtr(opencdm_get_system_session(&static_cast<const CDMInstanceThunder*>(instance())->thunderSystem(), keyID.data(),
+ keyValue = adoptInBoxPtr(opencdm_get_system_session(&static_cast<const CDMInstanceThunder*>(instance())->thunderSystem(), keyID.data(),
keyID.size(), s_licenseKeyResponseTimeout.millisecondsAs<uint32_t>()));
ASSERT(keyValue);
// takeValueIfDifferent takes and r-value ref of
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/BoxPtr.cpp (264498 => 264499)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/BoxPtr.cpp 2020-07-17 04:41:57 UTC (rev 264498)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/BoxPtr.cpp 2020-07-17 05:18:58 UTC (rev 264499)
@@ -70,7 +70,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> ptr = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> ptr = adoptInBoxPtr(a);
EXPECT_EQ(true, static_cast<bool>(ptr));
EXPECT_EQ(a, ptr->get());
EXPECT_EQ(a->name, (*ptr)->name);
@@ -79,7 +79,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
BoxPtr<BoxPtrLogger> p2(p1);
EXPECT_EQ(a, p1->get());
EXPECT_EQ(a, p2->get());
@@ -88,7 +88,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
BoxPtr<BoxPtrLogger> p2 = p1;
EXPECT_EQ(a, p1->get());
EXPECT_EQ(a, p2->get());
@@ -97,7 +97,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
BoxPtr<BoxPtrLogger> p2 = WTFMove(p1);
EXPECT_EQ(false, static_cast<bool>(p1));
EXPECT_EQ(a, p2->get());
@@ -106,7 +106,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
BoxPtr<BoxPtrLogger> p2(WTFMove(p1));
EXPECT_EQ(false, static_cast<bool>(p1));
EXPECT_EQ(a, p2->get());
@@ -115,7 +115,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> ptr = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> ptr = adoptInBoxPtr(a);
EXPECT_EQ(a, ptr->get());
ptr = nullptr;
EXPECT_EQ(false, static_cast<bool>(ptr));
@@ -128,8 +128,8 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
BoxPtrLogger* b = BoxPtrLogger::create("b");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
- BoxPtr<BoxPtrLogger> p2 = createBoxPtr(b);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p2 = adoptInBoxPtr(b);
EXPECT_EQ(a, p1->get());
EXPECT_EQ(b, p2->get());
log() << "| ";
@@ -143,8 +143,8 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
BoxPtrLogger* b = BoxPtrLogger::create("b");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
- BoxPtr<BoxPtrLogger> p2 = createBoxPtr(b);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p2 = adoptInBoxPtr(b);
EXPECT_EQ(a, p1->get());
EXPECT_EQ(b, p2->get());
log() << "| ";
@@ -157,7 +157,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> ptr = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> ptr = adoptInBoxPtr(a);
EXPECT_EQ(a, ptr->get());
log() << "| ";
IGNORE_CLANG_WARNINGS_BEGIN("self-assign-overloaded")
@@ -170,7 +170,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> ptr = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> ptr = adoptInBoxPtr(a);
EXPECT_EQ(a, ptr->get());
IGNORE_CLANG_WARNINGS_BEGIN("self-move")
ptr = WTFMove(ptr);
@@ -185,8 +185,8 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
BoxPtrLogger* b = BoxPtrLogger::create("b");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
- BoxPtr<BoxPtrLogger> p2 = createBoxPtr(b);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p2 = adoptInBoxPtr(b);
EXPECT_EQ(p1, p1);
EXPECT_NE(p1, p2);
}
@@ -194,7 +194,7 @@
{
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
EXPECT_EQ(static_cast<bool>(p1), true);
EXPECT_EQ(!p1, false);
}
@@ -203,7 +203,7 @@
{
BoxPtr<BoxPtrLogger> empty;
BoxPtrLogger* a = BoxPtrLogger::create("a");
- BoxPtr<BoxPtrLogger> p1 = createBoxPtr(a);
+ BoxPtr<BoxPtrLogger> p1 = adoptInBoxPtr(a);
EXPECT_NE(empty, p1);
EXPECT_EQ(empty, empty);
}
