Title: [89792] trunk/Source/WebKit/chromium
- Revision
- 89792
- Author
- [email protected]
- Date
- 2011-06-27 00:11:42 -0700 (Mon, 27 Jun 2011)
Log Message
2011-06-27 Yuta Kitamura <[email protected]>
Reviewed by Adam Barth.
[Chromium] Add useHixie76WebSocketProtocol to WebSettings
https://bugs.webkit.org/show_bug.cgi?id=63424
* public/WebSettings.h:
* src/WebSettingsImpl.cpp:
(WebKit::WebSettingsImpl::setHixie76WebSocketProtocolEnabled):
* src/WebSettingsImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (89791 => 89792)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-27 07:10:00 UTC (rev 89791)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-27 07:11:42 UTC (rev 89792)
@@ -1,3 +1,15 @@
+2011-06-27 Yuta Kitamura <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ [Chromium] Add useHixie76WebSocketProtocol to WebSettings
+ https://bugs.webkit.org/show_bug.cgi?id=63424
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setHixie76WebSocketProtocolEnabled):
+ * src/WebSettingsImpl.h:
+
2011-06-26 Adam Barth <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (89791 => 89792)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2011-06-27 07:10:00 UTC (rev 89791)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2011-06-27 07:11:42 UTC (rev 89792)
@@ -125,6 +125,7 @@
virtual void setAllowRunningOfInsecureContent(bool) = 0;
virtual void setShouldPrintBackgrounds(bool) = 0;
virtual void setEnableScrollAnimator(bool) = 0;
+ virtual void setHixie76WebSocketProtocolEnabled(bool) = 0;
protected:
~WebSettings() { }
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (89791 => 89792)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-06-27 07:10:00 UTC (rev 89791)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-06-27 07:11:42 UTC (rev 89792)
@@ -431,4 +431,13 @@
#endif
}
+void WebSettingsImpl::setHixie76WebSocketProtocolEnabled(bool enabled)
+{
+#if ENABLE(WEB_SOCKETS)
+ m_settings->setUseHixie76WebSocketProtocol(enabled);
+#else
+ UNUSED_PARAM(enabled);
+#endif
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (89791 => 89792)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2011-06-27 07:10:00 UTC (rev 89791)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2011-06-27 07:11:42 UTC (rev 89792)
@@ -118,6 +118,7 @@
virtual void setAllowRunningOfInsecureContent(bool);
virtual void setShouldPrintBackgrounds(bool);
virtual void setEnableScrollAnimator(bool);
+ virtual void setHixie76WebSocketProtocolEnabled(bool);
private:
WebCore::Settings* m_settings;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
