Changeset 192001 in webkit


Ignore:
Timestamp:
Nov 3, 2015, 5:01:34 PM (10 years ago)
Author:
bshafiei@apple.com
Message:

Merged r191999. rdar://problem/23376483

Location:
tags/Safari-602.1.9.1/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • tags/Safari-602.1.9.1/Source/WebCore/ChangeLog

    r191984 r192001  
     12015-11-03  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r191999.
     4
     5    2015-11-03  Geoffrey Garen  <ggaren@apple.com>
     6
     7            Provide a way to turn off const in WebKit2.
     8
     9            Reviewed by Sam Weinig.
     10
     11            * bindings/js/JSDOMWindowBase.cpp:
     12            (WebCore::JSDOMWindowBase::commonVM):
     13            * page/Settings.h:
     14            (WebCore::Settings::shouldUseHighResolutionTimers):
     15            (WebCore::Settings::shouldRewriteConstAsVar):
     16            (WebCore::Settings::setShouldRewriteConstAsVar):
     17            (WebCore::Settings::backgroundShouldExtendBeyondPage):
     18
    1192015-11-03  Babak Shafiei  <bshafiei@apple.com>
    220
  • tags/Safari-602.1.9.1/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

    r191984 r192001  
    260260
    261261#if PLATFORM(MAC)
    262         if (applicationIsITunes() || applicationIsIBooks())
     262        if (applicationIsITunes() || applicationIsIBooks() || Settings::shouldRewriteConstAsVar())
    263263            vm->setShouldRewriteConstAsVar(true);
    264264#endif
  • tags/Safari-602.1.9.1/Source/WebCore/page/Settings.cpp

    r189129 r192001  
    8585#endif
    8686   
     87bool Settings::gShouldRewriteConstAsVar = false;
    8788bool Settings::gShouldRespectPriorityInCSSAttributeSetters = false;
    8889bool Settings::gLowPowerVideoAudioBufferSizeEnabled = false;
  • tags/Safari-602.1.9.1/Source/WebCore/page/Settings.h

    r188234 r192001  
    195195#endif
    196196
     197    static bool shouldRewriteConstAsVar() { return gShouldRewriteConstAsVar; }
     198    static void setShouldRewriteConstAsVar(bool shouldRewriteConstAsVar) { gShouldRewriteConstAsVar = shouldRewriteConstAsVar; }
     199
    197200    WEBCORE_EXPORT void setBackgroundShouldExtendBeyondPage(bool);
    198201    bool backgroundShouldExtendBeyondPage() const { return m_backgroundShouldExtendBeyondPage; }
     
    348351    static bool gShouldUseHighResolutionTimers;
    349352#endif
     353    WEBCORE_EXPORT static bool gShouldRewriteConstAsVar;
    350354    static bool gShouldRespectPriorityInCSSAttributeSetters;
    351355#if PLATFORM(IOS)
  • tags/Safari-602.1.9.1/Source/WebKit2/ChangeLog

    r191684 r192001  
     12015-11-03  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r191999.
     4
     5    2015-11-03  Geoffrey Garen  <ggaren@apple.com>
     6
     7            Provide a way to turn off const in WebKit2.
     8
     9            Reviewed by Sam Weinig.
     10
     11            * Shared/WebProcessCreationParameters.cpp:
     12            (WebKit::WebProcessCreationParameters::encode):
     13            (WebKit::WebProcessCreationParameters::decode):
     14            * Shared/WebProcessCreationParameters.h:
     15            * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     16            (WebKit::WebProcessPool::platformInitializeWebProcess):
     17            * WebProcess/WebProcess.cpp:
     18            (WebKit::WebProcess::initializeWebProcess):
     19
    1202015-10-28  Babak Shafiei  <bshafiei@apple.com>
    221
  • tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

    r191260 r192001  
    108108    encoder << fontWhitelist;
    109109    encoder << iconDatabaseEnabled;
     110    encoder << shouldRewriteConstAsVar;
    110111    encoder << terminationTimeout;
    111112    encoder << languages;
     
    240241    if (!decoder.decode(parameters.iconDatabaseEnabled))
    241242        return false;
     243    if (!decoder.decode(parameters.shouldRewriteConstAsVar))
     244        return false;
    242245    if (!decoder.decode(parameters.terminationTimeout))
    243246        return false;
  • tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.h

    r191260 r192001  
    118118
    119119    bool iconDatabaseEnabled;
     120    bool shouldRewriteConstAsVar { false };
    120121
    121122    double terminationTimeout;
  • tags/Safari-602.1.9.1/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r191473 r192001  
    4545#import <WebCore/PlatformPasteboard.h>
    4646#import <WebCore/SharedBuffer.h>
     47#import <WebCore/RuntimeApplicationChecks.h>
    4748#import <sys/param.h>
    4849
     
    174175    parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
    175176    parameters.shouldEnableMemoryPressureReliefLogging = [[NSUserDefaults standardUserDefaults] boolForKey:@"LogMemoryJetsamDetails"];
     177
     178#if PLATFORM(MAC)
     179    parameters.shouldRewriteConstAsVar = applicationIsIBooks();
     180#endif
    176181
    177182#if HAVE(HOSTED_CORE_ANIMATION)
  • tags/Safari-602.1.9.1/Source/WebKit2/WebProcess/WebProcess.cpp

    r191381 r192001  
    337337        registerURLSchemeAsCORSEnabled(scheme);
    338338
     339    WebCore::Settings::setShouldRewriteConstAsVar(parameters.shouldRewriteConstAsVar);
     340
    339341#if ENABLE(CACHE_PARTITIONING)
    340342    for (auto& scheme : parameters.urlSchemesRegisteredAsCachePartitioned)
Note: See TracChangeset for help on using the changeset viewer.