Title: [229718] tags/Safari-606.1.9.4/Source
- Revision
- 229718
- Author
- jmarc...@apple.com
- Date
- 2018-03-19 14:27:23 -0700 (Mon, 19 Mar 2018)
Log Message
Cherry-pick r229679. rdar://problem/38385900
Modified Paths
Diff
Modified: tags/Safari-606.1.9.4/Source/WebCore/ChangeLog (229717 => 229718)
--- tags/Safari-606.1.9.4/Source/WebCore/ChangeLog 2018-03-19 21:27:18 UTC (rev 229717)
+++ tags/Safari-606.1.9.4/Source/WebCore/ChangeLog 2018-03-19 21:27:23 UTC (rev 229718)
@@ -1,5 +1,21 @@
2018-03-19 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r229679. rdar://problem/38385900
+
+ 2018-03-16 Megan Gardner <megan_gard...@apple.com>
+
+ Ensure that style is updated when the effective appearance changes
+ https://bugs.webkit.org/show_bug.cgi?id=183690
+ <rdar://problem/38385900>
+
+ Reviewed by Tim Horton and Wenson Hsieh.
+
+ Only exposing a function to outside WebCore, no tests needed.
+
+ * page/Page.h:
+
+2018-03-19 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r229654. rdar://problem/38382934
2018-03-15 Megan Gardner <megan_gard...@apple.com>
Modified: tags/Safari-606.1.9.4/Source/WebCore/page/Page.h (229717 => 229718)
--- tags/Safari-606.1.9.4/Source/WebCore/page/Page.h 2018-03-19 21:27:18 UTC (rev 229717)
+++ tags/Safari-606.1.9.4/Source/WebCore/page/Page.h 2018-03-19 21:27:23 UTC (rev 229718)
@@ -160,7 +160,7 @@
WEBCORE_EXPORT uint64_t renderTreeSize() const;
- void setNeedsRecalcStyleInAllFrames();
+ WEBCORE_EXPORT void setNeedsRecalcStyleInAllFrames();
WEBCORE_EXPORT ViewportArguments viewportArguments() const;
Modified: tags/Safari-606.1.9.4/Source/WebKit/ChangeLog (229717 => 229718)
--- tags/Safari-606.1.9.4/Source/WebKit/ChangeLog 2018-03-19 21:27:18 UTC (rev 229717)
+++ tags/Safari-606.1.9.4/Source/WebKit/ChangeLog 2018-03-19 21:27:23 UTC (rev 229718)
@@ -1,3 +1,22 @@
+2018-03-19 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r229679. rdar://problem/38385900
+
+ 2018-03-16 Megan Gardner <megan_gard...@apple.com>
+
+ Ensure that style is updated when the effective appearance changes
+ https://bugs.webkit.org/show_bug.cgi?id=183690
+ <rdar://problem/38385900>
+
+ Reviewed by Tim Horton and Wenson Hsieh.
+
+ Respond to and respect the effective appearance changing.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView effectiveAppearanceDidChange]):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setDefaultAppearance):
+
2018-03-16 Jason Marcell <jmarc...@apple.com>
Cherry-pick r229597. rdar://problem/38431469
Modified: tags/Safari-606.1.9.4/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (229717 => 229718)
--- tags/Safari-606.1.9.4/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-03-19 21:27:18 UTC (rev 229717)
+++ tags/Safari-606.1.9.4/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2018-03-19 21:27:23 UTC (rev 229718)
@@ -6167,6 +6167,11 @@
_page->setDefaultAppearance([self _defaultAppearance]);
}
+- (void)effectiveAppearanceDidChange
+{
+ _page->setDefaultAppearance([self _defaultAppearance]);
+}
+
- (void)_setHeaderBannerHeight:(int)height
{
_page->setHeaderBannerHeightForTesting(height);
Modified: tags/Safari-606.1.9.4/Source/WebKit/WebProcess/WebPage/WebPage.cpp (229717 => 229718)
--- tags/Safari-606.1.9.4/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-03-19 21:27:18 UTC (rev 229717)
+++ tags/Safari-606.1.9.4/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2018-03-19 21:27:23 UTC (rev 229718)
@@ -4130,6 +4130,7 @@
void WebPage::setDefaultAppearance(bool defaultAppearance)
{
corePage()->setDefaultAppearance(defaultAppearance);
+ corePage()->setNeedsRecalcStyleInAllFrames();
}
#endif
Modified: tags/Safari-606.1.9.4/Source/WebKitLegacy/mac/ChangeLog (229717 => 229718)
--- tags/Safari-606.1.9.4/Source/WebKitLegacy/mac/ChangeLog 2018-03-19 21:27:18 UTC (rev 229717)
+++ tags/Safari-606.1.9.4/Source/WebKitLegacy/mac/ChangeLog 2018-03-19 21:27:23 UTC (rev 229718)
@@ -1,5 +1,23 @@
2018-03-19 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r229679. rdar://problem/38385900
+
+ 2018-03-16 Megan Gardner <megan_gard...@apple.com>
+
+ Ensure that style is updated when the effective appearance changes
+ https://bugs.webkit.org/show_bug.cgi?id=183690
+ <rdar://problem/38385900>
+
+ Reviewed by Tim Horton and Wenson Hsieh.
+
+ Respond to and respect the effective appearance changing.
+
+ * WebView/WebView.mm:
+ (-[WebView _setUseSystemAppearance:]):
+ (-[WebView effectiveAppearanceDidChange]):
+
+2018-03-19 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r229654. rdar://problem/38382934
2018-03-15 Megan Gardner <megan_gard...@apple.com>
Modified: tags/Safari-606.1.9.4/Source/WebKitLegacy/mac/WebView/WebView.mm (229717 => 229718)
--- tags/Safari-606.1.9.4/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-03-19 21:27:18 UTC (rev 229717)
+++ tags/Safari-606.1.9.4/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-03-19 21:27:23 UTC (rev 229718)
@@ -5202,16 +5202,27 @@
if (auto page = _private->page) {
page->setUseSystemAppearance(useSystemAppearance);
page->setDefaultAppearance([self _defaultAppearance]);
+ page->setNeedsRecalcStyleInAllFrames();
}
}
- (BOOL)_useSystemAppearance
{
- if (auto page = _private->page)
- return page->useSystemAppearance();
- return NO;
+ if (!_private->page)
+ return NO;
+
+ return _private->page->useSystemAppearance();
}
+- (void)effectiveAppearanceDidChange
+{
+ if (!_private->page)
+ return;
+
+ _private->page->setDefaultAppearance([self _defaultAppearance]);
+ _private->page->setNeedsRecalcStyleInAllFrames();
+}
+
- (void)_setSourceApplicationAuditData:(NSData *)sourceApplicationAuditData
{
if (_private->sourceApplicationAuditData == sourceApplicationAuditData)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
