tree 5e65b5401d02c3bf1f251eb662ea56af43847471
parent 37b8adafa5245218cbc0b07de5bf367d62cba339
author ddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1585852624 +0000
committer ddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> 1585852624 +0000

API::PageConfiguration may have conflicting preference values between WebPreferences and WebPreferencesStore::ValueMap instance variables
<https://webkit.org/b/209678>
<rdar://problem/60981271>

Reviewed by Brent Fulgham.

Source/WebKit:

We fix this bug by removing
API::PageConfiguration::m_preferenceValues and
WebPageProxy::m_configurationPreferenceValues, and instead set
values directly on the WebPreferences object, which holds values
in its WebPreferencesStore instance variable.  This change only
requires that the API::PageConfiguration object has
m_preferences set to a valid WebPreferences object before using
the settings APIs.

Covered by WKAttachment TestWebKitAPI tests and
editing/undo-manager layout tests, among others.

* UIProcess/API/APIPageConfiguration.cpp:
(API::PageConfiguration::copy const):
- Remove use of m_preferenceValues instance variable.
* UIProcess/API/APIPageConfiguration.h:
- Update headers after removing WebPreferencesStore.h.
(API::PageConfiguration::preferenceValues): Delete.
- Remove use of m_preferenceValues instance variable.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setupPageConfiguration:]):
- Switch to use WebPreferences methods for settings.

* UIProcess/API/mac/WKView.mm:
(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
- Create WebPreferences object for API::PageConfiguration
  object.  This is what WebProcessPool::createWebPage() does
  when creating a WebPageProxy object.
- Switch to use WebPreferences method to set
  SystemLayoutDirection.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
- Remove initialization of m_configurationPreferenceValues.
- Switch to use WebPreferences method to set
  DisableScreenSizeOverride.
(WebKit::WebPageProxy::preferencesStore const):
- Simplify this method after removing
  m_configurationPreferenceValues.
* UIProcess/WebPageProxy.h:
- Remove m_configurationPreferenceValues.

Tools:

* TestWebKitAPI/Tests/WebKit/mac/GetBackingScaleFactor.mm:
(TestWebKitAPI::TEST):
- Fix WKView constructor to pass a valid WKPageGroupRef.

* WebKitTestRunner/TestController.cpp:
(WTR::updateTestOptionsFromTestHeader):
* WebKitTestRunner/TestOptions.h:
(WTR::TestOptions::hasSameInitializationOptions const):
* WebKitTestRunner/cocoa/TestControllerCocoa.mm:
(WTR::TestController::platformCreateWebView):
- Remove support for custom "enableUndoManagerAPI" setting since
  layout tests should use "internal:UndoManagerAPIEnabled"
  instead.

LayoutTests:

* editing/undo-manager/undo-manager-add-item-exceptions.html:
* editing/undo-manager/undo-manager-add-item.html:
* editing/undo-manager/undo-manager-delete-stale-undo-items.html:
* editing/undo-manager/undo-manager-interfaces.html:
* editing/undo-manager/undo-manager-item-labels.html:
* editing/undo-manager/undo-manager-keeps-wrapper-alive.html:
* editing/undo-manager/undo-manager-undo-redo-after-garbage-collection.html:
- Fix tests to use "internal:UndoManagerAPIEnabled=true" instead
  of custom "enableUndoManagerAPI=true" setting, which is being
  removed since it doesn't work after the changes to WebKit.


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