Changeset 232016 in webkit

Timestamp:

May 21, 2018, 9:33:46 AM (7 years ago)

Author:

Antti Koivisto

Message:

WebView._preferencesChanged should apply colorFilterEnabled preference before parsing user stylesheet
​https://bugs.webkit.org/show_bug.cgi?id=185815
<rdar://problem/40310069>

Reviewed by Simon Fraser.

User stylesheet parsing may depend on the colorFilterEnabled preference.

• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (3 diffs)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2018-05-21  Antti Koivisto  <antti@apple.com>
+
+        WebView._preferencesChanged should apply colorFilterEnabled preference before parsing user stylesheet
+        https://bugs.webkit.org/show_bug.cgi?id=185815
+        <rdar://problem/40310069>
+
+        Reviewed by Simon Fraser.
+
+        User stylesheet parsing may depend on the colorFilterEnabled preference.
+
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2018-05-18  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -2953 +2953 @@
     settings.setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
     settings.setHttpEquivEnabled([preferences httpEquivEnabled]);
+    settings.setColorFilterEnabled([preferences colorFilterEnabled]);
 
 #if PLATFORM(MAC)
@@ -2993 +2994 @@
 
 #if PLATFORM(MAC)
+    // This parses the user stylesheet synchronously so anything that may affect it should be done first.
     if ([preferences userStyleSheetEnabled]) {
         NSString* location = [[preferences userStyleSheetLocation] _web_originalDataAsString];
@@ -3062 +3064 @@
     settings.setViewportFitEnabled([preferences viewportFitEnabled]);
     settings.setConstantPropertiesEnabled([preferences constantPropertiesEnabled]);
-    settings.setColorFilterEnabled([preferences colorFilterEnabled]);
     settings.setCrossOriginOptionsSupportEnabled([preferences crossOriginOptionsSupportEnabled]);