Changeset 48861 in webkit


Ignore:
Timestamp:
Sep 29, 2009 12:02:18 AM (15 years ago)
Author:
ukai@chromium.org
Message:

2009-09-28 Fumitoshi Ukai <​ukai@chromium.org>

Reviewed by Eric Seidel.

Add experimentalWebSocketsEnabled in Settings.
​https://bugs.webkit.org/show_bug.cgi?id=28941

  • WebCore.base.exp:
  • bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::webSocket):
  • bindings/v8/V8DOMWrapper.cpp: (WebCore::V8DOMWrapper::getConstructor):
  • bindings/v8/custom/V8WebSocketCustom.cpp:
  • page/Settings.cpp: (WebCore::Settings::Settings): (WebCore::Settings::setExperimentalWebSocketsEnabled):
  • page/Settings.h: (WebCore::Settings::experimentalWebSocketsEnabled):

2009-09-28 Fumitoshi Ukai <​ukai@chromium.org>

Reviewed by Eric Seidel.

Add experimentalWebSocketsEnabled in WebPreferences.
​https://bugs.webkit.org/show_bug.cgi?id=28941

  • WebView/WebPreferenceKeysPrivate.h:
  • WebView/WebPreferences.mm: (+[WebPreferences initialize]): (-[WebPreferences experimentalWebSocketsEnabled]): (-[WebPreferences setExperimentalWebSocketsEnabled:]):
  • WebView/WebPreferencesPrivate.h:
  • WebView/WebView.mm: (-[WebView _preferencesChangedNotification:]):

2009-09-28 Fumitoshi Ukai <​ukai@chromium.org>

Reviewed by Eric Seidel.

Add experimentalWebSocketsEnabled in WebPreferences.
​https://bugs.webkit.org/show_bug.cgi?id=28941

  • Interfaces/IWebPreferencesPrivate.idl:
  • WebPreferenceKeysPrivate.h:
  • WebPreferences.cpp: (WebPreferences::initializeDefaultSettings): (WebPreferences::setExperimentalWebSocketsEnabled): (WebPreferences::experimentalWebSocketsEnabled):
  • WebPreferences.h:
  • WebView.cpp: (WebView::notifyPreferencesChanged): (core):

2009-09-28 Fumitoshi Ukai <​ukai@chromium.org>

Reviewed by Eric Seidel.

