Title: [250994] trunk/Source/WebCore
Revision
250994
Author
timothy_hor...@apple.com
Date
2019-10-10 15:28:39 -0700 (Thu, 10 Oct 2019)

Log Message

Use HAVE(IOSURFACE_RGB10) instead of PLATFORM(IOS_FAMILY) where appropriate
https://bugs.webkit.org/show_bug.cgi?id=202823

Reviewed by Wenson Hsieh.

* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
(WebCore::layerContentsFormat):
* platform/ios/LegacyTileGridTile.mm:
(WebCore::LegacyTileGridTile::LegacyTileGridTile):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (250993 => 250994)


--- trunk/Source/WebCore/ChangeLog	2019-10-10 22:02:03 UTC (rev 250993)
+++ trunk/Source/WebCore/ChangeLog	2019-10-10 22:28:39 UTC (rev 250994)
@@ -1,3 +1,15 @@
+2019-10-10  Tim Horton  <timothy_hor...@apple.com>
+
+        Use HAVE(IOSURFACE_RGB10) instead of PLATFORM(IOS_FAMILY) where appropriate
+        https://bugs.webkit.org/show_bug.cgi?id=202823
+
+        Reviewed by Wenson Hsieh.
+
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+        (WebCore::layerContentsFormat):
+        * platform/ios/LegacyTileGridTile.mm:
+        (WebCore::LegacyTileGridTile::LegacyTileGridTile):
+
 2019-10-10  Jer Noble  <jer.no...@apple.com>
 
         [Catalina] LayoutTest fast/canvas/webgl/texImage2D-mse-flip-{true,false}.html failing

Modified: trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (250993 => 250994)


--- trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm	2019-10-10 22:02:03 UTC (rev 250993)
+++ trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm	2019-10-10 22:28:39 UTC (rev 250994)
@@ -29,6 +29,7 @@
 #import "AnimationUtilities.h"
 #import "GraphicsContext.h"
 #import "GraphicsLayerCA.h"
+#import "IOSurface.h"
 #import "LengthFunctions.h"
 #import "PlatformCAAnimationCocoa.h"
 #import "PlatformCAFilters.h"
@@ -1037,7 +1038,7 @@
 
 static NSString *layerContentsFormat(bool acceleratesDrawing, bool wantsDeepColor, bool supportsSubpixelAntialiasedFonts)
 {
-#if PLATFORM(IOS_FAMILY)
+#if HAVE(IOSURFACE_RGB10)
     if (wantsDeepColor)
         return kCAContentsFormatRGBA10XR;
 #else

Modified: trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm (250993 => 250994)


--- trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm	2019-10-10 22:02:03 UTC (rev 250993)
+++ trunk/Source/WebCore/platform/ios/LegacyTileGridTile.mm	2019-10-10 22:28:39 UTC (rev 250994)
@@ -29,6 +29,7 @@
 #if PLATFORM(IOS_FAMILY)
 
 #include "Color.h"
+#include "IOSurface.h"
 #include "LegacyTileCache.h"
 #include "LegacyTileGrid.h"
 #include "LegacyTileLayer.h"
@@ -61,8 +62,10 @@
         m_tileLayer = adoptNS([[LegacyTileLayer alloc] init]);
     }
     LegacyTileLayer* layer = m_tileLayer.get();
+#if HAVE(IOSURFACE_RGB10)
     if (screenSupportsExtendedColor())
         layer.contentsFormat = kCAContentsFormatRGBA10XR;
+#endif
 
     [layer setTileGrid:tileGrid];
     [layer setOpaque:m_tileGrid->tileCache().tilesOpaque()];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to