Title: [230185] tags/Safari-606.1.7.4/Source
Revision
230185
Author
[email protected]
Date
2018-04-02 14:06:26 -0700 (Mon, 02 Apr 2018)

Log Message

Cherry-pick r229679. rdar://problem/38385900

    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.

    Source/WebCore:

    Only exposing a function to outside WebCore, no tests needed.

    * page/Page.h:

    Source/WebKit:

    Respond to and respect the effective appearance changing.

    * UIProcess/API/Cocoa/WKWebView.mm:
    (-[WKWebView effectiveAppearanceDidChange]):
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::setDefaultAppearance):

    Source/WebKitLegacy/mac:

    Respond to and respect the effective appearance changing.

    * WebView/WebView.mm:
    (-[WebView _setUseSystemAppearance:]):
    (-[WebView effectiveAppearanceDidChange]):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229679 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: tags/Safari-606.1.7.4/Source/WebCore/ChangeLog (230184 => 230185)


--- tags/Safari-606.1.7.4/Source/WebCore/ChangeLog	2018-04-02 21:06:22 UTC (rev 230184)
+++ tags/Safari-606.1.7.4/Source/WebCore/ChangeLog	2018-04-02 21:06:26 UTC (rev 230185)
@@ -1,5 +1,54 @@
 2018-04-02  Jason Marcell  <[email protected]>
 
+        Cherry-pick r229679. rdar://problem/38385900
+
+    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.
+    
+    Source/WebCore:
+    
+    Only exposing a function to outside WebCore, no tests needed.
+    
+    * page/Page.h:
+    
+    Source/WebKit:
+    
+    Respond to and respect the effective appearance changing.
+    
+    * UIProcess/API/Cocoa/WKWebView.mm:
+    (-[WKWebView effectiveAppearanceDidChange]):
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::WebPage::setDefaultAppearance):
+    
+    Source/WebKitLegacy/mac:
+    
+    Respond to and respect the effective appearance changing.
+    
+    * WebView/WebView.mm:
+    (-[WebView _setUseSystemAppearance:]):
+    (-[WebView effectiveAppearanceDidChange]):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229679 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-03-16  Megan Gardner  <[email protected]>
+
+            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-04-02  Jason Marcell  <[email protected]>
+
         Cherry-pick r229654. rdar://problem/38382934
 
     Create MediaQueryParserContext to provide additional context for the evaluation of media queries

Modified: tags/Safari-606.1.7.4/Source/WebCore/page/Page.h (230184 => 230185)


--- tags/Safari-606.1.7.4/Source/WebCore/page/Page.h	2018-04-02 21:06:22 UTC (rev 230184)
+++ tags/Safari-606.1.7.4/Source/WebCore/page/Page.h	2018-04-02 21:06:26 UTC (rev 230185)
@@ -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.7.4/Source/WebKit/ChangeLog (230184 => 230185)


--- tags/Safari-606.1.7.4/Source/WebKit/ChangeLog	2018-04-02 21:06:22 UTC (rev 230184)
+++ tags/Safari-606.1.7.4/Source/WebKit/ChangeLog	2018-04-02 21:06:26 UTC (rev 230185)
@@ -1,5 +1,57 @@
 2018-04-02  Jason Marcell  <[email protected]>
 
+        Cherry-pick r229679. rdar://problem/38385900
+
+    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.
+    
+    Source/WebCore:
+    
+    Only exposing a function to outside WebCore, no tests needed.
+    
+    * page/Page.h:
+    
+    Source/WebKit:
+    
+    Respond to and respect the effective appearance changing.
+    
+    * UIProcess/API/Cocoa/WKWebView.mm:
+    (-[WKWebView effectiveAppearanceDidChange]):
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::WebPage::setDefaultAppearance):
+    
+    Source/WebKitLegacy/mac:
+    
+    Respond to and respect the effective appearance changing.
+    
+    * WebView/WebView.mm:
+    (-[WebView _setUseSystemAppearance:]):
+    (-[WebView effectiveAppearanceDidChange]):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229679 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-03-16  Megan Gardner  <[email protected]>
+
+            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-04-02  Jason Marcell  <[email protected]>
+
         Cherry-pick r229511. rdar://problem/38326388
 
     Media query for default appearance

Modified: tags/Safari-606.1.7.4/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (230184 => 230185)


--- tags/Safari-606.1.7.4/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2018-04-02 21:06:22 UTC (rev 230184)
+++ tags/Safari-606.1.7.4/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm	2018-04-02 21:06:26 UTC (rev 230185)
@@ -6159,6 +6159,11 @@
     _page->setDefaultAppearance([self _defaultAppearance]);
 }
 
+- (void)effectiveAppearanceDidChange
+{
+    _page->setDefaultAppearance([self _defaultAppearance]);
+}
+
 - (void)_setHeaderBannerHeight:(int)height
 {
     _page->setHeaderBannerHeightForTesting(height);

Modified: tags/Safari-606.1.7.4/Source/WebKit/WebProcess/WebPage/WebPage.cpp (230184 => 230185)


--- tags/Safari-606.1.7.4/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2018-04-02 21:06:22 UTC (rev 230184)
+++ tags/Safari-606.1.7.4/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2018-04-02 21:06:26 UTC (rev 230185)
@@ -4130,6 +4130,7 @@
 void WebPage::setDefaultAppearance(bool defaultAppearance)
 {
     corePage()->setDefaultAppearance(defaultAppearance);
+    corePage()->setNeedsRecalcStyleInAllFrames();
 }
 #endif
 

Modified: tags/Safari-606.1.7.4/Source/WebKitLegacy/mac/ChangeLog (230184 => 230185)


--- tags/Safari-606.1.7.4/Source/WebKitLegacy/mac/ChangeLog	2018-04-02 21:06:22 UTC (rev 230184)
+++ tags/Safari-606.1.7.4/Source/WebKitLegacy/mac/ChangeLog	2018-04-02 21:06:26 UTC (rev 230185)
@@ -1,5 +1,56 @@
 2018-04-02  Jason Marcell  <[email protected]>
 
+        Cherry-pick r229679. rdar://problem/38385900
+
+    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.
+    
+    Source/WebCore:
+    
+    Only exposing a function to outside WebCore, no tests needed.
+    
+    * page/Page.h:
+    
+    Source/WebKit:
+    
+    Respond to and respect the effective appearance changing.
+    
+    * UIProcess/API/Cocoa/WKWebView.mm:
+    (-[WKWebView effectiveAppearanceDidChange]):
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::WebPage::setDefaultAppearance):
+    
+    Source/WebKitLegacy/mac:
+    
+    Respond to and respect the effective appearance changing.
+    
+    * WebView/WebView.mm:
+    (-[WebView _setUseSystemAppearance:]):
+    (-[WebView effectiveAppearanceDidChange]):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@229679 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-03-16  Megan Gardner  <[email protected]>
+
+            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-04-02  Jason Marcell  <[email protected]>
+
         Cherry-pick r229654. rdar://problem/38382934
 
     Create MediaQueryParserContext to provide additional context for the evaluation of media queries

Modified: tags/Safari-606.1.7.4/Source/WebKitLegacy/mac/WebView/WebView.mm (230184 => 230185)


--- tags/Safari-606.1.7.4/Source/WebKitLegacy/mac/WebView/WebView.mm	2018-04-02 21:06:22 UTC (rev 230184)
+++ tags/Safari-606.1.7.4/Source/WebKitLegacy/mac/WebView/WebView.mm	2018-04-02 21:06:26 UTC (rev 230185)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to