Commit 62141ba5 authored by tfarina's avatar tfarina Committed by Commit bot

ui/base/dragdrop: Fix warnings found by clang chromium-style plugin on Windows.

http://build.chromium.org/p/chromium.fyi/builders/CrWinClang/builds/622/steps/compile/logs/stdio

This fixes the following kind or warnings:

warning(clang): [chromium-style] Complex constructor has an inlined body.
warning(clang): [chromium-style] Complex destructor has an inline body.

BUG=467287
R=thakis@chromium.org,sky@chromium.org

Review URL: https://codereview.chromium.org/1103323004

Cr-Commit-Position: refs/heads/master@{#327296}
parent 056966e8
...@@ -626,6 +626,20 @@ static void DuplicateMedium(CLIPFORMAT source_clipformat, ...@@ -626,6 +626,20 @@ static void DuplicateMedium(CLIPFORMAT source_clipformat,
destination->pUnkForRelease->AddRef(); destination->pUnkForRelease->AddRef();
} }
DataObjectImpl::StoredDataInfo::StoredDataInfo(const FORMATETC& format_etc,
STGMEDIUM* medium)
: format_etc(format_etc), medium(medium), owns_medium(true) {
}
DataObjectImpl::StoredDataInfo::~StoredDataInfo() {
if (owns_medium) {
ReleaseStgMedium(medium);
delete medium;
}
if (downloader.get())
downloader->Stop();
}
DataObjectImpl::DataObjectImpl() DataObjectImpl::DataObjectImpl()
: is_aborting_(false), : is_aborting_(false),
in_drag_loop_(false), in_drag_loop_(false),
......
...@@ -104,17 +104,8 @@ class DataObjectImpl : public DownloadFileObserver, ...@@ -104,17 +104,8 @@ class DataObjectImpl : public DownloadFileObserver,
bool owns_medium; bool owns_medium;
scoped_refptr<DownloadFileProvider> downloader; scoped_refptr<DownloadFileProvider> downloader;
StoredDataInfo(const FORMATETC& format_etc, STGMEDIUM* medium) StoredDataInfo(const FORMATETC& format_etc, STGMEDIUM* medium);
: format_etc(format_etc), medium(medium), owns_medium(true) {} ~StoredDataInfo();
~StoredDataInfo() {
if (owns_medium) {
ReleaseStgMedium(medium);
delete medium;
}
if (downloader.get())
downloader->Stop();
}
}; };
typedef ScopedVector<StoredDataInfo> StoredData; typedef ScopedVector<StoredDataInfo> StoredData;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment