Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Unified Diff: third_party/WebKit/public/platform/WebPrivateOwnPtr.h

Issue 2143323002: Remove WebPrivateOwnPtr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/public/platform/WebPrivateOwnPtr.h
diff --git a/third_party/WebKit/public/platform/WebPrivateOwnPtr.h b/third_party/WebKit/public/platform/WebPrivateOwnPtr.h
deleted file mode 100644
index 9f29792ea15f265d2fb9afadfacdd219b2af39f6..0000000000000000000000000000000000000000
--- a/third_party/WebKit/public/platform/WebPrivateOwnPtr.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- * Copyright (C) 2013 Intel Corporation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebPrivateOwnPtr_h
-#define WebPrivateOwnPtr_h
-
-#include "WebCommon.h"
-#include "WebNonCopyable.h"
-#include "base/logging.h"
-#include <cstddef>
-
-#if INSIDE_BLINK
-#include "wtf/PtrUtil.h"
-#include <memory>
-#endif
-
-namespace blink {
-
-// This class is an implementation detail of the WebKit API. It exists
-// to help simplify the implementation of WebKit interfaces that merely
-// wrap a pointer to a WebCore class. It's similar to WebPrivatePtr, but it
-// wraps a naked pointer rather than a reference counted.
-// Note: you must call reset(0) on the implementation side in order to delete
-// the WebCore pointer.
-template <typename T>
-class WebPrivateOwnPtr : public WebNonCopyable {
-public:
- WebPrivateOwnPtr() : m_ptr(nullptr) {}
- WebPrivateOwnPtr(std::nullptr_t) : m_ptr(nullptr) {}
- ~WebPrivateOwnPtr() { DCHECK(!m_ptr); }
-
- explicit WebPrivateOwnPtr(T* ptr)
- : m_ptr(ptr)
- {
- }
-
- T* get() const { return m_ptr; }
-
-#if INSIDE_BLINK
- template <typename U>
- WebPrivateOwnPtr(std::unique_ptr<U>, EnsurePtrConvertibleArgDecl(U, T));
-
- void reset(T* ptr)
- {
- delete m_ptr;
- m_ptr = ptr;
- }
-
- void reset(std::unique_ptr<T> o)
- {
- reset(o.release());
- }
-
- std::unique_ptr<T> release()
- {
- T* ptr = m_ptr;
- m_ptr = nullptr;
- return wrapUnique(ptr);
- }
-
- T& operator*() const
- {
- DCHECK(m_ptr);
- return *m_ptr;
- }
-
- T* operator->() const
- {
- DCHECK(m_ptr);
- return m_ptr;
- }
-#endif // INSIDE_BLINK
-
-private:
- T* m_ptr;
-};
-
-#if INSIDE_BLINK
-template <typename T>
-template <typename U>
-inline WebPrivateOwnPtr<T>::WebPrivateOwnPtr(std::unique_ptr<U> o, EnsurePtrConvertibleArgDefn(U, T))
- : m_ptr(o.release())
-{
- static_assert(!std::is_array<T>::value, "Pointers to array must never be converted");
-}
-#endif
-
-} // namespace blink
-
-#endif
« no previous file with comments | « third_party/WebKit/public/platform/WebLayerTreeView.h ('k') | third_party/WebKit/public/platform/WebURLResponse.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698