<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[236497] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/236497">236497</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2018-09-25 22:26:30 -0700 (Tue, 25 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make frame flattening an internal debug feature
https://bugs.webkit.org/show_bug.cgi?id=189984

Reviewed by Simon Fraser.

Made frame flattening a runtime switchable from internal debug menu.

To avoid having to enumerate three distinct values in the settings, made it a boolean flag in WKPreference.
That's what's exposd as an API anyway.

* Shared/WebPreferences.yaml:
* Shared/WebPreferencesDefaultValues.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/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedWebPreferencesyaml">trunk/Source/WebKit/Shared/WebPreferences.yaml</a></li>
<li><a href="#trunkSourceWebKitSharedWebPreferencesDefaultValuesh">trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPICWKPreferencescpp">trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIglibWebKitSettingscpp">trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPagecpp">trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (236496 => 236497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2018-09-26 05:16:22 UTC (rev 236496)
+++ trunk/Source/WebKit/ChangeLog       2018-09-26 05:26:30 UTC (rev 236497)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2018-09-25  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Make frame flattening an internal debug feature
+        https://bugs.webkit.org/show_bug.cgi?id=189984
+
+        Reviewed by Simon Fraser.
+
+        Made frame flattening a runtime switchable from internal debug menu.
+
+        To avoid having to enumerate three distinct values in the settings, made it a boolean flag in WKPreference.
+        That's what's exposd as an API anyway.
+
+        * Shared/WebPreferences.yaml:
+        * Shared/WebPreferencesDefaultValues.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/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2018-09-25  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [MediaStream] Add Mac window capture source
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebPreferencesyaml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (236496 => 236497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/WebPreferences.yaml   2018-09-26 05:16:22 UTC (rev 236496)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml      2018-09-26 05:26:30 UTC (rev 236497)
</span><span class="lines">@@ -886,10 +886,13 @@
</span><span class="cx">   defaultValue: 0
</span><span class="cx">   webcoreBinding: custom
</span><span class="cx"> 
</span><del>-FrameFlattening:
-  type: uint32_t
</del><ins>+FrameFlatteningEnabled:
+  type: bool
</ins><span class="cx">   defaultValue: DEFAULT_FRAME_FLATTENING
</span><span class="cx">   webcoreBinding: custom
</span><ins>+  humanReadableName: "Frame flattening"
+  humanReadableDescription: "Enable frame flattening, which adjusts the height of an iframe to fit its contents"
+  category: internal
</ins><span class="cx"> 
</span><span class="cx"> StandardFontFamily:
</span><span class="cx">   type: String
</span></span></pre></div>
<a id="trunkSourceWebKitSharedWebPreferencesDefaultValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h (236496 => 236497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2018-09-26 05:16:22 UTC (rev 236496)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h    2018-09-26 05:26:30 UTC (rev 236497)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #define DEFAULT_ALLOWS_PICTURE_IN_PICTURE_MEDIA_PLAYBACK true
</span><span class="cx"> #define DEFAULT_BACKSPACE_KEY_NAVIGATION_ENABLED false
</span><del>-#define DEFAULT_FRAME_FLATTENING FrameFlattening::FullyEnabled
</del><ins>+#define DEFAULT_FRAME_FLATTENING true
</ins><span class="cx"> #define DEFAULT_SHOULD_PRINT_BACKGROUNDS true
</span><span class="cx"> #define DEFAULT_TEXT_AREAS_ARE_RESIZABLE false
</span><span class="cx"> #define DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY false
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> #else
</span><span class="cx"> #define DEFAULT_ALLOWS_PICTURE_IN_PICTURE_MEDIA_PLAYBACK false
</span><span class="cx"> #define DEFAULT_BACKSPACE_KEY_NAVIGATION_ENABLED true
</span><del>-#define DEFAULT_FRAME_FLATTENING FrameFlattening::Disabled
</del><ins>+#define DEFAULT_FRAME_FLATTENING false
</ins><span class="cx"> #define DEFAULT_SHOULD_PRINT_BACKGROUNDS false
</span><span class="cx"> #define DEFAULT_TEXT_AREAS_ARE_RESIZABLE true
</span><span class="cx"> #define DEFAULT_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY true
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (236496 => 236497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp    2018-09-26 05:16:22 UTC (rev 236496)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp       2018-09-26 05:26:30 UTC (rev 236497)
</span><span class="lines">@@ -160,14 +160,12 @@
</span><span class="cx"> 
</span><span class="cx"> void WKPreferencesSetFrameFlatteningEnabled(WKPreferencesRef preferencesRef, bool frameFlatteningEnabled)
</span><span class="cx"> {
</span><del>-    // FIXME: Expose more frame flattening values.
-    toImpl(preferencesRef)->setFrameFlattening(frameFlatteningEnabled ? static_cast<uint32_t>(WebCore::FrameFlattening::FullyEnabled) : static_cast<uint32_t>(WebCore::FrameFlattening::Disabled));
</del><ins>+    toImpl(preferencesRef)->setFrameFlatteningEnabled(frameFlatteningEnabled);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool WKPreferencesGetFrameFlatteningEnabled(WKPreferencesRef preferencesRef)
</span><span class="cx"> {
</span><del>-    // FIXME: Expose more frame flattening values.
-    return toImpl(preferencesRef)->frameFlattening() != static_cast<uint32_t>(WebCore::FrameFlattening::Disabled);
</del><ins>+    return toImpl(preferencesRef)->frameFlatteningEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WKPreferencesSetPluginsEnabled(WKPreferencesRef preferencesRef, bool pluginsEnabled)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIglibWebKitSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp (236496 => 236497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp        2018-09-26 05:16:22 UTC (rev 236496)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp   2018-09-26 05:26:30 UTC (rev 236497)
</span><span class="lines">@@ -1717,8 +1717,7 @@
</span><span class="cx"> {
</span><span class="cx">     g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
</span><span class="cx"> 
</span><del>-    // FIXME: Expose more frame flattening values.
-    return settings->priv->preferences->frameFlattening() != static_cast<uint32_t>(WebCore::FrameFlattening::Disabled);
</del><ins>+    return settings->priv->preferences->frameFlatteningEnabled();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="lines">@@ -1733,12 +1732,10 @@
</span><span class="cx">     g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
</span><span class="cx"> 
</span><span class="cx">     WebKitSettingsPrivate* priv = settings->priv;
</span><del>-    bool currentValue = priv->preferences->frameFlattening() != static_cast<uint32_t>(WebCore::FrameFlattening::Disabled);
-    if (currentValue == enabled)
</del><ins>+    if (priv->preferences->frameFlatteningEnabled() == enabled)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    // FIXME: Expose more frame flattening values.
-    priv->preferences->setFrameFlattening(enabled ? static_cast<uint32_t>(WebCore::FrameFlattening::FullyEnabled) : static_cast<uint32_t>(WebCore::FrameFlattening::Disabled));
</del><ins>+    priv->preferences->setFrameFlatteningEnabled(enabled);
</ins><span class="cx">     g_object_notify(G_OBJECT(settings), "enable-frame-flattening");
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (236496 => 236497)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp       2018-09-26 05:16:22 UTC (rev 236496)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp  2018-09-26 05:26:30 UTC (rev 236497)
</span><span class="lines">@@ -3155,7 +3155,7 @@
</span><span class="cx">     settings.setSystemLayoutDirection(static_cast<TextDirection>(store.getUInt32ValueForKey(WebPreferencesKey::systemLayoutDirectionKey())));
</span><span class="cx">     settings.setJavaScriptRuntimeFlags(static_cast<RuntimeFlags>(store.getUInt32ValueForKey(WebPreferencesKey::javaScriptRuntimeFlagsKey())));
</span><span class="cx">     settings.setStorageBlockingPolicy(static_cast<SecurityOrigin::StorageBlockingPolicy>(store.getUInt32ValueForKey(WebPreferencesKey::storageBlockingPolicyKey())));
</span><del>-    settings.setFrameFlattening(static_cast<WebCore::FrameFlattening>(store.getUInt32ValueForKey(WebPreferencesKey::frameFlatteningKey())));
</del><ins>+    settings.setFrameFlattening(store.getBoolValueForKey(WebPreferencesKey::frameFlatteningEnabledKey()) ? WebCore::FrameFlattening::FullyEnabled : WebCore::FrameFlattening::Disabled);
</ins><span class="cx">     settings.setEditableLinkBehavior(static_cast<WebCore::EditableLinkBehavior>(store.getUInt32ValueForKey(WebPreferencesKey::editableLinkBehaviorKey())));
</span><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><span class="cx">     settings.setDataDetectorTypes(static_cast<DataDetectorTypes>(store.getUInt32ValueForKey(WebPreferencesKey::dataDetectorTypesKey())));
</span></span></pre>
</div>
</div>

</body>
</html>