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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « WebCore/DerivedSources.make ('k') | WebCore/WebCore.xcodeproj/project.pbxproj » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 WebCore := $(srcdir)/WebCore 2 WebCore := $(srcdir)/WebCore
3 3
4 FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1 4 FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1
5 SVG_FEATURES := 5 SVG_FEATURES :=
6 HTML_FEATURES := 6 HTML_FEATURES :=
7 7
8 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in 8 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in
9 WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in 9 WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
10 10
(...skipping 3112 matching lines...) Expand 10 before | Expand all | Expand 10 after
3123 $(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkatt rs.in --outputDir "$(GENSOURCES)" 3123 $(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/svg/xlinkatt rs.in --outputDir "$(GENSOURCES)"
3124 3124
3125 endif # END ENABLE_SVG 3125 endif # END ENABLE_SVG
3126 3126
3127 # ---- 3127 # ----
3128 # Web Sockets Support 3128 # Web Sockets Support
3129 # ---- 3129 # ----
3130 if ENABLE_WEB_SOCKETS 3130 if ENABLE_WEB_SOCKETS
3131 FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1 3131 FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
3132 3132
3133 IDL_BINDINGS += \
3134 WebCore/websockets/WebSocket.idl
3135
3133 webcore_cppflags += \ 3136 webcore_cppflags += \
3134 -DENABLE_WEB_SOCKETS=1 \ 3137 -DENABLE_WEB_SOCKETS=1 \
3135 -I$(srcdir)/WebCore/websockets 3138 -I$(srcdir)/WebCore/websockets
3136 3139
3140 webcore_sources += \
3141 WebCore/bindings/js/JSWebSocketConstructor.cpp \
3142 WebCore/bindings/js/JSWebSocketConstructor.h \
3143 WebCore/bindings/js/JSWebSocketCustom.cpp \
3144 WebCore/websockets/WebSocket.cpp \
3145 WebCore/websockets/WebSocket.h \
3146 WebCore/websockets/WebSocketChannel.cpp \
3147 WebCore/websockets/WebSocketChannel.h \
3148 WebCore/websockets/WebSocketChannelClient.h \
3149 WebCore/websockets/WebSocketRequest.cpp \
3150 WebCore/websockets/WebSocketRequest.h \
3151 WebCore/websockets/WebSocketResponse.cpp \
3152 WebCore/websockets/WebSocketResponse.h \
3153 WebCore/platform/network/SocketStreamErrorBase.cpp \
3154 WebCore/platform/network/SocketStreamErrorBase.h \
3155 WebCore/platform/network/SocketStreamHandle.h \
3156 WebCore/platform/network/SocketStreamHandleBase.cpp \
3157 WebCore/platform/network/SocketStreamHandleBase.h \
3158 WebCore/platform/network/SocketStreamHandleClient.h
3159
3160 webcoregtk_sources += \
3161 WebCore/platform/network/soup/SocketStreamError.h \
3162 WebCore/platform/network/soup/SocketStreamHandleSoup.cpp
3163
3164 # if TARGET_WIN32
3165 # webcore_sources += \
3166 # endif
3167
3137 else 3168 else
3138 webcore_cppflags += -DENABLE_WEB_SOCKETS=0 3169 webcore_cppflags += -DENABLE_WEB_SOCKETS=0
3139 endif # END ENABLE_WEB_SOCKETS 3170 endif # END ENABLE_WEB_SOCKETS
3140 3171
3141 3172
3142 DerivedSources/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/ makeprop.pl 3173 DerivedSources/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/ makeprop.pl
3143 if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi 3174 if sort $(WEBCORE_CSS_PROPERTY_NAMES) | uniq -d | grep -E '^[^#]'; then echo 'Duplicate value!'; exit 1; fi
3144 cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in 3175 cat $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
3145 $(PERL) "$(WebCore)/css/makeprop.pl" 3176 $(PERL) "$(WebCore)/css/makeprop.pl"
3146 mv CSSPropertyNames.* $(GENSOURCES) 3177 mv CSSPropertyNames.* $(GENSOURCES)
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
3231 $(WebCore)/css \ 3262 $(WebCore)/css \
3232 $(WebCore)/dom \ 3263 $(WebCore)/dom \
3233 $(WebCore)/html \ 3264 $(WebCore)/html \
3234 $(WebCore)/inspector \ 3265 $(WebCore)/inspector \
3235 $(WebCore)/loader/appcache \ 3266 $(WebCore)/loader/appcache \
3236 $(WebCore)/page \ 3267 $(WebCore)/page \
3237 $(WebCore)/storage \ 3268 $(WebCore)/storage \
3238 $(WebCore)/svg \ 3269 $(WebCore)/svg \
3239 $(WebCore)/xml \ 3270 $(WebCore)/xml \
3240 $(WebCore)/plugins \ 3271 $(WebCore)/plugins \
3272 $(WebCore)/websockets \
3241 $(WebCore)/workers 3273 $(WebCore)/workers
3242 3274
3243 vpath %.idl = $(IDL_PATH) 3275 vpath %.idl = $(IDL_PATH)
3244 3276
3245 DerivedSources/JS%.h: DerivedSources/JS%.cpp; 3277 DerivedSources/JS%.h: DerivedSources/JS%.cpp;
3246 3278
3247 .SECONDARY: 3279 .SECONDARY:
3248 DerivedSources/JS%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/Co deGeneratorJS.pm 3280 DerivedSources/JS%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/Co deGeneratorJS.pm
3249 $(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/genera te-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES)" --defines "$(FEATURE_DEFINES_JAVASCRIPT)" --generator JS $< 3281 $(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/genera te-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES)" --defines "$(FEATURE_DEFINES_JAVASCRIPT)" --generator JS $<
3250 3282
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
3350 $(WebCore)/Resources/urlIcon.png \ 3382 $(WebCore)/Resources/urlIcon.png \
3351 $(WebCore)/Resources/missingImage.png \ 3383 $(WebCore)/Resources/missingImage.png \
3352 $(WebCore)/Resources/panIcon.png \ 3384 $(WebCore)/Resources/panIcon.png \
3353 $(WebCore)/Resources/deleteButton.png 3385 $(WebCore)/Resources/deleteButton.png
3354 3386
3355 # Clean rules for WebCore 3387 # Clean rules for WebCore
3356 3388
3357 CLEANFILES += \ 3389 CLEANFILES += \
3358 libWebCoreJS.la 3390 libWebCoreJS.la
3359 3391
OLDNEW
« 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