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

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

Issue 1447893002: compositor-worker: Introduce WebCompositorMutableState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review feedback. Created 4 years, 11 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
« no previous file with comments | « third_party/WebKit/public/platform/WebCompositorMutableStateProvider.h ('k') | ui/gfx/transform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/public/platform/WebPassOwnPtr.h
diff --git a/third_party/WebKit/public/platform/WebPassOwnPtr.h b/third_party/WebKit/public/platform/WebPassOwnPtr.h
index 217bd5404fe6e6ca6f1d9c0efefe2d58f254b097..9b2d34f5bd2c348b7202c8e23b52cd3ecfc43e56 100644
--- a/third_party/WebKit/public/platform/WebPassOwnPtr.h
+++ b/third_party/WebKit/public/platform/WebPassOwnPtr.h
@@ -10,6 +10,8 @@
#if INSIDE_BLINK
#include "wtf/PassOwnPtr.h"
+#else
+#include <base/memory/scoped_ptr.h>
#endif
namespace blink {
@@ -50,6 +52,13 @@ public:
m_ptr = nullptr;
return adoptPtr(ptr);
}
+#else
+ operator scoped_ptr<T>()
+ {
+ T* ptr = m_ptr;
+ m_ptr = nullptr;
+ return scoped_ptr<T>(ptr);
+ }
#endif // INSIDE_BLINK
template <typename U> friend class WebPassOwnPtr;
« no previous file with comments | « third_party/WebKit/public/platform/WebCompositorMutableStateProvider.h ('k') | ui/gfx/transform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698