Title: [293205] trunk/Source/WebKitLegacy/win
Revision
293205
Author
bfulg...@apple.com
Date
2022-04-21 19:48:39 -0700 (Thu, 21 Apr 2022)

Log Message

Unreviewed build fix after r293199.
https://bugs.webkit.org/show_bug.cgi?id=239628

Remove unused references to XSS Auditor.


* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::isXSSAuditorEnabled):
(WebPreferences::setXSSAuditorEnabled):
* WebView.cpp:
(WebView::notifyPreferencesChanged):

Modified Paths

Diff

Modified: trunk/Source/WebKitLegacy/win/ChangeLog (293204 => 293205)


--- trunk/Source/WebKitLegacy/win/ChangeLog	2022-04-22 01:21:04 UTC (rev 293204)
+++ trunk/Source/WebKitLegacy/win/ChangeLog	2022-04-22 02:48:39 UTC (rev 293205)
@@ -1,3 +1,18 @@
+2022-04-21  Brent Fulgham  <bfulg...@apple.com>
+
+        Unreviewed build fix after r293199.
+        https://bugs.webkit.org/show_bug.cgi?id=239628
+
+        Remove unused references to XSS Auditor.
+
+        * WebPreferenceKeysPrivate.h:
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings):
+        (WebPreferences::isXSSAuditorEnabled):
+        (WebPreferences::setXSSAuditorEnabled):
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
 2022-04-16  Chris Dumez  <cdu...@apple.com>
 
         Drop String::truncate() and use String::left() instead

Modified: trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h (293204 => 293205)


--- trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h	2022-04-22 01:21:04 UTC (rev 293204)
+++ trunk/Source/WebKitLegacy/win/WebPreferenceKeysPrivate.h	2022-04-22 02:48:39 UTC (rev 293205)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2020 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -136,8 +136,6 @@
 
 #define WebKitJavaScriptCanAccessClipboardPreferenceKey "WebKitJavaScriptCanAccessClipboard"
 
-#define WebKitXSSAuditorEnabledPreferenceKey "WebKitXSSAuditorEnabled"
-
 #define WebKitUseHighResolutionTimersPreferenceKey "WebKitUseHighResolutionTimers"
 
 #define WebKitFrameFlatteningEnabledPreferenceKey "WebKitFrameFlatteningEnabled"

Modified: trunk/Source/WebKitLegacy/win/WebPreferences.cpp (293204 => 293205)


--- trunk/Source/WebKitLegacy/win/WebPreferences.cpp	2022-04-22 01:21:04 UTC (rev 293204)
+++ trunk/Source/WebKitLegacy/win/WebPreferences.cpp	2022-04-22 02:48:39 UTC (rev 293205)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2020 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006-2022 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -257,7 +257,6 @@
     CFDictionaryAddValue(defaults.get(), CFSTR(WebKitAllowUniversalAccessFromFileURLsPreferenceKey), kCFBooleanFalse);
     CFDictionaryAddValue(defaults.get(), CFSTR(WebKitAllowFileAccessFromFileURLsPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults.get(), CFSTR(WebKitJavaScriptCanAccessClipboardPreferenceKey), kCFBooleanFalse);
-    CFDictionaryAddValue(defaults.get(), CFSTR(WebKitXSSAuditorEnabledPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults.get(), CFSTR(WebKitFrameFlatteningEnabledPreferenceKey), kCFBooleanFalse);
     CFDictionaryAddValue(defaults.get(), CFSTR(WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey), kCFBooleanTrue);
     CFDictionaryAddValue(defaults.get(), CFSTR(WebKitPluginsEnabledPreferenceKey), kCFBooleanTrue);
@@ -1027,13 +1026,13 @@
 {
     if (!enabled)
         return E_POINTER;
-    *enabled = boolValueForKey(WebKitXSSAuditorEnabledPreferenceKey);
+    *enabled = FALSE;
     return S_OK;
 }
 
 HRESULT WebPreferences::setXSSAuditorEnabled(BOOL enabled)
 {
-    setBoolValue(WebKitXSSAuditorEnabledPreferenceKey, enabled);
+    UNUSED_PARAM(enabled);
     return S_OK;
 }
 

Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (293204 => 293205)


--- trunk/Source/WebKitLegacy/win/WebView.cpp	2022-04-22 01:21:04 UTC (rev 293204)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp	2022-04-22 02:48:39 UTC (rev 293205)
@@ -5267,11 +5267,6 @@
         return hr;
     settings.setJavaScriptCanAccessClipboard(!!enabled);
 
-    hr = prefsPrivate->isXSSAuditorEnabled(&enabled);
-    if (FAILED(hr))
-        return hr;
-    settings.setXSSAuditorEnabled(!!enabled);
-
     hr = prefsPrivate->shouldUseHighResolutionTimers(&enabled);
     if (FAILED(hr))
         return hr;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to