Attachment 356321 Details for Bug 192280 – Patch

[patch] Patch

bug-192280-20181201141545.patch (text/plain), 11.48 KB, created by zalan on 2018-12-01 14:15:53 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-12-01 14:15:53 PST

Size: 11.48 KB

patch

obsolete

>Subversion Revision: 238781
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index c99091fd44292259f8fded2520c968aab4e816d7..5be44191497e961e10a40b26dade7b9d4d487e49 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-12-01  Zalan Bujtas  <zalan@apple.com>
>+
>+        Add a runtime feature flag for LayoutFormattingContext.
>+        https://bugs.webkit.org/show_bug.cgi?id=192280
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2018-11-29  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
> 
>         [JSC] Keep TypeMaybeBigInt small
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 356ee4265b0f5f96b732a121a87b88d7fefdbdb1..1e352e80a0635b1ed77b94617d8f451b95003a95 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-01  Zalan Bujtas  <zalan@apple.com>
>+
>+        Add a runtime feature flag for LayoutFormattingContext.
>+        https://bugs.webkit.org/show_bug.cgi?id=192280
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * page/FrameViewLayoutContext.cpp:
>+        (WebCore::layoutUsingFormattingContext):
>+        * page/RuntimeEnabledFeatures.h:
>+        (WebCore::RuntimeEnabledFeatures::setLayoutFormattingContextEnabled):
>+        (WebCore::RuntimeEnabledFeatures::layoutFormattingContextEnabled const):
>+
> 2018-12-01  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Call instrinsicWidthConstraints on the correct formatting state.
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index b9e3348e4bf79873a6de1ad6befe9ffa412a0b90..6b05a6a9579c056a34b8fc2db883fd762f9c51c9 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-12-01  Zalan Bujtas  <zalan@apple.com>
>+
>+        Add a runtime feature flag for LayoutFormattingContext.
>+        https://bugs.webkit.org/show_bug.cgi?id=192280
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2018-11-30  Don Olmstead  <don.olmstead@sony.com>
> 
>         Rename ENABLE_SUBTLE_CRYPTO to ENABLE_WEB_CRYPTO
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index fbcfd8b0c06220ac81d6dc57feb3d7738817a637..9e5ad4d24d982f32ed21f047d3f931ee16125efc 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-12-01  Zalan Bujtas  <zalan@apple.com>
>+
>+        Add a runtime feature flag for LayoutFormattingContext.
>+        https://bugs.webkit.org/show_bug.cgi?id=192280
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        * Shared/WebPreferences.yaml:
>+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
>+        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
>+
> 2018-11-30  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix Windows build.
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 281551fdcd93becaa00073d1f759bd91fcedba20..d5be801ddeee39b2529a0d606684577a81f68473 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-12-01  Zalan Bujtas  <zalan@apple.com>
>+
>+        Add a runtime feature flag for LayoutFormattingContext.
>+        https://bugs.webkit.org/show_bug.cgi?id=192280
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+
> 2018-11-30  Alex Christensen  <achristensen@webkit.org>
> 
>         Move URL from WebCore to WTF
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index de8c44c9e16496dfef5212262e882a092bd021f9..f4993e58feed0f618c0880a91a716fad262b3374 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -228,7 +228,7 @@ ENABLE_KEYBOARD_CODE_ATTRIBUTE = ENABLE_KEYBOARD_CODE_ATTRIBUTE;
> 
> ENABLE_KEYBOARD_KEY_ATTRIBUTE = ENABLE_KEYBOARD_KEY_ATTRIBUTE;
> 
>-ENABLE_LAYOUT_FORMATTING_CONTEXT = ;
>+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
> 
> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
> 
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index de8c44c9e16496dfef5212262e882a092bd021f9..f4993e58feed0f618c0880a91a716fad262b3374 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -228,7 +228,7 @@ ENABLE_KEYBOARD_CODE_ATTRIBUTE = ENABLE_KEYBOARD_CODE_ATTRIBUTE;
> 
> ENABLE_KEYBOARD_KEY_ATTRIBUTE = ENABLE_KEYBOARD_KEY_ATTRIBUTE;
> 
>-ENABLE_LAYOUT_FORMATTING_CONTEXT = ;
>+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
> 
> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
> 
>diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>index de8c44c9e16496dfef5212262e882a092bd021f9..f4993e58feed0f618c0880a91a716fad262b3374 100644
>--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
>@@ -228,7 +228,7 @@ ENABLE_KEYBOARD_CODE_ATTRIBUTE = ENABLE_KEYBOARD_CODE_ATTRIBUTE;
> 
> ENABLE_KEYBOARD_KEY_ATTRIBUTE = ENABLE_KEYBOARD_KEY_ATTRIBUTE;
> 
>-ENABLE_LAYOUT_FORMATTING_CONTEXT = ;
>+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
> 
> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
> 
>diff --git a/Source/WebCore/page/FrameViewLayoutContext.cpp b/Source/WebCore/page/FrameViewLayoutContext.cpp
>index 7a9957a17f86b7fdb018d2b5e7acdcab7cfa3ffb..8e946390833aed06346ee92bc70da7e63adb66d6 100644
>--- a/Source/WebCore/page/FrameViewLayoutContext.cpp
>+++ b/Source/WebCore/page/FrameViewLayoutContext.cpp
>@@ -36,6 +36,7 @@
> #include "Logging.h"
> #include "RenderElement.h"
> #include "RenderView.h"
>+#include "RuntimeEnabledFeatures.h"
> #include "ScriptDisallowedScope.h"
> #include "Settings.h"
> 
>@@ -55,6 +56,8 @@ namespace WebCore {
> #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
> static void layoutUsingFormattingContext(const RenderView& renderView)
> {
>+    if (!RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextEnabled())
>+        return;
>     auto initialContainingBlock = Layout::TreeBuilder::createLayoutTree(renderView);
>     auto layoutState = std::make_unique<Layout::LayoutState>(*initialContainingBlock, renderView.size());
>     layoutState->setInQuirksMode(renderView.document().inQuirksMode());
>diff --git a/Source/WebCore/page/RuntimeEnabledFeatures.h b/Source/WebCore/page/RuntimeEnabledFeatures.h
>index ac795057f545d96e0158d56993ff2051b774afa6..d28a8f7648bc8a911963b95a8b22e86f9590b6d3 100644
>--- a/Source/WebCore/page/RuntimeEnabledFeatures.h
>+++ b/Source/WebCore/page/RuntimeEnabledFeatures.h
>@@ -178,6 +178,11 @@ public:
>     void setPointerEventsEnabled(bool isEnabled) { m_pointerEventsEnabled = isEnabled; }
>     bool pointerEventsEnabled() const { return m_pointerEventsEnabled; }
> 
>+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
>+    void setLayoutFormattingContextEnabled(bool isEnabled) { m_layoutFormattingContextEnabled = isEnabled; }
>+    bool layoutFormattingContextEnabled() const { return m_layoutFormattingContextEnabled; }
>+#endif
>+
> #if ENABLE(CSS_PAINTING_API)
>     void setCSSPaintingAPIEnabled(bool isEnabled) { m_CSSPaintingAPIEnabled = isEnabled; }
>     bool cssPaintingAPIEnabled() const { return m_CSSPaintingAPIEnabled; }
>@@ -372,6 +377,10 @@ private:
>     bool m_pointerEventsEnabled { false };
>     bool m_webSQLEnabled { true };
> 
>+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
>+    bool m_layoutFormattingContextEnabled { false };
>+#endif
>+
> #if ENABLE(CSS_PAINTING_API)
>     bool m_CSSPaintingAPIEnabled { false };
> #endif
>diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>index de8c44c9e16496dfef5212262e882a092bd021f9..f4993e58feed0f618c0880a91a716fad262b3374 100644
>--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig
>@@ -228,7 +228,7 @@ ENABLE_KEYBOARD_CODE_ATTRIBUTE = ENABLE_KEYBOARD_CODE_ATTRIBUTE;
> 
> ENABLE_KEYBOARD_KEY_ATTRIBUTE = ENABLE_KEYBOARD_KEY_ATTRIBUTE;
> 
>-ENABLE_LAYOUT_FORMATTING_CONTEXT = ;
>+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
> 
> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
> 
>diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml
>index 6e6836b0a43ef21fe2c49b3063a873fdcdfe05c8..a37ba990513bb28dbdcb3ab8c155f8f05179726a 100644
>--- a/Source/WebKit/Shared/WebPreferences.yaml
>+++ b/Source/WebKit/Shared/WebPreferences.yaml
>@@ -1326,6 +1326,15 @@ DarkModeCSSEnabled:
>   category: experimental
>   condition: ENABLE(DARK_MODE_CSS)
> 
>+LayoutFormattingContextEnabled:
>+  type: bool
>+  defaultValue: false
>+  humanReadableName: "Next-gen layout"
>+  humanReadableDescription: "Enable next-gen layout"
>+  webcoreBinding: RuntimeEnabledFeatures
>+  category: experimental
>+  condition: ENABLE(LAYOUT_FORMATTING_CONTEXT)
>+
> CSSPaintingAPIEnabled:
>   type: bool
>   defaultValue: false
>diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
>index a0a2fc8b49254fc758de43e8758d34547b6506ce..88054071b6afcadd4a1a821e3c59007713478867 100644
>--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
>+++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp
>@@ -256,6 +256,11 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page
>     if (preference == "CSSCustomPropertiesAndValuesEnabled")
>         RuntimeEnabledFeatures::sharedFeatures().setCSSCustomPropertiesAndValuesEnabled(enabled);
> 
>+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
>+    if (preference == "LayoutFormattingContextEnabled")
>+        RuntimeEnabledFeatures::sharedFeatures().setLayoutFormattingContextEnabled(enabled);
>+#endif
>+
> #if ENABLE(CSS_PAINTING_API)
>     if (preference == "CSSPaintingAPIEnabled")
>         RuntimeEnabledFeatures::sharedFeatures().setCSSPaintingAPIEnabled(enabled);
>diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>index de8c44c9e16496dfef5212262e882a092bd021f9..f4993e58feed0f618c0880a91a716fad262b3374 100644
>--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
>@@ -228,7 +228,7 @@ ENABLE_KEYBOARD_CODE_ATTRIBUTE = ENABLE_KEYBOARD_CODE_ATTRIBUTE;
> 
> ENABLE_KEYBOARD_KEY_ATTRIBUTE = ENABLE_KEYBOARD_KEY_ATTRIBUTE;
> 
>-ENABLE_LAYOUT_FORMATTING_CONTEXT = ;
>+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
> 
> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
> 
>diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>index de8c44c9e16496dfef5212262e882a092bd021f9..f4993e58feed0f618c0880a91a716fad262b3374 100644
>--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
>@@ -228,7 +228,7 @@ ENABLE_KEYBOARD_CODE_ATTRIBUTE = ENABLE_KEYBOARD_CODE_ATTRIBUTE;
> 
> ENABLE_KEYBOARD_KEY_ATTRIBUTE = ENABLE_KEYBOARD_KEY_ATTRIBUTE;
> 
>-ENABLE_LAYOUT_FORMATTING_CONTEXT = ;
>+ENABLE_LAYOUT_FORMATTING_CONTEXT = ENABLE_LAYOUT_FORMATTING_CONTEXT;
> 
> ENABLE_LEGACY_CSS_VENDOR_PREFIXES = ENABLE_LEGACY_CSS_VENDOR_PREFIXES;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192280: 356321 | 356322 | 356331 | 356336 | 356349