Changeset 122280 in webkit


Ignore:
Timestamp:
Jul 10, 2012 4:53:21 PM (12 years ago)
Author:
abarth@webkit.org
Message:

WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
​https://bugs.webkit.org/show_bug.cgi?id=90910

Reviewed by Eric Seidel.

Source/WebCore:

We've already removed the code that implements Hixie76 WebSockets. This
patch just removes the WebCore::Setting that used to control which
WebSocket protocol version we'd use.

I've left the WebKit-layer APIs in place, but they now don't do
anything. I'll remove all the Chromium callers shortly.

  • page/Settings.cpp:

(WebCore::Settings::Settings):

  • page/Settings.h:

(Settings):

Source/WebKit/blackberry:

  • Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::init):

Source/WebKit/chromium:

  • public/WebSettings.h:

(WebKit::WebSettings::setHixie76WebSocketProtocolEnabled):

  • src/WebSettingsImpl.cpp:
  • src/WebSettingsImpl.h:

(WebSettingsImpl):

  • src/WebSharedWorkerImpl.cpp:

(WebKit::WebSharedWorkerImpl::initializeLoader):

Source/WebKit/gtk:

  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
  • WebCoreSupport/DumpRenderTreeSupportGtk.h:

(DumpRenderTreeSupportGtk):

  • webkit/webkitwebview.cpp:

(webkit_web_view_update_settings):

Source/WebKit/mac:

  • WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
(-[WebPreferences setHixie76WebSocketProtocolEnabled:]):
(-[WebPreferences isHixie76WebSocketProtocolEnabled]):

  • WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Source/WebKit/qt:

  • Api/qwebpage.cpp:

(QWebPagePrivate::QWebPagePrivate):

  • WebCoreSupport/DumpRenderTreeSupportQt.cpp:
  • WebCoreSupport/DumpRenderTreeSupportQt.h:

Source/WebKit/win:

  • WebPreferences.cpp:

(WebPreferences::initializeDefaultSettings):
(WebPreferences::setHixie76WebSocketProtocolEnabled):
(WebPreferences::hixie76WebSocketProtocolEnabled):

  • WebView.cpp:

(WebView::notifyPreferencesChanged):

Source/WebKit2:

  • Shared/WebPreferencesStore.h:

(WebKit):

  • UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetHixie76WebSocketProtocolEnabled):
(WKPreferencesGetHixie76WebSocketProtocolEnabled):

  • WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

