Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (268992 => 268993)
--- trunk/Source/_javascript_Core/ChangeLog 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-10-26 20:08:01 UTC (rev 268993)
@@ -1,3 +1,37 @@
+2020-10-26 Alex Christensen <[email protected]>
+
+ Inclusive software: Remove instances of "dumb" from the code
+ https://bugs.webkit.org/show_bug.cgi?id=217778
+
+ Reviewed by Simon Fraser.
+
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::emitCall):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileCallEval):
+ (JSC::FTL::DFG::LowerDFGToB3::unboxBoolean):
+ * heap/SlotVisitor.h:
+ * jit/AssemblyHelpers.cpp:
+ (JSC::AssemblyHelpers::emitVirtualCall):
+ (JSC::AssemblyHelpers::emitDumbVirtualCall): Deleted.
+ * jit/AssemblyHelpers.h:
+ * jit/JITCall.cpp:
+ (JSC::JIT::compileCallEvalSlowCase):
+ * jit/JITCall32_64.cpp:
+ (JSC::JIT::compileCallEvalSlowCase):
+ * runtime/CachedTypes.cpp:
+ * runtime/JSCJSValue.h:
+ * runtime/WriteBarrier.h:
+ * runtime/WriteBarrierInlines.h:
+ (JSC::RawValueTraits<Unknown>>::set):
+ (JSC::DumbValueTraits<Unknown>>::set): Deleted.
+ * wasm/WasmAirIRGenerator.cpp:
+ (JSC::Wasm::AirIRGenerator::addCallIndirect):
+ * wasm/generateWasm.py:
+ (opcodeIterator):
+
2020-10-26 Sam Weinig <[email protected]>
JSC special function forward declarations (e.g. JSC_DECLARE_HOST_FUNCTION) that are internal to a cpp file should be declared with static to avoid external linkage
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (268992 => 268993)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -824,7 +824,7 @@
m_jit.addPtr(TrustedImm32(requiredBytes), JITCompiler::stackPointerRegister);
m_jit.load32(JITCompiler::calleeFrameSlot(CallFrameSlot::callee).withOffset(PayloadOffset), GPRInfo::regT0);
m_jit.load32(JITCompiler::calleeFrameSlot(CallFrameSlot::callee).withOffset(TagOffset), GPRInfo::regT1);
- m_jit.emitDumbVirtualCall(vm(), globalObject, info);
+ m_jit.emitVirtualCall(vm(), globalObject, info);
done.link(&m_jit);
setResultAndResetStack();
Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (268992 => 268993)
--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -816,7 +816,7 @@
// This is the part where we meant to make a normal call. Oops.
m_jit.addPtr(TrustedImm32(requiredBytes), JITCompiler::stackPointerRegister);
m_jit.load64(JITCompiler::calleeFrameSlot(CallFrameSlot::callee), GPRInfo::regT0);
- m_jit.emitDumbVirtualCall(vm(), globalObject, callLinkInfo);
+ m_jit.emitVirtualCall(vm(), globalObject, callLinkInfo);
done.link(&m_jit);
setResultAndResetStack();
Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (268992 => 268993)
--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -10610,7 +10610,7 @@
jit.addPtr(CCallHelpers::TrustedImm32(requiredBytes), CCallHelpers::stackPointerRegister);
jit.load64(CCallHelpers::calleeFrameSlot(CallFrameSlot::callee), GPRInfo::regT0);
- jit.emitDumbVirtualCall(vm, globalObject, callLinkInfo);
+ jit.emitVirtualCall(vm, globalObject, callLinkInfo);
done.link(&jit);
jit.addPtr(
@@ -17948,7 +17948,7 @@
LValue unboxBoolean(LValue jsValue)
{
// We want to use a cast that guarantees that B3 knows that even the integer
- // value is just 0 or 1. But for now we do it the dumb way.
+ // value is just 0 or 1. But for now we do it the direct way.
return m_out.notZero64(m_out.bitAnd(jsValue, m_out.constInt64(1)));
}
LValue boxBoolean(LValue value)
Modified: trunk/Source/_javascript_Core/heap/SlotVisitor.h (268992 => 268993)
--- trunk/Source/_javascript_Core/heap/SlotVisitor.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/heap/SlotVisitor.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -91,8 +91,8 @@
template<typename T, typename Traits> void append(const WriteBarrierBase<T, Traits>&);
template<typename T, typename Traits> void appendHidden(const WriteBarrierBase<T, Traits>&);
template<typename Iterator> void append(Iterator begin , Iterator end);
- void appendValues(const WriteBarrierBase<Unknown, DumbValueTraits<Unknown>>*, size_t count);
- void appendValuesHidden(const WriteBarrierBase<Unknown, DumbValueTraits<Unknown>>*, size_t count);
+ void appendValues(const WriteBarrierBase<Unknown, RawValueTraits<Unknown>>*, size_t count);
+ void appendValuesHidden(const WriteBarrierBase<Unknown, RawValueTraits<Unknown>>*, size_t count);
// These don't require you to prove that you have a WriteBarrier<>. That makes sense
// for:
Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp (268992 => 268993)
--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -642,7 +642,7 @@
#endif
}
-void AssemblyHelpers::emitDumbVirtualCall(VM& vm, JSGlobalObject* globalObject, CallLinkInfo* info)
+void AssemblyHelpers::emitVirtualCall(VM& vm, JSGlobalObject* globalObject, CallLinkInfo* info)
{
move(TrustedImmPtr(info), GPRInfo::regT2);
move(TrustedImmPtr(globalObject), GPRInfo::regT3);
Modified: trunk/Source/_javascript_Core/jit/AssemblyHelpers.h (268992 => 268993)
--- trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/jit/AssemblyHelpers.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -1938,7 +1938,7 @@
functor(TypeofType::Undefined, true);
}
- void emitDumbVirtualCall(VM&, JSGlobalObject*, CallLinkInfo*);
+ void emitVirtualCall(VM&, JSGlobalObject*, CallLinkInfo*);
void makeSpaceOnStackForCCall();
void reclaimSpaceOnStackForCCall();
Modified: trunk/Source/_javascript_Core/jit/JITCall.cpp (268992 => 268993)
--- trunk/Source/_javascript_Core/jit/JITCall.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/jit/JITCall.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -158,7 +158,7 @@
addPtr(TrustedImm32(registerOffset * sizeof(Register) + sizeof(CallerFrameAndPC)), callFrameRegister, stackPointerRegister);
load64(Address(stackPointerRegister, sizeof(Register) * CallFrameSlot::callee - sizeof(CallerFrameAndPC)), regT0);
- emitDumbVirtualCall(vm(), m_codeBlock->globalObject(), info);
+ emitVirtualCall(vm(), m_codeBlock->globalObject(), info);
addPtr(TrustedImm32(stackPointerOffsetFor(m_codeBlock) * sizeof(Register)), callFrameRegister, stackPointerRegister);
checkStackPointerAlignment();
Modified: trunk/Source/_javascript_Core/jit/JITCall32_64.cpp (268992 => 268993)
--- trunk/Source/_javascript_Core/jit/JITCall32_64.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/jit/JITCall32_64.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -260,7 +260,7 @@
addPtr(TrustedImm32(registerOffset * sizeof(Register) + sizeof(CallerFrameAndPC)), callFrameRegister, stackPointerRegister);
emitLoad(callee, regT1, regT0);
- emitDumbVirtualCall(vm(), m_codeBlock->globalObject(), info);
+ emitVirtualCall(vm(), m_codeBlock->globalObject(), info);
addPtr(TrustedImm32(stackPointerOffsetFor(m_codeBlock) * sizeof(Register)), callFrameRegister, stackPointerRegister);
checkStackPointerAlignment();
Modified: trunk/Source/_javascript_Core/runtime/CachedTypes.cpp (268992 => 268993)
--- trunk/Source/_javascript_Core/runtime/CachedTypes.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/runtime/CachedTypes.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -533,7 +533,7 @@
return OBJECT_OFFSETOF(CachedPtr<void>, m_offset);
}
-template<typename T, typename Source = SourceType<T>, typename PtrTraits = DumbPtrTraits<Source>>
+template<typename T, typename Source = SourceType<T>, typename PtrTraits = RawPtrTraits<Source>>
class CachedRefPtr : public CachedObject<RefPtr<Source, PtrTraits>> {
public:
void encode(Encoder& encoder, const Source* src)
Modified: trunk/Source/_javascript_Core/runtime/JSCJSValue.h (268992 => 268993)
--- trunk/Source/_javascript_Core/runtime/JSCJSValue.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/runtime/JSCJSValue.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -79,7 +79,7 @@
template <class T, typename Traits> class WriteBarrierBase;
template<class T>
using WriteBarrierTraitsSelect = typename std::conditional<std::is_same<T, Unknown>::value,
- DumbValueTraits<T>, DumbPtrTraits<T>
+ RawValueTraits<T>, RawPtrTraits<T>
>::type;
enum PreferredPrimitiveType : uint8_t { NoPreference, PreferNumber, PreferString };
Modified: trunk/Source/_javascript_Core/runtime/WriteBarrier.h (268992 => 268993)
--- trunk/Source/_javascript_Core/runtime/WriteBarrier.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/runtime/WriteBarrier.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -28,8 +28,8 @@
#include "GCAssertions.h"
#include "HandleTypes.h"
#include <type_traits>
-#include <wtf/DumbPtrTraits.h>
-#include <wtf/DumbValueTraits.h>
+#include <wtf/RawPtrTraits.h>
+#include <wtf/RawValueTraits.h>
namespace JSC {
@@ -43,7 +43,7 @@
template<class T>
using WriteBarrierTraitsSelect = typename std::conditional<std::is_same<T, Unknown>::value,
- DumbValueTraits<T>, DumbPtrTraits<T>
+ RawValueTraits<T>, RawPtrTraits<T>
>::type;
template<class T, typename Traits = WriteBarrierTraitsSelect<T>> class WriteBarrierBase;
@@ -124,7 +124,7 @@
void clear() { Traits::exchange(m_cell, nullptr); }
// Slot cannot be used when pointers aren't stored as-is.
- template<typename BarrierT, typename BarrierTraits, std::enable_if_t<std::is_same<BarrierTraits, DumbPtrTraits<BarrierT>>::value, void*> = nullptr>
+ template<typename BarrierT, typename BarrierTraits, std::enable_if_t<std::is_same<BarrierTraits, RawPtrTraits<BarrierT>>::value, void*> = nullptr>
struct SlotHelper {
static BarrierT** reinterpret(typename BarrierTraits::StorageType* cell) { return reinterpret_cast<T**>(cell); }
};
@@ -152,7 +152,7 @@
StorageType m_cell;
};
-template <> class WriteBarrierBase<Unknown, DumbValueTraits<Unknown>> {
+template <> class WriteBarrierBase<Unknown, RawValueTraits<Unknown>> {
public:
void set(VM&, const JSCell* owner, JSValue);
void setWithoutWriteBarrier(JSValue value)
@@ -218,7 +218,7 @@
enum UndefinedWriteBarrierTagType { UndefinedWriteBarrierTag };
template <>
-class WriteBarrier<Unknown, DumbValueTraits<Unknown>> : public WriteBarrierBase<Unknown, DumbValueTraits<Unknown>> {
+class WriteBarrier<Unknown, RawValueTraits<Unknown>> : public WriteBarrierBase<Unknown, RawValueTraits<Unknown>> {
WTF_MAKE_FAST_ALLOCATED;
public:
WriteBarrier()
Modified: trunk/Source/_javascript_Core/runtime/WriteBarrierInlines.h (268992 => 268993)
--- trunk/Source/_javascript_Core/runtime/WriteBarrierInlines.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/runtime/WriteBarrierInlines.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -54,7 +54,7 @@
vm.heap.writeBarrier(owner, static_cast<JSCell*>(value));
}
-inline void WriteBarrierBase<Unknown, DumbValueTraits<Unknown>>::set(VM& vm, const JSCell* owner, JSValue value)
+inline void WriteBarrierBase<Unknown, RawValueTraits<Unknown>>::set(VM& vm, const JSCell* owner, JSValue value)
{
ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
m_value = JSValue::encode(value);
Modified: trunk/Source/_javascript_Core/wasm/WasmAirIRGenerator.cpp (268992 => 268993)
--- trunk/Source/_javascript_Core/wasm/WasmAirIRGenerator.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/wasm/WasmAirIRGenerator.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -2240,7 +2240,7 @@
// FIXME: when we have trap handlers, we can just let the call fail because Signature::invalidIndex is 0. https://bugs.webkit.org/show_bug.cgi?id=177210
static_assert(sizeof(WasmToWasmImportableFunction::signatureIndex) == sizeof(uint64_t), "Load codegen assumes i64");
- // FIXME: This seems dumb to do two checks just for a nicer error message.
+ // FIXME: This seems wasteful to do two checks just for a nicer error message.
// We should move just to use a single branch and then figure out what
// error to use in the exception handler.
Modified: trunk/Source/_javascript_Core/wasm/generateWasm.py (268992 => 268993)
--- trunk/Source/_javascript_Core/wasm/generateWasm.py 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/_javascript_Core/wasm/generateWasm.py 2020-10-26 20:08:01 UTC (rev 268993)
@@ -68,7 +68,7 @@
// DO NO EDIT! - This file was generated by """ + scriptName
def opcodeIterator(self, filter, ret=None):
- # We need to do this because python is dumb and won't let me use self in the lambda, which is ridiculous.
+ # We need to do this because python won't let me use self in the lambda, which is ridiculous.
if ret == None:
ret = lambda op: {"name": op, "opcode": self.opcodes[op]}
for op in self.opcodes.keys():
Modified: trunk/Source/WTF/ChangeLog (268992 => 268993)
--- trunk/Source/WTF/ChangeLog 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/ChangeLog 2020-10-26 20:08:01 UTC (rev 268993)
@@ -1,3 +1,24 @@
+2020-10-26 Alex Christensen <[email protected]>
+
+ Inclusive software: Remove instances of "dumb" from the code
+ https://bugs.webkit.org/show_bug.cgi?id=217778
+
+ Reviewed by Simon Fraser.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * icu/unicode/caniter.h:
+ * wtf/Bag.h:
+ * wtf/CMakeLists.txt:
+ * wtf/CagedPtr.h:
+ * wtf/Forward.h:
+ * wtf/NakedRef.h:
+ * wtf/RawPtrTraits.h: Renamed from Source/WTF/wtf/DumbPtrTraits.h.
+ * wtf/RawValueTraits.h: Renamed from Source/WTF/wtf/DumbValueTraits.h.
+ * wtf/Ref.h:
+ * wtf/RefCountedArray.h:
+ * wtf/RefPtr.h:
+ * wtf/SentinelLinkedList.h:
+
2020-10-26 Youenn Fablet <[email protected]>
Use a WeakHashSet for Document::m_captionPreferencesChangedElements
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (268992 => 268993)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2020-10-26 20:08:01 UTC (rev 268993)
@@ -676,7 +676,7 @@
A8A47372151A825B004123FF /* VMTags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMTags.h; sourceTree = "<group>"; };
A8A4748B151A8264004123FF /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
A9A4727F151A825A004123FF /* DisallowCType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisallowCType.h; sourceTree = "<group>"; };
- AD653DA82006B6C200D820D7 /* DumbValueTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumbValueTraits.h; sourceTree = "<group>"; };
+ AD653DA82006B6C200D820D7 /* RawValueTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RawValueTraits.h; sourceTree = "<group>"; };
AD7C434A1DD2A4A70026888B /* Expected.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Expected.h; sourceTree = "<group>"; };
AD89B6B51E6415080090707F /* MemoryPressureHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryPressureHandler.cpp; sourceTree = "<group>"; };
AD89B6B61E6415080090707F /* MemoryPressureHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryPressureHandler.h; sourceTree = "<group>"; };
@@ -752,7 +752,7 @@
F72BBDB107FA424886178B9E /* SymbolImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SymbolImpl.cpp; sourceTree = "<group>"; };
FE032AD02463E43B0012D7C7 /* WTFConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WTFConfig.cpp; sourceTree = "<group>"; };
FE032AD12463E43B0012D7C7 /* WTFConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WTFConfig.h; sourceTree = "<group>"; };
- FE05FAE61FDB214300093230 /* DumbPtrTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumbPtrTraits.h; sourceTree = "<group>"; };
+ FE05FAE61FDB214300093230 /* RawPtrTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RawPtrTraits.h; sourceTree = "<group>"; };
FE05FAFE1FE5007500093230 /* WTFAssertions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WTFAssertions.cpp; sourceTree = "<group>"; };
FE1D6D87237401CD007A5C26 /* StackCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StackCheck.h; sourceTree = "<group>"; };
FE1E2C392240C05400F6B729 /* PtrTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PtrTag.cpp; sourceTree = "<group>"; };
@@ -1019,8 +1019,6 @@
A8A47280151A825A004123FF /* DoublyLinkedList.h */,
A8A47297151A825A004123FF /* dtoa.cpp */,
A8A47298151A825A004123FF /* dtoa.h */,
- FE05FAE61FDB214300093230 /* DumbPtrTraits.h */,
- AD653DA82006B6C200D820D7 /* DumbValueTraits.h */,
5338EBA423AB04D100382662 /* EnumClassOperatorOverloads.h */,
1AEA88E11D6BBCF400E5AD64 /* EnumTraits.h */,
AD7C434A1DD2A4A70026888B /* Expected.h */,
@@ -1194,6 +1192,8 @@
0F2AC5601E89F70C0001EE3F /* Range.h */,
0F725CAB1C50461600AD943A /* RangeSet.h */,
0F87105916643F190090B0AD /* RawPointer.h */,
+ FE05FAE61FDB214300093230 /* RawPtrTraits.h */,
+ AD653DA82006B6C200D820D7 /* RawValueTraits.h */,
0FEC3C5C1F368A9700F59B6C /* ReadWriteLock.cpp */,
0FEC3C5D1F368A9700F59B6C /* ReadWriteLock.h */,
E33D5F871FBED66700BF625E /* RecursableLambda.h */,
Modified: trunk/Source/WTF/icu/unicode/caniter.h (268992 => 268993)
--- trunk/Source/WTF/icu/unicode/caniter.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/icu/unicode/caniter.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -120,7 +120,7 @@
#ifndef U_HIDE_INTERNAL_API
/**
- * Dumb recursive implementation of permutation.
+ * Unoptimized recursive implementation of permutation.
* TODO: optimize
* @param source the string to find permutations for
* @param skipZeros determine if skip zeros
Modified: trunk/Source/WTF/wtf/Bag.h (268992 => 268993)
--- trunk/Source/WTF/wtf/Bag.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/Bag.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -25,15 +25,15 @@
#pragma once
-#include <wtf/DumbPtrTraits.h>
#include <wtf/FastMalloc.h>
#include <wtf/Noncopyable.h>
#include <wtf/Packed.h>
+#include <wtf/RawPtrTraits.h>
namespace WTF {
DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(BagNode);
-template<typename T, typename PassedPtrTraits = DumbPtrTraits<T>>
+template<typename T, typename PassedPtrTraits = RawPtrTraits<T>>
class BagNode {
WTF_MAKE_FAST_ALLOCATED_WITH_HEAP_IDENTIFIER(BagNode);
public:
@@ -48,7 +48,7 @@
typename PtrTraits::StorageType m_next { nullptr };
};
-template<typename T, typename PassedPtrTraits = DumbPtrTraits<T>>
+template<typename T, typename PassedPtrTraits = RawPtrTraits<T>>
class Bag final {
WTF_MAKE_NONCOPYABLE(Bag);
WTF_MAKE_FAST_ALLOCATED;
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (268992 => 268993)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2020-10-26 20:08:01 UTC (rev 268993)
@@ -58,8 +58,6 @@
DisallowCType.h
Dominators.h
DoublyLinkedList.h
- DumbPtrTraits.h
- DumbValueTraits.h
EnumClassOperatorOverloads.h
EnumTraits.h
Expected.h
@@ -202,6 +200,8 @@
Range.h
RangeSet.h
RawPointer.h
+ RawPtrTraits.h
+ RawValueTraits.h
ReadWriteLock.h
RecursableLambda.h
RecursiveLockAdapter.h
Modified: trunk/Source/WTF/wtf/CagedPtr.h (268992 => 268993)
--- trunk/Source/WTF/wtf/CagedPtr.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/CagedPtr.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -25,9 +25,9 @@
#pragma once
-#include <wtf/DumbPtrTraits.h>
#include <wtf/Gigacage.h>
#include <wtf/PtrTag.h>
+#include <wtf/RawPtrTraits.h>
#include <climits>
@@ -35,7 +35,7 @@
constexpr bool tagCagedPtr = true;
-template<Gigacage::Kind passedKind, typename T, bool shouldTag = false, typename PtrTraits = DumbPtrTraits<T>>
+template<Gigacage::Kind passedKind, typename T, bool shouldTag = false, typename PtrTraits = RawPtrTraits<T>>
class CagedPtr {
public:
static constexpr Gigacage::Kind kind = passedKind;
Deleted: trunk/Source/WTF/wtf/DumbPtrTraits.h (268992 => 268993)
--- trunk/Source/WTF/wtf/DumbPtrTraits.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/DumbPtrTraits.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <utility>
-
-namespace WTF {
-
-template<typename T>
-struct DumbPtrTraits {
- template<typename U> using RebindTraits = DumbPtrTraits<U>;
-
- using StorageType = T*;
-
- template<typename U>
- static ALWAYS_INLINE T* exchange(StorageType& ptr, U&& newValue) { return std::exchange(ptr, newValue); }
-
- static ALWAYS_INLINE void swap(StorageType& a, StorageType& b) { std::swap(a, b); }
- static ALWAYS_INLINE T* unwrap(const StorageType& ptr) { return ptr; }
-
- static StorageType hashTableDeletedValue() { return bitwise_cast<StorageType>(static_cast<uintptr_t>(-1)); }
- static ALWAYS_INLINE bool isHashTableDeletedValue(const StorageType& ptr) { return ptr == hashTableDeletedValue(); }
-};
-
-} // namespace WTF
-
-using WTF::DumbPtrTraits;
Deleted: trunk/Source/WTF/wtf/DumbValueTraits.h (268992 => 268993)
--- trunk/Source/WTF/wtf/DumbValueTraits.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/DumbValueTraits.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <cstdint>
-#include <utility>
-
-namespace WTF {
-
-template<typename T>
-struct DumbValueTraits {
- template<typename U> using RebindTraits = DumbValueTraits<U>;
-
- using StorageType = T;
-
- template<typename U>
- static ALWAYS_INLINE T exchange(StorageType& val, U&& newValue) { return std::exchange(val, newValue); }
-
- static ALWAYS_INLINE void swap(StorageType& a, StorageType& b) { std::swap(a, b); }
- static ALWAYS_INLINE T unwrap(const StorageType& val) { return val; }
-};
-
-} // namespace WTF
-
-using WTF::DumbValueTraits;
Modified: trunk/Source/WTF/wtf/Forward.h (268992 => 268993)
--- trunk/Source/WTF/wtf/Forward.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/Forward.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -58,7 +58,6 @@
using VectorMalloc = FastMalloc;
#endif
-template<typename> struct DumbPtrTraits;
template<typename> struct DefaultRefDerefTraits;
template<typename> class CompletionHandler;
@@ -69,8 +68,9 @@
template<typename> class Optional;
template<typename> class Packed;
template<typename T, size_t = alignof(T)> class PackedAlignedPtr;
-template<typename T, typename = DumbPtrTraits<T>> class Ref;
-template<typename T, typename = DumbPtrTraits<T>, typename = DefaultRefDerefTraits<T>> class RefPtr;
+template<typename> struct RawPtrTraits;
+template<typename T, typename = RawPtrTraits<T>> class Ref;
+template<typename T, typename = RawPtrTraits<T>, typename = DefaultRefDerefTraits<T>> class RefPtr;
template<typename> class StringBuffer;
template<typename> class StringParsingBuffer;
template<typename, typename = void> class StringTypeAdapter;
@@ -87,7 +87,7 @@
template<> struct DefaultHash<URL>;
template<typename T, size_t inlineCapacity> struct DefaultHash<Vector<T, inlineCapacity>>;
-template<typename> struct DumbValueTraits;
+template<typename> struct RawValueTraits;
template<typename> struct EnumTraits;
template<typename E, E...> struct EnumValues;
template<typename> struct HashTraits;
@@ -110,8 +110,6 @@
using WTF::BinarySemaphore;
using WTF::CString;
using WTF::CompletionHandler;
-using WTF::DumbPtrTraits;
-using WTF::DumbValueTraits;
using WTF::Function;
using WTF::FunctionDispatcher;
using WTF::HashCountedSet;
@@ -124,6 +122,8 @@
using WTF::Optional;
using WTF::OrdinalNumber;
using WTF::PrintStream;
+using WTF::RawPtrTraits;
+using WTF::RawValueTraits;
using WTF::Ref;
using WTF::RefPtr;
using WTF::SHA1;
Modified: trunk/Source/WTF/wtf/NakedRef.h (268992 => 268993)
--- trunk/Source/WTF/wtf/NakedRef.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/NakedRef.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -25,8 +25,8 @@
#pragma once
-#include <wtf/DumbPtrTraits.h>
#include <wtf/FastMalloc.h>
+#include <wtf/RawPtrTraits.h>
namespace WTF {
@@ -75,7 +75,7 @@
T& leakRef() WARN_UNUSED_RETURN
{
ASSERT(m_ptr);
- T& result = *DumbPtrTraits<T>::exchange(m_ptr, nullptr);
+ T& result = *RawPtrTraits<T>::exchange(m_ptr, nullptr);
return result;
}
Added: trunk/Source/WTF/wtf/RawPtrTraits.h (0 => 268993)
--- trunk/Source/WTF/wtf/RawPtrTraits.h (rev 0)
+++ trunk/Source/WTF/wtf/RawPtrTraits.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017-2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <utility>
+
+namespace WTF {
+
+template<typename T>
+struct RawPtrTraits {
+ template<typename U> using RebindTraits = RawPtrTraits<U>;
+
+ using StorageType = T*;
+
+ template<typename U>
+ static ALWAYS_INLINE T* exchange(StorageType& ptr, U&& newValue) { return std::exchange(ptr, newValue); }
+
+ static ALWAYS_INLINE void swap(StorageType& a, StorageType& b) { std::swap(a, b); }
+ static ALWAYS_INLINE T* unwrap(const StorageType& ptr) { return ptr; }
+
+ static StorageType hashTableDeletedValue() { return bitwise_cast<StorageType>(static_cast<uintptr_t>(-1)); }
+ static ALWAYS_INLINE bool isHashTableDeletedValue(const StorageType& ptr) { return ptr == hashTableDeletedValue(); }
+};
+
+} // namespace WTF
+
+using WTF::RawPtrTraits;
Added: trunk/Source/WTF/wtf/RawValueTraits.h (0 => 268993)
--- trunk/Source/WTF/wtf/RawValueTraits.h (rev 0)
+++ trunk/Source/WTF/wtf/RawValueTraits.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2018 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <utility>
+
+namespace WTF {
+
+template<typename T>
+struct RawValueTraits {
+ template<typename U> using RebindTraits = RawValueTraits<U>;
+
+ using StorageType = T;
+
+ template<typename U>
+ static ALWAYS_INLINE T exchange(StorageType& val, U&& newValue) { return std::exchange(val, newValue); }
+
+ static ALWAYS_INLINE void swap(StorageType& a, StorageType& b) { std::swap(a, b); }
+ static ALWAYS_INLINE T unwrap(const StorageType& val) { return val; }
+};
+
+} // namespace WTF
+
+using WTF::RawValueTraits;
Modified: trunk/Source/WTF/wtf/Ref.h (268992 => 268993)
--- trunk/Source/WTF/wtf/Ref.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/Ref.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -26,9 +26,9 @@
#pragma once
#include <wtf/Assertions.h>
-#include <wtf/DumbPtrTraits.h>
#include <wtf/Forward.h>
#include <wtf/GetPtr.h>
+#include <wtf/RawPtrTraits.h>
#include <wtf/StdLibExtras.h>
#include <wtf/TypeCasts.h>
@@ -43,7 +43,7 @@
inline void adopted(const void*) { }
template<typename T, typename PtrTraits> class Ref;
-template<typename T, typename PtrTraits = DumbPtrTraits<T>> Ref<T, PtrTraits> adoptRef(T&);
+template<typename T, typename PtrTraits = RawPtrTraits<T>> Ref<T, PtrTraits> adoptRef(T&);
template<typename T, typename Traits>
class Ref {
@@ -216,7 +216,7 @@
U::swap(m_ptr, other.m_ptr);
}
-template<typename T, typename U, typename X, typename Y, typename = std::enable_if_t<!std::is_same<U, DumbPtrTraits<T>>::value || !std::is_same<Y, DumbPtrTraits<X>>::value>>
+template<typename T, typename U, typename X, typename Y, typename = std::enable_if_t<!std::is_same<U, RawPtrTraits<T>>::value || !std::is_same<Y, RawPtrTraits<X>>::value>>
inline void swap(Ref<T, U>& a, Ref<X, Y>& b)
{
a.swap(b);
@@ -235,19 +235,19 @@
return oldReference;
}
-template<typename T, typename U = DumbPtrTraits<T>, typename X, typename Y>
+template<typename T, typename U = RawPtrTraits<T>, typename X, typename Y>
inline Ref<T, U> static_reference_cast(Ref<X, Y>& reference)
{
return Ref<T, U>(static_cast<T&>(reference.get()));
}
-template<typename T, typename U = DumbPtrTraits<T>, typename X, typename Y>
+template<typename T, typename U = RawPtrTraits<T>, typename X, typename Y>
inline Ref<T, U> static_reference_cast(Ref<X, Y>&& reference)
{
return adoptRef(static_cast<T&>(reference.leakRef()));
}
-template<typename T, typename U = DumbPtrTraits<T>, typename X, typename Y>
+template<typename T, typename U = RawPtrTraits<T>, typename X, typename Y>
inline Ref<T, U> static_reference_cast(const Ref<X, Y>& reference)
{
return Ref<T, U>(static_cast<T&>(reference.copyRef().get()));
Modified: trunk/Source/WTF/wtf/RefCountedArray.h (268992 => 268993)
--- trunk/Source/WTF/wtf/RefCountedArray.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/RefCountedArray.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -25,8 +25,8 @@
#pragma once
-#include <wtf/DumbPtrTraits.h>
#include <wtf/FastMalloc.h>
+#include <wtf/RawPtrTraits.h>
#include <wtf/StdLibExtras.h>
#include <wtf/Vector.h>
@@ -45,7 +45,7 @@
DECLARE_ALLOCATOR_WITH_HEAP_IDENTIFIER(RefCountedArray);
-template<typename T, typename PtrTraits = DumbPtrTraits<T>>
+template<typename T, typename PtrTraits = RawPtrTraits<T>>
class RefCountedArray {
enum CommonCopyConstructorTag { CommonCopyConstructor };
Modified: trunk/Source/WTF/wtf/RefPtr.h (268992 => 268993)
--- trunk/Source/WTF/wtf/RefPtr.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/RefPtr.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -44,7 +44,7 @@
};
template<typename T, typename PtrTraits, typename RefDerefTraits> class RefPtr;
-template<typename T, typename PtrTraits = DumbPtrTraits<T>, typename RefDerefTraits = DefaultRefDerefTraits<T>> RefPtr<T, PtrTraits, RefDerefTraits> adoptRef(T*);
+template<typename T, typename PtrTraits = RawPtrTraits<T>, typename RefDerefTraits = DefaultRefDerefTraits<T>> RefPtr<T, PtrTraits, RefDerefTraits> adoptRef(T*);
template<typename T, typename _PtrTraits, typename _RefDerefTraits>
class RefPtr {
@@ -193,7 +193,7 @@
U::swap(m_ptr, o.m_ptr);
}
-template<typename T, typename U, typename V, typename X, typename Y, typename Z, typename = std::enable_if_t<!std::is_same<U, DumbPtrTraits<T>>::value || !std::is_same<Y, DumbPtrTraits<X>>::value>>
+template<typename T, typename U, typename V, typename X, typename Y, typename Z, typename = std::enable_if_t<!std::is_same<U, RawPtrTraits<T>>::value || !std::is_same<Y, RawPtrTraits<X>>::value>>
inline void swap(RefPtr<T, U, V>& a, RefPtr<X, Y, Z>& b)
{
a.swap(b);
@@ -235,7 +235,7 @@
return a != b.get();
}
-template<typename T, typename U = DumbPtrTraits<T>, typename V = DefaultRefDerefTraits<T>, typename X, typename Y, typename Z>
+template<typename T, typename U = RawPtrTraits<T>, typename V = DefaultRefDerefTraits<T>, typename X, typename Y, typename Z>
inline RefPtr<T, U, V> static_pointer_cast(const RefPtr<X, Y, Z>& p)
{
return RefPtr<T, U, V>(static_cast<T*>(p.get()));
Modified: trunk/Source/WTF/wtf/SentinelLinkedList.h (268992 => 268993)
--- trunk/Source/WTF/wtf/SentinelLinkedList.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WTF/wtf/SentinelLinkedList.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -42,7 +42,7 @@
enum SentinelTag { Sentinel };
-template<typename T, typename PassedPtrTraits = DumbPtrTraits<T>>
+template<typename T, typename PassedPtrTraits = RawPtrTraits<T>>
class BasicRawSentinelNode {
WTF_MAKE_FAST_ALLOCATED;
public:
Modified: trunk/Source/WebCore/ChangeLog (268992 => 268993)
--- trunk/Source/WebCore/ChangeLog 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WebCore/ChangeLog 2020-10-26 20:08:01 UTC (rev 268993)
@@ -1,3 +1,17 @@
+2020-10-26 Alex Christensen <[email protected]>
+
+ Inclusive software: Remove instances of "dumb" from the code
+ https://bugs.webkit.org/show_bug.cgi?id=217778
+
+ Reviewed by Simon Fraser.
+
+ * Modules/webaudio/AudioNode.h:
+ * dom/GCReachableRef.h:
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleDrag):
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::InlineFlowBox::addToLine):
+
2020-10-26 Fujii Hironori <[email protected]>
[TextureMapper] min(genIType) isn't supported for GLSL ES < 3.0
Modified: trunk/Source/WebCore/Modules/webaudio/AudioNode.h (268992 => 268993)
--- trunk/Source/WebCore/Modules/webaudio/AudioNode.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WebCore/Modules/webaudio/AudioNode.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -282,7 +282,7 @@
};
template<typename T>
-using AudioConnectionRefPtr = RefPtr<T, DumbPtrTraits<T>, AudioNodeConnectionRefDerefTraits<T>>;
+using AudioConnectionRefPtr = RefPtr<T, RawPtrTraits<T>, AudioNodeConnectionRefDerefTraits<T>>;
String convertEnumerationToString(AudioNode::NodeType);
Modified: trunk/Source/WebCore/dom/GCReachableRef.h (268992 => 268993)
--- trunk/Source/WebCore/dom/GCReachableRef.h 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WebCore/dom/GCReachableRef.h 2020-10-26 20:08:01 UTC (rev 268993)
@@ -25,8 +25,8 @@
#pragma once
-#include <wtf/DumbPtrTraits.h>
#include <wtf/HashCountedSet.h>
+#include <wtf/RawPtrTraits.h>
#include <wtf/RefPtr.h>
namespace WebCore {
Modified: trunk/Source/WebCore/page/EventHandler.cpp (268992 => 268993)
--- trunk/Source/WebCore/page/EventHandler.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -3911,7 +3911,7 @@
sourceOperationMask = dragState().dataTransfer->sourceOperationMask();
// Yuck, a draggedImage:moveTo: message can be fired as a result of kicking off the
- // drag with dragImage! Because of that dumb reentrancy, we may think we've not
+ // drag with dragImage! Because of that reentrancy, we may think we've not
// started the drag when that happens. So we have to assume it's started before we kick it off.
dragState().dataTransfer->setDragHasStarted();
}
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (268992 => 268993)
--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2020-10-26 19:57:35 UTC (rev 268992)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2020-10-26 20:08:01 UTC (rev 268993)
@@ -135,7 +135,7 @@
shouldClearDescendantsHaveSameLineHeightAndBaseline = true;
} else {
if (child->renderer().isLineBreak()) {
- // FIXME: This is dumb. We only turn off because current layout test results expect the <br> to be 0-height on the baseline.
+ // FIXME: This isn't ideal. We only turn off because current layout test results expect the <br> to be 0-height on the baseline.
// Other than making a zillion tests have to regenerate results, there's no reason to ditch the optimization here.
shouldClearDescendantsHaveSameLineHeightAndBaseline = child->renderer().isBR();
} else {
