Title: [205036] trunk
- Revision
- 205036
- Author
- [email protected]
- Date
- 2016-08-26 13:33:34 -0700 (Fri, 26 Aug 2016)
Log Message
[Cocoa] Infinite recursion calling -charValue on a WKNSNumber
https://bugs.webkit.org/show_bug.cgi?id=161258
Reviewed by Anders Carlsson.
Source/WebKit2:
* Shared/Cocoa/WKNSNumber.mm:
(-[WKNSNumber charValue]): Override this…
(-[WKNSNumber boolValue]): …not this.
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (205035 => 205036)
--- trunk/Source/WebKit2/ChangeLog 2016-08-26 20:29:17 UTC (rev 205035)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-26 20:33:34 UTC (rev 205036)
@@ -1,3 +1,14 @@
+2016-08-26 Dan Bernstein <[email protected]>
+
+ [Cocoa] Infinite recursion calling -charValue on a WKNSNumber
+ https://bugs.webkit.org/show_bug.cgi?id=161258
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/Cocoa/WKNSNumber.mm:
+ (-[WKNSNumber charValue]): Override this…
+ (-[WKNSNumber boolValue]): …not this.
+
2016-08-26 Csaba Osztrogonác <[email protected]>
[EFL][GTK] REGRESSION(204877): Fix the clean build
Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSNumber.mm (205035 => 205036)
--- trunk/Source/WebKit2/Shared/Cocoa/WKNSNumber.mm 2016-08-26 20:29:17 UTC (rev 205035)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSNumber.mm 2016-08-26 20:33:34 UTC (rev 205036)
@@ -106,12 +106,12 @@
// MARK: NSNumber primitive methods
-- (BOOL)boolValue
+- (char)charValue
{
if (_type == API::Object::Type::Boolean)
return _number._boolean->value();
- return super.boolValue;
+ return super.charValue;
}
- (double)doubleValue
Modified: trunk/Tools/ChangeLog (205035 => 205036)
--- trunk/Tools/ChangeLog 2016-08-26 20:29:17 UTC (rev 205035)
+++ trunk/Tools/ChangeLog 2016-08-26 20:33:34 UTC (rev 205036)
@@ -1,3 +1,13 @@
+2016-08-26 Dan Bernstein <[email protected]>
+
+ [Cocoa] Infinite recursion calling -charValue on a WKNSNumber
+ https://bugs.webkit.org/show_bug.cgi?id=161258
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm:
+ (TestWebKitAPI::TEST):
+
2016-08-26 Csaba Osztrogonác <[email protected]>
Fix the ENABLE(WEBASSEMBLY) build on Linux
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm (205035 => 205036)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm 2016-08-26 20:29:17 UTC (rev 205035)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/WKNSNumber.mm 2016-08-26 20:33:34 UTC (rev 205036)
@@ -45,6 +45,7 @@
NSNumber *doubleNumber = (NSNumber *)doubleRef.get();
EXPECT_EQ(YES, booleanNumber.boolValue);
+ EXPECT_EQ(YES, booleanNumber.charValue);
EXPECT_EQ(39UL, uint64Number.unsignedLongLongValue);
EXPECT_EQ(39, uint64Number.intValue);
EXPECT_EQ(-16.2, doubleNumber.doubleValue);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
