| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2012 Google Inc. All rights reserved. |    2  * Copyright (C) 2012 Google Inc. All rights reserved. | 
|    3  * Copyright (C) 2013 Apple Inc. All rights reserved. |    3  * Copyright (C) 2013 Apple Inc. All rights reserved. | 
|    4  * |    4  * | 
|    5  * Redistribution and use in source and binary forms, with or without |    5  * Redistribution and use in source and binary forms, with or without | 
|    6  * modification, are permitted provided that the following conditions |    6  * modification, are permitted provided that the following conditions | 
|    7  * are met: |    7  * are met: | 
|    8  * |    8  * | 
|    9  * 1.  Redistributions of source code must retain the above copyright |    9  * 1.  Redistributions of source code must retain the above copyright | 
|   10  *     notice, this list of conditions and the following disclaimer. |   10  *     notice, this list of conditions and the following disclaimer. | 
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   63     , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS
     izeOverride()) |   63     , m_originalTextAutosizingWindowSizeOverride(settings->textAutosizingWindowS
     izeOverride()) | 
|   64     , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac
     tor()) |   64     , m_originalAccessibilityFontScaleFactor(settings->accessibilityFontScaleFac
     tor()) | 
|   65     , m_originalMediaTypeOverride(settings->mediaTypeOverride()) |   65     , m_originalMediaTypeOverride(settings->mediaTypeOverride()) | 
|   66     , m_originalDisplayModeOverride(settings->displayModeOverride()) |   66     , m_originalDisplayModeOverride(settings->displayModeOverride()) | 
|   67     , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) |   67     , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled()) | 
|   68     , m_originalMockGestureTapHighlightsEnabled(settings->mockGestureTapHighligh
     tsEnabled()) |   68     , m_originalMockGestureTapHighlightsEnabled(settings->mockGestureTapHighligh
     tsEnabled()) | 
|   69     , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri
     buteAwareFormControlUIEnabled()) |   69     , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttri
     buteAwareFormControlUIEnabled()) | 
|   70     , m_imagesEnabled(settings->imagesEnabled()) |   70     , m_imagesEnabled(settings->imagesEnabled()) | 
|   71     , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) |   71     , m_defaultVideoPosterURL(settings->defaultVideoPosterURL()) | 
|   72     , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled()) |   72     , m_originalLayerSquashingEnabled(settings->layerSquashingEnabled()) | 
|   73     , m_originalImageColorProfilesEnabled(RuntimeEnabledFeatures::imageColorProf
     ilesEnabled()) |  | 
|   74     , m_originalImageAnimationPolicy(settings->imageAnimationPolicy()) |   73     , m_originalImageAnimationPolicy(settings->imageAnimationPolicy()) | 
|   75     , m_originalScrollTopLeftInteropEnabled(RuntimeEnabledFeatures::scrollTopLef
     tInteropEnabled()) |   74     , m_originalScrollTopLeftInteropEnabled(RuntimeEnabledFeatures::scrollTopLef
     tInteropEnabled()) | 
|   76     , m_originalCompositorWorkerEnabled(RuntimeEnabledFeatures::compositorWorker
     Enabled()) |   75     , m_originalCompositorWorkerEnabled(RuntimeEnabledFeatures::compositorWorker
     Enabled()) | 
|   77 { |   76 { | 
|   78 } |   77 } | 
|   79  |   78  | 
|   80 void InternalSettings::Backup::restoreTo(Settings* settings) |   79 void InternalSettings::Backup::restoreTo(Settings* settings) | 
|   81 { |   80 { | 
|   82     RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(
     m_originalCSP); |   81     RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(
     m_originalCSP); | 
|   83     RuntimeEnabledFeatures::setCSSStickyPositionEnabled(m_originalCSSStickyPosit
     ionEnabled); |   82     RuntimeEnabledFeatures::setCSSStickyPositionEnabled(m_originalCSSStickyPosit
     ionEnabled); | 
|   84     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb
     arsEnabled); |   83     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(m_originalOverlayScrollb
     arsEnabled); | 
|   85     settings->setEditingBehaviorType(m_originalEditingBehavior); |   84     settings->setEditingBehaviorType(m_originalEditingBehavior); | 
|   86     settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); |   85     settings->setTextAutosizingEnabled(m_originalTextAutosizingEnabled); | 
|   87     settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow
     SizeOverride); |   86     settings->setTextAutosizingWindowSizeOverride(m_originalTextAutosizingWindow
     SizeOverride); | 
|   88     settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa
     ctor); |   87     settings->setAccessibilityFontScaleFactor(m_originalAccessibilityFontScaleFa
     ctor); | 
|   89     settings->setMediaTypeOverride(m_originalMediaTypeOverride); |   88     settings->setMediaTypeOverride(m_originalMediaTypeOverride); | 
|   90     settings->setDisplayModeOverride(m_originalDisplayModeOverride); |   89     settings->setDisplayModeOverride(m_originalDisplayModeOverride); | 
|   91     settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); |   90     settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled); | 
|   92     settings->setMockGestureTapHighlightsEnabled(m_originalMockGestureTapHighlig
     htsEnabled); |   91     settings->setMockGestureTapHighlightsEnabled(m_originalMockGestureTapHighlig
     htsEnabled); | 
