Diff
Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:21:53 UTC (rev 184472)
@@ -1,5 +1,59 @@
2015-05-18 Matthew Hanson <[email protected]>
+ Merge r184011. rdar://problem/19790341
+
+ 2015-05-08 Timothy Horton <[email protected]>
+
+ Flip the direction of the fence in scaleViewAndUpdateGeometryFenced
+ https://bugs.webkit.org/show_bug.cgi?id=144810
+
+ Reviewed by Simon Fraser.
+
+ Send the fence from the Web process to the UI process, instead of vice versa.
+ This means that we won't keep the UI process CAContext blocked for the whole
+ time that the Web process is doing layout/painting/etc. Instead, we'll start
+ blocking the Web process CAContext immediately after flushing and before committing,
+ and send the fence to the UI process to be applied immediately. This minimizes
+ the amount of time in both processes spent blocked on the fence.
+
+ * Platform/mac/LayerHostingContext.h:
+ * Platform/mac/LayerHostingContext.mm:
+ (WebKit::LayerHostingContext::createFencePort):
+ Add createFencePort, which creates a MachSendRight wrapping a CA fence port.
+ Note that you must setFencePort() with this port if you want the LayerHostingContext's
+ CAContext to block on it!
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::scaleViewAndUpdateGeometryFenced):
+ (WebKit::WebPageProxy::machSendRightCallback):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ Create a callback and send it to the Web process along with scaleViewAndUpdateGeometryFenced.
+
+ * UIProcess/mac/WKViewLayoutStrategy.mm:
+ (-[WKViewDynamicSizeWithMinimumViewSizeLayoutStrategy updateLayout]):
+ When called back, install the fence port in our CAContext; when the commit goes through,
+ remove the transient scale as we did previously.
+
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::replyWithFenceAfterNextFlush):
+ (WebKit::DrawingArea::updateGeometry): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::scaleViewAndUpdateGeometryFenced):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ Instead of installing a fence created in the UI process, tell the DrawingArea
+ to create one and reply to the UI process with it after the next flush.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::flushLayers):
+ (WebKit::TiledCoreAnimationDrawingArea::replyWithFenceAfterNextFlush):
+ After flushing, before committing, create a fence and reply to any
+ callbacks that requested fences, and install it in our context.
+
+2015-05-18 Matthew Hanson <[email protected]>
+
Merge r183978. rdar://problem/20635659
2015-05-07 Conrad Shultz <[email protected]>
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-05-18 14:21:53 UTC (rev 184472)
@@ -62,9 +62,14 @@
void setColorSpace(CGColorSpaceRef);
CGColorSpaceRef colorSpace() const;
- // This only works on iOS and OS 10.10+
+ // Fences only work on iOS and OS 10.10+.
void setFencePort(mach_port_t);
+ // createFencePort does not install the fence port on the LayerHostingContext's
+ // CAContext; call setFencePort() with the newly created port if synchronization
+ // with this context is desired.
+ WebCore::MachSendRight createFencePort();
+
private:
LayerHostingMode m_layerHostingMode;
RetainPtr<CAContext> m_context;
Modified: branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-05-18 14:21:53 UTC (rev 184472)
@@ -107,11 +107,21 @@
{
[m_context setFencePort:fencePort];
}
+
+MachSendRight LayerHostingContext::createFencePort()
+{
+ return MachSendRight::adopt([m_context createFencePort]);
+}
#else
NO_RETURN_DUE_TO_ASSERT void LayerHostingContext::setFencePort(mach_port_t fencePort)
{
ASSERT_NOT_REACHED();
}
+
+NO_RETURN_DUE_TO_ASSERT const MachSendRight& LayerHostingContext::createFencePort()
+{
+ ASSERT_NOT_REACHED();
+}
#endif
} // namespace WebKit
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-18 14:21:53 UTC (rev 184472)
@@ -2248,15 +2248,18 @@
}
#if PLATFORM(COCOA)
-void WebPageProxy::scaleViewAndUpdateGeometryFenced(double scale, IntSize viewSize, const MachSendRight& fencePort)
+void WebPageProxy::scaleViewAndUpdateGeometryFenced(double scale, IntSize viewSize, std::function<void (const MachSendRight&, CallbackBase::Error)> callback)
{
- if (!isValid())
+ if (!isValid()) {
+ callback(MachSendRight(), CallbackBase::Error::OwnerWasInvalidated);
return;
+ }
m_viewScaleFactor = scale;
if (m_drawingArea)
m_drawingArea->willSendUpdateGeometry();
- m_process->send(Messages::WebPage::ScaleViewAndUpdateGeometryFenced(scale, viewSize, fencePort), m_pageID);
+ uint64_t callbackID = m_callbacks.put(WTF::move(callback), m_process->throttler().backgroundActivityToken());
+ m_process->send(Messages::WebPage::ScaleViewAndUpdateGeometryFenced(scale, viewSize, callbackID), m_pageID);
}
#endif
@@ -4656,6 +4659,17 @@
callback->performCallbackWithReturnValue(range);
}
+#if PLATFORM(COCOA)
+void WebPageProxy::machSendRightCallback(const MachSendRight& sendRight, uint64_t callbackID)
+{
+ auto callback = m_callbacks.take<MachSendRightCallback>(callbackID);
+ if (!callback)
+ return;
+
+ callback->performCallbackWithReturnValue(sendRight);
+}
+#endif
+
static bool shouldLogDiagnosticMessage(bool shouldSample)
{
if (!shouldSample)
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-18 14:21:53 UTC (rev 184472)
@@ -242,6 +242,10 @@
typedef GenericCallback<const WebCore::IntPoint&, uint32_t> TouchesCallback;
#endif
+#if PLATFORM(COCOA)
+typedef GenericCallback<const WebCore::MachSendRight&> MachSendRightCallback;
+#endif
+
struct WebPageConfiguration {
WebPageGroup* pageGroup = nullptr;
WebPreferences* preferences = nullptr;
@@ -649,7 +653,7 @@
double viewScaleFactor() const { return m_viewScaleFactor; }
void scaleView(double scale);
#if PLATFORM(COCOA)
- void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, const WebCore::MachSendRight& fencePort);
+ void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, std::function<void (const WebCore::MachSendRight&, CallbackBase::Error)>);
#endif
float deviceScaleFactor() const;
@@ -1313,6 +1317,9 @@
void validateCommandCallback(const String&, bool, int, uint64_t);
void unsignedCallback(uint64_t, uint64_t);
void editingRangeCallback(const EditingRange&, uint64_t);
+#if PLATFORM(COCOA)
+ void machSendRightCallback(const WebCore::MachSendRight&, uint64_t);
+#endif
void rectForCharacterRangeCallback(const WebCore::IntRect&, const EditingRange&, uint64_t);
#if PLATFORM(MAC)
void attributedStringForCharacterRangeCallback(const AttributedString&, const EditingRange&, uint64_t);
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-05-18 14:21:53 UTC (rev 184472)
@@ -194,6 +194,9 @@
#if PLATFORM(GTK)
PrintFinishedCallback(WebCore::ResourceError error, uint64_t callbackID)
#endif
+#if PLATFORM(COCOA)
+ MachSendRightCallback(WebCore::MachSendRight sendRight, uint64_t callbackID)
+#endif
PageScaleFactorDidChange(double scaleFactor)
PluginScaleFactorDidChange(double zoomFactor)
Modified: branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/UIProcess/mac/WKViewLayoutStrategy.mm 2015-05-18 14:21:53 UTC (rev 184472)
@@ -293,12 +293,13 @@
_wkView._rootLayer.transform = transform;
} else if (scale != _page->viewScaleFactor()) {
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- CAContext *context = [_wkView.layer context];
- MachSendRight fencePort = MachSendRight::adopt([context createFencePort]);
- _page->scaleViewAndUpdateGeometryFenced(scale, IntSize(_wkView.frame.size), fencePort);
- [context setFencePort:fencePort.sendRight() commitHandler:^{
- _wkView._rootLayer.transform = CATransform3DIdentity;
- }];
+ RetainPtr<CAContext> context = [_wkView.layer context];
+ RetainPtr<WKView> retainedWKView = _wkView;
+ _page->scaleViewAndUpdateGeometryFenced(scale, IntSize(_wkView.frame.size), [retainedWKView, context] (const WebCore::MachSendRight& fencePort, CallbackBase::Error) {
+ [context setFencePort:fencePort.sendRight() commitHandler:^{
+ [retainedWKView _rootLayer].transform = CATransform3DIdentity;
+ }];
+ });
#else
_page->scaleView(scale);
_wkView._rootLayer.transform = CATransform3DIdentity;
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2015-05-18 14:21:53 UTC (rev 184472)
@@ -129,6 +129,8 @@
#if PLATFORM(COCOA)
// Used by TiledCoreAnimationDrawingArea.
virtual void updateGeometry(const WebCore::IntSize& viewSize, const WebCore::IntSize& layerPosition, bool flushSynchronously) { }
+
+ virtual void replyWithFenceAfterNextFlush(uint64_t callbackID) { ASSERT_NOT_REACHED(); }
#endif
protected:
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-05-18 14:21:53 UTC (rev 184472)
@@ -1449,11 +1449,11 @@
#if PLATFORM(COCOA)
-void WebPage::scaleViewAndUpdateGeometryFenced(double scale, IntSize viewSize, const MachSendRight& fencePort)
+void WebPage::scaleViewAndUpdateGeometryFenced(double scale, IntSize viewSize, uint64_t callbackID)
{
scaleView(scale);
m_drawingArea->updateGeometry(viewSize, IntSize(), false);
- m_drawingArea->addFence(fencePort);
+ m_drawingArea->replyWithFenceAfterNextFlush(callbackID);
}
#endif
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-05-18 14:21:53 UTC (rev 184472)
@@ -362,7 +362,7 @@
double viewScaleFactor() const { return m_viewScaleFactor; }
void scaleView(double scale);
#if PLATFORM(COCOA)
- void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, const WebCore::MachSendRight& fencePort);
+ void scaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, uint64_t callbackID);
#endif
void setUseFixedLayout(bool);
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-05-18 14:21:53 UTC (rev 184472)
@@ -203,7 +203,7 @@
ScalePageInViewCoordinates(double scale, WebCore::IntPoint centerInViewCoordinates)
ScaleView(double scale)
#if PLATFORM(COCOA)
- ScaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, WebCore::MachSendRight fencePort)
+ ScaleViewAndUpdateGeometryFenced(double scale, WebCore::IntSize viewSize, uint64_t callbackID)
#endif
SetUseFixedLayout(bool fixed)
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-05-18 14:21:53 UTC (rev 184472)
@@ -86,6 +86,8 @@
virtual void attachViewOverlayGraphicsLayer(WebCore::Frame*, WebCore::GraphicsLayer*) override;
+ virtual void replyWithFenceAfterNextFlush(uint64_t callbackID) override;
+
// WebCore::LayerFlushSchedulerClient
virtual bool flushLayers() override;
@@ -146,6 +148,8 @@
bool m_wantsDidUpdateViewState;
WebCore::GraphicsLayer* m_viewOverlayRootLayer;
+
+ Vector<uint64_t> m_fenceCallbacksForAfterNextFlush;
};
} // namespace WebKit
Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (184471 => 184472)
--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-05-18 14:21:37 UTC (rev 184471)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-05-18 14:21:53 UTC (rev 184472)
@@ -329,6 +329,16 @@
if (m_transientZoomScale != 1)
applyTransientZoomToLayers(m_transientZoomScale, m_transientZoomOrigin);
+ if (!m_fenceCallbacksForAfterNextFlush.isEmpty()) {
+ MachSendRight fencePort = m_layerHostingContext->createFencePort();
+
+ for (auto callbackID : m_fenceCallbacksForAfterNextFlush)
+ m_webPage.send(Messages::WebPageProxy::MachSendRightCallback(fencePort, callbackID));
+ m_fenceCallbacksForAfterNextFlush.clear();
+
+ m_layerHostingContext->setFencePort(fencePort.sendRight());
+ }
+
return returnValue;
}
}
@@ -746,6 +756,11 @@
m_layerHostingContext->setFencePort(fencePort.sendRight());
}
+void TiledCoreAnimationDrawingArea::replyWithFenceAfterNextFlush(uint64_t callbackID)
+{
+ m_fenceCallbacksForAfterNextFlush.append(callbackID);
+}
+
} // namespace WebKit
#endif // !PLATFORM(IOS)
