Oilpan: make DataObject and SharedWorker heap Supplementables.

Source/core/clipboard/DataObject.h

 /*
  * Copyright (c) 2008, 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 32 matching lines @@
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class KURL;
 class SharedBuffer;
 
 // A data object for holding data that would be in a clipboard or moved
 // during a drag-n-drop operation. This is the data that WebCore is aware
 // of and is not specific to a platform.
-class DataObject : public RefCountedWillBeGarbageCollectedFinalized<DataObject>, public Supplementable<DataObject> {
+class DataObject : public RefCountedWillBeGarbageCollectedFinalized<DataObject>, public WillBeHeapSupplementable<DataObject> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DataObject);
 public:
     static PassRefPtrWillBeRawPtr<DataObject> createFromPasteboard(PasteMode);
     static PassRefPtrWillBeRawPtr<DataObject> create();
 
     PassRefPtrWillBeRawPtr<DataObject> copy() const;
 
     // DataTransferItemList support.
     size_t length() const;
     PassRefPtrWillBeRawPtr<DataObjectItem> item(unsigned long index);
     // FIXME: Implement V8DataTransferItemList::indexedPropertyDeleter to get this called.
@@ skipping 25 matching lines @@
     void addSharedBuffer(const String& name, PassRefPtr<SharedBuffer>);
 
     int modifierKeyState() const { return m_modifierKeyState; }
     void setModifierKeyState(int modifierKeyState) { m_modifierKeyState = modifierKeyState; }
 
     // The accessor should only ever be called by DragData.
     const String& filenameForNavigation() const { return m_filenameForNavigation; }
     void setFilenameForNavigation(const String& filename) { m_filenameForNavigation = filename; }
 
     // FIXME: oilpan: This trace() has to trace Supplementable.
     void trace(Visitor*);

[haraken, 2014/03/21 10:35:13]

Ditto. Also you can remove the FIXME.

[sof, 2014/03/21 10:42:20]

Done.

 
 private:
     DataObject();
     explicit DataObject(const DataObject&);
 
     PassRefPtrWillBeRawPtr<DataObjectItem> findStringItem(const String& type) const;
     bool internalAddStringItem(PassRefPtrWillBeRawPtr<DataObjectItem>);
     void internalAddFileItem(PassRefPtrWillBeRawPtr<DataObjectItem>);
 
     WillBeHeapVector<RefPtrWillBeMember<DataObjectItem> > m_itemList;
 
     String m_filenameForNavigation;
 
     // State of Shift/Ctrl/Alt/Meta keys.
     int m_modifierKeyState;
 };
 
 } // namespace WebCore
 
 #endif