Changeset 174475 in webkit

Timestamp:

Oct 8, 2014, 1:26:41 PM (11 years ago)

Author:

jer.noble@apple.com

Message:

Unreviewed follow-up fix for r174460. Do not register for KVOs if the object does not respond to the requested property.

• platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:

(-[CDMSessionMediaSourceAVFObjCObserver beginObserving:]):
(-[CDMSessionMediaSourceAVFObjCObserver stopObserving:]):
(-[CDMSessionMediaSourceAVFObjCObserver invalidate]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-10-08  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed follow-up fix for r174460. Do not register for KVOs if the object does not respond to the requested property.
+
+        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+        (-[CDMSessionMediaSourceAVFObjCObserver beginObserving:]):
+        (-[CDMSessionMediaSourceAVFObjCObserver stopObserving:]):
+        (-[CDMSessionMediaSourceAVFObjCObserver invalidate]):
+
 2014-10-08  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm

@@ -88 +88 @@
     ASSERT(!m_parsers.contains(parser));
     m_parsers.add(parser);
-    [parser addObserver:self forKeyPath:@"sessionIdentifier" options:(NSKeyValueObservingOptionNew|NSKeyValueObservingOptionInitial) context:nullptr];
+    if ([parser respondsToSelector:@selector(sessionIdentifier)])
+        [parser addObserver:self forKeyPath:@"sessionIdentifier" options:(NSKeyValueObservingOptionNew|NSKeyValueObservingOptionInitial) context:nullptr];
 }
 
@@ -95 +96 @@
     ASSERT(m_parsers.contains(parser));
     m_parsers.remove(parser);
-    [parser removeObserver:self forKeyPath:@"sessionIdentifier" context:nullptr];
+    if ([parser respondsToSelector:@selector(sessionIdentifier)])
+        [parser removeObserver:self forKeyPath:@"sessionIdentifier" context:nullptr];
 }
 
@@ -101 +103 @@
 {
     m_parent = nullptr;
-    for (auto& parser : m_parsers)
-        [parser removeObserver:self forKeyPath:@"sessionIdentifier" context:nullptr];
+    for (auto& parser : m_parsers) {
+        if ([parser respondsToSelector:@selector(sessionIdentifier)])
+            [parser removeObserver:self forKeyPath:@"sessionIdentifier" context:nullptr];
+    }
     m_parsers.clear();
 }