Changeset 172735 in webkit

Timestamp:

Aug 18, 2014 4:22:59 PM (10 years ago)

Author:

psolanki@apple.com

Message:

Use modern for loop instead of iterators in SharedBufferCF.cpp
​https://bugs.webkit.org/show_bug.cgi?id=136000

Reviewed by Andreas Kling.

• platform/cf/SharedBufferCF.cpp:

(WebCore::SharedBuffer::copyBufferAndClear):
(WebCore::SharedBuffer::copySomeDataFromDataArray):
(WebCore::SharedBuffer::maybeAppendDataArray): Use auto& instead of auto for less RetainPtr/refcount churn.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/cf/SharedBufferCF.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-08-18  Pratik Solanki  <psolanki@apple.com>
+
+        Use modern for loop instead of iterators in SharedBufferCF.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=136000
+
+        Reviewed by Andreas Kling.
+
+        * platform/cf/SharedBufferCF.cpp:
+        (WebCore::SharedBuffer::copyBufferAndClear):
+        (WebCore::SharedBuffer::copySomeDataFromDataArray):
+        (WebCore::SharedBuffer::maybeAppendDataArray): Use auto& instead of auto for less RetainPtr/refcount churn.
+
 2014-08-18  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp

@@ -158 +158 @@
 
     CFIndex bytesLeft = bytesToCopy;
-    Vector<RetainPtr<CFDataRef>>::const_iterator end = m_dataArray.end();
-    for (Vector<RetainPtr<CFDataRef>>::const_iterator it = m_dataArray.begin(); it != end; ++it) {
-        CFIndex dataLen = CFDataGetLength(it->get());
+    for (auto& cfData : m_dataArray) {
+        CFIndex dataLen = CFDataGetLength(cfData.get());
         ASSERT(bytesLeft >= dataLen);
-        memcpy(destination, CFDataGetBytePtr(it->get()), dataLen);
+        memcpy(destination, CFDataGetBytePtr(cfData.get()), dataLen);
         destination += dataLen;
         bytesLeft -= dataLen;
@@ -171 +170 @@
 unsigned SharedBuffer::copySomeDataFromDataArray(const char*& someData, unsigned position) const
 {
-    Vector<RetainPtr<CFDataRef>>::const_iterator end = m_dataArray.end();
     unsigned totalOffset = 0;
-    for (Vector<RetainPtr<CFDataRef>>::const_iterator it = m_dataArray.begin(); it != end; ++it) {
-        unsigned dataLen = static_cast<unsigned>(CFDataGetLength(it->get()));
+    for (auto& cfData : m_dataArray) {
+        unsigned dataLen = static_cast<unsigned>(CFDataGetLength(cfData.get()));
         ASSERT(totalOffset <= position);
         unsigned localOffset = position - totalOffset;
         if (localOffset < dataLen) {
-            someData = reinterpret_cast<const char *>(CFDataGetBytePtr(it->get())) + localOffset;
+            someData = reinterpret_cast<const char *>(CFDataGetBytePtr(cfData.get())) + localOffset;
             return dataLen - localOffset;
         }
@@ -206 +204 @@
     unsigned originalSize = size();
 #endif
-    for (auto cfData : data->m_dataArray)
+    for (auto& cfData : data->m_dataArray)
         append(cfData.get());
     ASSERT(size() == originalSize + data->size());