diff options
| -rw-r--r-- | build/features_override.gypi | 2 | ||||
| -rw-r--r-- | webkit/api/src/SharedWorkerRepository.cpp | 69 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 1 |
3 files changed, 71 insertions, 1 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi index decf31e..1ec254f 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -24,7 +24,7 @@ 'ENABLE_ORIENTATION_EVENTS=0', 'ENABLE_XSLT=1', 'ENABLE_XPATH=1', - 'ENABLE_SHARED_WORKERS=0', + 'ENABLE_SHARED_WORKERS=1', 'ENABLE_SVG=1', 'ENABLE_SVG_ANIMATION=1', 'ENABLE_SVG_AS_IMAGE=1', diff --git a/webkit/api/src/SharedWorkerRepository.cpp b/webkit/api/src/SharedWorkerRepository.cpp new file mode 100644 index 0000000..09d1186 --- /dev/null +++ b/webkit/api/src/SharedWorkerRepository.cpp @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2009 Google Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "config.h" + +#if ENABLE(SHARED_WORKERS) + +#include "SharedWorkerRepository.h" + +#include "MessagePortChannel.h" +#include "SharedWorker.h" + +namespace WebCore { + +class Document; + +bool SharedWorkerRepository::isAvailable() +{ + // SharedWorkers are disabled for now until the implementation is further along. + return false; +} + +void SharedWorkerRepository::connect(PassRefPtr<SharedWorker>, PassOwnPtr<MessagePortChannel>, const KURL&, const String&, ExceptionCode&) +{ + // Should not be called because SharedWorkers are disabled. + ASSERT_NOT_REACHED(); +} + +void SharedWorkerRepository::documentDetached(Document*) +{ + // Does nothing for now (will shutdown shared workers in the future). +} + +bool SharedWorkerRepository::hasSharedWorkers(Document*) +{ + // There can be no shared workers until the API is enabled. + return false; +} + +} // namespace WebCore + +#endif // ENABLE(SHARED_WORKERS) diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 11409cb..85b9f29 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -176,6 +176,7 @@ 'api/src/PlatformMessagePortChannel.cpp', 'api/src/PlatformMessagePortChannel.h', 'api/src/ResourceHandle.cpp', + 'api/src/SharedWorkerRepository.cpp', 'api/src/SocketStreamHandle.cpp', 'api/src/StorageAreaProxy.cpp', 'api/src/StorageAreaProxy.h', |