Diff
Modified: branches/safari-610.1.15-branch/Source/WebKit/ChangeLog (262448 => 262449)
--- branches/safari-610.1.15-branch/Source/WebKit/ChangeLog 2020-06-02 21:58:17 UTC (rev 262448)
+++ branches/safari-610.1.15-branch/Source/WebKit/ChangeLog 2020-06-02 21:58:20 UTC (rev 262449)
@@ -1,5 +1,46 @@
2020-06-02 Alan Coon <alanc...@apple.com>
+ Cherry-pick r262429. rdar://problem/63891546
+
+ macCatalyst: WKWebView's tint color is not propagated to Web Content process
+ https://bugs.webkit.org/show_bug.cgi?id=212630
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode const):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/Cocoa/PageClientImplCocoa.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@262429 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-06-02 Tim Horton <timothy_hor...@apple.com>
+
+ macCatalyst: WKWebView's tint color is not propagated to Web Content process
+ https://bugs.webkit.org/show_bug.cgi?id=212630
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode const):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/Cocoa/PageClientImplCocoa.h:
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+
+2020-06-02 Alan Coon <alanc...@apple.com>
+
Cherry-pick r262427. rdar://problem/63891546
REGRESSION (r258949): Dynamic user accent color changes are not respected by WKWebView
Modified: branches/safari-610.1.15-branch/Source/WebKit/Shared/WebPageCreationParameters.cpp (262448 => 262449)
--- branches/safari-610.1.15-branch/Source/WebKit/Shared/WebPageCreationParameters.cpp 2020-06-02 21:58:17 UTC (rev 262448)
+++ branches/safari-610.1.15-branch/Source/WebKit/Shared/WebPageCreationParameters.cpp 2020-06-02 21:58:20 UTC (rev 262449)
@@ -113,6 +113,9 @@
encoder << smartInsertDeleteEnabled;
encoder << additionalSupportedImageTypes;
#endif
+#if ENABLE(TINT_COLOR_SUPPORT)
+ encoder << tintColor;
+#endif
#if USE(WPE_RENDERER)
encoder << hostFileDescriptor;
#endif
@@ -353,6 +356,11 @@
return WTF::nullopt;
#endif
+#if ENABLE(TINT_COLOR_SUPPORT)
+ if (!decoder.decode(parameters.tintColor))
+ return WTF::nullopt;
+#endif
+
#if USE(WPE_RENDERER)
if (!decoder.decode(parameters.hostFileDescriptor))
return WTF::nullopt;
Modified: branches/safari-610.1.15-branch/Source/WebKit/Shared/WebPageCreationParameters.h (262448 => 262449)
--- branches/safari-610.1.15-branch/Source/WebKit/Shared/WebPageCreationParameters.h 2020-06-02 21:58:17 UTC (rev 262448)
+++ branches/safari-610.1.15-branch/Source/WebKit/Shared/WebPageCreationParameters.h 2020-06-02 21:58:20 UTC (rev 262449)
@@ -174,6 +174,9 @@
bool smartInsertDeleteEnabled;
Vector<String> additionalSupportedImageTypes;
#endif
+#if ENABLE(TINT_COLOR_SUPPORT)
+ WebCore::Color tintColor;
+#endif
#if USE(WPE_RENDERER)
IPC::Attachment hostFileDescriptor;
#endif
Modified: branches/safari-610.1.15-branch/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h (262448 => 262449)
--- branches/safari-610.1.15-branch/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h 2020-06-02 21:58:17 UTC (rev 262448)
+++ branches/safari-610.1.15-branch/Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.h 2020-06-02 21:58:20 UTC (rev 262449)
@@ -54,6 +54,10 @@
bool scrollingUpdatesDisabledForTesting() final;
+#if ENABLE(TINT_COLOR_SUPPORT)
+ WebCore::Color tintColor() final;
+#endif
+
#if ENABLE(ATTACHMENT_ELEMENT)
void didInsertAttachment(API::Attachment&, const String& source) final;
void didRemoveAttachment(API::Attachment&) final;
Modified: branches/safari-610.1.15-branch/Source/WebKit/UIProcess/PageClient.h (262448 => 262449)
--- branches/safari-610.1.15-branch/Source/WebKit/UIProcess/PageClient.h 2020-06-02 21:58:17 UTC (rev 262448)
+++ branches/safari-610.1.15-branch/Source/WebKit/UIProcess/PageClient.h 2020-06-02 21:58:20 UTC (rev 262449)
@@ -350,6 +350,10 @@
virtual void didPerformDictionaryLookup(const WebCore::DictionaryPopupInfo&) = 0;
#endif
+#if ENABLE(TINT_COLOR_SUPPORT)
+ virtual WebCore::Color tintColor() = 0;
+#endif
+
virtual bool effectiveAppearanceIsDark() const { return false; }
virtual bool effectiveUserInterfaceLevelIsElevated() const { return false; }
Modified: branches/safari-610.1.15-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (262448 => 262449)
--- branches/safari-610.1.15-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-06-02 21:58:17 UTC (rev 262448)
+++ branches/safari-610.1.15-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-06-02 21:58:20 UTC (rev 262449)
@@ -7804,6 +7804,9 @@
parameters.smartInsertDeleteEnabled = m_isSmartInsertDeleteEnabled;
parameters.additionalSupportedImageTypes = m_configuration->additionalSupportedImageTypes();
#endif
+#if ENABLE(TINT_COLOR_SUPPORT)
+ parameters.tintColor = pageClient().tintColor();
+#endif
parameters.shouldScaleViewToFitDocument = m_shouldScaleViewToFitDocument;
parameters.userInterfaceLayoutDirection = pageClient().userInterfaceLayoutDirection();
parameters.observedLayoutMilestones = m_observedLayoutMilestones;
Modified: branches/safari-610.1.15-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (262448 => 262449)
--- branches/safari-610.1.15-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-06-02 21:58:17 UTC (rev 262448)
+++ branches/safari-610.1.15-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-06-02 21:58:20 UTC (rev 262449)
@@ -723,6 +723,10 @@
WebCore::setAdditionalSupportedImageTypes(parameters.additionalSupportedImageTypes);
#endif
+#if ENABLE(TINT_COLOR_SUPPORT)
+ setTintColor(parameters.tintColor);
+#endif
+
m_needsFontAttributes = parameters.needsFontAttributes;
#if ENABLE(WEB_RTC)
Modified: branches/safari-610.1.15-branch/Source/WebKit/WebProcess/WebPage/WebPage.h (262448 => 262449)
--- branches/safari-610.1.15-branch/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-06-02 21:58:17 UTC (rev 262448)
+++ branches/safari-610.1.15-branch/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-06-02 21:58:20 UTC (rev 262449)
@@ -1563,6 +1563,10 @@
void drawPagesToPDFFromPDFDocument(CGContextRef, PDFDocument *, const PrintInfo&, uint32_t first, uint32_t count);
#endif
+#if ENABLE(TINT_COLOR_SUPPORT)
+ void setTintColor(WebCore::Color);
+#endif
+
void setMainFrameIsScrollable(bool);
void unapplyEditCommand(WebUndoStepID commandID);
