Title: [291204] trunk/Source/WebCore
- Revision
- 291204
- Author
- pvol...@apple.com
- Date
- 2022-03-11 19:15:58 -0800 (Fri, 11 Mar 2022)
Log Message
[macOS] Image decoders should be restricted for Mail
https://bugs.webkit.org/show_bug.cgi?id=237717
<rdar://89827733>
Reviewed by Geoffrey Garen.
Use correct prefix for static member.
* platform/graphics/cg/ImageDecoderCG.cpp:
(WebCore::ImageDecoderCG::enableRestrictedDecoding):
(WebCore::ImageDecoderCG::restrictedDecodingEnabled):
* platform/graphics/cg/ImageDecoderCG.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (291203 => 291204)
--- trunk/Source/WebCore/ChangeLog 2022-03-12 02:33:04 UTC (rev 291203)
+++ trunk/Source/WebCore/ChangeLog 2022-03-12 03:15:58 UTC (rev 291204)
@@ -1,3 +1,18 @@
+2022-03-11 Per Arne Vollan <pvol...@apple.com>
+
+ [macOS] Image decoders should be restricted for Mail
+ https://bugs.webkit.org/show_bug.cgi?id=237717
+ <rdar://89827733>
+
+ Reviewed by Geoffrey Garen.
+
+ Use correct prefix for static member.
+
+ * platform/graphics/cg/ImageDecoderCG.cpp:
+ (WebCore::ImageDecoderCG::enableRestrictedDecoding):
+ (WebCore::ImageDecoderCG::restrictedDecodingEnabled):
+ * platform/graphics/cg/ImageDecoderCG.h:
+
2022-03-11 Wenson Hsieh <wenson_hs...@apple.com>
Refactor the filter block in DocumentMarkerController::filterMarkers() to return an enum type
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp (291203 => 291204)
--- trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp 2022-03-12 02:33:04 UTC (rev 291203)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp 2022-03-12 03:15:58 UTC (rev 291204)
@@ -255,7 +255,7 @@
}
#endif
-bool ImageDecoderCG::m_enableRestrictedDecoding = false;
+bool ImageDecoderCG::s_enableRestrictedDecoding = false;
ImageDecoderCG::ImageDecoderCG(FragmentedSharedBuffer& data, AlphaOption, GammaAndColorProfileOption)
{
@@ -599,12 +599,12 @@
void ImageDecoderCG::enableRestrictedDecoding()
{
- m_enableRestrictedDecoding = true;
+ s_enableRestrictedDecoding = true;
}
bool ImageDecoderCG::restrictedDecodingEnabled()
{
- return m_enableRestrictedDecoding;
+ return s_enableRestrictedDecoding;
}
}
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h (291203 => 291204)
--- trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h 2022-03-12 02:33:04 UTC (rev 291203)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.h 2022-03-12 03:15:58 UTC (rev 291204)
@@ -75,7 +75,7 @@
bool m_isAllDataReceived { false };
mutable EncodedDataStatus m_encodedDataStatus { EncodedDataStatus::Unknown };
RetainPtr<CGImageSourceRef> m_nativeDecoder;
- static bool m_enableRestrictedDecoding;
+ static bool s_enableRestrictedDecoding;
};
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
