haikuwebkit/Source/WTF/wtf/PointerComparison.h

38 lines
1.5 KiB
C
Raw Permalink Normal View History

Add helper funtion for checking pointer equivalency and use it https://bugs.webkit.org/show_bug.cgi?id=150022 Reviewed by Darin Adler. Source/WebCore: A common pattern in WebCore code is to check for equivalency of two pointers, either both null, or both non-null and with equal values. This was written in several different ways in different places. Add arePointingToEqualData() to standardize this pattern. This obviates the need for StyleImage::imagesEquivalent(), counterDataEquivalent() etc. Also change some comparisons of DataRef<> which checked the pointer and then the values to use DataRef<>::operator== which does the same thing. Comparisons of m_grid and m_gridItem only checked pointer equality, so this is probably a bug fix there. * page/animation/CSSPropertyAnimation.cpp: if ((!a && !b) || a == b) is redundant so fix, and add checks for a and b RenderStyle* first. (WebCore::PropertyWrapperGetter::equals): (WebCore::StyleImagePropertyWrapper::equals): (WebCore::PropertyWrapperShadow::equals): (WebCore::PropertyWrapperMaybeInvalidColor::equals): (WebCore::FillLayerPropertyWrapperGetter::equals): (WebCore::FillLayerStyleImagePropertyWrapper::equals): (WebCore::FillLayersPropertyWrapper::equals): (WebCore::ShorthandPropertyWrapper::equals): (WebCore::PropertyWrapperFlex::equals): (WebCore::PropertyWrapperSVGPaint::equals): * platform/network/ResourceRequestBase.cpp: (WebCore::equalIgnoringHeaderFields): * rendering/style/FillLayer.cpp: (WebCore::FillLayer::operator==): * rendering/style/NinePieceImage.cpp: (WebCore::NinePieceImageData::operator==): * rendering/style/RenderStyle.cpp: Some nullptr cleanup. (WebCore::RenderStyle::getCachedPseudoStyle): (WebCore::RenderStyle::addCachedPseudoStyle): (WebCore::RenderStyle::changeAffectsVisualOverflow): (WebCore::RenderStyle::changeRequiresLayout): (WebCore::RenderStyle::changeRequiresLayerRepaint): (WebCore::RenderStyle::setWillChange): * rendering/style/SVGRenderStyleDefs.cpp: (WebCore::StyleShadowSVGData::operator==): * rendering/style/ShadowData.cpp: (WebCore::ShadowData::operator==): * rendering/style/StyleImage.h: (WebCore::StyleImage::imagesEquivalent): Deleted. * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::operator==): (WebCore::cursorDataEquivalent): Deleted. (WebCore::quotesDataEquivalent): Deleted. (WebCore::StyleRareInheritedData::shadowDataEquivalent): Deleted. * rendering/style/StyleRareInheritedData.h: * rendering/style/StyleRareNonInheritedData.cpp: (WebCore::StyleRareNonInheritedData::operator==): (WebCore::StyleRareNonInheritedData::counterDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::shadowDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::willChangeDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::reflectionDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::animationDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::transitionDataEquivalent): Deleted. * rendering/style/StyleRareNonInheritedData.h: Source/WTF: Add PointerComparison.h which contains the templated pointer comparison function. * WTF.xcodeproj/project.pbxproj: * wtf/PointerComparison.h: Added. (WTF::arePointingToEqualData): Canonical link: https://commits.webkit.org/168245@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191017 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2015-10-14 00:14:29 +00:00
/*
* Copyright (C) 2015 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. AND ITS CONTRIBUTORS ``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 ITS 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.
*/
Use pragma once in WTF https://bugs.webkit.org/show_bug.cgi?id=190527 Reviewed by Chris Dumez. Source/WTF: We also need to consistently include wtf headers from within wtf so we can build wtf without symbol redefinition errors from including the copy in Source and the copy in the build directory. * wtf/ASCIICType.h: * wtf/Assertions.cpp: * wtf/Assertions.h: * wtf/Atomics.h: * wtf/AutomaticThread.cpp: * wtf/AutomaticThread.h: * wtf/BackwardsGraph.h: * wtf/Bag.h: * wtf/BagToHashMap.h: * wtf/BitVector.cpp: * wtf/BitVector.h: * wtf/Bitmap.h: * wtf/BloomFilter.h: * wtf/Box.h: * wtf/BubbleSort.h: * wtf/BumpPointerAllocator.h: * wtf/ByteOrder.h: * wtf/CPUTime.cpp: * wtf/CallbackAggregator.h: * wtf/CheckedArithmetic.h: * wtf/CheckedBoolean.h: * wtf/ClockType.cpp: * wtf/ClockType.h: * wtf/CommaPrinter.h: * wtf/CompilationThread.cpp: * wtf/CompilationThread.h: * wtf/Compiler.h: * wtf/ConcurrentPtrHashSet.cpp: * wtf/ConcurrentVector.h: * wtf/Condition.h: * wtf/CountingLock.cpp: * wtf/CrossThreadTaskHandler.cpp: * wtf/CryptographicUtilities.cpp: * wtf/CryptographicUtilities.h: * wtf/CryptographicallyRandomNumber.cpp: * wtf/CryptographicallyRandomNumber.h: * wtf/CurrentTime.cpp: * wtf/DataLog.cpp: * wtf/DataLog.h: * wtf/DateMath.cpp: * wtf/DateMath.h: * wtf/DecimalNumber.cpp: * wtf/DecimalNumber.h: * wtf/Deque.h: * wtf/DisallowCType.h: * wtf/Dominators.h: * wtf/DoublyLinkedList.h: * wtf/FastBitVector.cpp: * wtf/FastMalloc.cpp: * wtf/FastMalloc.h: * wtf/FeatureDefines.h: * wtf/FilePrintStream.cpp: * wtf/FilePrintStream.h: * wtf/FlipBytes.h: * wtf/FunctionDispatcher.cpp: * wtf/FunctionDispatcher.h: * wtf/GetPtr.h: * wtf/Gigacage.cpp: * wtf/GlobalVersion.cpp: * wtf/GraphNodeWorklist.h: * wtf/GregorianDateTime.cpp: * wtf/GregorianDateTime.h: * wtf/HashFunctions.h: * wtf/HashMap.h: * wtf/HashMethod.h: * wtf/HashSet.h: * wtf/HashTable.cpp: * wtf/HashTraits.h: * wtf/Indenter.h: * wtf/IndexSparseSet.h: * wtf/InlineASM.h: * wtf/Insertion.h: * wtf/IteratorAdaptors.h: * wtf/IteratorRange.h: * wtf/JSONValues.cpp: * wtf/JSValueMalloc.cpp: * wtf/LEBDecoder.h: * wtf/Language.cpp: * wtf/ListDump.h: * wtf/Lock.cpp: * wtf/Lock.h: * wtf/LockAlgorithm.h: * wtf/LockedPrintStream.cpp: * wtf/Locker.h: * wtf/MD5.cpp: * wtf/MD5.h: * wtf/MainThread.cpp: * wtf/MainThread.h: * wtf/MallocPtr.h: * wtf/MathExtras.h: * wtf/MediaTime.cpp: * wtf/MediaTime.h: * wtf/MemoryPressureHandler.cpp: * wtf/MessageQueue.h: * wtf/MetaAllocator.cpp: * wtf/MetaAllocator.h: * wtf/MetaAllocatorHandle.h: * wtf/MonotonicTime.cpp: * wtf/MonotonicTime.h: * wtf/NakedPtr.h: * wtf/NoLock.h: * wtf/NoTailCalls.h: * wtf/Noncopyable.h: * wtf/NumberOfCores.cpp: * wtf/NumberOfCores.h: * wtf/OSAllocator.h: * wtf/OSAllocatorPosix.cpp: * wtf/OSRandomSource.cpp: * wtf/OSRandomSource.h: * wtf/ObjcRuntimeExtras.h: * wtf/OrderMaker.h: * wtf/PackedIntVector.h: * wtf/PageAllocation.h: * wtf/PageBlock.cpp: * wtf/PageBlock.h: * wtf/PageReservation.h: * wtf/ParallelHelperPool.cpp: * wtf/ParallelHelperPool.h: * wtf/ParallelJobs.h: * wtf/ParallelJobsLibdispatch.h: * wtf/ParallelVectorIterator.h: * wtf/ParkingLot.cpp: * wtf/ParkingLot.h: * wtf/Platform.h: * wtf/PointerComparison.h: * wtf/Poisoned.cpp: * wtf/PrintStream.cpp: * wtf/PrintStream.h: * wtf/ProcessID.h: * wtf/ProcessPrivilege.cpp: * wtf/RAMSize.cpp: * wtf/RAMSize.h: * wtf/RandomDevice.cpp: * wtf/RandomNumber.cpp: * wtf/RandomNumber.h: * wtf/RandomNumberSeed.h: * wtf/RangeSet.h: * wtf/RawPointer.h: * wtf/ReadWriteLock.cpp: * wtf/RedBlackTree.h: * wtf/Ref.h: * wtf/RefCountedArray.h: * wtf/RefCountedLeakCounter.cpp: * wtf/RefCountedLeakCounter.h: * wtf/RefCounter.h: * wtf/RefPtr.h: * wtf/RetainPtr.h: * wtf/RunLoop.cpp: * wtf/RunLoop.h: * wtf/RunLoopTimer.h: * wtf/RunLoopTimerCF.cpp: * wtf/SHA1.cpp: * wtf/SHA1.h: * wtf/SaturatedArithmetic.h: (saturatedSubtraction): * wtf/SchedulePair.h: * wtf/SchedulePairCF.cpp: * wtf/SchedulePairMac.mm: * wtf/ScopedLambda.h: * wtf/Seconds.cpp: * wtf/Seconds.h: * wtf/SegmentedVector.h: * wtf/SentinelLinkedList.h: * wtf/SharedTask.h: * wtf/SimpleStats.h: * wtf/SingleRootGraph.h: * wtf/SinglyLinkedList.h: * wtf/SixCharacterHash.cpp: * wtf/SixCharacterHash.h: * wtf/SmallPtrSet.h: * wtf/Spectrum.h: * wtf/StackBounds.cpp: * wtf/StackBounds.h: * wtf/StackStats.cpp: * wtf/StackStats.h: * wtf/StackTrace.cpp: * wtf/StdLibExtras.h: * wtf/StreamBuffer.h: * wtf/StringHashDumpContext.h: * wtf/StringPrintStream.cpp: * wtf/StringPrintStream.h: * wtf/ThreadGroup.cpp: * wtf/ThreadMessage.cpp: * wtf/ThreadSpecific.h: * wtf/Threading.cpp: * wtf/Threading.h: * wtf/ThreadingPrimitives.h: * wtf/ThreadingPthreads.cpp: * wtf/TimeWithDynamicClockType.cpp: * wtf/TimeWithDynamicClockType.h: * wtf/TimingScope.cpp: * wtf/TinyLRUCache.h: * wtf/TinyPtrSet.h: * wtf/TriState.h: * wtf/TypeCasts.h: * wtf/UUID.cpp: * wtf/UnionFind.h: * wtf/VMTags.h: * wtf/ValueCheck.h: * wtf/Vector.h: * wtf/VectorTraits.h: * wtf/WallTime.cpp: * wtf/WallTime.h: * wtf/WeakPtr.h: * wtf/WeakRandom.h: * wtf/WordLock.cpp: * wtf/WordLock.h: * wtf/WorkQueue.cpp: * wtf/WorkQueue.h: * wtf/WorkerPool.cpp: * wtf/cf/LanguageCF.cpp: * wtf/cf/RunLoopCF.cpp: * wtf/cocoa/Entitlements.mm: * wtf/cocoa/MachSendRight.cpp: * wtf/cocoa/MainThreadCocoa.mm: * wtf/cocoa/MemoryFootprintCocoa.cpp: * wtf/cocoa/WorkQueueCocoa.cpp: * wtf/dtoa.cpp: * wtf/dtoa.h: * wtf/ios/WebCoreThread.cpp: * wtf/ios/WebCoreThread.h: * wtf/mac/AppKitCompatibilityDeclarations.h: * wtf/mac/DeprecatedSymbolsUsedBySafari.mm: * wtf/mbmalloc.cpp: * wtf/persistence/PersistentCoders.cpp: * wtf/persistence/PersistentDecoder.cpp: * wtf/persistence/PersistentEncoder.cpp: * wtf/spi/cf/CFBundleSPI.h: * wtf/spi/darwin/CommonCryptoSPI.h: * wtf/text/ASCIIFastPath.h: * wtf/text/ASCIILiteral.cpp: * wtf/text/AtomicString.cpp: * wtf/text/AtomicString.h: * wtf/text/AtomicStringHash.h: * wtf/text/AtomicStringImpl.cpp: * wtf/text/AtomicStringImpl.h: * wtf/text/AtomicStringTable.cpp: * wtf/text/AtomicStringTable.h: * wtf/text/Base64.cpp: * wtf/text/CString.cpp: * wtf/text/CString.h: * wtf/text/ConversionMode.h: * wtf/text/ExternalStringImpl.cpp: * wtf/text/IntegerToStringConversion.h: * wtf/text/LChar.h: * wtf/text/LineEnding.cpp: * wtf/text/StringBuffer.h: * wtf/text/StringBuilder.cpp: * wtf/text/StringBuilder.h: * wtf/text/StringBuilderJSON.cpp: * wtf/text/StringCommon.h: * wtf/text/StringConcatenate.h: * wtf/text/StringHash.h: * wtf/text/StringImpl.cpp: * wtf/text/StringImpl.h: * wtf/text/StringOperators.h: * wtf/text/StringView.cpp: * wtf/text/StringView.h: * wtf/text/SymbolImpl.cpp: * wtf/text/SymbolRegistry.cpp: * wtf/text/SymbolRegistry.h: * wtf/text/TextBreakIterator.cpp: * wtf/text/TextBreakIterator.h: * wtf/text/TextBreakIteratorInternalICU.h: * wtf/text/TextPosition.h: * wtf/text/TextStream.cpp: * wtf/text/UniquedStringImpl.h: * wtf/text/WTFString.cpp: * wtf/text/WTFString.h: * wtf/text/cocoa/StringCocoa.mm: * wtf/text/cocoa/StringViewCocoa.mm: * wtf/text/cocoa/TextBreakIteratorInternalICUCocoa.cpp: * wtf/text/icu/UTextProvider.cpp: * wtf/text/icu/UTextProvider.h: * wtf/text/icu/UTextProviderLatin1.cpp: * wtf/text/icu/UTextProviderLatin1.h: * wtf/text/icu/UTextProviderUTF16.cpp: * wtf/text/icu/UTextProviderUTF16.h: * wtf/threads/BinarySemaphore.cpp: * wtf/threads/BinarySemaphore.h: * wtf/threads/Signals.cpp: * wtf/unicode/CharacterNames.h: * wtf/unicode/Collator.h: * wtf/unicode/CollatorDefault.cpp: * wtf/unicode/UTF8.cpp: * wtf/unicode/UTF8.h: Tools: Put WorkQueue in namespace DRT so it does not conflict with WTF::WorkQueue. * DumpRenderTree/TestRunner.cpp: (TestRunner::queueLoadHTMLString): (TestRunner::queueLoadAlternateHTMLString): (TestRunner::queueBackNavigation): (TestRunner::queueForwardNavigation): (TestRunner::queueLoadingScript): (TestRunner::queueNonLoadingScript): (TestRunner::queueReload): * DumpRenderTree/WorkQueue.cpp: (WorkQueue::singleton): Deleted. (WorkQueue::WorkQueue): Deleted. (WorkQueue::queue): Deleted. (WorkQueue::dequeue): Deleted. (WorkQueue::count): Deleted. (WorkQueue::clear): Deleted. (WorkQueue::processWork): Deleted. * DumpRenderTree/WorkQueue.h: (WorkQueue::setFrozen): Deleted. * DumpRenderTree/WorkQueueItem.h: * DumpRenderTree/mac/DumpRenderTree.mm: (runTest): * DumpRenderTree/mac/FrameLoadDelegate.mm: (-[FrameLoadDelegate processWork:]): (-[FrameLoadDelegate webView:locationChangeDone:forDataSource:]): * DumpRenderTree/mac/TestRunnerMac.mm: (TestRunner::notifyDone): (TestRunner::forceImmediateCompletion): (TestRunner::queueLoad): * DumpRenderTree/win/DumpRenderTree.cpp: (runTest): * DumpRenderTree/win/FrameLoadDelegate.cpp: (FrameLoadDelegate::processWork): (FrameLoadDelegate::locationChangeDone): * DumpRenderTree/win/TestRunnerWin.cpp: (TestRunner::notifyDone): (TestRunner::forceImmediateCompletion): (TestRunner::queueLoad): Canonical link: https://commits.webkit.org/205473@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237099 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2018-10-15 14:24:49 +00:00
#pragma once
Add helper funtion for checking pointer equivalency and use it https://bugs.webkit.org/show_bug.cgi?id=150022 Reviewed by Darin Adler. Source/WebCore: A common pattern in WebCore code is to check for equivalency of two pointers, either both null, or both non-null and with equal values. This was written in several different ways in different places. Add arePointingToEqualData() to standardize this pattern. This obviates the need for StyleImage::imagesEquivalent(), counterDataEquivalent() etc. Also change some comparisons of DataRef<> which checked the pointer and then the values to use DataRef<>::operator== which does the same thing. Comparisons of m_grid and m_gridItem only checked pointer equality, so this is probably a bug fix there. * page/animation/CSSPropertyAnimation.cpp: if ((!a && !b) || a == b) is redundant so fix, and add checks for a and b RenderStyle* first. (WebCore::PropertyWrapperGetter::equals): (WebCore::StyleImagePropertyWrapper::equals): (WebCore::PropertyWrapperShadow::equals): (WebCore::PropertyWrapperMaybeInvalidColor::equals): (WebCore::FillLayerPropertyWrapperGetter::equals): (WebCore::FillLayerStyleImagePropertyWrapper::equals): (WebCore::FillLayersPropertyWrapper::equals): (WebCore::ShorthandPropertyWrapper::equals): (WebCore::PropertyWrapperFlex::equals): (WebCore::PropertyWrapperSVGPaint::equals): * platform/network/ResourceRequestBase.cpp: (WebCore::equalIgnoringHeaderFields): * rendering/style/FillLayer.cpp: (WebCore::FillLayer::operator==): * rendering/style/NinePieceImage.cpp: (WebCore::NinePieceImageData::operator==): * rendering/style/RenderStyle.cpp: Some nullptr cleanup. (WebCore::RenderStyle::getCachedPseudoStyle): (WebCore::RenderStyle::addCachedPseudoStyle): (WebCore::RenderStyle::changeAffectsVisualOverflow): (WebCore::RenderStyle::changeRequiresLayout): (WebCore::RenderStyle::changeRequiresLayerRepaint): (WebCore::RenderStyle::setWillChange): * rendering/style/SVGRenderStyleDefs.cpp: (WebCore::StyleShadowSVGData::operator==): * rendering/style/ShadowData.cpp: (WebCore::ShadowData::operator==): * rendering/style/StyleImage.h: (WebCore::StyleImage::imagesEquivalent): Deleted. * rendering/style/StyleRareInheritedData.cpp: (WebCore::StyleRareInheritedData::operator==): (WebCore::cursorDataEquivalent): Deleted. (WebCore::quotesDataEquivalent): Deleted. (WebCore::StyleRareInheritedData::shadowDataEquivalent): Deleted. * rendering/style/StyleRareInheritedData.h: * rendering/style/StyleRareNonInheritedData.cpp: (WebCore::StyleRareNonInheritedData::operator==): (WebCore::StyleRareNonInheritedData::counterDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::shadowDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::willChangeDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::reflectionDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::animationDataEquivalent): Deleted. (WebCore::StyleRareNonInheritedData::transitionDataEquivalent): Deleted. * rendering/style/StyleRareNonInheritedData.h: Source/WTF: Add PointerComparison.h which contains the templated pointer comparison function. * WTF.xcodeproj/project.pbxproj: * wtf/PointerComparison.h: Added. (WTF::arePointingToEqualData): Canonical link: https://commits.webkit.org/168245@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191017 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2015-10-14 00:14:29 +00:00
namespace WTF {
template<typename T> inline bool arePointingToEqualData(const T& a, const T& b)
{
return a == b || (a && b && *a == *b);
}
} // namespace WTF
using WTF::arePointingToEqualData;