|   93     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr
     ibuteAwareFormControlUIEnabled); |   92     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttr
     ibuteAwareFormControlUIEnabled); | 
|   94     settings->setImagesEnabled(m_imagesEnabled); |   93     settings->setImagesEnabled(m_imagesEnabled); | 
|   95     settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL); |   94     settings->setDefaultVideoPosterURL(m_defaultVideoPosterURL); | 
|   96     settings->genericFontFamilySettings().reset(); |   95     settings->genericFontFamilySettings().reset(); | 
|   97     RuntimeEnabledFeatures::setImageColorProfilesEnabled(m_originalImageColorPro
     filesEnabled); |  | 
|   98     settings->setImageAnimationPolicy(m_originalImageAnimationPolicy); |   96     settings->setImageAnimationPolicy(m_originalImageAnimationPolicy); | 
|   99     RuntimeEnabledFeatures::setScrollTopLeftInteropEnabled(m_originalScrollTopLe
     ftInteropEnabled); |   97     RuntimeEnabledFeatures::setScrollTopLeftInteropEnabled(m_originalScrollTopLe
     ftInteropEnabled); | 
|  100     RuntimeEnabledFeatures::setCompositorWorkerEnabled(m_originalCompositorWorke
     rEnabled); |   98     RuntimeEnabledFeatures::setCompositorWorkerEnabled(m_originalCompositorWorke
     rEnabled); | 
|  101 } |   99 } | 
|  102  |  100  | 
|  103 InternalSettings* InternalSettings::from(Page& page) |  101 InternalSettings* InternalSettings::from(Page& page) | 
|  104 { |  102 { | 
|  105     if (!Supplement<Page>::from(page, supplementName())) |  103     if (!Supplement<Page>::from(page, supplementName())) | 
|  106         Supplement<Page>::provideTo(page, supplementName(), new InternalSettings
     (page)); |  104         Supplement<Page>::provideTo(page, supplementName(), new InternalSettings
     (page)); | 
|  107     return static_cast<InternalSettings*>(Supplement<Page>::from(page, supplemen
     tName())); |  105     return static_cast<InternalSettings*>(Supplement<Page>::from(page, supplemen
     tName())); | 
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  153 void InternalSettings::setCSSStickyPositionEnabled(bool enabled) |  151 void InternalSettings::setCSSStickyPositionEnabled(bool enabled) | 
|  154 { |  152 { | 
|  155     RuntimeEnabledFeatures::setCSSStickyPositionEnabled(enabled); |  153     RuntimeEnabledFeatures::setCSSStickyPositionEnabled(enabled); | 
|  156 } |  154 } | 
|  157  |  155  | 
|  158 void InternalSettings::setExperimentalContentSecurityPolicyFeaturesEnabled(bool 
     enabled) |  156 void InternalSettings::setExperimentalContentSecurityPolicyFeaturesEnabled(bool 
     enabled) | 
|  159 { |  157 { | 
|  160     RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(
     enabled); |  158     RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(
     enabled); | 
|  161 } |  159 } | 
|  162  |  160  | 
|  163 void InternalSettings::setImageColorProfilesEnabled(bool enabled) |  | 
|  164 { |  | 
|  165     RuntimeEnabledFeatures::setImageColorProfilesEnabled(enabled); |  | 
|  166 } |  | 
|  167  |  | 
|  168 void InternalSettings::setOverlayScrollbarsEnabled(bool enabled) |  161 void InternalSettings::setOverlayScrollbarsEnabled(bool enabled) | 
|  169 { |  162 { | 
|  170     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enabled); |  163     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enabled); | 
|  171 } |  164 } | 
|  172  |  165  | 
|  173 void InternalSettings::setViewportEnabled(bool enabled, ExceptionState& exceptio
     nState) |  166 void InternalSettings::setViewportEnabled(bool enabled, ExceptionState& exceptio
     nState) | 
|  174 { |  167 { | 
|  175     InternalSettingsGuardForSettings(); |  168     InternalSettingsGuardForSettings(); | 
|  176     settings()->setViewportEnabled(enabled); |  169     settings()->setViewportEnabled(enabled); | 
|  177 } |  170 } | 
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  483     settings()->setLogPreload(enabled); |  476     settings()->setLogPreload(enabled); | 
|  484 } |  477 } | 
|  485  |  478  | 
|  486 void InternalSettings::setCompositorWorkerEnabled(bool enabled, ExceptionState& 
     exceptionState) |  479 void InternalSettings::setCompositorWorkerEnabled(bool enabled, ExceptionState& 
     exceptionState) | 
|  487 { |  480 { | 
|  488     InternalSettingsGuardForSettings(); |  481     InternalSettingsGuardForSettings(); | 
|  489     RuntimeEnabledFeatures::setCompositorWorkerEnabled(enabled); |  482     RuntimeEnabledFeatures::setCompositorWorkerEnabled(enabled); | 
|  490 } |  483 } | 
|  491  |  484  | 
|  492 } // namespace blink |  485 } // namespace blink | 
| OLD | NEW |