Title: [230030] trunk/Source/WebKit
- Revision
- 230030
- Author
- timothy_hor...@apple.com
- Date
- 2018-03-28 09:10:04 -0700 (Wed, 28 Mar 2018)
Log Message
Make use of HAVE(CORE_ANIMATION_RENDER_SERVER) in more places
https://bugs.webkit.org/show_bug.cgi?id=184072
<rdar://problem/38946530>
Reviewed by Dan Bernstein.
* Platform/mac/LayerHostingContext.mm:
(WebKit::LayerHostingContext::createForExternalHostingProcess):
* UIProcess/mac/ViewSnapshotStore.h:
* UIProcess/mac/ViewSnapshotStore.mm:
(WebKit::ViewSnapshot::clearImage):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (230029 => 230030)
--- trunk/Source/WebKit/ChangeLog 2018-03-28 14:39:01 UTC (rev 230029)
+++ trunk/Source/WebKit/ChangeLog 2018-03-28 16:10:04 UTC (rev 230030)
@@ -1,3 +1,17 @@
+2018-03-28 Tim Horton <timothy_hor...@apple.com>
+
+ Make use of HAVE(CORE_ANIMATION_RENDER_SERVER) in more places
+ https://bugs.webkit.org/show_bug.cgi?id=184072
+ <rdar://problem/38946530>
+
+ Reviewed by Dan Bernstein.
+
+ * Platform/mac/LayerHostingContext.mm:
+ (WebKit::LayerHostingContext::createForExternalHostingProcess):
+ * UIProcess/mac/ViewSnapshotStore.h:
+ * UIProcess/mac/ViewSnapshotStore.mm:
+ (WebKit::ViewSnapshot::clearImage):
+
2018-03-28 Wenson Hsieh <wenson_hs...@apple.com>
Revert an unnecessary workaround when zooming focused form controls
Modified: trunk/Source/WebKit/Platform/mac/LayerHostingContext.mm (230029 => 230030)
--- trunk/Source/WebKit/Platform/mac/LayerHostingContext.mm 2018-03-28 14:39:01 UTC (rev 230029)
+++ trunk/Source/WebKit/Platform/mac/LayerHostingContext.mm 2018-03-28 16:10:04 UTC (rev 230030)
@@ -61,8 +61,11 @@
// Use a very large display ID to ensure that the context is never put on-screen
// without being explicitly parented. See <rdar://problem/16089267> for details.
layerHostingContext->m_context = [CAContext remoteContextWithOptions:@{
+#if HAVE(CORE_ANIMATION_RENDER_SERVER)
kCAContextIgnoresHitTest : @YES,
- kCAContextDisplayId : @10000 }];
+ kCAContextDisplayId : @10000
+#endif
+ }];
#elif __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
[CAContext setAllowsCGSConnections:NO];
layerHostingContext->m_context = [CAContext remoteContextWithOptions:@{kCAContextCIFilterBehavior : @"ignore"}];
Modified: trunk/Source/WebKit/UIProcess/mac/ViewSnapshotStore.h (230029 => 230030)
--- trunk/Source/WebKit/UIProcess/mac/ViewSnapshotStore.h 2018-03-28 14:39:01 UTC (rev 230029)
+++ trunk/Source/WebKit/UIProcess/mac/ViewSnapshotStore.h 2018-03-28 16:10:04 UTC (rev 230030)
@@ -127,7 +127,7 @@
void setDisableSnapshotVolatilityForTesting(bool disable) { m_disableSnapshotVolatility = disable; }
bool disableSnapshotVolatilityForTesting() const { return m_disableSnapshotVolatility; }
-#if !HAVE(IOSURFACE)
+#if !HAVE(IOSURFACE) && HAVE(CORE_ANIMATION_RENDER_SERVER)
static CAContext *snapshottingContext();
#endif
Modified: trunk/Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm (230029 => 230030)
--- trunk/Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm 2018-03-28 14:39:01 UTC (rev 230029)
+++ trunk/Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm 2018-03-28 16:10:04 UTC (rev 230030)
@@ -60,7 +60,7 @@
return store;
}
-#if !HAVE(IOSURFACE)
+#if !HAVE(IOSURFACE) && HAVE(CORE_ANIMATION_RENDER_SERVER)
CAContext *ViewSnapshotStore::snapshottingContext()
{
static CAContext *context;
@@ -195,7 +195,9 @@
#if HAVE(IOSURFACE)
m_surface = nullptr;
#else
+#if HAVE(CORE_ANIMATION_RENDER_SERVER)
[ViewSnapshotStore::snapshottingContext() deleteSlot:m_slotID];
+#endif
m_slotID = 0;
m_imageSizeInBytes = 0;
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
