Changeset 103008 in webkit

Timestamp:

Dec 15, 2011 6:00:43 PM (12 years ago)

Author:

andersca@apple.com

Message:

Source/JavaScriptCore: Regression (r102866): Navigating away from or closing a page with a plugin crashes
​https://bugs.webkit.org/show_bug.cgi?id=74655
<rdar://problem/10590024>

Reviewed by Sam Weinig.

Rewrite HasRefAndDeref to work if ref and deref are implemented in base classes,
using a modified version of the technique described here:
​http://groups.google.com/group/comp.lang.c++.moderated/msg/e5fbc9305539f699

• wtf/Functional.h:

Tools: Regression (r102866): Navigating away from or closing a page with a plugin crashes
​https://bugs.webkit.org/show_bug.cgi?id=74655

Reviewed by Sam Weinig.

Add a bunch of tests.

• TestWebKitAPI/Tests/WTF/Functional.cpp:

Location:

trunk

Files:

• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wtf/Functional.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/Functional.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-12-15  Anders Carlsson  <andersca@apple.com>
+
+        Regression (r102866): Navigating away from or closing a page with a plugin crashes
+        https://bugs.webkit.org/show_bug.cgi?id=74655
+        <rdar://problem/10590024>
+
+        Reviewed by Sam Weinig.
+
+        Rewrite HasRefAndDeref to work if ref and deref are implemented in base classes,
+        using a modified version of the technique described here:
+        http://groups.google.com/group/comp.lang.c++.moderated/msg/e5fbc9305539f699
+        
+        * wtf/Functional.h:
+
 2011-12-15  Andy Wingo  <wingo@igalia.com>
 

trunk/Source/JavaScriptCore/wtf/Functional.h

@@ -47 +47 @@
     };
 
-    template<typename U, U, U> struct TypeChecker { };
+    struct BaseMixin {
+        void deref();
+        void ref();
+    };
+
+    struct Base : public T, public BaseMixin { };
+
+    template<typename U, U> struct
+    TypeChecker { };
 
     template<typename U>
-    static YesType refAndDerefCheck(TypeChecker<void (U::*)(), &U::ref, &U::deref>*);
+    static NoType refCheck(U*, TypeChecker<void (BaseMixin::*)(), &U::ref>* = 0);
+    static YesType refCheck(...);
 
     template<typename U>
-    static NoType refAndDerefCheck(...);
-
-public:
-    static const bool value = sizeof(refAndDerefCheck<T>(0)) == sizeof(YesType);
+    static NoType derefCheck(U*, TypeChecker<void (BaseMixin::*)(), &U::deref>* = 0);
+    static YesType derefCheck(...);
+
+public:
+    static const bool value = sizeof(refCheck(static_cast<Base*>(0))) == sizeof(YesType) && sizeof(derefCheck(static_cast<Base*>(0))) == sizeof(YesType);
 };
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-15  Anders Carlsson  <andersca@apple.com>
+
+        Regression (r102866): Navigating away from or closing a page with a plugin crashes
+        https://bugs.webkit.org/show_bug.cgi?id=74655
+
+        Reviewed by Sam Weinig.
+
+        Add a bunch of tests.
+
+        * TestWebKitAPI/Tests/WTF/Functional.cpp:
+
 2011-12-15  Stephanie Lewis  <slewis@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/Functional.cpp

@@ -152 +152 @@
 }
 
+namespace RefAndDerefTests {
+    
+    template<typename T> struct RefCounted {
+        void ref();
+        void deref();
+    };
+    struct Connection : RefCounted<Connection> { };
+    COMPILE_ASSERT(WTF::HasRefAndDeref<Connection>::value, class_has_ref_and_deref);
+    
+    struct NoRefOrDeref { };
+    COMPILE_ASSERT(!WTF::HasRefAndDeref<NoRefOrDeref>::value, class_has_no_ref_or_deref);
+    
+    struct RefOnly { void ref(); };
+    COMPILE_ASSERT(!WTF::HasRefAndDeref<RefOnly>::value, class_has_ref_only);
+    
+    struct DerefOnly { void deref(); };
+    COMPILE_ASSERT(!WTF::HasRefAndDeref<DerefOnly>::value, class_has_deref_only);
+
+}
+
 } // namespace TestWebKitAPI