Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2816)

Unified Diff: WebCore/GNUmakefile.am

Issue 155079: WebSocket implementation in WebKit (Closed)
Patch Set: Rewrite to use SocketStreamHandle Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « WebCore/DerivedSources.make ('k') | WebCore/WebCore.xcodeproj/project.pbxproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: WebCore/GNUmakefile.am
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 1f1a1b087e1f1cc5258b7721cd5ce79d19b6c345..f6803d4f71ec03dc9c47aa66e235abe3d6f45cfd 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3130,10 +3130,41 @@ endif # END ENABLE_SVG
if ENABLE_WEB_SOCKETS
FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
+IDL_BINDINGS += \
+ WebCore/websockets/WebSocket.idl
+
webcore_cppflags += \
-DENABLE_WEB_SOCKETS=1 \
-I$(srcdir)/WebCore/websockets
+webcore_sources += \
+ WebCore/bindings/js/JSWebSocketConstructor.cpp \
+ WebCore/bindings/js/JSWebSocketConstructor.h \
+ WebCore/bindings/js/JSWebSocketCustom.cpp \
+ WebCore/websockets/WebSocket.cpp \
+ WebCore/websockets/WebSocket.h \
+ WebCore/websockets/WebSocketChannel.cpp \
+ WebCore/websockets/WebSocketChannel.h \
+ WebCore/websockets/WebSocketChannelClient.h \
+ WebCore/websockets/WebSocketRequest.cpp \
+ WebCore/websockets/WebSocketRequest.h \
+ WebCore/websockets/WebSocketResponse.cpp \
+ WebCore/websockets/WebSocketResponse.h \
+ WebCore/platform/network/SocketStreamErrorBase.cpp \
+ WebCore/platform/network/SocketStreamErrorBase.h \
+ WebCore/platform/network/SocketStreamHandle.h \
+ WebCore/platform/network/SocketStreamHandleBase.cpp \
+ WebCore/platform/network/SocketStreamHandleBase.h \
+ WebCore/platform/network/SocketStreamHandleClient.h
+
+webcoregtk_sources += \
+ WebCore/platform/network/soup/SocketStreamError.h \
+ WebCore/platform/network/soup/SocketStreamHandleSoup.cpp
+
+# if TARGET_WIN32
+# webcore_sources += \
+# endif
+
else
webcore_cppflags += -DENABLE_WEB_SOCKETS=0
endif # END ENABLE_WEB_SOCKETS
@@ -3238,6 +3269,7 @@ IDL_PATH := \
$(WebCore)/svg \
$(WebCore)/xml \
$(WebCore)/plugins \
+ $(WebCore)/websockets \
$(WebCore)/workers
vpath %.idl = $(IDL_PATH)
« no previous file with comments | « WebCore/DerivedSources.make ('k') | WebCore/WebCore.xcodeproj/project.pbxproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698