Diff
Modified: trunk/Source/WebCore/ChangeLog (122279 => 122280)
--- trunk/Source/WebCore/ChangeLog 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebCore/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1,3 +1,22 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ 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.
+
+ 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):
+
2012-07-10 Philip Rogers <[email protected]>
Crash due to SVG animation element not removed from target (before reset)
Modified: trunk/Source/WebCore/page/Settings.cpp (122279 => 122280)
--- trunk/Source/WebCore/page/Settings.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -252,9 +252,6 @@
#if ENABLE(SMOOTH_SCROLLING)
, m_scrollAnimatorEnabled(true)
#endif
-#if ENABLE(WEB_SOCKETS)
- , m_useHixie76WebSocketProtocol(false)
-#endif
, m_mediaPlaybackRequiresUserGesture(false)
, m_mediaPlaybackAllowsInline(true)
, m_passwordEchoEnabled(false)
Modified: trunk/Source/WebCore/page/Settings.h (122279 => 122280)
--- trunk/Source/WebCore/page/Settings.h 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebCore/page/Settings.h 2012-07-10 23:53:21 UTC (rev 122280)
@@ -505,10 +505,6 @@
void setEnableScrollAnimator(bool flag) { m_scrollAnimatorEnabled = flag; }
bool scrollAnimatorEnabled() const { return m_scrollAnimatorEnabled; }
#endif
-#if ENABLE(WEB_SOCKETS)
- void setUseHixie76WebSocketProtocol(bool flag) { m_useHixie76WebSocketProtocol = flag; }
- bool useHixie76WebSocketProtocol() { return m_useHixie76WebSocketProtocol; }
-#endif
void setMediaPlaybackRequiresUserGesture(bool flag) { m_mediaPlaybackRequiresUserGesture = flag; };
bool mediaPlaybackRequiresUserGesture() const { return m_mediaPlaybackRequiresUserGesture; }
@@ -745,9 +741,6 @@
#if ENABLE(SMOOTH_SCROLLING)
bool m_scrollAnimatorEnabled : 1;
#endif
-#if ENABLE(WEB_SOCKETS)
- bool m_useHixie76WebSocketProtocol : 1;
-#endif
bool m_mediaPlaybackRequiresUserGesture : 1;
bool m_mediaPlaybackAllowsInline : 1;
bool m_passwordEchoEnabled : 1;
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (122279 => 122280)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -567,7 +567,6 @@
m_page->settings()->setTextReflowEnabled(m_webSettings->textReflowMode() == WebSettings::TextReflowEnabled);
#endif
- m_page->settings()->setUseHixie76WebSocketProtocol(false);
m_page->settings()->setInteractiveFormValidationEnabled(true);
m_page->settings()->setAllowUniversalAccessFromFileURLs(false);
m_page->settings()->setAllowFileAccessFromFileURLs(false);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (122279 => 122280)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1,5 +1,15 @@
2012-07-10 Adam Barth <[email protected]>
+ 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.
+
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::init):
+
+2012-07-10 Adam Barth <[email protected]>
+
LayoutTestController.dumpConfigurationForViewport should move to Internals
https://bugs.webkit.org/show_bug.cgi?id=45652
Modified: trunk/Source/WebKit/chromium/ChangeLog (122279 => 122280)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1,3 +1,18 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ 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.
+
+ * public/WebSettings.h:
+ (WebKit::WebSettings::setHixie76WebSocketProtocolEnabled):
+ * src/WebSettingsImpl.cpp:
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+ * src/WebSharedWorkerImpl.cpp:
+ (WebKit::WebSharedWorkerImpl::initializeLoader):
+
2012-07-09 Dana Jansens <[email protected]>
[chromium] Replace use of ManagedTexture with CCScopedTexture for impl thread and remove implTextureManager from LayerRendererChromium
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (122279 => 122280)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-07-10 23:53:21 UTC (rev 122280)
@@ -145,7 +145,6 @@
virtual void setShouldPrintBackgrounds(bool) = 0;
virtual void setEnableScrollAnimator(bool) = 0;
virtual bool scrollAnimatorEnabled() const = 0;
- virtual void setHixie76WebSocketProtocolEnabled(bool) = 0;
virtual void setVisualWordMovementEnabled(bool) = 0;
virtual void setAcceleratedPaintingEnabled(bool) = 0;
virtual void setViewportEnabled(bool) = 0;
@@ -161,6 +160,7 @@
// DEPRECATED
virtual void setDefaultDeviceScaleFactor(int) { }
+ virtual void setHixie76WebSocketProtocolEnabled(bool) { }
protected:
~WebSettings() { }
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (122279 => 122280)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -555,15 +555,6 @@
#endif
}
-void WebSettingsImpl::setHixie76WebSocketProtocolEnabled(bool enabled)
-{
-#if ENABLE(WEB_SOCKETS)
- m_settings->setUseHixie76WebSocketProtocol(enabled);
-#else
- UNUSED_PARAM(enabled);
-#endif
-}
-
void WebSettingsImpl::setVisualWordMovementEnabled(bool enabled)
{
m_settings->setVisualWordMovementEnabled(enabled);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (122279 => 122280)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-07-10 23:53:21 UTC (rev 122280)
@@ -139,7 +139,6 @@
virtual void setShouldPrintBackgrounds(bool);
virtual void setEnableScrollAnimator(bool);
virtual bool scrollAnimatorEnabled() const;
- virtual void setHixie76WebSocketProtocolEnabled(bool);
virtual void setVisualWordMovementEnabled(bool);
virtual void setShouldDisplaySubtitles(bool);
virtual void setShouldDisplayCaptions(bool);
Modified: trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp (122279 => 122280)
--- trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -123,7 +123,6 @@
m_webView->settings()->setOfflineWebApplicationCacheEnabled(WebRuntimeFeatures::isApplicationCacheEnabled());
// FIXME: Settings information should be passed to the Worker process from Browser process when the worker
// is created (similar to RenderThread::OnCreateNewView).
- m_webView->settings()->setHixie76WebSocketProtocolEnabled(false);
m_webView->initializeMainFrame(this);
WebFrameImpl* webFrame = static_cast<WebFrameImpl*>(m_webView->mainFrame());
Modified: trunk/Source/WebKit/gtk/ChangeLog (122279 => 122280)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1,3 +1,16 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ 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.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+ (DumpRenderTreeSupportGtk):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_update_settings):
+
2012-07-10 Sudarsana Nagineni <[email protected]>
[GTK] Fix memory leaks by adopting allocation of GdkPixbuf
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (122279 => 122280)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -769,16 +769,6 @@
#endif
}
-void DumpRenderTreeSupportGtk::setHixie76WebSocketProtocolEnabled(WebKitWebView* webView, bool enabled)
-{
-#if ENABLE(WEB_SOCKETS)
- core(webView)->settings()->setUseHixie76WebSocketProtocol(enabled);
-#else
- UNUSED_PARAM(webView);
- UNUSED_PARAM(enabled);
-#endif
-}
-
void DumpRenderTreeSupportGtk::setPageCacheSupportsPlugins(WebKitWebView* webView, bool enabled)
{
core(webView)->settings()->setPageCacheSupportsPlugins(enabled);
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (122279 => 122280)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-07-10 23:53:21 UTC (rev 122280)
@@ -118,7 +118,6 @@
static void setMockGeolocationError(WebKitWebView*, int errorCode, const gchar* errorMessage);
static int numberOfPendingGeolocationPermissionRequests(WebKitWebView*);
- static void setHixie76WebSocketProtocolEnabled(WebKitWebView*, bool enabled);
static void setPageCacheSupportsPlugins(WebKitWebView*, bool enabled);
static void setCSSGridLayoutEnabled(WebKitWebView*, bool enabled);
static void setCSSRegionsEnabled(WebKitWebView*, bool enabled);
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (122279 => 122280)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -3438,10 +3438,6 @@
coreSettings->setWebAudioEnabled(settingsPrivate->enableWebAudio);
#endif
-#if ENABLE(WEB_SOCKETS)
- coreSettings->setUseHixie76WebSocketProtocol(false);
-#endif
-
#if ENABLE(SMOOTH_SCROLLING)
coreSettings->setEnableScrollAnimator(settingsPrivate->enableSmoothScrolling);
#endif
Modified: trunk/Source/WebKit/mac/ChangeLog (122279 => 122280)
--- trunk/Source/WebKit/mac/ChangeLog 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1,3 +1,17 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ 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.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences setHixie76WebSocketProtocolEnabled:]):
+ (-[WebPreferences isHixie76WebSocketProtocolEnabled]):
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2012-07-09 Matt Falkenhagen <[email protected]>
Add ENABLE_DIALOG_ELEMENT and skeleton files
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (122279 => 122280)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2012-07-10 23:53:21 UTC (rev 122280)
@@ -386,7 +386,6 @@
[NSNumber numberWithBool:YES], WebKitHyperlinkAuditingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitUsePreHTML5ParserQuirksKey,
[NSNumber numberWithBool:YES], WebKitAVFoundationEnabledKey,
- [NSNumber numberWithBool:NO], WebKitHixie76WebSocketProtocolEnabledKey,
[NSNumber numberWithBool:NO], WebKitMediaPlaybackRequiresUserGesturePreferenceKey,
[NSNumber numberWithBool:YES], WebKitMediaPlaybackAllowsInlinePreferenceKey,
[NSNumber numberWithBool:NO], WebKitWebAudioEnabledPreferenceKey,
@@ -1561,12 +1560,11 @@
- (void)setHixie76WebSocketProtocolEnabled:(BOOL)flag
{
- [self _setBoolValue:flag forKey:WebKitHixie76WebSocketProtocolEnabledKey];
}
- (BOOL)isHixie76WebSocketProtocolEnabled
{
- return [self _boolValueForKey:WebKitHixie76WebSocketProtocolEnabledKey];
+ return false;
}
- (BOOL)mediaPlaybackRequiresUserGesture
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (122279 => 122280)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1525,9 +1525,6 @@
settings->setAVFoundationEnabled(false);
#endif
#endif
-#if ENABLE(WEB_SOCKETS)
- settings->setUseHixie76WebSocketProtocol([preferences isHixie76WebSocketProtocolEnabled]);
-#endif
settings->setMediaPlaybackRequiresUserGesture([preferences mediaPlaybackRequiresUserGesture]);
settings->setMediaPlaybackAllowsInline([preferences mediaPlaybackAllowsInline]);
settings->setSuppressesIncrementalRendering([preferences suppressesIncrementalRendering]);
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (122279 => 122280)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -358,10 +358,6 @@
settings = new QWebSettings(page->settings());
-#if ENABLE(WEB_SOCKETS)
- page->settings()->setUseHixie76WebSocketProtocol(false);
-#endif
-
history.d = new QWebHistoryPrivate(static_cast<WebCore::BackForwardListImpl*>(page->backForwardList()));
memset(actions, 0, sizeof(actions));
Modified: trunk/Source/WebKit/qt/ChangeLog (122279 => 122280)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1,3 +1,15 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ 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.
+
+ * Api/qwebpage.cpp:
+ (QWebPagePrivate::QWebPagePrivate):
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
2012-07-09 No'am Rosenthal <[email protected]>
Shared code that is guarded with ENABLE(WEBGL) should be guarded with USE()
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (122279 => 122280)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1137,22 +1137,6 @@
#endif
}
-bool DumpRenderTreeSupportQt::defaultHixie76WebSocketProtocolEnabled()
-{
- return true;
-}
-
-void DumpRenderTreeSupportQt::setHixie76WebSocketProtocolEnabled(QWebPage* page, bool enabled)
-{
-#if ENABLE(WEB_SOCKETS)
- if (Page* corePage = QWebPagePrivate::core(page))
- corePage->settings()->setUseHixie76WebSocketProtocol(enabled);
-#else
- UNUSED_PARAM(page);
- UNUSED_PARAM(enabled);
-#endif
-}
-
QImage DumpRenderTreeSupportQt::paintPagesWithBoundaries(QWebFrame* qframe)
{
Frame* frame = QWebFramePrivate::core(qframe);
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (122279 => 122280)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2012-07-10 23:53:21 UTC (rev 122280)
@@ -228,9 +228,6 @@
static bool thirdPartyCookiePolicyAllows(QWebPage*, const QUrl&, const QUrl& firstPartyUrl);
#endif
- static bool defaultHixie76WebSocketProtocolEnabled();
- static void setHixie76WebSocketProtocolEnabled(QWebPage*, bool);
-
static QImage paintPagesWithBoundaries(QWebFrame*);
};
Modified: trunk/Source/WebKit/win/ChangeLog (122279 => 122280)
--- trunk/Source/WebKit/win/ChangeLog 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/win/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1,3 +1,17 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ 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.
+
+ * WebPreferences.cpp:
+ (WebPreferences::initializeDefaultSettings):
+ (WebPreferences::setHixie76WebSocketProtocolEnabled):
+ (WebPreferences::hixie76WebSocketProtocolEnabled):
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2012-07-02 Ryosuke Niwa <[email protected]>
Make HTMLCollection RefCounted
Modified: trunk/Source/WebKit/win/WebPreferences.cpp (122279 => 122280)
--- trunk/Source/WebKit/win/WebPreferences.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -269,7 +269,6 @@
CFDictionaryAddValue(defaults, CFSTR(WebKitMemoryInfoEnabledPreferenceKey), kCFBooleanFalse);
CFDictionaryAddValue(defaults, CFSTR(WebKitHyperlinkAuditingEnabledPreferenceKey), kCFBooleanTrue);
- CFDictionaryAddValue(defaults, CFSTR(WebKitHixie76WebSocketProtocolEnabledPreferenceKey), kCFBooleanFalse);
CFDictionaryAddValue(defaults, CFSTR(WebKitMediaPlaybackRequiresUserGesturePreferenceKey), kCFBooleanFalse);
CFDictionaryAddValue(defaults, CFSTR(WebKitMediaPlaybackAllowsInlinePreferenceKey), kCFBooleanTrue);
@@ -982,14 +981,13 @@
HRESULT STDMETHODCALLTYPE WebPreferences::setHixie76WebSocketProtocolEnabled(
/* [in] */ BOOL enabled)
{
- setBoolValue(CFSTR(WebKitHixie76WebSocketProtocolEnabledPreferenceKey), enabled);
return S_OK;
}
HRESULT STDMETHODCALLTYPE WebPreferences::hixie76WebSocketProtocolEnabled(
/* [retval][out] */ BOOL* enabled)
{
- *enabled = boolValueForKey(CFSTR(WebKitHixie76WebSocketProtocolEnabledPreferenceKey));
+ *enabled = false;
return S_OK;
}
Modified: trunk/Source/WebKit/win/WebView.cpp (122279 => 122280)
--- trunk/Source/WebKit/win/WebView.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit/win/WebView.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -4907,13 +4907,6 @@
return hr;
settings->setLoadsSiteIconsIgnoringImageLoadingSetting(!!enabled);
-#if ENABLE(WEB_SOCKETS)
- hr = prefsPrivate->hixie76WebSocketProtocolEnabled(&enabled);
- if (FAILED(hr))
- return hr;
- settings->setUseHixie76WebSocketProtocol(enabled);
-#endif
-
hr = prefsPrivate->showsToolTipOverTruncatedText(&enabled);
if (FAILED(hr))
return hr;
Modified: trunk/Source/WebKit2/ChangeLog (122279 => 122280)
--- trunk/Source/WebKit2/ChangeLog 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-10 23:53:21 UTC (rev 122280)
@@ -1,3 +1,20 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ 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.
+
+ * 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):
+
2012-07-10 Helder Correia <[email protected]>
[Qt] Repaint counter for accelerated compositing
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (122279 => 122280)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2012-07-10 23:53:21 UTC (rev 122280)
@@ -95,7 +95,6 @@
macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, DEFAULT_WEBKIT_AVFOUNDATION_ENABLED) \
- macro(Hixie76WebSocketProtocolEnabled, hixie76WebSocketProtocolEnabled, Bool, bool, false) \
macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, false) \
macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, true) \
macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (122279 => 122280)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -650,12 +650,11 @@
void WKPreferencesSetHixie76WebSocketProtocolEnabled(WKPreferencesRef preferencesRef, bool enabled)
{
- toImpl(preferencesRef)->setHixie76WebSocketProtocolEnabled(enabled);
}
bool WKPreferencesGetHixie76WebSocketProtocolEnabled(WKPreferencesRef preferencesRef)
{
- return toImpl(preferencesRef)->hixie76WebSocketProtocolEnabled();
+ return false;
}
void WKPreferencesSetMediaPlaybackRequiresUserGesture(WKPreferencesRef preferencesRef, bool flag)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (122279 => 122280)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -156,10 +156,6 @@
FOR_EACH_OVERRIDE_BOOL_PREFERENCE(OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES)
-#if ENABLE(WEB_SOCKETS)
- OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES(WebKitHixie76WebSocketProtocolEnabled, UseHixie76WebSocketProtocol, hixie76WebSocketProtocolEnabled)
-#endif
-
#undef OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES
#undef FOR_EACH_OVERRIDE_BOOL_PREFERENCE
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (122279 => 122280)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-07-10 23:39:33 UTC (rev 122279)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-07-10 23:53:21 UTC (rev 122280)
@@ -2050,10 +2050,6 @@
settings->setAVFoundationEnabled(store.getBoolValueForKey(WebPreferencesKey::isAVFoundationEnabledKey()));
#endif
-#if ENABLE(WEB_SOCKETS)
- settings->setUseHixie76WebSocketProtocol(store.getBoolValueForKey(WebPreferencesKey::hixie76WebSocketProtocolEnabledKey()));
-#endif
-
#if ENABLE(WEB_AUDIO)
settings->setWebAudioEnabled(store.getBoolValueForKey(WebPreferencesKey::webAudioEnabledKey()));
#endif
