diff options
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.v8.derived.mk | 2 | ||||
| -rw-r--r-- | WebCore/Android.v8.mk | 13 | ||||
| -rw-r--r-- | WebCore/config.h | 8 |
3 files changed, 11 insertions, 12 deletions
diff --git a/WebCore/Android.v8.derived.mk b/WebCore/Android.v8.derived.mk index a89ce31..115dc38 100644 --- a/WebCore/Android.v8.derived.mk +++ b/WebCore/Android.v8.derived.mk @@ -59,8 +59,6 @@ # If an entry starts with '/', any subdirectory may match # If an entry starts with '^', the first directory must match # LOCAL_DIR_WILDCARD_EXCLUDED := \ -# ^storage/* \ -# ^workers/* \ # This comment block is read by tools/webkitsync/diff.cpp # Don't remove it or move it. diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk index 57f9406..74409e7 100644 --- a/WebCore/Android.v8.mk +++ b/WebCore/Android.v8.mk @@ -25,7 +25,6 @@ # accessibility/*.cpp \ # bridge/test*.cpp \ # css/CSSGrammar.y \ -# dom/Worker*.cpp \ # dom/XMLTokenizerQt.cpp \ # editing/BackForwardListChromium.cpp \ # editing/SmartReplace*.cpp \ @@ -36,13 +35,11 @@ # loader/CachedXSLStyleSheet.cpp \ # loader/FTP*.cpp \ # loader/UserStyleSheetLoader.cpp \ -# loader/WorkerThreadableLoader.cpp \ # loader/icon/IconDatabaseNone.cpp \ # page/AXObjectCache.cpp \ # page/Accessibility*.cpp \ # page/InspectorController.cpp \ # page/JavaScript*.cpp \ -# page/WorkerNavigator.cpp \ # platform/ThreadingNone.cpp \ # platform/graphics/FloatPoint3D.cpp \ # rendering/RenderThemeChromium*.cpp \ @@ -82,7 +79,6 @@ # /symbian/* \ # /v8/* \ # /win/* \ -# ^workers/* \ # ^wml/* \ # /wx/* \ @@ -411,6 +407,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ loader/DocLoader.cpp \ loader/DocumentLoader.cpp \ loader/DocumentThreadableLoader.cpp \ + loader/WorkerThreadableLoader.cpp \ loader/FormState.cpp \ loader/FrameLoader.cpp \ loader/ImageDocument.cpp \ @@ -471,6 +468,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ page/SecurityOrigin.cpp \ page/Settings.cpp \ page/WindowFeatures.cpp \ + page/WorkerNavigator.cpp \ \ page/android/DragControllerAndroid.cpp \ page/android/EventHandlerAndroid.cpp \ @@ -1008,6 +1006,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ endif LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + workers/Worker.cpp \ + workers/WorkerContext.cpp \ + workers/WorkerImportScriptsClient.cpp \ + workers/WorkerLocation.cpp \ + workers/WorkerMessagingProxy.cpp \ + workers/WorkerRunLoop.cpp \ + workers/WorkerThread.cpp \ xml/DOMParser.cpp \ xml/XMLHttpRequest.cpp \ xml/XMLHttpRequestUpload.cpp \ diff --git a/WebCore/config.h b/WebCore/config.h index e7ab49f..24a4e6a 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -101,14 +101,10 @@ #define ENABLE_DOM_STORAGE 1 #undef ENABLE_FTPDIR #define ENABLE_FTPDIR 0 -#undef ENABLE_WORKERS -#if USE(V8) -// Workers do not work with V8 yet. -#else -#define ENABLE_WORKERS 1 -#endif // ENABLE_V8 #ifndef ENABLE_SVG #define ENABLE_SVG 0 +#undef ENABLE_WORKERS +#define ENABLE_WORKERS 1 #endif #if ENABLE_SVG #if !defined(ENABLE_SVG_ANIMATION) |