Changeset 158797 in webkit

Timestamp:

Nov 6, 2013 3:04:39 PM (10 years ago)

Author:

andersca@apple.com

Message:

Move allowed classes handling to decodeObject
​https://bugs.webkit.org/show_bug.cgi?id=123930

Reviewed by Andreas Kling.

• Shared/API/Cocoa/WKRemoteObjectCoder.mm:

(decodeObjectFromObjectStream):
Pass allowed classes through to decodeObject.

(decodeObject):
Update to take an NSSet of allowed classes. If the set is nil, use the current set.

(-[WKRemoteObjectDecoder decodeObjectOfClasses:forKey:]):
Pass classes to decodeObject.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKRemoteObjectCoder.mm (modified) (5 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-06  Anders Carlsson  <andersca@apple.com>
+
+        Move allowed classes handling to decodeObject
+        https://bugs.webkit.org/show_bug.cgi?id=123930
+
+        Reviewed by Andreas Kling.
+
+        * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+        (decodeObjectFromObjectStream):
+        Pass allowed classes through to decodeObject.
+
+        (decodeObject):
+        Update to take an NSSet of allowed classes. If the set is nil, use the current set.
+
+        (-[WKRemoteObjectDecoder decodeObjectOfClasses:forKey:]):
+        Pass classes to decodeObject.
+
 2013-11-06  Sergio Correia  <sergio.correia@openbossa.org>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm

@@ -295 +295 @@
 }
 
-static id decodeObject(WKRemoteObjectDecoder *decoder, const ImmutableDictionary*);
+static id decodeObject(WKRemoteObjectDecoder *, const ImmutableDictionary*, NSSet *allowedClasses);
 
 static id decodeObjectFromObjectStream(WKRemoteObjectDecoder *decoder, NSSet *allowedClasses)
@@ -305 +305 @@
         return nil;
 
-    TemporaryChange<NSSet *> allowedClassesChange(decoder->_allowedClasses, allowedClasses);
-
     const ImmutableDictionary* dictionary = decoder->_objectStream->at<ImmutableDictionary>(decoder->_objectStreamPosition++);
 
-    return decodeObject(decoder, dictionary);
+    return decodeObject(decoder, dictionary, allowedClasses);
 }
 
@@ -444 +442 @@
 }
 
-static id decodeObject(WKRemoteObjectDecoder *decoder, const ImmutableDictionary* dictionary)
+static id decodeObject(WKRemoteObjectDecoder *decoder, const ImmutableDictionary* dictionary, NSSet *allowedClasses)
 {
     if (!dictionary)
@@ -451 +449 @@
     TemporaryChange<const ImmutableDictionary*> dictionaryChange(decoder->_currentDictionary, dictionary);
 
+    // If no allowed classes were listed, just use the currently allowed classes.
+    if (!allowedClasses)
+        return decodeObject(decoder);
+
+    TemporaryChange<NSSet *> allowedClassesChange(decoder->_allowedClasses, allowedClasses);
     return decodeObject(decoder);
 }
@@ -487 +490 @@
 - (id)decodeObjectOfClasses:(NSSet *)classes forKey:(NSString *)key
 {
-    TemporaryChange<NSSet *> allowedClassesChange(_allowedClasses, classes);
-
-    return decodeObject(self, _currentDictionary->get<ImmutableDictionary>(escapeKey(key)));
+    return decodeObject(self, _currentDictionary->get<ImmutableDictionary>(escapeKey(key)), classes);
 }