Title: [214379] trunk/Source/WebKit2
- Revision
- 214379
- Author
- simon.fra...@apple.com
- Date
- 2017-03-24 14:57:08 -0700 (Fri, 24 Mar 2017)
Log Message
Make UI-side compositing on macOS a bit more usable
https://bugs.webkit.org/show_bug.cgi?id=170073
Reviewed by Tim Horton.
Mach port as layer contents doesn't work on macOS, so don't use it there.
Also remove two assertions that hit with UI-side compositing in MiniBrowser.
* UIProcess/DrawingAreaProxy.cpp:
(WebKit::DrawingAreaProxy::createFence):
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::requestScroll):
* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::updateLayerTree):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (214378 => 214379)
--- trunk/Source/WebKit2/ChangeLog 2017-03-24 21:46:07 UTC (rev 214378)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-24 21:57:08 UTC (rev 214379)
@@ -1,3 +1,21 @@
+2017-03-24 Simon Fraser <simon.fra...@apple.com>
+
+ Make UI-side compositing on macOS a bit more usable
+ https://bugs.webkit.org/show_bug.cgi?id=170073
+
+ Reviewed by Tim Horton.
+
+ Mach port as layer contents doesn't work on macOS, so don't use it there.
+
+ Also remove two assertions that hit with UI-side compositing in MiniBrowser.
+
+ * UIProcess/DrawingAreaProxy.cpp:
+ (WebKit::DrawingAreaProxy::createFence):
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::requestScroll):
+ * UIProcess/mac/RemoteLayerTreeHost.mm:
+ (WebKit::RemoteLayerTreeHost::updateLayerTree):
+
2017-03-24 Alex Christensen <achristen...@webkit.org>
Fix assertions after r214358.
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp (214378 => 214379)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2017-03-24 21:46:07 UTC (rev 214378)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxy.cpp 2017-03-24 21:57:08 UTC (rev 214379)
@@ -70,7 +70,6 @@
#if PLATFORM(COCOA)
MachSendRight DrawingAreaProxy::createFence()
{
- ASSERT_NOT_REACHED();
return MachSendRight();
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (214378 => 214379)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2017-03-24 21:46:07 UTC (rev 214378)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2017-03-24 21:57:08 UTC (rev 214379)
@@ -123,7 +123,6 @@
void PageClientImpl::requestScroll(const FloatPoint& scrollPosition, const IntPoint& scrollOrigin, bool isProgrammaticScroll)
{
- ASSERT_NOT_REACHED();
}
WebCore::FloatPoint PageClientImpl::viewScrollPosition()
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (214378 => 214379)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2017-03-24 21:46:07 UTC (rev 214378)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2017-03-24 21:57:08 UTC (rev 214379)
@@ -87,7 +87,12 @@
typedef std::pair<GraphicsLayer::PlatformLayerID, GraphicsLayer::PlatformLayerID> LayerIDPair;
Vector<LayerIDPair> clonesToUpdate;
+#if PLATFORM(MAC)
+ // Can't use the iOS code on macOS yet: rdar://problem/31247730
+ auto layerContentsType = RemoteLayerBackingStore::LayerContentsType::IOSurface;
+#else
auto layerContentsType = m_drawingArea.hasDebugIndicator() ? RemoteLayerBackingStore::LayerContentsType::IOSurface : RemoteLayerBackingStore::LayerContentsType::CAMachPort;
+#endif
for (auto& changedLayer : transaction.changedLayerProperties()) {
auto layerID = changedLayer.key;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
