Diff
Modified: trunk/Source/WebKit2/ChangeLog (159235 => 159236)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 22:06:39 UTC (rev 159235)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 22:17:54 UTC (rev 159236)
@@ -1,5 +1,14 @@
2013-11-13 Anders Carlsson <[email protected]>
+ Fix build.
+
+ Not sure why these weren't added.
+
+ * Shared/APIArray.cpp: Added.
+ * Shared/APIArray.h: Added.
+
+2013-11-13 Anders Carlsson <[email protected]>
+
Rename ImmutableArray to API::Array
https://bugs.webkit.org/show_bug.cgi?id=124307
Added: trunk/Source/WebKit2/Shared/APIArray.cpp (0 => 159236)
--- trunk/Source/WebKit2/Shared/APIArray.cpp (rev 0)
+++ trunk/Source/WebKit2/Shared/APIArray.cpp 2013-11-13 22:17:54 UTC (rev 159236)
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2010 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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 "APIArray.h"
+
+#include "WebString.h"
+
+namespace API {
+
+PassRefPtr<Array> Array::create()
+{
+ return create(Vector<RefPtr<Object>>());
+}
+
+PassRefPtr<Array> Array::create(Vector<RefPtr<Object>> elements)
+{
+ return adoptRef(new Array(std::move(elements)));
+}
+
+PassRefPtr<Array> Array::createStringArray(const Vector<String>& strings)
+{
+ Vector<RefPtr<Object>> elements;
+ elements.reserveInitialCapacity(strings.size());
+
+ for (const auto& string : strings)
+ elements.uncheckedAppend(WebKit::WebString::create(string));
+
+ return create(std::move(elements));
+}
+
+Array::Array(Vector<RefPtr<Object>> elements)
+ : m_elements(std::move(elements))
+{
+}
+
+Array::~Array()
+{
+}
+
+} // namespace API
Added: trunk/Source/WebKit2/Shared/APIArray.h (0 => 159236)
--- trunk/Source/WebKit2/Shared/APIArray.h (rev 0)
+++ trunk/Source/WebKit2/Shared/APIArray.h 2013-11-13 22:17:54 UTC (rev 159236)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2010 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
+ */
+
+#ifndef APIArray_h
+#define APIArray_h
+
+#include "APIObject.h"
+#include <wtf/Forward.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/Vector.h>
+
+namespace API {
+
+class Array FINAL : public TypedObject<Object::Type::Array> {
+public:
+ static PassRefPtr<Array> create();
+ static PassRefPtr<Array> create(Vector<RefPtr<Object>> elements);
+
+ static PassRefPtr<Array> createStringArray(const Vector<String>&);
+
+ virtual ~Array();
+
+ template<typename T>
+ T* at(size_t i) const
+ {
+ if (m_elements[i]->type() != T::APIType)
+ return nullptr;
+
+ return static_cast<T*>(m_elements[i].get());
+ }
+
+ Object* at(size_t i) const { return m_elements[i].get(); }
+ size_t size() const { return m_elements.size(); }
+
+ const Vector<RefPtr<Object>>& elements() const { return m_elements; }
+ Vector<RefPtr<Object>>& elements() { return m_elements; }
+
+private:
+ explicit Array(Vector<RefPtr<Object>> elements);
+
+ Vector<RefPtr<Object>> m_elements;
+};
+
+} // namespace API
+
+#endif // APIArray_h
