Changeset 136759 in webkit

Timestamp:

Dec 5, 2012, 1:48:07 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r136598. <rdar://problem/12804399>

Location:

tags/Safari-537.20.3/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/mac/ObjCObjectGraphCoders.mm (modified) (1 diff)

tags/Safari-537.20.3/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-12-05  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r136598
+
+    2012-12-04  Andy Estes  <aestes@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  <lforschler@apple.com>
 

tags/Safari-537.20.3/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm

@@ -76 +76 @@
         return NSDataType;
 #if defined(__LP64__) && defined(__clang__)
-    if ([object isKindOfClass:[WKBrowsingContextController class]])
+    if ([object isKindOfClass:[WKBrowsingContextController class]] || [object isKindOfClass:[WKWebProcessPlugInBrowserContextController class]])
         return WKBrowsingContextControllerType;
 #endif