Location:
trunk/Source
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r122278 r122280  
     12012-07-10  Adam Barth  <abarth@webkit.org>
     2
     3        WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
     4        https://bugs.webkit.org/show_bug.cgi?id=90910
     5
     6        Reviewed by Eric Seidel.
     7
     8        We've already removed the code that implements Hixie76 WebSockets. This
     9        patch just removes the WebCore::Setting that used to control which
     10        WebSocket protocol version we'd use.
     11
     12        I've left the WebKit-layer APIs in place, but they now don't do
     13        anything.  I'll remove all the Chromium callers shortly.
     14
     15        * page/Settings.cpp:
     16        (WebCore::Settings::Settings):
     17        * page/Settings.h:
     18        (Settings):
     19
    1202012-07-10  Philip Rogers  <pdr@google.com>
    221

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

    r121907 r122280  
    253253    , m_scrollAnimatorEnabled(true)
    254254#endif
    255 #if ENABLE(WEB_SOCKETS)
    256     , m_useHixie76WebSocketProtocol(false)
    257 #endif
    258255    , m_mediaPlaybackRequiresUserGesture(false)
    259256    , m_mediaPlaybackAllowsInline(true)

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

    r121907 r122280  
    505505        void setEnableScrollAnimator(bool flag) { m_scrollAnimatorEnabled = flag; }
    506506        bool scrollAnimatorEnabled() const { return m_scrollAnimatorEnabled; }
    507 #endif
    508 #if ENABLE(WEB_SOCKETS)
    509         void setUseHixie76WebSocketProtocol(bool flag) { m_useHixie76WebSocketProtocol = flag; }
    510         bool useHixie76WebSocketProtocol() { return m_useHixie76WebSocketProtocol; }
    511507#endif
    512508
    … …  
    746742        bool m_scrollAnimatorEnabled : 1;
    747743#endif
    748 #if ENABLE(WEB_SOCKETS)
    749         bool m_useHixie76WebSocketProtocol : 1;
    750 #endif
    751744        bool m_mediaPlaybackRequiresUserGesture : 1;
    752745        bool m_mediaPlaybackAllowsInline : 1;

  • trunk/Source/WebKit/blackberry/Api/WebPage.cpp

    r122162 r122280  
    568568#endif
    569569
    570     m_page->settings()->setUseHixie76WebSocketProtocol(false);
    571570    m_page->settings()->setInteractiveFormValidationEnabled(true);
    572571    m_page->settings()->setAllowUniversalAccessFromFileURLs(false);

  • trunk/Source/WebKit/blackberry/ChangeLog

    r122204 r122280  
     12012-07-10  Adam Barth  <abarth@webkit.org>
     2
     3        WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
     4        https://bugs.webkit.org/show_bug.cgi?id=90910
     5
     6        Reviewed by Eric Seidel.
     7
     8        * Api/WebPage.cpp:
     9        (BlackBerry::WebKit::WebPagePrivate::init):
     10
    1112012-07-10  Adam Barth  <abarth@webkit.org>
    212

  • trunk/Source/WebKit/chromium/ChangeLog

    r122272 r122280  
     12012-07-10  Adam Barth  <abarth@webkit.org>
     2
     3        WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
     4        https://bugs.webkit.org/show_bug.cgi?id=90910
     5
     6        Reviewed by Eric Seidel.
     7
     8        * public/WebSettings.h:
     9        (WebKit::WebSettings::setHixie76WebSocketProtocolEnabled):
     10        * src/WebSettingsImpl.cpp:
     11        * src/WebSettingsImpl.h:
     12        (WebSettingsImpl):
     13        * src/WebSharedWorkerImpl.cpp:
     14        (WebKit::WebSharedWorkerImpl::initializeLoader):
     15
    1162012-07-09  Dana Jansens  <danakj@chromium.org>
    217

  • trunk/Source/WebKit/chromium/public/WebSettings.h

    r121861 r122280  
    146146    virtual void setEnableScrollAnimator(bool) = 0;
    147147    virtual bool scrollAnimatorEnabled() const = 0;
    148     virtual void setHixie76WebSocketProtocolEnabled(bool) = 0;
    149148    virtual void setVisualWordMovementEnabled(bool) = 0;
    150149    virtual void setAcceleratedPaintingEnabled(bool) = 0;
    … …  
    162161    // DEPRECATED
    163162    virtual void setDefaultDeviceScaleFactor(int) { }
     163    virtual void setHixie76WebSocketProtocolEnabled(bool) { }
    164164
    165165protected:

  • trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp

    r121861 r122280  
    556556}
    557557
    558 void WebSettingsImpl::setHixie76WebSocketProtocolEnabled(bool enabled)
    559 {
    560 #if ENABLE(WEB_SOCKETS)
    561     m_settings->setUseHixie76WebSocketProtocol(enabled);
    562 #else
    563     UNUSED_PARAM(enabled);
    564 #endif
    565 }
    566 
    567558void WebSettingsImpl::setVisualWordMovementEnabled(bool enabled)
    568559{

  • trunk/Source/WebKit/chromium/src/WebSettingsImpl.h

    r121861 r122280  
    140140    virtual void setEnableScrollAnimator(bool);
    141141    virtual bool scrollAnimatorEnabled() const;
    142     virtual void setHixie76WebSocketProtocolEnabled(bool);
    143142    virtual void setVisualWordMovementEnabled(bool);
    144143    virtual void setShouldDisplaySubtitles(bool);

  • trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp

    r121742 r122280  
    124124    // FIXME: Settings information should be passed to the Worker process from Browser process when the worker
    125125    // is created (similar to RenderThread::OnCreateNewView).
    126     m_webView->settings()->setHixie76WebSocketProtocolEnabled(false);
    127126    m_webView->initializeMainFrame(this);
    128127

  • trunk/Source/WebKit/gtk/ChangeLog

    r122233 r122280  
     12012-07-10  Adam Barth  <abarth@webkit.org>
     2
     3        WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
     4        https://bugs.webkit.org/show_bug.cgi?id=90910
     5
     6        Reviewed by Eric Seidel.
     7
     8        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
     9        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
     10        (DumpRenderTreeSupportGtk):
     11        * webkit/webkitwebview.cpp:
     12        (webkit_web_view_update_settings):
     13
    1142012-07-10  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
    215

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r122204 r122280  
    770770}
    771771
    772 void DumpRenderTreeSupportGtk::setHixie76WebSocketProtocolEnabled(WebKitWebView* webView, bool enabled)
    773 {
    774 #if ENABLE(WEB_SOCKETS)
    775     core(webView)->settings()->setUseHixie76WebSocketProtocol(enabled);
    776 #else
    777     UNUSED_PARAM(webView);
    778     UNUSED_PARAM(enabled);
    779 #endif
    780 }
    781 
    782772void DumpRenderTreeSupportGtk::setPageCacheSupportsPlugins(WebKitWebView* webView, bool enabled)
    783773{

  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h

    r122204 r122280  
    119119    static int numberOfPendingGeolocationPermissionRequests(WebKitWebView*);
    120120
    121     static void setHixie76WebSocketProtocolEnabled(WebKitWebView*, bool enabled);
    122121    static void setPageCacheSupportsPlugins(WebKitWebView*, bool enabled);
    123122    static void setCSSGridLayoutEnabled(WebKitWebView*, bool enabled);

  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r122147 r122280  
    34373437#if ENABLE(WEB_AUDIO)
    34383438    coreSettings->setWebAudioEnabled(settingsPrivate->enableWebAudio);
    3439 #endif
    3440 
    3441 #if ENABLE(WEB_SOCKETS)
    3442     coreSettings->setUseHixie76WebSocketProtocol(false);
    34433439#endif
    34443440

  • trunk/Source/WebKit/mac/ChangeLog

    r122195 r122280  
     12012-07-10  Adam Barth  <abarth@webkit.org>
     2
     3        WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
     4        https://bugs.webkit.org/show_bug.cgi?id=90910
     5
     6        Reviewed by Eric Seidel.
     7
     8        * WebView/WebPreferences.mm:
     9        (+[WebPreferences initialize]):
     10        (-[WebPreferences setHixie76WebSocketProtocolEnabled:]):
     11        (-[WebPreferences isHixie76WebSocketProtocolEnabled]):
     12        * WebView/WebView.mm:
     13        (-[WebView _preferencesChanged:]):
     14
    1152012-07-09  Matt Falkenhagen  <falken@chromium.org>
    216

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

    r118018 r122280  
    387387        [NSNumber numberWithBool:NO],   WebKitUsePreHTML5ParserQuirksKey,
    388388        [NSNumber numberWithBool:YES],  WebKitAVFoundationEnabledKey,
    389         [NSNumber numberWithBool:NO],  WebKitHixie76WebSocketProtocolEnabledKey,
    390389        [NSNumber numberWithBool:NO],   WebKitMediaPlaybackRequiresUserGesturePreferenceKey,
    391390        [NSNumber numberWithBool:YES],  WebKitMediaPlaybackAllowsInlinePreferenceKey,
    … …  
    15621561- (void)setHixie76WebSocketProtocolEnabled:(BOOL)flag
    15631562{
    1564     [self _setBoolValue:flag forKey:WebKitHixie76WebSocketProtocolEnabledKey];
    15651563}
    15661564
    15671565- (BOOL)isHixie76WebSocketProtocolEnabled
    15681566{
    1569     return [self _boolValueForKey:WebKitHixie76WebSocketProtocolEnabledKey];
     1567    return false;
    15701568}
    15711569

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

    r121707 r122280  
    15261526#endif
    15271527#endif
    1528 #if ENABLE(WEB_SOCKETS)
    1529     settings->setUseHixie76WebSocketProtocol([preferences isHixie76WebSocketProtocolEnabled]);
    1530 #endif
    15311528    settings->setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
    15321529    settings->setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);

  • trunk/Source/WebKit/qt/Api/qwebpage.cpp

    r121555 r122280  
    358358
    359359    settings = new QWebSettings(page->settings());
    360 
    361 #if ENABLE(WEB_SOCKETS)
    362     page->settings()->setUseHixie76WebSocketProtocol(false);
    363 #endif
    364360
    365361    history.d = new QWebHistoryPrivate(static_cast<WebCore::BackForwardListImpl*>(page->backForwardList()));

  • trunk/Source/WebKit/qt/ChangeLog

    r122175 r122280  
     12012-07-10  Adam Barth  <abarth@webkit.org>
     2
     3        WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
     4        https://bugs.webkit.org/show_bug.cgi?id=90910
     5
     6        Reviewed by Eric Seidel.
     7
     8        * Api/qwebpage.cpp:
     9        (QWebPagePrivate::QWebPagePrivate):
     10        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
     11        * WebCoreSupport/DumpRenderTreeSupportQt.h:
     12
    1132012-07-09  No'am Rosenthal  <noam.rosenthal@nokia.com>
    214

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp

    r121555 r122280  
    11381138}
    11391139
    1140 bool DumpRenderTreeSupportQt::defaultHixie76WebSocketProtocolEnabled()
    1141 {
    1142     return true;
    1143 }
    1144 
    1145 void DumpRenderTreeSupportQt::setHixie76WebSocketProtocolEnabled(QWebPage* page, bool enabled)
    1146 {
    1147 #if ENABLE(WEB_SOCKETS)
    1148     if (Page* corePage = QWebPagePrivate::core(page))
    1149         corePage->settings()->setUseHixie76WebSocketProtocol(enabled);
    1150 #else
    1151     UNUSED_PARAM(page);
    1152     UNUSED_PARAM(enabled);
    1153 #endif
    1154 }
    1155 
    11561140QImage DumpRenderTreeSupportQt::paintPagesWithBoundaries(QWebFrame* qframe)
    11571141{

  • trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h

    r121429 r122280  
    229229#endif
    230230
    231     static bool defaultHixie76WebSocketProtocolEnabled();
    232     static void setHixie76WebSocketProtocolEnabled(QWebPage*, bool);
    233 
    234231    static QImage paintPagesWithBoundaries(QWebFrame*);
    235232};

  • trunk/Source/WebKit/win/ChangeLog

    r122115 r122280  
     12012-07-10  Adam Barth  <abarth@webkit.org>
     2
     3        WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
     4        https://bugs.webkit.org/show_bug.cgi?id=90910
     5
     6        Reviewed by Eric Seidel.
     7
     8        * WebPreferences.cpp:
     9        (WebPreferences::initializeDefaultSettings):
     10        (WebPreferences::setHixie76WebSocketProtocolEnabled):
     11        (WebPreferences::hixie76WebSocketProtocolEnabled):
     12        * WebView.cpp:
     13        (WebView::notifyPreferencesChanged):
     14
    1152012-07-02  Ryosuke Niwa  <rniwa@webkit.org>
    216

  • trunk/Source/WebKit/win/WebPreferences.cpp

    r121597 r122280  
    270270    CFDictionaryAddValue(defaults, CFSTR(WebKitMemoryInfoEnabledPreferenceKey), kCFBooleanFalse);
    271271    CFDictionaryAddValue(defaults, CFSTR(WebKitHyperlinkAuditingEnabledPreferenceKey), kCFBooleanTrue);
    272     CFDictionaryAddValue(defaults, CFSTR(WebKitHixie76WebSocketProtocolEnabledPreferenceKey), kCFBooleanFalse);
    273272
    274273    CFDictionaryAddValue(defaults, CFSTR(WebKitMediaPlaybackRequiresUserGesturePreferenceKey), kCFBooleanFalse);
    … …  
    983982    /* [in] */ BOOL enabled)
    984983{
    985     setBoolValue(CFSTR(WebKitHixie76WebSocketProtocolEnabledPreferenceKey), enabled);
    986984    return S_OK;
    987985}
    … …  
    990988    /* [retval][out] */ BOOL* enabled)
    991989{
    992     *enabled = boolValueForKey(CFSTR(WebKitHixie76WebSocketProtocolEnabledPreferenceKey));
     990    *enabled = false;
    993991    return S_OK;
    994992}

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

    r121707 r122280  
    49084908    settings->setLoadsSiteIconsIgnoringImageLoadingSetting(!!enabled);
    49094909
    4910 #if ENABLE(WEB_SOCKETS)
    4911     hr = prefsPrivate->hixie76WebSocketProtocolEnabled(&enabled);
    4912     if (FAILED(hr))
    4913         return hr;
    4914     settings->setUseHixie76WebSocketProtocol(enabled);
    4915 #endif
    4916 
    49174910    hr = prefsPrivate->showsToolTipOverTruncatedText(&enabled);
    49184911    if (FAILED(hr))

  • trunk/Source/WebKit2/ChangeLog

    r122275 r122280  
     12012-07-10  Adam Barth  <abarth@webkit.org>
     2
     3        WebCore::Settings for Hixie76 WebSocket protocol doesn't do anything and should be removed
     4        https://bugs.webkit.org/show_bug.cgi?id=90910
     5
     6        Reviewed by Eric Seidel.
     7
     8        * Shared/WebPreferencesStore.h:
     9        (WebKit):
     10        * UIProcess/API/C/WKPreferences.cpp:
     11        (WKPreferencesSetHixie76WebSocketProtocolEnabled):
     12        (WKPreferencesGetHixie76WebSocketProtocolEnabled):
     13        * WebProcess/InjectedBundle/InjectedBundle.cpp:
     14        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
     15        * WebProcess/WebPage/WebPage.cpp:
     16        (WebKit::WebPage::updatePreferences):
     17
    1182012-07-10  Helder Correia  <helder.correia@nokia.com>
    219

  • trunk/Source/WebKit2/Shared/WebPreferencesStore.h

    r120534 r122280  
    9696    macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
    9797    macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, DEFAULT_WEBKIT_AVFOUNDATION_ENABLED) \
    98     macro(Hixie76WebSocketProtocolEnabled, hixie76WebSocketProtocolEnabled, Bool, bool, false) \
    9998    macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, false) \
    10099    macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, true) \

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

    r118018 r122280  
    651651void WKPreferencesSetHixie76WebSocketProtocolEnabled(WKPreferencesRef preferencesRef, bool enabled)
    652652{
    653     toImpl(preferencesRef)->setHixie76WebSocketProtocolEnabled(enabled);
    654653}
    655654
    656655bool WKPreferencesGetHixie76WebSocketProtocolEnabled(WKPreferencesRef preferencesRef)
    657656{
    658     return toImpl(preferencesRef)->hixie76WebSocketProtocolEnabled();
     657    return false;
    659658}
    660659

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

    r121381 r122280  
    157157    FOR_EACH_OVERRIDE_BOOL_PREFERENCE(OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES)
    158158
    159 #if ENABLE(WEB_SOCKETS)
    160     OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES(WebKitHixie76WebSocketProtocolEnabled, UseHixie76WebSocketProtocol, hixie76WebSocketProtocolEnabled)
    161 #endif
    162 
    163159#undef OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES
    164160#undef FOR_EACH_OVERRIDE_BOOL_PREFERENCE

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r122204 r122280  
    20512051#endif
    20522052
    2053 #if ENABLE(WEB_SOCKETS)
    2054     settings->setUseHixie76WebSocketProtocol(store.getBoolValueForKey(WebPreferencesKey::hixie76WebSocketProtocolEnabledKey()));
    2055 #endif
    2056 
    20572053#if ENABLE(WEB_AUDIO)
    20582054    settings->setWebAudioEnabled(store.getBoolValueForKey(WebPreferencesKey::webAudioEnabledKey()));
Note: See TracChangeset for help on using the changeset viewer.