Title: [136598] trunk/Source/WebKit2
Revision
136598
Author
[email protected]
Date
2012-12-04 17:05:53 -0800 (Tue, 04 Dec 2012)

Log Message

[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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (136597 => 136598)


--- trunk/Source/WebKit2/ChangeLog	2012-12-05 00:56:37 UTC (rev 136597)
+++ trunk/Source/WebKit2/ChangeLog	2012-12-05 01:05:53 UTC (rev 136598)
@@ -1,3 +1,19 @@
+2012-12-04  Andy Estes  <[email protected]>
+
+        [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  Simon Fraser  <[email protected]>
 
         Show a mini visualizer for the tile cache tiles

Modified: trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm (136597 => 136598)


--- trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm	2012-12-05 00:56:37 UTC (rev 136597)
+++ trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm	2012-12-05 01:05:53 UTC (rev 136598)
@@ -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
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to