Changeset 230030 in webkit

Timestamp:

Mar 28, 2018 9:10:04 AM (6 years ago)

Author:

timothy_horton@apple.com

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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/mac/LayerHostingContext.mm (modified) (1 diff)
• UIProcess/mac/ViewSnapshotStore.h (modified) (1 diff)
• UIProcess/mac/ViewSnapshotStore.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-28  Tim Horton  <timothy_horton@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_hsieh@apple.com>
 

trunk/Source/WebKit/Platform/mac/LayerHostingContext.mm

@@ -62 +62 @@
     // 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];

trunk/Source/WebKit/UIProcess/mac/ViewSnapshotStore.h

@@ -128 +128 @@
     bool disableSnapshotVolatilityForTesting() const { return m_disableSnapshotVolatility; }
 
-#if !HAVE(IOSURFACE)
+#if !HAVE(IOSURFACE) && HAVE(CORE_ANIMATION_RENDER_SERVER)
     static CAContext *snapshottingContext();
 #endif

trunk/Source/WebKit/UIProcess/mac/ViewSnapshotStore.mm

@@ -61 +61 @@
 }
 
-#if !HAVE(IOSURFACE)
+#if !HAVE(IOSURFACE) && HAVE(CORE_ANIMATION_RENDER_SERVER)
 CAContext *ViewSnapshotStore::snapshottingContext()
 {
@@ -196 +196 @@
     m_surface = nullptr;
 #else
+#if HAVE(CORE_ANIMATION_RENDER_SERVER)
     [ViewSnapshotStore::snapshottingContext() deleteSlot:m_slotID];
+#endif
     m_slotID = 0;
     m_imageSizeInBytes = 0;