Title: [136759] tags/Safari-537.20.3/Source/WebKit2
- Revision
- 136759
- Author
- lforsch...@apple.com
- Date
- 2012-12-05 13:48:07 -0800 (Wed, 05 Dec 2012)
Log Message
Merged r136598. <rdar://problem/12804399>
Modified Paths
Diff
Modified: tags/Safari-537.20.3/Source/WebKit2/ChangeLog (136758 => 136759)
--- tags/Safari-537.20.3/Source/WebKit2/ChangeLog 2012-12-05 21:47:30 UTC (rev 136758)
+++ tags/Safari-537.20.3/Source/WebKit2/ChangeLog 2012-12-05 21:48:07 UTC (rev 136759)
@@ -1,3 +1,23 @@
+2012-12-05 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r136598
+
+ 2012-12-04 Andy Estes <aes...@apple.com>
+
+ [WebKit2] WKWebProcessPlugInBrowserContextControllers should be treated as type WKBrowsingContextControllerType for encoding purposes
+ https://bugs.webkit.org/show_bug.cgi?id=104063
+
+ Reviewed by Sam Weinig.
+
+ Objective-C message graphs can include browsing context controller
+ objects, which are decoded as WKWebProcessPlugInBrowserContextControllers
+ in the web process plug-in and as WKBrowsingContextControllers in the UI
+ process. Ensure we correctly encode WKWebProcessPlugInBrowserContextControllers
+ by treating them as type WKBrowsingContextControllerType.
+
+ * Shared/mac/ObjCObjectGraphCoders.mm:
+ (WebKit::typeFromObject):
+
2012-12-04 Lucas Forschler <lforsch...@apple.com>
Merge r136302
Modified: tags/Safari-537.20.3/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm (136758 => 136759)
--- tags/Safari-537.20.3/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2012-12-05 21:47:30 UTC (rev 136758)
+++ tags/Safari-537.20.3/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2012-12-05 21:48:07 UTC (rev 136759)
@@ -75,7 +75,7 @@
if ([object isKindOfClass:[NSData class]])
return NSDataType;
#if defined(__LP64__) && defined(__clang__)
- if ([object isKindOfClass:[WKBrowsingContextController class]])
+ if ([object isKindOfClass:[WKBrowsingContextController class]] || [object isKindOfClass:[WKWebProcessPlugInBrowserContextController class]])
return WKBrowsingContextControllerType;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
