Oilpan: Move core/clipboard/ to oilpan's heap

public/platform/WebDragData.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #ifndef WebDragData_h
 #define WebDragData_h
 
 #include "WebCommon.h"
 #include "WebData.h"
 #include "WebString.h"
 #include "WebURL.h"
 
 #if BLINK_IMPLEMENTATION
 namespace WebCore { class DataObject; }
-namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
 namespace blink {
 
 class WebDragDataPrivate;
 template <typename T> class WebVector;
 
 // Holds data that may be exchanged through a drag-n-drop operation. It is
 // inexpensive to copy a WebDragData object.
 class WebDragData {
@@ skipping 24 matching lines @@
         WebData binaryData;
 
         // Title associated with a link when stringType == "text/uri-list".
         // Filename when storageType == StorageTypeBinaryData.
         WebString title;
 
         // Only valid when stringType == "text/html".
         WebURL baseURL;
     };
 
-    ~WebDragData() { reset(); }
+    WebDragData() { }
+    WebDragData(const WebDragData&);
+    WebDragData& operator=(const WebDragData&);
+    ~WebDragData();
 
-    WebDragData() : m_private(0) { }
-    WebDragData(const WebDragData& d) : m_private(0) { assign(d); }
-    WebDragData& operator=(const WebDragData& d)
-    {
-        assign(d);
-        return *this;
-    }
+    bool isNull() const;
 
     BLINK_EXPORT void initialize();
     BLINK_EXPORT void reset();
     BLINK_EXPORT void assign(const WebDragData&);
 
-    bool isNull() const { return !m_private; }
-
     BLINK_EXPORT WebVector<Item> items() const;
     BLINK_EXPORT void setItems(const WebVector<Item>&);
     BLINK_EXPORT void addItem(const Item&);
 
     BLINK_EXPORT WebString filesystemId() const;
     BLINK_EXPORT void setFilesystemId(const WebString&);
 
 #if BLINK_IMPLEMENTATION
-    WebDragData(const WTF::PassRefPtr<WebCore::DataObject>&);
-    WebDragData& operator=(const WTF::PassRefPtr<WebCore::DataObject>&);
-    operator WTF::PassRefPtr<WebCore::DataObject>() const;
+    WebDragData(const PassRefPtrWillBeRawPtr<WebCore::DataObject>&);
+    WebDragData& operator=(const PassRefPtrWillBeRawPtr<WebCore::DataObject>&);
+    WebCore::DataObject* getValue() const;
 #endif
 
 private:
-    void assign(WebDragDataPrivate*);
     void ensureMutable();
-    WebDragDataPrivate* m_private;
+#if BLINK_IMPLEMENTATION
+    WebPrivatePtr<WebCore::DataObject> m_private;

[Mads Ager (chromium), 2014/02/19 10:47:13]

I don't think this will work. Isn't m_private needed for isNull for example?

It looks like the other uses of WebPrivatePtr have the forward declaration and
the m_private declaration outside of the INSIDE_BLINK #ifdef.

[haraken, 2014/02/19 10:51:14]

You're right. This CL compiles by accident probably because the code is not
used.

I'll remove the #if from here and the forward declaration.

+#endif
 };
 
 } // namespace blink
 
 #endif