| commit | 2c386559c2b67b9921be326a44676937b61b08f4 | [log] [tgz] |
|---|---|---|
| author | Steve Block <steveblock@google.com> | Fri Nov 06 08:36:18 2009 +0000 |
| committer | Steve Block <steveblock@google.com> | Tue Nov 10 23:52:42 2009 +0000 |
| tree | 4bf9593f80dd0238422f660ccc09dda4ab9b86b4 | |
| parent | 70c8e1be70c9509280aa52daa293153cb033df13 [diff] |
Update Android build to remove websockets include and to keep in line with latest WebKit. See https://bugs.webkit.org/show_bug.cgi?id=31209 Change-Id: Ie79b5599ee9d6a87f02eea7148f2660b0aaafd9d
diff --git a/Android.v8.mk b/Android.v8.mk index 2141840..0c068b1 100644 --- a/Android.v8.mk +++ b/Android.v8.mk
@@ -151,7 +151,6 @@ $(LOCAL_PATH)/WebCore/rendering \ $(LOCAL_PATH)/WebCore/rendering/style \ $(LOCAL_PATH)/WebCore/storage \ - $(LOCAL_PATH)/WebCore/websockets \ $(LOCAL_PATH)/WebCore/workers \ $(LOCAL_PATH)/WebCore/xml \ $(LOCAL_PATH)/WebKit/android \
diff --git a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp index 7eccfb1..25d5ccd 100644 --- a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
@@ -56,7 +56,9 @@ #include "Settings.h" #include "SharedWorkerRepository.h" #include "Storage.h" +#if ENABLE(WEB_SOCKETS) #include "WebSocket.h" +#endif #include "WindowFeatures.h" // Horizontal and vertical offset, from the parent content area, around newly