|
2664
|
1 |
diff -r d4d2f47b7a3e JavaScriptCore/wtf/OwnPtr.h
|
|
|
2 |
--- a/JavaScriptCore/wtf/OwnPtr.h Fri May 14 22:59:13 2010 +0800
|
|
|
3 |
+++ b/JavaScriptCore/wtf/OwnPtr.h Tue May 18 20:19:08 2010 +0800
|
|
|
4 |
@@ -47,12 +47,12 @@
|
|
2650
|
5 |
// transients for assigning a PassOwnPtr<T> object to a stack-allocated
|
|
|
6 |
// OwnPtr<T> object. It should never be called explicitly and gcc
|
|
|
7 |
// should optimize away the constructor when generating code.
|
|
|
8 |
- OwnPtr(const OwnPtr<ValueType>& o);
|
|
2664
|
9 |
+ OwnPtr(const OwnPtr<ValueType>& o) : m_ptr(o.release()) { }
|
|
2650
|
10 |
|
|
|
11 |
~OwnPtr() { deleteOwnedPtr(m_ptr); }
|
|
|
12 |
|
|
2664
|
13 |
PtrType get() const { return m_ptr; }
|
|
|
14 |
- PtrType release() { PtrType ptr = m_ptr; m_ptr = 0; return ptr; }
|
|
|
15 |
+ PtrType release() const {return m_ptr;}// PtrType ptr = m_ptr; m_ptr = 0; return ptr; }
|
|
|
16 |
|
|
|
17 |
// FIXME: This should be renamed to adopt.
|
|
|
18 |
void set(PtrType ptr) { ASSERT(!ptr || m_ptr != ptr); deleteOwnedPtr(m_ptr); m_ptr = ptr; }
|
|
2650
|
19 |
diff -r cea4c6b56f01 WebCore/workers/WorkerMessagingProxy.cpp
|
|
|
20 |
--- a/WebCore/workers/WorkerMessagingProxy.cpp Thu May 13 18:27:39 2010 +0800
|
|
|
21 |
+++ b/WebCore/workers/WorkerMessagingProxy.cpp Fri May 14 18:42:53 2010 +0800
|
|
|
22 |
@@ -62,7 +62,7 @@
|
|
|
23 |
{
|
|
|
24 |
ASSERT(scriptContext->isWorkerContext());
|
|
|
25 |
DedicatedWorkerContext* context = static_cast<DedicatedWorkerContext*>(scriptContext);
|
|
|
26 |
- OwnPtr<MessagePortArray> ports = MessagePort::entanglePorts(*scriptContext, m_channels.release());
|
|
|
27 |
+ OwnPtr<MessagePortArray> ports ;//= MessagePort::entanglePorts(*scriptContext, m_channels.release());
|
|
|
28 |
context->dispatchEvent(MessageEvent::create(ports.release(), m_message));
|
|
|
29 |
context->thread()->workerObjectProxy().confirmMessageFromWorkerObject(context->hasPendingActivity());
|
|
|
30 |
}
|
|
|
31 |
@@ -93,7 +93,7 @@
|
|
|
32 |
if (!workerObject || m_messagingProxy->askedToTerminate())
|
|
|
33 |
return;
|
|
|
34 |
|
|
|
35 |
- OwnPtr<MessagePortArray> ports = MessagePort::entanglePorts(*scriptContext, m_channels.release());
|
|
|
36 |
+ OwnPtr<MessagePortArray> ports ;//= MessagePort::entanglePorts(*scriptContext, m_channels.release());
|
|
|
37 |
workerObject->dispatchEvent(MessageEvent::create(ports.release(), m_message));
|
|
|
38 |
}
|
|
|
39 |
|