Add experimentalWebSocketsEnabled in WebPreferences.
​https://bugs.webkit.org/show_bug.cgi?id=28941

  • DumpRenderTree/mac/DumpRenderTree.mm: (resetDefaultsToConsistentValues):
  • DumpRenderTree/win/DumpRenderTree.cpp: (resetDefaultsToConsistentValues):
Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r48859 r48861  
     12009-09-28  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Add experimentalWebSocketsEnabled in Settings.
     6        https://bugs.webkit.org/show_bug.cgi?id=28941
     7
     8        * WebCore.base.exp:
     9        * bindings/js/JSDOMWindowCustom.cpp:
     10        (WebCore::JSDOMWindow::webSocket):
     11        * bindings/v8/V8DOMWrapper.cpp:
     12        (WebCore::V8DOMWrapper::getConstructor):
     13        * bindings/v8/custom/V8WebSocketCustom.cpp:
     14        * page/Settings.cpp:
     15        (WebCore::Settings::Settings):
     16        (WebCore::Settings::setExperimentalWebSocketsEnabled):
     17        * page/Settings.h:
     18        (WebCore::Settings::experimentalWebSocketsEnabled):
     19       
    1202009-09-11  Fumitoshi Ukai  <ukai@chromium.org>
    221

  • trunk/WebCore/WebCore.base.exp

    r48748 r48861  
    646646__ZN7WebCore8Settings32setAcceleratedCompositingEnabledEb
    647647__ZN7WebCore8Settings32setNeedsAdobeFrameReloadingQuirkEb
     648__ZN7WebCore8Settings32setExperimentalWebSocketsEnabledEb
    648649__ZN7WebCore8Settings33setDownloadableBinaryFontsEnabledEb
    649650__ZN7WebCore8Settings33setEnforceCSSMIMETypeInStrictModeEb

  • trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

    r48778 r48861  
    721721JSValue JSDOMWindow::webSocket(ExecState* exec) const
    722722{
     723    Frame* frame = impl()->frame();
     724    if (!frame)
     725        return jsUndefined();
     726    Settings* settings = frame->settings();
     727    if (!settings)
     728        return jsUndefined();
     729    if (!settings->experimentalWebSocketsEnabled())
     730        return jsUndefined();
    723731    return getDOMConstructor<JSWebSocketConstructor>(exec, this);
    724732}

  • trunk/WebCore/bindings/v8/V8DOMWrapper.cpp

    r48781 r48861  
    579579    if (!frame)
    580580        return v8::Local<v8::Function>();
     581
     582#if ENABLE(WEB_SOCKETS)
     583    // Make typeof(window.WebSocket) == 'undefined' when
     584    // experimentalWebSocketEnabled is false.
     585    if (type == V8ClassIndex::WEBSOCKET) {
     586        Settings* settings = frame->settings();
     587        if (!settings || !settings->experimentalWebSocketsEnabled())
     588            return v8::Local<v8::Function>();
     589    }
     590#endif
    581591
    582592    v8::Handle<v8::Context> context = V8Proxy::context(frame);

  • trunk/WebCore/bindings/v8/custom/V8WebSocketCustom.cpp

    r48323 r48861  
    3636
    3737#include "Frame.h"
     38#include "Settings.h"
    3839#include "V8Binding.h"
    3940#include "V8ObjectEventListener.h"

  • trunk/WebCore/page/Settings.cpp

    r48748 r48861  
    118118    , m_experimentalNotificationsEnabled(false)
    119119    , m_pluginHalterEnabled(false)
     120    , m_experimentalWebSocketsEnabled(false)
    120121{
    121122    // A Frame may not have been created yet, so we initialize the AtomicString
    … …  
    529530#endif
    530531
     532#if ENABLE(WEB_SOCKETS)
     533void Settings::setExperimentalWebSocketsEnabled(bool enabled)
     534{
     535    m_experimentalWebSocketsEnabled = enabled;
     536}
     537#endif
     538
    531539} // namespace WebCore

  • trunk/WebCore/page/Settings.h

    r48748 r48861  
    267267        void setPluginAllowedRunTime(unsigned);
    268268        unsigned pluginAllowedRunTime() const { return m_pluginAllowedRunTime; }
     269
     270#if ENABLE(WEB_SOCKETS)
     271        void setExperimentalWebSocketsEnabled(bool);
     272        bool experimentalWebSocketsEnabled() const { return m_experimentalWebSocketsEnabled; }
     273#endif
    269274
    270275    private:
    … …  
    336341        bool m_pluginHalterEnabled : 1;
    337342
     343#if ENABLE(WEB_SOCKETS)
     344        bool m_experimentalWebSocketsEnabled : 1;
     345#endif
     346
    338347#if USE(SAFARI_THEME)
    339348        static bool gShouldPaintNativeControls;

  • trunk/WebKit/mac/ChangeLog

    r48831 r48861  
     12009-09-28  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Add experimentalWebSocketsEnabled in WebPreferences.
     6        https://bugs.webkit.org/show_bug.cgi?id=28941
     7
     8        * WebView/WebPreferenceKeysPrivate.h:
     9        * WebView/WebPreferences.mm:
     10        (+[WebPreferences initialize]):
     11        (-[WebPreferences experimentalWebSocketsEnabled]):
     12        (-[WebPreferences setExperimentalWebSocketsEnabled:]):
     13        * WebView/WebPreferencesPrivate.h:
     14        * WebView/WebView.mm:
     15        (-[WebView _preferencesChangedNotification:]):
     16
    1172009-09-28  Dan Bernstein  <mitz@apple.com>
    218

  • trunk/WebKit/mac/WebView/WebPreferenceKeysPrivate.h

    r48745 r48861  
    5757#define WebKitLocalStorageEnabledPreferenceKey @"WebKitLocalStorageEnabledPreferenceKey"
    5858#define WebKitExperimentalNotificationsEnabledPreferenceKey @"WebKitExperimentalNotificationsEnabledPreferenceKey"
     59#define WebKitExperimentalWebSocketsEnabledPreferenceKey @"WebKitExperimentalWebSocketsEnabledPreferenceKey"
    5960#define WebKitAllowAnimatedImagesPreferenceKey @"WebKitAllowAnimatedImagesPreferenceKey"
    6061#define WebKitAllowAnimatedImageLoopingPreferenceKey @"WebKitAllowAnimatedImageLoopingPreferenceKey"

  • trunk/WebKit/mac/WebView/WebPreferences.mm

    r48745 r48861  
    322322        [NSNumber numberWithBool:YES],  WebKitLocalStorageEnabledPreferenceKey,
    323323        [NSNumber numberWithBool:NO],   WebKitExperimentalNotificationsEnabledPreferenceKey,
     324        [NSNumber numberWithBool:NO],   WebKitExperimentalWebSocketsEnabledPreferenceKey,
    324325        [NSNumber numberWithBool:YES],  WebKitAllowAnimatedImagesPreferenceKey,
    325326        [NSNumber numberWithBool:YES],  WebKitAllowAnimatedImageLoopingPreferenceKey,
    … …  
    10231024}
    10241025
     1026- (BOOL)experimentalWebSocketsEnabled
     1027{
     1028    return [self _boolValueForKey:WebKitExperimentalWebSocketsEnabledPreferenceKey];
     1029}
     1030
     1031- (void)setExperimentalWebSocketsEnabled:(BOOL)experimentalWebSocketsEnabled
     1032{
     1033    [self _setBoolValue:experimentalWebSocketsEnabled forKey:WebKitExperimentalWebSocketsEnabledPreferenceKey];
     1034}
     1035
    10251036+ (WebPreferences *)_getInstanceForIdentifier:(NSString *)ident
    10261037{

  • trunk/WebKit/mac/WebView/WebPreferencesPrivate.h

    r48745 r48861  
    111111- (void)setExperimentalNotificationsEnabled:(BOOL)notificationsEnabled;
    112112
     113- (BOOL)experimentalWebSocketsEnabled;
     114- (void)setExperimentalWebSocketsEnabled:(BOOL)websocketsEnabled;
     115
    113116// zero means do AutoScale
    114117- (float)PDFScaleFactor;

  • trunk/WebKit/mac/WebView/WebView.mm

    r48748 r48861  
    12791279    settings->setLocalStorageEnabled([preferences localStorageEnabled]);
    12801280    settings->setExperimentalNotificationsEnabled([preferences experimentalNotificationsEnabled]);
     1281    settings->setExperimentalWebSocketsEnabled([preferences experimentalWebSocketsEnabled]);
    12811282    settings->setPrivateBrowsingEnabled([preferences privateBrowsingEnabled]);
    12821283    settings->setSansSerifFontFamily([preferences sansSerifFontFamily]);

  • trunk/WebKit/win/ChangeLog

    r48770 r48861  
     12009-09-28  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Add experimentalWebSocketsEnabled in WebPreferences.
     6        https://bugs.webkit.org/show_bug.cgi?id=28941
     7
     8        * Interfaces/IWebPreferencesPrivate.idl:
     9        * WebPreferenceKeysPrivate.h:
     10        * WebPreferences.cpp:
     11        (WebPreferences::initializeDefaultSettings):
     12        (WebPreferences::setExperimentalWebSocketsEnabled):
     13        (WebPreferences::experimentalWebSocketsEnabled):
     14        * WebPreferences.h:
     15        * WebView.cpp:
     16        (WebView::notifyPreferencesChanged):
     17        (core):
     18
    1192009-09-25  Darin Adler  <darin@apple.com>
    220

  • trunk/WebKit/win/Interfaces/IWebPreferencesPrivate.idl

    r48748 r48861  
    8383    HRESULT setExperimentalNotificationsEnabled([in] BOOL enabled);
    8484
     85    HRESULT experimentalWebSocketsEnabled([out, retval] BOOL *enabled);
     86    HRESULT setExperimentalWebSocketsEnabled([in] BOOL enabled);
     87
    8588    HRESULT setShouldUseHighResolutionTimers([in] BOOL useHighResolutionTimers);
    8689    HRESULT shouldUseHighResolutionTimers([out, retval] BOOL* useHighResolutionTimers);

  • trunk/WebKit/win/WebPreferenceKeysPrivate.h

    r48748 r48861  
    5555#define WebKitLocalStorageEnabledPreferenceKey "WebKitLocalStorageEnabled"
    5656#define WebKitExperimentalNotificationsEnabledPreferenceKey "WebKitExperimentalNotificationsEnabled"
     57#define WebKitExperimentalWebSocketsEnabledPreferenceKey "WebKitExperimentalWebSocketsEnabled"
    5758#define WebKitAllowAnimatedImagesPreferenceKey "WebKitAllowAnimatedImagesPreferenceKey"
    5859#define WebKitAllowAnimatedImageLoopingPreferenceKey "WebKitAllowAnimatedImageLoopingPreferenceKey"

  • trunk/WebKit/win/WebPreferences.cpp

    r48748 r48861  
    214214    CFDictionaryAddValue(defaults, CFSTR(WebKitLocalStorageEnabledPreferenceKey), kCFBooleanTrue);
    215215    CFDictionaryAddValue(defaults, CFSTR(WebKitExperimentalNotificationsEnabledPreferenceKey), kCFBooleanFalse);
     216    CFDictionaryAddValue(defaults, CFSTR(WebKitExperimentalWebSocketsEnabledPreferenceKey), kCFBooleanFaluse);
    216217    CFDictionaryAddValue(defaults, CFSTR(WebKitAllowAnimatedImagesPreferenceKey), kCFBooleanTrue);
    217218    CFDictionaryAddValue(defaults, CFSTR(WebKitAllowAnimatedImageLoopingPreferenceKey), kCFBooleanTrue);
    … …  
    13121313}
    13131314
     1315HRESULT STDMETHODCALLTYPE WebPreferences::setExperimentalWebSocketsEnabled(BOOL enabled)
     1316{
     1317    setBoolValue(CFSTR(WebKitExperimentalWebSocketsEnabledPreferenceKey), enabled);
     1318    return S_OK;
     1319}
     1320
     1321HRESULT STDMETHODCALLTYPE WebPreferences::experimentalWebSocketsEnabled(BOOL* enabled)
     1322{
     1323    *enabled = boolValueForKey(CFSTR(WebKitExperimentalWebSocketsEnabledPreferenceKey));
     1324    return S_OK;
     1325}
     1326
    13141327HRESULT WebPreferences::setZoomsTextOnly(BOOL zoomsTextOnly)
    13151328{

  • trunk/WebKit/win/WebPreferences.h

    r48748 r48861  
    333333        /* [in] */ BOOL enabled);
    334334
     335    virtual HRESULT STDMETHODCALLTYPE experimentalWebSocketsEnabled(
     336        /* [retval][out] */ BOOL *enabled);
     337
     338    virtual HRESULT STDMETHODCALLTYPE setExperimentalWebSocketsEnabled(
     339        /* [in] */ BOOL enabled);
     340
    335341    virtual HRESULT STDMETHODCALLTYPE setShouldPaintNativeControls(
    336342    /* [in] */ BOOL shouldPaint);

  • trunk/WebKit/win/WebView.cpp

    r48754 r48861  
    44104410    settings->setExperimentalNotificationsEnabled(enabled);
    44114411
     4412    hr = prefsPrivate->experimentalWebSocketsEnabled(&enabled);
     4413    if (FAILED(hr))
     4414        return hr;
     4415    settings->setExperimentalWebSocketsEnabled(enabled);
     4416
    44124417    hr = prefsPrivate->isWebSecurityEnabled(&enabled);
    44134418    if (FAILED(hr))
    … …  
    56265631    return page;
    56275632}
    5628 

  • trunk/WebKitTools/ChangeLog

    r48853 r48861  
     12009-09-28  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Add experimentalWebSocketsEnabled in WebPreferences.
     6        https://bugs.webkit.org/show_bug.cgi?id=28941
     7
     8        * DumpRenderTree/mac/DumpRenderTree.mm:
     9        (resetDefaultsToConsistentValues):
     10        * DumpRenderTree/win/DumpRenderTree.cpp:
     11        (resetDefaultsToConsistentValues):
     12
    1132009-09-28  Yaar Schnitman  <yaar@chromium.org>
    214

  • trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

    r48833 r48861  
    408408    [preferences setXSSAuditorEnabled:NO];
    409409    [preferences setExperimentalNotificationsEnabled:NO];
     410    [preferences setExperimentalWebSocketsEnabled:NO];
    410411
    411412    [preferences setPrivateBrowsingEnabled:NO];

  • trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

    r48745 r48861  
    738738        prefsPrivate->setDeveloperExtrasEnabled(FALSE);
    739739        prefsPrivate->setExperimentalNotificationsEnabled(TRUE);
     740        prefsPrivate->setExperimentalWebSocketsEnabled(FALSE);
    740741        prefsPrivate->setShouldPaintNativeControls(FALSE); // FIXME - need to make DRT pass with Windows native controls <http://bugs.webkit.org/show_bug.cgi?id=25592>
    741742        prefsPrivate->setXSSAuditorEnabled(FALSE);
Note: See TracChangeset for help on using the changeset viewer.