[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
ukai at chromium.org
ukai at chromium.org
Wed Jan 20 22:14:56 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit b53ea626e9bf8bd99bc48040f5193a6500b5e861
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 7 02:57:53 2010 +0000
Unreviewed build fix for chromium.
Add "bool V8WorkerContext::WebSocketEnabled()"
* bindings/v8/custom/V8WorkerContextCustom.cpp:
(WebCore::V8WorkerContext::WebSocketEnabled):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52894 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 16324be..d725eaf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
2010-01-06 Fumitoshi Ukai <ukai at chromium.org>
+ Unreviewed build fix for chromium.
+ Add "bool V8WorkerContext::WebSocketEnabled()"
+
+ * bindings/v8/custom/V8WorkerContextCustom.cpp:
+ (WebCore::V8WorkerContext::WebSocketEnabled):
+
+2010-01-06 Fumitoshi Ukai <ukai at chromium.org>
+
Unreviewed build fix.
remove wrong assertion
diff --git a/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp b/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp
index d257fe4..ed54a1d 100644
--- a/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8WorkerContextCustom.cpp
@@ -55,6 +55,13 @@ bool V8WorkerContext::WebkitNotificationsEnabled()
}
#endif
+#if ENABLE(WEB_SOCKETS)
+bool V8WorkerContext::WebSocketEnabled()
+{
+ return WebSocket::isAvailable();
+}
+#endif
+
v8::Handle<v8::Value> SetTimeoutOrInterval(const v8::Arguments& args, bool singleShot)
{
WorkerContext* workerContext = V8DOMWrapper::convertDOMWrapperToNative<WorkerContext>(args.Holder());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list