remove memoryinstrumentation

Source/bindings/v8/ScriptWrappable.h

 /*
  * Copyright (C) 2010 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 14 matching lines @@
  * 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 ScriptWrappable_h
 #define ScriptWrappable_h
 
 #include "V8Utilities.h"
-#include "WebCoreMemoryInstrumentation.h"
 #include "WrapperTypeInfo.h"
 #include <v8.h>
 
 namespace WebCore {
 
 class ScriptWrappable {
     friend class WeakHandleListener<ScriptWrappable>;
 public:
     ScriptWrappable() : m_maskedStorage(0) { }
 
@@ skipping 40 matching lines @@
 
         return 0;
     }
 
     void setTypeInfo(const WrapperTypeInfo* info)
     {
         m_maskedStorage = reinterpret_cast<uintptr_t>(info);
         ASSERT(containsTypeInfo());
     }
 
-    void reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
-    {
-        MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
-        info.ignoreMember(m_maskedStorage);
-    }
-
     static bool wrapperCanBeStoredInObject(const void*) { return false; }
     static bool wrapperCanBeStoredInObject(const ScriptWrappable*) { return true; }
 
     static v8::Handle<v8::Object> getWrapperFromObject(void*)
     {
         ASSERT_NOT_REACHED();
         return v8::Handle<v8::Object>();
     }
 
     static v8::Handle<v8::Object> getWrapperFromObject(ScriptWrappable* object)
@@ skipping 43 matching lines @@
     inline bool containsWrapper() const { return (m_maskedStorage & 1) == 1; }
     inline bool containsTypeInfo() const { return m_maskedStorage && ((m_maskedStorage & 1) == 0); }
 
     static inline uintptr_t maskOrUnmaskValue(uintptr_t value)
     {
         // Entropy via ASLR, bottom bit set to always toggle the bottom bit in the result. Since masking is only
         // applied to wrappers, not wrapper type infos, and these are aligned poitners with zeros in the bottom
         // bit(s), this automatically set the wrapper flag in the bottom bit upon encoding. Simiarlry,this
         // automatically zeros out the bit upon decoding. Additionally, since setWrapper() now performs an explicit
         // null test, and wrapper() requires the bottom bit to be set, there is no need to preserve null here.
-        const uintptr_t randomMask = ~((reinterpret_cast<uintptr_t>(&WebCoreMemoryTypes::DOM) >> 13)) | 1;
+        const uintptr_t randomMask = 15;
         return value ^ randomMask;
     }
 
     inline void disposeWrapper(v8::Persistent<v8::Value> value, v8::Isolate* isolate, const WrapperTypeInfo* info)
     {
         ASSERT(containsWrapper());
         ASSERT(reinterpret_cast<uintptr_t>(*value) == maskOrUnmaskValue(m_maskedStorage));
         value.Dispose(isolate);
         setTypeInfo(info);
     }
@@ skipping 21 matching lines @@
     key->disposeWrapper(value, isolate, info);
     // FIXME: I noticed that 50%~ of minor GC cycle times can be consumed
     // inside key->deref(), which causes Node destructions. We should
     // make Node destructions incremental.
     info->derefObject(object);
 }
 
 } // namespace WebCore
 
 #endif // ScriptWrappable_h