Title: [199465] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199465
- Author
- [email protected]
- Date
- 2016-04-13 05:23:48 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r198852 - Random SerializedScriptValue cleanup.
https://bugs.webkit.org/show_bug.cgi?id=156032
Rubberstamped by Tim Hatcher.
- Remove two unused functions.
- Make the class always be ThreadSafeRefCounted.
* bindings/js/SerializedScriptValue.cpp:
(WebCore::SerializedScriptValue::numberValue): Deleted.
(WebCore::SerializedScriptValue::undefinedValue): Deleted.
* bindings/js/SerializedScriptValue.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199464 => 199465)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 12:18:31 UTC (rev 199464)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 12:23:48 UTC (rev 199465)
@@ -1,3 +1,18 @@
+2016-03-30 Brady Eidson <[email protected]>
+
+ Random SerializedScriptValue cleanup.
+ https://bugs.webkit.org/show_bug.cgi?id=156032
+
+ Rubberstamped by Tim Hatcher.
+
+ - Remove two unused functions.
+ - Make the class always be ThreadSafeRefCounted.
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::SerializedScriptValue::numberValue): Deleted.
+ (WebCore::SerializedScriptValue::undefinedValue): Deleted.
+ * bindings/js/SerializedScriptValue.h:
+
2016-03-24 Simon Fraser <[email protected]>
Make animation events non-cancelable
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/SerializedScriptValue.cpp (199464 => 199465)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-04-13 12:18:31 UTC (rev 199464)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-04-13 12:23:48 UTC (rev 199465)
@@ -2672,22 +2672,6 @@
return adoptRef(*new SerializedScriptValue(WTFMove(buffer)));
}
-#if ENABLE(INDEXED_DATABASE)
-Ref<SerializedScriptValue> SerializedScriptValue::numberValue(double value)
-{
- Vector<uint8_t> buffer;
- CloneSerializer::serializeNumber(value, buffer);
- return adoptRef(*new SerializedScriptValue(WTFMove(buffer)));
-}
-
-Ref<SerializedScriptValue> SerializedScriptValue::undefinedValue()
-{
- Vector<uint8_t> buffer;
- CloneSerializer::serializeUndefined(buffer);
- return adoptRef(*new SerializedScriptValue(WTFMove(buffer)));
-}
-#endif
-
RefPtr<SerializedScriptValue> SerializedScriptValue::create(JSContextRef originContext, JSValueRef apiValue, JSValueRef* exception)
{
ExecState* exec = toJS(originContext);
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/SerializedScriptValue.h (199464 => 199465)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-04-13 12:18:31 UTC (rev 199464)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-04-13 12:23:48 UTC (rev 199465)
@@ -59,12 +59,7 @@
class SharedBuffer;
-class SerializedScriptValue :
-#if ENABLE(INDEXED_DATABASE)
- public ThreadSafeRefCounted<SerializedScriptValue> {
-#else
- public RefCounted<SerializedScriptValue> {
-#endif
+class SerializedScriptValue : public ThreadSafeRefCounted<SerializedScriptValue> {
public:
WEBCORE_EXPORT static RefPtr<SerializedScriptValue> create(JSC::ExecState*, JSC::JSValue, MessagePortArray*, ArrayBufferArray*, SerializationErrorMode = Throwing);
@@ -90,12 +85,6 @@
bool hasBlobURLs() const { return !m_blobURLs.isEmpty(); }
void blobURLs(Vector<String>&) const;
-#if ENABLE(INDEXED_DATABASE)
- // FIXME: Get rid of these. The only caller immediately deserializes the result, so it's a very roundabout way to create a JSValue.
- static Ref<SerializedScriptValue> numberValue(double value);
- static Ref<SerializedScriptValue> undefinedValue();
-#endif
-
static Ref<SerializedScriptValue> createFromWireBytes(Vector<uint8_t>&& data)
{
return adoptRef(*new SerializedScriptValue(WTFMove(data)));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
