Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / workers / SharedWorker.cpp

diff --git a/src/third_party/WebKit/Source/core/workers/SharedWorker.cpp b/src/third_party/WebKit/Source/core/workers/SharedWorker.cpp
index f8dab9c..7e1c932 100644 (file)
--- a/src/third_party/WebKit/Source/core/workers/SharedWorker.cpp
+++ b/src/third_party/WebKit/Source/core/workers/SharedWorker.cpp
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "core/workers/SharedWorker.h"
 
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/MessageChannel.h"
@@ -46,10 +46,11 @@
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
-namespace WebCore {
+namespace blink {
 
 inline SharedWorker::SharedWorker(ExecutionContext* context)
     : AbstractWorker(context)
+    , m_isBeingConnected(false)
 {
     ScriptWrappable::init(this);
 }
@@ -63,7 +64,7 @@ PassRefPtrWillBeRawPtr<SharedWorker> SharedWorker::create(ExecutionContext* cont
 
     RefPtrWillBeRawPtr<SharedWorker> worker = adoptRefWillBeRefCountedGarbageCollected(new SharedWorker(context));
 
-    RefPtr<MessageChannel> channel = MessageChannel::create(context);
+    RefPtrWillBeRawPtr<MessageChannel> channel = MessageChannel::create(context);
     worker->m_port = channel->port1();
     OwnPtr<blink::WebMessagePortChannel> remotePort = channel->port2()->disentangle();
     ASSERT(remotePort);
@@ -96,22 +97,16 @@ const AtomicString& SharedWorker::interfaceName() const
     return EventTargetNames::SharedWorker;
 }
 
-void SharedWorker::setPreventGC()
+bool SharedWorker::hasPendingActivity() const
 {
-    setPendingActivity(this);
-}
-
-void SharedWorker::unsetPreventGC()
-{
-    unsetPendingActivity(this);
+    return m_isBeingConnected;
 }
 
 void SharedWorker::trace(Visitor* visitor)
 {
+    visitor->trace(m_port);
     AbstractWorker::trace(visitor);
-#if ENABLE(OILPAN)
-    HeapSupplementable<SharedWorker>::trace(visitor);
-#endif
+    WillBeHeapSupplementable<SharedWorker>::trace(visitor);
 }
 
-} // namespace WebCore
+} // namespace blink