Title: [266452] trunk/Source
- Revision
- 266452
- Author
- s...@apple.com
- Date
- 2020-09-02 01:04:12 -0700 (Wed, 02 Sep 2020)
Log Message
Unreviewed, reverting r266449.
Underlying frameworks do not work correctly for loopCount >=
1.
Reverted changeset:
"[CG] REGRESSION (Big Sur): A GIF image with a finite
loopCount loops an extra cycle"
https://bugs.webkit.org/show_bug.cgi?id=216018
https://trac.webkit.org/changeset/266449
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (266451 => 266452)
--- trunk/Source/WTF/ChangeLog 2020-09-02 06:57:07 UTC (rev 266451)
+++ trunk/Source/WTF/ChangeLog 2020-09-02 08:04:12 UTC (rev 266452)
@@ -1,3 +1,17 @@
+2020-09-02 Said Abou-Hallawa <sabouhall...@apple.com>
+
+ Unreviewed, reverting r266449.
+
+ Underlying frameworks do not work correctly for loopCount >=
+ 1.
+
+ Reverted changeset:
+
+ "[CG] REGRESSION (Big Sur): A GIF image with a finite
+ loopCount loops an extra cycle"
+ https://bugs.webkit.org/show_bug.cgi?id=216018
+ https://trac.webkit.org/changeset/266449
+
2020-09-01 Said Abou-Hallawa <sabouhall...@apple.com>
[CG] REGRESSION (Big Sur): A GIF image with a finite loopCount loops an extra cycle
Modified: trunk/Source/WTF/wtf/PlatformHave.h (266451 => 266452)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-09-02 06:57:07 UTC (rev 266451)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-09-02 08:04:12 UTC (rev 266452)
@@ -380,6 +380,14 @@
#define HAVE_ACCESSIBILITY_BUNDLES_PATH 1
#endif
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
+ || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
+ || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000) \
+ || (PLATFORM(MACCATALYST) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#define HAVE_PRECONNECT_PING 1
+#endif
+
#if PLATFORM(COCOA) && !(PLATFORM(MAC) && !(__MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101404))
#define HAVE_CFNETWORK_OVERRIDE_SESSION_COOKIE_ACCEPT_POLICY 1
#endif
@@ -407,6 +415,14 @@
#define HAVE_BROKEN_DOWNLOAD_RESUME_UNLINK 1
#endif
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
+ || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
+ || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000) \
+ || PLATFORM(MACCATALYST)
+#define HAVE_HSTS_STORAGE 1
+#endif
+
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
#define HAVE_CFNETWORK_METRICS_APIS_V4 1
#endif
@@ -582,6 +598,10 @@
#define HAVE_GCCONTROLLER_HID_DEVICE_CHECK 1
#endif
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000)
+#define HAVE_WEBP 1
+#endif
+
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
#define HAVE_INCREMENTAL_PDF_APIS 1
#endif
@@ -659,6 +679,13 @@
#define HAVE_LOGGING_PRIVACY_LEVEL 1
#endif
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
+ || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
+ || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#define HAVE_CF_PREFS_SET_READ_ONLY 1
+#endif
+
#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
#define HAVE_FRONTBOARD_SYSTEM_APP_SERVICES 1
#endif
@@ -667,10 +694,24 @@
#define HAVE_CPU_TRANSLATION_CAPABILITY 1
#endif
+#if (((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
+ || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000) \
+ || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000))
+#define HAVE_PTHREAD_JIT_PERMISSIONS_API 1
+#endif
+
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
#define HAVE_APP_ACCENT_COLORS 1
#endif
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
+ || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
+ || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
+ || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
+#define HAVE_LSDATABASECONTEXT 1
+#endif
+
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
#define HAVE_AVROUTEPICKERVIEW 1
#endif
@@ -689,12 +730,5 @@
|| ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) \
|| (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
|| (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
-#define HAVE_CF_PREFS_SET_READ_ONLY 1
#define HAVE_CFNETWORK_CNAME_AND_COOKIE_TRANSFORM_SPI 1
-#define HAVE_CGIMAGESOURCE_WITH_ACCURATE_LOOP_COUNT 1
-#define HAVE_HSTS_STORAGE 1
-#define HAVE_LSDATABASECONTEXT 1
-#define HAVE_PRECONNECT_PING 1
-#define HAVE_PTHREAD_JIT_PERMISSIONS_API 1
-#define HAVE_WEBP 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (266451 => 266452)
--- trunk/Source/WebCore/ChangeLog 2020-09-02 06:57:07 UTC (rev 266451)
+++ trunk/Source/WebCore/ChangeLog 2020-09-02 08:04:12 UTC (rev 266452)
@@ -1,3 +1,17 @@
+2020-09-02 Said Abou-Hallawa <sabouhall...@apple.com>
+
+ Unreviewed, reverting r266449.
+
+ Underlying frameworks do not work correctly for loopCount >=
+ 1.
+
+ Reverted changeset:
+
+ "[CG] REGRESSION (Big Sur): A GIF image with a finite
+ loopCount loops an extra cycle"
+ https://bugs.webkit.org/show_bug.cgi?id=216018
+ https://trac.webkit.org/changeset/266449
+
2020-09-01 Said Abou-Hallawa <sabouhall...@apple.com>
[CG] REGRESSION (Big Sur): A GIF image with a finite loopCount loops an extra cycle
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp (266451 => 266452)
--- trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp 2020-09-02 06:57:07 UTC (rev 266451)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp 2020-09-02 08:04:12 UTC (rev 266452)
@@ -294,9 +294,6 @@
if (!loopCount)
return RepetitionCountInfinite;
-#if HAVE(CGIMAGESOURCE_WITH_ACCURATE_LOOP_COUNT)
- return loopCount;
-#else
if (!isGIFImageType(uti()))
return loopCount;
@@ -303,7 +300,6 @@
// For GIF and loopCount > 0, the specs is not clear about it. But it looks the meaning
// is: play once + loop loopCount which is equivalent to play loopCount + 1.
return loopCount + 1;
-#endif
}
Optional<IntPoint> ImageDecoderCG::hotSpot() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes