Attachment 349294 Details for Bug 189044 – Patch to land

[patch] Patch to land

bug-189044-20180910111511.patch (text/plain), 13.88 KB, created by Fujii Hironori on 2018-09-09 19:15:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-09 19:15:12 PDT

Size: 13.88 KB

patch

obsolete

>Subversion Revision: 235837
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 1b80c24f1d31939b3d580e7029ed3ca731cae224..fb553bd61867f80672d2c74ba579e6d94a8f336c 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-09-09  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        Add specialized template declarations of HashTraits and DefaultHash to detect misuse
>+        https://bugs.webkit.org/show_bug.cgi?id=189044
>+
>+        Reviewed by Yusuke Suzuki.
>+
>+        * wtf/BitVector.h: Removed unnecessary HashTraits declaration.
>+        * wtf/MetaAllocatorPtr.h: Ditto.
>+        * wtf/IndexSparseSet.h: Removed unused #include <wtf/HashTraits.h>.
>+        * wtf/LoggingHashMap.h: Removed unused #include <wtf/LoggingHashTraits.h>.
>+        * wtf/StackShot.h: Added #include <wtf/HashTraits.h> because this header uses SimpleClassHashTraits.
>+        Removed unnecessary HashTraits declaration.
>+
> 2018-09-07  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r235784.
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8375217f8686e250bb3a23429f0200fb573ffe7e..2ef402c4a717b40466043f123cbae4bf24533935 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,41 @@
>+2018-09-09  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        Add specialized template declarations of HashTraits and DefaultHash to detect misuse
>+        https://bugs.webkit.org/show_bug.cgi?id=189044
>+
>+        Reviewed by Yusuke Suzuki.
>+
>+        Some classes have a separate header for specializations of
>+        WTF::HashTraits and WTF::DefaultHash to reduce the number of
>+        header files included. For example, ColorHash.h and Color.h.
>+
>+        If someone is mistakenly using HashSet or HashMap without
>+        including the specialization header, unexpected template
>+        instantiation can cause subtle bugs. For example, MSVC linker
>+        would silently produce an broken executable (Bug 188893).
>+
>+        By applying this change, I found three misuse cases in
>+        DebugPageOverlays.cpp, AVVideoCaptureSource.h and WebPage.h. As
>+        far as I analyzed, I concluded that these misuses don't introduce
>+        any bugs at the moment, and they are not testable (Bug 189044 Comment 9),
>+        except the MSVC issue (Bug 188893).
>+
>+        No new tests (Covered by existing tests).
>+
>+        * Modules/webdatabase/SQLResultSetRowList.h: Removed unused #include <wtf/HashTraits.h>.
>+        * bindings/js/SerializedScriptValue.cpp: Ditto.
>+        * page/DebugPageOverlays.cpp: Added #include "ColorHash.h" to instantiate HashMap<String, Color>.
>+        * platform/URLHash.h: Added DefaultHash<URL> specialization definition.
>+        * platform/URL.h: Added specialized template declarations.
>+        * platform/graphics/Color.h: Ditto.
>+        * platform/graphics/FloatSize.h: Ditto.
>+        * platform/graphics/IntPoint.h: Ditto.
>+        * platform/graphics/IntSize.h: Ditto.
>+        * platform/network/ProtectionSpace.h: Ditto.
>+        * platform/network/ProtectionSpaceHash.h: Removed unnecessary DefaultHash declaration.
>+        * platform/mediastream/mac/AVVideoCaptureSource.h:
>+        Added #include "IntSizeHash.h" to instantiate HashMap<String, IntSize>.
>+
> 2018-09-08  Andy Estes  <aestes@apple.com>
> 
>         [Apple Pay] Dispatch a paymentmethodchange event when the payment method changes
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index d9f188bc7edfa4da9cbe92f5dcdda5ba946047c9..84efd06dd391221851440636a24eb1658dec1d80 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-09-09  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        Add specialized template declarations of HashTraits and DefaultHash to detect misuse
>+        https://bugs.webkit.org/show_bug.cgi?id=189044
>+
>+        Reviewed by Yusuke Suzuki.
>+
>+        * WebProcess/WebPage/WebPage.h: Added #include <WebCore/IntPointHash.h> to instantiate HashMap<std::pair<IntSize, double>, IntPoint>.
>+
> 2018-09-08  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         REGRESSION (r235153): [iOS] Can't move selection start grabber when selecting text in a subframe
>diff --git a/Source/WTF/wtf/BitVector.h b/Source/WTF/wtf/BitVector.h
>index 8c8bdd7349b09556cd489d05c98b9bcb3f2ff8bf..c389e04c6c2c400d43d72d0fdb4c93fa30dfdcc4 100644
>--- a/Source/WTF/wtf/BitVector.h
>+++ b/Source/WTF/wtf/BitVector.h
>@@ -482,7 +482,6 @@ template<> struct DefaultHash<BitVector> {
>     typedef BitVectorHash Hash;
> };
> 
>-template<typename T> struct HashTraits;
> template<> struct HashTraits<BitVector> : public CustomHashTraits<BitVector> { };
> 
> } // namespace WTF
>diff --git a/Source/WTF/wtf/IndexSparseSet.h b/Source/WTF/wtf/IndexSparseSet.h
>index bce4588c15cf3dffe244058381579a99e1d03e81..f0e93944ccba5119a37b482a1608ca9bf6100ce5 100644
>--- a/Source/WTF/wtf/IndexSparseSet.h
>+++ b/Source/WTF/wtf/IndexSparseSet.h
>@@ -26,7 +26,6 @@
> #ifndef IndexSparseSet_h
> #define IndexSparseSet_h
> 
>-#include <wtf/HashTraits.h>
> #include <wtf/Vector.h>
> 
> namespace WTF {
>diff --git a/Source/WTF/wtf/LoggingHashMap.h b/Source/WTF/wtf/LoggingHashMap.h
>index ff8e790fa3efae84d8877f47efa45937d6636f37..5b6e6218f45fd12c33576f34ea3a98828cc0e98b 100644
>--- a/Source/WTF/wtf/LoggingHashMap.h
>+++ b/Source/WTF/wtf/LoggingHashMap.h
>@@ -28,7 +28,6 @@
> #include <wtf/DataLog.h>
> #include <wtf/HashMap.h>
> #include <wtf/LoggingHashID.h>
>-#include <wtf/LoggingHashTraits.h>
> 
> namespace WTF {
> 
>diff --git a/Source/WTF/wtf/MetaAllocatorPtr.h b/Source/WTF/wtf/MetaAllocatorPtr.h
>index 5be74a0cf9c711478bb022f90307121013c95dd9..d22e611e210fa12fe1836f3ef0beca08e1ee097a 100644
>--- a/Source/WTF/wtf/MetaAllocatorPtr.h
>+++ b/Source/WTF/wtf/MetaAllocatorPtr.h
>@@ -114,7 +114,6 @@ template<PtrTag tag> struct DefaultHash<MetaAllocatorPtr<tag>> {
>     typedef MetaAllocatorPtrHash<tag> Hash;
> };
> 
>-template<typename T> struct HashTraits;
> template<PtrTag tag> struct HashTraits<MetaAllocatorPtr<tag>> : public CustomHashTraits<MetaAllocatorPtr<tag>> { };
> 
> } // namespace WTF
>diff --git a/Source/WTF/wtf/StackShot.h b/Source/WTF/wtf/StackShot.h
>index 7e32a35bae3c7b56a8be85b7d18d1e5579a0b3fc..7b3ad9243b9ade2714ed6064255485025455b134 100644
>--- a/Source/WTF/wtf/StackShot.h
>+++ b/Source/WTF/wtf/StackShot.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include <wtf/Assertions.h>
>+#include <wtf/HashTraits.h>
> #include <wtf/UniqueArray.h>
> 
> namespace WTF {
>@@ -123,7 +124,6 @@ template<> struct DefaultHash<StackShot> {
>     typedef StackShotHash Hash;
> };
> 
>-template<typename T> struct HashTraits;
> template<> struct HashTraits<StackShot> : SimpleClassHashTraits<StackShot> { };
> 
> } // namespace WTF
>diff --git a/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h b/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h
>index b6fd7980c9c4a4b8db97d4e66c91148b7cbe8b6e..14c44483afb879a2995519c6f6120a30d2a8a94b 100644
>--- a/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h
>+++ b/Source/WebCore/Modules/webdatabase/SQLResultSetRowList.h
>@@ -30,7 +30,6 @@
> 
> #include "ExceptionOr.h"
> #include "SQLValue.h"
>-#include <wtf/HashTraits.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/WebCore/bindings/js/SerializedScriptValue.cpp b/Source/WebCore/bindings/js/SerializedScriptValue.cpp
>index fea9c381b11d4ad4a8c2459e73badd7dfe15a8aa..ba945cd771e4af9e85f67f85720486295744c609 100644
>--- a/Source/WebCore/bindings/js/SerializedScriptValue.cpp
>+++ b/Source/WebCore/bindings/js/SerializedScriptValue.cpp
>@@ -81,7 +81,6 @@
> #include <JavaScriptCore/TypedArrays.h>
> #include <JavaScriptCore/WasmModule.h>
> #include <limits>
>-#include <wtf/HashTraits.h>
> #include <wtf/MainThread.h>
> #include <wtf/RunLoop.h>
> #include <wtf/Vector.h>
>diff --git a/Source/WebCore/page/DebugPageOverlays.cpp b/Source/WebCore/page/DebugPageOverlays.cpp
>index 595aa41854b849c3da82ae23134d10b9165b9234..ed027fae83cc23edbf52b1e3b230f947f3fe8b04 100644
>--- a/Source/WebCore/page/DebugPageOverlays.cpp
>+++ b/Source/WebCore/page/DebugPageOverlays.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "DebugPageOverlays.h"
> 
>+#include "ColorHash.h"
> #include "ElementIterator.h"
> #include "FrameView.h"
> #include "GraphicsContext.h"
>diff --git a/Source/WebCore/platform/URL.h b/Source/WebCore/platform/URL.h
>index e96a41e9698d22bb3ed0322d4d047ffb3ac1c80f..775044a3245da6c9732a6c725c62bebe0948f86e 100644
>--- a/Source/WebCore/platform/URL.h
>+++ b/Source/WebCore/platform/URL.h
>@@ -424,11 +424,6 @@ WTF::TextStream& operator<<(WTF::TextStream&, const URL&);
> } // namespace WebCore
> 
> namespace WTF {
>-
>-// URLHash is the default hash for String
>-template<typename T> struct DefaultHash;
>-template<> struct DefaultHash<WebCore::URL> {
>-    typedef WebCore::URLHash Hash;
>-};
>-
>+template<> struct DefaultHash<WebCore::URL>;
>+template<> struct HashTraits<WebCore::URL>;
> } // namespace WTF
>diff --git a/Source/WebCore/platform/URLHash.h b/Source/WebCore/platform/URLHash.h
>index cedc4f385305c3b2becd296f69ee52d08a82f966..41d0ab96da35d31ac8db4eb4dabd3f4e1592b81b 100644
>--- a/Source/WebCore/platform/URLHash.h
>+++ b/Source/WebCore/platform/URLHash.h
>@@ -50,7 +50,12 @@ namespace WebCore {
> 
> namespace WTF {
> 
>-    template<> struct HashTraits<WebCore::URL> : SimpleClassHashTraits<WebCore::URL> { };
>+// URLHash is the default hash for String
>+template<> struct DefaultHash<WebCore::URL> {
>+    using Hash = WebCore::URLHash;
>+};
>+
>+template<> struct HashTraits<WebCore::URL> : SimpleClassHashTraits<WebCore::URL> { };
> 
> } // namespace WTF
> 
>diff --git a/Source/WebCore/platform/graphics/Color.h b/Source/WebCore/platform/graphics/Color.h
>index 66609cc2d40cf2803ee54d72457b4be8f393469d..e584b43418f675a6141761cf70fb93299470008f 100644
>--- a/Source/WebCore/platform/graphics/Color.h
>+++ b/Source/WebCore/platform/graphics/Color.h
>@@ -470,3 +470,8 @@ WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const Color&);
> WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, ColorSpace);
> 
> } // namespace WebCore
>+
>+namespace WTF {
>+template<> struct DefaultHash<WebCore::Color>;
>+template<> struct HashTraits<WebCore::Color>;
>+}
>diff --git a/Source/WebCore/platform/graphics/FloatSize.h b/Source/WebCore/platform/graphics/FloatSize.h
>index 1c3d7f1245969e816cd41d598ce6081583ebb00a..b75fb98fa799ad6efd729b2585599ce7166b5fc8 100644
>--- a/Source/WebCore/platform/graphics/FloatSize.h
>+++ b/Source/WebCore/platform/graphics/FloatSize.h
>@@ -256,3 +256,7 @@ WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const FloatSize&);
> 
> } // namespace WebCore
> 
>+namespace WTF {
>+template<> struct DefaultHash<WebCore::FloatSize>;
>+template<> struct HashTraits<WebCore::FloatSize>;
>+}
>diff --git a/Source/WebCore/platform/graphics/IntPoint.h b/Source/WebCore/platform/graphics/IntPoint.h
>index 77f1589f1122a5b717f3310f11b6c9ca5ab1f0c4..39f1d599a0e52d3274276494331dda54f8841440 100644
>--- a/Source/WebCore/platform/graphics/IntPoint.h
>+++ b/Source/WebCore/platform/graphics/IntPoint.h
>@@ -215,3 +215,7 @@ WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const IntPoint&);
> 
> } // namespace WebCore
> 
>+namespace WTF {
>+template<> struct DefaultHash<WebCore::IntPoint>;
>+template<> struct HashTraits<WebCore::IntPoint>;
>+}
>diff --git a/Source/WebCore/platform/graphics/IntSize.h b/Source/WebCore/platform/graphics/IntSize.h
>index 7ac64cab48c3d09a91a9ae78bd0c7aadfe0945a4..3fbcb6b057ebe1b740dd7a524299a5650acfe8c8 100644
>--- a/Source/WebCore/platform/graphics/IntSize.h
>+++ b/Source/WebCore/platform/graphics/IntSize.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include <algorithm>
>+#include <wtf/Forward.h>
> 
> #if PLATFORM(MAC) && defined __OBJC__
> #import <Foundation/NSGeometry.h>
>@@ -219,3 +220,7 @@ WEBCORE_EXPORT WTF::TextStream& operator<<(WTF::TextStream&, const IntSize&);
> 
> } // namespace WebCore
> 
>+namespace WTF {
>+template<> struct DefaultHash<WebCore::IntSize>;
>+template<> struct HashTraits<WebCore::IntSize>;
>+}
>diff --git a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h
>index f55fef92c7ca9cca6533d78de445b638a95d7f2a..9f2fc3456c4b2a5bdd4b44423e45a3633edfdae9 100644
>--- a/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h
>+++ b/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h
>@@ -27,6 +27,7 @@
> 
> #if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
> 
>+#include "IntSizeHash.h"
> #include "OrientationNotifier.h"
> #include "RealtimeMediaSource.h"
> #include <wtf/text/StringHash.h>
>diff --git a/Source/WebCore/platform/network/ProtectionSpace.h b/Source/WebCore/platform/network/ProtectionSpace.h
>index 769de805fe0bcdc70fe36b84efa1e271cbd8f0a3..bcd316270f0f61a2e781f860bb9f29823f482207 100644
>--- a/Source/WebCore/platform/network/ProtectionSpace.h
>+++ b/Source/WebCore/platform/network/ProtectionSpace.h
>@@ -48,4 +48,9 @@ public:
> 
> } // namespace WebCore
> 
>+namespace WTF {
>+template<> struct DefaultHash<WebCore::ProtectionSpace>;
>+template<> struct HashTraits<WebCore::ProtectionSpace>;
>+}
>+
> #endif
>diff --git a/Source/WebCore/platform/network/ProtectionSpaceHash.h b/Source/WebCore/platform/network/ProtectionSpaceHash.h
>index 4526cd4f811ce8a22955d3c2b639600abdb26e8b..e8433357f2afdb662431fe5a6d80db6a44309557 100644
>--- a/Source/WebCore/platform/network/ProtectionSpaceHash.h
>+++ b/Source/WebCore/platform/network/ProtectionSpaceHash.h
>@@ -59,9 +59,8 @@ namespace WTF {
> 
>     template<> struct HashTraits<WebCore::ProtectionSpace> : SimpleClassHashTraits<WebCore::ProtectionSpace> { };
> 
>-    template<typename T> struct DefaultHash;
>     template<> struct DefaultHash<WebCore::ProtectionSpace> {
>-        typedef WebCore::ProtectionSpaceHash Hash;
>+        using Hash = WebCore::ProtectionSpaceHash;
>     };
> 
> } // namespace WTF
>diff --git a/Source/WebKit/WebProcess/WebPage/WebPage.h b/Source/WebKit/WebProcess/WebPage/WebPage.h
>index 14499480293c5e42eaee87b75a435ee8d1fe508e..7b27e7569a4ad90d960fafd33e57e80668797431 100644
>--- a/Source/WebKit/WebProcess/WebPage/WebPage.h
>+++ b/Source/WebKit/WebProcess/WebPage/WebPage.h
>@@ -92,6 +92,7 @@
> #if PLATFORM(IOS)
> #include "GestureTypes.h"
> #include "WebPageMessages.h"
>+#include <WebCore/IntPointHash.h>
> #include <WebCore/ViewportConfiguration.h>
> #endif
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189044: 348281 | 348286 | 348330 | 348803 | 349294