[Win] A few final cleanups to the DataObject classes.

https://bugs.webkit.org/show_bug.cgi?id=131784

Reviewed by Anders Carlsson.

Source/WebCore:
* platform/win/WCDataObject.cpp:
(WebCore::WCDataObject::clearData): Use 'last()' method.

Tools:
* DumpRenderTree/win/DRTDataObject.cpp:
(DRTDataObject::clearData): Use 'last()' method.
* DumpRenderTree/win/UIDelegate.cpp:
(DRTUndoStack::pop): Use 'takeLast()' method.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167442 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1439b46d8e31a3a428fb3168bd90c42f6c774a6c..4aa9bac71d90c099e31ca056323186fa8e08b1db 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-16  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] A few final cleanups to the DataObject classes.
+        https://bugs.webkit.org/show_bug.cgi?id=131784
+
+        Reviewed by Anders Carlsson.
+
+        * platform/win/WCDataObject.cpp:
+        (WebCore::WCDataObject::clearData): Use 'last()' method.
+
 2014-04-15  Jer Noble  <jer.noble@apple.com>
 
         Fullscreen media controls are unusable in pagination mode

diff --git a/Source/WebCore/platform/win/WCDataObject.cpp b/Source/WebCore/platform/win/WCDataObject.cpp
index 17d190085e7c54b076df035b8ea9233f64907a23..25dee143485d0106be18953ed2faae3d7e3dec0c 100644 (file)
--- a/Source/WebCore/platform/win/WCDataObject.cpp
+++ b/Source/WebCore/platform/win/WCDataObject.cpp
@@ -357,10 +357,8 @@ void WCDataObject::clearData(CLIPFORMAT format)
     size_t ptr = 0;
     while (ptr < m_formats.size()) {
         if (m_formats[ptr]->cfFormat == format) {
-            m_formats[ptr] = std::move(m_formats[m_formats.size() - 1]);
-            m_formats.removeLast();
-            m_medium[ptr] = std::move(m_medium[m_medium.size() - 1]);
-            m_medium.removeLast();
+            m_formats[ptr] = m_formats.takeLast();
+            m_medium[ptr] = m_medium.takeLast();
             continue;
         }
         ptr++;

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6076ecd2cac53e6864e0c42363ede5ad4f2895de..369503c55dd9e873b6c5a304341613e846eadb70 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2014-04-16  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] A few final cleanups to the DataObject classes.
+        https://bugs.webkit.org/show_bug.cgi?id=131784
+
+        Reviewed by Anders Carlsson.
+
+        * DumpRenderTree/win/DRTDataObject.cpp:
+        (DRTDataObject::clearData): Use 'last()' method.
+        * DumpRenderTree/win/UIDelegate.cpp:
+        (DRTUndoStack::pop): Use 'takeLast()' method.
+
 2014-04-17  Andres Gomez  <agomez@igalia.com>
 
         [Win] cygwin to keep installing curl 7.33.0-1 and subversion 1.7.14-1

diff --git a/Tools/DumpRenderTree/win/DRTDataObject.cpp b/Tools/DumpRenderTree/win/DRTDataObject.cpp
index b7b2279d854aeedd6dc4fd119e8c8d1e87dae18f..0a6d9641ba3c15c56fa5aff902113038e5cefc70 100644 (file)
--- a/Tools/DumpRenderTree/win/DRTDataObject.cpp
+++ b/Tools/DumpRenderTree/win/DRTDataObject.cpp
@@ -346,10 +346,8 @@ void DRTDataObject::clearData(CLIPFORMAT format)
     size_t position = 0;
     while (position < m_formats.size()) {
         if (m_formats[position]->cfFormat == format) {
-            m_formats[position] = std::move(m_formats[m_formats.size() - 1]);
-            m_formats.removeLast();
-            m_medium[position] = std::move(m_medium[m_medium.size() - 1]);
-            m_medium.removeLast();
+            m_formats[position] = m_formats.takeLast();
+            m_medium[position] = m_medium.takeLast();
             continue;
         }
         position++;

diff --git a/Tools/DumpRenderTree/win/UIDelegate.cpp b/Tools/DumpRenderTree/win/UIDelegate.cpp
index 4f9dc010e0afca431dc4add7e1734aa152e361cc..7a128c8da72e98b160910d25dc99e4ebbeeb5466 100644 (file)
--- a/Tools/DumpRenderTree/win/UIDelegate.cpp
+++ b/Tools/DumpRenderTree/win/UIDelegate.cpp
@@ -76,7 +76,7 @@ public:
     void clear() { m_undoVector.clear(); }
 
     void push(DRTUndoObject* undoObject) { m_undoVector.append(undoObject); }
-    std::unique_ptr<DRTUndoObject> pop() { std::unique_ptr<DRTUndoObject> top = std::move(m_undoVector.last()); m_undoVector.removeLast(); return std::move(top); }
+    std::unique_ptr<DRTUndoObject> pop() { return m_undoVector.takeLast(); }
 
 private:
     Vector<std::unique_ptr<DRTUndoObject>> m_undoVector;