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/WebKit/chromium/src/WebSerializedScriptValue.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/WebKit/chromium/src/WebSerializedScriptValue.cpp')
-rw-r--r-- | Source/WebKit/chromium/src/WebSerializedScriptValue.cpp | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/Source/WebKit/chromium/src/WebSerializedScriptValue.cpp b/Source/WebKit/chromium/src/WebSerializedScriptValue.cpp deleted file mode 100644 index 34fa4bb25..000000000 --- a/Source/WebKit/chromium/src/WebSerializedScriptValue.cpp +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2010 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" -#include "platform/WebSerializedScriptValue.h" - -#include "SerializedScriptValue.h" -#include <public/WebString.h> - -using namespace WebCore; - -namespace WebKit { - -WebSerializedScriptValue WebSerializedScriptValue::fromString(const WebString& s) -{ - return SerializedScriptValue::createFromWire(s); -} - -#if WEBKIT_USING_V8 -WebSerializedScriptValue WebSerializedScriptValue::serialize(v8::Handle<v8::Value> value) -{ - bool didThrow; - WebSerializedScriptValue serializedValue = SerializedScriptValue::create(value, 0, 0, didThrow); - if (didThrow) - return createInvalid(); - return serializedValue; -} -#endif - -WebSerializedScriptValue WebSerializedScriptValue::createInvalid() -{ - return SerializedScriptValue::create(); -} - -void WebSerializedScriptValue::reset() -{ - m_private.reset(); -} - -void WebSerializedScriptValue::assign(const WebSerializedScriptValue& other) -{ - m_private = other.m_private; -} - -WebString WebSerializedScriptValue::toString() const -{ - return m_private->toWireString(); -} - -#if WEBKIT_USING_V8 -v8::Handle<v8::Value> WebSerializedScriptValue::deserialize() -{ - return m_private->deserialize(); -} -#endif - -WebSerializedScriptValue::WebSerializedScriptValue(const PassRefPtr<SerializedScriptValue>& value) - : m_private(value) -{ -} - -WebSerializedScriptValue& WebSerializedScriptValue::operator=(const PassRefPtr<SerializedScriptValue>& value) -{ - m_private = value; - return *this; -} - -WebSerializedScriptValue::operator PassRefPtr<SerializedScriptValue>() const -{ - return m_private.get(); -} - -} // namespace WebKit |