Title: [91634] trunk/Source/WebKit/chromium
- Revision
- 91634
- Author
- [email protected]
- Date
- 2011-07-23 07:54:52 -0700 (Sat, 23 Jul 2011)
Log Message
[Chromium] Turn on new WebSocket protocol in worker shadow page
https://bugs.webkit.org/show_bug.cgi?id=64852
Reviewed by Dmitry Titov.
* src/WebWorkerBase.cpp:
(WebKit::WebWorkerBase::initializeLoader):
Initialize the value of WebCore::Settings::useHixie76WebSocketProtocol()
for a new shadow page. The default value of this flag is overridden through
WebPreferences (located in webkit/glue in Chromium source tree) but a shadow
page does not receive the preference values from it.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (91633 => 91634)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-23 11:18:22 UTC (rev 91633)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-23 14:54:52 UTC (rev 91634)
@@ -1,3 +1,17 @@
+2011-07-23 Yuta Kitamura <[email protected]>
+
+ [Chromium] Turn on new WebSocket protocol in worker shadow page
+ https://bugs.webkit.org/show_bug.cgi?id=64852
+
+ Reviewed by Dmitry Titov.
+
+ * src/WebWorkerBase.cpp:
+ (WebKit::WebWorkerBase::initializeLoader):
+ Initialize the value of WebCore::Settings::useHixie76WebSocketProtocol()
+ for a new shadow page. The default value of this flag is overridden through
+ WebPreferences (located in webkit/glue in Chromium source tree) but a shadow
+ page does not receive the preference values from it.
+
2011-07-22 James Robinson <[email protected]>
[chromium] Remove code that attempted to explicitly sync compositing state before compositing
Modified: trunk/Source/WebKit/chromium/src/WebWorkerBase.cpp (91633 => 91634)
--- trunk/Source/WebKit/chromium/src/WebWorkerBase.cpp 2011-07-23 11:18:22 UTC (rev 91633)
+++ trunk/Source/WebKit/chromium/src/WebWorkerBase.cpp 2011-07-23 14:54:52 UTC (rev 91634)
@@ -239,6 +239,9 @@
ASSERT(!m_webView);
m_webView = WebView::create(0);
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());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
