Changeset 223432 in webkit for trunk/Source/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Oct 16, 2017, 1:33:32 PM (8 years ago)

Author:

[email protected]

Message:

[Settings] Remove all custom code from Settings.h/cpp
​https://bugs.webkit.org/show_bug.cgi?id=178330

Reviewed by Simon Fraser.

Source/WebCore:

Removes the two remaining functions out of Settings paving the way
for the file to be generated.

• pageDestroyed was moved down into SettingsBase.
• effectiveFrameFlattening was moved to FrameView (to reduce the need for additional includes, the FrameFlattening enum was converted to an enum class to allow it to be forward declared).

Also moves default values into SettingsDefaultValues.h

• WebCore.xcodeproj/project.pbxproj:

Add new files.

• page/FrameView.cpp:
• page/FrameView.h:

Move effectiveFrameFlattening function here from Settings.

• page/Settings.cpp:
• page/Settings.h:

Move effectiveFrameFlattening, pageDestroyed and default values out.

• page/Settings.in:

Update for turning FrameFlattening into an enum class.

• page/SettingsBase.h:

Turn FrameFlattening into an enum class and move pageDestroyed here.

• page/SettingsDefaultValues.h: Added.

Move all the default values from Settings here.

• rendering/RenderFrameSet.cpp:
• rendering/RenderIFrame.cpp:
• rendering/RenderView.cpp:

Get effectiveFrameFlattening from the FrameView.

• testing/InternalSettings.cpp:
• testing/InternalSettings.h:

Update now that FrameFlattening is an enum class.

Source/WebKit:

• Shared/WebPreferencesDefinitions.h:
• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetFrameFlatteningEnabled):
(WKPreferencesGetFrameFlatteningEnabled):

• UIProcess/API/glib/WebKitSettings.cpp:

(webkit_settings_get_enable_frame_flattening):
(webkit_settings_set_enable_frame_flattening):

• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::setFrameFlatteningEnabled):

Update for naming changes of FrameFlattening now that it is an enum class.

• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::contentsSizeChanged const):

Ge the effectiveFrameFlattening from the FrameView, rather than the Settings.

Source/WebKitLegacy/mac:

• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):

Update for naming changes of FrameFlattening now that it is an enum class.

Source/WebKitLegacy/win:

• WebView.cpp:

(WebView::notifyPreferencesChanged):

Update for naming changes of FrameFlattening now that it is an enum class.

File:

• trunk/Source/WebCore/rendering/RenderFrameSet.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -652 +652 @@
 bool RenderFrameSet::flattenFrameSet() const
 {
-    return settings().effectiveFrameFlattening() != FrameFlatteningDisabled;
+    return view().frameView().effectiveFrameFlattening() != FrameFlattening::Disabled;
 }