Title: [159152] trunk/Source/WebKit2
- Revision
- 159152
- Author
- [email protected]
- Date
- 2013-11-12 15:04:46 -0800 (Tue, 12 Nov 2013)
Log Message
Remove more functionality from MutableArray
https://bugs.webkit.org/show_bug.cgi?id=124235
Reviewed by Beth Dakin.
* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
(encodeToObjectStream):
* Shared/API/c/WKMutableArray.cpp:
(WKArrayAppendItem):
(WKArrayRemoveItemAtIndex):
* Shared/Cocoa/WKNSArray.mm:
(-[WKNSArray copyWithZone:]):
* Shared/ImmutableArray.h:
(WebKit::ImmutableArray::elements):
* Shared/MutableArray.cpp:
* Shared/MutableArray.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159151 => 159152)
--- trunk/Source/WebKit2/ChangeLog 2013-11-12 23:03:59 UTC (rev 159151)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-12 23:04:46 UTC (rev 159152)
@@ -1,5 +1,24 @@
2013-11-12 Anders Carlsson <[email protected]>
+ Remove more functionality from MutableArray
+ https://bugs.webkit.org/show_bug.cgi?id=124235
+
+ Reviewed by Beth Dakin.
+
+ * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+ (encodeToObjectStream):
+ * Shared/API/c/WKMutableArray.cpp:
+ (WKArrayAppendItem):
+ (WKArrayRemoveItemAtIndex):
+ * Shared/Cocoa/WKNSArray.mm:
+ (-[WKNSArray copyWithZone:]):
+ * Shared/ImmutableArray.h:
+ (WebKit::ImmutableArray::elements):
+ * Shared/MutableArray.cpp:
+ * Shared/MutableArray.h:
+
+2013-11-12 Anders Carlsson <[email protected]>
+
Remove most uses of MutableArray
https://bugs.webkit.org/show_bug.cgi?id=124232
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (159151 => 159152)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2013-11-12 23:03:59 UTC (rev 159151)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2013-11-12 23:04:46 UTC (rev 159152)
@@ -105,11 +105,11 @@
ensureObjectStream(encoder);
size_t position = encoder->_objectStream->size();
- encoder->_objectStream->append(nullptr);
+ encoder->_objectStream->elements().append(nullptr);
RefPtr<ImmutableDictionary> encodedObject = createEncodedObject(encoder, value);
- ASSERT(!encoder->_objectStream->entries()[position]);
- encoder->_objectStream->entries()[position] = encodedObject.release();
+ ASSERT(!encoder->_objectStream->elements()[position]);
+ encoder->_objectStream->elements()[position] = encodedObject.release();
}
static void encodeInvocation(WKRemoteObjectEncoder *encoder, NSInvocation *invocation)
Modified: trunk/Source/WebKit2/Shared/API/c/WKMutableArray.cpp (159151 => 159152)
--- trunk/Source/WebKit2/Shared/API/c/WKMutableArray.cpp 2013-11-12 23:03:59 UTC (rev 159151)
+++ trunk/Source/WebKit2/Shared/API/c/WKMutableArray.cpp 2013-11-12 23:04:46 UTC (rev 159152)
@@ -43,11 +43,11 @@
void WKArrayAppendItem(WKMutableArrayRef arrayRef, WKTypeRef itemRef)
{
- toImpl(arrayRef)->append(toImpl(itemRef));
+ toImpl(arrayRef)->elements().append(toImpl(itemRef));
}
void WKArrayRemoveItemAtIndex(WKMutableArrayRef arrayRef, size_t index)
{
- toImpl(arrayRef)->removeItemAtIndex(index);
+ toImpl(arrayRef)->elements().remove(index);
}
Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSArray.mm (159151 => 159152)
--- trunk/Source/WebKit2/Shared/Cocoa/WKNSArray.mm 2013-11-12 23:03:59 UTC (rev 159151)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSArray.mm 2013-11-12 23:04:46 UTC (rev 159152)
@@ -61,8 +61,8 @@
if (!reinterpret_cast<ImmutableArray*>(&_array)->isMutable())
return [self retain];
- auto entries = reinterpret_cast<ImmutableArray*>(&_array)->entries();
- return ImmutableArray::create(std::move(entries)).leakRef()->wrapper();
+ auto elements = reinterpret_cast<ImmutableArray*>(&_array)->elements();
+ return ImmutableArray::create(std::move(elements)).leakRef()->wrapper();
}
#pragma mark WKObject protocol implementation
Modified: trunk/Source/WebKit2/Shared/ImmutableArray.h (159151 => 159152)
--- trunk/Source/WebKit2/Shared/ImmutableArray.h 2013-11-12 23:03:59 UTC (rev 159151)
+++ trunk/Source/WebKit2/Shared/ImmutableArray.h 2013-11-12 23:04:46 UTC (rev 159152)
@@ -58,8 +58,8 @@
virtual bool isMutable() { return false; }
- const Vector<RefPtr<APIObject>>& entries() const { return m_elements; }
- Vector<RefPtr<APIObject>>& entries() { return m_elements; }
+ const Vector<RefPtr<APIObject>>& elements() const { return m_elements; }
+ Vector<RefPtr<APIObject>>& elements() { return m_elements; }
protected:
ImmutableArray(Vector<RefPtr<APIObject>> elements);
Modified: trunk/Source/WebKit2/Shared/MutableArray.cpp (159151 => 159152)
--- trunk/Source/WebKit2/Shared/MutableArray.cpp 2013-11-12 23:03:59 UTC (rev 159151)
+++ trunk/Source/WebKit2/Shared/MutableArray.cpp 2013-11-12 23:04:46 UTC (rev 159152)
@@ -37,19 +37,4 @@
{
}
-void MutableArray::append(PassRefPtr<APIObject> item)
-{
- m_elements.append(item);
-}
-
-void MutableArray::reserveCapacity(unsigned capacity)
-{
- m_elements.reserveCapacity(capacity);
-}
-
-void MutableArray::removeItemAtIndex(unsigned index)
-{
- m_elements.remove(index);
-}
-
} // namespace WebKit
Modified: trunk/Source/WebKit2/Shared/MutableArray.h (159151 => 159152)
--- trunk/Source/WebKit2/Shared/MutableArray.h 2013-11-12 23:03:59 UTC (rev 159151)
+++ trunk/Source/WebKit2/Shared/MutableArray.h 2013-11-12 23:04:46 UTC (rev 159152)
@@ -42,10 +42,6 @@
~MutableArray();
- void append(PassRefPtr<APIObject>);
- void reserveCapacity(unsigned);
- void removeItemAtIndex(unsigned);
-
virtual bool isMutable() { return true; }
private:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
