<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167365] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167365">167365</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-04-16 11:15:04 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Eliminate use of deleteAllValues in Windows Files
https://bugs.webkit.org/show_bug.cgi?id=131631
Reviewed by Darin Adler.
Source/WebCore:
Update to use std::unique_ptr for object lifetime. Get rid of
deleteAllValues now that it is no loner needed. Use ranged for
loops where possible.
* platform/win/WCDataObject.cpp:
(WebCore::WCEnumFormatEtc::WCEnumFormatEtc):
(WebCore::WCDataObject::~WCDataObject):
(WebCore::WCDataObject::GetData):
(WebCore::WCDataObject::QueryGetData):
(WebCore::WCDataObject::SetData):
(WebCore::WCDataObject::clearData):
* platform/win/WCDataObject.h:
Tools:
Switch to std::unique_ptr for memory lifetime. Get rid of
deleteAllValues now that it is no longer needed. Use ranged
for loops where possible.
* DumpRenderTree/win/DRTDataObject.cpp:
(WCEnumFormatEtc::WCEnumFormatEtc):
(DRTDataObject::~DRTDataObject):
(DRTDataObject::GetData):
(DRTDataObject::QueryGetData):
(DRTDataObject::SetData):
(DRTDataObject::clearData):
* DumpRenderTree/win/DRTDataObject.h:
* DumpRenderTree/win/UIDelegate.cpp:
(DRTUndoObject::DRTUndoObject):
(DRTUndoObject::~DRTUndoObject):
(DRTUndoStack::~DRTUndoStack):
(DRTUndoStack::clear):
(DRTUndoStack::pop):
(DRTUndoManager::DRTUndoManager):
(DRTUndoManager::redo):
(DRTUndoManager::undo):
(UIDelegate::UIDelegate):
(UIDelegate::resetUndoManager):
* DumpRenderTree/win/UIDelegate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformwinWCDataObjectcpp">trunk/Source/WebCore/platform/win/WCDataObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformwinWCDataObjecth">trunk/Source/WebCore/platform/win/WCDataObject.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDRTDataObjectcpp">trunk/Tools/DumpRenderTree/win/DRTDataObject.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDRTDataObjecth">trunk/Tools/DumpRenderTree/win/DRTDataObject.h</a></li>
<li><a href="#trunkToolsDumpRenderTreewinUIDelegatecpp">trunk/Tools/DumpRenderTree/win/UIDelegate.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinUIDelegateh">trunk/Tools/DumpRenderTree/win/UIDelegate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167364 => 167365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-16 18:09:56 UTC (rev 167364)
+++ trunk/Source/WebCore/ChangeLog 2014-04-16 18:15:04 UTC (rev 167365)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-04-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Eliminate use of deleteAllValues in Windows Files
+ https://bugs.webkit.org/show_bug.cgi?id=131631
+
+ Reviewed by Darin Adler.
+
+ Update to use std::unique_ptr for object lifetime. Get rid of
+ deleteAllValues now that it is no loner needed. Use ranged for
+ loops where possible.
+
+ * platform/win/WCDataObject.cpp:
+ (WebCore::WCEnumFormatEtc::WCEnumFormatEtc):
+ (WebCore::WCDataObject::~WCDataObject):
+ (WebCore::WCDataObject::GetData):
+ (WebCore::WCDataObject::QueryGetData):
+ (WebCore::WCDataObject::SetData):
+ (WebCore::WCDataObject::clearData):
+ * platform/win/WCDataObject.h:
+
</ins><span class="cx"> 2014-04-16 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Accessing a table cell with an invalid column header crashes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinWCDataObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/WCDataObject.cpp (167364 => 167365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/WCDataObject.cpp 2014-04-16 18:09:56 UTC (rev 167364)
+++ trunk/Source/WebCore/platform/win/WCDataObject.cpp 2014-04-16 18:15:04 UTC (rev 167365)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> {
</span><span class="cx"> public:
</span><span class="cx"> WCEnumFormatEtc(const Vector<FORMATETC>& formats);
</span><del>- WCEnumFormatEtc(const Vector<FORMATETC*>& formats);
</del><ins>+ WCEnumFormatEtc(const Vector<std::unique_ptr<FORMATETC>>& formats);
</ins><span class="cx">
</span><span class="cx"> //IUnknown members
</span><span class="cx"> STDMETHOD(QueryInterface)(REFIID, void**);
</span><span class="lines">@@ -55,8 +55,6 @@
</span><span class="cx"> size_t m_current;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> WCEnumFormatEtc::WCEnumFormatEtc(const Vector<FORMATETC>& formats)
</span><span class="cx"> : m_ref(1)
</span><span class="cx"> , m_current(0)
</span><span class="lines">@@ -65,12 +63,12 @@
</span><span class="cx"> m_formats.append(formats[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WCEnumFormatEtc::WCEnumFormatEtc(const Vector<FORMATETC*>& formats)
-: m_ref(1)
-, m_current(0)
</del><ins>+WCEnumFormatEtc::WCEnumFormatEtc(const Vector<std::unique_ptr<FORMATETC>>& formats)
+ : m_ref(1)
+ , m_current(0)
</ins><span class="cx"> {
</span><del>- for(size_t i = 0; i < formats.size(); ++i)
- m_formats.append(*formats[i]);
</del><ins>+ for (auto& format : formats)
+ m_formats.append(*format);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> STDMETHODIMP WCEnumFormatEtc::QueryInterface(REFIID riid, void** ppvObject)
</span><span class="lines">@@ -178,15 +176,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WCDataObject::~WCDataObject()
-{
- for(size_t i = 0; i < m_medium.size(); ++i) {
- ReleaseStgMedium(m_medium[i]);
- delete m_medium[i];
- }
- WTF::deprecatedDeleteAllValues(m_formats);
-}
-
</del><span class="cx"> STDMETHODIMP WCDataObject::QueryInterface(REFIID riid,void** ppvObject)
</span><span class="cx"> {
</span><span class="cx"> *ppvObject = 0;
</span><span class="lines">@@ -220,12 +209,12 @@
</span><span class="cx"> return E_POINTER;
</span><span class="cx"> pmedium->hGlobal = 0;
</span><span class="cx">
</span><del>- for(size_t i=0; i < m_formats.size(); ++i) {
</del><ins>+ for (size_t i = 0; i < m_formats.size(); ++i) {
</ins><span class="cx"> if(/*pformatetcIn->tymed & m_formats[i]->tymed &&*/ // tymed can be 0 (TYMED_NULL) - but it can have a medium that contains an pUnkForRelease
</span><span class="cx"> pformatetcIn->lindex == m_formats[i]->lindex &&
</span><span class="cx"> pformatetcIn->dwAspect == m_formats[i]->dwAspect &&
</span><span class="cx"> pformatetcIn->cfFormat == m_formats[i]->cfFormat) {
</span><del>- CopyMedium(pmedium, m_medium[i], m_formats[i]);
</del><ins>+ CopyMedium(pmedium, m_medium[i].get(), m_formats[i].get());
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -245,12 +234,12 @@
</span><span class="cx"> if (!(DVASPECT_CONTENT & pformatetc->dwAspect))
</span><span class="cx"> return (DV_E_DVASPECT);
</span><span class="cx"> HRESULT hr = DV_E_TYMED;
</span><del>- for(size_t i = 0; i < m_formats.size(); ++i) {
- if(pformatetc->tymed & m_formats[i]->tymed) {
- if(pformatetc->cfFormat == m_formats[i]->cfFormat)
</del><ins>+ for (auto& format : m_formats) {
+ if (pformatetc->tymed & format->tymed) {
+ if (pformatetc->cfFormat == format->cfFormat)
</ins><span class="cx"> return S_OK;
</span><del>- else
- hr = DV_E_CLIPFORMAT;
</del><ins>+
+ hr = DV_E_CLIPFORMAT;
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> hr = DV_E_TYMED;
</span><span class="lines">@@ -268,28 +257,20 @@
</span><span class="cx"> if(!pformatetc || !pmedium)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- FORMATETC* fetc=new FORMATETC;
- if (!fetc)
- return E_OUTOFMEMORY;
</del><ins>+ auto fetc = std::make_unique<FORMATETC>();
+ std::unique_ptr<STGMEDIUM, StgMediumDeleter> pStgMed(new STGMEDIUM);
</ins><span class="cx">
</span><del>- STGMEDIUM* pStgMed = new STGMEDIUM;
</del><ins>+ ZeroMemory(fetc.get(), sizeof(FORMATETC));
+ ZeroMemory(pStgMed.get(), sizeof(STGMEDIUM));
</ins><span class="cx">
</span><del>- if(!pStgMed) {
- delete fetc;
- return E_OUTOFMEMORY;
- }
-
- ZeroMemory(fetc,sizeof(FORMATETC));
- ZeroMemory(pStgMed,sizeof(STGMEDIUM));
-
</del><span class="cx"> *fetc = *pformatetc;
</span><del>- m_formats.append(fetc);
</del><ins>+ m_formats.append(std::move(fetc));
</ins><span class="cx">
</span><span class="cx"> if(fRelease)
</span><span class="cx"> *pStgMed = *pmedium;
</span><span class="cx"> else
</span><del>- CopyMedium(pStgMed, pmedium, pformatetc);
- m_medium.append(pStgMed);
</del><ins>+ CopyMedium(pStgMed.get(), pmedium, pformatetc);
+ m_medium.append(std::move(pStgMed));
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="lines">@@ -376,17 +357,10 @@
</span><span class="cx"> size_t ptr = 0;
</span><span class="cx"> while (ptr < m_formats.size()) {
</span><span class="cx"> if (m_formats[ptr]->cfFormat == format) {
</span><del>- FORMATETC* current = m_formats[ptr];
- m_formats[ptr] = m_formats[m_formats.size() - 1];
- m_formats[m_formats.size() - 1] = 0;
</del><ins>+ m_formats[ptr] = std::move(m_formats[m_formats.size() - 1]);
</ins><span class="cx"> m_formats.removeLast();
</span><del>- delete current;
- STGMEDIUM* medium = m_medium[ptr];
- m_medium[ptr] = m_medium[m_medium.size() - 1];
- m_medium[m_medium.size() - 1] = 0;
</del><ins>+ m_medium[ptr] = std::move(m_medium[m_medium.size() - 1]);
</ins><span class="cx"> m_medium.removeLast();
</span><del>- ReleaseStgMedium(medium);
- delete medium;
</del><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> ptr++;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinWCDataObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/WCDataObject.h (167364 => 167365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/WCDataObject.h 2014-04-16 18:09:56 UTC (rev 167364)
+++ trunk/Source/WebCore/platform/win/WCDataObject.h 2014-04-16 18:15:04 UTC (rev 167365)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -34,6 +34,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+struct StgMediumDeleter {
+ void operator()(STGMEDIUM* medium)
+ {
+ ::ReleaseStgMedium(medium);
+ }
+};
+
</ins><span class="cx"> class WCDataObject : public IDataObject {
</span><span class="cx"> public:
</span><span class="cx"> void CopyMedium(STGMEDIUM* pMedDest, STGMEDIUM* pMedSrc, FORMATETC* pFmtSrc);
</span><span class="lines">@@ -60,10 +67,9 @@
</span><span class="cx"> static HRESULT createInstance(WCDataObject**, const DragDataMap&);
</span><span class="cx"> private:
</span><span class="cx"> WCDataObject();
</span><del>- virtual ~WCDataObject();
</del><span class="cx"> long m_ref;
</span><del>- Vector<FORMATETC*> m_formats;
- Vector<STGMEDIUM*> m_medium;
</del><ins>+ Vector<std::unique_ptr<FORMATETC>> m_formats;
+ Vector<std::unique_ptr<STGMEDIUM, StgMediumDeleter>> m_medium;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167364 => 167365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-16 18:09:56 UTC (rev 167364)
+++ trunk/Tools/ChangeLog 2014-04-16 18:15:04 UTC (rev 167365)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-04-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Eliminate use of deleteAllValues in Windows Files
+ https://bugs.webkit.org/show_bug.cgi?id=131631
+
+ Reviewed by Darin Adler.
+
+ Switch to std::unique_ptr for memory lifetime. Get rid of
+ deleteAllValues now that it is no longer needed. Use ranged
+ for loops where possible.
+
+ * DumpRenderTree/win/DRTDataObject.cpp:
+ (WCEnumFormatEtc::WCEnumFormatEtc):
+ (DRTDataObject::~DRTDataObject):
+ (DRTDataObject::GetData):
+ (DRTDataObject::QueryGetData):
+ (DRTDataObject::SetData):
+ (DRTDataObject::clearData):
+ * DumpRenderTree/win/DRTDataObject.h:
+ * DumpRenderTree/win/UIDelegate.cpp:
+ (DRTUndoObject::DRTUndoObject):
+ (DRTUndoObject::~DRTUndoObject):
+ (DRTUndoStack::~DRTUndoStack):
+ (DRTUndoStack::clear):
+ (DRTUndoStack::pop):
+ (DRTUndoManager::DRTUndoManager):
+ (DRTUndoManager::redo):
+ (DRTUndoManager::undo):
+ (UIDelegate::UIDelegate):
+ (UIDelegate::resetUndoManager):
+ * DumpRenderTree/win/UIDelegate.h:
+
</ins><span class="cx"> 2014-04-16 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed GTK gardening.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDRTDataObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DRTDataObject.cpp (167364 => 167365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DRTDataObject.cpp 2014-04-16 18:09:56 UTC (rev 167364)
+++ trunk/Tools/DumpRenderTree/win/DRTDataObject.cpp 2014-04-16 18:15:04 UTC (rev 167365)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2012 Baidu Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> class WCEnumFormatEtc : public IEnumFORMATETC {
</span><span class="cx"> public:
</span><span class="cx"> explicit WCEnumFormatEtc(const Vector<FORMATETC>& formats);
</span><del>- explicit WCEnumFormatEtc(const Vector<FORMATETC*>& formats);
</del><ins>+ explicit WCEnumFormatEtc(const Vector<std::unique_ptr<FORMATETC>>& formats);
</ins><span class="cx">
</span><span class="cx"> // IUnknown members
</span><span class="cx"> STDMETHOD(QueryInterface)(REFIID, void**);
</span><span class="lines">@@ -76,12 +76,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WCEnumFormatEtc::WCEnumFormatEtc(const Vector<FORMATETC*>& formats)
</del><ins>+WCEnumFormatEtc::WCEnumFormatEtc(const Vector<std::unique_ptr<FORMATETC>>& formats)
</ins><span class="cx"> : m_ref(1)
</span><span class="cx"> , m_current(0)
</span><span class="cx"> {
</span><del>- for (size_t i = 0; i < formats.size(); ++i)
- m_formats.append(*formats[i]);
</del><ins>+ for (auto& format : formats)
+ m_formats.append(*format);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> STDMETHODIMP WCEnumFormatEtc::QueryInterface(REFIID riid, void** ppvObject)
</span><span class="lines">@@ -175,15 +175,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DRTDataObject::~DRTDataObject()
-{
- for (size_t i = 0; i < m_medium.size(); ++i) {
- ReleaseStgMedium(m_medium[i]);
- delete m_medium[i];
- }
- WTF::deprecatedDeleteAllValues(m_formats);
-}
-
</del><span class="cx"> STDMETHODIMP DRTDataObject::QueryInterface(REFIID riid, void** ppvObject)
</span><span class="cx"> {
</span><span class="cx"> *ppvObject = 0;
</span><span class="lines">@@ -218,7 +209,7 @@
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < m_formats.size(); ++i) {
</span><span class="cx"> if (pformatetcIn->lindex == m_formats[i]->lindex && pformatetcIn->dwAspect == m_formats[i]->dwAspect && pformatetcIn->cfFormat == m_formats[i]->cfFormat) {
</span><del>- CopyMedium(pmedium, m_medium[i], m_formats[i]);
</del><ins>+ CopyMedium(pmedium, m_medium[i].get(), m_formats[i].get());
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -238,9 +229,9 @@
</span><span class="cx"> if (!(DVASPECT_CONTENT & pformatetc->dwAspect))
</span><span class="cx"> return (DV_E_DVASPECT);
</span><span class="cx">
</span><del>- for (size_t i = 0; i < m_formats.size(); ++i) {
- if (pformatetc->tymed & m_formats[i]->tymed) {
- if (pformatetc->cfFormat == m_formats[i]->cfFormat)
</del><ins>+ for (auto& format : m_formats) {
+ if (pformatetc->tymed & format->tymed) {
+ if (pformatetc->cfFormat == format->cfFormat)
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -257,28 +248,20 @@
</span><span class="cx"> if (!pformatetc || !pmedium)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- FORMATETC* formatetc = new FORMATETC;
- if (!formatetc)
- return E_OUTOFMEMORY;
</del><ins>+ auto formatetc = std::make_unique<FORMATETC>();
+ std::unique_ptr<STGMEDIUM, StgMediumDeleter> pStgMed(new STGMEDIUM);
</ins><span class="cx">
</span><del>- STGMEDIUM* pStgMed = new STGMEDIUM;
</del><ins>+ ZeroMemory(formatetc.get(), sizeof(FORMATETC));
+ ZeroMemory(pStgMed.get(), sizeof(STGMEDIUM));
</ins><span class="cx">
</span><del>- if (!pStgMed) {
- delete formatetc;
- return E_OUTOFMEMORY;
- }
-
- ZeroMemory(formatetc, sizeof(FORMATETC));
- ZeroMemory(pStgMed, sizeof(STGMEDIUM));
-
</del><span class="cx"> *formatetc = *pformatetc;
</span><del>- m_formats.append(formatetc);
</del><ins>+ m_formats.append(std::move(formatetc));
</ins><span class="cx">
</span><span class="cx"> if (fRelease)
</span><span class="cx"> *pStgMed = *pmedium;
</span><span class="cx"> else
</span><del>- CopyMedium(pStgMed, pmedium, pformatetc);
- m_medium.append(pStgMed);
</del><ins>+ CopyMedium(pStgMed.get(), pmedium, pformatetc);
+ m_medium.append(std::move(pStgMed));
</ins><span class="cx">
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="lines">@@ -363,17 +346,10 @@
</span><span class="cx"> size_t position = 0;
</span><span class="cx"> while (position < m_formats.size()) {
</span><span class="cx"> if (m_formats[position]->cfFormat == format) {
</span><del>- FORMATETC* current = m_formats[position];
- m_formats[position] = m_formats[m_formats.size() - 1];
- m_formats[m_formats.size() - 1] = 0;
</del><ins>+ m_formats[position] = std::move(m_formats[m_formats.size() - 1]);
</ins><span class="cx"> m_formats.removeLast();
</span><del>- delete current;
- STGMEDIUM* medium = m_medium[position];
- m_medium[position] = m_medium[m_medium.size() - 1];
- m_medium[m_medium.size() - 1] = 0;
</del><ins>+ m_medium[position] = std::move(m_medium[m_medium.size() - 1]);
</ins><span class="cx"> m_medium.removeLast();
</span><del>- ReleaseStgMedium(medium);
- delete medium;
</del><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> position++;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDRTDataObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DRTDataObject.h (167364 => 167365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DRTDataObject.h 2014-04-16 18:09:56 UTC (rev 167364)
+++ trunk/Tools/DumpRenderTree/win/DRTDataObject.h 2014-04-16 18:15:04 UTC (rev 167365)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2012 Baidu Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -37,6 +37,13 @@
</span><span class="cx">
</span><span class="cx"> FORMATETC* cfUrlWFormat();
</span><span class="cx">
</span><ins>+struct StgMediumDeleter {
+ void operator()(STGMEDIUM* medium)
+ {
+ ::ReleaseStgMedium(medium);
+ }
+};
+
</ins><span class="cx"> class DRTDataObject : public IDataObject {
</span><span class="cx"> public:
</span><span class="cx"> void CopyMedium(STGMEDIUM* pMedDest, STGMEDIUM* pMedSrc, FORMATETC* pFmtSrc);
</span><span class="lines">@@ -62,10 +69,9 @@
</span><span class="cx"> static HRESULT createInstance(DRTDataObject**);
</span><span class="cx"> private:
</span><span class="cx"> DRTDataObject();
</span><del>- ~DRTDataObject();
</del><span class="cx"> long m_ref;
</span><del>- Vector<FORMATETC*> m_formats;
- Vector<STGMEDIUM*> m_medium;
</del><ins>+ Vector<std::unique_ptr<FORMATETC>> m_formats;
+ Vector<std::unique_ptr<STGMEDIUM, StgMediumDeleter>> m_medium;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // DRTDataObject_h
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinUIDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/UIDelegate.cpp (167364 => 167365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/UIDelegate.cpp 2014-04-16 18:09:56 UTC (rev 167364)
+++ trunk/Tools/DumpRenderTree/win/UIDelegate.cpp 2014-04-16 18:15:04 UTC (rev 167365)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "TestRunner.h"
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <JavaScriptCore/JavaScriptCore.h>
</span><span class="lines">@@ -51,14 +50,13 @@
</span><span class="cx"> public:
</span><span class="cx"> DRTUndoObject(IWebUndoTarget* target, BSTR actionName, IUnknown* obj)
</span><span class="cx"> : m_target(target)
</span><del>- , m_actionName(SysAllocString(actionName))
</del><ins>+ , m_actionName(actionName)
</ins><span class="cx"> , m_obj(obj)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~DRTUndoObject()
</span><span class="cx"> {
</span><del>- SysFreeString(m_actionName);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void invoke()
</span><span class="lines">@@ -68,22 +66,20 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> IWebUndoTarget* m_target;
</span><del>- BSTR m_actionName;
</del><ins>+ _bstr_t m_actionName;
</ins><span class="cx"> COMPtr<IUnknown> m_obj;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class DRTUndoStack {
</span><span class="cx"> public:
</span><del>- ~DRTUndoStack() { deprecatedDeleteAllValues(m_undoVector); }
-
</del><span class="cx"> bool isEmpty() const { return m_undoVector.isEmpty(); }
</span><del>- void clear() { deprecatedDeleteAllValues(m_undoVector); m_undoVector.clear(); }
</del><ins>+ void clear() { m_undoVector.clear(); }
</ins><span class="cx">
</span><span class="cx"> void push(DRTUndoObject* undoObject) { m_undoVector.append(undoObject); }
</span><del>- DRTUndoObject* pop() { DRTUndoObject* top = m_undoVector.last(); m_undoVector.removeLast(); return top; }
</del><ins>+ std::unique_ptr<DRTUndoObject> pop() { std::unique_ptr<DRTUndoObject> top = std::move(m_undoVector.last()); m_undoVector.removeLast(); return std::move(top); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- Vector<DRTUndoObject*> m_undoVector;
</del><ins>+ Vector<std::unique_ptr<DRTUndoObject>> m_undoVector;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class DRTUndoManager {
</span><span class="lines">@@ -98,15 +94,15 @@
</span><span class="cx"> bool canUndo() { return !m_undoStack->isEmpty(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- OwnPtr<DRTUndoStack> m_redoStack;
- OwnPtr<DRTUndoStack> m_undoStack;
</del><ins>+ std::unique_ptr<DRTUndoStack> m_redoStack;
+ std::unique_ptr<DRTUndoStack> m_undoStack;
</ins><span class="cx"> bool m_isRedoing;
</span><span class="cx"> bool m_isUndoing;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> DRTUndoManager::DRTUndoManager()
</span><del>- : m_redoStack(adoptPtr(new DRTUndoStack))
- , m_undoStack(adoptPtr(new DRTUndoStack))
</del><ins>+ : m_redoStack(std::make_unique<DRTUndoStack>())
+ , m_undoStack(std::make_unique<DRTUndoStack>())
</ins><span class="cx"> , m_isRedoing(false)
</span><span class="cx"> , m_isUndoing(false)
</span><span class="cx"> {
</span><span class="lines">@@ -134,9 +130,7 @@
</span><span class="cx">
</span><span class="cx"> m_isRedoing = true;
</span><span class="cx">
</span><del>- DRTUndoObject* redoObject = m_redoStack->pop();
- redoObject->invoke();
- delete redoObject;
</del><ins>+ m_redoStack->pop()->invoke();
</ins><span class="cx">
</span><span class="cx"> m_isRedoing = false;
</span><span class="cx"> }
</span><span class="lines">@@ -148,16 +142,14 @@
</span><span class="cx">
</span><span class="cx"> m_isUndoing = true;
</span><span class="cx">
</span><del>- DRTUndoObject* undoObject = m_undoStack->pop();
- undoObject->invoke();
- delete undoObject;
</del><ins>+ m_undoStack->pop()->invoke();
</ins><span class="cx">
</span><span class="cx"> m_isUndoing = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UIDelegate::UIDelegate()
</span><span class="cx"> : m_refCount(1)
</span><del>- , m_undoManager(adoptPtr(new DRTUndoManager))
</del><ins>+ , m_undoManager(std::make_unique<DRTUndoManager>())
</ins><span class="cx"> , m_desktopNotifications(new DRTDesktopNotificationPresenter)
</span><span class="cx"> {
</span><span class="cx"> m_frame.bottom = 0;
</span><span class="lines">@@ -168,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> void UIDelegate::resetUndoManager()
</span><span class="cx"> {
</span><del>- m_undoManager = adoptPtr(new DRTUndoManager);
</del><ins>+ m_undoManager = std::make_unique<DRTUndoManager>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HRESULT UIDelegate::QueryInterface(REFIID riid, void** ppvObject)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/UIDelegate.h (167364 => 167365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/UIDelegate.h 2014-04-16 18:09:56 UTC (rev 167364)
+++ trunk/Tools/DumpRenderTree/win/UIDelegate.h 2014-04-16 18:15:04 UTC (rev 167365)
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RECT m_frame;
</span><del>- OwnPtr<DRTUndoManager> m_undoManager;
</del><ins>+ std::unique_ptr<DRTUndoManager> m_undoManager;
</ins><span class="cx">
</span><span class="cx"> COMPtr<IWebDesktopNotificationsDelegate> m_desktopNotifications;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>