diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-13 12:51:20 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | d441d6f39bb846989d95bcf5caf387b42414718d (patch) | |
| tree | e367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/dom/MessageEvent.cpp | |
| parent | 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff) | |
| download | qtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz | |
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit.
Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/dom/MessageEvent.cpp')
| -rw-r--r-- | Source/WebCore/dom/MessageEvent.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/Source/WebCore/dom/MessageEvent.cpp b/Source/WebCore/dom/MessageEvent.cpp index 1282a2519..0329af137 100644 --- a/Source/WebCore/dom/MessageEvent.cpp +++ b/Source/WebCore/dom/MessageEvent.cpp @@ -73,10 +73,6 @@ MessageEvent::MessageEvent(PassRefPtr<SerializedScriptValue> data, const String& , m_source(source) , m_ports(ports) { -#if USE(V8) - if (m_dataAsSerializedScriptValue) - m_dataAsSerializedScriptValue->registerMemoryAllocatedWithCurrentScriptContext(); -#endif } MessageEvent::MessageEvent(const String& data, const String& origin) @@ -138,11 +134,6 @@ void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bo m_lastEventId = lastEventId; m_source = source; m_ports = ports; - -#if USE(V8) - if (m_dataAsSerializedScriptValue) - m_dataAsSerializedScriptValue->registerMemoryAllocatedWithCurrentScriptContext(); -#endif } // FIXME: Remove this when we have custom ObjC binding support. @@ -153,7 +144,6 @@ SerializedScriptValue* MessageEvent::data() const return m_dataAsSerializedScriptValue.get(); } -// FIXME: remove this when we update the ObjC bindings (bug #28774). MessagePort* MessageEvent::messagePort() { if (!m_ports) @@ -162,7 +152,6 @@ MessagePort* MessageEvent::messagePort() return (*m_ports)[0].get(); } -// FIXME: remove this when we update the ObjC bindings (bug #28774). void MessageEvent::initMessageEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<SerializedScriptValue> data, const String& origin, const String& lastEventId, DOMWindow* source, MessagePort* port) { OwnPtr<MessagePortArray> ports; |