Changeset 223432 in webkit


Ignore:
Timestamp:
Oct 16, 2017 1:33:32 PM (7 years ago)
Author:
weinig@apple.com
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.

Location:
trunk/Source
Files:
1 added
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r223427 r223432  
     12017-10-16  Sam Weinig  <sam@webkit.org>
     2
     3        [Settings] Remove all custom code from Settings.h/cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=178330
     5
     6        Reviewed by Simon Fraser.
     7
     8        Removes the two remaining functions out of Settings paving the way
     9        for the file to be generated.
     10       
     11        - pageDestroyed was moved down into SettingsBase.
     12        - effectiveFrameFlattening was moved to FrameView (to reduce the need
     13          for additional includes, the FrameFlattening enum was converted to
     14          an enum class to allow it to be forward declared).
     15         
     16        Also moves default values into SettingsDefaultValues.h
     17
     18        * WebCore.xcodeproj/project.pbxproj:
     19       
     20            Add new files.
     21       
     22        * page/FrameView.cpp:
     23        * page/FrameView.h:
     24
     25            Move effectiveFrameFlattening function here from Settings.
     26
     27        * page/Settings.cpp:
     28        * page/Settings.h:
     29
     30            Move effectiveFrameFlattening, pageDestroyed and default values out.
     31
     32        * page/Settings.in:
     33       
     34            Update for turning FrameFlattening into an enum class.
     35       
     36        * page/SettingsBase.h:
     37
     38            Turn FrameFlattening into an enum class and move pageDestroyed here.
     39
     40        * page/SettingsDefaultValues.h: Added.
     41
     42            Move all the default values from Settings here.
     43
     44        * rendering/RenderFrameSet.cpp:
     45        * rendering/RenderIFrame.cpp:
     46        * rendering/RenderView.cpp:
     47
     48            Get effectiveFrameFlattening from the FrameView.
     49
     50        * testing/InternalSettings.cpp:
     51        * testing/InternalSettings.h:
     52       
     53            Update now that FrameFlattening is an enum class.
     54
    1552017-10-16  Maureen Daum  <mdaum@apple.com>
    256

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r223412 r223432  
    1150511505                7C6579EE1E00856600E3A27A /* JSApplePayShippingMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSApplePayShippingMethod.h; sourceTree = "<group>"; };
    1150611506                7C6752BA1B06E82000C279CB /* NonElementParentNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NonElementParentNode.idl; sourceTree = "<group>"; };
     11507                7C6EFEEA1F946A2E00FFAD41 /* SettingsDefaultValues.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SettingsDefaultValues.h; sourceTree = "<group>"; };
    1150711508                7C73FB05191EF416007DE061 /* UserMessageHandlersNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMessageHandlersNamespace.cpp; sourceTree = "<group>"; };
    1150811509                7C73FB06191EF417007DE061 /* UserMessageHandlersNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageHandlersNamespace.h; sourceTree = "<group>"; };
    … …  
    1992119922                                7CC6609B1F93057900D500E9 /* SettingsBase.cpp */,
    1992219923                                7CC660991F93057800D500E9 /* SettingsBase.h */,
     19924                                7C6EFEEA1F946A2E00FFAD41 /* SettingsDefaultValues.h */,
    1992319925                                5C688AA21D38126F000B54FA /* SocketProvider.cpp */,
    1992419926                                5C7C88D71D0F1F2B009D2F6D /* SocketProvider.h */,

  • trunk/Source/WebCore/page/FrameView.cpp

    r223313 r223432  
    567567}
    568568
     569FrameFlattening FrameView::effectiveFrameFlattening() const
     570{
     571#if PLATFORM(IOS)
     572    // On iOS when async frame scrolling is enabled, it does not make sense to use full frame flattening.
     573    // In that case, we just consider that frame flattening is disabled. This allows people to test
     574    // frame scrolling on iOS by enabling "Async Frame Scrolling" via the Safari menu.
     575    if (frame().settings().asyncFrameScrollingEnabled() && frame().settings().frameFlattening() == FrameFlattening::FullyEnabled)
     576        return FrameFlattening::Disabled;
     577#endif
     578    return frame().settings().frameFlattening();
     579}
     580
    569581bool FrameView::frameFlatteningEnabled() const
    570582{
    571     return frame().settings().effectiveFrameFlattening() != FrameFlatteningDisabled;
     583    return effectiveFrameFlattening() != FrameFlattening::Disabled;
    572584}
    573585

  • trunk/Source/WebCore/page/FrameView.h

    r222740 r223432  
    6161class RenderView;
    6262class RenderWidget;
     63
     64enum class FrameFlattening;
    6365
    6466Pagination::Mode paginationModeForRenderStyle(const RenderStyle&);
    … …  
    636638    void setSpeculativeTilingDelayDisabledForTesting(bool disabled) { m_speculativeTilingDelayDisabledForTesting = disabled; }
    637639
     640    WEBCORE_EXPORT FrameFlattening effectiveFrameFlattening() const;
     641
    638642protected:
    639643    bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) final;

  • trunk/Source/WebCore/page/Settings.cpp

    r223332 r223432  
    2727#include "Settings.h"
    2828
    29 #include "AudioSession.h"
    30 #include "BackForwardController.h"
    31 #include "CachedResourceLoader.h"
    32 #include "CookieStorage.h"
    33 #include "DOMTimer.h"
    34 #include "Database.h"
    35 #include "Document.h"
    36 #include "FontCascade.h"
    37 #include "FontGenericFamilies.h"
    38 #include "FrameTree.h"
    39 #include "FrameView.h"
    40 #include "HTMLMediaElement.h"
    41 #include "HistoryItem.h"
    42 #include "MainFrame.h"
    4329#include "Page.h"
    44 #include "StorageMap.h"
    45 #include <limits>
    46 #include <wtf/NeverDestroyed.h>
    47 #include <wtf/StdLibExtras.h>
     30#include "SettingsDefaultValues.h"
    4831
    4932namespace WebCore {
    50 
    51 // NOTEs
    52 //  1) EditingMacBehavior comprises Tiger, Leopard, SnowLeopard and iOS builds, as well as QtWebKit when built on Mac;
    53 //  2) EditingWindowsBehavior comprises Win32 build;
    54 //  3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS (and then abusing the terminology);
    55 // 99) MacEditingBehavior is used as a fallback.
    56 static EditingBehaviorType editingBehaviorTypeForPlatform()
    57 {
    58     return
    59 #if PLATFORM(IOS)
    60     EditingIOSBehavior
    61 #elif OS(DARWIN)
    62     EditingMacBehavior
    63 #elif OS(WINDOWS)
    64     EditingWindowsBehavior
    65 #elif OS(UNIX)
    66     EditingUnixBehavior
    67 #else
    68     // Fallback
    69     EditingMacBehavior
    70 #endif
    71     ;
    72 }
    73 
    74 #if PLATFORM(COCOA)
    75 static const bool defaultYouTubeFlashPluginReplacementEnabled = true;
    76 #else
    77 static const bool defaultYouTubeFlashPluginReplacementEnabled = false;
    78 #endif
    79 
    80 #if PLATFORM(IOS)
    81 static const bool defaultFixedBackgroundsPaintRelativeToDocument = true;
    82 static const bool defaultAcceleratedCompositingForFixedPositionEnabled = true;
    83 static const bool defaultAllowsInlineMediaPlayback = false;
    84 static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = true;
    85 static const bool defaultVideoPlaybackRequiresUserGesture = true;
    86 static const bool defaultAudioPlaybackRequiresUserGesture = true;
    87 static const bool defaultMediaDataLoadsAutomatically = false;
    88 static const bool defaultShouldRespectImageOrientation = true;
    89 static const bool defaultImageSubsamplingEnabled = true;
    90 static const bool defaultScrollingTreeIncludesFrames = true;
    91 static const bool defaultMediaControlsScaleWithPageZoom = true;
    92 static const bool defaultQuickTimePluginReplacementEnabled = true;
    93 #else
    94 static const bool defaultFixedBackgroundsPaintRelativeToDocument = false;
    95 static const bool defaultAcceleratedCompositingForFixedPositionEnabled = false;
    96 static const bool defaultAllowsInlineMediaPlayback = true;
    97 static const bool defaultInlineMediaPlaybackRequiresPlaysInlineAttribute = false;
    98 static const bool defaultVideoPlaybackRequiresUserGesture = false;
    99 static const bool defaultAudioPlaybackRequiresUserGesture = false;
    100 static const bool defaultMediaDataLoadsAutomatically = true;
    101 static const bool defaultShouldRespectImageOrientation = false;
    102 static const bool defaultImageSubsamplingEnabled = false;
    103 static const bool defaultScrollingTreeIncludesFrames = false;
    104 static const bool defaultMediaControlsScaleWithPageZoom = true;
    105 static const bool defaultQuickTimePluginReplacementEnabled = false;
    106 #endif
    107 
    108 static const bool defaultRequiresUserGestureToLoadVideo = true;
    109 static const bool defaultAllowsPictureInPictureMediaPlayback = true;
    110 
    111 static const double defaultIncrementalRenderingSuppressionTimeoutInSeconds = 5;
    112 #if USE(UNIFIED_TEXT_CHECKING)
    113 static const bool defaultUnifiedTextCheckerEnabled = true;
    114 #else
    115 static const bool defaultUnifiedTextCheckerEnabled = false;
    116 #endif
    117 static const bool defaultSmartInsertDeleteEnabled = true;
    118 static const bool defaultSelectTrailingWhitespaceEnabled = false;
    11933
    12034Ref<Settings> Settings::create(Page* page)
    … …  
    13549SETTINGS_SETTER_BODIES
    13650
    137 FrameFlattening Settings::effectiveFrameFlattening()
    138 {
    139 #if PLATFORM(IOS)
    140     // On iOS when async frame scrolling is enabled, it does not make sense to use full frame flattening.
    141     // In that case, we just consider that frame flattening is disabled. This allows people to test
    142     // frame scrolling on iOS by enabling "Async Frame Scrolling" via the Safari menu.
    143     if (asyncFrameScrollingEnabled() && frameFlattening() == FrameFlatteningFullyEnabled)
    144         return FrameFlatteningDisabled;
    145 #endif
    146     return frameFlattening();
    147 }
    148 
    14951} // namespace WebCore

  • trunk/Source/WebCore/page/Settings.h

    r223332 r223432  
    2828
    2929#include "SettingsBase.h"
     30#include "SettingsMacros.h"
     31#include <wtf/RefCounted.h>
    3032
    3133namespace WebCore {
    … …  
    3739    ~Settings();
    3840
    39     void pageDestroyed() { m_page = nullptr; }
    40 
    4141    SETTINGS_GETTERS_AND_SETTERS
    42 
    43 
    44     WEBCORE_EXPORT FrameFlattening effectiveFrameFlattening();
    4542
    4643private:
    … …  
    4845
    4946    SETTINGS_MEMBER_VARIABLES
    50 
    5147};
    5248

  • trunk/Source/WebCore/page/Settings.in

    r223211 r223432  
    176176primaryPlugInSnapshotDetectionEnabled initial=true
    177177maximumPlugInSnapshotAttempts type=unsigned, initial=20
    178 frameFlattening type=FrameFlattening, initial=FrameFlatteningDisabled
     178frameFlattening type=FrameFlattening, initial=FrameFlattening::Disabled
    179179asyncFrameScrollingEnabled initial=false
    180180

  • trunk/Source/WebCore/page/SettingsBase.h

    r223332 r223432  
    3232#include "IntSize.h"
    3333#include "SecurityOrigin.h"
    34 #include "SettingsMacros.h"
     34#include "StorageMap.h"
    3535#include "TextFlags.h"
    3636#include "Timer.h"
    … …  
    8989};
    9090
    91 enum FrameFlattening {
    92     FrameFlatteningDisabled,
    93     FrameFlatteningEnabledForNonFullScreenIFrames,
    94     FrameFlatteningFullyEnabled
     91enum class FrameFlattening {
     92    Disabled,
     93    EnabledForNonFullScreenIFrames,
     94    FullyEnabled
    9595};
    9696
    … …  
    101101public:
    102102    ~SettingsBase();
     103
     104    void pageDestroyed() { m_page = nullptr; }
    103105
    104106    enum class FontLoadTimingOverride { None, Block, Swap, Failure };

  • trunk/Source/WebCore/rendering/RenderFrameSet.cpp

    r223169 r223432  
    652652bool RenderFrameSet::flattenFrameSet() const
    653653{
    654     return settings().effectiveFrameFlattening() != FrameFlatteningDisabled;
     654    return view().frameView().effectiveFrameFlattening() != FrameFlattening::Disabled;
    655655}
    656656

  • trunk/Source/WebCore/rendering/RenderIFrame.cpp

    r223169 r223432  
    7979bool RenderIFrame::flattenFrame() const
    8080{
    81     if (settings().effectiveFrameFlattening() == FrameFlatteningDisabled)
     81    if (view().frameView().effectiveFrameFlattening() == FrameFlattening::Disabled)
    8282        return false;
    8383
    … …  
    9090            return false;
    9191        // Do not flatten "fullscreen" iframes or they could become larger than the viewport.
    92         if (settings().effectiveFrameFlattening() <= FrameFlatteningEnabledForNonFullScreenIFrames && isFullScreenIFrame())
     92        if (view().frameView().effectiveFrameFlattening() <= FrameFlattening::EnabledForNonFullScreenIFrames && isFullScreenIFrame())
    9393            return false;
    9494    }

  • trunk/Source/WebCore/rendering/RenderView.cpp

    r223169 r223432  
    6060    FrameFlatteningLayoutDisallower(FrameView& frameView)
    6161        : m_frameView(frameView)
    62         , m_disallowLayout(frameView.frame().settings().effectiveFrameFlattening() != FrameFlatteningDisabled)
     62        , m_disallowLayout(frameView.effectiveFrameFlattening() != FrameFlattening::Disabled)
    6363    {
    6464        if (m_disallowLayout)

  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r222926 r223432  
    820820}
    821821
    822 static FrameFlattening internalSettingsToWebCoreValue(InternalSettings::FrameFlatteningValue value)
    823 {
    824     switch (value) {
    825     case InternalSettings::FrameFlatteningValue::Disabled:
    826         return FrameFlatteningDisabled;
    827     case InternalSettings::FrameFlatteningValue::EnabledForNonFullScreenIFrames:
    828         return FrameFlatteningEnabledForNonFullScreenIFrames;
    829     case InternalSettings::FrameFlatteningValue::FullyEnabled:
    830         return FrameFlatteningFullyEnabled;
    831     }
    832 
    833     ASSERT_NOT_REACHED();
    834     return FrameFlatteningDisabled;
    835 }
    836 
    837 ExceptionOr<void> InternalSettings::setFrameFlattening(const FrameFlatteningValue& frameFlattening)
    838 {
    839     if (!m_page)
    840         return Exception { InvalidAccessError };
    841     settings().setFrameFlattening(internalSettingsToWebCoreValue(frameFlattening));
     822ExceptionOr<void> InternalSettings::setFrameFlattening(FrameFlatteningValue frameFlattening)
     823{
     824    if (!m_page)
     825        return Exception { InvalidAccessError };
     826    settings().setFrameFlattening(frameFlattening);
    842827    return { };
    843828}

  • trunk/Source/WebCore/testing/InternalSettings.h

    r222926 r223432  
    102102    ExceptionOr<void> setCustomPasteboardDataEnabled(bool);
    103103
    104     enum class FrameFlatteningValue { Disabled, EnabledForNonFullScreenIFrames, FullyEnabled };
    105     ExceptionOr<void> setFrameFlattening(const FrameFlatteningValue&);
     104    using FrameFlatteningValue = FrameFlattening;
     105    ExceptionOr<void> setFrameFlattening(FrameFlatteningValue);
    106106   
    107107    static void setAllowsAnySSLCertificate(bool);

  • trunk/Source/WebKit/ChangeLog

    r223431 r223432  
     12017-10-16  Sam Weinig  <sam@webkit.org>
     2
     3        [Settings] Remove all custom code from Settings.h/cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=178330
     5
     6        Reviewed by Simon Fraser.
     7
     8        * Shared/WebPreferencesDefinitions.h:
     9        * UIProcess/API/C/WKPreferences.cpp:
     10        (WKPreferencesSetFrameFlatteningEnabled):
     11        (WKPreferencesGetFrameFlatteningEnabled):
     12        * UIProcess/API/glib/WebKitSettings.cpp:
     13        (webkit_settings_get_enable_frame_flattening):
     14        (webkit_settings_set_enable_frame_flattening):
     15        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     16        (WebKit::InjectedBundle::setFrameFlatteningEnabled):
     17       
     18            Update for naming changes of FrameFlattening now that it is an enum class.
     19
     20        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     21        (WebKit::WebChromeClient::contentsSizeChanged const):
     22
     23            Ge the effectiveFrameFlattening from the FrameView, rather than the Settings.
     24
    1252017-10-16  Chris Dumez  <cdumez@apple.com>
    226

  • trunk/Source/WebKit/Shared/WebPreferencesDefinitions.h

    r223167 r223432  
    6161#define DEFAULT_ALLOWS_PICTURE_IN_PICTURE_MEDIA_PLAYBACK true
    6262#define DEFAULT_BACKSPACE_KEY_NAVIGATION_ENABLED false
    63 #define DEFAULT_FRAME_FLATTENING FrameFlatteningFullyEnabled
     63#define DEFAULT_FRAME_FLATTENING FrameFlattening::FullyEnabled
    6464#define DEFAULT_SHOULD_PRINT_BACKGROUNDS true
    6565#define DEFAULT_TEXT_AREAS_ARE_RESIZABLE false
    … …  
    7979#define DEFAULT_ALLOWS_PICTURE_IN_PICTURE_MEDIA_PLAYBACK false
    8080#define DEFAULT_BACKSPACE_KEY_NAVIGATION_ENABLED true
    81 #define DEFAULT_FRAME_FLATTENING FrameFlatteningDisabled
     81#define DEFAULT_FRAME_FLATTENING FrameFlattening::Disabled
    8282#define DEFAULT_SHOULD_PRINT_BACKGROUNDS false
    8383#define DEFAULT_TEXT_AREAS_ARE_RESIZABLE true

  • trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp

    r223167 r223432  
    146146{
    147147    // FIXME: Expose more frame flattening values.
    148     toImpl(preferencesRef)->setFrameFlattening(frameFlatteningEnabled ? WebCore::FrameFlatteningFullyEnabled : WebCore::FrameFlatteningDisabled);
     148    toImpl(preferencesRef)->setFrameFlattening(frameFlatteningEnabled ? static_cast<uint32_t>(WebCore::FrameFlattening::FullyEnabled) : static_cast<uint32_t>(WebCore::FrameFlattening::Disabled));
    149149}
    150150
    … …  
    152152{
    153153    // FIXME: Expose more frame flattening values.
    154     return toImpl(preferencesRef)->frameFlattening() != WebCore::FrameFlatteningDisabled;
     154    return toImpl(preferencesRef)->frameFlattening() != static_cast<uint32_t>(WebCore::FrameFlattening::Disabled);
    155155}
    156156

  • trunk/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp

    r221847 r223432  
    16211621
    16221622    // FIXME: Expose more frame flattening values.
    1623     return settings->priv->preferences->frameFlattening() != WebCore::FrameFlatteningDisabled;
     1623    return settings->priv->preferences->frameFlattening() != static_cast<uint32_t>(WebCore::FrameFlattening::Disabled);
    16241624}
    16251625
    … …  
    16361636
    16371637    WebKitSettingsPrivate* priv = settings->priv;
    1638     bool currentValue = priv->preferences->frameFlattening() != WebCore::FrameFlatteningDisabled;
     1638    bool currentValue = priv->preferences->frameFlattening() != static_cast<uint32_t>(WebCore::FrameFlattening::Disabled);
    16391639    if (currentValue == enabled)
    16401640        return;
    16411641
    16421642    // FIXME: Expose more frame flattening values.
    1643     priv->preferences->setFrameFlattening(enabled ? WebCore::FrameFlatteningFullyEnabled : WebCore::FrameFlatteningDisabled);
     1643    priv->preferences->setFrameFlattening(enabled ? static_cast<uint32_t>(WebCore::FrameFlattening::FullyEnabled) : static_cast<uint32_t>(WebCore::FrameFlattening::Disabled));
    16441644    g_object_notify(G_OBJECT(settings), "enable-frame-flattening");
    16451645}

  • trunk/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp

    r222432 r223432  
    301301    const HashSet<Page*>& pages = PageGroup::pageGroup(pageGroup->identifier())->pages();
    302302    for (HashSet<Page*>::iterator iter = pages.begin(); iter != pages.end(); ++iter)
    303         (*iter)->settings().setFrameFlattening(enabled ? FrameFlatteningFullyEnabled : FrameFlatteningDisabled);
     303        (*iter)->settings().setFrameFlattening(enabled ? FrameFlattening::FullyEnabled : FrameFlattening::Disabled);
    304304}
    305305

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r223169 r223432  
    567567void WebChromeClient::contentsSizeChanged(Frame& frame, const IntSize& size) const
    568568{
    569     if (m_page.corePage()->settings().effectiveFrameFlattening() == FrameFlatteningDisabled) {
     569    FrameView* frameView = frame.view();
     570
     571    if (frameView && frameView->effectiveFrameFlattening() == FrameFlattening::Disabled) {
    570572        WebFrame* largestFrame = findLargestFrameInFrameSet(m_page);
    571573        if (largestFrame != m_cachedFrameSetLargestFrame.get()) {
    … …  
    582584    m_page.drawingArea()->mainFrameContentSizeChanged(size);
    583585
    584     FrameView* frameView = frame.view();
    585586    if (frameView && !frameView->delegatesScrolling())  {
    586587        bool hasHorizontalScrollbar = frameView->horizontalScrollbar();

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r223291 r223432  
     12017-10-16  Sam Weinig  <sam@webkit.org>
     2
     3        [Settings] Remove all custom code from Settings.h/cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=178330
     5
     6        Reviewed by Simon Fraser.
     7
     8        * WebView/WebPreferences.mm:
     9        (+[WebPreferences initialize]):
     10       
     11            Update for naming changes of FrameFlattening now that it is an enum class.
     12
    1132017-10-13  Alex Christensen  <achristensen@webkit.org>
    214

  • trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

    r223167 r223432  
    518518        [NSNumber numberWithBool:YES],  WebKitAnimatedImageAsyncDecodingEnabledPreferenceKey,
    519519#if PLATFORM(IOS)
    520         [NSNumber numberWithUnsignedInt:FrameFlatteningFullyEnabled], WebKitFrameFlatteningPreferenceKey,
     520        [NSNumber numberWithUnsignedInt:static_cast<uint32_t>(FrameFlattening::FullyEnabled)], WebKitFrameFlatteningPreferenceKey,
    521521#else
    522         [NSNumber numberWithUnsignedInt:FrameFlatteningDisabled], WebKitFrameFlatteningPreferenceKey,
     522        [NSNumber numberWithUnsignedInt:static_cast<uint32_t>(FrameFlattening::Disabled)], WebKitFrameFlatteningPreferenceKey,
    523523#endif
    524524        [NSNumber numberWithBool:NO], WebKitAsyncFrameScrollingEnabledPreferenceKey,

  • trunk/Source/WebKitLegacy/win/ChangeLog

    r223192 r223432  
     12017-10-16  Sam Weinig  <sam@webkit.org>
     2
     3        [Settings] Remove all custom code from Settings.h/cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=178330
     5
     6        Reviewed by Simon Fraser.
     7
     8        * WebView.cpp:
     9        (WebView::notifyPreferencesChanged):
     10           
     11            Update for naming changes of FrameFlattening now that it is an enum class.
     12
    1132017-10-11  Chris Dumez  <cdumez@apple.com>
    214

  • trunk/Source/WebKitLegacy/win/WebView.cpp

    r221746 r223432  
    54225422    if (FAILED(hr))
    54235423        return hr;
    5424     settings.setFrameFlattening(enabled ? FrameFlatteningFullyEnabled : FrameFlatteningDisabled);
     5424    settings.setFrameFlattening(enabled ? FrameFlattening::FullyEnabled : FrameFlattening::Disabled);
    54255425
    54265426    hr = prefsPrivate->acceleratedCompositingEnabled(&enabled);
Note: See TracChangeset for help on using the changeset viewer.