Title: [178962] tags/Safari-601.1.15.1/Source/WebKit2
- Revision
- 178962
- Author
- bshaf...@apple.com
- Date
- 2015-01-22 15:35:13 -0800 (Thu, 22 Jan 2015)
Log Message
Merged r178958. rdar://problem/19438402
Modified Paths
Diff
Modified: tags/Safari-601.1.15.1/Source/WebKit2/ChangeLog (178961 => 178962)
--- tags/Safari-601.1.15.1/Source/WebKit2/ChangeLog 2015-01-22 23:34:34 UTC (rev 178961)
+++ tags/Safari-601.1.15.1/Source/WebKit2/ChangeLog 2015-01-22 23:35:13 UTC (rev 178962)
@@ -1,3 +1,19 @@
+2015-01-22 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r178958.
+
+ 2015-01-22 Timothy Horton <timothy_hor...@apple.com>
+
+ UserData decoding of WKTypeRefWrapper always fails
+ https://bugs.webkit.org/show_bug.cgi?id=140791
+ <rdar://problem/19438402>
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/mac/ObjCObjectGraph.mm:
+ (WebKit::ObjCObjectGraph::decode):
+ Add a missing break.
+
2015-01-20 Martin Hock <mh...@apple.com>
[iOS][WK2] Redraw find-in-page indicator on rotation
Modified: tags/Safari-601.1.15.1/Source/WebKit2/Shared/mac/ObjCObjectGraph.mm (178961 => 178962)
--- tags/Safari-601.1.15.1/Source/WebKit2/Shared/mac/ObjCObjectGraph.mm 2015-01-22 23:34:34 UTC (rev 178961)
+++ tags/Safari-601.1.15.1/Source/WebKit2/Shared/mac/ObjCObjectGraph.mm 2015-01-22 23:35:13 UTC (rev 178962)
@@ -318,6 +318,7 @@
return false;
result = adoptNS([[WKTypeRefWrapper alloc] initWithObject:toAPI(object.get())]);
+ break;
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
