<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209141] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209141">209141</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-30 11:20:32 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Sync video preview layer and parent layer sizes
https://bugs.webkit.org/show_bug.cgi?id=165139
Reviewed by Jer Noble.
CALayer auto-resizing doesn't work on iOS, so manually reize the video capture preview layer
whenever the background layer's bounds change.
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoSourcePreview::AVVideoSourcePreview): Create layer observer.
(WebCore::AVVideoSourcePreview::backgroundLayerBoundsChanged): Sync preview layer and background
layer sizes.
(WebCore::AVVideoSourcePreview::invalidate): Invalidate and clear observer.
(-[WebCoreAVVideoCaptureSourceObserver initWithParent:]):
(-[WebCoreAVVideoCaptureSourceObserver setParent:]): Add KVO bounds observer.
(-[WebCoreAVVideoCaptureSourceObserver observeValueForKeyPath:ofObject:change:context:]): Call
parent when "bounds" changes.
(-[WebCoreAVVideoCaptureSourceObserver actionForKey:]): Return nil to disable all animations.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209140 => 209141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-30 19:19:44 UTC (rev 209140)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 19:20:32 UTC (rev 209141)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-30 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Sync video preview layer and parent layer sizes
+ https://bugs.webkit.org/show_bug.cgi?id=165139
+
+ Reviewed by Jer Noble.
+
+ CALayer auto-resizing doesn't work on iOS, so manually reize the video capture preview layer
+ whenever the background layer's bounds change.
+
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoSourcePreview::AVVideoSourcePreview): Create layer observer.
+ (WebCore::AVVideoSourcePreview::backgroundLayerBoundsChanged): Sync preview layer and background
+ layer sizes.
+ (WebCore::AVVideoSourcePreview::invalidate): Invalidate and clear observer.
+ (-[WebCoreAVVideoCaptureSourceObserver initWithParent:]):
+ (-[WebCoreAVVideoCaptureSourceObserver setParent:]): Add KVO bounds observer.
+ (-[WebCoreAVVideoCaptureSourceObserver observeValueForKeyPath:ofObject:change:context:]): Call
+ parent when "bounds" changes.
+ (-[WebCoreAVVideoCaptureSourceObserver actionForKey:]): Return nil to disable all animations.
+
</ins><span class="cx"> 2016-11-30 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Fix crash in -webkit-shape-outside parsing
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (209140 => 209141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-11-30 19:19:44 UTC (rev 209140)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2016-11-30 19:20:32 UTC (rev 209141)
</span><span class="lines">@@ -40,9 +40,15 @@
</span><span class="cx"> #import "RealtimeMediaSourceCenter.h"
</span><span class="cx"> #import "RealtimeMediaSourcePreview.h"
</span><span class="cx"> #import "RealtimeMediaSourceSettings.h"
</span><ins>+#import "WebActionDisablingCALayerDelegate.h"
</ins><span class="cx"> #import <AVFoundation/AVFoundation.h>
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include "WebCoreThread.h"
+#include "WebCoreThreadRun.h"
+#endif
+
</ins><span class="cx"> #import "CoreMediaSoftLink.h"
</span><span class="cx"> #import "CoreVideoSoftLink.h"
</span><span class="cx">
</span><span class="lines">@@ -79,7 +85,7 @@
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPreset960x540, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPreset640x480, NSString *)
</span><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPreset352x288, NSString *)
</span><del>-SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPreset320x240, NSString*)
</del><ins>+SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPreset320x240, NSString *)
</ins><span class="cx"> SOFT_LINK_POINTER(AVFoundation, AVCaptureSessionPresetLow, NSString *)
</span><span class="cx">
</span><span class="cx"> #define AVCaptureSessionPreset1280x720 getAVCaptureSessionPreset1280x720()
</span><span class="lines">@@ -89,14 +95,28 @@
</span><span class="cx"> #define AVCaptureSessionPreset320x240 getAVCaptureSessionPreset320x240()
</span><span class="cx"> #define AVCaptureSessionPresetLow getAVCaptureSessionPresetLow()
</span><span class="cx">
</span><ins>+using namespace WebCore;
+
+@interface WebCoreAVVideoCaptureSourceObserver : NSObject<CALayerDelegate> {
+ AVVideoSourcePreview *_parent;
+ BOOL _hasObserver;
+}
+
+- (void)setParent:(AVVideoSourcePreview *)parent;
+- (void)observeValueForKeyPath:keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context;
+@end
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class AVVideoSourcePreview: public AVMediaSourcePreview {
</span><span class="cx"> public:
</span><del>- static RefPtr<AVMediaSourcePreview> create(AVCaptureSession *, AVCaptureDeviceTypedef *, AVVideoCaptureSource*);
</del><ins>+ static RefPtr<AVMediaSourcePreview> create(AVCaptureSession*, AVCaptureDeviceTypedef*, AVVideoCaptureSource*);
</ins><span class="cx">
</span><ins>+ void backgroundLayerBoundsChanged();
+ PlatformLayer* platformLayer() const final { return m_previewBackgroundLayer.get(); }
+
</ins><span class="cx"> private:
</span><del>- AVVideoSourcePreview(AVCaptureSession *, AVCaptureDeviceTypedef *, AVVideoCaptureSource*);
</del><ins>+ AVVideoSourcePreview(AVCaptureSession*, AVCaptureDeviceTypedef*, AVVideoCaptureSource*);
</ins><span class="cx">
</span><span class="cx"> void invalidate() final;
</span><span class="cx">
</span><span class="lines">@@ -104,13 +124,12 @@
</span><span class="cx"> void pause() const final;
</span><span class="cx"> void setVolume(double) const final { };
</span><span class="cx"> void setEnabled(bool) final;
</span><del>- PlatformLayer* platformLayer() const final { return m_previewBackgroundLayer.get(); }
-
</del><span class="cx"> void setPaused(bool) const;
</span><span class="cx">
</span><span class="cx"> RetainPtr<AVCaptureVideoPreviewLayerType> m_previewLayer;
</span><span class="cx"> RetainPtr<PlatformLayer> m_previewBackgroundLayer;
</span><span class="cx"> RetainPtr<AVCaptureDeviceTypedef> m_device;
</span><ins>+ RetainPtr<WebCoreAVVideoCaptureSourceObserver> m_objcObserver;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RefPtr<AVMediaSourcePreview> AVVideoSourcePreview::create(AVCaptureSession *session, AVCaptureDeviceTypedef* device, AVVideoCaptureSource* parent)
</span><span class="lines">@@ -120,33 +139,40 @@
</span><span class="cx">
</span><span class="cx"> AVVideoSourcePreview::AVVideoSourcePreview(AVCaptureSession *session, AVCaptureDeviceTypedef* device, AVVideoCaptureSource* parent)
</span><span class="cx"> : AVMediaSourcePreview(parent)
</span><ins>+ , m_objcObserver(adoptNS([[WebCoreAVVideoCaptureSourceObserver alloc] init]))
</ins><span class="cx"> {
</span><span class="cx"> m_device = device;
</span><span class="cx"> m_previewLayer = adoptNS([allocAVCaptureVideoPreviewLayerInstance() initWithSession:session]);
</span><del>-#ifndef NDEBUG
- m_previewLayer.get().name = @"AVVideoCaptureSource preview layer";
-#endif
-
</del><span class="cx"> m_previewLayer.get().contentsGravity = kCAGravityResize;
</span><span class="cx"> m_previewLayer.get().anchorPoint = CGPointZero;
</span><del>-#if !PLATFORM(IOS)
- m_previewLayer.get().autoresizingMask = kCALayerWidthSizable | kCALayerHeightSizable;
-#endif
</del><ins>+ [m_previewLayer.get() setDelegate:[WebActionDisablingCALayerDelegate shared]];
</ins><span class="cx">
</span><span class="cx"> m_previewBackgroundLayer = adoptNS([[CALayer alloc] init]);
</span><del>- m_previewBackgroundLayer.get().name = @"AVVideoSourcePreview parent layer";
</del><span class="cx"> m_previewBackgroundLayer.get().contentsGravity = kCAGravityResizeAspect;
</span><span class="cx"> m_previewBackgroundLayer.get().anchorPoint = CGPointZero;
</span><span class="cx"> m_previewBackgroundLayer.get().needsDisplayOnBoundsChange = YES;
</span><del>-#if !PLATFORM(IOS)
- m_previewBackgroundLayer.get().autoresizingMask = kCALayerWidthSizable | kCALayerHeightSizable;
</del><ins>+ [m_previewBackgroundLayer.get() setDelegate:[WebActionDisablingCALayerDelegate shared]];
+
+#ifndef NDEBUG
+ m_previewLayer.get().name = @"AVVideoCaptureSource preview layer";
+ m_previewBackgroundLayer.get().name = @"AVVideoSourcePreview parent layer";
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> [m_previewBackgroundLayer addSublayer:m_previewLayer.get()];
</span><ins>+
+ [m_objcObserver.get() setParent:this];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void AVVideoSourcePreview::backgroundLayerBoundsChanged()
+{
+ if (m_previewBackgroundLayer && m_previewLayer)
+ [m_previewLayer.get() setBounds:m_previewBackgroundLayer.get().bounds];
+}
+
</ins><span class="cx"> void AVVideoSourcePreview::invalidate()
</span><span class="cx"> {
</span><ins>+ [m_objcObserver.get() setParent:nil];
+ m_objcObserver = nullptr;
</ins><span class="cx"> m_previewLayer = nullptr;
</span><span class="cx"> m_previewBackgroundLayer = nullptr;
</span><span class="cx"> m_device = nullptr;
</span><span class="lines">@@ -587,4 +613,46 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><ins>+@implementation WebCoreAVVideoCaptureSourceObserver
+
+static NSString * const KeyValueBoundsChangeKey = @"bounds";
+
+- (void)setParent:(AVVideoSourcePreview *)parent
+{
+ if (_parent && _hasObserver && _parent->platformLayer()) {
+ _hasObserver = false;
+ [_parent->platformLayer() removeObserver:self forKeyPath:KeyValueBoundsChangeKey];
+ }
+
+ _parent = parent;
+
+ if (_parent && _parent->platformLayer()) {
+ _hasObserver = true;
+ [_parent->platformLayer() addObserver:self forKeyPath:KeyValueBoundsChangeKey options:0 context:nullptr];
+ }
+}
+
+- (void)observeValueForKeyPath:keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ UNUSED_PARAM(context);
+
+ if (!_parent)
+ return;
+
+ if ([[change valueForKey:NSKeyValueChangeNotificationIsPriorKey] boolValue])
+ return;
+
+#if PLATFORM(IOS)
+ WebThreadRun(^ {
+ if ([keyPath isEqual:KeyValueBoundsChangeKey] && object == _parent->platformLayer())
+ _parent->backgroundLayerBoundsChanged();
+ });
+#else
+ if ([keyPath isEqual:KeyValueBoundsChangeKey] && object == _parent->platformLayer())
+ _parent->backgroundLayerBoundsChanged();
+#endif
+}
+
+@end
+
</ins><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span></span></pre>
</div>
</div>
</body>
</html>